diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 6058e62eb..f02d2aee1 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1753,27 +1753,23 @@ export const productionReturnJob = [ { label: "到库区", prop: 'toLocationArea' }, // ----------------------------------------------------------------------- ] -// 生产退库记录 已调整 +// 生产退库记录 20230413 export const productionReturnNote = [ { label: "物品代码", prop: "itemCode",fixed:"left" }, { label: "物品名称", prop: 'itemName' }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: 'qty' }, { label: "单位", prop: 'uom' }, - { label: "批次", prop: 'toLot' }, - { label: "箱码", prop: 'toPackingCode' }, - { label: "来源库位", prop: 'fromLocationCode' }, - { label: "目标库位", prop: 'toLocationCode' }, { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "采购订单号", prop: 'poNumber', width:orderWidth }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -1791,9 +1787,39 @@ export const productionReturnNote = [ { label: "目标库区", prop: 'toLocationArea' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, + // ----------------------------------------------------------------------- + { label: "推荐箱码", prop: "recommendPackingCode" }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + { label: "实际供应商批次", prop: "handledSupplierBatch" }, + { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, + { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, + { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, + { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, + { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, + { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, + { label: "推荐批次", prop: "recommendLot" }, + { label: "实际批次", prop: "handledLot" }, + { label: "推荐库位", prop: "recommendToLocationCode" }, + { label: "实际库位", prop: "handledToLocationCode" }, + { label: "推荐库区", prop: "recommendToLocationArea" }, + { label: "实际库区", prop: "handledToLocationArea" }, + { label: "推荐库位组", prop: "recommendToLocationGroup" }, + { label: "实际库位组", prop: "handledToLocationGroup" }, + { label: "推荐ERP库位", prop: "recommendToLocationErpCode" }, + { label: "实际ERP库位", prop: "handledToLocationErpCode" }, + { label: "推荐仓库", prop: "recommendToWarehouseCode" }, + { label: "实际仓库", prop: "handledToWarehouseCode" }, + { label: "推荐数量", prop: "recommendQty" }, + { label: "实际数量", prop: "handledQty" }, { label: "fromStatus", prop: 'fromStatus' }, { label: "toStatus", prop: 'toStatus' }, - // ----------------------------------------------------------------------- + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: 'id' }, + // { label: "采购订单号", prop: 'poNumber', width:orderWidth }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, ] // 库存管理 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index cf661aa91..68004d530 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2471,7 +2471,7 @@ export const productionReturnJob = [ { label: "任务描述", prop: 'jobDescription' }, // ----------------------------------------------------------------------- ] -// 生产退库记录 已调整 +// 生产退库记录 20230413 export const productionReturnNote = [ { label: "退库记录单号", @@ -2480,18 +2480,21 @@ export const productionReturnNote = [ fixed: "left", width: orderWidth }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth }, - { label: "采购订单号", prop: "poNumber", width:orderWidth }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "操作员", prop: 'worker' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "退料时间", prop: 'returnTime', type: "dateTime" }, { label: "任务ID", prop: 'jobNumber', width:orderWidth }, + { label: "事务ID", prop: "tenantId" }, + // { label: "采购订单号", prop: "poNumber", width:orderWidth }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 线边仓缴库申请 已调整 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index c1d1d6f51..7e47a6e0c 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1843,25 +1843,25 @@ export const productionReturnJob = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 生产退库记录 已调整 1 +// 生产退库记录 20230413 export const productionReturnNote = [ { label: "退库记录单号", prop: "number" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "退库单号", prop: "productionReturnRequestNumber" }, - { label: "采购订单号", prop: "poNumber" }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "退料时间", prop: 'returnTime', type: "dateTime" }, { label: "任务ID", prop: 'jobNumber' }, { label: "ID", prop: 'id' }, + // { label: "采购订单号", prop: "poNumber" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ]