From 225d11e2ddaa55d1d482201cb4d89c9486cdba69 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期五, 20 六月 2025 12:27:52 +0800 Subject: [PATCH] 更新代码 --- 代码管理/淮安PDA/pages/stash/raworderboxing.vue | 423 ++++++++++++++++++++++++---------------------------- 1 files changed, 198 insertions(+), 225 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 94cbf35..ad79014 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" @@ -10,23 +10,27 @@ </uni-forms-item> <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' v-model="Initiallife" /> </uni-forms-item> - + <!-- <uni-forms-item> <checkbox checked="check">鏄惁婊$洏</checkbox> </uni-forms-item> --> <uni-forms-item> - <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button> + <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="submit" type="primary" size="default" style="width: 160rpx;">缁勭洏</button> + </view> </uni-forms-item> </uni-forms> <uni-list> @@ -65,11 +69,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" 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> @@ -86,9 +90,10 @@ <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}}</view> - <view style="font-size: 18px;">鍗曚綅锛歿{item.unit}}</view> + <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity+item.unit}}</view> <view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view> </view> </view> @@ -99,49 +104,36 @@ </view> <view v-if="current === 3" class="headerstyle"> <view class="itemstyle"> - <uni-forms label-width="120"> - <uni-forms-item> - <uni-easyinput type="text" @input="releaseboxInput" v-model="value" placeholder="璇锋壂鐮�" - ref='midInput' :focus="true" /> + <uni-forms label-width="180"> + <uni-forms-item label="鍐呯鏍囩:"> + <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="!pkfocus" + v-model="pkmaterSn" @confirm="pksnInput" /> </uni-forms-item> + <uni-forms-item> - <button @click="releasebox" type="primary" size="default">瑙g洏</button> + <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> + </view> </uni-forms-item> + </uni-forms> <uni-list> - <uni-list-item direction="column" v-if="value2"> + <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">鎵樼洏鍙凤細{{value2}}</view> - </view> - </view> - </template> - </uni-list-item> - <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 matInfo" :key="index"> - <template v-slot:body> - <view class="uni-list-box"> - <view class="uni-content"> - <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;"> - 鐗╂枡缂栫爜锛歿{item.matCode}} - </view> - <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;"> - 鐗╂枡鍚嶇О锛歿{item.matName}} - </view> - <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;"> - 鏁伴噺锛歿{item.matQty}} - </view> + <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> @@ -167,10 +159,12 @@ label: "", orderInfo: [], focus: false, + pkfocus: false, barcode: "", materSn: "", Initiallife: 1000, sns: [], + pksns: [], addressFocus: false, inboundBarcode: "", address: "", @@ -184,6 +178,9 @@ Testlabel: "", Testplaceholder: "", Testcheck: false, + pkmaterSn: "", + pkmatInfos: [], + addressdisabled: false } }, onShow() {}, @@ -201,99 +198,22 @@ this.Testlabel = "鏁伴噺:"; this.Testplaceholder = "璇疯緭鍏ユ暟閲�"; this.Initiallife = 16; + } else if (this.warehouseId == 5) { //杈呮枡 + this.items.push("鍏ュ钩搴�"); + this.items[1] = "鍏ョ珛搴�"; + this.address = "8005"; + } else if (this.warehouseId == 3) { //杈呮枡 + this.address = "1011"; + this.addressdisabled = true; } this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo; this.getData(); }, methods: { - voiceSpeech(src) { - innerAudioContext.src = src; // '../../static/success.mp3'; - innerAudioContext.play(); - }, - //瑙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" - }) - } - }) - } - }) - }, - + // voiceSpeech(src) { + // innerAudioContext.src = src; // '../../static/success.mp3'; + // innerAudioContext.play(); + // }, updateFocus() { debugger this.$nextTick(() => { @@ -354,97 +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) { - // debugger - // this.matTotal.push({ - // matCode: res.data.materielCode, - // matQuantity: parseInt(res.data.quantity) - // }); - this.sns.push(res.data.serialNumber); - - // this.matInfos.splice(0, this.matInfos.length); - 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.updateFocus,200); - setTimeout(() => { - this.voiceSpeech('../../static/fail.mp3'); - }, 100); - return; + // setTimeout(() => { + // this.voiceSpeech('../../static/fail.mp3'); + // }, 100); } - // setTimeout(this.updateFocus,200); - setTimeout(() => { - this.voiceSpeech('../../static/success.mp3'); - }, 100); - } else { - // this.innerCode = ""; - this.$refs.uToast.show({ - title: res.message, - type: "error" - }) - // setTimeout(this.updateFocus,200); - setTimeout(() => { - this.voiceSpeech('../../static/fail.mp3'); - }, 100); - } - }) - - - // var matInfo = matSn.split('|'); - - // if (matInfo.length == 7) { - // var matObj = { - // matCode: matInfo[1], - // matProductionDate: matInfo[3], - // matQty: matInfo[5], - // orderNo: matInfo[6], - // sn: matSn - // } - // var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo); - // if (!temp) { - // var tmp = this.matTotal.find(x => x.matCode == matObj.matCode); - // if (!tmp) { - // this.matTotal.push({ - // matCode: matObj.matCode, - // matQuantity: parseInt(matObj.matQty) - // }) - // } else { - // tmp.matQuantity += parseInt(matObj.matQty); - // } - // this.sns.push(matSn); - // this.matInfos.push(matObj); - // setTimeout(this.updateFocus, 200); - // setTimeout(() => { - // this.voiceSpeech('../../static/success.mp3'); - // }, 100); - // } else { - // this.$refs.uToast.show({ - // title: "鎵爜閲嶅", - // type: "error" - // }) - // setTimeout(this.updateFocus, 200); - // setTimeout(() => { - // this.voiceSpeech('../../static/fail.mp3'); - // }, 100); - // } - // } else { - // this.$refs.uToast.show({ - // title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜", - // type: "error" - // }) - // setTimeout(this.updateFocus, 200); - // setTimeout(() => { - // this.voiceSpeech('../../static/fail.mp3'); - // }, 100); - // } + }) + } + setTimeout(() => { + this.materSn = ""; + }, 100); + } + }) + }, + pksnInput() { + this.$nextTick(() => { + if (this.pkmaterSn != "") { + + var matSn = this.pkmaterSn; + + 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); + } + }) + } + setTimeout(() => { + this.pkmaterSn = ""; + }, 100); } }) }, @@ -472,11 +381,14 @@ } this.$u.post('/api/Task/RequestInboundTask', postData).then(res => { if (res.status) { - uni.$showMsg(res.message); this.inboundBarcode = ""; - this.address = ""; + if (this.warehouseId != 5) this.address = ""; setTimeout(() => { this.addressFocus = false; + this.$refs.uToast.show({ + title: "鎴愬姛", + type: "success" + }) }, 200); } else { this.$refs.uToast.show({ @@ -503,6 +415,51 @@ this.matInfos.splice(res, 1); this.sns.splice(res, 1); }, + pkdeleteList(res) { + 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; + } + }, + resetInPk() { + this.pkmaterSn = ""; + this.pkfocus = false; + this.pkmatInfos = []; + this.pksns = []; + }, + pksubmit() { + if (this.pkmatInfos.length == 0) { + this.$refs.uToast.show({ + title: "璇锋壂鎻忓唴绠辨爣绛�", + type: 'error' + }) + return; + } + this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId + "&orderNo=" + this.orderNo, this + .pksns).then(res => { + if (res.status) { + this.$refs.uToast.show({ + title: "鍏ュ簱鎴愬姛", + type: "success" + }) + this.pkfocus = false; + this.pkmatInfos = []; + this.pksns = []; + } else { + this.$refs.uToast.show({ + title: res.message, + type: "error" + }) + } + }) + }, submit() { if (this.barcode == "") { this.$refs.uToast.show({ @@ -521,11 +478,24 @@ if (this.Test) { if (!this.Testcheck) { this.Testcheck = true; - this.$refs.uToast.show({ - title: "璇风‘璁ゅ垵濮嬪鍛�", - type: 'error' - }) + 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); } } this.$u.post('/api/InboundOrder/MaterielGroup', { @@ -549,6 +519,9 @@ this.matInfos = []; this.sns = []; this.matTotal = []; + if (this.warehouseId != 6) { //娴嬭瘯鏋朵粨搴撳尯ID + this.Initiallife = ""; + } } else { this.$refs.uToast.show({ title: res.message, -- Gitblit v1.9.3