diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index c22cbb6a..fb08ebda 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -63,7 +63,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue' import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app' import { overPackageRecordSubmit, getPackUnitByItemCode } from '@/api/request2.js' -import { goHome } from '@/common/basic.js' +import { goHome, getCurrDateTime } from '@/common/basic.js' import { getInventoryStatusDesc, getDirectoryItemArray, getPackUnitName, getUomInfo } from '@/common/directory.js' @@ -79,6 +79,7 @@ import recommendBalance from '@/mycomponents/balance/recommendBalance.vue' import packageTarget from '@/mycomponents/package/packageTarget.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import packUnit from '@/mycomponents/qty/packUnit.vue' + import { useCountStore } from '@/store' // 获取自定义的store const store = useCountStore() @@ -293,13 +294,13 @@ const submitJob = () => { itemName: item.itemName, // 物品名称 packName: item.packName, // 包装名称 packageCode: item.toPackingNumber, // 包装号 - batch: item.batch, // 批次 + batch: item.toBatch, // 批次 parentNumber: item.parentNumber, // 父包装号 itemType: item.itemType, // 物料类型 asnNumber: item.asnNumber, // ASN supplierCode: item.supplierCode, // 供应商 qty: item.qty, // 数量 - printTimes: item.printTimes, // 打印时间 + printTimes: getCurrDateTime(), // 打印时间 barcodeString: item.barcodeString, // 标签信息 barcodeBase64: '' }) diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 2eec0add..04fd6f0f 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -282,6 +282,11 @@ const getScanResult = (result) => { column: 'itemCode', action: '==', value: result.label.itemCode + }, + { + column: 'type', + action: '==', + value: props.type } // { // column: 'fromLocationCode', diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index 9e3c952b..255a8469 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -496,12 +496,12 @@ const remove = (record, index) => { const item = toLocation.value.Items.find((r) => r.itemCode == record.itemCode) if (item != undefined) { item.Locations.forEach((l) => { - const batch = l.Batchs.find((b) => b.packingNumber == record.packingNumber && b.batch == record.batch) + const batch = l.Batchs.find((b) => (b.packingNumber == record.packingNumber || b.packingNumber == null || b.packingNumber == '') && b.batch == record.batch) const rIndex = batch.Records.findIndex((r) => r.packingNumber == record.packingNumber && r.batch == record.batch) batch.Records.splice(rIndex, 1) }) } - emit('updateData', item) + emit('updateData', record) } }) }