From fbc6fae6c793220d0b67ac603ce9bbf22837de79 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 17:50:47 +0800
Subject: [PATCH] 1
---
项目代码/芜湖三一PDA/pages/stash/raworderboxing.vue | 406 +++++----------------------------------------------------
1 files changed, 40 insertions(+), 366 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/raworderboxing.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/raworderboxing.vue"
index b5cb5f1..d64b741 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/raworderboxing.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\350\212\234\346\271\226\344\270\211\344\270\200PDA/pages/stash/raworderboxing.vue"
@@ -6,126 +6,24 @@
<view v-if="current === 0" class="headerstyle">
<view class="itemstyle">
<uni-forms label-width="180">
- <uni-forms-item :label="label">
+ <uni-forms-item :label="orderNolabel">
+ </uni-forms-item>
+ <uni-forms-item :label="batchNolabel">
</uni-forms-item>
<uni-forms-item label="鎵樼洏鏉＄爜:">
<uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="!focus"
v-model="barcode" @input="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>
-
- <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>
- </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 class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
- placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput' :focus="addressFocus" />
+ <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏鍏ュ簱</button>
</uni-forms-item>
<uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
+ <button @click="ReleaseCompleted" type="primary" size="default" style="margin-top: 2%;">鏀捐揣瀹屾垚</button>
</uni-forms-item>
</uni-forms>
- </view>
- </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+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" />
- </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>
@@ -138,63 +36,24 @@
export default {
data() {
return {
- items: ['缁勭洏', '鍏ュ簱', '鍗曟嵁淇℃伅'], //, '瑙ｇ洏'
+ items: ['缁勭洏'], //, '鍏ュ簱', '鍗曟嵁淇℃伅', '瑙ｇ洏'
current: 0,
- matTotal: [],
- matInfos: [],
orderNo: "",
- label: "",
+ batchNo: "",
+ orderNolabel: "",
+ batchNolabel: "",
orderInfo: [],
focus: false,
- pkfocus: false,
barcode: "",
- materSn: "",
- Initiallife: 1000,
- sns: [],
- pksns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true,
- value: "",
- matInfo: [],
- value2: "",
- matTotals: [],
- warehouseId: "",
- Test: false,
- Testlabel: "",
- Testplaceholder: "",
- Testcheck: false,
- pkmaterSn: "",
- pkmatInfos: [],
- addressdisabled: false
}
},
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) { //杈呮枡
- 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();
+ this.batchNo = res.batchNo;
+ this.orderNolabel = "鎵瑰彿锛�" + this.orderNo;
+ this.batchNolabel = "鏌滃彿锛�" + this.batchNo;
+ // this.getData();
},
methods: {
voiceSpeech(src) {
@@ -218,19 +77,19 @@
}
},
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;
- }
- }
- })
+ // 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;
@@ -256,172 +115,22 @@
}
})
},
- snInput() {
- this.$nextTick(() => {
- 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) {
- 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);
- }
- })
- }
- })
- },
- 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);
- }
- })
- }
- })
- },
- inbound() {
- if (this.inboundBarcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: "error"
- })
- return;
- }
- if (this.address == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address,
- "warehouseId": this.warehouseId
- }
- }
- this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
- if (res.status) {
- this.inboundBarcode = "";
- if (this.warehouseId != 5) this.address = "";
- setTimeout(() => {
- this.addressFocus = false;
+ ReleaseCompleted() {
+ this.$u.post('http://192.168.10.88:8099/api/AGV/ReleaseCompleted').then(
+ res => {
+ if (res.status) {
this.$refs.uToast.show({
- title: "鎴愬姛",
+ title: "鏀捐揣瀹屾垚鎴愬姛",
type: "success"
})
- }, 200);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
+ this.qty = "";
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error"
+ })
+ }
})
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- 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 == "") {
@@ -431,43 +140,11 @@
})
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);
- }
- }
- this.$u.post('/api/InboundOrder/MaterielGroup', {
+ this.$u.post('/api/PDA/InMateriel', {
MainData: {
"palletCode": this.barcode,
"orderNo": this.orderNo,
- "initiallife": this.Initiallife,
- // "isFull": this.check
- "warehouseId": this.warehouseId
+ "batchNo":this.batchNo
},
DelKeys: this.sns
}).then(res => {
@@ -479,9 +156,6 @@
})
this.focus = false;
this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
} else {
this.$refs.uToast.show({
title: res.message,
--
Gitblit v1.9.3