From abf213daaafbf942d0e70527b779cb97ec51f803 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 25 Jan 2024 15:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=96=99=E8=AE=B0=E5=BD=95=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coms/comRepleinshRequestPopup.vue         | 21 ++++++++++++++++---
 pages/repleinsh/record/repleinshRecord.vue    |  5 +++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
index 2585a16f..c8098218 100644
--- a/pages/repleinsh/coms/comRepleinshRequestPopup.vue
+++ b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -116,11 +116,10 @@
 				fgLocationCode: "",
 				itemCodeFocus: false,
 				isCheckItemCode: false,
-				counQty: 0,
+				counQty: undefined,
 				editPosition: true,
 				numberFocus: false,
 				uom: "",
-				positionInfo: "请选择位置",
 				show: false,
 				isModifiedPosition: true,
 				positionList: [],
@@ -167,7 +166,12 @@
 				// 	this.qty = 0
 				// 	this.itemCodeGetFocus();
 				// }
-
+				this.qty = 0;
+				this.itemCode = '请扫描物料信息'
+				this.toLocationCode = '请扫目标库位'
+				this.isCheckItemCode =false;
+				this.counQty =undefined;
+				this.numberFocus = false
 				this.$refs.popup.open('bottom');
 				// this.showScanLocation();
 			},
@@ -207,10 +211,21 @@
 			},
 
 			confirm() {
+				if (this.toLocationCode == "请扫目标库位") {
+					this.showErrorMessage("请输入目标库位")
+					return
+				}
+				
 				if (this.itemCode == "" || !this.isCheckItemCode) {
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
 				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
+				
 				if (this.qty == 0) {
 					this.showErrorMessage("数量必须大于0")
 					return
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index 5db4e85a..9eb97203 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -206,6 +206,8 @@
 						if (res.data.length > 0) {
 							res.data.forEach(r => {
 								r.toLocationCode = item.toLocation.code;
+								r.itemName = item.itemName
+								r.uom = item.uom;
 								that.subList.push(r);
 							})
 
@@ -367,13 +369,12 @@
 			submitJob() {
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-
 				repleinshRecordSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成补料记录<br>" + res.data)
 					} else {
-						this.showErrorMessage("提交失败:" + res.msg)
+						this.showErrorMessage("提交失败[" + res.msg+"]")
 					}
 				}).catch(error => {
 					uni.hideLoading()