From 2e62d67844b9dcf5d2d631c628def5b33b66691c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 27 Aug 2024 18:10:32 +0800 Subject: [PATCH] =?UTF-8?q?6=E6=9C=8811=E5=8F=B7=E4=B8=8A=E6=8B=89?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E8=BF=98=E6=B2=A1=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 8 ++++++++ src/mycomponents/scan/winComScanFg.vue | 1 + .../productPutaway/record/productPutawayRecord.vue | 12 ++++++++++-- .../productReceipt/job/fgProductReceiptDetail.vue | 2 ++ src/pages/productReceipt/job/productReceiptJob.vue | 5 +++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index 33d3433b..ad752148 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -2571,3 +2571,11 @@ export function getPackageLabel(packageCode) { } return http.post("/wms/barbasic/senior",data) } + +/** + * 装配收货mes码是否已经完工 + * @param {*} + */ +export function isCheckMesCode(code) { + return http.get("/wms/productreceipt-detailb/getCheckWhetherItExists?remark="+code) +} \ No newline at end of file diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index 746df870..f15af7b7 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -176,6 +176,7 @@ const handelScanMsg = () => { const batch = content.substr(lengthMat + 8, 3) const order = content.substr(-8) if (itemCode != partNumber) { + clear() throw new Error(`解析错误:扫描物料号【${itemCode}】与查询物料号【${partNumber}】不一致`) } diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index f4d83c8c..09b84c65 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -39,7 +39,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue' import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app' import { productPutawayRecordSubmit } from '@/api/request2.js' -import { goHome, getPackingNumberAndBatchByList, deepCopyData } from '@/common/basic.js' +import { goHome, getPackingNumberAndBatchByList, deepCopyData, updateTitle } from '@/common/basic.js' import { getPrecisionStrategyList } from '@/common/balance.js' import { getInventoryStatusDesc, getDirectoryItemArray } from '@/common/directory.js' @@ -55,6 +55,7 @@ import winScanLocation from '@/mycomponents/scan/winScanLocation.vue' import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import { useCountStore } from '@/store' + // 获取自定义的store const store = useCountStore() const { proxy } = getCurrentInstance() @@ -74,10 +75,16 @@ const managementList = ref([]) const scanLocationCode = ref() const scanPopup = ref() const comMessageRef = ref() +const type = ref('') onLoad((option) => { + type.value = option.type + if (type.value == 'predict') { + updateTitle('制品上架记录') + } else if (type.value == 'assemble') { + updateTitle('装配上架记录') + } const typeCode = 'ProductPutaway' getBusinessType(typeCode, (res) => { - console.log(111, res) if (res.success) { businessType.value = res.businessType fromLocationAreaTypeList.value = res.fromLocationAreaTypeList @@ -270,6 +277,7 @@ const setParams = () => { }) }) dataContent.value.subList = subList + dataContent.value.type = type.value dataContent.value.creator = creator return dataContent.value } diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index e1e98fca..05cab35f 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -384,6 +384,7 @@ const commit = () => { submitJob() } } else { + subitem.handleQty = subitem.qty subitem.scaned = true submitJob() } @@ -439,6 +440,7 @@ const setParams = () => { res.outsideItemCode = res.itemCode res.outsideProduceDate = res.productDate res.outsideSerialNumber = res.order + res.lowerLim = res.content }) } subList.push(detail) diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index fd21f695..b9649d46 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -301,6 +301,11 @@ const getScanResult = (result) => { column: 'itemCode', action: '==', value: result.label.itemCode + }, + { + column: 'type', + action: '==', + value: props.type } // { // column: 'fromLocationCode',