From 54be1e87788f53b8c5d8e5f42e92eb641cc81c8a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 16 Aug 2024 17:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collectOrder.js | 8 +++++ src/api/collect/splitCreateOrder.js | 8 +++++ src/views/collect/DealOrder.vue | 54 ++++++++++++++++++++++++----- 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js index 296c83ab..c4ca2f70 100644 --- a/src/api/collect/collectOrder.js +++ b/src/api/collect/collectOrder.js @@ -9,6 +9,14 @@ export function orderPage(query) { }); } +export function getNextOrder(query) { + return axios({ + url: "/udiwms/basic/collect/order/next", + method: "get", + params: query + }); +} + export function orderDetail(query) { return axios({ url: "/udiwms/basic/collect/order/detail", diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js index 3b32f5c9..4c2403e5 100644 --- a/src/api/collect/splitCreateOrder.js +++ b/src/api/collect/splitCreateOrder.js @@ -20,6 +20,14 @@ export function tagCode(query) { }); } +export function startSplit(query) { + return axios({ + url: "/udiwms/ioSplit/material/order/split", + method: "post", + data: query + }); +} + export function finishOrder(query) { return axios({ diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 341f0c61..c0c45e64 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -38,7 +38,7 @@ 下一单据 { @@ -318,9 +319,12 @@ export default { .catch(() => { }); }, - workPlaceCodeChange(value){ - this.curWorkPlaces.forEach(item => {if(item.workplaceId == value){ this.formDataVisible = item - } }) + workPlaceCodeChange(value) { + this.curWorkPlaces.forEach(item => { + if (item.workplaceId == value) { + this.formDataVisible = item + } + }) if (this.formDataVisible.operationType == 1){ this.findFromInvList(""); } @@ -355,7 +359,7 @@ export default { } listPage(query).then((res) => { this.curWorkPlaces = res.data.list || []; - if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) { + if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) { this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId; } this.workPlaceCodeChange(this.formData.workPlaceCode); @@ -513,10 +517,26 @@ export default { }, + //选择单据 selectPrescribe() { this.selectPrescriptionVisible = true; }, + //获取下一单据 + nextCollectOrder() { + getNextOrder(this.formData).then(res => { + this.loading = false + if (res.code == 20000) { + this.formData = res.data; + this.dealSplitOrder() + } else { + this.$message.error(res.message) + } + }).catch(() => { + this.loading = false + }) + }, + closeDialog() { this.selectPrescriptionVisible = false; }, @@ -525,9 +545,27 @@ export default { this.selectPrescriptionVisible = false; this.formData = row; this.curRow = row; + this.dealSplitOrder() this.refreshCodesPanel(this); }, + //开始拆零 + dealSplitOrder() { + startSplit(this.formData).then(res => { + this.loading = false + if (res.code == 20000) { + console.log(res.data) + this.refreshCodesPanel(this); + } else { + console.log(res.message) + + } + }).catch(() => { + this.loading = false + }) + }, + + printCodeResult(data, isSuccess) { const resultParts = ["追溯码:" + data.code + "\r\n"];