From 70b88dec797b1c6d1bf48deb5274a563a7591c0f Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 25 Jun 2024 17:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=BA=93=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/api/index.js                                 |  2 +-
 fe/PDA/common/scan.js                               |  8 ++++----
 .../comRequest/comKittingRequestItem.vue            |  4 ++--
 fe/PDA/mycomponents/common/comDyItemInfo.vue        |  2 +-
 fe/PDA/mycomponents/coms/comUnPacking.vue           |  2 +-
 fe/PDA/mycomponents/coms/request/comInjectIssue.vue |  4 ++--
 fe/PDA/mycomponents/coms/task/comInjectIssue.vue    |  4 ++--
 fe/PDA/mycomponents/popup/selectClickList.vue       |  2 +-
 fe/PDA/pages/task/assembleIssueJobDetailByQty.vue   |  2 +-
 fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue   |  2 +-
 fe/PDA/pages/task/countFgDetail.vue                 |  2 +-
 fe/PDA/pages/task/injectionIssueJobDetailByQty.vue  |  2 +-
 fe/PDA/pages/task/injectionPlanJobDetail.vue        |  4 ++--
 fe/PDA/pages/task/kittingIssueJobDetailByQty.vue    |  2 +-
 fe/PDA/pages/task/sparePartIssueJobDetail.vue       | 10 ++++------
 fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue  |  2 +-
 fe/PDA/pages/task/thirdLocationJobDetail.vue        | 13 ++++++++++---
 fe/PDA/pages/task/unProducePickWipDetail.vue        |  2 +-
 fe/PDA/pages/task/unProduceReturnWipDetail.vue      |  2 +-
 19 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 0067792a5..8d41dae15 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -2053,7 +2053,7 @@ export const kittingIssueRequest = (params) => request(
 		data: params,
 		method: "post"
 	})
