From 48f784bbbe3d04cf2f992a6554911b03aa2d2ce3 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 3 Jun 2024 10:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=B7=A5=E8=BD=AC?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/api/index.js                           | 17 ++++++----
 fe/PDA/mycomponents/comItem/comBaseItem.vue   |  2 +-
 fe/PDA/mycomponents/comItem/comBottomItem.vue |  2 +-
 fe/PDA/mycomponents/comItem/comItemTop.vue    |  2 +-
 fe/PDA/mycomponents/comItem/comTopItem.vue    |  2 +-
 fe/PDA/mycomponents/coms/comProductItem.vue   |  2 +-
 .../coms/return/comReturnDetail.vue           |  2 +-
 .../mycomponents/coms/task/comScanPutaway.vue |  4 +--
 fe/PDA/mycomponents/dycom/dyItemInfo.vue      |  2 +-
 fe/PDA/mycomponents/popup/selectClickList.vue |  2 +-
 .../mycomponents/return/comReturnDetail.vue   |  2 +-
 fe/PDA/mycomponents/scan/comScanCreateTp.vue  |  2 +-
 fe/PDA/mycomponents/scan/comScanDeliverFg.vue |  2 +-
 fe/PDA/mycomponents/scan/comScanDeliverTf.vue |  2 +-
 fe/PDA/mycomponents/scan/comScanHold.vue      |  2 +-
 fe/PDA/mycomponents/scan/comScanPutaway.vue   |  2 +-
 fe/PDA/mycomponents/scan/comScanReplen.vue    |  8 ++---
 .../mycomponents/scan/comScanSemiPutaway.vue  |  2 +-
 fe/PDA/mycomponents/scan/comScanUnpick.vue    |  2 +-
 .../wincom/winScanByProductCode.vue           |  3 +-
 .../pages/container/containerMoveDetail.vue   |  2 +-
 fe/PDA/pages/cotaing/coatingTransfer.vue      |  2 +-
 .../injectionInventoryMoveDetail.vue          |  2 +-
 fe/PDA/pages/injection/injectionTransfer.vue  | 22 ++++++++----
 fe/PDA/pages/inventory/comTransfer.vue        |  2 +-
 fe/PDA/pages/inventory/merge.vue              |  2 +-
 .../inventory/productionReturn_detail.vue     |  2 +-
 .../pages/inventory/transferIssue_detail.vue  |  2 +-
 .../inventory/transferReceipt_detail.vue      |  2 +-
 fe/PDA/pages/putaway/purchasePutaway.vue      |  2 +-
 fe/PDA/pages/putaway/semiPutaway.vue          |  2 +-
 fe/PDA/pages/query/item.vue                   |  2 +-
 fe/PDA/pages/query/location.vue               |  2 +-
 .../record/completeInventoryTransfer.vue      |  2 +-
 fe/PDA/pages/record/productionReturn.vue      |  2 +-
 .../purchaseReturnRequestApprove_detail.vue   |  2 +-
 fe/PDA/pages/spray/sprayCompleteReceive.vue   |  2 +-
 fe/PDA/pages/store/deliverRaw.vue             |  2 +-
 fe/PDA/pages/store/issueDirect.vue            |  2 +-
 fe/PDA/pages/store/receipt.vue                |  2 +-
 fe/PDA/pages/store/recycle.vue                |  2 +-
 fe/PDA/pages/store/tjRecycle.vue              |  2 +-
 fe/PDA/pages/task/Inspect.vue                 |  6 ++--
 fe/PDA/pages/task/Inspect_result.vue          |  2 +-
 fe/PDA/pages/task/count.vue                   |  2 +-
 fe/PDA/pages/task/countByLocation.vue         |  2 +-
 fe/PDA/pages/task/countFg.vue                 |  2 +-
 fe/PDA/pages/task/countFgDetail.vue           |  2 +-
 fe/PDA/pages/task/countRaw.vue                |  2 +-
 fe/PDA/pages/task/countRawDetail.vue          |  2 +-
 fe/PDA/pages/task/count_detail.vue            |  2 +-
 fe/PDA/pages/task/count_result.vue            |  2 +-
 fe/PDA/pages/task/deliverBoard_detail.vue     |  2 +-
 fe/PDA/pages/task/deliver_detail.vue          |  2 +-
 fe/PDA/pages/task/inventoryMoveJobDetail.vue  |  2 +-
 fe/PDA/pages/task/issue_detail.vue            | 34 +++++++++----------
 fe/PDA/pages/task/putaway.vue                 |  2 +-
 fe/PDA/pages/task/putawayjob.vue              |  2 +-
 fe/PDA/pages/task/receipt_check.vue           |  2 +-
 fe/PDA/pages/task/unProducePickDetail.vue     | 26 +++++++-------
 fe/PDA/pages/task/unProduceReturnDetail.vue   | 24 ++++++-------
 61 files changed, 131 insertions(+), 117 deletions(-)

diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 77036531d..710595e35 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -133,7 +133,7 @@ export const getBalanceRemoveInAndOut = (params) => request(
 		data: params,
 		method: "post"
 	})
