Преглед изворни кода

fix:5219【销售订单-退货单】进行提交发货单操作,系统内容批次号没获取到,扣减库存不是显示我发货的那条物品仓库

mlchen пре 1 недеља
родитељ
комит
a6011102ce
2 измењених фајлова са 17 додато и 5 уклоњено
  1. 14 3
      src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue
  2. 3 2
      vue.config.js

+ 14 - 3
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -1132,6 +1132,7 @@
           warehouseId: data?.warehouseId || '',
           code: row.productCode,
           batchNo: row.batchNo,
+          systemBatchNo: row.systemBatchNo,
           colorKey: row.colorKey,
           modelType: row.modelType
         });
@@ -1187,6 +1188,7 @@
                   warehouseId: row.warehouseId,
                   code: row.productCode,
                   batchNo: row.batchNo,
+                  systemBatchNo: row.systemBatchNo,
                   colorKey: row.colorKey,
                   modelType: row.modelType
                 })
@@ -1620,6 +1622,7 @@
                     warehouseId: item.warehouseId,
                     code: item.productCode,
                     batchNo: item.batchNo,
+                    systemBatchNo: item.systemBatchNo,
                     colorKey: item.colorKey,
                     modelType: item.modelType
                   })
@@ -1678,6 +1681,7 @@
                 warehouseId: item.warehouseId,
                 code: item.productCode,
                 batchNo: item.batchNo,
+                systemBatchNo: item.systemBatchNo,
                 colorKey: item.colorKey,
                 modelType: item.modelType
               })
@@ -1704,11 +1708,13 @@
           let tempBatchNoList = templist1?.list || [];
           console.log('888~~~~', index, item.batchNo);
 
-          // 新数据按系统批次精确匹配,历史数据保持按外部批次号兼容匹配
+          // 优先按批次明细ID匹配,无ID时按系统批次和业务批次兼容匹配
           const batchNoObj = tempBatchNoList.find(
             (i) =>
-              i.batchNo == item.batchNo &&
-              (!item.systemBatchNo || i.systemBatchNo == item.systemBatchNo)
+              (item.batchStockId && i.id == item.batchStockId) ||
+              (!item.batchStockId &&
+                i.batchNo == item.batchNo &&
+                (!item.systemBatchNo || i.systemBatchNo == item.systemBatchNo))
           );
 
           if (batchNoObj) {
@@ -1717,6 +1723,11 @@
               'batchStockId',
               batchNoObj.id
             );
+            this.$set(
+              this.form.datasource[index],
+              'systemBatchNo',
+              batchNoObj.systemBatchNo || ''
+            );
             this.$set(
               this.form.datasource[index],
               'warehouseNum',

+ 3 - 2
vue.config.js

@@ -2,7 +2,7 @@
  * @Author: mlchen 374826075@qq.com
  * @Date: 2026-07-22 15:43:30
  * @LastEditors: mlchen 374826075@qq.com
- * @LastEditTime: 2026-07-27 09:31:46
+ * @LastEditTime: 2026-08-11 10:52:40
  * @FilePath: /kd-aiot-frontend-eom/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -44,7 +44,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.1.251:18086', //开发
+        // target: 'http://192.168.1.251:18086', //开发
+        target: 'http://localhost:18086', //开发
         // target: 'http://192.168.1.251:18186', //测试
         // target: 'http://192.168.1.15:18086',//罗
         // target: 'http://192.168.1.144:18086',//付