From 8df6a83658c71473f8e9839ed4038675c9e528ef Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 8 Apr 2022 12:59:34 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20DN=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/picking/ByOrder.vue      | 6 ++++++
 src/pages/raw/handover/picking/model.ts         | 3 ++-
 src/pages/raw/ingoods/dnReceipt/ImportDN.vue    | 3 ++-
 src/pages/raw/ingoods/dnReceipt/dnReceiving.vue | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index 5636de1..a959940 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -319,6 +319,12 @@ export default class RawReceiptDetail extends BasePage {
   async onAggregate() {
     await this.model.queryProOrder(this.model.formParams);
     await this.model.queryProOrderResult(this.model.NEWparams);
+    if (this.model.proOrderResultList.length == 0) {
+      this.some = {};
+      this.LocationList = [];
+      this.wlCode = '';
+      return;
+    }
     await this.model.lockProOrderResult(this.model.proOrderResultList);
     this.some = {};
     this.LocationList = [];
diff --git a/src/pages/raw/handover/picking/model.ts b/src/pages/raw/handover/picking/model.ts
index fc79c44..cc70f52 100644
--- a/src/pages/raw/handover/picking/model.ts
+++ b/src/pages/raw/handover/picking/model.ts
@@ -292,7 +292,8 @@ export class PickingModule extends VuexModule {
       //   icon: 'none',
       //   title: 'No Data Found！',
       // });
-      vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
+      // vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
+      return;
     }
     aggregateList.forEach((item: any) => {
       (item.loginName = params.loginName), (item.differences = parseFloat(item.amount) - parseFloat(item.totalMoAmount));
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index fe18dda..777b60d 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -243,7 +243,8 @@ export default class dnReceiptDom extends BasePage {
     this.receiptAmount = '';
     this.poNo = e.pickerName.value;
     // 过滤重复物料
-    this.materialList = JSON.parse(JSON.stringify(this.removeDuplicates(this.material, 'materialCode')));
+    // this.materialList = JSON.parse(JSON.stringify(this.removeDuplicates(this.material, 'materialCode')));
+    this.materialList = JSON.parse(JSON.stringify(this.material));
     // 返回物料中poNo为选中的项；
     this.materialList = this.materialList.filter((item: any) => {
       if (item.poNo == e.pickerName.value) {
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index f60a0f5..5e757f4 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -244,7 +244,8 @@ export default class dnReceiptDom extends BasePage {
     this.receiptAmount = '';
     this.poNo = e.pickerName.value;
     // 过滤重复物料
-    this.materialList = JSON.parse(JSON.stringify(this.removeDuplicates(this.material, 'materialCode')));
+    // this.materialList = JSON.parse(JSON.stringify(this.removeDuplicates(this.material, 'materialCode')));
+    this.materialList = JSON.parse(JSON.stringify(this.material));
     console.log('this.materialList??>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', this.materialList);
     // 返回物料中poNo为选中的项；
     this.materialList = this.materialList.filter((item: any) => {