From 90f3569ec21b0fe3351c70973185d94d580e9f81 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 3 Aug 2024 10:33:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .../record/productPutawayRecord.vue           | 87 +++++++++----------
 2 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/.env.development b/.env.development
index 2788279c..a216fad1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://192.168.0.108:12080/admin-api
+VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
 VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
 
 # 租户配置
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index e7e11ff3..409d5e22 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -289,55 +289,44 @@
 			},
 
 			commit() {
-				if (this.toLocationCode == "") {
-					this.$refs.comMessage.showQuestionMessage('未指定目标库位,系统将按上架策略推荐库位是否继续提交?', res => {
-						if (res) {
-							this.commitRecord();
-						}
-					});
-				} else {
-					this.commitRecord();
-				}
-			},
-
-			commitRecord() {
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
 					//查询管理模式
 					uni.showLoading({
 						title: "提交中....",
 						mask: true
 					});
-					this.managementList = [];
-					var precisionStrategParams = this.setPrecisionStrategParams()
-
-					getPrecisionStrategyList(precisionStrategParams, res => {
-						if (res.success) {
-							this.managementList = res.list;
-							var params = this.setParams()
-							console.log("提交" + JSON.stringify(params))
-							productPutawayRecordSubmit(params).then(res => {
-								uni.hideLoading()
-								if (res.data) {
-									this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
-									let removeId = [];
-									this.detailSource.forEach(r => {
-										removeId.push(r.expectinNumber);
-									})
-
-									this.removeRecommendLocation(removeId);
-								} else {
-									this.showErrorMessage("提交失败[" + res.msg + "]")
-								}
-							}).catch(error => {
-								uni.hideLoading()
-								this.showErrorMessage(error)
+					// this.managementList = [];
+					// var precisionStrategParams = this.setPrecisionStrategParams()
+
+					// getPrecisionStrategyList(precisionStrategParams, res => {
+					// 	if (res.success) {
+					// 		this.managementList = res.list;
+
+
+					var params = this.setParams()
+					console.log("提交" + JSON.stringify(params))
+					productPutawayRecordSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+							let removeId = [];
+							this.detailSource.forEach(r => {
+								removeId.push(r.expectinNumber);
 							})
 
+							this.removeRecommendLocation(removeId);
 						} else {
-							uni.hideLoading();
-							this.showErrorMessage(res.message);
+							this.showErrorMessage("提交失败[" + res.msg + "]")
 						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
 					})
+					// } else {
+					// 	uni.hideLoading();
+					// 	this.showErrorMessage(res.message);
+					// }
+
 				} else {
 					this.showErrorMessage("没有要提交的数据,请先扫描")
 				}
@@ -376,8 +365,8 @@
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var submitItem = deepCopyData(detail)
-							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.toLocationCode, detail.batch);
+							// var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+							// 	detail.packingNumber, detail.toLocationCode, detail.batch);
 							submitItem.itemCode = detail.itemCode;
 							submitItem.itemName = detail.package.itemName;
 							submitItem.itemDesc1 = detail.package.itemDesc1;
@@ -385,14 +374,20 @@
 
 							submitItem.inventoryStatus = detail.inventoryStatus;
 
-							submitItem.fromPackingNumber = info.packingNumber;
-							submitItem.toPackingNumber = info.packingNumber;
+							// submitItem.fromPackingNumber = info.packingNumber;
+							// submitItem.toPackingNumber = info.packingNumber;
+							
+							submitItem.fromPackingNumber = detail.packingNumber;
+							submitItem.toPackingNumber = detail.packingNumber;					
 
-							submitItem.fromContainerNumber = detail.containerNumber;
-							submitItem.toContainerNumber = detail.containerNumber
+							//submitItem.fromContainerNumber = detail.containerNumber;
+							//submitItem.toContainerNumber = detail.containerNumber
 
-							submitItem.fromBatch = info.batch;
-							submitItem.toBatch = info.batch;
+							//submitItem.fromBatch = info.batch;
+							//submitItem.toBatch = info.batch;
+							
+							submitItem.fromBatch = detail.package.batch;
+							submitItem.toBatch = detail.package.batch;
 
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = item.toLocationCode;