From 1fcc01cda4e6ae6200370cd109022ebe62fad68e Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 20 Dec 2023 15:26:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/record.js                              |   2 +-
 mycomponents/qty/qty.vue                      |   2 +-
 .../record/productPutawayRecord.vue           | 165 ++++++++++--------
 static/config.json                            |   2 +-
 4 files changed, 96 insertions(+), 75 deletions(-)

diff --git a/common/record.js b/common/record.js
index 353842eb..9b7af65f 100644
--- a/common/record.js
+++ b/common/record.js
@@ -26,7 +26,7 @@ export function createDetailInfo(data, pack) {
 	Object.assign(detail, data)
 	detail.balanceQty = Number(detail.qty)
 	detail.stdPackQty = Number(pack.stdPackQty)
-	detail.stdPackUnit =pack.stdPackUnit
+	detail.stdPackUnit = pack.stdPackUnit
 	detail.package = pack;
 	return detail;
 }
diff --git a/mycomponents/qty/qty.vue b/mycomponents/qty/qty.vue
index b3a8f0cb..b7f2fdfc 100644
--- a/mycomponents/qty/qty.vue
+++ b/mycomponents/qty/qty.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="center uni-column">
 		<view class="uni-flex uni-row">
-			{{dataContent.inventoryStatus}}
+			<!-- {{dataContent.inventoryStatus}} -->
 			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 			<view class="text_default center">
 				{{Number(dataContent.qty)}}
diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue
index d26fbd19..f1dbbdca 100644
--- a/pages/productPutaway/record/productPutawayRecord.vue
+++ b/pages/productPutaway/record/productPutawayRecord.vue
@@ -18,13 +18,14 @@
 				</scroll-view>
 			</view>
 
-			<requiredLocation  v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationTypeList="tolocationTypeList"></requiredLocation>
+			
 
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
+						<requiredLocation   title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -44,15 +45,14 @@
 <script>
 	
 	import {
-		productPutawayRequestSubmit,
 		productPutawayRecordSubmit
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		getPackingNumberAndBatch
+		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
 	import {
-		getManagementPrecisions
+		getPrecisionStrategyList
 	} from '@/common/balance.js';
 	
 	import {
@@ -93,28 +93,19 @@
 		data() {
 			return {
 				id: '',
-				receiptJob: {},
-				received: false,
-				isShowPackingCode: true,
 				scanCount: 0,
 				dataContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
 				fromLocationCode: "",
-				toLocationInfo: {},
 				toLocationCode: "",
-				isShowLocation: false,
 				fromlocationTypeList: [],
 				tolocationTypeList: [],
-				allowModifyLocation: false,
 				inInventoryStatus: "", //目标入库库存状态
 				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
-				showToLoaction:true
+				managementList:[]
 			};
 		},
 		onLoad(option) {
@@ -126,7 +117,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
+					this.showErrorMessage(res.message)
 				}
 			});
 			
@@ -243,79 +234,114 @@
 			},
 
 			commit() {
-				if (this.showToLoaction &&this.toLocationCode == "") {
+				if (this.toLocationCode == "") {
 					this.showMessage("请先选择目标库位")
 					return;
 				}
 				
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				
-					//记录有目标库位，需要查询管理模式
-					var itemCodes = []
-					this.detailSource.forEach(item => {
-						itemCodes.push(item.itemCode)
-					})
-					//获取管理模式，封装参数
-					getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+				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.setRecordParams(true)
-							console.log("提交参数", JSON.stringify(params));
-					
-							// productPutawayRecordSubmit(params).then(res => {
-							// 	uni.hideLoading()
-							// 	if (res.data) {
-							// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data )
-							// 	} else {
-							// 		this.showErrorMessage("提交失败"+res.msg)
-							// 	}
-							// }).catch(error => {
-							// 	uni.hideLoading()
-							// 	this.showErrorMessage(error)
-							// })
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+								productPutawayRecordSubmit(params).then(res => {
+									uni.hideLoading()
+									if (res.data) {
+										this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+									} else {
+										this.showErrorMessage("提交失败[" + res.msg + "]")
+									}
+								}).catch(error => {
+									uni.hideLoading()
+									this.showErrorMessage(error)
+								})
+				
 						} else {
 							uni.hideLoading();
 							this.showErrorMessage(res.message);
 						}
-					});
+				
+					})
+				
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
 
 			},
 			
-			setRecordParams(queryModel) {
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+			
+						}
+					})
+				})
+				return itemList;
+			},
+			
+			setParams() {
+			
 				var subList = []
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							// var subItem = {};
-							// Object.assign(subItem, detail)
-							if (queryModel) {
-								var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-									detail.packingNumber, detail.batch);
-								detail.toPackingNumber = info.packingNumber;;
-								detail.toContainerNumber = detail.containerNumber
-								detail.toBatch = info.batch;
-								detail.toInventoryStatus = detail.inventoryStatus
-								detail.toLocationCode = this.toLocationCode
-							} else {
-								detail.toPackingNumber = detail.packingNumber;
-								detail.toContainerNumber = detail.containerNumber
-								detail.toBatch = detail.toBatch;
-								detail.toInventoryStatus = detail.inventoryStatus
-								detail.toLocationCode = ""
-							}
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							detail.itemCode = detail.itemCode;
+							detail.itemName = detail.package.itemName;
+							detail.itemDesc1 = detail.package.itemDesc1;
+							detail.itemDesc2 = detail.package.itemDesc2;
+							
+							detail.inventoryStatus = detail.inventoryStatus;
+			
+							detail.fromPackingNumber = info.packingNumber;
+							detail.toPackingNumber = info.packingNumber;
+			
+							detail.fromContainerNumber = detail.containerNumber;
+							detail.toContainerNumber = detail.containerNumber
+			
+							detail.fromBatch = info.batch;
+							detail.toBatch = info.batch;
+			
+							detail.fromLocationCode = detail.locationCode;
+							detail.toLocationCode = detail.toLocationCode;
 			
 							subList.push(detail)
 						}
 					})
 				})
-				this.dataContent.subList = subList
+				this.dataContent.subList = subList;
 				this.dataContent.creator = creator;
 				return this.dataContent;
 			},
+		
 
 
 			showMessage(message) {
@@ -346,25 +372,20 @@
 				this.getFromLocationCode(location, code)
 			},
 			getFromLocationCode(location, code) {
-				this.fromLocationInfo = location;
 				this.fromLocationCode = code;
 				this.openScanPopup();
 			},
 			getToLocationCode(location, code) {
-				if (this.fromLocationCode == code) {
-					uni.showToast({
-						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
-						duration: 2000
-					})
-					return
-				}
-				this.ToLocationCodeInfo = location;
 				this.toLocationCode = code;
 			},
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					this.fromLocationCode = '';
+					this.subList = [];
+					this.detailSource = [];
+					this.toLocationCode = '';
+					this.dataContent = {}
 
 				})
 			},
diff --git a/static/config.json b/static/config.json
index 01b08039..67781eb9 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.106:12080/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",