From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 13:52:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/raworderboxing.vue | 195 ++++++++++++++++++++++++------------------------
1 files changed, 97 insertions(+), 98 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..4aa1134 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"
@@ -16,12 +16,12 @@
<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
v-model="materSn" @input="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> -->
@@ -99,49 +99,29 @@
</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" @input="pksnInput" />
</uni-forms-item>
<uni-forms-item>
- <button @click="releasebox" type="primary" size="default">瑙ｇ洏</button>
+ <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-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 +147,12 @@
label: "",
orderInfo: [],
focus: false,
+ pkfocus:false,
barcode: "",
materSn: "",
Initiallife: 1000,
sns: [],
+ pksns:[],
addressFocus: false,
inboundBarcode: "",
address: "",
@@ -184,6 +166,8 @@
Testlabel: "",
Testplaceholder: "",
Testcheck: false,
+ pkmaterSn: "",
+ pkmatInfos: []
}
},
onShow() {},
@@ -201,6 +185,10 @@
this.Testlabel = "鏁伴噺:";
this.Testplaceholder = "璇疯緭鍏ユ暟閲�";
this.Initiallife = 16;
+ } else if (this.warehouseId == 5) { //杈呮枡
+ this.items.push("鍏ュ钩搴�");
+ this.items[1] = "鍏ョ珛搴�";
+ this.address = "8005";
}
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
this.getData();
@@ -360,91 +348,70 @@
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) {
this.$refs.uToast.show({
title: res.message,
type: "error"
})
- // setTimeout(this.updateFocus,200);
setTimeout(() => {
this.voiceSpeech('../../static/fail.mp3');
}, 100);
return;
}
- // 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);
- // }
+ }
+ })
+ },
+ 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.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);
+ }
+ })
}
})
},
@@ -472,11 +439,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 +473,35 @@
this.matInfos.splice(res, 1);
this.sns.splice(res, 1);
},
+ pkdeleteList(res) {
+ this.pkmatInfos.splice(res, 1);
+ this.pksns.splice(res, 1);
+ },
+ 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.focus = false;
+ this.pkmatInfos = [];
+ this.pksns = [];
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error"
+ })
+ }
+ })
+ },
submit() {
if (this.barcode == "") {
this.$refs.uToast.show({
--
Gitblit v1.9.3