线边仓调拨字段调整

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

@@ -2601,25 +2601,24 @@ export const lineSideWarehouseAllocationNote =  [
   // { label: "次交易码", prop: "secondaryTransactioncode" },
   // -----------------------------------------------------------------------
 ]
-// 储位调拨记录 已调整
+// 储位调拨记录 20230417
 export const interStorageAllocationNote =  [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  { label: "批次", prop: 'toLot' },
-  { label: "箱码", prop: "toPackingCode" },
   { label: "调出库位", prop: "fromLocationCode" },
   { label: "调入库位", prop: "toLocationCode" },
-  { label: "调出ERP库位", prop: "fromLocationErpCode" },
-  { label: "调入ERP库位", prop: "toLocationErpCode" },
+  { label: "在途库位", prop: "onTheWayLocationCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   // -----------------------------------------------------------------------
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "任务编号", prop: 'number' },
   { label: "备注", prop: 'remark' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "目标箱码", prop: 'toPackingCode' },
@@ -2633,12 +2632,22 @@ export const interStorageAllocationNote =  [
   { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "来源库区", prop: 'fromLocationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+  { label: "目标ERP库位", prop: 'toLocationErpCode' },
   { label: "来源仓库", prop: 'fromWarehouseCode' },
   { label: "目标仓库", prop: 'toWarehouseCode' },
   { label: "fromStatus", prop: 'fromStatus' },
   { label: "toStatus", prop: 'toStatus' },
   { label: "原因", prop: 'reason' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: "masterID" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "正厂编码", prop: "supllierItemCode" },
+  // { label: "部门代号", prop: "departmentCode" },
+  // { label: "交易码", prop: "transactioncode" },
+  // { label: "次交易码", prop: "secondaryTransactioncode" },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨申请 20230410

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

@@ -3254,7 +3254,6 @@ export const lineSideWarehouseAllocationNote =  [
     width: orderWidth
   },
   { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
-  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
   { label: "申请日期", prop: "activeDate",type:"dateTime" },
   { label: "确认时间", prop: "confirmTime",type:"dateTime" },
   { label: "操作员", prop: "worker" },
@@ -3268,11 +3267,12 @@ export const lineSideWarehouseAllocationNote =  [
   { label: "事务ID", prop: "tenantId" },
   { label: "调拨类型", prop: 'type' },
   { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
   // { label: "仓库代码", prop: "warehouseCode" },
   // { label: "公司", prop: 'company',},
   // -----------------------------------------------------------------------
 ]
-// 储位调拨记录 已调整
+// 储位调拨记录 20230417
 export const interStorageAllocationNote =  [
   {
     label: "调拨单号",
@@ -3281,16 +3281,23 @@ export const interStorageAllocationNote =  [
     type: "name",
     width: orderWidth
   },
-  { label: "调拨日期", prop: "activeDate",type:"dateTime" },
+  { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
+  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "备注", prop: "remark" },
-  { label: "公司", prop: "company" },
-  { label: "仓库代码", prop: "warehouseCode" },
-  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "任务ID", prop: "jobNumber" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "备注", prop: 'remark' },
+  { label: "任务ID", prop: 'jobNumber',width: orderWidth },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "调拨类型", prop: 'type' },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // { label: "仓库代码", prop: "warehouseCode" },
+  // { label: "公司", prop: 'company',},
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨申请 20230410

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

@@ -2449,27 +2449,27 @@ export const lineSideWarehouseAllocationNote =  [
   // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
-// 储位调拨记录 已调整 1
+// 储位调拨记录 20230417
 export const interStorageAllocationNote =  [
   { label: "调拨单号", prop: "number" },
-  { label: "调拨日期", prop: "activeDate",type:"dateTime" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "调拨申请单号", prop: "requestNumber" },
+  { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
   { label: "操作员", prop: "worker" },
+  { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
-  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
-  { label: "申请单号", prop: "requestNumber" },
-  { label: "备注", prop: "remark" },
+  { label: "任务ID", prop: 'jobNumber' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
-  { label: "公司", prop: "company" },
-  { label: "仓库代码", prop: "warehouseCode" },
-  { label: "任务ID", prop: "jobNumber" },
-  { label: "类型", prop: "type" },
+  { label: "调拨类型", prop: 'type' },
   { label: "ID", prop: 'id' },
+  { label: "备注", prop: 'remark' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨申请 已调整 20230410