From 550ae4989da1ce9ca874a00aec7423d252b67a27 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 08:25:21 +0800
Subject: [PATCH] 提交

---
 项目代码/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue"
index 4487276..b73d987 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/BatchPickingConfirm.vue"
@@ -83,7 +83,7 @@
               <el-table-column type="selection" width="55"></el-table-column>
               <el-table-column prop="materielCode" label="鐗╂枡缂栫爜" width="120"></el-table-column>
               <el-table-column prop="pickedQty" label="宸叉嫞鏁伴噺" width="100"></el-table-column>
-              <el-table-column prop="locationCode" label="璐т綅" width="100"></el-table-column>
+              <!-- <el-table-column prop="locationCode" label="璐т綅" width="100"></el-table-column> -->
               <el-table-column prop="currentBarcode" label="鏉$爜"></el-table-column>
             </el-table>
           </el-card>
@@ -550,8 +550,8 @@
           this.$message.success('鎷i�夌‘璁ゆ垚鍔�');
           this.scanData.barcode = '';
           await this.loadPalletData();
-          if(res.data && res.data.splitResults && res.data.splitResults.length>0){
-            this.$refs.childs.open(res.data.splitResults);
+          if(res.data && res.data && res.data.length>0){
+            this.$refs.childs.open(res.data);
           }
           this.$nextTick(() => {
             this.$refs.barcodeInput.focus();
@@ -592,6 +592,9 @@
         });
 
         if (res.status) {
+            if(res.data && res.data.length>0){           
+            this.$refs.childs.open(res.data); 
+          }
           this.splitForm.materielCode = res.data.materielCode;
           this.splitForm.maxQuantity = res.data.remainQuantity;
           this.splitForm.splitQuantity = Math.min(1, this.splitForm.maxQuantity);
@@ -983,7 +986,8 @@
           palletCode: this.scanData.palletCode
         });
         if (res.status) {
-          this.unpickedList = res.data || [];
+          //this.unpickedList = res.data || [];
+          this.unpickedList = (res.data || []).filter(item => item.canPick === true);
           this.summary.unpickedCount = this.unpickedList.length;
           this.summary.unpickedQuantity = this.unpickedList.reduce((sum, item) => sum + (item.remainQuantity || 0), 0);
         }
@@ -1000,6 +1004,15 @@
         });
         if (res.status) {
           this.pickedList = res.data || [];
+          
+          this.pickedList = res.data.map(item => {
+  // 鏂瑰紡1锛氫繚鐣欏師barcode瀛楁锛屾柊澧瀋urrentBarcode
+  return {
+    ...item,
+    currentBarcode: item.barcode
+  };
+});
+
           this.summary.pickedCount = this.pickedList.length;
         }
       } catch (error) {

--
Gitblit v1.9.3