diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index 3249536ab..876d5a6d6 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -501,7 +501,7 @@ export function getPageListWip(data, url) { }) } -// 线边仓调拨确认按钮 | 客户调拨确认按钮 +// 线边仓调拨确认按钮 | 客户调拨确认按钮 | 自动发料记录 export function confirm(id, url) { return request({ url: baseURL + url + '/confirm/' + id, diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index bbc02f299..e989406f0 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1667,27 +1667,24 @@ export const FISDeliverRequest = [ // { label: "截止底盘号",prop: 'extraProperties',type:"object", showProp: 'ToVinCode' }, // ----------------------------------------------------------------------- ] -// FIS发货记录 已调整 +// FIS发货记录 20230415 export const FISDeliverNote = [ { 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: 'extraProperties',type:"object", showProp: 'FromVinCode' }, - { label: "截止底盘号",prop: 'extraProperties',type:"object", showProp: 'ToVinCode' }, - { label: "出货库区", prop: "fromLocationArea" }, - { label: "出货库位", prop: 'fromLocationCode' }, - { label: "ERP库位", prop: 'fromLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - // ----------------------------------------------------------------------- - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "出货库位", prop: "fromLocationCode" }, + { label: "出货ERP库位", prop: "fromLocationErpCode" }, { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + { label: "生产时间", prop: "produceDate",type: "dateTime" }, + { label: "过期时间", prop: "expireDate",type: "dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, @@ -1696,37 +1693,68 @@ export const FISDeliverNote = [ { label: "供应商批次", prop: 'supplierBatch' }, { label: "来源库位组", prop: 'fromLocationGroup' }, { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: 'toLocationCode' }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "fromStatus", prop: 'fromStatus' }, { label: "toStatus", prop: 'toStatus' }, // ----------------------------------------------------------------------- + { label: "推荐批次", prop: 'recommendLot' }, + { label: "实际批次", prop: 'handledLot' }, + { label: "推荐数量", prop: 'recommendQty' }, + { label: "实际数量", prop: 'handledQty' }, + { label: "推荐箱码", prop: 'recommendPackingCode' }, + { label: "实际箱码", prop: 'handledPackingCode' }, + { label: "创建者ID", prop: 'creatorId' }, + { 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: "事务ID", prop: "tenantId" }, + { label: "主表ID", prop: "masterID" }, + { label: "ID", prop: 'id' }, + { label: "推荐库位", prop: 'recommendFromLocationCode' }, + { label: "推荐区域", prop: 'recommendFromLocationArea' }, + { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, + { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: "实际区域", prop: 'handledFromLocationArea' }, + { label: "实际分组", prop: 'handledFromLocationGroup' }, + { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际仓库", prop: 'handledFromWarehouseCode' }, + // { label: "客户代码", showProp:"customerCode", type:"outerMainFilter", width: orderWidth }, + // { label: "客户地址", showProp:"customerAddressCode", type:"outerMainFilter", width: orderWidth }, + // { label: "来源ERP库位", prop: 'fromLocationErpCode' }, + // { label: "来源库位", prop: 'fromLocationCode' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // ----------------------------------------------------------------------- ] -// 客户退拆申请 已调整 +// 客户退拆申请 20230415 export const customerDismantle = [ { label: "退拆物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "预定开工日", prop: "preStartTime",type: "dateTime" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "退拆数量", prop: "qty" }, { label: "单位", prop: 'uom' }, { label: "扣账库位", prop: "locationCode" }, { label: "扣账ERP库位", prop: 'locationErpCode' }, - { label: "转移工时", prop: "workHour" }, { label: "缴库库位", prop: 'rawLocationCode' }, { label: "原料ERP库位", prop: 'rawLocationErpCode' }, - { label: "转移料号（子零件号）", prop: 'rawItemCode' }, - { label: "转移量（子零件）", prop: 'rawQty' }, { 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: "Bom版本", prop: 'bomVersion' }, @@ -1734,7 +1762,15 @@ export const customerDismantle = [ { label: "库区", prop: 'locationArea' }, { label: "原料库位组", prop: 'rawLocationGroup' }, { label: "原料库区", prop: 'rawLocationArea' }, + { label: "原料仓库", prop: 'rawWarehouseCode' }, { label: "仓库代码", prop: 'warehouseCode' }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: 'id' }, + // { label: "预定开工日", prop: "preStartTime",type: "dateTime" }, + // { label: "转移工时", prop: "workHour" }, + // { label: "转移料号（子零件号）", prop: 'rawItemCode' }, + // { label: "转移量（子零件）", prop: 'rawQty' }, // ----------------------------------------------------------------------- ] // 生产退库申请 已调整 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index fdb7a2c19..8d0201aac 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2337,7 +2337,7 @@ export const FISDeliverRequest = [ // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// FIS发货记录 已调整 +// FIS发货记录 20230415 export const FISDeliverNote = [ { label: "发货记录单号", @@ -2346,28 +2346,32 @@ export const FISDeliverNote = [ type: "name", width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "发货申请单号", prop: "deliverRequestNumber", width: orderWidth }, + { label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth }, + { label: "发货时间", prop: "deliverTime",type: "dateTime" }, { label: "客户代码", prop: "customerCode" }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- - { label: "发货时间", prop: "deliverTime",type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "发货任务单号", prop: "jobNumber", width:orderWidth }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "任务ID", prop: 'jobNumber' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "客户地址", prop: 'customerAddressCode' }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, - { label: "目标库位代码", prop: 'toLocationCode' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "目标ERP库位代码", prop: 'toLocationErpCode' }, - { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, + { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" }, + { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "目标库位代码", prop: 'toLocationCode' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "目标ERP库位代码", prop: 'toLocationErpCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆申请 已调整 +// 客户退拆申请 20230415 export const customerDismantle = [ { label: "退拆申请单号", @@ -2377,23 +2381,28 @@ export const customerDismantle = [ width: orderWidth }, { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { 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: 'shift' }, { 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" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, + { label: "车间", prop: 'workshop' }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: "id" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆记录 已调整 +// 客户退拆记录 20230415 export const customerDismantleNote = [ { label: "退拆记录单号", @@ -2402,23 +2411,26 @@ export const customerDismantleNote = [ type: "name", width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: "worker" }, - // ----------------------------------------------------------------------- - { label: "生效时间", prop: "activeDate",type: "dateTime" }, { label: "班次", prop: 'shift' }, + { label: "车间", prop: 'workshop' }, { label: "回收时间", prop: "recycleTime",type: "dateTime" }, + { label: "生效时间", prop: "activeDate",type: "dateTime" }, + { label: "操作员", prop: "worker" }, + // ----------------------------------------------------------------------- + { 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: 'requestNumber', width:orderWidth }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 客户退拆记录-明细【即回冲记录】 已调整 +// 客户退拆记录-明细【即回冲记录】 20230415 export const customerDismantleBackFlushNote = [ { label: "退拆物品号", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1", }, { label: "预定开工日", prop: "preStartTime" ,type: "dateTime", }, { label: "退拆数量", prop: "qty" }, { label: "扣账库位", prop: 'locationCode' }, @@ -2426,6 +2438,7 @@ export const customerDismantleBackFlushNote = [ { label: "缴库库位", prop: 'rawLocationCode' }, { label: "转移料号（子零件号）", prop: 'rawItemCode' }, { label: "转移量（子零件）", prop: 'rawQty' }, + // { label: "物品描述", prop: "itemDesc1", }, ] // 生产退库申请 已调整 export const productionReturnRequest = [ diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 065f576f7..dbb5e2814 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1714,78 +1714,78 @@ export const FISDeliverRequest = [ // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// FIS发货记录 已调整 1 +// FIS发货记录 20230415 export const FISDeliverNote = [ - { label: "发货记录单号", prop: 'number' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "记录单号", prop: 'number' }, + { label: "发货任务单号", prop: "jobNumber" }, { label: "发货申请单号", prop: "deliverRequestNumber" }, + { label: "发货时间", prop: "deliverTime",type: "dateTime" }, { label: "客户代码", prop: "customerCode" }, + { label: "客户地址", prop: 'customerAddressCode' }, { label: "操作员", prop: 'worker' }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "发货时间", prop: "deliverTime", type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, - { label: "公司", prop: 'company' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "任务ID", prop: 'jobNumber' }, - { label: "客户地址", prop: 'customerAddressCode' }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, - { label: "目标库位代码", prop: 'toLocationCode' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "目标ERP库位代码", prop: 'toLocationErpCode' }, - { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" }, + { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, + { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "目标库位代码", prop: 'toLocationCode' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "目标ERP库位代码", prop: 'toLocationErpCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆申请 已调整 1 +// 客户退拆申请 20230415 export const customerDismantle = [ { label: "退拆申请单号", prop: "number" }, { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, { label: "车间", prop: 'workshop' }, - { label: "公司", prop: 'company' }, { label: "班次", prop: 'shift' }, { 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" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆记录 已调整 1 +// 客户退拆记录 20230415 export const customerDismantleNote = [ { label: "退拆记录单号", prop: "number" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, - { label: "生效时间", prop: "activeDate",type: "dateTime" }, - { label: "回收时间", prop: "recycleTime" ,type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "申请单号", prop: 'requestNumber' }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, + { label: "事务ID", prop: "tenantId" }, + { label: "操作员", prop: "worker" }, + { label: "生效时间", prop: "activeDate",type: "dateTime" }, + { label: "回收时间", prop: "recycleTime" ,type: "dateTime" }, { label: "班次", prop: 'shift' }, { label: "车间", prop: 'workshop' }, - { label: "事务ID", prop: "tenantId" }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "ID", prop: 'id' }, + { label: "申请单号", prop: 'requestNumber' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 生产退库申请 已调整 1 diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue index 6ac8dfd42..0e34d1029 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue +++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue @@ -133,12 +133,14 @@ export default { } else { this.propsData = res } - this.propsData.itemCode = this.propsData.noteAndBackFlushDetails[0].itemCode - this.propsData.locationCode = this.propsData.noteAndBackFlushDetails[0].locationCode - this.propsData.qty = this.propsData.noteAndBackFlushDetails[0].qty - this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode - this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime - this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour + if (this.propsData.noteAndBackFlushDetails.length > 0) { + this.propsData.itemCode = this.propsData.noteAndBackFlushDetails[0].itemCode + this.propsData.locationCode = this.propsData.noteAndBackFlushDetails[0].locationCode + this.propsData.qty = this.propsData.noteAndBackFlushDetails[0].qty + this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode + this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime + this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour + } this.inlineDialogCallback() }) .catch(err => { diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue index f21909240..cdcc6aa57 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue @@ -45,7 +45,7 @@