收货任务字段调整

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

@@ -139,31 +139,26 @@ export const PurchaseReceiptRequest =  [
   // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   // -----------------------------------------------------------------------
 ]
-// 采购收货任务 已调整
+// 采购收货任务 20230404
 export const PurchaseReceiptJob =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "状态", prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
   { label: "数量", prop: "recommendQty" },
-  { label: "物品单位", prop: "recommendUom" },
-  { label: "生产批次", prop: 'recommendLot' },
-  { label: "箱码", prop: "recommendPackingCode" },
-  { label: "ERP库位", prop: "recommendErpCode" },
   { label: "质量缺陷", prop: "massDefect" },
   { label: "不合格原因代码", prop: "failedReason",},
   { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
-  { label: "推荐库位", prop: 'recommendLocationCode' },
   // -----------------------------------------------------------------------
-  { label: "实际库位", prop: 'handledLocationCode' },
-  { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
+  { label: "标包数量", prop: 'stdPackQty' },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "主表ID", prop: 'masterID' },
   { label: "任务编号", prop: 'number' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "状态", prop: 'status' },
-  { label: "推荐箱码", prop: 'recommendPackingCode' },
   { label: "实际箱码", prop: 'handledPackingCode' },
   { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
   { label: "实际供应商批次", prop: 'handledSupplierBatch' },
@@ -173,24 +168,46 @@ export const PurchaseReceiptJob =  [
   { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
   { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
   { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
-  { label: "推荐库位组", prop: 'recommendLocationGroup' },
-  { label: "实际库位组", prop: 'handledLocationGroup' },
-  { label: "推荐库区", prop: 'recommendLocationArea' },
-  { label: "实际库区", prop: 'handledLocationArea' },
-  { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
-  { label: "实际ERP库位", prop: 'handledLocationErpCode' },
-  { label: "推荐计量单位", prop: 'recommendUom' },
-  { label: "实际计量单位", prop: 'handledUom' },
-  { label: "推荐数量", prop: 'recommendQty' },
   { label: "实际数量", prop: 'handledQty' },
   { label: "推荐批次", prop: 'recommendLot' },
   { label: "实际批次", prop: 'handledLot' },
+  { label: "推荐库位", prop: 'recommendToLocationCode' },
+  { label: "推荐区域", prop: 'recommendToLocationArea' },
+  { label: "推荐分组", prop: 'recommendToLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendToLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "计量单位", prop: 'uom' },
+  { label: "实际库位", prop: 'handledToLocationCode' },
+  { label: "实际区域", prop: 'handledToLocationArea' },
+  { label: "实际分组", prop: 'handledToLocationGroup' },
+  { label: "实际ERP库位", prop: 'handledToLocationErpCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "订单号", prop: 'poNumber' },
+  { label: "订单行", prop: 'poLine' },
   { label: "目检照片Json", prop: 'inspectPhotoJson' },
   { label: "到货时间", prop: 'arriveDate',type: "dateTime" },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
+  { label: "ID", prop: "id" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "推荐箱码", prop: 'recommendPackingCode' },
+  // { label: "实际库位", prop: 'handledLocationCode' },
+  // { label: "推荐库位组", prop: 'recommendLocationGroup' },
+  // { label: "实际库位组", prop: 'handledLocationGroup' },
+  // { label: "推荐库区", prop: 'recommendLocationArea' },
+  // { label: "实际库区", prop: 'handledLocationArea' },
+  // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
+  // { label: "实际ERP库位", prop: 'handledLocationErpCode' },
+  // { label: "推荐计量单位", prop: 'recommendUom' },
+  // { label: "实际计量单位", prop: 'handledUom' },
+  // { label: "推荐数量", prop: 'recommendQty' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
+  // { label: "推荐库位", prop: 'recommendLocationCode' },
+  // { label: "物品单位", prop: "recommendUom" },
+  // { label: "ERP库位", prop: "recommendErpCode" },
   // -----------------------------------------------------------------------
-
 ]
 // 报检单 已调整
 export const InspectNotice =  [

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

@@ -1168,7 +1168,7 @@ export const PurchaseReceiptRequest = [
   // { label: "发货日期", prop: "shipDate", type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
-// 采购收货任务 已调整
+// 采购收货任务 20230404
 export const PurchaseReceiptJob =  [
   {
     label: "收货任务编号",
@@ -1179,20 +1179,20 @@ export const PurchaseReceiptJob =  [
   },
   { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
   { label: "发货单号", prop: "asnNumber", width: orderWidth },
-  { label: "到货单号", prop: "arriveNoticeNumber", width: orderWidth },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth },
   { label: "采购订单号", prop: "poNumber", width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress",showProp: true  },
   { label: "要求到货日期", prop: "planArriveDate" ,type: "dateTime" },
   { label: "完成时间", prop: "completeTime",type: "dateTime" },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "要货计划单号", prop: 'rpNumber' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType' },
@@ -1207,6 +1207,12 @@ export const PurchaseReceiptJob =  [
   { label: "完成者用户名", prop: 'completeUserName' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "时间窗口", prop: 'timeWindow' },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "type", prop: "type" },
+  // { label: "公司", prop: 'company' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "到货单号", prop: "arriveNoticeNumber", width: orderWidth },
   // -----------------------------------------------------------------------
 ]
 // 采购收货记录 已调整

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

@@ -911,18 +911,17 @@ export const PurchaseReceiptRequest =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 采购收货任务 已调整 20221220
+// 采购收货任务 20230404
 export const PurchaseReceiptJob = [
   { label: "收货任务编号", prop: "number" },
   { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
   { label: "发货单号", prop: "asnNumber" },
-  { label: "到货单号", prop: "arriveNoticeNumber" },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber" },
   { label: "采购订单号", prop: "poNumber" },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
   { label: "要求到货日期", prop: 'planArriveDate',type:'dateTime' },
-  // { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
@@ -949,7 +948,8 @@ export const PurchaseReceiptJob = [
   { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   { label: "type", prop: "type" },
-  { label: "公司", prop: 'company' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 采购收货记录 已调整 20221220