diff --git a/src/api/wms/unitConversion/index.ts b/src/api/wms/unitConversion/index.ts index 1c43bd535..ff6acc4ba 100644 --- a/src/api/wms/unitConversion/index.ts +++ b/src/api/wms/unitConversion/index.ts @@ -54,4 +54,9 @@ export const exportUnitConversion = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/unit-conversion/get-import-template' }) +} + +// 查询品番单位转换表(WMS)详情根据物料code +export const getUnitConversionByCode = async (itemCode: string) => { + return await request.get({ url: `/wms/unit-conversion/getUnitConversionByCode?itemCode=` + itemCode }) } \ No newline at end of file diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d828cc2af..6cdc47b94 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -120,6 +120,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as ItembasicApi from '@/api/wms/itembasic' +import * as UnitConversionApi from '@/api/wms/unitConversion' import * as SupplieritemApi from '@/api/wms/supplieritem' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' import { @@ -603,6 +604,21 @@ const pointLabel = async () => { // } // }) labelPointFormRef.value.formLoading = true + const unitConversion = await UnitConversionApi.getUnitConversionByCode(detatableData1.value[0].itemCode); + let convertRate = 1//转换率 + let purchaseUom = detatableData1.value[0].uom//采购计量单位 + let purchaseStdQty//采购标包数量 + if(unitConversion!=null){ + if(unitConversion.convertRate!=null&&unitConversion.convertRate!='' && unitConversion.convertRate!=0){ + convertRate = unitConversion.convertRate; + } + if(unitConversion.purchaseUom!=null&&unitConversion.purchaseUom!='' ){ + purchaseUom = unitConversion.purchaseUom; + } + } + + let purchaseQty = (detatableData1.value[0].printQty / convertRate).toFixed(5);//采购每包中实际的数量 + purchaseStdQty = (detatableData1.value[0].packQty / convertRate).toFixed(5);//采购每包中实际的数量 try { const obj = { itemCode:detatableData1.value[0].itemCode, @@ -613,7 +629,12 @@ const pointLabel = async () => { uom:detatableData1.value[0].uom, productionLine:detatableData1.value[0].productionLine, supplierCode:detatableData1.value[0].supplierItemCode, + convertRate:convertRate, + purchaseQty:purchaseQty, + purchaseUom:purchaseUom, + purchaseStdQty:purchaseStdQty } + console.log('obj===========================',obj); // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0) if(!parseFloat(obj.printQty) ){ message.error(`物料号${obj.itemCode}打印数量不可以为0`)