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

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

@@ -1266,7 +1266,7 @@ export const qualifiedInfo = [
   { label: "箱码", prop: "packingCode" },
   { label: "ERP库位", prop: "locationErpCode" },
   // { label: "ERP库位", prop: "recommendErpCode" },
-  { label: "到货时间", prop: "arriveDate",type: "dateTime" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1279,8 +1279,8 @@ export const qualifiedInfo = [
   { label: "实际ERP库位", prop: "handledToLocationErpCode" },
   { label: "推荐数量", prop: "recommendQty" },
   { label: "实际数量", prop: "handledQty" },
-  { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
-  { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
+  { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
   { label: "生产时间", prop: "produceDate",type: "dateTime" },
   { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
   { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
@@ -1333,7 +1333,7 @@ export const unqualifiedInfo = [
   { label: "不合格原因代码", prop: 'failedReason' },
   { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
   { label: "质量缺陷", prop: "massDefect" },
-  { label: "到货时间", prop: "arriveDate",type: "dateTime" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   { label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" },
   // -----------------------------------------------------------------------
@@ -1347,8 +1347,8 @@ export const unqualifiedInfo = [
   { label: "实际ERP库位", prop: "handledToLocationErpCode" },
   { label: "推荐数量", prop: "recommendQty" },
   { label: "实际数量", prop: "handledQty" },
-  { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
-  { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
+  { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
   { label: "生产时间", prop: "produceDate",type: "dateTime" },
   { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
   { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
@@ -1402,9 +1402,9 @@ export const lackMaterialsInfo = [
   { label: "数量", prop: "qty" },
   { label: "推荐数量", prop: "recommendQty" },
   { label: "实际数量", prop: "handledQty" },
-  { label: "到货时间", prop: "arriveDate",type: "dateTime" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
-  { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
-  { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
+  { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
   { label: "生产时间", prop: "produceDate",type: "dateTime" },
   { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
   { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
@@ -1542,7 +1542,7 @@ export const unqualifiedToQualified = [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
+  { label: "到货日期", prop: 'arriveDate', type: "dateTime" },
   { label: "生产时间", prop: 'produceDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "序号", prop: 'serialNumber' },
@@ -2694,7 +2694,7 @@ export const InventoryTransaction = [
   { label: "单据号", prop: "docNumber" },
   { label: "库位组", prop: "locationGroup" },
   { label: "库区", prop: "locationArea" },
-  { label: "到货时间", prop: "arriveDate",type: "dateTime" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   { label: "标包数量", prop: "stdPackQty" },
@@ -2727,8 +2727,8 @@ export const InventoryTransferLog =  [
     type: "name",
     width: orderWidth
   },
-  { label: "从状态", prop: "fromStatus",type: "filter", filters: "requestStatus" },
+  { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
-  { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
+  { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
@@ -2768,7 +2768,7 @@ export const InventoryTransferLog =  [
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "到仓库代码", prop: "toWarehouseCode" },
 ]
-// 预计入库存(+自定义tab页)
+// 预计入库存(+自定义tab页) 20230411
 export const expectOut = [
   { 
     label: "任务编号", 
@@ -2779,20 +2779,31 @@ export const expectOut = [
   },
   { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { 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: "locationCode" },
   { label: "箱码", prop: "packingCode" },
   { label: "供应商批次", prop: "supplierBatch" },
   { label: "库区", prop: "locationArea" },
   { label: "库位组", prop: "locationGroup" },
   { label: "ERP库位", prop: "locationErpCode" },
+  { label: "批次", prop: "lot" },
+  { label: "到货日期", prop: "arriveDate",type:"dateTime" },
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type:"dateTime" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "序号", prop: "serialNumber" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
 ]
-// 预计出库存(+自定义tab页)
+// 预计入库存(+自定义tab页) 20230411
 export const expectIn = [
   { 
     label: "任务编号", 
@@ -2802,19 +2813,30 @@ export const expectIn = [
     width: orderWidth
   },
   { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { 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: "locationCode" },
   { label: "箱码", prop: "packingCode" },
+  { label: "批次", prop: "lot" },
   { label: "供应商批次", prop: "supplierBatch" },
   { label: "库区", prop: "locationArea" },
   { label: "库位组", prop: "locationGroup" },
   { label: "ERP库位", prop: "locationErpCode" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type:"dateTime" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "序号", prop: 'serialNumber' },
   { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
 ]
 // 非生产领料申请 已调整
 export const pickingRequest =  [

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

@@ -2108,10 +2108,12 @@ export const InventoryTransferLog = [
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
-// 预计出库存 1
+// 预计入库存 20230411
 export const expectIn = [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位代码", prop: "locationCode" },
@@ -2123,28 +2125,28 @@ export const expectIn = [
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
   { label: "状态", prop: "status", type: "filter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "序号", prop: "serialNumber" },
-  { label: "物品描述", prop: "itemDesc1" },
-  { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: 'lot' },
   { label: "单位", prop: "uom" },
-  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
+  { label: "仓库代码", prop: 'warehouseCode' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 预计入库存 1
+// 预计入库存 20230411
 export const expectOut = [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位代码", prop: "locationCode" },
@@ -2156,22 +2158,20 @@ export const expectOut = [
   { label: "生产日期", prop: "produceDate", type: "dateTime" },
   { label: "状态", prop: "status", type: "filter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "序号", prop: "serialNumber" },
-  { label: "物品描述", prop: "itemDesc1" },
-  { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: 'lot' },
   { label: "单位", prop: "uom" },
-  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 非生产领料申请 已调整 1