上架前退货字段整理

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

@@ -850,34 +850,67 @@ export const automaticCallNote =  [
   // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
 ]
-// 上架前退货记录 已调整
+// 上架前退货记录 20230412
 export const beforeGroundingReturnNote =  [
   { 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: "lot" },
   { label: "箱码", prop: "packingCode" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "库位", prop: 'locationCode' },
+  { label: "库区", prop: 'locationArea' },
   { label: "ERP库位", prop: "locationErpCode" },
   { label: "退货原因代码", prop: 'reason' },
   { label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
   // -----------------------------------------------------------------------
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+  { label: "单据号", prop: 'number' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate' },
   { label: "备注", prop: 'remark' },
   { label: "生产时间", prop: 'produceDate' },
   { label: "过期时间", prop: 'expireDate' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "库位组", prop: 'locationGroup' },
   { label: "订单号", prop: 'poNumber' },
   { label: "订单行", prop: 'poLine' },
   { label: "status", prop: 'status' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "ID", prop: 'id' },
+  { label: "推荐数量", prop: 'recommendQty' },
+  { label: "实际批次", prop: "handledLot" },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "实际数量", prop: 'handledQty' },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐批次", prop: "recommendLot" },
+  { 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: 'stdPackUom' },
+  // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
   // -----------------------------------------------------------------------
 ]
 // 上架后退货申请 已调整

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

@@ -1822,7 +1822,7 @@ export const automaticCallNote =  [
   // { label: "完成时间", prop: "completeTime",type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
-// 上架前退货记录 已调整
+// 上架前退货记录 20230412
 export const beforeGroundingReturnNote = [
   {
     label: "退货单号",
@@ -1831,23 +1831,26 @@ export const beforeGroundingReturnNote = [
     type: "name",
     width: orderWidth
   },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "发货单号", prop: "asnNumber",width: orderWidth },
   { label: "收货单号", prop: "rpNumber", width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "退货时间", prop: "returnTime",type: "dateTime" },
   { 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: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "订单号", prop: 'poNumber' },
   { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
   { label: "returnType", prop: 'returnType' },
   { label: "status", prop: 'status' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 上架后退货申请 已调整

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

@@ -1275,10 +1275,9 @@ export const automaticCallNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 上架前退货记录 已调整 1
+// 上架前退货记录 20230412
 export const beforeGroundingReturnNote =  [
   { label: "退货单号", prop: "number" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "发货单号", prop: "asnNumber" },
   { label: "订单号", prop: 'poNumber' },
   { label: "供应商代码", prop: "supplierCode" },
@@ -1286,19 +1285,20 @@ export const beforeGroundingReturnNote =  [
   { label: "操作员", prop: 'worker' },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "创建者ID", prop: "creatorId" },
   { label: "收货单号", prop: "rpNumber" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "生效日期", prop: 'activeDate' },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
-  { label: "公司", prop: 'company' },
   { label: "ID", prop: 'id' },
   { label: "returnType", prop: 'returnType' },
   { label: "status", prop: 'status' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 上架后退货申请 已调整 1