From 9458c720859b00fd344540c81de8f3ecf88b3ef7 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 30 Aug 2024 17:18:20 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9A=84=E5=BC=80=E5=85=B3=202024/6/19=2014:?= =?UTF-8?q?41:46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 3 +- src/pages/index/index.vue | 2 +- src/pages/pointPutawayJob/index.vue | 2 +- .../job/productPutawayDetail.vue | 10 +- .../productPutaway/job/productPutawayJob.vue | 4 +- .../job/fgProductReceiptDetail.vue | 1 + .../job/productReceiptDetail.vue | 1 + .../purchaseReceipt/job/receiptDetail.vue | 94 ++++++++++--------- src/pages/putaway/job/putawayDetail.vue | 1 + 9 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/pages.json b/src/pages.json index a2953a08..ea8d08be 100644 --- a/src/pages.json +++ b/src/pages.json @@ -902,7 +902,7 @@ { "path": "pages/productPutaway/job/fgProductPutawayJob", "style": { - "navigationBarTitleText": "装配上架任务", + "navigationBarTitleText": "成品入库任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -2074,7 +2074,6 @@ } }, { - "path": "pages/check/checkFgLabel", "style": { "navigationBarTitleText": "标签成品标签", "enablePullDownRefresh": false diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 0ff8b0a3..99725a91 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -339,7 +339,7 @@ const getDictory = () => { console.log('包装规格获取失败', res) }) - const switchCode = 'FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate' + const switchCode = 'FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA' getSwitchByCode(switchCode) .then((res) => { diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 72a62889..bd595617 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -33,7 +33,7 @@ {{ cur.batch }} {{ cur.packingNumber }} {{ cur.packUnit }} - {{ cur.packQty }} + {{ cur.qty }} {{ cur.uom }} diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 2100e42d..fb21ad42 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -78,6 +78,7 @@ const type = ref('') const isCheckLocation = ref(false) const switchCode = ref('') const scanedPackingNumber = ref('') +const hintTitle = ref('') const status = ref('') const scanPopup = ref() const comScanLocation = ref() @@ -90,10 +91,12 @@ onLoad((option) => { status.value = option.status || '' if (type.value == 'predict') { switchCode.value = 'SemiPutawayLocationCodeValidate' - updateTitle('预生产上架任务') + hintTitle.value = '预生产上架' + updateTitle('预生产上架详情') } else if (type.value == 'assemble') { + hintTitle.value = '成品入库' switchCode.value = 'FgPutawayLocationCodeValidate' - updateTitle('装配上架任务') + updateTitle('成品入库详情') } }) onShow(() => { @@ -171,6 +174,7 @@ const getDetail = () => { s.scaned = true s.cancleScanedHiht = true openScanPopupSimulate(s) + scanedPackingNumber.value = '' } }) }) @@ -355,7 +359,7 @@ const submitJob = () => { .then((res) => { uni.hideLoading() if (res.data) { - showCommitSuccessMessage(`提交成功
生成制品上架记录:${res.data}`) + showCommitSuccessMessage(`提交成功
生成${hintTitle.value}记录
${res.data}`) } else { showErrorMessage(`提交失败[${res.msg}]`) } diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 04fd6f0f..d8f288f2 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -127,7 +127,7 @@ const getList = (type) => { if (props.type == 'predict') { updateTitle(`预生产上架任务(${totalCount.value})`) } else if (props.type == 'assemble') { - updateTitle(`装配上架任务(${totalCount.value})`) + updateTitle(`成品入库任务(${totalCount.value})`) } loadingType.value = 'loadmore' if (list == null || list.length == 0) { @@ -144,7 +144,7 @@ const getList = (type) => { if (props.type == 'predict') { updateTitle(`预生产上架任务(${totalCount.value})`) } else if (props.type == 'assemble') { - updateTitle(`装配上架任务(${totalCount.value})`) + updateTitle(`成品入库任务(${totalCount.value})`) } loadingType.value = '' uni.hideLoading() diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index f3f08a28..2733ad8b 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -187,6 +187,7 @@ const getDetail = () => { s.scaned = true // 模拟扫描功能 scanPopup.value.simulateScan(s) + scanedPackingNumber.value = '' } }) }) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 0753a3b5..4abd9fcc 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -187,6 +187,7 @@ const getDetail = () => { s.cancleScanedHiht = true s.copyContent = `HMQ;V1.0;I${s.itemCode};P${s.packingNumber};B${s.batch};Q${s.qty}` scanPopup.value.simulateScan(s) + scanedPackingNumber.value = '' // s.handleQty = s.qty } }) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index bc731397..0396ddc1 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -55,7 +55,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue' import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app' import { purchaseReceiptJobSubmit, getPurchaseReceiptJobDetail, takePurchaseReceiptJob, cancleTakePurchaseReceiptJob, productDismantleJobClose, getPutawayJobList } from '@/api/request2.js' -import { goHome, getCurrDateTime, getPackingNumberAndBatch, compareAsc, navigateBack } from '@/common/basic.js' +import { goHome, getCurrDateTime, getPackingNumberAndBatch, compareAsc, navigateBack, getSwitchInfoByCode } from '@/common/basic.js' import { getDirectoryItemArray } from '@/common/directory.js' @@ -91,6 +91,7 @@ const isAllReceived = ref(false) const operation = ref('') const scanedPackingNumber = ref('') const status = ref('') +const switchCode = ref('') const comMessageRef = ref() const locationCompareRef = ref() const scanPopup = ref() @@ -101,6 +102,7 @@ onLoad((option) => { scanedPackingNumber.value = option.scaned || '' status.value = option.status || '' operation.value = option.operation + switchCode.value = 'purchasereceiptPrintPDA' }) onShow(() => { @@ -182,6 +184,7 @@ const getDetail = () => { s.cancleScanedHiht = true s.copyContent = `HPQ;V1.0;I${s.itemCode};P${s.packingNumber};B${s.batch};Q${s.qty}` scanPopup.value.simulateScan(s) + scanedPackingNumber.value = '' } }) }) @@ -391,50 +394,57 @@ const submitJob = () => { uni.hideLoading() if (res.data) { // showCommitSuccessMessage(`提交成功
生成采购收货记录
${res.data}`) - uni.showLoading({ - title: '提交成功,将跳转到打印页面', - mask: true - }) - // 获取上架任务 - let timerCount = 0 - const timer1 = setInterval(async () => { - if (timerCount == 15) { - clearInterval(timer1) - uni.showToast({ - title: '跳转打印页面失败', - icon: 'none' - }) - return - } - await getPutawayJobList({ - filters: [ - { - column: 'purchaseReceiptRecordNumber', - action: 'in', - value: res.data.number - } - ], - pageNo: 1, - pageSize: 1000 - }).then((res1) => { - timerCount += 1 - if (res1.data && res1.data.list && res1.data.list.length && res1.data.total >= res.data.detailCount) { - uni.hideLoading() + const isCheckPrint = getSwitchInfoByCode(switchCode.value) + if (!isCheckPrint) { + uni.hideLoading() + + showCommitSuccessMessage(`提交成功
生成采购收货记录
${res.data.number}`) + } else { + uni.showLoading({ + title: '提交成功,将跳转到打印页面', + mask: true + }) + // 获取上架任务 + let timerCount = 0 + const timer1 = setInterval(async () => { + if (timerCount == 15) { clearInterval(timer1) - const dataParams = { - toLocationCode: res1.data.list[0].toLocationCode, - number: res1.data.list[0].number, - creator: res1.data.list[0].creator, - createTime: res1.data.list[0].createTime, - ids: res1.data.list.map((item) => item.masterId).join(',') - } - console.log(dataParams) - uni.navigateTo({ - url: `/pages/pointPutawayJob/index?data=${encodeURIComponent(JSON.stringify(dataParams))}` + uni.showToast({ + title: '跳转打印页面失败', + icon: 'none' }) + return } - }) - }, 2000) + await getPutawayJobList({ + filters: [ + { + column: 'purchaseReceiptRecordNumber', + action: 'in', + value: res.data.number + } + ], + pageNo: 1, + pageSize: 1000 + }).then((res1) => { + timerCount += 1 + if (res1.data && res1.data.list && res1.data.list.length && res1.data.total >= res.data.detailCount) { + uni.hideLoading() + clearInterval(timer1) + const dataParams = { + toLocationCode: res1.data.list[0].toLocationCode, + number: res1.data.list[0].number, + creator: res1.data.list[0].creator, + createTime: res1.data.list[0].createTime, + ids: res1.data.list.map((item) => item.masterId).join(',') + } + console.log(dataParams) + uni.navigateTo({ + url: `/pages/pointPutawayJob/index?data=${encodeURIComponent(JSON.stringify(dataParams))}` + }) + } + }) + }, 2000) + } } else { showErrorMessage(`提交失败[${res.msg}]`) } diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 188567f8..fd707d6a 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -163,6 +163,7 @@ const getDetail = () => { s.packList.forEach((item) => (item.scaned = true)) s.inventoryStatus = s.inspectResult // 更新检验结果状态 openScanPopupSimulate(s) + scanedPackingNumber.value = '' } }) })