From 5ba9676fccc521b8d841f858eecfcdc3d28ece4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 13:58:40 +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=202024/8/3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/productPutawayRecord.vue           | 93 +++++++++----------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index f767e374..54f249db 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -248,51 +248,42 @@
 	// }
 
 	const commit = () => {
-    if (toLocationCode.value == "") {
-      showQuestionMessage('未指定目标库位,系统将按上架策略推荐库位是否继续提交?', res => {
-        if (res) {
-          commitRecord();
-        }
-      });
-    } else {
-      commitRecord();
-    }
-  }
-  const commitRecord = ()=>{
+
 		if (detailSource.value.length > 0 && detailSource.value[0].subList.length > 0) {
 			// 查询管理模式
 
 			proxy.$modal.loading('提交中....')
-			managementList.value = []
-			const precisionStrategParams = setPrecisionStrategParams()
-
-			getPrecisionStrategyList(precisionStrategParams, (res) => {
-				if (res.success) {
-					managementList.value = res.list
-					const params = setParams()
-					productPutawayRecordSubmit(params)
-						.then((res) => {
-							uni.hideLoading()
-							if (res.data) {
-								showCommitSuccessMessage(`提交成功<br>生成制品上架记录<br>${res.data}`)
-                let removeId = [];
-                detailSource.value.forEach(r => {
-                  removeId.push(r.expectinNumber)
-                })
-                removeRecommendLocation(removeId);
-							} else {
-								showErrorMessage(`提交失败[${res.msg}]`)
-							}
-						})
-						.catch((error) => {
-							uni.hideLoading()
-							showErrorMessage(error)
-						})
-				} else {
-					uni.hideLoading()
-					showErrorMessage(res.message)
-				}
-			})
+			// managementList.value = []
+			// const precisionStrategParams = setPrecisionStrategParams()
+
+			// getPrecisionStrategyList(precisionStrategParams, (res) => {
+			// 	if (res.success) {
+			// 		managementList.value = res.list
+			//
+			// 	} else {
+			// 		uni.hideLoading()
+			// 		showErrorMessage(res.message)
+			// 	}
+			// })
+      const params = setParams()
+      productPutawayRecordSubmit(params)
+          .then((res) => {
+            uni.hideLoading()
+            if (res.data) {
+              showCommitSuccessMessage(`提交成功<br>生成制品上架记录<br>${res.data}`)
+              let removeId = [];
+              detailSource.value.forEach(r => {
+                removeId.push(r.expectinNumber)
+              })
+              removeRecommendLocation(removeId);
+            } else {
+              showErrorMessage(`提交失败[${res.msg}]`)
+            }
+          })
+          .catch((error) => {
+            uni.hideLoading()
+            showErrorMessage(error)
+          })
 		} else {
 			showErrorMessage('没有要提交的数据,请先扫描')
 		}
@@ -330,7 +321,7 @@
 			item.subList.forEach((detail) => {
 				if (detail.scaned) {
 					const submitItem = deepCopyData(detail)
-					const info = getPackingNumberAndBatchByList(managementList.value, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch)
+					// const info = getPackingNumberAndBatchByList(managementList.value, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch)
 					submitItem.itemCode = detail.itemCode
 					submitItem.itemName = detail.package.itemName
 					submitItem.itemDesc1 = detail.package.itemDesc1
@@ -338,14 +329,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