From 42fb46c61e218be08b756b7e9f556e35612e1c46 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Sep 2024 08:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA=202024/7/9=2016:28:29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 8 +- src/pages/issue/job/issueJob.vue | 14 +- src/pages/package/coms/comPackageRecord.vue | 300 ++++---- .../package/record/splitPackageRecord.vue | 721 +++++++++--------- src/pages/repleinsh/job/repleinshJob.vue | 78 +- 5 files changed, 581 insertions(+), 540 deletions(-) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 3107abbf..d1a63a06 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -7,7 +7,7 @@ 扫描箱码 - + @@ -320,6 +320,12 @@ const getBalance = (label, packageInfoParams, callback) => { }) } const onScan = (result) => { + if (!result.package) { + showErrorMessage(`扫描数据错误[${result.label.code}]`, (res) => { + getfocus() + }) + return + } if (toLocation.value && result.package.packUnit) { const item = toLocation.value.Items.find((r) => r.itemCode == result.package.itemCode) if (result.package.packUnit !== item.packUnit) { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index d1ab1e28..4cf5c717 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -323,6 +323,14 @@ const openScanPopup = () => { scanPopup.value.openScanPopup() } const getScanResult = (result) => { + if (!result.label.batch) { + showMessage('批次为空') + return + } + if (!result.label.itemCode) { + showMessage('物料号为空') + return + } try { const filters = [ { @@ -344,7 +352,7 @@ const getScanResult = (result) => { getIssueJobList({ filters, pageNo: 1, - pageSize: 100, + pageSize: 1000, sort: 'createTime', by: 'asc' }) @@ -362,9 +370,7 @@ const getScanResult = (result) => { list.push(item) } }) - if (list.length > 1) { - jobListRef.value.openList(list) - } else { + if (list.length > 0) { selectItem(list[0]) } } else { diff --git a/src/pages/package/coms/comPackageRecord.vue b/src/pages/package/coms/comPackageRecord.vue index fe24a43d..3077e3c1 100644 --- a/src/pages/package/coms/comPackageRecord.vue +++ b/src/pages/package/coms/comPackageRecord.vue @@ -1,171 +1,157 @@ - + diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue index 5cf86210..e0bbcad4 100644 --- a/src/pages/package/record/splitPackageRecord.vue +++ b/src/pages/package/record/splitPackageRecord.vue @@ -1,382 +1,351 @@ - + diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index f10dfa26..d4848fd2 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -10,6 +10,8 @@ + + @@ -30,6 +32,8 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue' import repleinshJobListPopup from '@/pages/repleinsh/coms/repleinshJobListPopup.vue' import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue' +import winScanButton from '@/mycomponents/scan/winScanButton.vue' +import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' import { useCountStore } from '@/store' // 获取自定义的store @@ -46,6 +50,7 @@ const waitTask = ref(false) const todayTime = ref('') const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) +const scanMessage = ref('') const detailGiveupOptions = ref([]) const filter = ref() const comMessageRef = ref() @@ -162,8 +167,8 @@ const fromLocationCode = (fromLocationCode) => { console.log('fromLocationCode', fromLocationCode) getList('refresh', fromLocationCode, '') } -const openJobDetail = (item) => { - proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}`) +const openJobDetail = (item, scanMessageParams = '') => { + proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessageParams}`) } const selectedItem = (item) => { openJobDetail(item) @@ -262,6 +267,75 @@ const showMessage = (message) => { } }) } +const openScanPopup = () => { + scanPopup.value.openScanPopup() +} +const selectItem = (item) => { + scanPopup.value.closeScanPopup() + openJobDetail(item, scanMessage.value) +} +const getScanResult = (result) => { + if (!result.label.batch) { + showMessage('批次为空') + return + } + if (!result.label.itemCode) { + showMessage('物料号为空') + return + } + try { + const filters = [ + { + column: 'status', + action: 'in', + value: '1,2' + }, + { + column: 'batch', + action: '==', + value: result.label.batch + }, + { + column: 'itemCode', + action: '==', + value: result.label.itemCode + } + ] + getRepleinshJobList({ + filters, + pageNo: 1, + pageSize: 1000, + sort: 'createTime', + by: 'asc' + }) + .then((res) => { + scanMessage.value = result.scanMessage + const resultList = res.data.list + if (resultList.length > 0) { + resultList.forEach((item) => { + item.title = item.number + item.selected = false + }) + const list = [] + resultList.forEach((item) => { + if (!list.find((subItem) => subItem.title == item.title)) { + list.push(item) + } + }) + if (list.length > 0) { + selectItem(list[0]) + } + } else { + showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`) + } + }) + .catch((error) => { + showMessage(error) + }) + } catch (e) { + showMessage(e.message) + } +}