Browse Source

线边仓调整字段调整

dev_web_online
陈薪名 2 years ago
parent
commit
68410227d9
  1. 113
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 37
      fe/PC/src/utils/tableColumns/index.js
  3. 74
      fe/PC/src/utils/tabsDesTions/index.js

113
fe/PC/src/utils/detailsTableColumns/index.js

@ -3019,61 +3019,114 @@ export const lineSideWarehouseScrappingNote = [
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 线边仓调整申请 已调整
// 线边仓调整申请 20230417
export const lineSideWarehouseAdjustmentSheetRequest = [
{ 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: 'locationCode' },
{ label: "ERP库位", prop:"locationErpCode" },
{ label: "调整原因代码", prop:"reasonCode" },
{ label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: 'locationGroup' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "生效时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
{ label: "fromStatus", prop: 'fromStatus' },
{ label: "toStatus", prop: 'toStatus' },
{ label: "事务ID", prop: "tenantId" },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: 'id' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "库区", prop: "locationArea" },
// { label: "库位组", prop: 'locationGroup' },
// { label: "调整库位", prop: 'locationCode' },
// { label: "ERP库位", prop:"locationErpCode" },
// -----------------------------------------------------------------------
]
// 线边仓调整记录 已调整
// 线边仓调整记录 20230417
export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "数量", prop: "adjustQty" },
{ label: "单位", prop: "inventoryUom" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "调整库位", prop: 'locationCode' },
{ label: "ERP库位", prop:"locationErpCode" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "调整原因代码", prop:"reasonCode" },
{ label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "库存数量", prop: "inventoryQty" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "批次", prop: "lot" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "箱码", prop: "packingCode" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: 'locationGroup' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "到货时间", prop: "arriveDate",type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "盘点标签", prop: "containerCode" },
{ label: "盘点数量", prop: "countQty" },
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "fromStatus", prop: 'fromStatus' },
{ label: "toStatus", prop: 'toStatus' },
{ label: "事务ID", prop: "tenantId" },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: 'id' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "盘点标签", prop: "containerCode" },
// { label: "盘点数量", prop: "countQty" },
// { label: "箱码", prop: "packingCode" },
// { label: "库区", prop: "locationArea" },
// { label: "库位组", prop: 'locationGroup' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "批次", prop: "lot" },
// { label: "库存数量", prop: "inventoryQty" },
// { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
// { label: "数量", prop: "adjustQty" },
// { label: "单位", prop: "inventoryUom" },
// { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
// { label: "调整库位", prop: 'locationCode' },
// { label: "ERP库位", prop:"locationErpCode" },
// -----------------------------------------------------------------------
]
// 库存初始化记录

37
fe/PC/src/utils/tableColumns/index.js