-//通过零件号和库位查询库存，去除预计出
+//通过ERP料号和库位查询库存，去除预计出
 export const getRecommendBalanceByLocationAsync = (params,itemCode,isPackingCode) => promise(
 	devUrl + "/api/pda/inventory/balances/get-recommend-balance-by-locations?itemCode="+itemCode+"&isPackingCode="+isPackingCode,{ //
 		data: params,
@@ -201,8 +201,13 @@ export const getBalancesExpectByFilter = (params) => request(
 		method: 'post',
 		data: params
 	});
-
-//
+// ERP料号模糊匹配查询库存
+export const getBalancesByItemCode = (params) => request(
+	devUrl + "/api/pda/get-fuzzy-by-balances-request-many-parameter", {
+		method: 'post',
+		data: params
+	});
+	
 
 //根据库位查询库存
 export const getBalancesByStatus = (params) => request(
@@ -211,7 +216,7 @@ export const getBalancesByStatus = (params) => request(
 		data: params
 	});
 
-//根据库位和零件号查询库存
+//根据库位和ERP料号查询库存
 export const getBalancesByLocationAndItem = (params) => request(
 	devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode +
 	"&itemCode=" + params.itemCode, {
@@ -220,7 +225,7 @@ export const getBalancesByLocationAndItem = (params) => request(
 	});
 
 
-//根据库位和零件号查询库存
+//根据库位和ERP料号查询库存
 export const getBalancesByLocationAndItemAsync = (params) => promise(
 	devUrl + "/api/pda/inventory/balances/get-by-location-and-item?locationCode=" + params.locationCode +
 	"&itemCode=" + params.itemCode, {
@@ -253,7 +258,7 @@ export const getitems = (code) => request(
 	});
 	
 //
-//查询单件码 通过单件码查询零件号信息
+//查询单件码 通过单件码查询ERP料号信息
 export const getMesBarCode = (mesBarCode) => request(
 	devUrl + "/api/pda/store/product-receipt/get-itemcode-by-mesbarcode?mesBarCode=" + mesBarCode, {
 		method: 'post',
diff --git a/fe/PDA/mycomponents/comItem/comBaseItem.vue b/fe/PDA/mycomponents/comItem/comBaseItem.vue
index 6383b2c4e..729231e67 100644
--- a/fe/PDA/mycomponents/comItem/comBaseItem.vue
+++ b/fe/PDA/mycomponents/comItem/comBaseItem.vue
@@ -1,5 +1,5 @@
 <!-- 零件基础信息卡片包括:
-零件号、名称、描述、数量和单位
+ERP料号、名称、描述、数量和单位
 箱码、批次、库位、状态
 可以通过属性控制库位和状态是否显示 -->
 <template>
diff --git a/fe/PDA/mycomponents/comItem/comBottomItem.vue b/fe/PDA/mycomponents/comItem/comBottomItem.vue
index 3011a4f1f..98d5fc729 100644
--- a/fe/PDA/mycomponents/comItem/comBottomItem.vue
+++ b/fe/PDA/mycomponents/comItem/comBottomItem.vue
@@ -1,5 +1,5 @@
 <!-- 零件基础信息卡片包括:
-零件号、名称、描述、数量和单位
+ERP料号、名称、描述、数量和单位
 箱码、批次、库位、状态
 可以通过属性控制库位和状态是否显示 -->
 <template>
diff --git a/fe/PDA/mycomponents/comItem/comItemTop.vue b/fe/PDA/mycomponents/comItem/comItemTop.vue
index 25e71461d..6cc1d8a98 100644
--- a/fe/PDA/mycomponents/comItem/comItemTop.vue
+++ b/fe/PDA/mycomponents/comItem/comItemTop.vue
@@ -1,5 +1,5 @@
 <!-- 零件基础信息卡片包括:
-零件号、名称、描述、数量和单位
+ERP料号、名称、描述、数量和单位
 箱码、批次、库位、状态
 可以通过属性控制库位和状态是否显示 -->
 <template>
diff --git a/fe/PDA/mycomponents/comItem/comTopItem.vue b/fe/PDA/mycomponents/comItem/comTopItem.vue
index 3011a4f1f..98d5fc729 100644
--- a/fe/PDA/mycomponents/comItem/comTopItem.vue
+++ b/fe/PDA/mycomponents/comItem/comTopItem.vue
@@ -1,5 +1,5 @@
 <!-- 零件基础信息卡片包括:
-零件号、名称、描述、数量和单位
+ERP料号、名称、描述、数量和单位
 箱码、批次、库位、状态
 可以通过属性控制库位和状态是否显示 -->
 <template>
diff --git a/fe/PDA/mycomponents/coms/comProductItem.vue b/fe/PDA/mycomponents/coms/comProductItem.vue
index 83c49bff0..48e3e930e 100644
--- a/fe/PDA/mycomponents/coms/comProductItem.vue
+++ b/fe/PDA/mycomponents/coms/comProductItem.vue
@@ -1,5 +1,5 @@
 <!-- 产品信息卡片包括:
-零件号、名称、描述、数量和单位
+ERP料号、名称、描述、数量和单位
 箱码、批次、库位、状态
 可以通过属性控制库位和状态是否显示 -->
 <template>
diff --git a/fe/PDA/mycomponents/coms/return/comReturnDetail.vue b/fe/PDA/mycomponents/coms/return/comReturnDetail.vue
index 71fe0b4d2..c11881113 100644
--- a/fe/PDA/mycomponents/coms/return/comReturnDetail.vue
+++ b/fe/PDA/mycomponents/coms/return/comReturnDetail.vue
@@ -4,7 +4,7 @@
 		<view class="choose_main">
 			<view class="ljh_box">
 				<view class="uni-flex uni-row space-between">
-					<view class="text-itemcode">零件号:{{ returnDetail.itemCode }}</view>
+					<view class="text-itemcode">ERP料号:{{ returnDetail.itemCode }}</view>
 				</view>
 				<view class="label_order">
 					<image class="icon_normal" src="@/static/icons_ui/icon_asn.svg"></image>
diff --git a/fe/PDA/mycomponents/coms/task/comScanPutaway.vue b/fe/PDA/mycomponents/coms/task/comScanPutaway.vue
index a4c8015ad..6f1e29f06 100644
--- a/fe/PDA/mycomponents/coms/task/comScanPutaway.vue
+++ b/fe/PDA/mycomponents/coms/task/comScanPutaway.vue
@@ -128,7 +128,7 @@
 				if (this.active == 0) //库位
 				{
 					this.scanLocation(result.data.code);
-				} else //零件号
+				} else //ERP料号
 				{
 					this.scanItem(result.data.code);
 				}
@@ -212,7 +212,7 @@
 			},
 
 			async getItemInfo(itemCode) {
-				//按零件号查询零件
+				//按ERP料号查询零件
 				let that = this;
 				let itemInfo = await getItemAsync(itemCode);
 				if (itemInfo != null) {} else {
diff --git a/fe/PDA/mycomponents/dycom/dyItemInfo.vue b/fe/PDA/mycomponents/dycom/dyItemInfo.vue
index 6279f0afb..66c3524c9 100644
--- a/fe/PDA/mycomponents/dycom/dyItemInfo.vue
+++ b/fe/PDA/mycomponents/dycom/dyItemInfo.vue
@@ -4,7 +4,7 @@
 		<view class="choose_main">
 				<view class="ljh_box">
 					<view class="uni-flex uni-row space-between">
-						<view class="text-itemcode">零件号:{{ dataContent.itemCode }}</view>
+						<view class="text-itemcode">ERP料号:{{ dataContent.itemCode }}</view>
 					</view>
 					<view class="uni-flex space-between">
 						<view class="ljh_left desc_ljh">
diff --git a/fe/PDA/mycomponents/popup/selectClickList.vue b/fe/PDA/mycomponents/popup/selectClickList.vue
index a7ffbf5b9..36441f680 100644
--- a/fe/PDA/mycomponents/popup/selectClickList.vue
+++ b/fe/PDA/mycomponents/popup/selectClickList.vue
@@ -18,7 +18,7 @@
 								</view>
 								<view class="" style="font-size: 32rpx;">
 									<view class="" >
-										<text style="font-size: 32rpx; font-weight: bold;">物料代码 :</text>
+										<text style="font-size: 32rpx; font-weight: bold;">ERP料号 :</text>
 										 {{item.itemCode}}
 									</view>
 									<view class="">
diff --git a/fe/PDA/mycomponents/return/comReturnDetail.vue b/fe/PDA/mycomponents/return/comReturnDetail.vue
index 71fe0b4d2..c11881113 100644
--- a/fe/PDA/mycomponents/return/comReturnDetail.vue
+++ b/fe/PDA/mycomponents/return/comReturnDetail.vue
@@ -4,7 +4,7 @@
 		<view class="choose_main">
 			<view class="ljh_box">
 				<view class="uni-flex uni-row space-between">
-					<view class="text-itemcode">零件号:{{ returnDetail.itemCode }}</view>
+					<view class="text-itemcode">ERP料号:{{ returnDetail.itemCode }}</view>
 				</view>
 				<view class="label_order">
 					<image class="icon_normal" src="@/static/icons_ui/icon_asn.svg"></image>
diff --git a/fe/PDA/mycomponents/scan/comScanCreateTp.vue b/fe/PDA/mycomponents/scan/comScanCreateTp.vue
index f319934ed..38cb24b6f 100644
--- a/fe/PDA/mycomponents/scan/comScanCreateTp.vue
+++ b/fe/PDA/mycomponents/scan/comScanCreateTp.vue
@@ -139,7 +139,7 @@
 				if (this.active == 0) //托标签
 				{
 					this.scanContainer(result);
-				} else //零件号
+				} else //ERP料号
 				{
 					this.scanPack(result);
 				}
diff --git a/fe/PDA/mycomponents/scan/comScanDeliverFg.vue b/fe/PDA/mycomponents/scan/comScanDeliverFg.vue
index 6a502dd1e..c40a9b70d 100644
--- a/fe/PDA/mycomponents/scan/comScanDeliverFg.vue
+++ b/fe/PDA/mycomponents/scan/comScanDeliverFg.vue
@@ -157,7 +157,7 @@
 				let that = this;
 				if (result.data != null) {
 					that.scanData = result.data;
-					//按照零件号+箱码+批次去重
+					//按照ERP料号+箱码+批次去重
 					let datas = that.itemList.filter(function(r) {
 						if (r.itemCode === result.data.itemCode &&
 							r.lot === result.data.lot &&
diff --git a/fe/PDA/mycomponents/scan/comScanDeliverTf.vue b/fe/PDA/mycomponents/scan/comScanDeliverTf.vue
index 04fb73103..4e7dfa286 100644
--- a/fe/PDA/mycomponents/scan/comScanDeliverTf.vue
+++ b/fe/PDA/mycomponents/scan/comScanDeliverTf.vue
@@ -146,7 +146,7 @@
 				let that = this;
 				if (result.data != null) {
 					that.scanData = result.data;
-					//按照零件号+箱码+批次去重
+					//按照ERP料号+箱码+批次去重
 					let datas = that.itemList.filter(r => {
 						return r.itemCode === result.data.itemCode &&
 							r.lot === result.data.lot &&
diff --git a/fe/PDA/mycomponents/scan/comScanHold.vue b/fe/PDA/mycomponents/scan/comScanHold.vue
index 40374e7a7..811511e6a 100644
--- a/fe/PDA/mycomponents/scan/comScanHold.vue
+++ b/fe/PDA/mycomponents/scan/comScanHold.vue
@@ -143,7 +143,7 @@
 				};
 
 				if (result.data.itemCode == null || result.data.itemCode == undefined) {
-					this.showMessage('未解析到零件号信息');
+					this.showMessage('未解析到ERP料号信息');
 					return;
 				}
 				that.scanResult = result;
diff --git a/fe/PDA/mycomponents/scan/comScanPutaway.vue b/fe/PDA/mycomponents/scan/comScanPutaway.vue
index 064083665..c322b717b 100644
--- a/fe/PDA/mycomponents/scan/comScanPutaway.vue
+++ b/fe/PDA/mycomponents/scan/comScanPutaway.vue
@@ -133,7 +133,7 @@
 				if (this.active == 0) //库位
 				{
 					this.scanLocation(result.data.code);
-				} else //零件号
+				} else //ERP料号
 				{
 					this.scanItem(result);
 				}
diff --git a/fe/PDA/mycomponents/scan/comScanReplen.vue b/fe/PDA/mycomponents/scan/comScanReplen.vue
index 849a6de14..51646d7a3 100644
--- a/fe/PDA/mycomponents/scan/comScanReplen.vue
+++ b/fe/PDA/mycomponents/scan/comScanReplen.vue
@@ -119,7 +119,7 @@
 				if (this.active == 0) //库位
 				{
 					this.scanProdLine(result);
-				} else //零件号
+				} else //ERP料号
 				{
 					this.scanItem(result);
 				}
@@ -159,7 +159,7 @@
 				this.scanPlaceholder = '扫描零件';
 			},
 
-			//扫描零件号
+			//扫描ERP料号
 			scanItem(result) {
 				let itemCode = '';
 				if (result.data.scanType === 'qrcode') {
@@ -169,7 +169,7 @@
 				}
 
 				if (itemCode === null || itemCode === '') {
-					this.showMessage('未解析到零件号');
+					this.showMessage('未解析到ERP料号');
 					return;
 				} else {
 					let that = this;
@@ -190,7 +190,7 @@
 			},
 
 			async getItemInfo(itemCode) {
-				//按零件号查询零件
+				//按ERP料号查询零件
 				let that = this;
 				uni.showLoading({
 					title: '加载中',
diff --git a/fe/PDA/mycomponents/scan/comScanSemiPutaway.vue b/fe/PDA/mycomponents/scan/comScanSemiPutaway.vue
index e317fd880..240c09cd1 100644
--- a/fe/PDA/mycomponents/scan/comScanSemiPutaway.vue
+++ b/fe/PDA/mycomponents/scan/comScanSemiPutaway.vue
@@ -300,7 +300,7 @@
 
 					let balanceRes = await getBalancesByLocationAndItemAsync(params);
 					if (balanceRes.length == 0) {
-						that.showMessage('按库位和零件号[' + that.fromLocation.code + ',' + label.itemCode + ']未查找到库存信息');
+						that.showMessage('按库位和ERP料号[' + that.fromLocation.code + ',' + label.itemCode + ']未查找到库存信息');
 					} else {
 						let balanceItem = balanceRes[0];
 						let item = {
diff --git a/fe/PDA/mycomponents/scan/comScanUnpick.vue b/fe/PDA/mycomponents/scan/comScanUnpick.vue
index 2214a2dd4..b2c2f76d1 100644
--- a/fe/PDA/mycomponents/scan/comScanUnpick.vue
+++ b/fe/PDA/mycomponents/scan/comScanUnpick.vue
@@ -109,7 +109,7 @@
 				if (this.active == 0) //托标签
 				{
 					this.scanContainer(result);
-				} else //零件号
+				} else //ERP料号
 				{
 					this.scanPack(result);
 				}
diff --git a/fe/PDA/mycomponents/wincom/winScanByProductCode.vue b/fe/PDA/mycomponents/wincom/winScanByProductCode.vue
index e4743dde9..e1e25f154 100644
--- a/fe/PDA/mycomponents/wincom/winScanByProductCode.vue
+++ b/fe/PDA/mycomponents/wincom/winScanByProductCode.vue
@@ -89,7 +89,8 @@
 									itemDesc1:item.itemDesc1,
 									stdPackQty: item.stdPackQty,
 									uom: item.uom,
-									qty:item.qty
+									qty:item.qty,
+									locationCode:item.locationCode
 								};
 								uni.hideLoading();
 								this.callBack();
diff --git a/fe/PDA/pages/container/containerMoveDetail.vue b/fe/PDA/pages/container/containerMoveDetail.vue
index 116932b34..c7b93a11c 100644
--- a/fe/PDA/pages/container/containerMoveDetail.vue
+++ b/fe/PDA/pages/container/containerMoveDetail.vue
@@ -232,7 +232,7 @@
 						return;
 					}
 				}
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 1000,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/cotaing/coatingTransfer.vue b/fe/PDA/pages/cotaing/coatingTransfer.vue
index 69f63b942..b507af8b4 100644
--- a/fe/PDA/pages/cotaing/coatingTransfer.vue
+++ b/fe/PDA/pages/cotaing/coatingTransfer.vue
@@ -16,7 +16,7 @@
 
 						<uni-table border stripe style="">
 							<!-- <uni-tr>
-								<uni-td align="center">物品代码</uni-td>
+								<uni-td align="center">ERP料号</uni-td>
 								<uni-td>{{item.itemCode}}</uni-td>
 							</uni-tr> -->
 							<uni-tr>
diff --git a/fe/PDA/pages/injection/injectionInventoryMoveDetail.vue b/fe/PDA/pages/injection/injectionInventoryMoveDetail.vue
index 6e55c0111..7c60f0990 100644
--- a/fe/PDA/pages/injection/injectionInventoryMoveDetail.vue
+++ b/fe/PDA/pages/injection/injectionInventoryMoveDetail.vue
@@ -232,7 +232,7 @@
 						return;
 					}
 				}
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 1000,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/injection/injectionTransfer.vue b/fe/PDA/pages/injection/injectionTransfer.vue
index 75a90c845..4ad2b3d9d 100644
--- a/fe/PDA/pages/injection/injectionTransfer.vue
+++ b/fe/PDA/pages/injection/injectionTransfer.vue
@@ -16,7 +16,7 @@
 
 						<uni-table border stripe style="">
 							<!-- <uni-tr>
-								<uni-td align="center">物品代码</uni-td>
+								<uni-td align="center">ERP料号</uni-td>
 								<uni-td>{{item.itemCode}}</uni-td>
 							</uni-tr> -->
 							<uni-tr>
@@ -201,7 +201,7 @@
 						stdPackQty: result.stdPackQty,
 						uom: result.uom,
 						qty: result.stdPackQty,
-						fromLocationCode: "ZPCP1",
+						fromLocationCode: result.locationCode,
 						fromStatus: 2,
 						toStatus:2
 					}
@@ -240,16 +240,22 @@
 				});
 				let that = this;
 				locations(code).then(res => {
-					if (res == null) {
+					uni.hideLoading();
+					if(res){
+						//不要待检、隔离、在途、
+						if(res.type==1||res.type==6||res.type==13){
+							that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
+						}else {
+							that.toLocationCode = code;
+							that.toLocationErpCode = res.erpLocationCode;
+						}
+					}else {
 						that.toLocationCode = ''
 						that.showMessage('目标库位【' + code + '】不存在');
 						this.$refs.location.clearLocation()
 						this.locationGotFocus = true;
-					} else {
-						that.toLocationCode = code;
-						that.toLocationErpCode = res.erpLocationCode;
 					}
-					uni.hideLoading();
+					
 				}).catch(err => {
 					that.toLocationCode = ''
 					this.locationGotFocus = true;
@@ -322,6 +328,8 @@
 								that.showMessage(err.message);
 								uni.hideLoading();
 							});
+					}else {
+						that.showMessage("库位["+this.itemList[0].fromLocationCode+"]不存在");
 					}
 				})
 
diff --git a/fe/PDA/pages/inventory/comTransfer.vue b/fe/PDA/pages/inventory/comTransfer.vue
index 431616d9f..040e4a212 100644
--- a/fe/PDA/pages/inventory/comTransfer.vue
+++ b/fe/PDA/pages/inventory/comTransfer.vue
@@ -162,7 +162,7 @@
 					mask: true
 				})
 				let that = this;
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/inventory/merge.vue b/fe/PDA/pages/inventory/merge.vue
index 9e5b02e05..046d75c31 100644
--- a/fe/PDA/pages/inventory/merge.vue
+++ b/fe/PDA/pages/inventory/merge.vue
@@ -121,7 +121,7 @@
 					return;
 				}
 				if (result.data.itemCode === null) {
-					this.showMessage('请包含零件号');
+					this.showMessage('请包含ERP料号');
 					return;
 				}
 				//判断是否重复扫描
