From 1474bb8bc005a4a76b5a34de6f62af9ba276b685 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 31 Jan 2024 10:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/balance.js               | 15 +++++++++++++++
 pages/count/job/countDetail.vue |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

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;
 							}