-//通过物料号查询收容数
+//通过ERP料号查询收容数
 export const getCountByItemCode = (itemCode) => request(
 	devUrl + "/api/pda/item-container/by-item?itemCode="+itemCode, { //
 		data: {},
diff --git a/fe/PDA/common/scan.js b/fe/PDA/common/scan.js
index 99fdd935e..fe8c1db1c 100644
--- a/fe/PDA/common/scan.js
+++ b/fe/PDA/common/scan.js
@@ -1,7 +1,7 @@
 //解析扫描信息
 //P2251076NAA;L220325;Q2000;N0205183222000006;SS0000066;V02051832;OPO1072;C15;
 //解析规则 
-//P:itemCode 物料号
+//P:itemCode ERP料号
 //L:lot批次
 //Q:qty 数量
 //N:asn 供应商商发货单 ASN
@@ -55,7 +55,7 @@ export function analyseScanInfo(scanMsg) {
 							if (type != "") {
 								scanResult.data.scanType = 'qrcode';
 								switch (type) {
-									case "P": //物料号
+									case "P": //ERP料号
 									case "p":
 										scanResult.data.itemCode = value;
 										break;
@@ -126,7 +126,7 @@ export function analyseScanInfo(scanMsg) {
 //P2250229RAA;L220408;Q100;N62840610;SB0000107;UEA;DU571LS;FA;E2022-4-8
 //P零件号，L批次，Q数量，N生产计划号，S箱码,U计量单位,D生产线，F班次，E日期，M零件名称(待添加)
 //解析规则 
-//P:itemCode 物料号
+//P:itemCode ERP料号
 //L:lot批次
 //Q:qty 数量
 //N:pnumber productionPlanNumber生产计划号
@@ -173,7 +173,7 @@ export function analyseProductLabelInfo(scanMsg) {
 							let value = item.substring(1, item.length);
 							if (type != "") {
 								switch (type) {
-									case "P": //物料号
+									case "P": //ERP料号
 									case "p":
 										scanResult.data.itemCode = value;
 										break;
diff --git a/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue b/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue
index 153b94c63..a171e921c 100644
--- a/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue
+++ b/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue
@@ -9,10 +9,10 @@
 				<text>申请单：{{dataContent.deliverRequestNumber}}</text>
 			</view> -->
 			<view class="label_order" v-if="dataContent.details.length>0">
-				<text>物料号 ：{{dataContent.details[0].itemCode}}</text>
+				<text>ERP料号 ：{{dataContent.details[0].itemCode}}</text>
 			</view>
 			<view class="label_order" v-if="dataContent.details.length>0">
-				<text>物料描述 ：{{dataContent.details[0].itemDesc1}}</text>
+				<text>料号描述 ：{{dataContent.details[0].itemDesc1}}</text>
 			</view>
 			<view class="label_order" v-if="dataContent.details.length>0">
 				<text>位置码 ：{{dataContent.details[0].positionCode}}</text>
diff --git a/fe/PDA/mycomponents/common/comDyItemInfo.vue b/fe/PDA/mycomponents/common/comDyItemInfo.vue
index 026a97b38..e4f3add45 100644
--- a/fe/PDA/mycomponents/common/comDyItemInfo.vue
+++ b/fe/PDA/mycomponents/common/comDyItemInfo.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="device-detail">
 		<view class="list-style">
-			<view class="text-color">物料号:{{dataContent.itemCode}}</view>
+			<view class="text-color">ERP料号:{{dataContent.itemCode}}</view>
 			<view>物料名称:{{dataContent.itemName }}</view>
 			 <view class="uni-flex">
 			 	<view style="-webkit-flex: 1;flex: 1;">箱码: {{dataContent.packingCode}}</view>
diff --git a/fe/PDA/mycomponents/coms/comUnPacking.vue b/fe/PDA/mycomponents/coms/comUnPacking.vue
index 4dd4528f8..72d25b349 100644
--- a/fe/PDA/mycomponents/coms/comUnPacking.vue
+++ b/fe/PDA/mycomponents/coms/comUnPacking.vue
@@ -9,7 +9,7 @@
 					</view>
 				</view>
 				<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">箱码 : {{dataContent.recommendPackingCode}}</view>
-				<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">物料号 : {{dataContent.itemCode}}</view>
+				<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">ERP料号 : {{dataContent.itemCode}}</view>
 				<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">名称 : {{dataContent.itemName}}</view>
 				<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">描述 : {{dataContent.itemDesc1}}</view>
 				<view style="display: flex;  justify-content: center;align-items: center; padding: 6rpx;margin-top: 10rpx;">
diff --git a/fe/PDA/mycomponents/coms/request/comInjectIssue.vue b/fe/PDA/mycomponents/coms/request/comInjectIssue.vue
index 8dd90369f..a8af95edd 100644
--- a/fe/PDA/mycomponents/coms/request/comInjectIssue.vue
+++ b/fe/PDA/mycomponents/coms/request/comInjectIssue.vue
@@ -11,10 +11,10 @@
 				<text>申请单：{{dataContent.deliverRequestNumber}}</text>
 			</view> -->
 			<view class="label_order" v-if="dataContent.details.length>0">
-				<text>物料号 ：{{dataContent.details[0].itemCode}}</text>
+				<text>ERP料号 ：{{dataContent.details[0].itemCode}}</text>
 			</view>
 			<view class="label_order" v-if="dataContent.details.length>0">
-				<text>物料描述 ：{{dataContent.details[0].itemDesc1}}</text>
+				<text>料号描述 ：{{dataContent.details[0].itemDesc1}}</text>
 			</view>
 			<view class="label_order" v-if="dataContent.details.length>0">
 				<text>收容数 ：{{dataContent.details[0].requestQty}} ({{dataContent.details[0].uom}})</text>
diff --git a/fe/PDA/mycomponents/coms/task/comInjectIssue.vue b/fe/PDA/mycomponents/coms/task/comInjectIssue.vue
index 8dd90369f..a8af95edd 100644
--- a/fe/PDA/mycomponents/coms/task/comInjectIssue.vue
+++ b/fe/PDA/mycomponents/coms/task/comInjectIssue.vue
@@ -11,10 +11,10 @@
 				<text>申请单：{{dataContent.deliverRequestNumber}}</text>
 			</view> -->
 			<view class="label_order" v-if="dataContent.details.length>0">
-				<text>物料号 ：{{dataContent.details[0].itemCode}}</text>
+				<text>ERP料号 ：{{dataContent.details[0].itemCode}}</text>
 			</view>
 			<view class="label_order" v-if="dataContent.details.length>0">
-				<text>物料描述 ：{{dataContent.details[0].itemDesc1}}</text>
+				<text>料号描述 ：{{dataContent.details[0].itemDesc1}}</text>
 			</view>
 			<view class="label_order" v-if="dataContent.details.length>0">
 				<text>收容数 ：{{dataContent.details[0].requestQty}} ({{dataContent.details[0].uom}})</text>
diff --git a/fe/PDA/mycomponents/popup/selectClickList.vue b/fe/PDA/mycomponents/popup/selectClickList.vue
index 36441f680..d798e355b 100644
--- a/fe/PDA/mycomponents/popup/selectClickList.vue
+++ b/fe/PDA/mycomponents/popup/selectClickList.vue
@@ -26,7 +26,7 @@
 										 {{item.itemName}}
 									</view>
 									<view class="">
-										<text style="font-size: 32rpx; font-weight: bold;">物料描述 : </text>
+										<text style="font-size: 32rpx; font-weight: bold;">料号描述 : </text>
 										 {{item.itemDesc1}}
 									</view>
 									<view class="" v-if="item.packingCode">
diff --git a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
index c37fa7364..75291ff8b 100644
--- a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
@@ -381,7 +381,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				}
 				this.singCode = result.itemCode
diff --git a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
index 40675fd65..1c49eb552 100644
--- a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
+++ b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
@@ -394,7 +394,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				}
 				this.singCode = result.itemCode
diff --git a/fe/PDA/pages/task/countFgDetail.vue b/fe/PDA/pages/task/countFgDetail.vue
index 758a102fe..abc8baec4 100644
--- a/fe/PDA/pages/task/countFgDetail.vue
+++ b/fe/PDA/pages/task/countFgDetail.vue
@@ -732,7 +732,7 @@
 				}
 				
 				if(temp!=""){
-					this.showMessage("物料号:["+temp.itemCode+"]盘点数量为0,请输入盘点数量")
+					this.showMessage("ERP料号:["+temp.itemCode+"]盘点数量为0,请输入盘点数量")
 					return;
 				}
 				
diff --git a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
index 4f8d58242..dbbe41658 100644
--- a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
@@ -377,7 +377,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				}
 				this.singCode = result.itemCode
diff --git a/fe/PDA/pages/task/injectionPlanJobDetail.vue b/fe/PDA/pages/task/injectionPlanJobDetail.vue
index 46f0d3abe..624f05505 100644
--- a/fe/PDA/pages/task/injectionPlanJobDetail.vue
+++ b/fe/PDA/pages/task/injectionPlanJobDetail.vue
@@ -324,11 +324,11 @@
 				});
 
 				if (item === undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				} else {
 					if (item.scaned) {
-						this.showMessage('物料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
+						this.showMessage('ERP料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
 						return;
 					} else {
 						item.scaned = true;
diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
index 62804bfbe..f2fb8c164 100644
--- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
@@ -380,7 +380,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				}
 				this.singCode = result.itemCode
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetail.vue b/fe/PDA/pages/task/sparePartIssueJobDetail.vue
index a96bd4dfb..08f146142 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetail.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetail.vue
@@ -350,7 +350,7 @@
 				//是否承接
 				//已经承接
 				if (this.datacontent.isClaims) {
-					this.datacontent.jobStatus =2
+					this.datacontent.jobStatus = 2
 					//承接并且承接人是自己显示，不是自己隐藏
 					if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
 						this.showBtn = true
@@ -430,7 +430,7 @@
 							item.handledFromLot = balancesItem.lot
 							item.handledFromWarehouseCode = balancesItem.warehouseCode
 							item.handledFromQty = balancesItem.qty
-							item.handledFromLocationCode =balancesItem.locationCode
+							item.handledFromLocationCode = balancesItem.locationCode
 							item.handleToPackingCodeLocationCode = balancesItem.locationCode
 						} else {
 							showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item
@@ -456,7 +456,7 @@
 										item.handledFromLot = balancesItem.lot
 										item.handledFromWarehouseCode = balancesItem.warehouseCode
 										item.handledFromQty = balancesItem.qty
-										item.handledFromLocationCode =balancesItem.locationCode
+										item.handledFromLocationCode = balancesItem.locationCode
 										item.handleToPackingCodeLocationCode = balancesItem.locationCode
 									}
 								})
@@ -591,9 +591,7 @@
 				finshSparePartIssueJob(that.id, params.id, params)
 					.then(res => {
 						uni.hideLoading();
-						if (res) {
-							that.showCommitSuccessMessage();
-						}
+						that.showCommitSuccessMessage();
 					})
 					.catch(err => {
 						that.showMessage(err.message);
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
index ef6efc0e8..9625a6275 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
@@ -377,7 +377,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				}
 				this.singCode = result.itemCode
diff --git a/fe/PDA/pages/task/thirdLocationJobDetail.vue b/fe/PDA/pages/task/thirdLocationJobDetail.vue
index 07e2bf9da..4bf7f1d30 100644
--- a/fe/PDA/pages/task/thirdLocationJobDetail.vue
+++ b/fe/PDA/pages/task/thirdLocationJobDetail.vue
@@ -9,7 +9,7 @@
 		<view class="" style="background-color: #fff; padding: 20rpx; font-size: 32rpx;">
 			承接人 :{{datacontent.claimsUserName}}
 		</view>
-		<button v-if="showFinishButton" type="primary" @click="finish" style="margin: 20rpx;"> 任务终止</button>
+		<button v-if="showFinishButton" type="primary" @click="finish" style="margin: 20rpx;"> 完成</button>
 
 		<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
 			class="scroll-detail">
@@ -216,6 +216,11 @@
 		methods: {
 			//扫描默认目标库位
 			getDefaultToLocation(locationCode) {
+				if(this.details[0].toLocationCode!=locationCode){
+					this.showMessage("扫描库位["+locationCode+"]与目标库位["+this.details[0].toLocationCode+"]不一致");
+					this.$refs.comCollapseLocation.clearLocation()
+					return;
+				}
 				uni.showLoading({
 					title: "扫描中",
 					mask: true
@@ -225,12 +230,14 @@
 					if (res) {
 						this.toLocationInfo = res
 					} else {
+						this.$refs.comCollapseLocation.clearLocation()
 						this.showMessage('目标库位【' + locationCode + '】不存在');
 					}
 
 				}).catch(err => {
 					uni.hideLoading();
 					this.toLocationInfo = null
+					this.$refs.comCollapseLocation.clearLocation()
 					this.showMessage(err.message);
 
 				})
@@ -356,11 +363,11 @@
 				});
 
 				if (item === undefined) {
-					this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
+					this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
 					return;
 				} else {
 					if (item.scaned) {
-						this.showMessage('物料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
+						this.showMessage('ERP料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
 						return;
 					} else {
 						item.scaned = true;
diff --git a/fe/PDA/pages/task/unProducePickWipDetail.vue b/fe/PDA/pages/task/unProducePickWipDetail.vue
index 061291662..c650df6b1 100644
--- a/fe/PDA/pages/task/unProducePickWipDetail.vue
+++ b/fe/PDA/pages/task/unProducePickWipDetail.vue
@@ -265,7 +265,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的物料号与任务中的物料号不一致,请重新扫描');
+					this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的ERP料号与任务中的ERP料号不一致,请重新扫描');
 					return;
 				}
 				if(item.scaned){
diff --git a/fe/PDA/pages/task/unProduceReturnWipDetail.vue b/fe/PDA/pages/task/unProduceReturnWipDetail.vue
index 04a83083e..757a7dfd7 100644
--- a/fe/PDA/pages/task/unProduceReturnWipDetail.vue
+++ b/fe/PDA/pages/task/unProduceReturnWipDetail.vue
@@ -265,7 +265,7 @@
 				});
 
 				if (item == undefined) {
-					this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的物料号与任务中的物料号不一致,请重新扫描');
+					this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的ERP料号与任务中的ERP料号不一致,请重新扫描');
 					return;
 				}
 				if (item.scaned) {