diff --git a/fe/PDA/pages/inventory/productionReturn_detail.vue b/fe/PDA/pages/inventory/productionReturn_detail.vue
index e4e87aede..1b8aff36e 100644
--- a/fe/PDA/pages/inventory/productionReturn_detail.vue
+++ b/fe/PDA/pages/inventory/productionReturn_detail.vue
@@ -10,7 +10,7 @@
 					<view class="choose_main">
 						<view class="ljh_box">
 							<view class="uni-flex uni-row space-between">
-								<view class="text-itemcode">零件号:{{ item.itemCode }}</view>
+								<view class="text-itemcode">ERP料号:{{ item.itemCode }}</view>
 							</view>
 							<view class="label_order">
 								<image class="icon_normal" src="@/static/icons_ui/icon_asn.svg"></image>
diff --git a/fe/PDA/pages/inventory/transferIssue_detail.vue b/fe/PDA/pages/inventory/transferIssue_detail.vue
index 6c6ee11d8..f82bd5be9 100644
--- a/fe/PDA/pages/inventory/transferIssue_detail.vue
+++ b/fe/PDA/pages/inventory/transferIssue_detail.vue
@@ -30,7 +30,7 @@
 					<view class="choose_main">
 						<view class="ljh_box">
 							<view class="uni-flex uni-row space-between">
