2025-08-28 pc生产领料优化

src/views/modules/production-pick/productionPickingDetail.vue

@@ -76,7 +76,7 @@
         <div class="col-no">NO.</div>
         <div class="col-label">标签条码</div>
         <div class="col-part">物料编码</div>
-        <div class="col-unit">单位</div>
+<!--        <div class="col-unit">单位</div>-->
         <div class="col-qty">标签数量</div>
       </div>
 
@@ -88,7 +88,7 @@
         <div class="col-no">{{ labelList.length - index }}</div>
         <div class="col-label">{{ label.labelCode }}</div>
         <div class="col-part">{{ label.partNo }}</div>
-        <div class="col-unit">{{ label.unit || '个' }}</div>
+<!--        <div class="col-unit">{{ label.unit || '个' }}</div>-->
         <div class="col-qty">{{ label.quantity }}</div>
       </div>
 
@@ -213,6 +213,7 @@ export default {
 
       validateLabelWithOutbound(params).then(({ data }) => {
         if (data && data.code === 0) {
+          const resultList = data.data;
           // 检查是否已经扫描过
           const exists = this.labelList.find(item => item.labelCode === labelCode);
           if (exists) {
@@ -220,19 +221,19 @@ export default {
             return;
           }
 
-          // 添加到列表
+          // 将所有结果添加到列表
+          resultList.forEach(result => {
             this.labelList.push({
-            id: Date.now(),
-            labelCode: labelCode,
-            partNo: data.data.partNo,
-            quantity: data.data.quantity,
-            unit: data.data.unit,
-            batchNo: data.data.batchNo
+              id: Date.now() + Math.random(), // 确保ID唯一
+              labelCode: result.labelCode,
+              partNo: result.partNo,
+              quantity: result.quantity,
+              batchNo: result.batchNo
             });
-
-          this.$message.success('操作成功');
+          });
+          this.$message.success(`标签验证成功，共添加 ${resultList.length} 条记录`);
         } else {
-          this.$message.error(data.msg || '该标签与出库单不符，请检查');
+          this.$message.error(data.msg || '该标签不符合退货条件，请检查');
         }
       }).catch(error => {
         console.error('标签验证失败:', error);
@@ -257,7 +258,6 @@ export default {
         this.$message.warning('请先扫描标签');
         return;
       }
-
       const params = {
         site: this.outboundInfo.site,
         buNo: this.buNo,
@@ -267,10 +267,10 @@ export default {
           labelCode: label.labelCode,
           quantity: label.quantity,
           batchNo: label.batchNo,
-          partNo: label.partNo
+          partNo: label.partNo,
+          locationId: label.locationId
         }))
       };
-
       confirmProductionPicking(params).then(({ data }) => {
         if (data && data.code === 0) {
           this.$message.success('操作成功');
@@ -328,9 +328,9 @@ export default {
       const params = {
         site: this.outboundInfo.site,
         buNo: this.buNo,
-        outboundNo: this.outboundNo
+        outboundNo: this.outboundNo,
+        warehouseId: getCurrentWarehouse()
       };
-
       getOutboundMaterialList(params).then(({ data }) => {
         this.materialListLoading = false;
         if (data && data.code === 0) {

src/views/modules/sales/salesOutboundDetail.vue

@@ -216,22 +216,25 @@ export default {
       };
       validateLabelWithOutbound(params).then(({ data }) => {
         if (data && data.code === 0) {
+          const resultList = data.data;
           // 检查是否已经扫描过
           const exists = this.labelList.find(item => item.labelCode === labelCode);
           if (exists) {
             this.$message.warning('该标签已扫描，请勿重复扫描');
             return;
           }
-          // 添加到列表顶部（最后扫描的在最上面）
-          this.labelList.unshift({
-            id: Date.now(),
-            labelCode: labelCode,
-            partNo: data.data.partNo,
-            quantity: data.data.quantity,
-            batchNo: data.data.batchNo,
-            locationId: data.data.locationId
+          // 将所有结果添加到列表
+          resultList.forEach(result => {
+            this.labelList.push({
+              id: Date.now() + Math.random(), // 确保ID唯一
+              labelCode: result.labelCode,
+              partNo: result.partNo,
+              quantity: result.quantity,
+              batchNo: result.batchNo,
+              locationId: result.locationId
             });
-          this.$message.success('操作成功');
+          });
+          this.$message.success(`标签验证成功，共添加 ${resultList.length} 条记录`);
         } else {
           this.$message.error(data.msg || '该标签与出库单不符，请检查');
         }