From 530e081112854769321237ba16882490134808e5 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 14 May 2024 13:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/record/directIssue.vue | 41 ++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index e129c92d..d006d931 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -180,11 +180,11 @@
 				}
 				if (item == undefined) {
 					// 获取推荐库位
-					this.getRecommendLocation(balance, pack, toLocation => {
+					// this.getRecommendLocation(balance, pack, toLocation => {
 						var itemp = createItemInfo(balance, pack);
 						let newDetail = createDetailInfo(balance, pack); //
-						newDetail.toLocationCode = toLocation.code;
-						newDetail.toWarehouseCode = toLocation.warehouseCode;
+						// newDetail.toLocationCode = toLocation.code;
+						// newDetail.toWarehouseCode = toLocation.warehouseCode;
 						itemp.subList.push(newDetail);
 						var dataList = pack.subList
 						this.detailSource.push(itemp)
@@ -200,7 +200,7 @@
 								})
 							})
 						})
-					})
+					// })
 
 				} else {
 					var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
@@ -298,6 +298,24 @@
 				} else {
 					this.showErrorMessage("车间-生产线基础信息维护错误")
 				}
+				
+				//赋值到库位代码
+				let toLocationCode = ''
+				this.positionList.forEach(item=>{
+					if(this.workshopCode == item.value){ // 车间
+						item.children.find(child=>{
+							if(this.productionLineCode==child.value){
+								toLocationCode = child.children.find(subChild=>this.workStationCode==subChild.value).rawLocationCode;
+							}
+						})
+					}
+				})
+				this.detailSource.forEach(item=>{
+					item.subList.forEach(detail => {
+						detail.toLocationCode = toLocationCode
+					})
+				})
+				
 			},
 
 
@@ -364,13 +382,13 @@
 				getPrecisionStrategyList(precisionStrategyParams, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = this.setRecordParams()
+						var params = {...this.setRecordParams()}
 						console.log("提交参数", JSON.stringify(params));
 
 						issueRecordSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data, )
+								this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data)
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
@@ -441,6 +459,17 @@
 							// detail.toLocationCode = detail.toLocationCode
 							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
+							submitItem.recordList = [{
+									toInventoryStatus:detail.inventoryStatus,
+									fromPackingNumber:info.packingNumber,
+									fromBatch:info.batch,
+									toPackingNumber:info.packingNumber,
+									toBatch:info.batch,
+									fromLocationCode:detail.locationCode,
+									toLocationCode:detail.toLocationCode,
+									handleQty:detail.handleQty
+								}
+							]
 							subList.push(submitItem)
 						}
 					})