From 0d5f80dab7abdf5d9d7961c397e4e3cc4a000c6f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 25 Aug 2025 15:50:25 +0800
Subject: [PATCH] =?UTF-8?q?2025-08-25=20pda=E9=87=87=E8=B4=AD=E3=80=81?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/productionInboundStorage.vue | 13 +++++++------
 .../modules/purchase-inbound/inboundStorage.vue     |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/production/productionInboundStorage.vue b/src/views/modules/production/productionInboundStorage.vue
index 8db7560..6020f88 100644
--- a/src/views/modules/production/productionInboundStorage.vue
+++ b/src/views/modules/production/productionInboundStorage.vue
@@ -247,9 +247,9 @@ export default {
         inboundNo: this.inboundNo,
         partNo: this.partNo,
         warehouseId: getCurrentWarehouse(),
-        site:localStorage.getItem('site'),
+        site: localStorage.getItem('site'),
+        buNo: this.materialInfo.buNo
       };
-
       validateLabelWithInbound(params).then(({ data }) => {
         if (data && data.code === 0) {
           // 检查是否已经扫描过
@@ -323,23 +323,24 @@ export default {
       }
 
       const params = {
-        site:this.materialInfo.site,
+        site: this.materialInfo.site,
         buNo: this.materialInfo.buNo,
         inboundNo: this.inboundNo,
-        partNo: this.partNo,
         warehouseId: getCurrentWarehouse(),
         locationCode: this.locationCode.trim(),
         labels: this.labelList.map(label => ({
           labelCode: label.labelCode,
           quantity: label.quantity,
-          batchNo: label.batchNo
+          batchNo: label.batchNo,
+          partNo: label.partNo,
         }))
       };
       confirmInboundStorage(params).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('操作成功');
+          this.validateAndAddLabel(this.materialInfo.inboundNo);
           this.showLocationDialog = false;
-          this.$router.back();
+          //this.$router.back();
         } else {
           this.$message.error(data.msg || '操作失败');
         }
diff --git a/src/views/modules/purchase-inbound/inboundStorage.vue b/src/views/modules/purchase-inbound/inboundStorage.vue
index 310745c..9e479ff 100644
--- a/src/views/modules/purchase-inbound/inboundStorage.vue
+++ b/src/views/modules/purchase-inbound/inboundStorage.vue
@@ -248,7 +248,7 @@ export default {
         inboundNo: this.inboundNo,
         partNo: this.partNo,
         warehouseId: getCurrentWarehouse(),
-        site:localStorage.getItem('site'),
+        site: localStorage.getItem('site'),
       };
 
       validateLabelWithInbound(params).then(({ data }) => {
@@ -322,7 +322,6 @@ export default {
         this.$message.warning('请输入库位号');
         return;
       }
-
       const params = {
         site:this.materialInfo.site,
         buNo: this.materialInfo.buNo,
@@ -339,8 +338,9 @@ export default {
       confirmInboundStorage(params).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('操作成功');
+          this.validateAndAddLabel(this.materialInfo.inboundNo);
           this.showLocationDialog = false;
-          this.$router.back();
+          //this.$router.back();
         } else {
           this.$message.error(data.msg || '操作失败');
         }