完工收货缴库记录

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

@@ -1293,35 +1293,68 @@ export const ProductReceiptRequest =  [
   { label: "Bom版本", prop: 'bomVersion' },
   // -----------------------------------------------------------------------
 ]
-// 完工收货缴库记录 已调整
+// 完工收货缴库记录 20230413
 export const ProductReceiptNote =  [
   { 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:"locationArea" },
   { label: "库位代码", prop: 'locationCode' },
   { label: "ERP库位", prop:"locationErpCode" },
   { label: "生产时间", prop: "produceDate",type:"dateTime" },
-  { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
+  { label: "缴库库位", prop: 'rawLocationCode' },
+  { label: "调出库区", prop: "rawArea" },
   { label: "箱码", prop: 'packingCode' },
+  { label: "返线数量", prop: "returnQty" },
   { label: "到货时间", prop: 'arriveDate',type:"dateTime" },
   { label: "过期时间", prop: "expireDate" ,type:"dateTime" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "记录编号", prop: 'number' },
   { label: "批次", prop: 'lot' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "仓库代码", prop: 'warehouseCode' },
   { label: "库位组", prop: 'locationGroup' },
-  { label: "原料库位", prop: 'rawLocation' },
   { label: "生产线", prop: 'prodLine' },
   { label: "Bom版本", prop: 'bomVersion' },
+  { 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: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "推荐库位组", prop: "recommendToLocationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "推荐仓库", prop: "recommendToWarehouseCode" },
+  { label: "实际仓库", prop: "handledToWarehouseCode" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
   { label: "status", prop: 'status' },
+  { label: "主表ID", prop: "masterID" },
+  { label: "ID", prop: 'id' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "原料库位", prop: 'rawLocation' },
   // -----------------------------------------------------------------------
 ]
 //  完工收货报废申请 20230412

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

@@ -2082,7 +2082,7 @@ export const ProductReceiptRequest =  [
   { label: "计划日期", prop: 'planDate',type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
-// 完工收货缴库记录 已调整
+// 完工收货缴库记录 20230413
 export const ProductReceiptNote =  [
   {
     label: "缴库记录单号",
@@ -2091,20 +2091,24 @@ export const ProductReceiptNote =  [
     type: "name",
     width: orderWidth
   },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
    // -----------------------------------------------------------------------
   { label: "生效日期", prop: 'activeDate',type: "dateTime" },
   { label: "完工时间", prop: 'completeTime',type: "dateTime" },
+  { 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: 'sourceNumber',width: orderWidth },
   { label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth },
   { label: "任务ID", prop: 'jobNumber',width: orderWidth },
   { label: "车间", prop: 'workShop' },
   { label: "receiptType", prop: 'receiptType' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "type", prop: "type" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货报废申请 20230412

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

@@ -1499,28 +1499,27 @@ export const ProductReceiptRequest = [
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
-// 完工收货缴库记录 已调整 1
+// 完工收货缴库记录 20230413
 export const ProductReceiptNote = [
   { label: "缴库记录单号", prop: 'number' },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "操作员", prop: 'worker' },
-  // -----------------------------------------------------------------------
-  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate',type: "dateTime" },
   { label: "完工时间", prop: 'completeTime',type: "dateTime" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "备注", prop: 'remark' },
-  { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "操作员", prop: 'worker' },
   { label: "上级关联菜单号", prop: 'sourceNumber' },
   { label: "生产计划单号", prop: 'productionPlanNumber' },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "车间", prop: 'workShop' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "备注", prop: 'remark' },
   { label: "类型", prop: 'type' },
+  { label: "事务ID", prop: "tenantId" },
   { label: "receiptType", prop: 'receiptType' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货报废申请 20230412