From a5ddc07ae88a4eb34d974a738128ac0c67a619c5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 11 Oct 2024 13:02:14 +0800
Subject: [PATCH] =?UTF-8?q?YT-250pda=E9=A2=84=E7=94=9F=E4=BA=A7=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E4=BB=BB=E5=8A=A1=E3=80=81=E8=A3=85=E9=85=8D=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=AB=E6=8F=8F=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8C=85=E8=A3=85=E5=8F=B7=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                       | 9 ++++-----
 src/pages/productPutaway/job/productPutawayDetail.vue | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.env.production b/.env.production
index f6803774..01bc56cf 100644
--- a/.env.production
+++ b/.env.production
@@ -1,12 +1,11 @@
-VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
+VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
-VITE_isDevelopment=false
-
+VITE_isDevelopment=true
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'
\ No newline at end of file
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 1b3feb82..bc151e08 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -339,17 +339,16 @@
 						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
 						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber &&
-								r.batch == batch &&
+							return r.batch == batch &&
 								r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+							this.showErrorMessage("批次【" + batch + "】库位【" + result
 								.fromLocationCode + "】不在列表中")
 						} else {
 							detail.scaned = true
 							if (!itemDetail.cancleScanedHiht && itemDetail.scaned) {
-								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								this.showErrorMessage("批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")
 							} else {
 								// this.addDetail(itemDetail, result);