From 940d5615fd52a792f9d36f944ce47f4418c70a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 13 Apr 2023 07:31:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 45 ++++++++++++++++---- fe/PC/src/utils/tableColumns/index.js | 15 ++++--- fe/PC/src/utils/tabsDesTions/index.js | 14 +++--- 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index dbda19a38..98fe7f8b3 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1193,29 +1193,29 @@ export const materialDirectSendNote = [ // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] -// 直接发料记录 +// 直接发料记录 20230413 export const directIssueNote = [ { 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: "fromLot" }, - { label: "箱码", prop: "fromPackingCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "来源库位", prop: "fromLocationCode" }, { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "目标库位", prop: "toLocationCode" }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- { label: "生效日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -1228,13 +1228,42 @@ export const directIssueNote = [ { label: "目标库位组", prop: 'toLocationGroup' }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, + { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "fromStatus", prop: 'fromStatus' }, { label: "toStatus", prop: 'toStatus' }, { label: "发料时间", prop: 'issueTime', type: "dateTime" }, - { label: "过期时间", prop: 'expiredTime', type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, { label: "工作中心", prop: 'workStation' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + { label: "推荐数量", prop: 'recommendQty' }, + { label: "实际批次", prop: "handledLot" }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: "实际区域", prop: 'handledFromLocationArea' }, + { label: "实际分组", prop: 'handledFromLocationGroup' }, + { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际仓库", prop: 'handledFromWarehouseCode' }, + { label: "推荐库位", prop: 'recommendFromLocationCode' }, + { label: "推荐区域", prop: 'recommendFromLocationArea' }, + { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, + { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, + { label: "实际数量", prop: 'handledQty' }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "推荐批次", prop: "recommendLot" }, + { 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: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "过期时间", prop: 'expiredTime', type: "dateTime" }, + // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- ] diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 761aa42ed..7f583d211 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2019,7 +2019,7 @@ export const materialDirectSendNote = [ // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 直接发料记录 +// 直接发料记录 20230413 export const directIssueNote = [ { label: "发料记录单号", @@ -2028,22 +2028,25 @@ export const directIssueNote = [ type: "name", width: orderWidth }, + { label: "申请单号", prop: 'requestNumber',width: orderWidth }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "完成时间", prop: "completeTime",type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "车间", prop: 'workshop' }, { label: "叫料请求类型", prop: 'requestType' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime' }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "完成时间", prop: "completeTime",type: "dateTime" }, // ----------------------------------------------------------------------- ] diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 62b02b4fe..9eb7e1187 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1442,9 +1442,11 @@ export const materialDirectSendNote = [ // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 直接发料记录 +// 直接发料记录 20230413 export const directIssueNote = [ { label: "发料记录单号", prop: "number" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "任务单号", prop: 'jobNumber' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, { label: "叫料请求类型", prop: 'requestType' }, @@ -1456,14 +1458,12 @@ export const directIssueNote = [ { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "生效日期", prop: 'activeDate' }, { label: "车间", prop: 'workshop' }, - { label: "确认时间", prop: 'confirmTime', type: "dateTime" }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "确认时间", prop: 'confirmTime' }, { label: "ID", prop: 'id' }, - { label: "公司", prop: 'company' }, - { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ]