From b0eb7cdafc9a60b313a82f9167fcd0a3e1ae59b6 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 18 Apr 2025 09:39:25 +0800 Subject: [PATCH] =?UTF-8?q?YT-2397WMS=E3=80=8A=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E3=80=8B=EF=BC=8CPDA?= =?UTF-8?q?=E5=9C=A8=E6=89=AB=E7=A0=81=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=AD=E7=9A=84=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=AF=E5=B7=B2=E5=85=B3?= =?UTF-8?q?=E9=97=AD=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=BA=EF=BC=9A?= =?UTF-8?q?=E8=AF=A5=E5=93=81=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20=E5=B7=B2?= =?UTF-8?q?=E5=85=B3=E9=97=AD=EF=BC=9B=E5=A6=82=E6=9E=9C=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=AF=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=BA=EF=BC=9A=E8=AF=A5=E5=93=81?= =?UTF-8?q?=E7=95=AA=E5=AF=B9=E5=BA=94=E7=9A=84=E7=94=9F=E4=BA=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20[=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7]=20=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 10 +++++++- src/common/directory.js | 1 - src/mycomponents/balance/shift.vue | 1 - .../job/productReceiptDetail.vue | 21 ++++++++++++++--- .../productReceipt/job/productReceiptJob.vue | 23 ++++++++++++++++--- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index 4fae264d..4a9bd0f6 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -4992,4 +4992,12 @@ export async function workstationByLocation(data) { data: data, }); } - +/** + * 根据申请单号获取状态 + */ +export async function getNumberForStatus(requestNumber) { + return await request({ + url: baseApi + `/wms/productreceipt-request-main/getNumberForStatus?number=${requestNumber}`, + method: "get", + }); +} diff --git a/src/common/directory.js b/src/common/directory.js index 75038a54..d7b17ef1 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -699,7 +699,6 @@ export function getShiftName(value) { if (shiftList.length == 0) { shiftList = getDirectoryInfo("shift") } - console.log(333,shiftList) if (shiftList.length > 0) { for (let item of shiftList) { if (item.value == value) { diff --git a/src/mycomponents/balance/shift.vue b/src/mycomponents/balance/shift.vue index fd9c1ff9..5b2747d0 100644 --- a/src/mycomponents/balance/shift.vue +++ b/src/mycomponents/balance/shift.vue @@ -40,7 +40,6 @@ import { }, methods: { handleGetShiftName(){ - console.log(99,getShiftName(this.shift)) return getShiftName(this.shift) } } diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 44780eb4..6a369cba 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -84,7 +84,8 @@ getProductReceiptJobDetail, takeProductReceiptJob, cancleTakeProductReceiptJob, - productReceiptJobsubmit + productReceiptJobsubmit, + getNumberForStatus } from '@/api/request2.js'; import { goHome, @@ -270,8 +271,22 @@ }) }, - getScanResult(result) { - + async getScanResult(result) { + uni.showLoading({ + title: "加载中....", + mask: true + }); + const res1 = await getNumberForStatus(result.label.requestNumber) + if(res1.data == 5){ + uni.hideLoading() + this.showErrorMessage(`该品番对应的申请【${result.label.requestNumber}】已关闭`) + return + }else if(res1.data == 8){ + uni.hideLoading() + this.showErrorMessage(`该品番对应的生产任务【${result.label.requestNumber}】已经完成`) + return + } + uni.hideLoading() let label = result.label; var packingNumber = label.packingNumber; var batch = label.batch; diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index f1a946f1..64d202d4 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -31,7 +31,8 @@