-								<view class="text-itemcode">零件号:{{ item.itemCode }}</view>
+								<view class="text-itemcode">ERP料号:{{ item.itemCode }}</view>
 							</view>
 							<view class="label_order">
 								<image class="icon_normal" src="@/static/icons_ui/icon_asn.svg"></image>
diff --git a/fe/PDA/pages/inventory/transferReceipt_detail.vue b/fe/PDA/pages/inventory/transferReceipt_detail.vue
index 14e340a46..ecd0677dc 100644
--- a/fe/PDA/pages/inventory/transferReceipt_detail.vue
+++ b/fe/PDA/pages/inventory/transferReceipt_detail.vue
@@ -30,7 +30,7 @@
 					<view class="choose_main">
 						<view class="ljh_box">
 							<view class="uni-flex uni-row space-between">
-								<view class="text-itemcode">零件号:{{ item.itemCode }}</view>
+								<view class="text-itemcode">ERP料号:{{ item.itemCode }}</view>
 							</view>
 							<view class="label_order">
 								<image class="icon_normal" src="@/static/icons_ui/icon_asn.svg"></image>
diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
index 9761f0225..b0c9fd07e 100644
--- a/fe/PDA/pages/putaway/purchasePutaway.vue
+++ b/fe/PDA/pages/putaway/purchasePutaway.vue
@@ -261,7 +261,7 @@
 						})
 					}
 
