From 67348f250a1b7970059698002949a5e0a5f3c52f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 14 八月 2025 08:51:04 +0800
Subject: [PATCH] 上传最新代码

---
 项目代码/龙利得PDA/pages/stash/boxing.vue |  519 ++++-----------------------------------------------------
 1 files changed, 37 insertions(+), 482 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\351\276\231\345\210\251\345\276\227PDA/pages/stash/boxing.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\351\276\231\345\210\251\345\276\227PDA/pages/stash/boxing.vue"
index ead7682..917db35 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\351\276\231\345\210\251\345\276\227PDA/pages/stash/boxing.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\351\276\231\345\210\251\345\276\227PDA/pages/stash/boxing.vue"
@@ -6,57 +6,30 @@
 			<view v-if="current === 0" class="headerstyle">
 				<view class="itemstyle">
 					<uni-forms label-width="180">
-						<uni-forms-item label="鎵樼洏鏉$爜:">
+						<uni-forms-item label="鏉$爜:">
 							<uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="!focus"
-								v-model="barcode" @input="barcodeInput" />
+								v-model="barcode" @confirm="barcodeInput" />
 						</uni-forms-item>
-						<uni-forms-item label="鍐呯鏍囩:">
-							<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
-								v-model="materSn" @input="snInput" />
+						<uni-forms-item label="鐗╂枡:">
+							<uni-easyinput type="text" placeholder="璇疯緭鍏ョ墿鏂�" ref='midInput' v-model="materSn" />
 						</uni-forms-item>
-						<uni-forms-item :label="Testlabel" v-if="Test">
-							<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
-								v-model="Initiallife" />
+						<uni-forms-item label="鐩村緞:">
+							<uni-easyinput type="text" placeholder="璇疯緭鍏ョ洿寰�(mm)" ref='midInput' v-model="thickness" />
 						</uni-forms-item>
-						<!-- <uni-forms-item>
-							<checkbox checked="check">鏄惁婊$洏</checkbox>
-						</uni-forms-item> -->
+						<uni-forms-item label="骞呭:">
+							<uni-easyinput type="text" placeholder="璇疯緭鍏ュ箙瀹�(mm)" ref='midInput' v-model="wide" />
+						</uni-forms-item>
+						<uni-forms-item label="閲嶉噺:">
+							<uni-easyinput type="text" trim="all" placeholder="璇疯緭鍏ラ噸閲�(kg)" ref='midInput'
+								v-model="weight" />
+						</uni-forms-item>
 						<uni-forms-item>
 							<button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
 						</uni-forms-item>
 					</uni-forms>
-					<uni-list>
-						<!-- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
-							<template v-slot:body>
-								<view class="uni-list-box">
-									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
-										<view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
-									</view>
-								</view>
-							</template>
-						</uni-list-item> -->
-						<uni-list-item direction="column" v-for="(item,index) in matInfos" :key="index">
-							<template v-slot:body>
-								<view class="uni-list-box">
-									<uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
-										@click="deleteList(index)">
-									</uni-icons>
-									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
-										<view class="uni-note">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
-										<view class="uni-note">鎵规鍙凤細{{item.lotNo}}</view>
-										<view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
-										<view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
-										<view class="uni-note">鏈夋晥鏈燂細{{item.effectiveDate}}</view>
-									</view>
-								</view>
-							</template>
-						</uni-list-item>
-					</uni-list>
 				</view>
 			</view>
-			<view v-if="current === 1" class="headerstyle">
+			<view v-if="current === 1" class="headerstyle" >
 				<view class="itemstyle">
 					<uni-forms label-width="120">
 						<uni-forms-item label="鎵樼洏鏉$爜">
@@ -72,65 +45,6 @@
 						</uni-forms-item>
 					</uni-forms>
 				</view>
