数据调整

src/views/production/productionTotalOrder/modules/KSOutbound.vue

@@ -112,12 +112,7 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                
                 {
                     title: '料品编码',
                     align:"center",
@@ -130,6 +125,23 @@
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
+               
+                {
+                    // title: '本次执行扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeafNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutLeafNow' } ,
+                    slots:{title:'executeOutLeafNowTitle'},
+                },
+                {
+                    // title: '本次执行框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFramesNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutFramesNow' } ,
+                    slots:{title:'executeOutFramesNowTitle'},
+                },
                 {
                     // title: '框运费',
                     align:"center",
@@ -147,20 +159,10 @@
                     slots:{title:'fanFreightTitle'},
                 },
                 {
-                    // title: '本次执行扇数量',
-                    align:"center",
-                    dataIndex: 'executeOutLeafNow',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'executeOutLeafNow' } ,
-                    slots:{title:'executeOutLeafNowTitle'},
-                },
-                {
-                    // title: '本次执行框数量',
+                    title: '批次',
                     align:"center",
-                    dataIndex: 'executeOutFramesNow',
+                    dataIndex: 'batch',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'executeOutFramesNow' } ,
-                    slots:{title:'executeOutFramesNowTitle'},
                 },
                 {
                     title: '成品计量单位',
@@ -204,12 +206,7 @@
                     dataIndex: 'leafCount',
                     ellipsis: true,
                 },
-                {
-                    title: '已入库扇数量',
-                    align:"center",
-                    dataIndex: 'executeInLeaf',
-                    ellipsis: true,
-                },
+               
                 {
                     title: '已入库框数量',
                     align:"center",
@@ -217,9 +214,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: '已出库扇数量',
+                    title: '已入库扇数量',
                     align:"center",
-                    dataIndex: 'executeOutLeaf',
+                    dataIndex: 'executeInLeaf',
                     ellipsis: true,
                 },
                 {
@@ -228,6 +225,12 @@
                     dataIndex: 'executeOutFrames',
                     ellipsis: true,
                 },
+                {
+                    title: '已出库扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeaf',
+                    ellipsis: true,
+                },
                 {
                     title: '规格',
                     align:"center",

src/views/production/productionTotalOrder/modules/KSWarehousing.vue

@@ -95,12 +95,7 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+               
                 {
                     title: '料品编码',
                     align:"center",
@@ -113,6 +108,15 @@
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
+               
+                {
+                    // title: '本次执行框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFramesNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutFramesNow' } ,
+                    slots:{title:'executeOutFramesNowTitle'},
+                }, 
                 {
                     // title: '本次执行扇数量',
                     align:"center",
@@ -122,12 +126,10 @@
                     slots:{title:'executeOutLeafNowTitle'},
                 },
                 {
-                    // title: '本次执行框数量',
+                    title: '批次',
                     align:"center",
-                    dataIndex: 'executeOutFramesNow',
+                    dataIndex: 'batch',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'executeOutFramesNow' } ,
-                    slots:{title:'executeOutFramesNowTitle'},
                 },
                 {
                     title: '成品计量单位',
@@ -171,12 +173,6 @@
                     dataIndex: 'leafCount',
                     ellipsis: true,
                 },
-                {
-                    title: '已入库扇数量',
-                    align:"center",
-                    dataIndex: 'executeInLeaf',
-                    ellipsis: true,
-                },
                 {
                     title: '已入库框数量',
                     align:"center",
@@ -184,15 +180,21 @@
                     ellipsis: true,
                 },
                 {
-                    title: '已出库扇数量',
+                    title: '已入库扇数量',
                     align:"center",
-                    dataIndex: 'executeOutLeaf',
+                    dataIndex: 'executeInLeaf',
                     ellipsis: true,
                 },
+               {
+                   title: '已出库框数量',
+                   align:"center",
+                   dataIndex: 'executeOutFrames',
+                   ellipsis: true,
+               },
                 {
-                    title: '已出库框数量',
+                    title: '已出库扇数量',
                     align:"center",
-                    dataIndex: 'executeOutFrames',
+                    dataIndex: 'executeOutLeaf',
                     ellipsis: true,
                 },
                 {
@@ -352,7 +354,7 @@
         handleOk(){
             var mandatoryField  = '1'
             this.selectedRows.map(item=>{
-                if(!item.executeOutLeafNow||!item.executeOutFramesNow){
+                if(!item.executeOutLeafNow && !item.executeOutFramesNow){
                     mandatoryField = '0'
                 }                
             })

src/views/production/productionTotalOrder/modules/SurplusMaterials.vue

@@ -177,6 +177,7 @@
   </template>
   
   <script>
+  import alertModal from '../../../../plugins/modal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import inventoryPopup from '../../Popup/inventoryPopup.vue'
@@ -456,6 +457,17 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'glassNumber' } 
                 },
+                {
+                    title: '杂收同步',
+                    align:"center",
+                    dataIndex: 'sync',
+                    ellipsis: true
+                },{
+                    title: '杂发同步',
+                    align:"center",
+                    dataIndex: 'sync1',
+                    ellipsis: true
+                },
           ],
         rules:{
             quantity:{required:true,message:"不可为空"},
@@ -531,15 +543,30 @@
             }else if(idExistence=='no'){
                 this.$message.warning('请先保存余料管理')
             }else{
-                getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersOutByMainId', {id:idArr.join(','),type:data}).then((res) => {
-                    if (res.success) {
-                        this.$emit('ok','1')
-                        this.$message.success('执行成功');
-                    } else {
-                        this.$emit('ok','2')
-                        this.$message.error(res.message);
-                    }
-                })
+              let info = '是否确认生成杂收单？'
+              if(data == 'out'){
+                info = '是否确认生成杂发单？'
+              }
+              this.$confirm({
+                title: '执行确认',
+                content: info,
+                onOk:  ()=> {
+                  var ids =  this.selectedRowKeys.toString()
+                  alertModal.loading("执行中，请稍后！")
+                  getAction('/productionOrder/madeProductionOrders/syncMadeProductionOrdersOutList', {ids:idArr.join(','),type:data}).then((res) => {
+                       alertModal.closeLoading();
+                      if (res.success) {
+                          this.$emit('ok','1')
+                          this.$message.success('执行成功');
+                      } else {
+                          this.$emit('ok','2')
+                          this.$message.error(res.message);
+                      }
+                  })
+                }
+              })
+              
+               
             }
         }
     },