-					//根据零件号和箱码获取采购信息
+					//根据ERP料号和箱码获取采购信息
 					let purchaseDetail = await getPurchaseDetailAsync(balanceItem.itemCode, fromTopPackingCode);
 					if (purchaseDetail.error) {
 						that.showScanMessage(purchaseDetail.error.message);
diff --git a/fe/PDA/pages/putaway/semiPutaway.vue b/fe/PDA/pages/putaway/semiPutaway.vue
index d27e3e127..58167d89e 100644
--- a/fe/PDA/pages/putaway/semiPutaway.vue
+++ b/fe/PDA/pages/putaway/semiPutaway.vue
@@ -279,7 +279,7 @@
 
 						let balanceRes = await getWipListAsync(params);
 						if (balanceRes.totalCount == 0) {
-							that.showScanMessage('按零件号和库位【' + that.fromLocation.code + ',' + that.currentLabel
+							that.showScanMessage('按ERP料号和库位【' + that.fromLocation.code + ',' + that.currentLabel
 								.itemCode +
 								'】未查找到缴库信息');
 						} else {
diff --git a/fe/PDA/pages/query/item.vue b/fe/PDA/pages/query/item.vue
index 110f9043f..c2e7d9b5f 100644
--- a/fe/PDA/pages/query/item.vue
+++ b/fe/PDA/pages/query/item.vue
@@ -33,7 +33,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup' v-if="itemCode!=''"></win-scan-button>
-		<win-scan-by-code ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-by-code ref="scanPopup" title='ERP料号' @getScanCode='getScanCode'>
 		</win-scan-by-code>
 
 		<!-- com-message必须放在最下层 -->
diff --git a/fe/PDA/pages/query/location.vue b/fe/PDA/pages/query/location.vue
index 047d3a4bd..5545dd99e 100644
--- a/fe/PDA/pages/query/location.vue
+++ b/fe/PDA/pages/query/location.vue
@@ -167,7 +167,7 @@
 					mask: true
 				});
 				let params = {
-					locationCode: that.locationCode //按零件号查询库存列表
+					locationCode: that.locationCode //按ERP料号查询库存列表
 				};
 				summary(params).then(res => {
 					that.summarys = res.items;
diff --git a/fe/PDA/pages/record/completeInventoryTransfer.vue b/fe/PDA/pages/record/completeInventoryTransfer.vue
index 2b422c6b3..da6f2f874 100644
--- a/fe/PDA/pages/record/completeInventoryTransfer.vue
+++ b/fe/PDA/pages/record/completeInventoryTransfer.vue
@@ -16,7 +16,7 @@
 
 						<uni-table border stripe style="">
 							<!-- <uni-tr>
-								<uni-td align="center">物品代码</uni-td>
+								<uni-td align="center">ERP料号</uni-td>
 								<uni-td>{{item.itemCode}}</uni-td>
 							</uni-tr> -->
 							<uni-tr>
diff --git a/fe/PDA/pages/record/productionReturn.vue b/fe/PDA/pages/record/productionReturn.vue
index 8386006fd..5ca2b1047 100644
--- a/fe/PDA/pages/record/productionReturn.vue
+++ b/fe/PDA/pages/record/productionReturn.vue
@@ -15,7 +15,7 @@
 
 						<uni-table border stripe style="">
 							<!-- <uni-tr>
-								<uni-td align="center">物品代码</uni-td>
+								<uni-td align="center">ERP料号</uni-td>
 								<uni-td>{{item.itemCode}}</uni-td>
 							</uni-tr> -->
 							<uni-tr>
diff --git a/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue b/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue
index 62db1d212..d29248c3c 100644
--- a/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue
+++ b/fe/PDA/pages/return/purchaseReturnRequestApprove_detail.vue
@@ -147,7 +147,7 @@
 				this.dataList = []
 				data.forEach(res => {
 					var list = [{
-							title: '物品代码',
+							title: 'ERP料号',
 							content: res.itemCode
 						}, {
 							title: '物品名称',
diff --git a/fe/PDA/pages/spray/sprayCompleteReceive.vue b/fe/PDA/pages/spray/sprayCompleteReceive.vue
index 75a90c845..1ef39753c 100644
--- a/fe/PDA/pages/spray/sprayCompleteReceive.vue
+++ b/fe/PDA/pages/spray/sprayCompleteReceive.vue
@@ -16,7 +16,7 @@
 
 						<uni-table border stripe style="">
 							<!-- <uni-tr>
-								<uni-td align="center">物品代码</uni-td>
+								<uni-td align="center">ERP料号</uni-td>
 								<uni-td>{{item.itemCode}}</uni-td>
 							</uni-tr> -->
 							<uni-tr>
diff --git a/fe/PDA/pages/store/deliverRaw.vue b/fe/PDA/pages/store/deliverRaw.vue
index e2a77d46b..0d6d11f91 100644
--- a/fe/PDA/pages/store/deliverRaw.vue
+++ b/fe/PDA/pages/store/deliverRaw.vue
@@ -199,7 +199,7 @@
 					mask: true
 				})
 				let that = this;
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/store/issueDirect.vue b/fe/PDA/pages/store/issueDirect.vue
index c6c42c059..a88f076cf 100644
--- a/fe/PDA/pages/store/issueDirect.vue
+++ b/fe/PDA/pages/store/issueDirect.vue
@@ -225,7 +225,7 @@
 					mask: true
 				})
 				let that = this;
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/store/receipt.vue b/fe/PDA/pages/store/receipt.vue
index 954b70d91..828d72621 100644
--- a/fe/PDA/pages/store/receipt.vue
+++ b/fe/PDA/pages/store/receipt.vue
@@ -160,7 +160,7 @@
 							}
 						}
 
-						//按照零件号+箱码+批次去重
+						//按照ERP料号+箱码+批次去重
 						let datas = that.itemList.filter(r => {
 							return (r.itemCode === result.data.itemCode &&
 								r.lot === result.data.lot &&
diff --git a/fe/PDA/pages/store/recycle.vue b/fe/PDA/pages/store/recycle.vue
index 38a86dc14..952ac1e40 100644
--- a/fe/PDA/pages/store/recycle.vue
+++ b/fe/PDA/pages/store/recycle.vue
@@ -146,7 +146,7 @@
 							}
 						}
 
-						//按照零件号+箱码+批次去重
+						//按照ERP料号+箱码+批次去重
 						let datas = that.itemList.filter(function(r) {
 							if (r.itemCode === result.data.itemCode &&
 								r.lot === result.data.lot &&
diff --git a/fe/PDA/pages/store/tjRecycle.vue b/fe/PDA/pages/store/tjRecycle.vue
index ea78816e9..f1bc8a8e7 100644
--- a/fe/PDA/pages/store/tjRecycle.vue
+++ b/fe/PDA/pages/store/tjRecycle.vue
@@ -128,7 +128,7 @@
 						}
 					}
 
-					//按照零件号+箱码+批次去重
+					//按照ERP料号+箱码+批次去重
 					let datas = that.itemList.filter(function(r) {
 						if (r.itemCode === result.data.itemCode &&
 							r.lot === result.data.lot &&
diff --git a/fe/PDA/pages/task/Inspect.vue b/fe/PDA/pages/task/Inspect.vue
index e54ca9983..96b86de12 100644
--- a/fe/PDA/pages/task/Inspect.vue
+++ b/fe/PDA/pages/task/Inspect.vue
@@ -51,7 +51,7 @@
 				pageSize: 1000,
 				pageIndex: 1,
 				scrollHeight: 0,
-				titleArray: ['ASN', '到货单', '零件号'],
+				titleArray: ['ASN', '到货单', 'ERP料号'],
 			};
 		},
 		props: {
@@ -126,7 +126,7 @@
 								if (r.summaryDetails != null && r.summaryDetails[0] != null) {
 
 									r.item = r.summaryDetails[0].item;
-									r.itemCode = r.summaryDetails[0].itemCode; //零件号
+									r.itemCode = r.summaryDetails[0].itemCode; //ERP料号
 									r.lot = r.summaryDetails[0].recommendLot; //批次
 									if (r.summaryDetails[0].receiveQty === undefined) {
 										r.qty = {
@@ -165,7 +165,7 @@
 								return r.arriveNoticeNumber === code
 							});
 							break;
-						case '零件号':
+						case 'ERP料号':
 							itemDetail = that.inspectList.find(r => {
 								return r.itemCode === code
 							});
diff --git a/fe/PDA/pages/task/Inspect_result.vue b/fe/PDA/pages/task/Inspect_result.vue
index 1ea188e23..74432ebb8 100644
--- a/fe/PDA/pages/task/Inspect_result.vue
+++ b/fe/PDA/pages/task/Inspect_result.vue
@@ -5,7 +5,7 @@
 			<view class="uni-list">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						<view class="uni-label">零件号</view>
+						<view class="uni-label">ERP料号</view>
 					</view>
 					<view class="uni-list-cell-db">
 						<view class="uni-flex uni-row space-between">
diff --git a/fe/PDA/pages/task/count.vue b/fe/PDA/pages/task/count.vue
index 00ec6296d..cbddd733c 100644
--- a/fe/PDA/pages/task/count.vue
+++ b/fe/PDA/pages/task/count.vue
@@ -182,7 +182,7 @@
 					this.getByNumber(type, result.data.code);
 				} else if (type == '库位') {
 					this.getlocationScanResult(type, result.data.code);
-				} else if (type == '零件号') {
+				} else if (type == 'ERP料号') {
 					this.getItemScanResult(result);
 				}
 			},
diff --git a/fe/PDA/pages/task/countByLocation.vue b/fe/PDA/pages/task/countByLocation.vue
index 7237ef685..354af6adf 100644
--- a/fe/PDA/pages/task/countByLocation.vue
+++ b/fe/PDA/pages/task/countByLocation.vue
@@ -32,7 +32,7 @@
 						<view class="device-detail">
 							<view class="list-style">
 								<view class="uni-flex uni-row space-between">
-									<view class="text-bolder">零件号:{{ item.code }}</view>
+									<view class="text-bolder">ERP料号:{{ item.code }}</view>
 								</view>
 								<view>名称:{{ item.name }}</view>
 								<view>描述:{{ item.desc2 }}</view>
diff --git a/fe/PDA/pages/task/countFg.vue b/fe/PDA/pages/task/countFg.vue
index 21c511ceb..c0e05f7bd 100644
--- a/fe/PDA/pages/task/countFg.vue
+++ b/fe/PDA/pages/task/countFg.vue
@@ -183,7 +183,7 @@
 					this.getByNumber(type, result.data.code);
 				} else if (type == '库位') {
 					this.getlocationScanResult(type, result.data.code);
-				} else if (type == '零件号') {
+				} else if (type == 'ERP料号') {
 					this.getItemScanResult(result);
 				}
 			},
diff --git a/fe/PDA/pages/task/countFgDetail.vue b/fe/PDA/pages/task/countFgDetail.vue
index 8baa00cb5..8194050bd 100644
--- a/fe/PDA/pages/task/countFgDetail.vue
+++ b/fe/PDA/pages/task/countFgDetail.vue
@@ -482,7 +482,7 @@
 					mask: true
 				})
 				let that = this;
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/task/countRaw.vue b/fe/PDA/pages/task/countRaw.vue
index b8867b744..340f8a937 100644
--- a/fe/PDA/pages/task/countRaw.vue
+++ b/fe/PDA/pages/task/countRaw.vue
@@ -169,7 +169,7 @@
 					this.getByNumber(type, result.data.code);
 				} else if (type == '库位') {
 					this.getlocationScanResult(type, result.data.code);
-				} else if (type == '零件号') {
+				} else if (type == 'ERP料号') {
 					this.getItemScanResult(result);
 				}
 			},
