From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/boxing.vue | 117 ++++++++++++++++++++++++++--------------------------------
1 files changed, 52 insertions(+), 65 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
index fbddaf8..06517fe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
@@ -8,11 +8,11 @@
<uni-forms label-width="180">
<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" />
+ v-model="materSn" @confirm="snInput" />
</uni-forms-item>
<uni-forms-item :label="Testlabel" v-if="Test">
<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
@@ -61,11 +61,11 @@
<uni-forms label-width="120">
<uni-forms-item label="鎵樼洏鏉＄爜">
<uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
+ placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @confirm="inputChangebarcode" />
</uni-forms-item>
<uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" :disabled="addressdisabled" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
+ <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
+ placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput' :focus="addressFocus" />
</uni-forms-item>
<uni-forms-item>
<button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
@@ -102,30 +102,10 @@
</view>
<view v-if="current === 2" class="headerstyle">
<view class="itemstyle">
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
- <!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
- <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity}}</view>
- <view style="font-size: 18px;">鍗曚綅锛歿{item.unit}}</view>
- <view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 3" 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" />
+ v-model="pkmaterSn" @confirm="pksnInput" />
</uni-forms-item>
<uni-forms-item>
<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">鍏ュ钩搴�</button>
@@ -189,8 +169,8 @@
Testlabel: "",
Testplaceholder: "",
Testcheck: false,
- Summmary:0,
- stockInfoDetail:[],
+ Summmary: 0,
+ stockInfoDetail: [],
addressdisabled: false,
pksns: [],
pkmaterSn: "",
@@ -214,22 +194,21 @@
this.Initiallife = 16;
} else if (this.warehouseId == 5) { //杈呮枡浠撳簱鍖篒D
this.address = "8005";
- }else if (this.warehouseId == 3) { //杈呮枡浠撳簱鍖篒D
- this.address = "1011";
- this.addressdisabled = true;
- }else if (this.warehouseId == 5) { //杈呮枡
this.items.push("鍏ュ钩搴�");
this.items[1] = "鍏ョ珛搴�";
this.address = "8005";
+ } else if (this.warehouseId == 3) { //杈呮枡浠撳簱鍖篒D
+ this.address = "1011";
+ this.addressdisabled = true;
}
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
this.getData();
},
methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
+ // voiceSpeech(src) {
+ // innerAudioContext.src = src; // '../../static/success.mp3';
+ // innerAudioContext.play();
+ // },
//wms鍏ュ钩搴�
pksubmit() {
if (this.pkmatInfos.length == 0) {
@@ -239,8 +218,9 @@
})
return;
}
- this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId, this
+ this.$u.post('/api/InboundOrder/WMSInPinKu?warehouseId=' + this.warehouseId, this
.pksns).then(res => {
+ debugger
if (res.status) {
this.$refs.uToast.show({
title: "鍏ュ簱鎴愬姛",
@@ -274,23 +254,23 @@
title: res.message,
type: "error"
})
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
return;
}
- setTimeout(() => {
- this.voiceSpeech('../../static/success.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.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
}
})
}
@@ -444,19 +424,23 @@
}
if (this.materSn != "") {
this.focus = false;
- if(this.materSn.split(',').length != 6){
+ 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 = "";
+ 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.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId ==
+ 3) {
if (this.matInfos.length > 0) {
this.matInfos = [];
}
@@ -467,22 +451,22 @@
title: res.message,
type: "error"
})
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
return;
}
- setTimeout(() => {
- this.voiceSpeech('../../static/success.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.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
}
})
}
@@ -513,7 +497,10 @@
this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
if (res.status) {
this.inboundBarcode = "";
- if (this.warehouseId != 5) this.address = "";
+ if (this.warehouseId != 5 && this.warehouseId != 3) this.address = "";
+ this.stockInfoDetail = [];
+ //鑾峰彇鎬绘暟閲�
+ this.Summmary = 0;
setTimeout(() => {
this.addressFocus = false;
this.$refs.uToast.show({
@@ -553,12 +540,12 @@
// this.stockInfo = [];
this.stockInfoDetail = [];
if (res.status) {
- // this.stockInfo = res.data,
- this.stockInfoDetail = res.data.details
- //鑾峰彇鎬绘暟閲�
- this.stockInfoDetail.forEach(item => {
- this.Summmary+= item.stockQuantity;
- });
+ // this.stockInfo = res.data,
+ this.stockInfoDetail = res.data.details
+ //鑾峰彇鎬绘暟閲�
+ this.stockInfoDetail.forEach(item => {
+ this.Summmary += item.stockQuantity;
+ });
} else {
this.$refs.uToast.show({
// title: "鏈壘鍒版墭鐩樹俊鎭�",
--
Gitblit v1.9.3