diff --git a/src/api/request2.js b/src/api/request2.js index 0b400601..ffeb1630 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -2584,6 +2584,6 @@ export function isCheckMesCode(code) { * 获取上架任务打印明细 * @param {*} */ -export function getJimuPutawayJobDetail(ids) { - return http.get("/wms/jimu-report/getPutawayJobDetailForPDA?masterIds="+ids) +export function getJimuPutawayJobDetail(data) { + return http.post("/wms/jimu-report/getPutawayJobDetailForPDA",data) } \ No newline at end of file diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue index 29654fd7..3bfc478a 100644 --- a/src/mycomponents/recommend/recommend.vue +++ b/src/mycomponents/recommend/recommend.vue @@ -69,6 +69,21 @@ const props = defineProps({ default: '库位' } }) +watch( + () => props.detail, + (newVal, oldVal) => { + if (newVal.scaned) { + newVal.copyContent = `HPQ;V1.0;I${newVal.itemCode};P${newVal.packingNumber};B${newVal.batch};Q${newVal.qty}` + } else { + newVal.copyContent = '' + } + console.log('newVal.copyContent', newVal.copyContent) + }, + { + immediate: true, + deep: true + } +) const copy = () => { // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100 const content = `HPQ;V1.0;I${props.detail.itemCode};P${props.detail.packingNumber};B${props.detail.batch};Q${props.detail.qty}` diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index f15af7b7..0eeea2ed 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -119,6 +119,11 @@ const hide = () => { // #endif } +const setItemCodeSimulate = (itemCode, scanMsg) => { + itemCode.value = itemCode + scanMsg.value = scanMsg +} + const setItemCode = (itemCodeParams) => { itemCode.value = itemCodeParams } diff --git a/src/mycomponents/scan/winScanFgLabel.vue b/src/mycomponents/scan/winScanFgLabel.vue index de11a96a..8d371fe6 100644 --- a/src/mycomponents/scan/winScanFgLabel.vue +++ b/src/mycomponents/scan/winScanFgLabel.vue @@ -16,6 +16,9 @@ + + + @@ -36,6 +39,12 @@ const props = defineProps({ }) const show = ref(false) const comscan = ref() +const comscansimulate = ref() +// 模拟扫描功能 +const simulateScan = (item) => { + comscansimulate.value.setItemCodeSimulate(item.itemCode, item.copyContent) + comscansimulate.value.clickScanMsg() +} const openScanPopup = (itemCode) => { setTimeout((res) => { show.value = true @@ -84,7 +93,8 @@ defineExpose({ openScanPopup, closeScanPopup, losefocus, - getfocus + getfocus, + simulateScan }) diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index fa570e32..01b7ab50 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -202,7 +202,9 @@ const submit = () => { const submitJob = () => { const params = setParams() if (params.subList.length == 0) { - comMessageRef.value.showSuccessMessage('请扫描箱码') + uni.hideLoading() + comMessageRef.value.showConfirmMessageModal('请扫描箱码') + return } deliverJobSubmit(params) .then((res) => { diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index fb08ebda..29771438 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -253,7 +253,7 @@ const scanPopupGetFocus = () => { } const commit = () => { if (detailSource.value.length > 0 && detailSource.value[0].subList.length > 0) { - if (toPackUnit.value == '包装规格') { + if (toPackUnit.value || toPackUnit.value == '包装规格') { showErrorMessage('请选择目标包装规格') return } diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index d1952aa8..d3b4cbbd 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -1,178 +1,185 @@ \ No newline at end of file +::v-deep .u-td { + height: auto !important; + font-size: 24rpx !important; + word-break: break-all; +} + diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 1d54c96a..f3f08a28 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -183,7 +183,11 @@ const getDetail = () => { detailSource.value = getDataSource(subList.value) detailSource.value.forEach((r) => { r.subList.forEach((s) => { - if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) s.scaned = true + if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) { + s.scaned = true + // 模拟扫描功能 + scanPopup.value.simulateScan(s) + } }) }) } else { diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index f102f0b3..942002db 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -386,11 +386,11 @@ const submitJob = () => { // 获取上架任务 let timerCount = 0 const timer1 = setInterval(async () => { - if (timerCount == 10) { + if (timerCount == 15) { clearInterval(timer1) - uni.showLoading({ + uni.showToast({ title: '跳转打印页面失败', - mask: true + icon: 'none' }) return } @@ -399,23 +399,23 @@ const submitJob = () => { { column: 'purchaseReceiptRecordNumber', action: 'in', - value: res.data + value: res.data.number } ], pageNo: 1, pageSize: 1000 - }).then((res) => { + }).then((res1) => { timerCount += 1 console.log(11111) - if (res.data && res.data.list && res.data.list.length) { + if (res1.data && res1.data.list && res1.data.list.length && res1.data.total >= res.data.detailCount) { uni.hideLoading() clearInterval(timer1) const dataParams = { - toLocationCode: res.data.list[0].toLocationCode, - number: res.data.list[0].number, - creator: res.data.list[0].creator, - createTime: res.data.list[0].createTime, - ids: res.data.list.map((item) => item.masterId).join(',') + 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({ @@ -423,7 +423,7 @@ const submitJob = () => { }) } }) - }, 1000) + }, 2000) } else { showErrorMessage(`提交失败[${res.msg}]`) }