From 2f89f1a25cd47ed2f302b14b58527b6af11173cb Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 26 Jun 2024 15:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E6=A0=A1=E9=AA=8C=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winCheckFgLabel.vue             |  1 -
 src/mycomponents/scan/winScanLocation.vue             |  4 ++++
 src/mycomponents/scan/winScanPackAndLocation.vue      |  4 ++++
 .../scan/winScanPackAndLocationNoBalance.vue          |  4 ++++
 src/mycomponents/scan/winScanPackJob.vue              |  1 -
 src/pages/customerReturn/job/returnDetail.vue         |  1 -
 src/pages/deliver/coms/comDeliverRequestPopup.vue     |  1 -
 src/pages/deliver/job/deliverDetail.vue               |  1 -
 src/pages/inventoryMove/coms/comMoveRecord.vue        |  4 ++++
 src/pages/inventoryMove/job/inventoryMoveDetail.vue   | 11 -----------
 src/pages/issue/coms/comIssueRequestPopup.vue         |  1 -
 src/pages/productPutaway/job/productPutawayDetail.vue |  1 -
 .../productRecycle/job/productRecycleJobDetail.vue    |  1 -
 .../productionReceipt/job/productionReceiptDetail.vue |  1 -
 .../productionReturn/coms/comReturnRequestPopup.vue   |  1 -
 src/pages/purchaseReturn/job/returnDetail.vue         |  1 -
 src/pages/putaway/job/putawayDetail.vue               |  1 -
 src/pages/repleinsh/coms/comRepleinshRequestPopup.vue |  1 -
 src/pages/stockUp/job/stockUpJobDetail.vue            |  1 -
 src/pages/transfer/job/issueDetail.vue                |  1 -
 src/pages/transfer/job/receiptDetail.vue              |  1 -
 src/pages/transfer/job/transferDetail.vue             | 11 -----------
 22 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/src/mycomponents/scan/winCheckFgLabel.vue b/src/mycomponents/scan/winCheckFgLabel.vue