diff --git a/fe/PDA/pages/task/countRawDetail.vue b/fe/PDA/pages/task/countRawDetail.vue
index 7d8b15967..a666a761a 100644
--- a/fe/PDA/pages/task/countRawDetail.vue
+++ b/fe/PDA/pages/task/countRawDetail.vue
@@ -7,7 +7,7 @@
 				:newCount="newCount" :location="location" :countOrder="datacontent.inventoryStage">
 			</com-count-scan-detail>
 		</view>
-		<!-- <button @click="open">打开</button> -->
+		<button @click="open">打开</button>
 		<scroll-view scroll-y="true" style="margin-bottom: 50rpx;">
 			<view v-for="(item ,index) in showList" :key="index">
 				<view class="detail-content common_card">
diff --git a/fe/PDA/pages/task/count_detail.vue b/fe/PDA/pages/task/count_detail.vue
index e8b760b4a..95329f345 100644
--- a/fe/PDA/pages/task/count_detail.vue
+++ b/fe/PDA/pages/task/count_detail.vue
@@ -563,7 +563,7 @@
 					mask: true
 				})
 				let that = this;
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 100,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/task/count_result.vue b/fe/PDA/pages/task/count_result.vue
index 26d16e0fd..e1135e854 100644
--- a/fe/PDA/pages/task/count_result.vue
+++ b/fe/PDA/pages/task/count_result.vue
@@ -14,7 +14,7 @@
 				</view>
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-left">
-						<view class="uni-label">零件号</view>
+						<view class="uni-label">ERP料号</view>
 					</view>
 					<view class="uni-list-cell-db">
 						<input class="uni-input" type="text" :disabled="true" v-model="itemDetail.itemCode" />
diff --git a/fe/PDA/pages/task/deliverBoard_detail.vue b/fe/PDA/pages/task/deliverBoard_detail.vue
index a87742f5c..c7317b527 100644
--- a/fe/PDA/pages/task/deliverBoard_detail.vue
+++ b/fe/PDA/pages/task/deliverBoard_detail.vue
@@ -224,7 +224,7 @@
 						return;
 					}
 				}
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 1000,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/task/deliver_detail.vue b/fe/PDA/pages/task/deliver_detail.vue
index 98408fcc8..5d4c53c28 100644
--- a/fe/PDA/pages/task/deliver_detail.vue
+++ b/fe/PDA/pages/task/deliver_detail.vue
@@ -232,7 +232,7 @@
 						return;
 					}
 				}
-				//按照零件号和箱码去查询库存
+				//按照ERP料号和箱码去查询库存
 				let params = {
 					pageSize: 1000,
 					pageIndex: 1,
diff --git a/fe/PDA/pages/task/inventoryMoveJobDetail.vue b/fe/PDA/pages/task/inventoryMoveJobDetail.vue
index 0027d5db3..a4e96f97c 100644
--- a/fe/PDA/pages/task/inventoryMoveJobDetail.vue
+++ b/fe/PDA/pages/task/inventoryMoveJobDetail.vue
@@ -370,7 +370,7 @@
 						return;
 					}
 				}
-				//零件号校验
+				//ERP料号校验
 				if (itemFrom.isItemCodeFrom ) {
 					if (itemCode != itemFrom.itemCode) {
 						this.showMessage("任务中不允许修改来源零件, 扫描箱码[" + packingCode + "]的零件[" + itemCode + "]与推荐零件[" +
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index fa601faf1..1c9e496d6 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -328,23 +328,23 @@
 				if (itemCode == undefined) {
 					that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
 				}else {
-					//零件号相同、箱码相同
+					//ERP料号相同、箱码相同
 					var itemCode1 = that.details.find(r => {
 						return r.itemCode === result.data.itemCode&&
 						r.recommendPackingCode === result.data.code
 						r.scaned === scaned
 					})
-					//零件号相同、箱码不相同
+					//ERP料号相同、箱码不相同
 					if(itemCode1 == undefined){
 						var itemCode2 = that.details.find(r => {
 							return r.itemCode === result.data.itemCode&&
 							r.recommendLot === result.data.lot 
 							&&r.scaned === scaned
 						})
-						//零件号相同、箱码不相同、批次相同
+						//ERP料号相同、箱码不相同、批次相同
 						if(itemCode2==undefined){
-							//零件号相同、箱码不相同、批次不相同
-							console.log("零件号相同、箱码不相同、批次不相同")
+							//ERP料号相同、箱码不相同、批次不相同
+							console.log("ERP料号相同、箱码不相同、批次不相同")
 							setTimeout(res => {
 								showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
 									if (confirm) {
@@ -357,15 +357,15 @@
 							}, 100)
 							
 						}else {
-							console.log("零件号相同、箱码不相同、批次相同")
-							//零件号相同、箱码不相同、批次相同
+							console.log("ERP料号相同、箱码不相同、批次相同")
+							//ERP料号相同、箱码不相同、批次相同
 							that.currentItem = itemCode2;
 							that.afterScanPackLabel(result);
 						}
 						
 						
 					}else {
-						//零件号相同、箱码相同、批次相同
+						//ERP料号相同、箱码相同、批次相同
 						var itemCode3 = that.details.find(r => {
 							return r.itemCode === result.data.itemCode&&
 							r.recommendPackingCode === result.data.code&&
@@ -373,8 +373,8 @@
 							&&r.scaned === scaned
 						})
 						if(itemCode3==undefined){
-							//零件号相同、箱码相同、批次不同
-							console.log("零件号相同、箱码相同、批次不同")
+							//ERP料号相同、箱码相同、批次不同
+							console.log("ERP料号相同、箱码相同、批次不同")
 							setTimeout(res => {
 								showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
 									if (confirm) {
@@ -387,8 +387,8 @@
 							}, 100)
 							
 						}else {
-							console.log("零件号相同、箱码相同、批次相同")
-							//零件号相同、箱码相同、批次相同
+							console.log("ERP料号相同、箱码相同、批次相同")
+							//ERP料号相同、箱码相同、批次相同
 							that.currentItem = itemCode3;
 							that.afterScanPackLabel(result);
 						}
@@ -405,13 +405,13 @@
 				
 				
 
-				// //没找到符合的箱码、零件号、箱码、批次都相等
+				// //没找到符合的箱码、ERP料号、箱码、批次都相等
 				// if (that.currentItem === undefined) {
 				// 	var itemCode = that.details.find(res => {
 				// 		return res.itemCode === result.data.itemCode &&
 				// 			res.scaned === scaned
 				// 	})
-				// 	//零件号相等
+				// 	//ERP料号相等
 				// 	if (itemCode != undefined) {
 				// 		var lot = that.details.find(res => {
 				// 			return res.itemCode === result.data.itemCode &&
@@ -438,7 +438,7 @@
 
 				// 		}
 				// 	} else {
-				// 		//零件号不相等
+				// 		//ERP料号不相等
 				// 		var lot = that.details.find(res => {
 				// 			return res.recommendLot === result.data.lot &&
 				// 				res.scaned === scaned
@@ -448,7 +448,7 @@
 				// 			// 在该任务中未找到零件。
 				// 			that.showScanMessage('在该任务中未找到零件');
 				// 		} else {
-				// 			//零件号不相等,批次不相等
+				// 			//ERP料号不相等,批次不相等
 				// 			that.showScanMessage('所扫描的物料不在任务中');
 				// 		}
 				// 	}
@@ -491,7 +491,7 @@
 				issueBalances(params)
 					.then(res => {
 						if (res.totalCount === 0) {
-							this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
+							this.showScanMessage('按ERP料号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
 								result
 								.data.lot + '】在【原料库、半成品库】未查询到库存信息');
 						} else {
diff --git a/fe/PDA/pages/task/putaway.vue b/fe/PDA/pages/task/putaway.vue
index d8e75e7ae..95d4feeab 100644
--- a/fe/PDA/pages/task/putaway.vue
+++ b/fe/PDA/pages/task/putaway.vue
@@ -134,7 +134,7 @@
 				//不管是按托标签上架还是按照箱标签上架都对应一个上架任务
 				if (result.data.isPack === true) { //箱码
 					item = this.putawaydetailList.find(r => {
-						//零件号，箱码,批次
+						//ERP料号，箱码,批次
 						return r.itemCode === result.data.itemCode &&
 							r.recommendPackingCode === result.data.packingCode &&
 							r.recommendLot === result.data.lot
diff --git a/fe/PDA/pages/task/putawayjob.vue b/fe/PDA/pages/task/putawayjob.vue
index e81bc5a6d..1bb66c3b3 100644
--- a/fe/PDA/pages/task/putawayjob.vue
+++ b/fe/PDA/pages/task/putawayjob.vue
@@ -151,7 +151,7 @@
 				}
 				if (result.data.isPack) {
 					if (result.data.itemCode === undefined || result.data.itemCode === '') {
-						this.showMessage('扫描的标签中不包含零件号,请重新扫描');
+						this.showMessage('扫描的标签中不包含ERP料号,请重新扫描');
 						return;
 					}
 				}
diff --git a/fe/PDA/pages/task/receipt_check.vue b/fe/PDA/pages/task/receipt_check.vue
index 527af7ebd..4705c2868 100644
--- a/fe/PDA/pages/task/receipt_check.vue
+++ b/fe/PDA/pages/task/receipt_check.vue
@@ -4,7 +4,7 @@
 		<uni-popup ref="receiptCheckPopup" class="nopadpop camera_pop">
 			<view class="uni-list popuni_list camera_list">
 				<view class="list_cell uni-flex uni-row space-between">
-					<view class="title">零件号</view>
+					<view class="title">ERP料号</view>
 					<text class="info">{{dataContent.itemCode}}</text>
 				</view>
 				<view class="list_cell uni-flex uni-row space-between">
diff --git a/fe/PDA/pages/task/unProducePickDetail.vue b/fe/PDA/pages/task/unProducePickDetail.vue
index 6bb04199b..fb1ff6f3f 100644
--- a/fe/PDA/pages/task/unProducePickDetail.vue
+++ b/fe/PDA/pages/task/unProducePickDetail.vue
@@ -310,23 +310,23 @@
 				if (itemCode == undefined) {
 					that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
 				} else {
-					//零件号相同、箱码相同
+					//ERP料号相同、箱码相同
 					var itemCode1 = that.details.find(r => {
 						return r.itemCode === result.data.itemCode &&
 							r.recommendPackingCode === result.data.code
 						r.scaned === scaned
 					})
-					//零件号相同、箱码不相同
+					//ERP料号相同、箱码不相同
 					if (itemCode1 == undefined) {
 						var itemCode2 = that.details.find(r => {
 							return r.itemCode === result.data.itemCode &&
 								r.recommendLot === result.data.lot &&
 								r.scaned === scaned
 						})
-						//零件号相同、箱码不相同、批次相同
+						//ERP料号相同、箱码不相同、批次相同
 						if (itemCode2 == undefined) {
-							//零件号相同、箱码不相同、批次不相同
-							console.log("零件号相同、箱码不相同、批次不相同")
+							//ERP料号相同、箱码不相同、批次不相同
+							console.log("ERP料号相同、箱码不相同、批次不相同")
 							setTimeout(res => {
 								showConfirmMsg(itemCode.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?', confirm => {
 									if (confirm) {
@@ -339,15 +339,15 @@
 							}, 100)
 
 						} else {
-							console.log("零件号相同、箱码不相同、批次相同")
-							//零件号相同、箱码不相同、批次相同
+							console.log("ERP料号相同、箱码不相同、批次相同")
+							//ERP料号相同、箱码不相同、批次相同
 							that.currentItem = itemCode2;
 							that.afterScanPackLabel(result);
 						}
 
 
 					} else {
-						//零件号相同、箱码相同、批次相同
+						//ERP料号相同、箱码相同、批次相同
 						var itemCode3 = that.details.find(r => {
 							return r.itemCode === result.data.itemCode &&
 								r.recommendPackingCode === result.data.code &&
@@ -355,8 +355,8 @@
 							    r.scaned === scaned
 						})
 						if (itemCode3 == undefined) {
-							//零件号相同、箱码相同、批次不同
-							console.log("零件号相同、箱码相同、批次不同")
+							//ERP料号相同、箱码相同、批次不同
+							console.log("ERP料号相同、箱码相同、批次不同")
 							setTimeout(res => {
 								showConfirmMsg(itemCode1.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?',
 								confirm => {
@@ -370,8 +370,8 @@
 							}, 100)
 
 						} else {
-							console.log("零件号相同、箱码相同、批次相同")
-							//零件号相同、箱码相同、批次相同
+							console.log("ERP料号相同、箱码相同、批次相同")
+							//ERP料号相同、箱码相同、批次相同
 							that.currentItem = itemCode3;
 							that.afterScanPackLabel(result);
 						}
@@ -414,7 +414,7 @@
 				getBalancesByFilter(params)
 					.then(res => {
 						if (res.totalCount === 0) {
-							this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
+							this.showScanMessage('按ERP料号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
 								result
 								.data.lot + '】在【原料库】或【半成品库】或【成品库】未查询到库存信息');
 						} else {
diff --git a/fe/PDA/pages/task/unProduceReturnDetail.vue b/fe/PDA/pages/task/unProduceReturnDetail.vue
index 9fc2809d8..be5457860 100644
--- a/fe/PDA/pages/task/unProduceReturnDetail.vue
+++ b/fe/PDA/pages/task/unProduceReturnDetail.vue
@@ -333,23 +333,23 @@
 					that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
 				} else {
 
-					//零件号相同、箱码相同
+					//ERP料号相同、箱码相同
 					var itemCode1 = that.details.find(r => {
 						return r.itemCode === result.data.itemCode &&
 							r.recommendPackingCode === result.data.code
 						r.scaned === scaned
 					})
-					//零件号相同、箱码不相同
+					//ERP料号相同、箱码不相同
 					if (itemCode1 == undefined) {
 						var itemCode2 = that.details.find(r => {
 							return r.itemCode === result.data.itemCode &&
 								r.recommendLot === result.data.lot &&
 								r.scaned === scaned
 						})
-						//零件号相同、箱码不相同、批次相同
+						//ERP料号相同、箱码不相同、批次相同
 						if (itemCode2 == undefined) {
-							//零件号相同、箱码不相同、批次不相同
-							console.log("零件号相同、箱码不相同、批次不相同")
+							//ERP料号相同、箱码不相同、批次不相同
+							console.log("ERP料号相同、箱码不相同、批次不相同")
 							that.currentItem = itemCode;
 							that.afterScanPackLabel(result);
 							// setTimeout(res => {
@@ -364,15 +364,15 @@
 							// }, 100)
 
 						} else {
-							console.log("零件号相同、箱码不相同、批次相同")
-							//零件号相同、箱码不相同、批次相同
+							console.log("ERP料号相同、箱码不相同、批次相同")
+							//ERP料号相同、箱码不相同、批次相同
 							that.currentItem = itemCode2;
 							that.afterScanPackLabel(result);
 						}
 
 
 					} else {
-						//零件号相同、箱码相同、批次相同
+						//ERP料号相同、箱码相同、批次相同
 						var itemCode3 = that.details.find(r => {
 							return r.itemCode === result.data.itemCode &&
 								r.recommendPackingCode === result.data.code &&
@@ -380,8 +380,8 @@
 							    r.scaned === scaned
 						})
 						if (itemCode3 == undefined) {
-							//零件号相同、箱码相同、批次不同
-							console.log("零件号相同、箱码相同、批次不同")
+							//ERP料号相同、箱码相同、批次不同
+							console.log("ERP料号相同、箱码相同、批次不同")
 							that.currentItem = itemCode1;
 							that.afterScanPackLabel(result);
 							// setTimeout(res => {
@@ -396,8 +396,8 @@
 							// }, 100)
 
 						} else {
-							console.log("零件号相同、箱码相同、批次相同")
-							//零件号相同、箱码相同、批次相同
+							console.log("ERP料号相同、箱码相同、批次相同")
+							//ERP料号相同、箱码相同、批次相同
 							that.currentItem = itemCode3;
 							that.afterScanPackLabel(result);
 						}