From 69cdbb24ae389ffb7d56aa9724cd24673f268983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 11 Apr 2023 11:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=AB=E6=96=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=8E=A5=E5=8F=A3=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 | 153 ++++++++++++------ fe/PC/src/utils/tableColumns/index.js | 41 +++-- fe/PC/src/utils/tabsDesTions/index.js | 44 ++--- .../automaticCallJob-msQuery.vue | 4 +- .../automaticCallNote.vue | 2 +- 5 files changed, 157 insertions(+), 87 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index b2ce14463..d96933f3c 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -655,44 +655,55 @@ export const IssueNote = [ // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- ] -// 自动叫料申请 待确认 +// 自动叫料申请 20230411 export const automaticCallApply = [ { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, - // 批次占位 - // 箱码占位 { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // 来源库位占位 - // 来源ERP库位 + { label: "创建者ID", prop: 'creatorId' }, { label: "目标库位", prop: "toLocationCode" }, { label: "目标ERP库位", prop: "toLocationErpCode" }, { label: "生成任务数量", prop: 'issuedQty' }, { label: "已收数量", prop: 'receivedQty' }, - { label: "外部单号(其他系统)", prop: 'foreignNumber' }, - { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "单据号", prop: 'number' }, // ----------------------------------------------------------------------- - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "生产线", prop: 'prodLine' }, { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, { label: "工作中心", prop: 'workStation' }, { label: "过期时间", prop: 'expiredTime' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "目标库位组", prop: 'toLocationGroup' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: "remark" }, + { label: "事务ID", prop: "tenantId" }, + { label: "主表ID", prop: "masterID" }, + { label: "ID", prop: 'id' }, + { label: "请求未发", prop: 'toBeIssuedQty' }, + { label: "已发未收", prop: 'toBeReceivedQty' }, + { label: "请求未收", prop: 'notFinishQty' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "在途库位", prop: 'onTheWayLocationCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // 批次占位 + // 箱码占位 + // 来源库位占位 + // 来源ERP库位 // ----------------------------------------------------------------------- ] -// 自动发料任务 已调整 +// 自动发料任务 20230411 export const automaticCallJob = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "单位", prop: "recommendUom" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, { label: "推荐批次", prop: "recommendLot" }, { label: "实际批次", prop: "handledLot" }, { label: "推荐数量", prop: 'recommendQty' }, @@ -700,20 +711,29 @@ export const automaticCallJob = [ { label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "推荐库位", prop: "recommendLocationCode" }, - { label: "实际库位", prop: "handledLocationCode" }, - { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, - { label: "实际ERP库位", prop: 'handledLocationErpCode' }, - { label: "外部单号(其他系统)", prop: 'foreignNumber' }, + { label: "创建者ID", prop: 'creatorId' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- { label: "标包数量", prop: "stdPackQty" }, - { label: "标包计量单位", prop: "stdPackUom" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "任务编号", prop: 'number' }, + { label: "上次修改者ID", prop: 'lastModifierId' }, + { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "状态", prop: 'status' }, + { label: "推荐库位", prop: 'recommendFromLocationCode' }, + { label: "推荐区域", prop: 'recommendFromLocationArea' }, + { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, + { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, + { label: "计量单位", prop: 'uom' }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: "实际区域", prop: 'handledFromLocationArea' }, + { label: "实际分组", prop: 'handledFromLocationGroup' }, + { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际仓库", prop: 'handledFromWarehouseCode' }, + { label: "到库区", prop: 'toLocationArea' }, + { label: "到库位组", prop: 'toLocationGroup' }, + { label: "到ERP库位", prop: 'toLocationErpCode' }, + { label: "到仓库", prop: 'toWarehouseCode' }, { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, { label: "实际供应商批次", prop: 'handledSupplierBatch' }, { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, @@ -722,12 +742,6 @@ export const automaticCallJob = [ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "推荐库位组", prop: 'recommendLocationGroup' }, - { label: "实际库位组", prop: 'handledLocationGroup' }, - { label: "推荐库区", prop: 'recommendLocationArea' }, - { label: "实际库区", prop: 'handledLocationArea' }, - { label: "推荐计量单位", prop: 'recommendUom' }, - { label: "实际计量单位", prop: 'handledUom' }, { label: "请求库位", prop: 'requestLocationCode' }, { label: "到库位", prop: 'toLocationCode' }, { label: "生产线", prop: 'prodLine' }, @@ -740,35 +754,52 @@ export const automaticCallJob = [ { label: "plannedSplitRule", prop: 'plannedSplitRule' }, { label: "计划开始时间", prop: 'planBeginTime' }, { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, - { label: "ERP库位", prop: 'locationErpCode' }, - // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "ID", prop: 'id' }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + // { label: "单位", prop: "recommendUom" }, + // { label: "标包单位", prop: "stdPackUom" }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "状态", prop: 'status' }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "库区", prop: 'locationArea' }, + // { label: "ERP库位", prop: 'locationErpCode' }, + // { label: "推荐库位", prop: "recommendLocationCode" }, + // { label: "实际库位", prop: "handledLocationCode" }, + // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' }, + // { label: "实际ERP库位", prop: 'handledLocationErpCode' }, + // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // { label: "推荐库位组", prop: 'recommendLocationGroup' }, + // { label: "实际库位组", prop: 'handledLocationGroup' }, + // { label: "推荐库区", prop: 'recommendLocationArea' }, + // { label: "实际库区", prop: 'handledLocationArea' }, + // { label: "推荐计量单位", prop: 'recommendUom' }, + // { label: "实际计量单位", prop: 'handledUom' }, // ----------------------------------------------------------------------- ] -// 自动发料记录 已调整 +// 自动发料记录 20230411 export const automaticCallNote = [ { 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: "arriveDate", type: "dateTime" }, - { label: "外部单号(其他系统)", prop: 'foreignNumber' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- + { label: "生效日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "任务编号", prop: 'number' }, + { label: "上次修改者ID", prop: 'lastModifierId' }, + { label: "任务编号", prop: 'number',width: orderWidth }, { label: "备注", prop: 'remark' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "标包计量单位", prop: 'stdPackUom' }, + { label: "来源仓库", prop: 'fromWarehouseCode' }, + { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -776,19 +807,47 @@ export const automaticCallNote = [ { label: "目标批次", prop: 'toLot' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + { label: "过期日期", prop: 'expireDate', type: "dateTime" }, { label: "来源库位组", prop: 'fromLocationGroup' }, { label: "目标库位组", prop: 'toLocationGroup' }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源仓库", prop: 'fromWarehouseCode' }, - { label: "目标仓库", prop: 'toWarehouseCode' }, + { 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: "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 3f6655409..7d3839f11 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1718,7 +1718,7 @@ export const IssueNote = [ // { label: "完成时间", prop: "completeTime",type: "dateTime" }, // ----------------------------------------------------------------------- ] -// 自动叫料申请 已调整 +// 自动叫料申请 20230411 export const automaticCallApply = [ { label: "叫料申请编号", @@ -1727,14 +1727,15 @@ export const automaticCallApply = [ type: "name", width: orderWidth }, - { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: "worker" }, + { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "公司", prop: 'company' }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, @@ -1745,9 +1746,12 @@ export const automaticCallApply = [ { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 自动发料任务 已调整 +// 自动发料任务 20230411 export const automaticCallJob = [ { label: "发料任务编号", @@ -1757,16 +1761,18 @@ export const automaticCallJob = [ width: orderWidth }, { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, - { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "完成时间", prop: "completeTime",type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, + { label: "完成时间", prop: "completeTime", type: "dateTime" }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "仓库", prop: 'warehouseCode' }, - { label: "上游任务编号", prop: 'upStreamJobNumber',width: orderWidth }, + { label: "上游任务编号", prop: 'upStreamJobNumber' }, { label: "任务类型", prop: 'jobType' }, { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, @@ -1777,15 +1783,16 @@ export const automaticCallJob = [ { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, - { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, { label: "叫料请求类型", prop: 'requestType' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // { label: "公司", prop: 'company' }, + // { label: "完成时间", prop: 'completeTime', type: "dateTime" }, // ----------------------------------------------------------------------- ] -// 自动发料记录 已调整 +// 自动发料记录 20230411 export const automaticCallNote = [ { label: "发料记录单号", @@ -1797,18 +1804,22 @@ export const automaticCallNote = [ { 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: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "生效日期", prop: 'activeDate' }, + { 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: "事务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 0933f1e9b..9c4688e30 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1188,13 +1188,14 @@ export const IssueNote = [ // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 自动叫料申请 已调整 1apifox +// 自动叫料申请 20230411 export const automaticCallApply = [ - { label: "叫料申请编号", prop: "number" }, + { label: "申请编号", prop: "number" }, { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, @@ -1203,55 +1204,54 @@ export const automaticCallApply = [ { label: "叫料类型", prop: 'type' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, + { label: "创建者ID", prop: "creatorId" }, { label: "事务ID", prop: "tenantId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备料计划单号", prop: 'preparationPlanNumber' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 自动发料任务 已调整 1apifox +// 自动发料任务 20230411 export const automaticCallJob = [ - { label: "发料任务编号", prop: 'number' }, - { label: "申请单号", prop: 'materialRequestNumber' }, - { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "发料任务编号", prop: "number" }, + { label: "申请单号", prop: "materialRequestNumber" }, + { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, { label: "承接用户", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成用户", prop: 'completeUserName' }, - { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: "完成时间", prop: "completeTime", type: "dateTime" }, { label: "叫料请求类型", prop: 'requestType' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, + { label: "上游任务编号", prop: 'upStreamJobNumber',}, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "事务ID", prop: "tenantId" }, { label: "工作组", prop: 'workGroupCode' }, + { label: "创建者ID", prop: "creatorId" }, { label: "承接者ID", prop: 'acceptUserId' }, { label: "完成者ID", prop: 'completeUserId' }, { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "仓库", prop: 'warehouseCode' }, - { label: "ID", prop: 'id' }, - { label: "公司", prop: 'company' }, + { label: "ID", prop: "id" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 自动发料记录 已调整 1apifox +// 自动发料记录 20230411 export const automaticCallNote = [ { label: "发料记录单号", prop: "number" }, { label: "申请单号", prop: 'requestNumber' }, @@ -1262,17 +1262,17 @@ export const automaticCallNote = [ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, // ----------------------------------------------------------------------- - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "创建者ID", prop: "creatorId" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: 'company' }, { label: "生效日期", prop: 'activeDate' }, { label: "车间", prop: 'workshop' }, { label: "确认时间", prop: 'confirmTime' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 上架前退货记录 已调整 1 diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue index e17cd584e..dcc7760b3 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue @@ -98,7 +98,7 @@ export default { }, data () { return { - URL: 'wms/job/issue-job', + URL: 'wms/store/issue-job', tableLoading: false, handleMultipleSelection: [], //常用按钮数据 @@ -246,7 +246,7 @@ export default { this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount // 叫料请求类型: 人工拉动:Issue_Manual; 线边拉动:Issue_WIP; 直接发料:Direct_Issue let params = { - type: 'Issue_WIP' + requestType: 'Issue_WIP' } materialRequestByType(this.PageListParams, this.URL + '/by-type', params) .then(res => { diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue index d7fa0848d..f21909240 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue @@ -93,7 +93,7 @@ export default { this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount // 叫料请求类型: 人工拉动:Issue_Manual; 线边拉动:Issue_WIP; 直接发料:Direct_Issue let params = { - type: 'Issue_WIP' + requestType: 'Issue_WIP' } materialRequestByType(this.PageListParams, this.URL + '/by-type', params) .then(res => {