src/views/production/productionTotalOrder/modules/SurplusMaterialsDetail.vue

@@ -260,6 +260,18 @@
                     dataIndex: 'glassNumber',
                     ellipsis: true,
                 },
+                {
+                    title: '杂收同步',
+                    align:"center",
+                    dataIndex: 'sync',
+                    ellipsis: true,
+                },
+                {
+                    title: '杂发同步',
+                    align:"center",
+                    dataIndex: 'sync1',
+                    ellipsis: true,
+                },
           ],
       }
     },

src/views/production/productionTotalOrder/modules/TemporaryStorage.vue

@@ -102,13 +102,13 @@
                     ellipsis: true,
                 },
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                  {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/TemporaryStorageDetail.vue

@@ -103,13 +103,13 @@
                     ellipsis: true,
                 },
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                  {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/materiaWaring.vue

@@ -93,14 +93,14 @@
                     scopedSlots: { customRender: 'nowAuxiliaryQuan' } ,
                     slots:{title:'nowAuxiliaryQuanTitle'},
                 },
-                {
-                    title: '辅数量',
-                    align:"center",
-                    dataIndex: 'unQuantity',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'unQuantity' } ,
-                    slots:{title:'unQuantityTitle'},
-                },
+                // {
+                //     title: '辅数量',
+                //     align:"center",
+                //     dataIndex: 'unQuantity',
+                //     ellipsis: true,
+                //     scopedSlots: { customRender: 'unQuantity' } ,
+                //     slots:{title:'unQuantityTitle'},
+                // },
                 {
                     title: '项目编码',
                     align:"center",
@@ -163,15 +163,15 @@
                     ellipsis: true,
                 },
                 {
-                    title: '已执行辅数量',
+                    title: '已执行主数量',
                     align:"center",
-                    dataIndex: 'unQuantityExecute',
+                    dataIndex: 'quantityExecute',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行主数量',
+                    title: '已执行辅数量',
                     align:"center",
-                    dataIndex: 'quantityExecute',
+                    dataIndex: 'unQuantityExecute',
                     ellipsis: true,
                 },
                 {

src/views/production/productionTotalOrder/modules/productWarehousModel.vue

@@ -1,7 +1,7 @@
 <!-- 成品入库 -->
 <template>
     <a-modal
-      title="产品入库"
+      title="成品入库"
        width="95%"
       :visible="visible"
       :maskClosable="false"

src/views/production/productionTotalOrder/modules/productionTotalOrderAdd.vue

@@ -96,8 +96,8 @@
             <a-button size="small" @click="materiaWarehous" :disabled="activeKey!=='material'||defaultMethod=='add'">材料入库</a-button>
             <a-button size="small" @click="KSWarehousing" :disabled="activeKey!=='finishProduct'||defaultMethod=='add'">框/扇入库</a-button>
             <a-button size="small" @click="KSOutbound" :disabled="activeKey!=='finishProduct'||defaultMethod=='add'">框/扇出库</a-button>
-            <a-button size="small" @click="sendOrReceive('in')" :disabled="activeKey!=='SurplusMaterials'||defaultMethod=='add'">杂发</a-button>
-            <a-button size="small" @click="sendOrReceive('out')" :disabled="activeKey!=='SurplusMaterials'||defaultMethod=='add'">杂收</a-button>
+            <a-button size="small" @click="sendOrReceive('in')" :disabled="activeKey!=='SurplusMaterials'||defaultMethod=='add'">杂收</a-button>
+            <a-button size="small" @click="sendOrReceive('out')" :disabled="activeKey!=='SurplusMaterials'||defaultMethod=='add'">杂发</a-button>
        </div>
        <a-tabs v-model="activeKey" @change="handleChangeTabs">
             <a-tab-pane tab="成品明细" :key="refKeys[0]" :forceRender="true">

src/views/production/productionTotalOrder/productionTotalOrderList.vue

@@ -319,7 +319,7 @@
                   ellipsis: true,
                 },
               ],
-              fileUpload: window._CONFIG['domianURL'] + "/production/safetyStock/importExcel",
+              fileUpload: window._CONFIG['domianURL'] + "/productionOrder/madeProductionOrders/importExcel",
                  // ---------workflow  by fhf start -------------
               serviceName: 'assetAllocationService',
               // ---------workflow  by fhf end -------------