diff --git a/src/api/request2.js b/src/api/request2.js index ad752148..0b400601 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -2578,4 +2578,12 @@ export function getPackageLabel(packageCode) { */ export function isCheckMesCode(code) { return http.get("/wms/productreceipt-detailb/getCheckWhetherItExists?remark="+code) +} + +/** + * 获取上架任务打印明细 + * @param {*} + */ +export function getJimuPutawayJobDetail(ids) { + return http.get("/wms/jimu-report/getPutawayJobDetailForPDA?masterIds="+ids) } \ No newline at end of file diff --git a/src/common/balance.js b/src/common/balance.js index d87945d8..a74cb3f0 100644 --- a/src/common/balance.js +++ b/src/common/balance.js @@ -84,19 +84,19 @@ export function getPrecisionStrategyList(itemList, callback) { }; getPrecisionStrategy(itemList).then(res => { - console.log(111,res.data) + console.log(111, res.data) if (res.data == null) { result.success = false result.message = '未查询到管理精度信息' } else { result.list = res.data; } - console.log('haha',result) + console.log('haha', result) callback(result); }).catch(error => { result.success = false; result.message = error; - console.log('hehe',result) + console.log('hehe', result) callback(result); }) } @@ -136,21 +136,21 @@ export function getManagementPrecisions(itemCodes, locationCode, callback) { } export function getBalanceByManagementPrecision(label, locationCode, fromInventoryStatuses, callback) { - + let result = { list: [], success: true, message: '' }; - + let params = { itemCodes: [label.itemCode], locationCode: locationCode }; // let jsonParem = JSON.stringify(param) getManagementPrecision(params).then(res => { - - console.log("成功"+res) + + console.log("成功" + res) let managementPrecision = res.data[0].ManagementPrecision; switch (managementPrecision) { case 'BY_PACKAGING': @@ -179,7 +179,7 @@ export function getBalanceByManagementPrecision(label, locationCode, fromInvento break; } }).catch(error => { - console.log("失败"+error) + console.log("失败" + error) let result = { success: false, message: error @@ -219,11 +219,16 @@ export function byPacking(label, locationCode, fromInventoryStatuses, callback) action: "==", value: locationCode }) - if (fromInventoryStatuses != null && fromInventoryStatuses != "") { + if (fromInventoryStatuses) { + let status = "" + fromInventoryStatuses.forEach(res => { + status = res + "," + }) + filters.push({ column: "inventoryStatus", action: "in", - value: fromInventoryStatuses + value: status }) } @@ -282,11 +287,16 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) { value: locationCode }) - if (fromInventoryStatuses != null && fromInventoryStatuses != "") { + if (fromInventoryStatuses) { + let status = "" + fromInventoryStatuses.forEach(res => { + status = res + "," + }) + filters.push({ column: "inventoryStatus", action: "in", - value: fromInventoryStatuses + value: status }) } @@ -332,7 +342,7 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) data: {} }; - var filters = [] + let filters = [] filters.push({ column: "itemCode", action: "==", @@ -354,11 +364,16 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) value: locationCode }) - if (fromInventoryStatuses != null && fromInventoryStatuses != "") { + if (fromInventoryStatuses) { + var status = "" + fromInventoryStatuses.forEach(res => { + status = res + "," + }) + filters.push({ column: "inventoryStatus", action: "in", - value: fromInventoryStatuses + value: status }) } @@ -401,18 +416,23 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback) data: {} }; - var filters = [] + let filters = [] filters.push({ column: "packingNumber", action: "==", value: label.packingNumber }) - if (fromInventoryStatuses != null && fromInventoryStatuses != "") { + if (fromInventoryStatuses) { + var status = "" + fromInventoryStatuses.forEach(res => { + status = res + "," + }) + filters.push({ column: "inventoryStatus", action: "in", - value: fromInventoryStatuses + value: status }) } @@ -482,4 +502,4 @@ export function balanceByLocation(locationCode, callback) { result.message = err.message; callback(result) }) -} +} \ No newline at end of file diff --git a/src/mycomponents/scan/winCheckFgLabel.vue b/src/mycomponents/scan/winCheckFgLabel.vue index acd29571..eb6c7f3a 100644 --- a/src/mycomponents/scan/winCheckFgLabel.vue +++ b/src/mycomponents/scan/winCheckFgLabel.vue @@ -80,7 +80,7 @@ const openScanPopupForType = (customerCodeParams) => { } else { locationGetFocus() } - fromInventoryStatuses.value = businessType.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) // 出库库存状态 fromLocationAreaTypeList.value = getDirectoryItemArray(businessType.value.fromLocationAreaTypeList) // 出库库区 setTimeout((res) => { @@ -102,7 +102,7 @@ const openScanPopupForJob = (fromLocationCode, fromLocationList, jobContent) => setTimeout((res) => { show.value = true }, 500) - fromInventoryStatuses.value = jobContent.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(jobContent.outInventoryStatuses) // 出库库存状态; //出库库存状态 fromLocationAreaTypeList.value = getDirectoryItemArray(jobContent.fromAreaTypes) // 出库库存状态 } diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index 99fc1b92..2755c1d6 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -110,7 +110,7 @@ const openScanPopupForType = (fromLocationCodeParams, businessTypeParams) => { } else { locationGetFocus() } - fromInventoryStatuses.value = businessType.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) // 出库库存状态 fromLocationAreaTypeList.value = getDirectoryItemArray(businessType.value.fromLocationAreaTypeList) // 出库库区 setTimeout((res) => { @@ -132,7 +132,7 @@ const openScanPopupForJob = (fromLocationCodePrams, fromLocationListPrams, jobCo setTimeout((res) => { show.value = true }, 500) - fromInventoryStatuses.value = jobContent.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(jobContent.outInventoryStatuses) // 出库库存状态; //出库库存状态 fromLocationAreaTypeList.value = getDirectoryItemArray(jobContent.fromAreaTypes) // 出库库存状态 } diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index 80299745..1153f6da 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -105,7 +105,7 @@ const openScanPopupForType = (fromLocationCodeParms, businessTypeParms) => { } else { locationGetFocus() } - fromInventoryStatuses.value = businessType.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(businessType.value.outInventoryStatuses) // 出库库存状态 fromLocationTypeArray.value = getDirectoryItemArray(businessType.value.outLocationTypes) // 出库库存状态 setTimeout((res) => { @@ -126,7 +126,7 @@ const openScanPopupForJob = (fromLocationCodeParms, fromLocationListParms, jobCo setTimeout((res) => { show.value = true }, 500) - fromInventoryStatuses.value = jobContent.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.outInventoryStatuses) inventoryStatus.value = getDirectoryItemArray(jobContent.outInventoryStatuses) // 出库库存状态; //出库库存状态 fromLocationTypeArray.value = getDirectoryItemArray(jobContent.fromLocationTypes) // 出库库存状态 } diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index 394ae650..9f0f5529 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -7,7 +7,7 @@ 扫描箱码 - + @@ -74,6 +74,8 @@ import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import { getDetailOption, getDetailEditRemoveOption } from '@/common/array.js' +import { getDirectoryItemArray } from '@/common/directory.js' + import { calc } from '@/common/calc.js' import { getWorkShopLineStation } from '@/api/request2.js' @@ -108,6 +110,7 @@ const positionInfo = ref('请选择位置') const positionList = ref([]) const defaultValueList = ref([]) const fromInventoryStatuses = ref('') +const fromInventoryStatuses = ref([]) const packageInfo = ref({}) const label = ref({}) const toLocationCombox = ref() @@ -140,7 +143,7 @@ const closeScanPopup = () => { const initData = () => { fromLocationList.value = [] if (dataContent.value != null) { - fromInventoryStatuses.value = jobContent.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses) toLocation.value = dataContent.value[0] toLocationCode.value = dataContent.value[0].toLocationCode fromLocationList.value = getFromLocationList() diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index 39f39e0c..eb9af1da 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -56,7 +56,7 @@ import { getDeliverDetail, getBasicLocationByCode, takeDeliverJob, cancleTakeDel import { calc } from '@/common/calc.js' -import { goHome, navigateBack, getRemoveOption, getCurrDateTime, getDirectoryItemArray, getPackingNumberAndBatch } from '@/common/basic.js' +import { goHome, navigateBack, getRemoveOption, getCurrDateTime, getPackingNumberAndBatch } from '@/common/basic.js' import { getDataSource } from '@/pages/issue/js/issue.js' @@ -244,6 +244,7 @@ const setParams = () => { record.toPackingNumber = info.packingNumber record.toBatch = info.batch } + record.fromPackingNumber = r.packingNumber subItem.recordList.push(record) }) subList.push(subItem) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 79350c3d..9cd06df1 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -63,6 +63,7 @@ import { getWorkShopLineStation } from '@/api/request2.js' import { calc } from '@/common/calc.js' import { getBalanceByManagementPrecision } from '@/common/balance.js' +import { getDirectoryItemArray } from '../../../common/directory.js' const { proxy } = getCurrentInstance() const props = defineProps({ @@ -121,7 +122,7 @@ const closeScanPopup = () => { const initData = () => { fromLocationList.value = [] if (dataContent.value != null) { - fromInventoryStatuses.value = jobContent.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses) toLocation.value = dataContent.value[0] toLocationCode.value = dataContent.value[0].toLocationCode fromLocationList.value = getFromLocationList() diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue index 4850d9aa..5e9bda74 100644 --- a/src/pages/package/coms/comScanPackagePack.vue +++ b/src/pages/package/coms/comScanPackagePack.vue @@ -91,6 +91,7 @@ import { getWorkShopLineStation } from '@/api/request2.js' import { calc } from '@/common/calc.js' import { getBalanceByManagementPrecision } from '@/common/balance.js' +import { getDirectoryItemArray } from '../../../common/directory' const { proxy } = getCurrentInstance() const props = defineProps({ @@ -147,7 +148,7 @@ const closeScanPopup = () => { const initData = () => { fromLocationList.value = [] if (dataContent.value != null) { - fromInventoryStatuses.value = jobContent.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses) toLocation.value = dataContent.value[0] toLocationCode.value = dataContent.value[0].toLocationCode fromLocationList.value = getFromLocationList() diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 2bc50ed9..b7c72d1d 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -241,24 +241,25 @@ const getScanResult = (result) => { } else if (itemDetail.scaned) { showErrorMessage(`箱码【${packingNumber}】,批次【${batch}】库位【${result.fromLocationCode}】已经扫描`) } else { - addDetail(itemDetail, result) - return + // addDetail(itemDetail, result) + // return // 暂时先不判断状态 const itemStatus = getInventoryStatusName(itemDetail.inventoryStatus) const balanceStatus = getInventoryStatusName(result.balance.inventoryStatus) if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if (jobContent.value.allowModifyInventoryStatus == 'TRUE') { - showQuestionMessage(`实际库存状态[${balanceStatus}]与推荐库存状态[${itemStatus}]不一致,是否继续上架?`, (res) => { - if (res) { - addDetail(itemDetail, result) - } else { - scanPopupGetFocus() - } - }) - } - } else { - addDetail(itemDetail, result) + // if (jobContent.value.allowModifyInventoryStatus == 'TRUE') { + showQuestionMessage(`实际库存状态[${balanceStatus}]与推荐库存状态[${itemStatus}]不一致,是否继续上架?`, (res) => { + if (res) { + addDetail(itemDetail, result) + } else { + scanPopupGetFocus() + } + }) + // } } + // else { + // addDetail(itemDetail, result) + // } } } } catch (e) { @@ -270,6 +271,7 @@ const addDetail = (itemDetail, result) => { itemDetail.handleQty = Number(result.balance.qty) itemDetail.balance = result.balance itemDetail.toInventoryStatus = result.balance.inventoryStatus + itemDetail.fromInventoryStatus = result.balance.inventoryStatus itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packUnit = result.package.packUnit diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 747af082..2eec0add 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -12,7 +12,7 @@ - + diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index d69b0ab9..d0bd3e3d 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -11,7 +11,7 @@ - + diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index f03dc0ce..77aee44f 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -12,7 +12,7 @@ - + diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index 2bd74beb..9aa74b39 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -81,6 +81,7 @@ import { getWorkShopLineStation, getBalanceByFilter } from '@/api/request2.js' import { calc } from '@/common/calc.js' import { getBalanceByManagementPrecision } from '@/common/balance.js' +import { getDirectoryItemArray } from '../../../common/directory.js' const props = defineProps({ title: { @@ -139,7 +140,7 @@ const closeScanPopup = () => { const initData = () => { fromLocationList.value = [] if (dataContent.value != null) { - fromInventoryStatuses.value = jobContent.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses) toLocation.value = dataContent.value[0] toLocationCode.value = dataContent.value[0].toLocationCode fromLocationList.value = getFromLocationList() diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue index 7fca42f6..eed297fa 100644 --- a/src/pages/stockUp/coms/comScanStockUpPack.vue +++ b/src/pages/stockUp/coms/comScanStockUpPack.vue @@ -85,6 +85,7 @@ import { calc } from '@/common/calc.js' import { getWorkShopLineStation } from '@/api/request2.js' import { getBalanceByManagementPrecision } from '@/common/balance.js' +import { getDirectoryItemArray } from '../../../common/directory.js' const { proxy } = getCurrentInstance() const props = defineProps({ @@ -148,7 +149,7 @@ const closeScanPopup = () => { const initData = () => { fromLocationList.value = [] if (dataContent.value != null) { - fromInventoryStatuses.value = jobContent.value.outInventoryStatuses + fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses) toLocation.value = dataContent.value[0] toLocationCode.value = dataContent.value[0].toLocationCode fromLocationList.value = getFromLocationList()