From d8bb622a72bc83f2e87d91f3a40dd33dda07f497 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Sat, 17 Aug 2024 17:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BA=93=E5=AD=98=EF=BC=8C=E4=B8=8A=E6=9E=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |  29 ++-
 src/mycomponents/query/balanceQuery.vue       | 184 ++++++++++--------
 .../record/recordComDetailCard.vue            |   8 +-
 .../record/productPutawayRecord.vue           |   1 +
 src/pages/putaway/record/putawayRecord.vue    |  90 ++++++++-
 5 files changed, 222 insertions(+), 90 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 8dc5ef33..2fcbcd5b 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4492,4 +4492,31 @@ export function fgChangeCommit(params) {
 		method: "post",
 		data: params,
 	});
-}
\ No newline at end of file
+}
+
+/**
+ * 查询物料与库位关系
+ */
+export function checkItemCodeAndLocation(params) {
+	return request({
+		url: baseApi + "/wms/location/checkRecommendLocation",
+		method: "post",
+		data: params,
+	});
+}
+
+/**
+ * 库存余额根据业务类型汇总接口
+ */
+export function getBalanceByBusinessType(params) {
+	return request({
+		url: baseApi + "/wms/balance/summaryByBusinessType",
+		method: "get",
+		data: params,
+	});
+}
+
+
+
+
+
diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue
index 0a3bee4d..4a3b396a 100644
--- a/src/mycomponents/query/balanceQuery.vue
+++ b/src/mycomponents/query/balanceQuery.vue
@@ -60,7 +60,7 @@
 								</uni-tr>
 
 							</uni-table>
-							<view class="uni-flex"   style=" flex-direction: column; position: fixed; bottom: 0;  margin-bottom: 100rpx; background-color: #fff; width: 100%; align-items: center;" >
+							<!-- <view class="uni-flex"   style=" flex-direction: column; position: fixed; bottom: 0;  margin-bottom: 100rpx; background-color: #fff; width: 100%; align-items: center;" >
 								<view class="" style="width: 100%; display: flex;  justify-content: center; font-size: 32rpx;margin-top: 10rpx;margin-bottom: 10rpx;">
 									<view class="" >当前页：{{ current }}，总数：{{ total }}条，每页：{{ pageSize }}
 								</view>
@@ -68,7 +68,7 @@
 								</view>
 								<uni-pagination :current="current" :total="total" :show-icon="true"
 									@change="change" />
-							</view>
+							</view> -->
 							
 						</view>
 
@@ -86,6 +86,7 @@
 <script>
 	import {
 		getBasicItemByCodeSenior,
+		getBalanceByBusinessType
 	} from '@/api/request2.js';
 
 	import {
@@ -102,80 +103,81 @@
 				itemCodeResult: [],
 				current: 1,
 				total: 18,
-				tableData: [{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 1
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 2
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 3
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 4
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 3
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 4
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 3
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 4
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 3
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 4
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 3
-					},
-					{
-						batch: "20240814",
-						locationCode: "901",
-						inventoryStatus: "OK",
-						qty: 4
-					}
+				tableData:[]
+				// tableData: [{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 1
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 2
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 3
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 4
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 3
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 4
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 3
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 4
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 3
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 4
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 3
+				// 	},
+				// 	{
+				// 		batch: "20240814",
+				// 		locationCode: "901",
+				// 		inventoryStatus: "OK",
+				// 		qty: 4
+				// 	}
 
-				]
+				// ]
 			}
 		},
 		props: {
@@ -183,10 +185,10 @@
 			// 	type: Object,
 			// 	default: {}
 			// },
-			// isShowPack: {
-			// 	type: Boolean,
-			// 	default: true
-			// }
+			businessTypeCode: {
+				type: Boolean,
+				default: String
+			}
 		},
 		watch: {
 
@@ -211,6 +213,7 @@
 			selectItemCode(item) {
 				this.itemCode = item.code
 				this.itemCodeResult = []
+				this.getBalanceByBusiness(this.itemCode,this.businessTypeCode)
 			},
 			clearItemCode() {
 				this.itemCode = ""
@@ -227,11 +230,12 @@
 				})
 
 				getBasicItemByCodeSenior(this.itemCode).then(res => {
-					uni.hideLoading()
 					if (res.data && res.data.list.length > 0) {
 						if (res.data.list.length == 1) {
 							this.itemCode = res.data.list[0].code
+							this.getBalanceByBusiness(this.itemCode,this.businessTypeCode)
 						} else {
+							uni.hideLoading()
 							this.itemCodeResult = res.data.list
 						}
 					} else {
@@ -243,6 +247,26 @@
 					this.showErrorMessage(error)
 				})
 			},
