From 5d4d83a008221f0e2e5f1ac0611c8d9cb2dbabbf Mon Sep 17 00:00:00 2001
From: leiqiaozhen <leiqiaozhen@semi-tech.com>
Date: Wed, 19 Mar 2025 14:47:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=87=87=E8=B4=AD=E7=99=BB=E8=AE=B0)?=
 =?UTF-8?q?=EF=BC=9A=201.=E6=96=B0=E5=A2=9E=E4=BD=9C=E4=B8=9A=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E7=89=A9=E6=96=99=E7=BB=84ITEM=5FGROUP=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=AD=89=E7=BA=A7QUALITY=5FINSPECTION=5FSTAT?=
 =?UTF-8?q?US=201.=E5=A6=82=E6=9E=9C=E7=89=A9=E6=96=99=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=BB=84=E5=9C=A8=E4=BD=9C=E4=B8=9A=E8=A7=84=E5=88=99?=
 =?UTF-8?q?ITEM=5FGROUP=E4=B8=AD=EF=BC=8C=E8=AE=BE=E7=BD=AE=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E6=95=B0=E9=87=8F=E5=BF=85=E5=A1=AB=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E4=B8=BAY=EF=BC=8C=E5=B9=B6=E6=98=BE=E7=A4=BA=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E6=95=B0=E9=87=8F=E5=92=8C=E8=BE=85=E5=8A=A9=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E4=B8=94=E8=BE=85=E5=8A=A9=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9B=202.=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/wms-nalinv/poRegister/index.vue | 71 +++++++++++++++++--
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/wms-nalinv/poRegister/index.vue b/src/views/mes/wms-nalinv/poRegister/index.vue
index 4ca40a0..2a145d6 100644
--- a/src/views/mes/wms-nalinv/poRegister/index.vue
+++ b/src/views/mes/wms-nalinv/poRegister/index.vue
@@ -212,6 +212,17 @@
                 </template>
               </el-table-column>
               <el-table-column prop="unit" label="单位"></el-table-column>
+              <el-table-column v-if="false" prop="auxiliaryQtyFlag" label="辅助数量必填标识"></el-table-column>
+              <el-table-column v-if="showFlag" prop="auxiliaryOty" label="辅助数量" width="110">
+                <template slot-scope="scope">
+                  <el-input v-if="scope.row.auxiliaryQtyFlag === 'Y'"  v-model="scope.row.auxiliaryOty" type="number"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="showFlag" prop="auxiliaryUnit" label="辅助单位">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.auxiliaryQtyFlag === 'Y'">{{ scope.row.auxiliaryUnit }}</span>
+                </template>
+              </el-table-column>
               <el-table-column prop="uebto" label="过量收货比例%" width="130"></el-table-column>
               <el-table-column prop="storagLocation" label="到货仓库" width="130">
                 <template slot-scope="scope">
@@ -348,6 +359,7 @@ import {
   saveDocumentDetailData
 } from "@/api/mes/wms-nalinv/poRegister";
 import {fetchList as fetchWarehouseList} from "@/api/wms/warehouse";
+import {listByActivityId} from "@/api/admin/activity-option";
 
 export default {
   name: 'po-register',
@@ -445,6 +457,11 @@ export default {
           { required: true, message: '请选择日期', trigger: 'blur' }
         ],
       },
+      // 作业规则 物料组 ITEM_GROUP
+      itemGroups: '',
+      // 作业规则 质检等级 QUALITY_INSPECTION_STATUS
+      qualityInspectionStatus: '',
+      showFlag:false,
       page: {
         total: 0, // 总页数
         currentPage: 1, // 当前页数
@@ -453,6 +470,28 @@ export default {
     };
   },
   created() {
+    // 获取作业规则
+    let activityId = this.$route.query.ACTIVITY_ID
+    showLoading()
+    listByActivityId(activityId)
+        .then((response) => {
+          hideLoading()
+          if (response.data.code != 0) {
+            return this.$message.error(response.data.msg)
+          }
+          for (let i = 0; i < response.data.data.length; i++) {
+            // 判断 作业规则是否为 ITEM_GROUP物料组;
+            if (response.data.data[i].optionName == 'ITEM_GROUP') {
+              this.itemGroups = response.data.data[i].optionValue
+            } else if (response.data.data[i].optionName == 'QUALITY_INSPECTION_STATUS') {
+              this.qualityInspectionStatus = response.data.data[i].optionValue
+            }
+          }
+        })
+        .catch((e) => {
+          hideLoading()
+        })
+
     // avue option 翻譯 用
     this.getDataDictionary('DOCUMENT_STATE', 'documentStatusList');
     this.getDataDictionary('IQC_STATUS', 'iqcStatusList')
@@ -520,15 +559,31 @@ export default {
     // 检索采购订单明细
     searchPoDetailAction(){
       let me = this;
+      me.showFlag = false;
       showLoading();
       getDetailByPo(me.registerFormObj.po).then(res => {
-          hideLoading();
-          me.documentRegisterList = res.data.data;
+        hideLoading();
+        // 循环遍历
+        res.data.data.forEach(o => {
+          // 判断物料的物料组是否在作业规则中
+          if (!isBlank(this.itemGroups) && !isBlank(o.itemGroup) ) {
+            // 把this.itemGroups 以英文,进行分隔，组成
+            const itemGroupList = this.itemGroups.split(',').map(group => group.trim());
+            if (itemGroupList.includes(o.itemGroup)) {
+              o.auxiliaryQtyFlag = 'Y'
+              me.showFlag = true
+            } else  {
+              o.auxiliaryQtyFlag = 'N'
+            }
+          } else {
+            o.auxiliaryQtyFlag = 'N'
+          }
+        });
+        me.documentRegisterList = res.data.data;
         }).catch(error => {
           hideLoading();
         });
     },
-
     // 添加一行
     addRowData(row,index){
       let me = this;
@@ -621,6 +676,10 @@ export default {
             // this.$message.error('物料'+rowObj.matnr+ '、第'+rowObj.bseg+'行收货数量不能为空');
             continue;
           }
+          if(!isBlank(rowObj.auxiliaryQtyFlag) && rowObj.auxiliaryQtyFlag === 'Y' && isBlank(rowObj.auxiliaryOty)){
+            this.$message.error('序号' + rowObj.bseg+ '、物料' + rowObj.matnr +'辅助数量不能为空');
+            return;
+          }
           let key = rowObj.matnr+'-'+rowObj.bseg;
           if(rowObj.state != 'SON' && sumMap.get(key) == undefined){
             sumMap.set(key,Number(rowObj.actualQuantity));
@@ -646,7 +705,11 @@ export default {
             itemDescription: rowObj.itemDesc,
             matnr: rowObj.matnr,
             applicationsQuantity: rowObj.actualQuantity,
-            unitOfMeasure: rowObj.unit
+            unitOfMeasure: rowObj.unit,
+            auxiliaryQtyFlag: rowObj.auxiliaryQtyFlag,
+            auxiliaryOty: rowObj.auxiliaryOty,
+            auxiliaryUnit: rowObj.auxiliaryUnit,
+            qualityInspectionStatus: me.qualityInspectionStatus
           });
         }
         let successFlag = true;