From 9f285314e15c30cd137a2993d4be8b338ea9c89f Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 30 Jan 2024 11:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=96=99=E8=AE=B0=E5=BD=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/issue/coms/comIssueRequestPopup.vue     |  3 +--
 pages/query/container.vue                     |  2 +-
 pages/query/item.vue                          |  2 +-
 pages/query/item_copy.vue                     |  2 +-
 .../coms/comRepleinshRequestPopup.vue         | 22 +++++++------------
 pages/repleinsh/record/repleinshRecord.vue    |  7 ++++--
 .../unPlanned/coms/comReceiptRequestPopup.vue |  2 +-
 7 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index f457fce7..8cb50dd3 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -163,7 +163,7 @@
 				if (this.isModifiedPosition) {
 					this.isModifiedPosition = false
 				} else {
-					this.itemCode = "";
+					this.itemCode = "请扫描物料信息";
 					this.show = false
 					this.uom = ""
 					this.qty = 0;
@@ -321,7 +321,6 @@
 				this.uom =scanResult.uom
 				this.stdPackInfo = scanResult.package;
 				this.numberFocus = true
-				
 			}
 		}
 	}
diff --git a/pages/query/container.vue b/pages/query/container.vue
index 0bd4e41a..defebb34 100644
--- a/pages/query/container.vue
+++ b/pages/query/container.vue
@@ -27,7 +27,7 @@
 
 		、
 		<win-scan-button @goScan='openScanPopup' v-if="containerNumber!=''"></win-scan-button>
-		<win-scan-item ref="scanPopup" title='器具代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='器具代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 		<show-modal ref="modal"></show-modal>
 		<comMessage ref="comMessage"></comMessage>
diff --git a/pages/query/item.vue b/pages/query/item.vue
index 142c73f0..fc666c9b 100644
--- a/pages/query/item.vue
+++ b/pages/query/item.vue
@@ -27,7 +27,7 @@
 
 		</my-paging>
 		<win-scan-button @goScan='openScanPopup' v-if="itemCode!=''"></win-scan-button>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
diff --git a/pages/query/item_copy.vue b/pages/query/item_copy.vue
index d509d3e8..4f31d51f 100644
--- a/pages/query/item_copy.vue
+++ b/pages/query/item_copy.vue
@@ -42,7 +42,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup' v-if="itemCode!=''"></win-scan-button>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
diff --git a/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
index c8098218..8ebc05a6 100644
--- a/pages/repleinsh/coms/comRepleinshRequestPopup.vue
+++ b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -64,7 +64,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getItemScanResult' :itemCodeTypeList="itemCodeTypeList">
 		</win-scan-item>
 
 		<win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode'
@@ -115,7 +115,6 @@
 				rawLocationCode: "",
 				fgLocationCode: "",
 				itemCodeFocus: false,
-				isCheckItemCode: false,
 				counQty: undefined,
 				editPosition: true,
 				numberFocus: false,
@@ -169,7 +168,6 @@
 				this.qty = 0;
 				this.itemCode = '请扫描物料信息'
 				this.toLocationCode = '请扫目标库位'
-				this.isCheckItemCode =false;
 				this.counQty =undefined;
 				this.numberFocus = false
 				this.$refs.popup.open('bottom');
@@ -216,7 +214,7 @@
 					return
 				}
 				
-				if (this.itemCode == "" || !this.isCheckItemCode) {
+				if (this.itemCode == "请扫描物料信息") {
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
 				}
@@ -242,7 +240,6 @@
 					if (res.data != null && res.data.list.length > 0) {
 						this.itemCode = res.data.list[0].code;
 						this.itemName = res.data.list[0].name
-						this.isCheckItemCode = true;
 						this.numberFocus = true
 						this.uom = res.data.list[0].uom
 					} else {
@@ -276,14 +273,12 @@
 				this.closeRequestPopup();
 			},
 
-			getScanCode(code, scanResult) {
-				if (code == "") {
-					this.showErrorMessage('物料号不能为空')
-					return;
-				}
-				this.itemCode = "";
-				this.checkItemCode(code)
+			getItemScanResult(code, scanResult) {
+				this.itemCode = code;
+				this.itemName = scanResult.name
+				this.uom =scanResult.uom
 				this.stdPackInfo = scanResult.package;
+				this.numberFocus = true
 			},
 
 			getLocationCode(location, code) {
@@ -304,8 +299,7 @@
 						}
 					})
 					if (type == "itemCode") {
-						this.itemCode = ""
-						this.isCheckItemCode = false;
+						this.itemCode = "请扫描物料信息"
 					}
 				})
 			},
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index 9eb97203..62446127 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -33,7 +33,8 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 		<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationTypeList="tolocationTypeList"
-			@confirm='requestConfirm'>
+			@confirm='requestConfirm'
+			:itemCodeTypeList="itemCodeTypeList">
 		</com-repleinsh-request-popup>
 		<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
 		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
@@ -125,7 +126,8 @@
 				businessType: {},
 				requestList: [],
 				managementList: [],
-				dataContent: {}
+				dataContent: {},
+				itemCodeTypeList:[]
 			};
 		},
 		onLoad(option) {
@@ -133,6 +135,7 @@
 			getBusinessType(typeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
+					this.itemCodeTypeList = res.itemCodeTypeList;
 					this.fromlocationTypeList = res.fromlocationTypeList;
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showRequestPopup();
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
index 1bfeafbe..d458a30d 100644
--- a/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -68,7 +68,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="itemPopup" title='物料代码' @getScanResult='getItemScanResult'>
+		<win-scan-item ref="itemPopup" title='物料代码' @getScanResult='getItemScanResult' :itemCodeTypeList="itemCodeTypeList">
 		</win-scan-item>
 		<winScanLocation ref="locationPopup" title="库位代码" @getLocation='getLocationCode'></winScanLocation>
 		<comMessage ref="comMessage"></comMessage>