From ce2df660b06ea96efb0c491dfaa5349ddaa779e1 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 20 Dec 2023 17:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=99=A8=E5=85=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/qty/qty.vue                     |   1 -
 mycomponents/record/recordComDetailCard.vue  |   4 +-
 mycomponents/scan/winScanContainer.vue       |  19 +--
 mycomponents/scan/winScanPackAndLocation.vue |  76 ++++++-----
 pages.json                                   |   4 +-
 pages/pallet/record/bindPalletRecord.vue     | 128 +++++++++++++++----
 static/config.json                           |   3 +-
 7 files changed, 168 insertions(+), 67 deletions(-)

diff --git a/mycomponents/qty/qty.vue b/mycomponents/qty/qty.vue
index b3a8f0cb..f2d55dcc 100644
--- a/mycomponents/qty/qty.vue
+++ b/mycomponents/qty/qty.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="center uni-column">
 		<view class="uni-flex uni-row">
-			{{dataContent.inventoryStatus}}
 			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 			<view class="text_default center">
 				{{Number(dataContent.qty)}}
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index f369ba2b..797dae48 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -43,7 +43,7 @@
 
 	import {
 		getDetailOption,
-		getDetailEditRemoveOption,
+		getDetailRemoveOption,
 		getClearOption
 	} from '@/common/array.js';
 	export default {
@@ -113,7 +113,7 @@
 
 		mounted() {
 			this.detailOptions = getDetailOption();
-			this.scanOptions = getDetailEditRemoveOption();
+			this.scanOptions = getDetailRemoveOption();
 			this.removeOptions = getClearOption();
 		},
 
diff --git a/mycomponents/scan/winScanContainer.vue b/mycomponents/scan/winScanContainer.vue
index 726caa1d..dae2d39b 100644
--- a/mycomponents/scan/winScanContainer.vue
+++ b/mycomponents/scan/winScanContainer.vue
@@ -23,9 +23,8 @@
 </template>
 
 <script>
-	 
 	import {
-		getBasicLocationByCode,
+		getContainerByNumber
 	} from '@/api/request2.js';
 	import winComScan from '@/mycomponents/scan/winComScan.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
@@ -74,14 +73,18 @@
 					mask: true
 				});
 				let label = result.label;