+			getBalanceByBusiness(itemCode,businessType){
+				var params ={
+					itemCode:itemCode,
+					businessType:businessType
+				}
+				getBalanceByBusinessType(params).then(res=>{
+					uni.hideLoading()
+					if(res.data&&res.data.length>0){
+						console.log(this.tableData)
+						this.tableData= res.data
+					}else {
+						this.showErrorMessage("发料中未查询到物料号["+itemCode+"]的库存")
+					}
+					
+				}).catch(error=>{
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			
 			showDrawer() {
 				this.$refs.showRight.open();
 			},
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index cd6be527..ec58ae03 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -106,6 +106,12 @@
 				type: Boolean,
 				default: true
 			},
+			
+			isShowModifedLocation: {
+				type: Boolean,
+				default: false
+			},
+			
 		},
 		watch: {
 
@@ -143,7 +149,7 @@
 		mounted() {
 			this.detailOptions = getDetailOption();
 			this.scanOptions = getDetailEditRemoveOption();
-			this.removeOptions = getEditLocationRemoveOption();
+			this.removeOptions = this.isShowModifedLocation ?getEditLocationRemoveOption():getClearOption();
 		},
 
 		methods: {
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 31cc12c5..f2dab7c8 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -10,6 +10,7 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowStatus="true" :isShowToLocation='false' @removeItem="removeItem(index,item)"
+								:isShowModifedLocation="true"
 								@updateData="updateData" @removePack="removePack" @editLocation="showScanToLocation">
 							</record-com-detail-card>
 						</view>
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 9662d144..f212cfa3 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -5,10 +5,11 @@
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="page-header">
-				<view class="header_item">
-					来源库位 : {{fromLocationCode}}
+				<view class="header-view">
+					<view class="header_item">
+						来源库位 : {{fromLocationCode}}
+					</view>
 				</view>
-				<u-line />
 			</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
@@ -16,7 +17,10 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
-								@updateData="updateData" @removePack="removePack">
+								:isShowModifedLocation="true"
+								@updateData="updateData"
+								@editLocation="showScanToLocation"
+								 @removePack="removePack">
 							</record-com-detail-card>
 						</view>
 
@@ -43,14 +47,17 @@
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+		<win-scan-location ref="scanToLocationCode" title="目标库位" @getLocation='getToLocationCode'
+			:locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
 	</view>
 </template>
 
 <script>
 	import {
 		putawayRecordSubmit,
-		validateItemAndLocation,
-		getPutawayRecommendLocation
+		getPutawayRecommendLocation,
+		checkItemCodeAndLocation,
+		recommendLocationRemoveExpectin
 	} from '@/api/request2.js';
 
 	import {
@@ -116,7 +123,8 @@
 				showToLoaction: true,
 				recommendLocationList: [], //推荐库位列表
 				fromWarehouseCode: '', //来源仓库
-				businessTypeCode: "PurchasePutaway"
+				businessTypeCode: "PurchasePutaway",
+				editItem:{}
 			};
 		},
 		onLoad(option) {
@@ -168,6 +176,7 @@
 					// 获取推荐库位
 					this.getRecommendLocation(balance, pack, toLocation => {
 						var itemp = createItemInfo(balance, pack);
+						itemp.toLocationCode = toLocation.locationCode;
 						let newDetail = createDetailInfo(balance, pack); //
 						newDetail.toLocationCode = toLocation.locationCode;
 						newDetail.toWarehouseCode = toLocation.toWarehouseCode;
@@ -445,6 +454,7 @@
 				this.openScanPopup();
 			},
 			getToLocationCode(location, code) {
+				console.log( JSON.stringify(this.editItem) )
 				if (this.fromLocationCode == code) {
 					uni.showToast({
 						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
@@ -452,7 +462,59 @@
 					})
 					return
 				}
-				this.toLocationCode = code;
+				var item = this.editItem.subList[0]
+				if(item){
+					var param ={
+						batch:item.batch,
+						inventoryStatus:item.inventoryStatus,
+						itemCode:item.itemCode,
+						toLocationCode:item.toLocationCode,
+						expectinNumber: item.packingNumber + "-" + Date.now(),
+					}
+					checkItemCodeAndLocation(param).then(res=>{
+						if(res.data.recommendFlag){
+							this.editItem.toLocationCode = code;
+						}else {
+							if(res.data.errorMsg){
+								this.showErrorMessage(res.data.errorMsg)
+							}else {
+								if(res.data.balanceMsg){
+									this.$refs.comMessage.showQuestionMessage('已经有库存余额,是否继续上架?', res => {
+										if (res) {
+										}else {
+											this.removeRecommendLocation(res.data.recommendList)
+										}
+									});
+								}else {
+									this.editItem.toLocationCode = code;
+								}
+							}
+							
+						}
+					}).catch(error=>{
+						this.showErrorMessage(error)
+					})
+					
+				}
+			},
+			
+			//移除推荐的预占用库位
+			removeRecommendLocation(lst) {
+				let param = {
+					expectinNumberList: lst,
+				};
+				recommendLocationRemoveExpectin(param).then(res => {
+			
+				}).catch(err => {
+					this.showErrorMessage('【' + lst.join(',') + '】移除预占用失败,请在PC端的预占用中移除')
+				})
+			},
+			
+			showScanToLocation(item) {
+				this.editItem = item;
+				setTimeout(r => {
+					this.$refs.scanToLocationCode.openScanPopup();
+				})
 			},
 
 			showCommitSuccessMessage(hint) {
@@ -460,6 +522,17 @@
 					this.clear();
 				})
 			},
+			
+			showQuestionMessage(hint) {
+				this.$refs.comMessage.showQuestionMessage('已经有库存余额,是否继续上架?', res => {
+					if (res) {
+					}else {
+						
+					}
+				});
+			},
+			
+			
 
 			clear() {
 				this.fromLocationInfo = {};
@@ -467,6 +540,7 @@
 				this.fromWarehouseCode = '';
 				this.toWarehouseCode = '';
 				this.detailSource = [];
+				this.editItem ={}
 			}
 		}
 	}