原料直发客户字段调整

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

@@ -1072,16 +1072,16 @@ export const ScrapNote =  [
   // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
-// 原料直发客户记录 已调整
+// 原料直发客户记录 20230412
 export const materialDirectSendNote =  [
   { 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" },
@@ -1089,12 +1089,11 @@ export const materialDirectSendNote =  [
   // -----------------------------------------------------------------------
   { label: "生效日期", prop: "arriveDate", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "任务编号", prop: 'number',width: orderWidth },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "来源仓库", prop: 'fromWarehouseCode' },
   { label: "目标仓库", prop: 'toWarehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "目标箱码", prop: 'toPackingCode' },
@@ -1109,11 +1108,40 @@ export const materialDirectSendNote =  [
   { label: "目标库区", prop: 'toLocationArea' },
   { 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: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "ID", prop: 'id' },
+  { label: "推荐箱码", prop: 'recommendPackingCode' },
+  { label: "实际箱码", prop: 'handledPackingCode' },
+  { 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: 'recommendLot' },
+  { label: "实际批次", prop: 'handledLot' },
+  { label: "推荐数量", prop: 'recommendQty' },
+  { label: "实际数量", prop: 'handledQty' },
+  { 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: 'warehouseCode' },
+  // { label: "发料时间", prop: 'issueTime', type: "dateTime" },
+  // { label: "过期时间", prop: 'expiredTime', type: "dateTime" },
+  // { label: "生产线", prop: 'prodLine' },
+  // { label: "工作中心", prop: 'workStation' },
+  // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
 // 直接发料记录

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

@@ -1976,7 +1976,7 @@ export const ScrapNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 原料直发客户记录 已调整
+// 原料直发客户记录 20230412
 export const materialDirectSendNote =  [
   {
     label: "发货单号",
@@ -1992,17 +1992,21 @@ export const materialDirectSendNote =  [
   { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "任务ID", prop: 'jobNumber',width: orderWidth },
   { label: "发货计划单号", prop: 'deliverPlanNumber',width: orderWidth },
   { label: "发货申请单号", prop: 'deliverRequestNumber',width: orderWidth },
   { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
-  { label: "目标库位", prop: 'toLocationCode' },
-  { label: "目标库区", prop: 'toLocationArea' },
-  { label: "目标ERP库位", prop: 'toLocationErpCode' },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "目标库位", prop: 'toLocationCode' },
+  // { label: "目标库区", prop: 'toLocationArea' },
+  // { label: "目标ERP库位", prop: 'toLocationErpCode' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 直接发料记录 

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

@@ -1414,7 +1414,7 @@ export const ScrapNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 原料直发记录 已调整 1
+// 原料直发记录 20230412
 export const materialDirectSendNote =  [
   { label: "发货单号", prop: "number" },
   { label: "发货日期", prop: "deliverTime",type: "dateTime" },
@@ -1433,13 +1433,13 @@ export const materialDirectSendNote =  [
   { label: "发货计划单号", prop: 'deliverPlanNumber' },
   { label: "发货申请单号", prop: 'deliverRequestNumber' },
   { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
-  { label: "目标库位", prop: 'toLocationCode' },
-  { label: "目标库区", prop: 'toLocationArea' },
-  { label: "目标ERP库位", prop: 'toLocationErpCode' },
-  { label: "目标库位组", prop: 'toLocationGroup' },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
+  // { label: "目标库位", prop: 'toLocationCode' },
+  // { label: "目标库区", prop: 'toLocationArea' },
+  // { label: "目标ERP库位", prop: 'toLocationErpCode' },
+  // { label: "目标库位组", prop: 'toLocationGroup' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 直接发料记录