From e383b6cc094a4a67b9c1933a0996d1336dc8660e Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 15 Aug 2023 13:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=80=80=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=8A=E6=88=90=E5=93=81=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/return/returnToWarehouse.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fe/PDA/pages/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue
index 785c9a443..9adc13135 100644
--- a/fe/PDA/pages/return/returnToWarehouse.vue
+++ b/fe/PDA/pages/return/returnToWarehouse.vue
@@ -373,7 +373,7 @@
 					if (res == null) {
 						that.showMessage('目标库位【' + locationCode + '】不存在');
 					} else {
-						if (res.type == 2 || res.type == 6||res.type == 4) {
+						if (res.type == 2 || res.type == 3||res.type == 4 ||res.type == 6) {
 
 							showConfirmMsg('是否要将所有未扫描目标库位的零件,指定目标库位【' + locationCode + '】',
 								confirm => {
@@ -390,7 +390,7 @@
 									}
 								});
 						} else {
-							that.showMessage('目标库位的库位类型必须是【原料库】或【隔离库】或【成品库】')
+							that.showMessage('目标库位的库位类型必须是【原料库】或【半成品库】或【成品库】或【隔离库】')
 						}
 					}
 					uni.hideLoading();
@@ -420,10 +420,10 @@
 						that.showMessage('目标库位【' + code + '】不存在');
 					} else {
 
-						if (res.type == 2 || res.type == 6||res.type == 4) {
+						if (res.type == 2 || res.type == 3||res.type == 4||res.type == 6) {
 							this.handledToLocation(this.currentItem, res);
 						} else {
-							this.showMessage('目标库位必须是原料库或者隔离库或者成品库')
+							this.showMessage('目标库位的库位类型必须是【原料库】或【半成品库】或【成品库】或【隔离库】')
 						}
 					}
 					uni.hideLoading();