From 95e39ae7aecd6e1016c71cf5ae70a680d8f569bb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:48:30 +0800
Subject: [PATCH] 上传最新代码

---
 代码管理/淮安PDA/pages/stash/raworderboxing.vue |  169 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 92 insertions(+), 77 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
index 763d4d7..18d1f65 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
@@ -27,7 +27,8 @@
 						</uni-forms-item> -->
 						<uni-forms-item>
 							<view style="display: flex;justify-content: space-around;margin-top: 2%;">
-								<button @click="reset" type="default" size="default" style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
+								<button @click="reset" type="default" size="default"
+									style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
 								<button @click="submit" type="primary" size="default" style="width: 160rpx;">缁勭洏</button>
 							</view>
 						</uni-forms-item>
@@ -89,6 +90,8 @@
 									<view class="uni-content">
 										<view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
 										<view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
+										<view>鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
+										<view>鐗╂枡瑙勬牸锛歿{item.materielSpec}}</view>
 										<!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
 										<view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity+item.unit}}</view>
 										<view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
@@ -103,17 +106,19 @@
 				<view class="itemstyle">
 					<uni-forms label-width="180">
 						<uni-forms-item label="鍐呯鏍囩:">
-							<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="pkfocus"
+							<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="!pkfocus"
 								v-model="pkmaterSn" @input="pksnInput" />
 						</uni-forms-item>
-						
+
 						<uni-forms-item>
 							<view style="display: flex;justify-content: space-around;margin-top: 2%;">
-								<button @click="resetInPk" type="default" size="default" style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
-								<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">鍏ュ钩搴�</button>
+								<button @click="resetInPk" type="default" size="default"
+									style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
+								<button @click="pksubmit" type="primary" size="default"
+									style="margin-top: 2%;">鍏ュ钩搴�</button>
 							</view>
 						</uni-forms-item>
-						
+
 					</uni-forms>
 					<uni-list>
 						<uni-list-item direction="column" v-for="(item,index) in pkmatInfos" :key="index">
@@ -205,10 +210,10 @@
 			this.getData();
 		},
 		methods: {
-			voiceSpeech(src) {
-				innerAudioContext.src = src; // '../../static/success.mp3';
-				innerAudioContext.play();
-			},
+			// voiceSpeech(src) {
+			// 	innerAudioContext.src = src; // '../../static/success.mp3';
+			// 	innerAudioContext.play();
+			// },
 			updateFocus() {
 				debugger
 				this.$nextTick(() => {
@@ -269,77 +274,86 @@
 					if (this.materSn != "") {
 						this.focus = false;
 						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);
-
-								this.matInfos.push(res.data);
-								if (res.message) {
+						if (this.warehouseId == 11) {
+							matSn = matSn.replace(/,SC.*/, '');
+						}
+						//鏌ヨmatSn鏄惁瀛樺湪瀛楃
+						if(matSn.indexOf("POHA")>0){
+							this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
+								this.Testcheck = false;
+								if (res.status) {
+									this.sns.push(res.data.serialNumber);
+							
+									this.matInfos.push(res.data);
+									if (res.message) {
+										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);
-									return;
+									// setTimeout(() => {
+									// 	this.voiceSpeech('../../static/fail.mp3');
+									// }, 100);
 								}
-								setTimeout(() => {
-									this.voiceSpeech('../../static/success.mp3');
-								}, 100);
-							} else {
-								this.$refs.uToast.show({
-									title: res.message,
-									type: "error"
-								})
-								setTimeout(() => {
-									this.voiceSpeech('../../static/fail.mp3');
-								}, 100);
-							}
-						})
+							})
+						}
+						setTimeout(() => {
+							this.materSn = "";
+						}, 100);
 					}
 				})
 			},
 			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) {
+						
+						if(matSn.indexOf("POHA")>0){
+							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);
-									return;
+									// setTimeout(() => {
+									// 	this.voiceSpeech('../../static/fail.mp3');
+									// }, 100);
 								}
-								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);
-							}
-						})
+							})
+						}
+						setTimeout(() => {
+							this.pkmaterSn = "";
+						}, 100);
 					}
 				})
 			},
@@ -405,19 +419,20 @@
 				this.pkmatInfos.splice(res, 1);
 				this.pksns.splice(res, 1);
 			},
-			reset(){
-				this.barcode="";
-				this.matInfos=[];
-				this.sns=[];
-				this.materSn="";
-				if(this.warehouseId=!6){
-					this.Initiallife=0;
+			reset() {
+				this.barcode = "";
+				this.matInfos = [];
+				this.sns = [];
+				this.materSn = "";
+				if (this.warehouseId = !6) {
+					this.Initiallife = 0;
 				}
 			},
-			resetInPk(){
-				this.pkmaterSn="";
-				this.pkmatInfos=[];
-				this.pksns=[];
+			resetInPk() {
+				this.pkmaterSn = "";
+				this.pkfocus = false;
+				this.pkmatInfos = [];
+				this.pksns = [];
 			},
 			pksubmit() {
 				if (this.pkmatInfos.length == 0) {
@@ -434,7 +449,7 @@
 							title: "鍏ュ簱鎴愬姛",
 							type: "success"
 						})
-						this.focus = false;
+						this.pkfocus = false;
 						this.pkmatInfos = [];
 						this.pksns = [];
 					} else {
@@ -505,7 +520,7 @@
 						this.sns = [];
 						this.matTotal = [];
 						if (this.warehouseId != 6) { //娴嬭瘯鏋朵粨搴撳尯ID
-							this.Initiallife="";
+							this.Initiallife = "";
 						}
 					} else {
 						this.$refs.uToast.show({

--
Gitblit v1.9.3