diff --git a/common/balance.js b/common/balance.js index ba464a86..1a53c9f6 100644 --- a/common/balance.js +++ b/common/balance.js @@ -263,6 +263,11 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) { action: "==", value: label.batch }) + filters.push({ + column: "packingNumber", + action: "==", + value: null + }) filters.push({ column: "locationCode", action: "==", @@ -325,6 +330,16 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) action: "==", value: label.itemCode }) + filters.push({ + column: "packingNumber", + action: "==", + value: null + }) + filters.push({ + column: "batch", + action: "==", + value: null + }) filters.push({ column: "locationCode", action: "==", diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue index 034e47f5..ebe1187e 100644 --- a/pages/count/job/countDetail.vue +++ b/pages/count/job/countDetail.vue @@ -519,14 +519,14 @@ } else { //新增盘点 //检查物料号是否存在 - var detail = that.detailSource.find(r => r.itemCode == that.package.itemCode); + var detail = that.detailSource.find(r => r.itemCode == that.label.itemCode); if (detail == undefined) { //物料号不存在,创建物料号数据添加到列表。设置为已经扫描 that.addNewItemCodeToList(qty, inventoryStatus) } else { var itemEditInfo = detail.subList.find(item => { - if (item.packingNumber == that.package.number && - item.batch == that.package.batch && + if (item.packingNumber == that.label.packingNumber && + item.batch == that.label.batch && item.inventoryStatus == inventoryStatus) { return item; }