-				<view>
-					<uni-list>
-						<uni-list-item direction="column" v-if="inboundBarcode">
-							<template v-slot:body>
-								<view class="uni-list-box">
-									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">缁勭洏鎬绘暟閲忥細{{Summmary}}</view>
-									</view>
-								</view>
-							</template>
-						</uni-list-item>
-						<uni-list-item direction="column" v-for="(item,index) in stockInfoDetail" :key="index">
-							<template v-slot:body>
-								<view class="uni-list-box">
-									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
-										<view class="uni-note">鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
-										<view class="uni-note">鐗╂枡鎵规锛歿{item.batchNo}}</view>
-										<view class="uni-note">缁勭洏鏁伴噺锛歿{item.stockQuantity}}</view>
-										<view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
-										<view class="uni-note">鏈� 鏁� 鏈燂細{{item.effectiveDate}}</view>
-									</view>
-								</view>
-							</template>
-						</uni-list-item>
-					</uni-list>
-				</view>
-			</view>
-			<view v-if="current === 2" class="headerstyle">
-				<view class="itemstyle">
-					<uni-forms label-width="180">
-						<uni-forms-item label="鍐呯鏍囩:">
-							<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="pkfocus"
-								v-model="pkmaterSn" @input="pksnInput" />
-						</uni-forms-item>
-						<uni-forms-item>
-							<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">鍏ュ钩搴�</button>
-						</uni-forms-item>
-					</uni-forms>
-					<uni-list>
-						<uni-list-item direction="column" v-for="(item,index) in pkmatInfos" :key="index">
-							<template v-slot:body>
-								<view class="uni-list-box">
-									<uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
-										@click="pkdeleteList(index)">
-									</uni-icons>
-									<view class="uni-content">
-										<view class="uni-title-sub uni-ellipsis-2">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
-										<view class="uni-note">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
-										<view class="uni-note">鎵规鍙凤細{{item.lotNo}}</view>
-										<view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
-										<view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
-										<view class="uni-note">鏈夋晥鏈燂細{{item.effectiveDate}}</view>
-									</view>
-								</view>
-							</template>
-						</uni-list-item>
-					</uni-list>
-				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -143,332 +57,36 @@
 		data() {
 			return {
 				items: ['缁勭洏', '鍏ュ簱'], //, '鍗曟嵁淇℃伅', '瑙g洏'
-				current: 0,
-				matTotal: [],
-				matInfos: [],
-				orderNo: "",
-				label: "",
-				orderInfo: [],
-				focus: false,
-				pkfocus: false,
+				materSn:"",
+				wide:"",
+				weight:"",
+				thickness:"",
 				barcode: "",
-				materSn: "",
-				Initiallife: 1000,
-				sns: [],
-				sn: "",
-				addressFocus: false,
+				focus:false,
 				inboundBarcode: "",
 				address: "",
-				check: true,
-				value: "",
-				matInfo: [],
-				value2: "",
-				matTotals: [],
+				addressdisabled: true,
+				addressFocus: false,
+				current: 0,
+				orderNo: "",
 				warehouseId: "",
 				Test: false,
-				Testlabel: "",
-				Testplaceholder: "",
-				Testcheck: false,
-				Summmary: 0,
-				stockInfoDetail: [],
-				addressdisabled: false,
-				pksns: [],
-				pkmaterSn: "",
-				pkmatInfos: []
 			}
 		},
 		onShow() {},
 		onLoad(res) {
 			this.focus = false;
 			this.addressFocus = false;
-			this.orderNo = res.orderNo;
 			this.warehouseId = res.warehouseId;
-			if (this.warehouseId == 6) { //娴嬭瘯鏋朵粨搴撳尯ID
-				this.Test = true;
-				this.Testlabel = "鍒濆瀵垮懡:";
-				this.Testplaceholder = "璇疯緭鍏ュ垵濮嬪鍛�";
-			} else if (this.warehouseId == 2) { //娌瑰ⅷ浠撳簱鍖篒D
-				this.Test = true;
-				this.Testlabel = "鏁伴噺:";
-				this.Testplaceholder = "璇疯緭鍏ユ暟閲�";
-				this.Initiallife = 16;
-			} else if (this.warehouseId == 5) { //杈呮枡浠撳簱鍖篒D
-				this.address = "8005";
-				this.items.push("鍏ュ钩搴�");
-				this.items[1] = "鍏ョ珛搴�";
-				this.address = "8005";
-			} else if (this.warehouseId == 3) { //杈呮枡浠撳簱鍖篒D
-				this.address = "1011";
-				this.addressdisabled = true;
+			if (this.warehouseId == 1) { 
+				this.items=['缁勭洏'];
 			}
-			this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
-			this.getData();
 		},
 		methods: {
-			// voiceSpeech(src) {
-			// 	innerAudioContext.src = src; // '../../static/success.mp3';
-			// 	innerAudioContext.play();
-			// },
-			//wms鍏ュ钩搴�
-			pksubmit() {
-				if (this.pkmatInfos.length == 0) {
-					this.$refs.uToast.show({
-						title: "璇锋壂鎻忓唴绠辨爣绛�",
-						type: 'error'
-					})
-					return;
-				}
-				this.$u.post('/api/InboundOrder/WMSInPinKu?warehouseId=' + this.warehouseId, this
-					.pksns).then(res => {
-					debugger
-					if (res.status) {
-						this.$refs.uToast.show({
-							title: "鍏ュ簱鎴愬姛",
-							type: "success"
-						})
-						this.focus = false;
-						this.pkmatInfos = [];
-						this.pksns = [];
-					} else {
-						this.$refs.uToast.show({
-							title: res.message,
-							type: "error"
-						})
-					}
-				})
-			},
-			pksnInput() {
-				this.$nextTick(() => {
-					if (this.pkmaterSn != "") {
-						this.focus = false;
-						var matSn = this.pkmaterSn;
-						setTimeout(() => {
-							this.pkmaterSn = "";
-						}, 10);
-						this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
-							if (res.status) {
-								this.pksns.push(res.data.serialNumber);
-								this.pkmatInfos.push(res.data);
-								if (!res.status) {
-									this.$refs.uToast.show({
-										title: res.message,
-										type: "error"
-									})
-									// setTimeout(() => {
-									// 	this.voiceSpeech('../../static/fail.mp3');
-									// }, 100);
-									return;
-								}
-								// setTimeout(() => {
-								// 	this.voiceSpeech('../../static/success.mp3');
-								// }, 100);
-								return;
-							} else {
-								this.$refs.uToast.show({
-									title: res.message,
-									type: "error"
-								})
-								// setTimeout(() => {
-								// 	this.voiceSpeech('../../static/fail.mp3');
-								// }, 100);
-							}
-						})
-					}
-				})
-			},
-			//瑙g洏
-			releasebox() {
-				if (this.value.length == 0) {
-					this.$refs.uToast.show({
-						title: "璇锋壂鐮�",
-						type: "error"
-					})
-					return;
-				}
-				var param;
-				var matInfo = this.value.split('|');
-				if (matInfo.length == 7) {
-					param = {
-						MainData: {
-							"innerCode": this.value
-						}
-					}
-				} else {
-					param = {
-						MainData: {
-							"barcode": this.value
-						}
-					}
-				}
-				this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
-					if (resdt.status) {
-						uni.$showMsg('瑙g洏鎴愬姛!')
-						this.value = "";
-						this.matInfo = [];
-						this.matTotals = [];
-						this.value2 = "";
-					} else {
-						this.$refs.uToast.show({
-							title: resdt.message,
-							type: "error"
-						})
-					}
-				})
-			},
-			releaseboxInput() {
-				this.$nextTick(() => {
-					if (this.value.length == 0) {
-						return;
-					}
-					var matInfo = this.value.split('|');
-					this.matInfo = [];
-					if (matInfo.length == 7) {
-						this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
-							MainData: {
-								"innerCode": this.value
-							}
-						}).then(res => {
-							if (res.status) {
-								this.matInfo = res.data.stockInfo;
-								this.matTotals = res.data.stockTotal;
-								this.value2 = res.data.barcode;
-							} else {
-								this.$refs.uToast.show({
-									title: res.message,
-									type: "error"
-								})
-							}
-						})
-					} else {
-						this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
-							MainData: {
-								"barcode": this.value
-							}
-						}).then(res => {
-							if (res.status) {
-								this.matInfo = res.data.stockInfo;
-								this.matTotals = res.data.stockTotal;
-								this.value2 = res.data.barcode;
-							} else {
-								this.$refs.uToast.show({
-									title: res.message,
-									type: "error"
-								})
-							}
-						})
-					}
-				})
-			},
-
-			updateFocus() {
-				debugger
-				this.$nextTick(() => {
-					this.materSn = '';
-					if (!this.focus) {
-						this.focus = true;
-					}
-				});
-			},
-			barcodeFocus() {
-				debugger
-				this.barcode = '';
-				if (this.focus) {
-					this.focus = false;
-				}
-			},
-			getData() {
-				var postData = {
-					MainData: {
-						orderNo: this.orderNo
-					},
-				}
-				this.$u.post('/api/InboundOrderDetail/GetInboundOrderDetails', postData).then((res) => {
-					if (res.status) {
-						this.orderInfo = res.data;
-						if (this.orderInfo.length > 3) {
-							this.loadVisible = true;
-						}
-					}
-				})
-			},
-			onClickItem(e) {
-				this.focus = false;
-				this.addressFocus = false;
-				if (this.current !== e.currentIndex) {
-					this.current = e.currentIndex;
-					if (this.current == 2) {
-						this.getData();
-					}
-				}
-			},
 			barcodeInput() {
 				this.$nextTick(function(x) {
 					if (this.barcode.length > 0) {
-						// if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
 						this.focus = true;
-						// } else {
-						// 	this.$refs.uToast.show({
-						// 		title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
-						// 		type: "error"
-						// 	})
-						// }
-					}
-				})
-			},
-			snInput() {
-				this.$nextTick(() => {
-					if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId == 3) {
-						if (this.sns.length > 0) {
-							this.sns = [];
-						}
-					}
-					if (this.materSn != "") {
-						this.focus = false;
-						if(this.warehouseId==11){
-							this.materSn=this.materSn.replace(/,SC.*/, '');
-						}
-						if (this.materSn.split(',').length != 6) {
-							this.materSn = "";
-							return;
-						}
-						var matSn = this.materSn;
-						//setTimeout(() => {
-						this.materSn = "";
-						//}, 10);
-						this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
-							this.Testcheck = false;
-							if (res.status) {
-								this.sns.push(res.data.serialNumber);
-								if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId ==
-									3) {
-									if (this.matInfos.length > 0) {
-										this.matInfos = [];
-									}
-								}
-								this.matInfos.push(res.data);
-								if (!res.status) {
-									this.$refs.uToast.show({
-										title: res.message,
-										type: "error"
-									})
-									// setTimeout(() => {
-									// 	this.voiceSpeech('../../static/fail.mp3');
-									// }, 100);
-									return;
-								}
-								// setTimeout(() => {
-								// 	this.voiceSpeech('../../static/success.mp3');
-								// }, 100);
-							} else {
-								this.$refs.uToast.show({
-									title: res.message,
-									type: "error"
-								})
-								// setTimeout(() => {
-								// 	this.voiceSpeech('../../static/fail.mp3');
-								// }, 100);
-							}
-						})
 					}
 				})
 			},
