From d126cbf540357e019b9e3672a475002dac5e908c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 19 Jun 2024 11:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E6=96=99=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=80?=
 =?UTF-8?q?=E7=A7=B0=E5=9B=9E=E8=B0=83+=E7=B2=89=E7=A2=8E=E6=96=99?=
 =?UTF-8?q?=E5=92=8C=E6=B7=B7=E6=8B=8C=E6=96=99=E6=95=B0=E6=8D=AE=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialsAdjustmentFunc.vue               | 45 ++++++++++++++++---
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
index 13c5f9200..976973b41 100644
--- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
+++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
@@ -293,7 +293,8 @@ export default {
         },
       ],
       itemStagingLists:{},//物料相关内容暂存
-      supplierStagingLists:{},// 供应商信息暂存
+      supplierOnlyStagingLists:{},// 单纯供应商信息暂存
+      supplierItemStagingLists:{},// 供应商物品信息暂存
       asnStagingLists:{},// 供应商发货通知暂存
       locationStagingLists:{},//库位相关内容暂存
       packingStagingLists:{},//箱码相关内容暂存
@@ -559,7 +560,9 @@ export default {
       let _item = this.needNewPackingList[index]
       let _item_info = this.itemStagingLists[_item.itemCode]
       let _location_info = this.locationStagingLists[_item.locationCode]
-      let _supplier_info = this.supplierStagingLists[_item.supplierCode]
+      let _supplieritem_name = _item.supplierCode + '_' + _item.itemCode
+      let _supplieritem_info = this.supplierItemStagingLists[_supplieritem_name]
+      let _supplier_only_info = this.supplierOnlyStagingLists[_item.supplierCode]
       let _asn_info = this.asnStagingLists[_item.poNumber]
       let _creatPackData = {
         itemCode: _item_info.code || null,
@@ -589,9 +592,9 @@ export default {
         specifications: null,
         supplierBatch: null,
         supplierName: null,
-        supplierSimpleName: _supplier_info.supplierSimpleName,
-        supplierItemCode: _supplier_info.supplierItemCode,
-        supplierItemName: _supplier_info.itemName,
+        supplierSimpleName: _supplier_only_info.shortName,
+        supplierItemCode: _supplieritem_info.supplierItemCode,
+        supplierItemName: _supplieritem_info.itemName,
         labelType: 1,//采购标签
         planArriveDate: "9999-12-31",
         remark:null,
@@ -671,6 +674,30 @@ export default {
       console.log('原料',this.addPopData_YL)
       console.log('混拌料',this.addPopData_HB)
     },
+    updateSupplierOnlyStageByCode(supplierCode){
+      this.Loading.appMainLoading = true
+      // 获取供应商相关信息
+      let params = {
+        Sorting: "",
+        MaxResultCount: 1000,
+        SkipCount: 0,
+        condition: {
+          filters: [{
+            logic: "And",
+            column: "code",
+            action: "==",
+            value: supplierCode
+          }]
+        }
+      }
+      getPageList(params, "basedata/supplier").then((res)=>{
+        this.supplierOnlyStagingLists[supplierCode] = res.items[0]
+        this.Loading.appMainLoading = false
+      })
+      .catch(err=>{
+        this.Loading.appMainLoading = false
+      })
+    },
     // 粉碎料下拉
     pushFS(data){
       if(data[1].prop == "itemCode"){
@@ -686,7 +713,9 @@ export default {
         this.addPopData_FS[data[3].$index].locationCode = null
       }
       if(data[1].prop == "supplierCode"){
-        this.supplierStagingLists[data[2]] = data[0]
+        let _name = data[2] +'_'+ data[0].itemCode
+        this.supplierItemStagingLists[_name] = data[0]
+        this.updateSupplierOnlyStageByCode(data[0].supplierCode)
       }
       if(data[1].prop == "poNumber"){
         this.asnStagingLists[data[2]] = data[0]
@@ -778,7 +807,9 @@ export default {
         this.addPopData_HB[data[3].$index].poNumber = null
       }
       if(data[1].prop == "supplierCode"){
-        this.supplierStagingLists[data[2]] = data[0]
+        let _name = data[2] +'_'+ data[0].itemCode
+        this.supplierItemStagingLists[_name] = data[0]
+        this.updateSupplierOnlyStageByCode(data[0].supplierCode)
       }
       if(data[1].prop == "poNumber"){
         this.asnStagingLists[data[2]] = data[0]