|
|
@@ -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',
|