From bfe611aca149aa18fe609bea936974bfceb9537e Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 4 Nov 2024 13:46:46 +0800
Subject: [PATCH] HL-5674

---
 src/mycomponents/scan/winComScanBalance.vue   | 16 ++++++++++++++--
 .../scan/winScanPackAndLocation.vue           | 19 +++++++++++++++----
 .../job/productionReceiptDetail.vue           |  2 +-
 src/pages/purchaseReceipt/job/receiptJob.vue  |  4 ++--
 src/pages/putaway/job/putawayJob.vue          |  2 +-
 src/pages/repleinsh/job/repleinshJob.vue      |  2 ++
 6 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 148baaf9..5c00bab9 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -187,7 +187,11 @@
 				getBalanceByFilter(params).then(res => {
 					uni.hideLoading()
 					if (res.data.list.length > 0) {
-						this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+						if(this.bussinessCode=="Repleinment"){
+							this.showErrorMessage("此物料已补料");
+						}else {
+							this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+						}
 					} else {
 						this.queryBalance(this.resultData);
 					}
@@ -239,7 +243,15 @@
 
 				}).catch(error => {
 					uni.hideLoading()
-					this.showErrorMessage(error)
+					if(this.bussinessCode=="Repleinment"){
+						if(error.includes("库存余额不足")){
+							this.showErrorMessage("没有此物料库存，请核对库存余额与标签是否一致")
+						}else {
+							this.showErrorMessage(error)
+						}
+					}else {
+						this.showErrorMessage(error)
+					}
 				})
 			},
 
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 08974039..37a19d81 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -120,7 +120,11 @@
 			balanceFromInventoryStatuses: { //是否传fromInventoryStatuses
 				type: Boolean,
 				default: true
-			}
+			},
+			fromType: {
+				type: String,
+				default: ""
+			},
 		},
 		data() {
 			return {
@@ -378,9 +382,16 @@
 			//必须有库存
 			mustHavaBalance(datas) {
 				if (datas.length == 0) {
-					this.showErrorMessage(this.getQueryCondition() + '\n未查找到库存记录', res => {
-						this.packGetFocus();
-					})
+					if(this.fromType=="productionReceipt"){
+						this.showErrorMessage("没有此物料收料任务，请联系物流进行发料", res => {
+							this.packGetFocus();
+						})
+					}else {
+						this.showErrorMessage(this.getQueryCondition() + '\n未查找到库存记录', res => {
+							this.packGetFocus();
+						})
+					}
+					
 				} else if (datas.length == 1) {
 					let balance = datas[0];
 					this.packCallBack(balance);
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 99183b38..c5f98325 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -40,7 +40,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' fromType="productionReceipt" ></win-scan-pack-and-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 
 		<comMessage ref="comMessage"></comMessage>
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index cb517066..8e11fa61 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -273,7 +273,7 @@
 				getPurchaseReceiptJobList(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+						that.showMessage('没有此单据' + '【' + code + '】的收货任务,请联系管理员');
 					} else if (res.data.list.length == 1) {
 						that.openJobDetail(res.data.list[0]);
 					} else {
@@ -460,7 +460,7 @@
 								this.selectItem(list[0], result.scanMessage.indexOf('ASN') > -1)
 							}
 						} else {
-							this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
+							this.showMessage("没有此单据收货任务,请联系管理员\n" + "扫描[" + result.scanMessage + "]")
 						}
 					}).catch(error => {
 						this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 9c903838..6c8c1f1d 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -412,7 +412,7 @@
 							}
 
 						} else {
-							this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
+							this.showMessage("没有此物料上架任务,请联系管理员\n" + "扫描[" + result.scanMessage + "]")
 						}
 					}).catch(error => {
 						this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 1487f1f2..ea60a1c5 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -524,6 +524,8 @@
 						})
 
 					} catch (e) {
+						
+						console.log("测试"+e.message)
 						this.showMessage(e.message)
 					}
 				}