zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

成品发货申请任务记录FIS发货申请 字段调整

dev_web_online
陈薪名 2 years ago
parent
27c8f8fc85
commit
94ed86e4db
3 changed files with 188 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 186
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 59
      fe/PC/src/utils/tableColumns/index.js
  3. 53
      fe/PC/src/utils/tabsDesTions/index.js

186
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -1482,89 +1482,113 @@ export const partiallyPreparedProductsNote = [
{ label: "供应商包装数量", prop: 'supplierPackQty' },
// -----------------------------------------------------------------------
]
// 成品发货申请 已调整
// 成品发货申请 20230414
export const DeliverRequest = [
{ 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: "areaCode" },
{ 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: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 成品发货任务 已调整
// 成品发货任务 20230414
export const DeliverJob = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "出货数量", prop: "recommendQty" },
{ label: "单位", prop: "recommendUom" },
{ label: "出货库区", prop: "recommendLocationArea" },
{ label: "ERP库位", prop: "recommendLocationErpCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "推荐批次", prop: 'recommendLot' },
{ label: "实际批次", prop: 'handledLot' },
{ label: "推荐数量", prop: 'recommendQty' },
{ label: "实际数量", prop: 'handledQty' },
{ 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: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ 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: 'recommendLocationArea' },
{ label: "实际库区", prop: 'handledLocationArea' },
{ label: "推荐库位组", prop: 'recommendLocationGroup' },
{ label: "实际库位组", prop: 'handledLocationGroup' },
{ label: "推荐计量单位", prop: 'recommendUom' },
{ label: "实际计量单位", prop: 'handledUom' },
// -----------------------------------------------------------------------
]
// 成品发货记录 已调整
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "推荐批次", prop: 'recommendLot' },
{ label: "实际批次", prop: 'handledLot' },
{ label: "推荐数量", prop: 'recommendQty' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "推荐箱码", prop: 'recommendPackingCode' },
{ label: "实际箱码", prop: 'handledPackingCode' },
{ 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: 'stdPackQty' },
{ 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: "status", prop: 'status' },
{ 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: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "单位", prop: "recommendUom" },
// { label: "出货库区", prop: "recommendLocationArea" },
// { label: "ERP库位", prop: "recommendLocationErpCode" },
// { label: "推荐库位", prop: 'recommendLocationCode' },
// { label: "实际库位", prop: 'handledLocationCode' },
// { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
// { label: "实际ERP库位", prop: 'handledLocationErpCode' },
// { label: "推荐库区", prop: 'recommendLocationArea' },
// { label: "实际库区", prop: 'handledLocationArea' },
// { label: "推荐库位组", prop: 'recommendLocationGroup' },
// { label: "实际库位组", prop: 'handledLocationGroup' },
// { label: "推荐计量单位", prop: 'recommendUom' },
// { label: "实际计量单位", prop: 'handledUom' },
// -----------------------------------------------------------------------
]
// 成品发货记录 20230414
export const DeliverNote = [
{ 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: "出货库位", prop: "fromLocationCode" },
{ label: "出货ERP库位", prop: "fromLocationErpCode" },
{ label: "客户代码", showProp:"customerCode", type:"outerMainFilter", width: orderWidth },
{ label: "客户地址", showProp:"customerAddressCode", type:"outerMainFilter", width: orderWidth },
// -----------------------------------------------------------------------
{ label: "生效时间", prop: 'arriveDate', 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' },
@ -1573,36 +1597,74 @@ export const DeliverNote = [
{ 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' },
// -----------------------------------------------------------------------
]
// FIS发货申请 已调整
// FIS发货申请 20230414
export const FISDeliverRequest = [
{ 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: "areaCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
// { label: "截止底盘号",prop: 'extraProperties',type:"object", showProp: 'ToVinCode' },
// -----------------------------------------------------------------------
]
// FIS发货记录 已调整

59
fe/PC/src/utils/tableColumns/index.js
View File

@ -2195,7 +2195,7 @@ export const partiallyPreparedProductsNote = [
{ label: "type", prop: 'type' },
// -----------------------------------------------------------------------
]
// 成品发货申请 已调整
// 成品发货申请 20230414
export const DeliverRequest = [
{
label: "发货申请单号",
@ -2205,15 +2205,15 @@ export const DeliverRequest = [
width: orderWidth
},
{ label: "状态",prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ 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" },
@ -2221,9 +2221,13 @@ export const DeliverRequest = [
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 成品发货任务 已调整
// 成品发货任务 20230414
export const DeliverJob = [
{
label: "发货任务编号",
@ -2234,15 +2238,16 @@ export const DeliverJob = [
},
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@ -2258,13 +2263,15 @@ export const DeliverJob = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "到库位代码", prop: 'toLocationCode' },
{ label: "到库区", prop: 'toLocationArea' },
{ label: "到库位组", prop: 'toLocationGroup' },
{ label: "到ERP库位代码", prop: 'toLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "到库位代码", prop: 'toLocationCode' },
// { label: "到库区", prop: 'toLocationArea' },
// { label: "到库位组", prop: 'toLocationGroup' },
// { label: "到ERP库位代码", prop: 'toLocationErpCode' },
// -----------------------------------------------------------------------
]
// 成品发货记录 已调整
// 成品发货记录 20230414
export const DeliverNote = [
{
label: "发货记录单号",
@ -2273,28 +2280,32 @@ export const DeliverNote = [
type: "name",
width: orderWidth
},
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ 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: "生效日期", 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: "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' },
// -----------------------------------------------------------------------
]
// FIS发货申请 已调整
// FIS发货申请 20230414
export const FISDeliverRequest = [
{
label: "发货申请单号",
@ -2305,14 +2316,14 @@ export const FISDeliverRequest = [
},
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ 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" },
@ -2320,6 +2331,10 @@ export const FISDeliverRequest = [
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// FIS发货记录 已调整

53
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -1592,38 +1592,37 @@ export const partiallyPreparedProductsNote = [
{ label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]
// 成品发货申请 已调整 1
// 成品发货申请 20230414
export const DeliverRequest = [
{ label: "发货申请单号", prop: 'number' },
{ label: "状态",prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ 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: 'activeDate', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 成品发货任务 已调整 1
// 成品发货任务 20230414
export const DeliverJob = [
{ label: "发货任务单号", prop: "number" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "发货申请单号", prop: "deliverRequestNumber" },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
@ -1633,13 +1632,13 @@ export const DeliverJob = [
{ label: "完成用户", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ 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: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@ -1651,46 +1650,47 @@ export const DeliverJob = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "到库位代码", prop: 'toLocationCode' },
{ label: "到库区", prop: 'toLocationArea' },
{ label: "到库位组", prop: 'toLocationGroup' },
{ label: "到ERP库位代码", prop: 'toLocationErpCode' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "到库位代码", prop: 'toLocationCode' },
// { label: "到库区", prop: 'toLocationArea' },
// { label: "到库位组", prop: 'toLocationGroup' },
// { label: "到ERP库位代码", prop: 'toLocationErpCode' },
// -----------------------------------------------------------------------
]
// 成品发货记录 已调整 1
// 成品发货记录 20230414
export const DeliverNote = [
{ label: "记录单号", prop: 'number' },
{ label: "发货任务单号", prop: "jobNumber" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ 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: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ 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: "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' },
// -----------------------------------------------------------------------
]
// FIS发货申请 已调整 1
// FIS发货申请 20230414
export const FISDeliverRequest = [
{ label: "发货申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
@ -1701,16 +1701,17 @@ export const FISDeliverRequest = [
{ 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: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// FIS发货记录 已调整 1

Write Preview
Loading…
Cancel
Save