From f149f349cd63f60370c2b37b72854f54ad218c30 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 11 Jul 2024 17:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/task/assembleIssueJobDetail.vue  |  6 ++---
 .../task/assembleIssueJobDetailByQty.vue      |  6 ++---
 fe/PDA/pages/task/coatingIssuleJobDetail.vue  |  8 +++----
 .../task/coatingIssuleJobDetailByQty.vue      |  6 ++---
 fe/PDA/pages/task/injectionIssueJobDetail.vue |  6 ++---
 .../task/injectionIssueJobDetailByQty.vue     | 24 +++++++++----------
 fe/PDA/pages/task/kittingIssueJobDetail.vue   |  6 ++---
 .../pages/task/kittingIssueJobDetailByQty.vue |  6 ++---
 fe/PDA/pages/task/sparePartIssueJobDetail.vue |  6 ++---
 .../task/sparePartIssueJobDetailByQty.vue     |  6 ++---
 10 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/fe/PDA/pages/task/assembleIssueJobDetail.vue b/fe/PDA/pages/task/assembleIssueJobDetail.vue
index 67bb35c3f..2d31d6d23 100644
--- a/fe/PDA/pages/task/assembleIssueJobDetail.vue
+++ b/fe/PDA/pages/task/assembleIssueJobDetail.vue
@@ -289,9 +289,9 @@
 					return;
 				}
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 			},
 			//加载零件信息
 			getDetail() {
diff --git a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
index 03222982d..500d76782 100644
--- a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
@@ -281,9 +281,9 @@
 				}
 				this.toLocationInfo = locationInfo
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 				current.handledToWarehouseCode = locationInfo.warehouseCode
 				current.handledToPackingCode = ""
 				current.handledToLot = ""
diff --git a/fe/PDA/pages/task/coatingIssuleJobDetail.vue b/fe/PDA/pages/task/coatingIssuleJobDetail.vue
index 20e603e2a..422f98e6b 100644
--- a/fe/PDA/pages/task/coatingIssuleJobDetail.vue
+++ b/fe/PDA/pages/task/coatingIssuleJobDetail.vue
@@ -290,10 +290,10 @@
 						.recommendToLocationCode + "]不一致,请重新扫描")
 					return;
 				}
-				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+		current.handledToLocationCode = locationInfo.code
+		current.handledToLocationArea = locationInfo.areaCode
+		current.handledToLocationGroup = locationInfo.locationGroupCode
+		current.handledToLocationErpCode = locationInfo.erpLocationCode
 			},
 			//加载零件信息
 			getDetail() {
diff --git a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
index aea50e668..28dbc0a63 100644
--- a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
+++ b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
@@ -294,9 +294,9 @@
 				}
 				this.toLocationInfo = locationInfo
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 				current.handledToWarehouseCode = locationInfo.warehouseCode
 				current.handledToPackingCode = ""
 				current.handledToLot = ""
diff --git a/fe/PDA/pages/task/injectionIssueJobDetail.vue b/fe/PDA/pages/task/injectionIssueJobDetail.vue
index f0e61ee14..3d478e26d 100644
--- a/fe/PDA/pages/task/injectionIssueJobDetail.vue
+++ b/fe/PDA/pages/task/injectionIssueJobDetail.vue
@@ -293,9 +293,9 @@
 					return;
 				}
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 			},
 			//加载零件信息
 			getDetail() {
diff --git a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
index 2c0bcfdcb..5cb1e8b55 100644
--- a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
@@ -134,10 +134,10 @@
 
 <script>
 	import {
-		getKittingIssueDetail,
-		takeKittingIssueJob,
-		cancelTakeKittingIssueJob,
-		finshKittingIssueJob,
+		getInjectionIssueDetail,
+		takeInjectionIssueJob,
+		cancelTakeInjectionIssueJob,
+		finshInjectionIssueJob,
 		getCountByItemCode,
 		getRecommendBalance
 	} from '@/api/index.js';
@@ -211,7 +211,7 @@
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
-					cancelTakeKittingIssueJob(this.id).then(res => {}).catch(error => {})
+					cancelTakeInjectionIssueJob(this.id).then(res => {}).catch(error => {})
 				}
 				goHome();
 			} else if (e.index === 1) {
@@ -224,7 +224,7 @@
 			if (e.from == 'backbutton') {
 				if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
 					//取消承接任务	
-					cancelTakeKittingIssueJob(this.id).then(res => {
+					cancelTakeInjectionIssueJob(this.id).then(res => {
 						uni.navigateBack();
 					}).catch(error => {
 						uni.navigateBack();
@@ -278,9 +278,9 @@
 				}
 				this.toLocationInfo = locationInfo
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 				current.handledToWarehouseCode = locationInfo.warehouseCode
 				current.handledToPackingCode = ""
 				current.handledToLot = ""
@@ -298,7 +298,7 @@
 				let params = {
 					id: that.id,
 				};
-				getKittingIssueDetail(params)
+				getInjectionIssueDetail(params)
 					.then(item => {
 						console.log('item', item);
 						that.datacontent = item;
@@ -429,7 +429,7 @@
 				let params = {
 					id: this.id
 				};
-				takeKittingIssueJob(params)
+				takeInjectionIssueJob(params)
 					.then(res => {
 						callback(true);
 					})
@@ -485,7 +485,7 @@
 				that.details[0].handledFromQty = that.details[0].tempHandledToQty
 				that.details[0].handledToQty = that.details[0].tempHandledToQty
 				let params = that.details[0];
-				finshKittingIssueJob(that.id, params.id, params)
+				finshInjectionIssueJob(that.id, params.id, params)
 					.then(res => {
 						uni.hideLoading();
 						if (res != null) {
diff --git a/fe/PDA/pages/task/kittingIssueJobDetail.vue b/fe/PDA/pages/task/kittingIssueJobDetail.vue
index 5a4bcca25..ef3714411 100644
--- a/fe/PDA/pages/task/kittingIssueJobDetail.vue
+++ b/fe/PDA/pages/task/kittingIssueJobDetail.vue
@@ -290,9 +290,9 @@
 					return;
 				}
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 			},
 			//加载零件信息
 			getDetail() {
diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
index 5436e4fcf..a49b4f522 100644
--- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
@@ -280,9 +280,9 @@
 				}
 				this.toLocationInfo = locationInfo
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 				current.handledToWarehouseCode = locationInfo.warehouseCode
 				current.handledToPackingCode = ""
 				current.handledToLot = ""
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetail.vue b/fe/PDA/pages/task/sparePartIssueJobDetail.vue
index 3fc059530..e18d68d9d 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetail.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetail.vue
@@ -288,9 +288,9 @@
 					return;
 				}
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 			},
 			
 			getToLocation(locationCode){
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
index edb49f967..d926c43dd 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
@@ -279,9 +279,9 @@
 				}
 				this.toLocationInfo = locationInfo
 				current.handledToLocationCode = locationInfo.code
-				current.handledToLocationArea = locationInfo.locationArea
-				current.handledToLocationGroup = locationInfo.locationGroup
-				current.handledToLocationErpCode = locationInfo.locationErpCode
+				current.handledToLocationArea = locationInfo.areaCode
+				current.handledToLocationGroup = locationInfo.locationGroupCode
+				current.handledToLocationErpCode = locationInfo.erpLocationCode
 				current.handledToWarehouseCode = locationInfo.warehouseCode
 				current.handledToPackingCode = ""
 				current.handledToLot = ""