@ -3282,7 +3282,7 @@ export const interStorageAllocationNote = [
width: orderWidth
},
{ label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
{ label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
// { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
{ label: "申请日期", prop: "activeDate",type:"dateTime" },
{ label: "确认时间", prop: "confirmTime",type:"dateTime" },
{ label: "操作员", prop: "worker" },
@ -3396,7 +3396,7 @@ export const intraStorageTransferNote = [
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
// { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
{ label: "确认时间", prop: "confirmTime",type:"dateTime" },
{ label: "调拨申请单号", prop: "requestNumber",width: orderWidth },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@ -3414,7 +3414,7 @@ export const intraStorageTransferNote = [
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 线边仓调整申请 已调整
// 线边仓调整申请 20230417
export const lineSideWarehouseAdjustmentSheetRequest = [
{
label: "申请单号",
@ -3424,22 +3424,26 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
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: "公司", 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" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "type", prop: 'type' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓调整记录 已调整
// 线边仓调整记录 20230417
export const lineSideWarehouseAdjustmentSheetNote = [
{
label: "记录单号",
@ -3448,17 +3452,24 @@ export const lineSideWarehouseAdjustmentSheetNote = [
type: "name",
width: orderWidth
},
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "类型", prop: 'type' },
{ label: "盘点记录单号", prop: 'countNoteNumber', width: orderWidth },
{ label: "盘点计划单号", prop: "countPlanNumber",width: orderWidth },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "调整单号", prop: "requestNumber",width: orderWidth },
{ label: "备注", prop: 'remark' },
// { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
// { label: "确认时间", prop: "confirmTime",type:"dateTime" },
{ label: "任务ID", prop: 'jobNumber',width: orderWidth },
{ label: "事务ID", prop: "tenantId" },
{ label: "类型", prop: 'type' },
// { label: "盘点记录单号", prop: 'countNoteNumber', width: orderWidth },
// { label: "盘点计划单号", prop: "countPlanNumber",width: orderWidth },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 盘点计划 20230415

74
fe/PC/src/utils/tabsDesTions/index.js

@ -1024,7 +1024,7 @@ export const InspectRequest = [
// { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
// { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
// { label: "到货单号", prop: "arriveNoticeNumber" },
// { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
// { label: "状态", prop: "requestStatus", filters: "requestStatus" },
// { label: "生效日期", prop: "activeDate",type: "dateTime" },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
@ -1472,7 +1472,7 @@ export const directIssueNote = [
// 完工收货缴库申请 20230415
export const ProductReceiptRequest = [
{ label: "缴库申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: "requestStatus", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
@ -1747,7 +1747,7 @@ export const FISDeliverNote = [
// 客户退拆申请 20230415
export const customerDismantle = [
{ label: "退拆申请单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: 'requestStatus', filters: "requestStatus" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@ -2251,7 +2251,7 @@ export const pickingNote = [
// 非生产退料申请 20230417
export const materialReturnRequest = [
{ label: "退料单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: 'requestStatus', filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -2276,7 +2276,7 @@ export const materialReturnRequest = [
// 非生产退料审批 20230417
export const materialReturnApproval = [
{ label: "退料单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: 'requestStatus', filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -2453,7 +2453,7 @@ export const lineSideWarehouseAllocationNote = [
export const interStorageAllocationNote = [
{ label: "调拨单号", prop: "number" },
{ label: "调拨申请单号", prop: "requestNumber" },
{ label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
// { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
{ label: "申请日期", prop: "activeDate",type:"dateTime" },
{ label: "确认时间", prop: "confirmTime",type:"dateTime" },
{ label: "操作员", prop: "worker" },
@ -2553,7 +2553,7 @@ export const intraStorageTransferNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
// { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "事务ID", prop: "tenantId" },
@ -2569,7 +2569,7 @@ export const intraStorageTransferNote = [
// 线边仓缴库申请 20230415
export const lineSideWarehousePaymentRequest = [
{ label: "缴库申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: "requestStatus", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
@ -2663,54 +2663,56 @@ export const lineSideWarehouseScrappingNote = [
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓调整申请 已调整 1
// 线边仓调整申请 20230417
export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "申请单号", prop: 'number' },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
{ label: "操作员", prop: 'worker' },
{ 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: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ 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: 'remark' },
{ label: "ID", prop: 'id' },
{ label: "type", prop: 'type' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓调整记录 已调整 1
// 线边仓调整记录 20230417
export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "记录单号", prop: 'number' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "记录单号", prop: "number" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "创建者ID", prop: "creatorId" },
{ 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: 'type' },
{ label: "盘点记录单号", prop: 'countNoteNumber' },
{ label: "盘点计划号", prop: "countPlanNumber" },
{ label: "事务ID", prop: "tenantId" },
{ label: "是否调整", prop: "isAdjusted", type: "filter", filters: "whetherOrNot" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "调整单号", prop: "requestNumber" },
{ label: "备注", prop: 'remark' },
{ label: "ID", prop: 'id' },
// { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
// { label: "确认时间", prop: "confirmTime",type:"dateTime" },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
{ label: "类型", prop: 'type' },
// { label: "盘点记录单号", prop: 'countNoteNumber', width: orderWidth },
// { label: "盘点计划单号", prop: "countPlanNumber",width: orderWidth },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 盘点计划 20230415
export const CountPlan = [
{ label: "盘点计划单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: "requestStatus", filters: "requestStatus" },
{ label: "开始时间", prop: "beginTime",type: "dateTime" },
{ label: "结束时间", prop: "endTime", type: "dateTime" },
{ label: "计划时间", prop: 'planTime', type: "dateTime" },
@ -2745,7 +2747,7 @@ export const CountPlan = [
export const CountJob = [
{ label: "盘点任务号", prop: "number" },
{ label: "盘点计划号", prop: "countPlanNumber" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "状态", prop: "jobStatus", filters: "jobStatus" },
{ label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "承接时间", prop: "acceptTime", type: "dateTime" },
@ -2805,7 +2807,7 @@ export const CountNote = [
// 盘点调整申请 20230415
export const CountPlanAdjust = [
{ label: "盘点调整申请单号", prop: "number" },
{ label: "状态", type: "tagFilter", filters: "requestStatus", prop: "requestStatus" },
{ label: "状态", filters: "requestStatus", prop: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" },

Loading…
Cancel
Save