From 3c8f4bf5f805348ce594d445357361f095b61883 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 2 Aug 2024 19:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           | 24 +++++++++++++++++
 .../record/productPutawayRecord.vue           | 27 +++++++++++++------
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 91e1ac68..bc72fb82 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -510,6 +510,30 @@ export function getPutawayRecommendLocation(params) {
 }
 
 
+//获取推荐目标库位
+// expectinNumber: 预计入number
+// itemCode: 物料代码
+// inventoryStatus：库存状态
+export function getrecommendLocationExpectin(params) {
+	return request({
+		url: baseApi + "/wms/location/recommendLocationExpectin",
+		method: "post",
+		data: params,
+	});
+}
+
+
+//移除预占用的推荐库位
+// expectinNumber: 预计入number
+// itemCode: 物料代码
+// inventoryStatus：库存状态
+export function recommendLocationRemoveExpectin(params) {
+	return request({
+		url: baseApi + "/wms/location/recommendLocationRemoveExpectin",
+		method: "post",
+		data: params,
+	});
+}
 
 /**
  * 查询物品信息接口
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index ec7975ed..90d29eb0 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -44,7 +44,8 @@
 <script>
 	import {
 		productPutawayRecordSubmit,
-		getPutawayRecommendLocation
+		getrecommendLocationExpectin,
+		recommendLocationRemoveExpectin
 	} from '@/api/request2.js';
 	import {
 		goHome,
@@ -199,14 +200,12 @@
 				})
 
 				let param = {
+					expectinNumber: balance.id,
 					itemCode: balance.itemCode,
-					batch: balance.batch,
 					inventoryStatus: balance.inventoryStatus,
-					supplierCode: '',
-					businessCode: this.bussinessCode
 				};
 				console.log(JSON.stringify(param))
-				getPutawayRecommendLocation(param).then(res => {
+				getrecommendLocationExpectin(param).then(res => {
 					callback(res.data);
 					uni.hideLoading();
 				}).catch(error => {
@@ -216,8 +215,15 @@
 			},
 
 			//移除推荐的预占用库位
-			removeRecommendLocation() {
-				this.showMessage('移除推荐的预占用库位')
+			removeRecommendLocation(lst) {
+				let param = {
+					expectinNumberList: lst,
+				};
+				recommendLocationRemoveExpectin(param).then(res => {
+
+				}).catch(err => {
+					this.showErrorMessage('【'++'】移除预占用失败,请在PC端的预占用中移除')
+				})
 			},
 
 			showScanToLocation(item) {
@@ -239,7 +245,7 @@
 				this.calcHandleQty();
 			},
 			removeItem(index, item) {
-				this.removeRecommendLocation();
+				this.removeRecommendLocation([item.id]);
 				this.detailSource.splice(index, 1)
 			},
 			removePack() {
@@ -312,6 +318,11 @@
 								uni.hideLoading()
 								if (res.data) {
 									this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+									let removeId = [];
+									this.detailSource.forEach(r => {
+										removeId.push(r.id);
+									})
+									this.removeRecommendLocation(removeId);
 								} else {
 									this.showErrorMessage("提交失败[" + res.msg + "]")
 								}