-				this.code = label.Container;
-				getBalanceByContainer(this.code).then(res => {
+				this.code = label.container;
+				getContainerByNumber(this.code).then(res => {
 					uni.hideLoading();
-					if (res.data.length > 0) {
-						this.containerInfo = res.data[0];
-						this.callBack();
+					if (res.data.list.length > 0) {
+						this.containerInfo = res.data.list[0];
+						if (this.containerInfo.status == 'USED') {
+							this.callBack();
+						} else {
+							this.showErrorMessage("器具[" + this.code + "]状态是[" + this.containerInfo.status + "],不可以绑定")
+						}
 					} else {
-						this.showErrorMessage("托码[" + this.code + "]没查询到")
+						this.showErrorMessage("未查找到器具[" + this.code + "]")
 					}
 				}).catch(error => {
 					uni.hideLoading();
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 1a61c33d..c61dd364 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -16,15 +16,25 @@
 					background-color: #fff; 
 					margin-left: 20rpx;
 					margin-right: 20rpx;
-					border-radius: 8rpx;">
+					border-radius: 8rpx;
+					height: 30px;">
 					<view class="uni-center" style="width: 25%; ">
 						来源库位
 					</view>
 					<view class="" style="width: 75%;padding: 8rpx">
 						<!-- <input v-model="fromLocationCode" placeholder="请扫描来源库位" :focus="locationOnFocus"
 							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
-						<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
-							@confirm="scanLocation"></uni-combox>
+
+						<view v-if='allowModifyLocation'>
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
+								@confirm="scanLocation"></uni-combox>
+						</view>
+						<view v-else>
+							<text style="padding: 5px">
+								{{fromLocationCode}}
+							</text>
+						</view>
+
 					</view>
 				</view>
 				<view class="">
@@ -47,11 +57,11 @@
 	import {
 		getBalanceByManagementPrecision,
 	} from '@/common/balance.js';
-	
+
 	import {
 		getBasicLocationByCode,
 	} from '@/api/request2.js';
-	
+
 	import {
 		getListLocationTypeDesc,
 		checkDirectoryItemExist,
@@ -80,6 +90,11 @@
 				type: Boolean,
 				default: false
 			},
+			//是否允许修改库位
+			allowModifyLocation: {
+				type: Boolean,
+				default: true
+			},
 		},
 		data() {
 			return {
@@ -97,7 +112,7 @@
 				businessType: {},
 				inventoryStatus: [],
 				managementPrecision: '',
-				fromInventoryStatuses:""
+				fromInventoryStatuses: ""
 			}
 		},
 		created() {
@@ -132,7 +147,7 @@
 						this.fromLocationCode = this.fromLocationList[0];
 					}
 				}
-				this.$refs.popup.open('bottom');  
+				this.$refs.popup.open('bottom');
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
@@ -191,7 +206,7 @@
 			},
 
 			getScanResult(result) {
-				console.log("扫描",result)
+				console.log("扫描", result)
 				if (this.fromLocationCode == '' || this.fromLocationCode == null) {
 					this.showMessage('请先扫描来源库位', callback => {
 						this.locationGetFocus();
@@ -200,17 +215,18 @@
 				} else {
 					if (result.label != null) {
 						this.scanResult = result;
-						getBalanceByManagementPrecision(result.label,this.fromLocationCode,this.fromInventoryStatuses,res=>{
-							if(res.success){
-								this.managementPrecision =res.managementPrecision
-								this.afterQueryBalance(res.data.list);
-							}else {
-								this.showErrorMessage(res.message, res => {
-									this.packGetFocus();
-								})
-							}
-							
-						});
+						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+							res => {
+								if (res.success) {
+									this.managementPrecision = res.managementPrecision
+									this.afterQueryBalance(res.data.list);
+								} else {
+									this.showErrorMessage(res.message, res => {
+										this.packGetFocus();
+									})
+								}
+
+							});
 					}
 				}
 			},
@@ -243,12 +259,13 @@
 					})
 				} else if (datas.length == 1) {
 					let balance = datas[0];
-					if(balance.qty>0){
+					if (balance.qty > 0) {
 						this.packCallBack(balance);
-					}else {
-						this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为['+balance.qty+"],<br>不可以进行操作", res => {
-							this.packGetFocus();
-						})
+					} else {
+						this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
+							res => {
+								this.packGetFocus();
+							})
 					}
 				} else {
 					this.showBalanceSelect(datas);
@@ -260,12 +277,13 @@
 			},
 
 			selectBalanceItem(balance) {
-				if(balance.qty>0){
+				if (balance.qty > 0) {
 					this.packCallBack(balance);
-				}else {
-					this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为['+balance.qty+"],不可以进行操作", res => {
-						this.packGetFocus();
-					})
+				} else {
+					this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
+						res => {
+							this.packGetFocus();
+						})
 				}
 			},
 
diff --git a/pages.json b/pages.json
index f0985149..5b4732fb 100644
--- a/pages.json
+++ b/pages.json
@@ -1668,14 +1668,14 @@
 		{
 			"path": "pages/pallet/record/bindPalletRecord",
 			"style": {
-				"navigationBarTitleText": "托盘绑定",
+				"navigationBarTitleText": "器具绑定",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/pallet/record/unBindPalletRecord",
 			"style": {
-				"navigationBarTitleText": "托盘解绑",
+				"navigationBarTitleText": "器具解绑",
 				"enablePullDownRefresh": false
 			}
 		},
diff --git a/pages/pallet/record/bindPalletRecord.vue b/pages/pallet/record/bindPalletRecord.vue
index bc0bf03e..6cfafc89 100644
--- a/pages/pallet/record/bindPalletRecord.vue
+++ b/pages/pallet/record/bindPalletRecord.vue
@@ -4,6 +4,13 @@
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<view class="header_item">
+					来源库位：{{fromLocationCode}}
+				</view>
+				<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+			</view>
+
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -20,7 +27,7 @@
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-						<targetContainer ref="scanContainer" title="托盘" :containerCode="containerCode"
+						<targetContainer ref="scanContainer" title="器具" :containerCode="containerCode"
 							@getContainer="getContainer">
 						</targetContainer>
 					</view>
@@ -29,11 +36,12 @@
 					</view>
 				</view>
 			</view>
-			<win-scan-button @goScan='showFromLocationPopup'></win-scan-button>
+			<win-scan-button @goScan='showScanPackagePopup'></win-scan-button>
 		</view>
 		<win-scan-location ref="scanLocationPopup" title="库位" @getLocation="getFromLocation"
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
+		</win-scan-pack-and-location>
 		<!-- <win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack> -->
 		<com-message ref="comMessage"></com-message>
 	</view>
@@ -136,43 +144,80 @@
 			getFromLocation(location) {
 				if (location != null) {
 					this.fromLocationCode = location.code;
-					this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType)
+					this.showScanPackagePopup();
 				}
 			},
 
