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 @@