diff --git a/src/api/wms/mesRawMaterialConsumptionInfo/index.ts b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts new file mode 100644 index 000000000..fbfaf7290 --- /dev/null +++ b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts @@ -0,0 +1,46 @@ +import request from '@/config/axios' + + +export const AssemblyFinishedMaterialConsumptionMesRespVO = { + finishPackingNumber: '', + finishBatch: '', + finishItemCode: '', + finishCreateTime: new Date(), + id: 0, + processCode: '', + bomVersion: '', + packingNumber: '', + batch: '', + inventoryStatus: '', + fromLocationCode: '', + fromLocationGroupCode: '', + fromAreaCode: '', + itemName: '', + itemDesc1: '', + itemDesc2: '', + projectCode: '', + qty: '', + uom: '', + number: '', + itemCode: '', + remark: '', + createTime: new Date(), + creator: '', + code: '', + interfaceType: '', + jobDetailId: '' +}; + + +// 查询QAD项目信息列表 +export const getMesRawMaterialConsumptionInfoPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productreceipt-detailb/getAssemblyMaterialUsageMesSenior', data }) + } else { + return await request.get({ url: `/wms/productreceipt-detailb/getAssemblyMaterialUsageMes`, params }) + } +} + + diff --git a/src/api/wms/rawMaterialConsumptionInfo/index.ts b/src/api/wms/rawMaterialConsumptionInfo/index.ts new file mode 100644 index 000000000..38b62d2a9 --- /dev/null +++ b/src/api/wms/rawMaterialConsumptionInfo/index.ts @@ -0,0 +1,46 @@ +import request from '@/config/axios' + + +export const AssemblyFinishedMaterialConsumptionRespVO = { + finishPackingNumber: '', + finishBatch: '', + finishItemCode: '', + finishCreateTime: new Date(), + id: 0, + processCode: '', + bomVersion: '', + packingNumber: '', + batch: '', + inventoryStatus: '', + fromLocationCode: '', + fromLocationGroupCode: '', + fromAreaCode: '', + itemName: '', + itemDesc1: '', + itemDesc2: '', + projectCode: '', + qty: '', + uom: '', + number: '', + itemCode: '', + remark: '', + createTime: new Date(), + creator: '', + code: '', + interfaceType: '', + jobDetailId: '' +}; + + +// 查询QAD项目信息列表 +export const getRawMaterialConsumptionInfoPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/backflush-record-detailb/getAssemblyMaterialUsageSenior', data }) + } else { + return await request.get({ url: `/wms/backflush-record-detailb/getAssemblyMaterialUsage`, params }) + } +} + + diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue new file mode 100644 index 000000000..c0f82ff6a --- /dev/null +++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue @@ -0,0 +1,112 @@ + + + diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts new file mode 100644 index 000000000..804384a66 --- /dev/null +++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts @@ -0,0 +1,173 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' + + + +export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive([ + { + label: '成品包装号', + field: 'finishedPackingNumber', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '成品批次', + field: 'finishedBatch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, + { + label: '成品物料代码', + field: 'finishedItemCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '成品创建时间', + field: 'finishedCreateTime', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '成品创建人', + field: 'finishedCreator', + sort: 'custom', + isTable: true, + table: { + width: 150 + }, + }, + { + label: '唯一码', + field: 'remark', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '客户物料号', + field: 'customerItemCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '原料包装号', + field: 'packingNumber', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '原料旧包装号', + field: 'oldPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, + { + label: '原料批次', + field: 'batch', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '原料主表ID', + field: 'masterId', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料物品名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料外部零件号', + field: 'outsideItemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料外部生产日期', + field: 'outsideProduceDate', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料外部流水号', + field: 'outsideSerialNumber', + sort: 'custom', + table: { + width: 150 + }, + }, +])) \ No newline at end of file diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue new file mode 100644 index 000000000..ede928449 --- /dev/null +++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts new file mode 100644 index 000000000..3fdd7de9d --- /dev/null +++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts @@ -0,0 +1,260 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' + +/** + * @returns {Array} 制品收货记录子表 + */ +export const RawMaterialConsumptionInfo = useCrudSchemas(reactive([ + + { + label: '成品包装号', + field: 'finishedPackingNumber', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '成品批次', + field: 'finishedBatch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, + { + label: '成品物料代码', + field: 'finishedItemCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '成品创建时间', + field: 'finishedCreateTime', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '成品创建人', + field: 'finishedCreator', + sort: 'custom', + isTable: true, + table: { + width: 150 + }, + }, + { + label: '原料工序代码', + field: 'processCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料BOM版本', + field: 'bomVersion', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, + { + label: '原料库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料从库位组代码', + field: 'fromLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料从库区代码', + field: 'fromAreaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '原料物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, + { + label: '原料备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '原料创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '原料计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '原料接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, +])) \ No newline at end of file