@@ -521,88 +139,25 @@
 					})
 				})
 			},
-			inputChangebarcode() {
-				this.addressFocus = false;
-				this.$nextTick(function(x) {
-					if (this.inboundBarcode != '') {
-						this.addressFocus = true;
-					}
-				})
-				this.$nextTick(function(x) {
-					if (this.inboundBarcode != '') {
-						var postData = {
-							MainData: {
-								"barcode": this.inboundBarcode,
-								"warehouseId": this.warehouseId,
-							}
-						};
-						this.$u.post('/api/StockInfo/StockQueryData', postData).then(res => {
-							// this.stockInfo = [];
-							this.stockInfoDetail = [];
-							if (res.status) {
-								// this.stockInfo = res.data,
-								this.stockInfoDetail = res.data.details
-								//鑾峰彇鎬绘暟閲�
-								this.stockInfoDetail.forEach(item => {
-									this.Summmary += item.stockQuantity;
-								});
-							} else {
-								this.$refs.uToast.show({
-									// title: "鏈壘鍒版墭鐩樹俊鎭�",
-									title: res.message,
-									type: "error"
-								})
-							}
-						})
-					}
-				})
-			},
-			deleteList(res) {
-				this.matInfos.splice(res, 1);
-				this.sns.splice(res, 1);
-			},
 			submit() {
 				if (this.barcode == "") {
 					this.$refs.uToast.show({
-						title: "璇锋壂鎻忔墭鐩樻潯鐮�",
+						title: "璇锋壂鎻忔潯鐮�",
 						type: 'error'
 					})
 					return;
 				}
-				if (this.matInfos.length == 0) {
-					this.$refs.uToast.show({
-						title: "璇锋壂鎻忓唴绠辨爣绛�",
-						type: 'error'
-					})
-					return;
-				}
-				if (this.Test) {
-					if (!this.Testcheck) {
-						this.Testcheck = true;
-						if (this.warehouseId == 2) {
-							this.$refs.uToast.show({
-								title: "璇风‘璁ゆ暟閲�",
-								type: 'error'
-							})
-						} else if (this.warehouseId == 6) {
-							this.$refs.uToast.show({
-								title: "璇风‘璁ゅ垵濮嬪鍛�",
-								type: 'error'
-							})
-						}
-						return;
-					}
-				}
-				if (this.warehouseId == 2) { //娌瑰ⅷ浠撳簱鍖篒D
-					this.sn = this.sns[0];
-					for (var i = 0; i < this.Initiallife - 1; i++) {
-						this.sns.push(this.sn);
-					}
-				}
-				let url = 'palletCode=' + this.barcode + '&initiallife=' + this.Initiallife + '&warehouseId=' + this
-					.warehouseId;
-
-				this.$u.post('/api/InboundOrder/ManualMaterielGroup?' + url, this.sns).then(res => {
+				this.$u.post('/api/StockInfo/ManualMaterielGroup' ,{
+					MainData: {
+						"palletCode": this.barcode,
+						"thickness": this.thickness,
+						"weight": this.weight,
+						"wide": this.wide,
+						"materSn": this.materSn,
+						// "isFull": this.check
+						"warehouseId": this.warehouseId
+					},
+				}).then(res => {
 					this.Testcheck = false;
 					if (res.status) {
 						this.$refs.uToast.show({

--
Gitblit v1.9.3