+			showScanPackagePopup() {
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType)
+			},
+
 			getScanResult(result) {
-				var packingNumber = result.label.packingNumber;
-				var batch = result.label.batch;
-				var qty = result.label.qty;
-				var itemCode = result.label.itemCode;
-				var pack = result.package;
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+
 				var item = this.detailSource.find(res => {
-					if (res.itemCode == itemCode) {
+					if (res.itemCode == balance.itemCode) {
 						return res
 					}
 				})
 				if (item == undefined) {
-					var itemp = createItemInfo(result.label, pack);
-					let newDetail = createDetailInfo(result.label, pack); //
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
+					var itemInfo = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+					itemInfo.subList.push(newDetail);
+					this.detailSource.push(itemInfo)
 				} else {
 					var detail = item.subList.find(r => {
-						if (r.packingNumber == packingNumber) {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
 							return r;
 						}
 					})
+
 					if (detail == undefined) {
-						let newDetail = createDetailInfo(result.label, pack);
+						let newDetail = createDetailInfo(balance, pack);
 						item.subList.push(newDetail);
 					} else {
-						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + packingNumber + "批次[" + batch + "]已经在列表中")
-						}
+						this.showErrorMessage('箱码[' + balance.packingNumber + "]已经在列表中")
 					}
 				}
-				this.calcHandleQty();
-				this.scanPopupGetFocus();
+				calcHandleQty(this.detailSource);
+				// var packingNumber = result.label.packingNumber;
+				// var batch = result.label.batch;
+				// var qty = result.label.qty;
+				// var itemCode = result.label.itemCode;
+				// var pack = result.package;
+				// var item = this.detailSource.find(res => {
+				// 	if (res.itemCode == itemCode) {
+				// 		return res
+				// 	}
+				// })
+				// if (item == undefined) {
+				// 	var itemp = createItemInfo(result.label, pack);
+				// 	let newDetail = createDetailInfo(result.label, pack); //
+				// 	itemp.subList.push(newDetail);
+				// 	this.detailSource.push(itemp)
+				// } else {
+				// 	var detail = item.subList.find(r => {
+				// 		if (r.packingNumber == packingNumber) {
+				// 			return r;
+				// 		}
+				// 	})
+				// 	if (detail == undefined) {
+				// 		let newDetail = createDetailInfo(result.label, pack);
+				// 		item.subList.push(newDetail);
+				// 	} else {
+				// 		if (detail.scaned == true) {
+				// 			this.showErrorMessage("箱码[" + packingNumber + "批次[" + batch + "]已经在列表中")
+				// 		}
+				// 	}
+				// }
+				// this.calcHandleQty();
+				// this.scanPopupGetFocus();
 			},
 
 			showErrorMessage(message) {
@@ -207,11 +252,11 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				this.$refs.scanPopup.packGetFocus();
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				this.$refs.scanPopup.packLoseFocus();
 			},
 
 			commit() {
@@ -219,9 +264,44 @@
 					this.showMessage("请先选择托码")
 					return;
 				}
+
+				if (this.detailSource.length == 0) {
+					return;
+				}
+				let params = this.getParams();
 				console.log("提交" + JSON.stringify(params))
 			},
 
+			getParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				let params = {
+					number: this.containerCode,
+					type: 'bind',
+					status: 'USED',
+					creator: creator
+				};
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.containerContentType = 'PACKAGE';
+							detail.contentNumber = detail.packingNumber;
+
+							detail.itemCode = detail.itemCode;
+							detail.batch = detail.batch;
+							detail.inventoryStatus = detail.inventoryStatus;
+
+							detail.package = null;
+							subList.push(detail)
+						}
+					})
+				})
+				params.subList = subList
+				return params;
+			},
+
+
 			showMessage(message) {
 				setTimeout(r => {
 					this.scanPopupLoseFocus();
@@ -245,7 +325,7 @@
 			},
 
 			getContainer(containerInfo) {
-				this.containerCode = containerInfo.Number;
+				this.containerCode = containerInfo.number;
 			},
 
 			showCommitSuccessMessage(hint) {
diff --git a/static/config.json b/static/config.json
index 67781eb9..7426682e 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,11 +18,12 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/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",
 			"liuchen": "http://192.168.0.159:12080/admin-api",
+			"xuebing": "http://192.168.0.106:12080/admin-api",
 			"dev": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"local": "http://localhost:12080",
 			"desc": "api请求地址"