FIS发货记录 字段调整

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: "fromLocationCode" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "出货ERP库位", prop: "fromLocationErpCode" },
   { label: "生效时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
-  { label: "过期时间", prop: 'expireDate', 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,18 +1693,50 @@ 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' },
+  // -----------------------------------------------------------------------
 ]
 // 客户退拆申请 已调整
 export const customerDismantle = [

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,25 +2346,29 @@ export const FISDeliverNote =  [
     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: "deliverTime",type: "dateTime" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "生效日期", prop: 'activeDate', 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: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
-  { 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: "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' },
   // -----------------------------------------------------------------------
 ]
 // 客户退拆申请 已调整

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

@@ -1714,32 +1714,33 @@ export const FISDeliverRequest = [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// FIS发货记录 已调整 1
+// FIS发货记录 20230415
 export const FISDeliverNote = [
-  { label: "发货记录单号", prop: 'number' },
+  { label: "记录单号", prop: 'number' },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { 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: "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