From 14b47f720866e7933d6d4d1d06f23907463aba27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Sat, 15 Apr 2023 14:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E7=BC=B4?=
 =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=20FIS=E5=8F=91=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E5=AE=A2=E6=88=B7=E9=80=80=E6=8B=86=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E5=AE=A2=E6=88=B7=E9=80=80=E6=8B=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E7=94=9F=E4=BA=A7=E9=80=80=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E7=94=9F=E4=BA=A7=E9=80=80=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=20=E7=94=9F=E4=BA=A7=E9=80=80=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E7=BA=BF=E8=BE=B9=E4=BB=93=E7=BC=B4=E5=BA=93?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E7=BA=BF=E8=BE=B9=E4=BB=93=E7=BC=B4?=
 =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95=20=E5=AE=8C=E5=B7=A5=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E7=BC=B4=E5=BA=93=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js | 215 +++++++++++++------
 fe/PC/src/utils/tableColumns/index.js        |  84 +++++---
 fe/PC/src/utils/tabsDesTions/index.js        | 201 +++++++++--------
 3 files changed, 306 insertions(+), 194 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index e989406f0..9c6a44788 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1269,28 +1269,41 @@ export const directIssueNote =  [
 
 // 成品管理
 /**/
-// 完工收货缴库申请
+// 完工收货缴库申请 20230415
 export const ProductReceiptRequest =  [
   { 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:"areaCode" },
+  { label: "返线数量", prop: "returnQty" },
+  { label: "调出库区", prop: "rawArea" },
+  { label: "调入库位", prop: "locationCode" },
+  { label: "调入ERP库位", prop: "locationErpCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "库区", prop: "locationArea" },
+  { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "生产时间", prop: "produceDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate" ,type:"dateTime" },
+  { label: "库位组", prop: "locationGroup" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "申请编号", prop: 'number' },
-  { label: "公司", prop: 'company' },
-  { label: "备注", prop: 'remark' },
+  { label: "批次", prop: 'lot' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "Bom版本", prop: 'bomVersion' },
+  { label: "仓库", prop: "warehouseCode" },
+  { label: "ID", prop: "id" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "库区", prop: 'areaCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货缴库记录 20230413
@@ -1773,58 +1786,67 @@ export const customerDismantle = [
   // { label: "转移量（子零件）", prop: 'rawQty' },
   // -----------------------------------------------------------------------
 ]
-// 生产退库申请 已调整
+// 生产退库申请 20230415
 export const productionReturnRequest =  [
   { label: "物品代码", prop: "itemCode",fixed:"left" },
   { label: "物品名称", prop: 'itemName' },
-  { label: "物品描述", prop: "itemDesc1" },
-  { label: "数量", prop: 'qty' },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "单位", prop: 'uom' },
   { label: "批次", prop: 'lot' },
-  { label: "箱码", prop: 'packingCode' },
-  { label: "来源库位", prop: 'locationCode' },
-  { label: "目标库位", prop: 'toLocationCode' },
-  { label: "来源ERP库位", prop: 'locationErpCode' },
   { label: "目标ERP库位", prop: 'toLocationErpCode' },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "生产时间", prop: 'produceDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "备注", prop: 'remark' },
   { label: "任务编号", prop: 'number',width:orderWidth },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
-  { label: "库位组", prop: 'locationGroup' },
   { label: "目标库位组", prop: 'toLocationGroup' },
-  { label: "库区", prop: 'locationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
-  { label: "status", prop: 'status' },
   // -----------------------------------------------------------------------
+  { label: "来源箱码", prop: 'fromPackingCode' },
+  { label: "目标箱码", prop: 'toPackingCode' },
+  { label: "来源批次", prop: 'fromLot' },
+  { label: "目标批次", prop: 'toLot' },
+  { label: "来源库位", prop: 'fromLocationCode' },
+  { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+  { label: "来源库位组", prop: 'fromLocationGroup' },
+  { label: "目标库位", prop: 'toLocationCode' },
+  { label: "来源库区", prop: 'fromLocationArea' },
+  { label: "来源仓库", prop: 'fromWarehouseCode' },
+  { label: "目标仓库", prop: 'toWarehouseCode' },
+  { label: "fromStatus", prop: 'fromStatus' },
+  { label: "toStatus", prop: 'toStatus' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "ID", prop: 'id' },
+  // { label: "status", prop: 'status' },
+  // { label: "库区", prop: 'locationArea' },
+  // { label: "库位组", prop: 'locationGroup' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "数量", prop: 'qty' },
+  // { label: "箱码", prop: 'packingCode' },
+  // { label: "来源库位", prop: 'locationCode' },
+  // { label: "来源ERP库位", prop: 'locationErpCode' },
 ]
-// 生产退库任务 已调整
+// 生产退库任务 20230415
 export const productionReturnJob =  [
   {  label: "物品代码", prop: "itemCode",fixed:"left" },
   { label: "物品名称", prop: 'itemName' },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: 'recommendQty' },
-  { label: "单位", prop: 'recommendUom' },
   { label: "批次", prop: 'recommendLot' },
-  { label: "箱码", prop: 'recommendPackingCode' },
-  { label: "来源库位", prop: 'recommendLocationCode' },
-  { label: "目标库位", prop: 'toLocationCode' },
-  { label: "来源ERP库位", prop: 'recommendLocationErpCode' },
-  { label: "目标ERP库位", prop: 'toLocationErpCode' },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   // -----------------------------------------------------------------------
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "任务编号", prop: 'number',width:orderWidth },
-  { label: "采购订单号", prop: 'poNumber',width:orderWidth },
+  { label: "单位", prop: 'uom' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "推荐箱码", prop: 'recommendPackingCode' },
   { label: "实际箱码", prop: 'handledPackingCode' },
@@ -1836,20 +1858,51 @@ export const productionReturnJob =  [
   { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
   { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
   { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
-  { label: "推荐批次", prop: 'recommendLot' },
-  { label: "实际批次", prop: 'handledLot' },
-  { label: "实际库位", prop: 'handledLocationCode' },
-  { label: "推荐库区", prop: 'recommendLocationArea' },
-  { label: "实际库区", prop: 'handledLocationArea' },
-  { label: "推荐库位组", prop: 'recommendLocationGroup' },
-  { label: "实际库位组", prop: 'handledLocationGroup' },
-  { label: "推荐计量单位", prop: 'recommendUom' },
-  { label: "实际计量单位", prop: 'handledUom' },
-  { label: "推荐数量", prop: 'recommendQty' },
   { label: "实际数量", prop: 'handledQty' },
-  { label: "到库位组", prop: 'toLocationGroup' },
-  { label: "到库区", prop: 'toLocationArea' },
+  { label: "实际批次", prop: 'handledLot' },
   // -----------------------------------------------------------------------
+  { label: "来源库位", prop: 'fromLocationCode' },
+  { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+  { label: "来源库位组", prop: 'fromLocationGroup' },
+  { label: "来源库区", prop: 'fromLocationArea' },
+  { label: "来源仓库", prop: 'fromWarehouseCode' },
+  { 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: "status", prop: 'status' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "ID", prop: 'id' },
+  // { label: "采购订单号", prop: 'poNumber',width:orderWidth },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "单位", prop: 'recommendUom' },
+  // { label: "来源库位", prop: 'recommendLocationCode' },
+  // { label: "目标库位", prop: 'toLocationCode' },
+  // { label: "来源ERP库位", prop: 'recommendLocationErpCode' },
+  // { label: "目标ERP库位", prop: 'toLocationErpCode' },
+  // { label: "推荐批次", prop: 'recommendLot' },
+  // { label: "实际库位", prop: 'handledLocationCode' },
+  // { label: "推荐库区", prop: 'recommendLocationArea' },
+  // { label: "实际库区", prop: 'handledLocationArea' },
+  // { label: "推荐库位组", prop: 'recommendLocationGroup' },
+  // { label: "实际库位组", prop: 'handledLocationGroup' },
+  // { label: "推荐计量单位", prop: 'recommendUom' },
+  // { label: "实际计量单位", prop: 'handledUom' },
+  // { label: "推荐数量", prop: 'recommendQty' },
+  // { label: "到库位组", prop: 'toLocationGroup' },
+  // { label: "到库区", prop: 'toLocationArea' },
 ]
 // 生产退库记录 20230413
 export const productionReturnNote =  [
@@ -2580,11 +2633,12 @@ export const intraStorageTransferNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓缴库申请 待确认
+// 线边仓缴库申请 20230415
 export const lineSideWarehousePaymentRequest =  [
   { 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: "returnQty" },
@@ -2592,53 +2646,92 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "调入库位", prop: "locationCode" },
   { label: "调入ERP库位", prop: "locationErpCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "库区", prop: "locationArea" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "生产时间", prop: "produceDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate" ,type:"dateTime" },
   { label: "库位组", prop: "locationGroup" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "申请编号", prop: 'number' },
-  { label: "公司", prop: 'company' },
   { label: "批次", prop: 'lot' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "库区", prop: 'areaCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "Bom版本", prop: 'bomVersion' },
   { label: "仓库", prop: "warehouseCode" },
+  { label: "ID", prop: "id" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "库区", prop: 'areaCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓缴库记录 已调整
+// 线边仓缴库记录 20230415
 export const lineSideWarehousePaymentNote =  [
   { 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: "returnQty" },
-  { label: "调出库区", prop: "rawArea" },
-  { label: "调入库位", prop: "rawLocation" },
-  { label: "调入ERP库位", prop: "locationErpCode" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "备注", prop: 'remark' },
-  // -----------------------------------------------------------------------
+  { label: "库区", prop:"locationArea" },
+  { label: "库位代码", prop: 'locationCode' },
+  { label: "ERP库位", prop:"locationErpCode" },
   { label: "生产时间", prop: "produceDate",type:"dateTime" },
+  // -----------------------------------------------------------------------
+  { label: "缴库库位", prop: 'rawLocationCode' },
+  { label: "调出库区", prop: "rawArea" },
+  { label: "箱码", prop: 'packingCode' },
+  { label: "返线数量", prop: "returnQty" },
+  { label: "到货时间", prop: 'arriveDate',type:"dateTime" },
   { label: "过期时间", prop: "expireDate" ,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: 'prodLine' },
   { label: "Bom版本", prop: 'bomVersion' },
-  { label: "到货时间", prop: 'arriveDate' },
-  { label: "箱码", prop: 'packingCode' },
+  { 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
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 8d0201aac..9c7a60ec6 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2052,7 +2052,7 @@ export const directIssueNote =  [
 
 // 成品管理
 /**/
-// 完工收货缴库申请
+// 完工收货缴库申请 20230415
 export const ProductReceiptRequest =  [
   {
     label: "缴库申请单号",
@@ -2065,10 +2065,10 @@ export const ProductReceiptRequest =  [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@@ -2079,7 +2079,12 @@ export const ProductReceiptRequest =  [
   { label: "生产线", prop: 'prodLine' },
   { label: "班次", prop: 'shift' },
   { label: "班组", prop: 'team' },
-  { label: "计划日期", prop: 'planDate',type: "dateTime" },
+  { label: "计划日期", prop: 'planDate' },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "type", prop: "type" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货缴库记录 20230413
@@ -2440,7 +2445,7 @@ export const customerDismantleBackFlushNote = [
   { label: "转移量（子零件）", prop: 'rawQty' },
   // { label: "物品描述", prop: "itemDesc1", },
 ]
-// 生产退库申请 已调整
+// 生产退库申请 20230415
 export const productionReturnRequest =  [
   { 
     label: "退库申请单号", 
@@ -2450,22 +2455,26 @@ export const productionReturnRequest =  [
     width: orderWidth
   },
   { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "采购订单号", prop: "poNumber",width:orderWidth },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "采购订单号", prop: "poNumber",width:orderWidth },
   // -----------------------------------------------------------------------
 ]
-// 生产退库任务 已调整
+// 生产退库任务 20230415
 export const productionReturnJob =  [
   { 
     label: "退库任务单号", 
@@ -2477,13 +2486,12 @@ export const productionReturnJob =  [
   { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth },
-  { label: "采购订单号", prop: "poNumber",width:orderWidth },
   { label: "操作员", prop: 'worker' },
-  // -----------------------------------------------------------------------
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber',width:orderWidth },
   { label: "任务类型", prop: 'jobType' },
   { label: "优先级", prop: 'priority' },
@@ -2497,6 +2505,10 @@ export const productionReturnJob =  [
   { label: "完成者用户名", prop: 'completeUserName' },
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   { label: "任务描述", prop: 'jobDescription' },
+  // { label: "采购订单号", prop: "poNumber",width:orderWidth },
+  // { label: "公司", prop: 'company' },
+  // -----------------------------------------------------------------------
+  { label: "事务ID", prop: "tenantId" },
   // -----------------------------------------------------------------------
 ]
 // 生产退库记录 20230413
@@ -2525,7 +2537,7 @@ export const productionReturnNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓缴库申请 已调整
+// 线边仓缴库申请 20230415
 export const lineSideWarehousePaymentRequest =  [
   {
     label: "缴库申请单号",
@@ -2538,10 +2550,10 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@@ -2553,9 +2565,14 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "班次", prop: 'shift' },
   { label: "班组", prop: 'team' },
   { label: "计划日期", prop: 'planDate' },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "type", prop: "type" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓缴库记录 已调整
+// 线边仓缴库记录 20230415
 export const lineSideWarehousePaymentNote =  [
   {
     label: "缴库记录单号",
@@ -2564,22 +2581,25 @@ export const lineSideWarehousePaymentNote =  [
     type: "name",
     width: orderWidth
   },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "缴库时间", prop: 'completeTime',type: "dateTime" },
   { label: "操作员", prop: 'worker' },
    // -----------------------------------------------------------------------
-   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-   { label: "完工时间", prop: 'completeTime',type: "dateTime" },
-   { label: "备注", prop: 'remark' },
-   { label: "公司", prop: 'company' },
-   { label: "仓库", prop: 'warehouseCode' },
-   { label: "生效日期", prop: 'activeDate' },
-   { label: "上级关联菜单号", prop: 'sourceNumber' },
-   { label: "生产计划单号", prop: 'productionPlanNumber' },
-   { label: "任务ID", prop: 'jobNumber' },
-   { label: "车间", prop: 'workShop' },
-   { label: "receiptType", prop: 'receiptType' },
-   // -----------------------------------------------------------------------
+  { 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: '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
 export const lineSideWarehouseScrappingRequest =  [
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index dbb5e2814..632fd44c8 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -207,7 +207,7 @@ export const CustomerAddress =  [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "仓库", prop: "warehouseCode", },
+  { label: "仓库代码", prop: "warehouseCode", },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -330,7 +330,7 @@ export const Area =  [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -393,7 +393,7 @@ export const WorkGroup =  [
   { label: "工作组代码", prop: "code" },
   { label: "工作组名称", prop: 'name' },
   { label: "描述", prop: "description" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "事务ID", prop: "tenantId" },
@@ -459,7 +459,7 @@ export const Location =  [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -485,7 +485,7 @@ export const ItemStoreRelation =  [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -511,7 +511,7 @@ export const InventoryLocationCapacity =  [
 // 物品安全库存信息 20230328
 export const ItemSafetyStock = [
   { label: "物品代码", prop: "itemCode" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "存储关系代码", prop: "storeValue" },
   { label: "最大库存", prop: "maxStock" },
@@ -872,7 +872,7 @@ export const PurchaseOrder =  [
   { label: "orderStatus", prop: 'orderStatus' },
   { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "筹措员代码", prop: "contactUserName" },
   // { label: "联系人电话", prop: 'contactUserPhone' },
   // { label: "联系人邮件", prop: 'contactUserEmail' },
@@ -906,7 +906,7 @@ export const PurchaseReceiptRequest =  [
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
   { label: "时间窗口", prop: 'timeWindow' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -945,7 +945,7 @@ export const PurchaseReceiptJob = [
   { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "时间窗口", prop: 'timeWindow' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   { label: "type", prop: "type" },
   // { label: "筹措员代码", prop: "contactUserName" },
@@ -978,7 +978,7 @@ export const PurchaseReceiptNote =  [
   { label: "type", prop: 'type' },
   { label: "status", prop: 'status' },
   { label: "任务代码", prop: 'jobNumber' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -995,7 +995,7 @@ export const InspectRequest = [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
@@ -1026,7 +1026,7 @@ export const InspectRequest = [
   // { label: "到货单号", prop: "arriveNoticeNumber" },
   // { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
   // { label: "生效日期", prop: "activeDate",type: "dateTime" },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "公司", prop: 'company' },
   // { label: "要货计划单号", prop: 'rpNumber' },
   // -----------------------------------------------------------------------
@@ -1052,7 +1052,7 @@ export const InspectNote = [
   { label: "事务ID", prop: "tenantId" },
   { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
   { label: "ID", prop: 'id' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "到货单号", prop: "arriveNoticeNumber" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -1069,7 +1069,7 @@ export const unqualifiedToQualifiedNote = [
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -1098,7 +1098,7 @@ export const PutawayNote =  [
   { label: "type", prop: 'type' },
   // { label: "公司", prop: 'company' },
   // { label: "到货单号", prop: 'arriveNoticeNumber' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 人工叫料申请 20230411
@@ -1125,7 +1125,7 @@ export const IssueRequest =  [
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "ID", prop: 'id' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1159,7 +1159,7 @@ export const IssueJob = [
   { label: "任务描述", prop: 'jobDescription' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -1185,7 +1185,7 @@ export const IssueNote =  [
   { label: "确认时间", prop: 'confirmTime' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 自动叫料申请 20230411
@@ -1212,7 +1212,7 @@ export const automaticCallApply =  [
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "ID", prop: 'id' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1246,7 +1246,7 @@ export const automaticCallJob =  [
   { label: "任务描述", prop: 'jobDescription' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -1272,7 +1272,7 @@ export const automaticCallNote =  [
   { label: "确认时间", prop: 'confirmTime' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 上架前退货记录 20230412
@@ -1297,7 +1297,7 @@ export const beforeGroundingReturnNote =  [
   { label: "ID", prop: 'id' },
   { label: "returnType", prop: 'returnType' },
   { label: "status", prop: 'status' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1327,7 +1327,7 @@ export const PurchaseReturnRequest =  [
   { label: "returnType", prop: 'returnType' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 上架后退货任务 20230412
@@ -1353,7 +1353,7 @@ export const PurchaseReturnJob =  [
   { label: "备注", prop: 'remark' },
   { label: "事务ID", prop: "tenantId" },
   { label: "操作员", prop: 'worker' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "优先级", prop: 'priority' },
@@ -1390,7 +1390,7 @@ export const PurchaseReturnNote =  [
   { label: "ID", prop: 'id' },
   { label: "returnType", prop: 'returnType' },
   { label: "status", prop: 'status' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1411,7 +1411,7 @@ export const ScrapNote =  [
   { label: "报废请求单号", prop: 'scrapRequestNumber' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 原料直发记录 20230412
@@ -1439,7 +1439,7 @@ export const materialDirectSendNote =  [
   // { label: "目标ERP库位", prop: 'toLocationErpCode' },
   // { label: "目标库位组", prop: 'toLocationGroup' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 直接发料记录 20230413
@@ -1463,16 +1463,16 @@ export const directIssueNote =  [
   { label: "确认时间", prop: 'confirmTime' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 
 // 成品管理
 /**/
-// 完工收货缴库申请 1
+// 完工收货缴库申请 20230415
 export const ProductReceiptRequest = [
-  { label: "缴库申请单号", prop: 'number' },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+  { label: "缴库申请单号", prop: "number" },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
@@ -1481,22 +1481,22 @@ export const ProductReceiptRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
+  { label: "备注", prop: 'remark' },
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "备注", prop: 'remark' },
-  { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "生产计划编号", prop: 'productionPlanNumber' },
   { label: "车间", prop: 'workshop' },
   { label: "生产线", prop: 'prodLine' },
   { label: "班次", prop: 'shift' },
   { label: "班组", prop: 'team' },
-  { label: "计划日期", prop: 'planDate',type: "dateTime" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "计划日期", prop: 'planDate' },
   { label: "类型", prop: 'type' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货缴库记录 20230413
@@ -1519,7 +1519,7 @@ export const ProductReceiptNote = [
   { label: "receiptType", prop: 'receiptType' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货报废申请 20230412
@@ -1543,7 +1543,7 @@ export const ProductReceiptScrapRequest = [
   { label: "报废类型", prop: 'type' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货报废记录 20230412
@@ -1563,7 +1563,7 @@ export const ProductReceiptScrapNote = [
   { label: "报废请求单号", prop: 'scrapRequestNumber' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 半成品上架记录 已调整 1
@@ -1579,7 +1579,7 @@ export const partiallyPreparedProductsNote =  [
   { label: "备注", prop: 'remark' },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "检验单号", prop: 'inspectNumber' },
@@ -1616,7 +1616,7 @@ export const DeliverRequest = [
   { label: "事务ID", prop: "tenantId" },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 成品发货任务 20230414
@@ -1680,7 +1680,7 @@ export const DeliverNote = [
   { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "目标库位代码", prop: 'toLocationCode' },
   // { label: "目标库区", prop: 'toLocationArea' },
   // { label: "目标库位组", prop: 'toLocationGroup' },
@@ -1711,7 +1711,7 @@ export const FISDeliverRequest = [
   { label: "发货计划单号", prop: 'deliverPlanNumber' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // FIS发货记录 20230415
@@ -1736,7 +1736,7 @@ export const FISDeliverNote = [
   { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "目标库位代码", prop: 'toLocationCode' },
   // { label: "目标库区", prop: 'toLocationArea' },
   // { label: "目标库位组", prop: 'toLocationGroup' },
@@ -1765,7 +1765,7 @@ export const customerDismantle = [
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 客户退拆记录 20230415
@@ -1784,16 +1784,15 @@ export const customerDismantleNote = [
   { label: "班次", prop: 'shift' },
   { label: "车间", prop: 'workshop' },
   { label: "申请单号", prop: 'requestNumber' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 生产退库申请 已调整 1
+// 生产退库申请 20230415
 export const productionReturnRequest =  [
   { label: "退库申请单号", prop: "number" },
   { label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "采购订单号", prop: "poNumber" },
   { label: "操作员", prop: 'worker' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
@@ -1804,21 +1803,21 @@ export const productionReturnRequest =  [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "事务ID", prop: "tenantId" },
   { label: "ID", prop: 'id' },
+  // { label: "采购订单号", prop: "poNumber" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 生产退库任务 已调整 1
+// 生产退库任务 20230415
 export const productionReturnJob =  [
   { label: "退库任务单号", prop: "number" },
   { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "退库单号", prop: "productionReturnRequestNumber" },
-  { label: "采购订单号", prop: "poNumber" },
   { label: "操作员", prop: 'worker' },
   { label: "承接用户", prop: 'acceptUserName' },
   { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
@@ -1829,8 +1828,7 @@ export const productionReturnJob =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType' },
   { label: "优先级", prop: 'priority' },
@@ -1842,6 +1840,8 @@ export const productionReturnJob =  [
   { label: "任务描述", prop: 'jobDescription' },
   { label: "事务ID", prop: "tenantId" },
   { label: "ID", prop: 'id' },
+  // { label: "采购订单号", prop: "poNumber" },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 生产退库记录 20230413
@@ -1862,7 +1862,7 @@ export const productionReturnNote =  [
   { label: "ID", prop: 'id' },
   // { label: "采购订单号", prop: "poNumber" },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 
@@ -1921,7 +1921,7 @@ export const labelsList =  [
 export const InventoryInitialNote = [
   { label: "单据号", prop: "number" },
   { label: "操作员", prop: 'worker' },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "生效日期", prop: "activeDate",type: "dateTime" },
   { label: "库存初始化请求单号", prop: "requestNumber" },
   // -----------------------------------------------------------------------
@@ -1973,7 +1973,7 @@ export const InventoryInitialNote = [
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "到货时间", prop: "arriveDate",type:"dateTime" },
   // { label: "公司", prop: "company" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2016,7 +2016,7 @@ export const InventoryTransaction = [
   { label: "事务ID", prop: "tenantId" },
   { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
   // { label: "公司", prop: "company" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2051,7 +2051,7 @@ export const InventorySnapshot = [
   { label: "入库时间", prop: "putInTime", type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: "company" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2169,7 +2169,7 @@ export const expectOut = [
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -2196,7 +2196,7 @@ export const pickingRequest =  [
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2222,7 +2222,7 @@ export const pickingApproval =  [
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2243,7 +2243,7 @@ export const pickingNote =  [
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2269,7 +2269,7 @@ export const materialReturnRequest =  [
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2295,7 +2295,7 @@ export const materialReturnApproval =  [
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2315,7 +2315,7 @@ export const materialReturnNote =  [
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
@@ -2333,7 +2333,7 @@ export const recycledMaterialsReceipt = [
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2356,7 +2356,7 @@ export const recycledMaterialsAdjustmentApply =  [
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2374,7 +2374,7 @@ export const materialsAdjustment = [
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "任务单号", prop: "jobNumber" },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
@@ -2397,7 +2397,7 @@ export const lineSideWarehouseAllocationRequest =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
@@ -2420,7 +2420,7 @@ export const lineSideWarehouseAllocationConfirm =  [
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "任务单号", prop: "jobNumber" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
@@ -2444,7 +2444,7 @@ export const lineSideWarehouseAllocationNote =  [
   { label: "备注", prop: "remark" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: "company" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "任务ID", prop: "jobNumber" },
   { label: "调拨类型", prop: "type" },
   { label: "ID", prop: 'id' },
@@ -2467,7 +2467,7 @@ export const interStorageAllocationNote =  [
   { label: "事务ID", prop: "tenantId" },
   { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
   { label: "公司", prop: "company" },
-  { label: "仓库", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "任务ID", prop: "jobNumber" },
   { label: "类型", prop: "type" },
   { label: "ID", prop: 'id' },
@@ -2491,7 +2491,7 @@ export const customerStorageAllocationRequest =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
-  // { label: "仓库", prop: "warehouseCode" },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
@@ -2518,7 +2518,7 @@ export const customerStorageAllocationConfirm =  [
   { label: "ID", prop: 'id' },
   { label: "备注", prop: 'remark' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: "warehouseCode" },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨记录 20230410
@@ -2541,7 +2541,7 @@ export const customerStorageAllocationNote =  [
   { label: "ID", prop: 'id' },
   { label: "备注", prop: 'remark' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: "warehouseCode" },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // -----------------------------------------------------------------------
 ]
 // 储位内移库记录 20230410
@@ -2563,11 +2563,11 @@ export const intraStorageTransferNote =  [
   { label: "任务ID", prop: 'jobNumber' },
   { label: "type", prop: 'type' },
   { label: "ID", prop: 'id' },
-  // { label: "仓库", prop: "warehouseCode" },
+  // { label: "仓库代码", prop: "warehouseCode" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓缴库申请 已调整 1
+// 线边仓缴库申请 20230415
 export const lineSideWarehousePaymentRequest =  [
   { label: "缴库申请单号", prop: "number" },
   { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
@@ -2583,9 +2583,7 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "生产计划编号", prop: 'productionPlanNumber' },
   { label: "车间", prop: 'workshop' },
   { label: "生产线", prop: 'prodLine' },
@@ -2595,30 +2593,31 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "计划日期", prop: 'planDate' },
   { label: "类型", prop: 'type' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓缴库记录 已调整 1
+// 线边仓缴库记录 20230415
 export const lineSideWarehousePaymentNote = [
-  { label: "缴库申请单号", prop: 'number' },
+  { label: "缴库记录单号", prop: 'number' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "完工时间", prop: 'completeTime',type: "dateTime" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "缴库时间", prop: 'completeTime',type: "dateTime" },
-  { label: "操作员", prop: 'worker' },
-  // -----------------------------------------------------------------------
   { 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' },
+  { label: "操作员", prop: 'worker' },
   { label: "上级关联菜单号", prop: 'sourceNumber' },
   { label: "生产计划单号", prop: 'productionPlanNumber' },
   { label: "任务ID", prop: 'jobNumber' },
-  { label: "事务ID", prop: "tenantId" },
   { label: "车间", prop: 'workShop' },
-  { label: "receiptType", prop: 'receiptType' },
+  { 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
@@ -2642,7 +2641,7 @@ export const lineSideWarehouseScrappingRequest = [
   { label: "报废类型", prop: 'type' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓报废记录 20230412
@@ -2662,7 +2661,7 @@ export const lineSideWarehouseScrappingNote = [
   { label: "报废请求单号", prop: 'scrapRequestNumber' },
   { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
-  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调整申请 已调整 1
@@ -2683,7 +2682,7 @@ export const lineSideWarehouseAdjustmentSheetRequest =  [
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "备注", prop: 'remark' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
@@ -2704,7 +2703,7 @@ export const lineSideWarehouseAdjustmentSheetNote =  [
   { label: "事务ID", prop: "tenantId" },
   { label: "是否调整", prop: "isAdjusted", type: "filter", filters: "whetherOrNot" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "备注", prop: 'remark' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
@@ -2736,7 +2735,7 @@ export const CountPlan = [
   { label: "事务ID", prop: "tenantId" },
   { label: "物品代码JSON", prop: 'jsonItemCodes' },
   { label: "库位JSON", prop: 'jsonLocationCodes' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -2796,7 +2795,7 @@ export const CountNote = [
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "描述", prop: "description" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
@@ -2815,7 +2814,7 @@ export const CountPlanAdjust = [
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
@@ -2836,7 +2835,7 @@ export const CountAdjustNote = [
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]