index de831830..41622a0a 100644
--- a/src/mycomponents/scan/winCheckFgLabel.vue
+++ b/src/mycomponents/scan/winCheckFgLabel.vue
@@ -44,7 +44,6 @@
 	} from '@/common/balance.js';
 
 	import {
-		getBasicLocationByCode,
 		getCustomerItemList
 	} from '@/api/request2.js';
 
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 8b0ae440..a43cc3be 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -108,6 +108,10 @@
 					uni.hideLoading();
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
+						if(result.code!=this.code){
+							this.showErrorMessage('未查询到库位[' + this.code + ']')
+							return;
+						}
 						var type = result.type;
 						var areaType = result.areaType
 						var available = result.available;
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 18c69860..30f9daf1 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -247,6 +247,10 @@
 				getBasicLocationByCode(this.fromLocationCode).then(res => {
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
+						if(result.code!=this.fromLocationCode){
+							this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']')
+							return;
+						}
 						var type = result.areaType;
 						var available = result.available;
 						if (available == "TRUE") {
diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
index 216f6dcd..843346f0 100644
--- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
+++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
@@ -198,6 +198,10 @@
 				getBasicLocationByCode(this.fromLocationCode).then(res => {
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
+						if(result.code!=this.fromLocationCode){
+							this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']')
+							return;
+						}
 						var type = result.type;
 						var available = result.available;
 						if (available == "TRUE") {
diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue
index 3fbb6e07..e0b66aad 100644
--- a/src/mycomponents/scan/winScanPackJob.vue
+++ b/src/mycomponents/scan/winScanPackJob.vue
@@ -29,7 +29,6 @@
 	} from '@/common/balance.js';
 
 	import {
-		getBasicLocationByCode,
 		getPutawayJobList
 	} from '@/api/request2.js';
 
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 7d3cf5a3..070a6bee 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -43,7 +43,6 @@
 
 	import {
 		getCustomerReturnJobDetail,
-		getBasicLocationByCode,
 		takeCustomerReturnJob,
 		cancleTakeCustomerReturnJob,
 		customerReturnJobSubmit
diff --git a/src/pages/deliver/coms/comDeliverRequestPopup.vue b/src/pages/deliver/coms/comDeliverRequestPopup.vue
index 14e332b3..30a55974 100644
--- a/src/pages/deliver/coms/comDeliverRequestPopup.vue
+++ b/src/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -70,7 +70,6 @@
 
 <script>
 	import {
-		getBasicLocationByCode,
 		getBasicItemByCode,
 		getProductionlineItem,
 		getWorkShopLineStation,
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index ff86d8dc..5f084215 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -55,7 +55,6 @@
 <script>
 	import {
 		getDeliverDetail,
-		getBasicLocationByCode,
 		takeDeliverJob,
 		cancleTakeDeliverJob,
 		deliverJobSubmit
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 27afcb68..cb623c69 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -189,6 +189,10 @@
 					getBasicLocationByCode(this.toLocationCode).then(res => {
 						if (res.data.total > 0) {
 							let result = res.data.list[0];
+							if(result.code!=this.toLocationCode){
+								this.showErrorMessage('未查询到库位[' + this.toLocationCode + ']')
+								return;
+							}
 							var type = result.type;
 							var available = result.available;
 							if (available == "TRUE") {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 4f74e230..e7c3c78e 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -43,7 +43,6 @@
 <script>
 	import {
 		getInventoryMoveJobDetail,
-		getBasicLocationByCode,
 		takeInventoryMoveJob,
 		cancleTakeInventoryMoveJob,
 		inventoryMoveSubmit
@@ -464,16 +463,6 @@
 				return this.jobContent;
 			},
 
-
-
-			getLocationInfo(locationCode) {
-				getBasicLocationByCode(locationCode).then(res => {
-					if (res.data.list.length > 0) {
-						this.toLocationInfo = res.data.list[0]
-					}
-				})
-			},
-
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index 33d04731..41628e0b 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -85,7 +85,6 @@
 
 <script>
 	import {
-		getBasicLocationByCode,
 		getBasicItemByCode,
 		getProductionlineItem,
 		getWorkShopLineStation,
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index e12bb587..50b15b5c 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -49,7 +49,6 @@
 	} from '@/common/balance.js';
 
 	import {
-		getBasicLocationByCode,
 		getProductPutawayJobDetail,
 		takeProductPutawayJob,
 		cancleTakeProductPutawayJob,
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index d2c61ed3..e86247e8 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -42,7 +42,6 @@
 
 <script>
 	import {
-		getBasicLocationByCode,
 		getProductRecycleDetail,
 		productRecycleJobsubmit,
 		cancleTakeProductRecycleJob,
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index a65e7ab5..24e6a41d 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -53,7 +53,6 @@
 
 	import {
 		getProductionReceiptJobDetail,
-		getBasicLocationByCode,
 		takeProductionReceiptJob,
 		cancleTakeProductionReceiptJob,
 		productionReceiptJobSubmit,
diff --git a/src/pages/productionReturn/coms/comReturnRequestPopup.vue b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
index 0484cdc0..3c614434 100644
--- a/src/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -74,7 +74,6 @@
 
 <script>
 	import {
-		getBasicLocationByCode,
 		getBasicItemByCode,
 		getProductionlineItem,
 		getWorkShopLineStation
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 4f31b7bb..cc79e8b1 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -43,7 +43,6 @@
 
 <script>
 	import {
-		getBasicLocationByCode,
 		getPurchasereturnJobDetail,
 		purchaseReturnJobsubmit,
 		cancleTakePurchasereturnJob,
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index cb004393..fb5fe645 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -55,7 +55,6 @@
 
 	import {
 		getPutawayJobDetail,
-		getBasicLocationByCode,
 		putawayJobSubmit,
 		takePutawayJob,
 		cancleTakePutawayJob,
diff --git a/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
index 9c37d050..e87b881e 100644
--- a/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
+++ b/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -78,7 +78,6 @@
 
 <script>
 	import {
-		getBasicLocationByCode,
 		getBasicItemByCode,
 		getProductionlineItem,
 		getWorkShopLineStation
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index b9d7ad26..5f25e869 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -64,7 +64,6 @@
 <script>
 	import {
 		getStockUpJobDetail,
-		getBasicLocationByCode,
 		takeStockUpJob,
 		cancleTakeStockUpJob,
 		stockUpJobsubmit
diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue
index f2c8810f..9cdb3a7f 100644
--- a/src/pages/transfer/job/issueDetail.vue
+++ b/src/pages/transfer/job/issueDetail.vue
@@ -49,7 +49,6 @@
 	} from '@/common/balance.js';
 	import {
 		getTransferIssueJobDetail,
-		getBasicLocationByCode,
 		takeTransferIssueJob,
 		cancleTakeTransferIssueJob,
 		transferIssueJobSubmit
diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue
index a54da83b..9fb525bc 100644
--- a/src/pages/transfer/job/receiptDetail.vue
+++ b/src/pages/transfer/job/receiptDetail.vue
@@ -51,7 +51,6 @@
 <script>
 	import {
 		getTransferReceiptJobDetail,
-		getBasicLocationByCode,
 		cancleTakeTransferReceiptJob,
 		takeTransferReceiptJob,
 		transferReceiptJobSubmit
diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue
index 80d09e57..2333097b 100644
--- a/src/pages/transfer/job/transferDetail.vue
+++ b/src/pages/transfer/job/transferDetail.vue
@@ -46,9 +46,6 @@
 		submitPurchaseReturnJob,
 		getInventoryMoveJobDetail,
 	} from '@/api/request.js';
-	import {
-		getBasicLocationByCode
-	} from '@/api/request2.js';
 
 	import {
 		calc
@@ -494,14 +491,6 @@
 				return params;
 			},
 
-			getLocationInfo(locationCode) {
-				getBasicLocationByCode(locationCode).then(res => {
-					if (res.data.list.length > 0) {
-						this.toLocationInfo = res.data.list[0]
-					}
-				})
-			},
-
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {