Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

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

@@ -2308,40 +2308,63 @@ export const recycledMaterialsAdjustmentApply = [
   // { label: "目标单位", prop: "toUom" },
   // -----------------------------------------------------------------------
 ]
-// 回收料调整记录 已调整
+// 回收料调整记录 20230415
 export const materialsAdjustment = [
   { label: "来源物品代码", prop: "itemCode" },
   { label: "目标物品代码", prop: "toItemCode" },
-  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "来源物品名称", prop: "itemName" },
-  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "目标物品名称", prop: "toItemName" },
+  { label: "来源物品描述1", prop: "itemDesc1" },
+  { label: "目标物品描述1", prop: "toItemDesc1" },
+  { label: "来源物品描述2", prop: "itemDesc2" },
+  { label: "目标物品描述2", prop: "toItemDesc2" },
   { label: "来源箱标签", prop: "fromPackingCode" },
   { label: "目标箱标签", prop: "toPackingCode" },
-  { label: "调整数量", prop: "toQty" },
+  { label: "来源数量", prop: "fromQty" },
-  { label: "来源库位", prop: "locationCode" },
+  { label: "目标数量", prop: "toQty" },
+  { label: "来源库位", prop: 'fromLocationCode' },
   { label: "目标库位", prop: "toLocationCode" },
+  { label: "来源批次", prop: "fromLot" },
+  { label: "目标批次", prop: "toLot" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "单位", prop: "uom" },
   { label: "原因", prop: 'reasonCode' },//不是字典，直接显示文本
-  { label: "批次", prop: "toLot" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   // -----------------------------------------------------------------------
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "任务编号", prop: 'number' },
-  { label: "备注", prop: 'remark' },
-  { label: "操作员", prop: 'worker' },
-  { label: "来源单位", prop: "fromUom" },
-  { label: "目标单位", prop: "toUom" },
   { label: "从供应商批次", prop: "fromSupplierBatch" },
   { label: "到供应商批次", prop: "toSupplierBatch" },
-  { label: "从仓库", prop: "warehouseCode" },
   { label: "从到货时间", prop: "fromArriveDate", type: "dateTime" },
   { label: "到到货时间", prop: "toArriveDate", type: "dateTime" },
   { label: "从生产日期", prop: "fromProduceDate", type: "dateTime" },
   { label: "到生产日期", prop: "toProduceDate", type: "dateTime" },
   { label: "从过期时间", prop: "fromExpireDate", type: "dateTime" },
   { label: "到过期时间", prop: "toExpireDate", type: "dateTime" },
-  { label: "库位组", prop: "locationGroup" },
-  { label: "库区", prop: "locationArea" },
-  { label: "ERP库位", prop: "locationErpCode" },
   // -----------------------------------------------------------------------
+  { label: "来源库区", prop: 'fromLocationArea' },
+  { label: "目标库区", prop: 'toLocationArea' },
+  { label: "来源库位组", prop: 'fromLocationGroup' },
+  { label: "目标库位组", prop: 'toLocationGroup' },
+  { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+  { label: "目标ERP库位", prop: 'toLocationErpCode' },
+  { label: "来源仓库", prop: 'fromWarehouseCode' },
+  { label: "目标仓库", prop: 'toWarehouseCode' },
+  { label: "任务编号", prop: 'number' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "备注", prop: 'remark' },
+  { label: "操作员", prop: 'worker' },
+  { label: "fromStatus", prop: "fromStatus" },
+  { label: "toStatus", prop: "toStatus" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "ID", prop: "id" },
+  // { label: "来源库位", prop: "locationCode" },
+  // { label: "库位组", prop: "locationGroup" },
+  // { label: "库区", prop: "locationArea" },
+  // { label: "来源单位", prop: "fromUom" },
+  // { label: "目标单位", prop: "toUom" },
+  // { label: "从仓库", prop: "warehouseCode" },
 ]
 // 线边仓调拨申请 已调整
 export const lineSideWarehouseAllocationRequest =  [

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

@@ -3135,7 +3135,7 @@ export const recycledMaterialsAdjustmentApply =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 回收料调整记录 已调整
+// 回收料调整记录 20230415
 export const materialsAdjustment = [
   {
     label: "回收料调整记录单号",
@@ -3148,12 +3148,16 @@ export const materialsAdjustment = [
   { label: "创建日期", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: "worker",},
   // -----------------------------------------------------------------------
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "任务单号", prop: "jobNumber" },
-  { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "type", prop: "type" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调拨申请 已调整

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

@@ -2361,7 +2361,7 @@ export const recycledMaterialsAdjustmentApply =  [
   // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
-// 回收料调整记录 已调整 1
+// 回收料调整记录 20230415
 export const materialsAdjustment = [
   { label: "回收料调整记录单号", prop: "number" },
   { label: "申请单号", prop: "requestNumber" },
@@ -2373,11 +2373,12 @@ export const materialsAdjustment = [
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库代码", prop: "warehouseCode" },
   { label: "任务单号", prop: "jobNumber" },
+  { label: "type", prop: 'type' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调拨申请 已调整 1