From 81ba95f72f75f5c5db8b85ab22a0c5b436aad6e3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 13 May 2024 17:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/coms/comScanIssuePack.vue | 21 +++++++++++++++++++++
 src/pages/issue/js/issue.js               |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 6d13149d..0f0f7e50 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -228,6 +228,27 @@
 
 
 			onScan(result) {
+				if(this.toLocation&&result.package.packUnit){
+					let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode);
+					if(result.package.packUnit!==item.packUnit){
+						this.$refs.comMessage.showModal({
+							iconType:'警告',
+							content:'包装规格不一致',
+							showConfirmButton:true,
+							showCancelButton:true,
+							confirmText:'是',
+							cancelText:'否',
+							success:({confirm})=>{
+								if(confirm){
+									this.onScanResult(result)
+								}
+							}
+						});
+						return
+					}
+				}
+			},
+			onScanResult(result) {
 				try {
 					let that = this;
 					if (that.fromLocationCode == '') {
diff --git a/src/pages/issue/js/issue.js b/src/pages/issue/js/issue.js
index 0cabca84..696ff895 100644
--- a/src/pages/issue/js/issue.js
+++ b/src/pages/issue/js/issue.js
@@ -55,7 +55,7 @@ export function createItemInfo(detail) {
 		itemName: detail.itemName,
 		productionLineCode: detail.productionLineCode,
 		workStationCode: detail.workStationCode,
-		stdPackQty: detail.stdPackQty,
+		packQty: detail.packQty,
 		packUnit: detail.packUnit,
 		qty: detail.qty,
 		uom: detail.uom,