From fcc82c9c5bbb23033ba9e196f601252d444c5e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Apr 2023 09:43:29 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/importFile/index.vue     | 12 ++++++------
 .../purchaseReceipt/SupplierAsn-msQuery.vue   | 19 +++----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/fe/PC/src/components/importFile/index.vue b/fe/PC/src/components/importFile/index.vue
index 502204bca..b7cabca87 100644
--- a/fe/PC/src/components/importFile/index.vue
+++ b/fe/PC/src/components/importFile/index.vue
@@ -7,8 +7,7 @@
     :visible.sync="show"
     :append-to-body="true"
     :modal-append-to-body="false"
-    top="5vh"
-    width="950px"
+    width="85%"
     :show-close="false"
   >
     <div class="body_header">
@@ -56,13 +55,14 @@
     :modal-append-to-body="false"
     :show-close="false"
     width="85%"
-    top="3vh"
   >
     <div >
       <el-table 
         :data="excelData.results" 
-        border highlight-current-row 
-        style="width: 100%;margin-top:10px;"
+        :border="true" 
+        highlight-current-row 
+        style="width: 100%;
+        margin-top:10px;"
         max-height="400"
       >
         <el-table-column 
@@ -255,7 +255,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-dialog__body {
-  max-height: 50vh;
+  max-height: 100vh;
   display: flex;
   flex-direction: column;
 }
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
index 3a143d144..7a3fdb889 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
@@ -25,27 +25,14 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
-    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
-    <!-- <importFile
-      :loading="Loading.importLoading"
-      :show="displayDialog.importDialog"
-      :URL="URL"
-      :disabledMethod = {method1:false,method2:false,method3:false}
-      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
-      methodValue="0"
-      isAllowPartImportValue="1"
-      @importClick="postImportMergeClick(arguments)"
-      @postImportDown="importDown"
-    ></importFile> -->
     <!-- 表格导入 -->
-    <upload-excel-component 
+    <!-- <upload-excel-component 
       :DrawerLoading="Loading.DrawerLoading"
       :before-upload="beforeUpload"
       :show="displayDialog.importDialog"
       @postImportDown="importDown()"
       @submitForm="uploadSubmitForm"
-    />
+    /> -->
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -103,7 +90,7 @@ export default {
       // importUploadURL:"wms/store/supplier-asn/newImport",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

From dea45638361e81e2ced2bf46e95b15c46b70ebbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Apr 2023 12:01:14 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=20=E5=8E=9F=E6=96=99=E5=BA=93=E4=BD=8D=E7=BB=84?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicData/WorkshopManage/ProductionLine.vue  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
index b59e0030d..5e8d99b06 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
@@ -171,8 +171,12 @@ export default {
           ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData,[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
@@ -203,8 +207,12 @@ export default {
           ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData,[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[

From 1577de4a4364b3f6ee77b52c048d0c6657cd9362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Apr 2023 13:57:53 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/router/index.js                     | 32 +++++++++----------
 .../views/basicData/ItemsManage/ItemBasic.vue |  2 ++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index fd10bb1cb..bad618de2 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -118,22 +118,22 @@ export const constantRoutes = [
       }
     }]
   }, 
-  // {
-  //   path: '/',
-  //   component: Layout,
-  //   redirect: '/gridlayout',
-  //   // hidden: true,
-  //   children: [{
-  //     path: 'gridlayout',
-  //     component: () => import('@/views/gridLayout/indexShow'),
-  //     name: 'Gridlayout',
-  //     meta: {
-  //       keepAlive : true, 
-  //       title: '首页编辑器',
-  //       icon: '系统首页',
-  //     }
-  //   }]
-  // }, 
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'gridlayout',
+      component: () => import('@/views/gridLayout/indexShow'),
+      name: 'Gridlayout',
+      meta: {
+        keepAlive : true, 
+        title: '首页编辑器',
+        icon: '系统首页',
+      }
+    }]
+  }, 
   // 开发中模拟路由
   // {
   //   path: '/',
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
index e793d4717..42e46e8df 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
@@ -223,6 +223,7 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
@@ -255,6 +256,7 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },

From 1ae836c8b266978538076734945fc02dc4520875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 3 Apr 2023 14:00:06 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=B4=E6=96=B0=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=94=B9=E4=B8=BA=E7=89=A9=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js | 400 +++++++++----------
 fe/PC/src/utils/summaryTableColumns/index.js |  18 +-
 fe/PC/src/utils/tableColumns/index.js        | 148 +++----
 fe/PC/src/utils/tabsDesTions/index.js        | 118 +++---
 4 files changed, 342 insertions(+), 342 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index a4bf6c55a..4dc7ef91d 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -15,11 +15,11 @@ export const Dict = [
 /**/
 // 供应商发货通知 已调整
 export const SupplierAsn =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发货数量", prop: "qty" },
-  { label: "物料单位", prop: "uom" },
+  { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "ERP库位", prop: "recommendErpCode" },
@@ -44,11 +44,11 @@ export const SupplierAsn =  [
 
 // 采购订单信息 已调整
 export const PurchaseOrder =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发货数量", prop: "qty" },
-  { label: "物料单位", prop: "uom" },
+  { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
   { label: "ERP库位", prop: "locationErpCode" },
   { label: "项目编号", prop: "projectCode" },
@@ -69,11 +69,11 @@ export const PurchaseOrder =  [
 ]
 // 到货通知 已调整
 export const ArriveNotice =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发货数量", prop: "qty" },
-  { label: "物料单位", prop: "uom" },
+  { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "ERP库位", prop: "recommendErpCode" },
@@ -100,12 +100,12 @@ export const ArriveNotice =  [
 ]
 // 采购收货任务 已调整
 export const PurchaseReceiptJob =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "状态", prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
   { label: "数量", prop: "recommendQty" },
-  { label: "物料单位", prop: "recommendUom" },
+  { label: "物品单位", prop: "recommendUom" },
   { label: "生产批次", prop: 'recommendLot' },
   { label: "箱码", prop: "recommendPackingCode" },
   { label: "ERP库位", prop: "recommendErpCode" },
@@ -153,11 +153,11 @@ export const PurchaseReceiptJob =  [
 ]
 // 报检单 已调整
 export const InspectNotice =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName", width: orderWidth },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName", width: orderWidth },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "收货数量", prop: "receiveQty" },
-  { label: "物料单位", prop: "receiveUom" },
+  { label: "物品单位", prop: "receiveUom" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
@@ -202,12 +202,12 @@ export const InspectNotice =  [
 // 检验记录 字段需要确定
 export const InspectNote =  [
   // { label: "其他详情", fixed: "left", type: "button" },
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述1", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "收货数量", prop: "receiveQty" },
-  { label: "物料单位", prop: "receiveUom" },
+  { label: "物品单位", prop: "receiveUom" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位", prop: 'locationCode' },
@@ -258,9 +258,9 @@ export const InspectNote =  [
 
 // 不合格转合格记录 已调整
 export const unqualifiedToQualifiedNote = [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -297,9 +297,9 @@ export const unqualifiedToQualifiedNote = [
 ]
 // 采购上架记录  已调整
 export const PutawayNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "到货数", prop: 'shippedQty' },
   { label: "单位", prop: "uom" },
@@ -347,9 +347,9 @@ export const PutawayNote =  [
 ]
 // 人工叫料申请  待确认
 export const IssueRequest =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "叫料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
@@ -379,9 +379,9 @@ export const IssueRequest =  [
 ]
 // 人工发料任务 已调整
 export const IssueJob =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
   { label: "单位", prop: "recommendUom" },
   { label: "推荐批次", prop: "recommendLot" },
@@ -438,9 +438,9 @@ export const IssueJob =  [
 ]
 // 人工发料记录 已调整
 export const IssueNote =  [
-  { label: "物料代码", prop: "itemCode",fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -483,9 +483,9 @@ export const IssueNote =  [
 ]
 // 自动叫料申请 待确认
 export const automaticCallApply =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "叫料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   // 批次占位
@@ -515,9 +515,9 @@ export const automaticCallApply =  [
 ]
 // 自动发料任务 已调整
 export const automaticCallJob =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "单位", prop: "recommendUom" },
   { label: "推荐批次", prop: "recommendLot" },
   { label: "实际批次", prop: "handledLot" },
@@ -574,9 +574,9 @@ export const automaticCallJob =  [
 ]
 // 自动发料记录 已调整
 export const automaticCallNote =  [
-  { label: "物料代码", prop: "itemCode",fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -619,9 +619,9 @@ export const automaticCallNote =  [
 ]
 // 上架前退货记录 已调整
 export const beforeGroundingReturnNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -649,9 +649,9 @@ export const beforeGroundingReturnNote =  [
 ]
 // 上架后退货申请 已调整
 export const PurchaseReturnRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -679,9 +679,9 @@ export const PurchaseReturnRequest =  [
 ]
 // 上架后退货任务 已调整
 export const PurchaseReturnJob =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   // 上架后退货任务先都用【recommend】信息，已跟后端确定
   { label: "数量", prop: "recommendQty" },
   { label: "单位", prop: "recommendUom" },
@@ -729,9 +729,9 @@ export const PurchaseReturnJob =  [
 ]
 // 上架后退货记录 已调整
 export const PurchaseReturnNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -761,9 +761,9 @@ export const PurchaseReturnNote =  [
 ]
 // 原料报废记录 已调整
 export const ScrapNote =  [
-  { label: "物料代码", prop: "itemCode",fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "报废数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'toLot' },
@@ -804,9 +804,9 @@ export const ScrapNote =  [
 ]
 // 原料直发客户记录 已调整
 export const materialDirectSendNote =  [
-  { label: "物料代码", prop: "itemCode",fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -848,9 +848,9 @@ export const materialDirectSendNote =  [
 ]
 // 直接发料记录
 export const directIssueNote =  [
-  { label: "物料代码", prop: "itemCode",fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -895,9 +895,9 @@ export const directIssueNote =  [
 /**/
 // 完工收货缴库申请
 export const ProductReceiptRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -919,9 +919,9 @@ export const ProductReceiptRequest =  [
 ]
 // 完工收货缴库记录 已调整
 export const ProductReceiptNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
@@ -950,9 +950,9 @@ export const ProductReceiptNote =  [
 ]
 //  完工收货报废申请
 export const ProductReceiptScrapRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"areaCode" },
@@ -969,9 +969,9 @@ export const ProductReceiptScrapRequest =  [
 ]
 //  完工收货报废记录 已调整
 export const ProductReceiptScrapNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "报废数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "报废库区", prop:"fromLocationArea" },
@@ -1011,9 +1011,9 @@ export const ProductReceiptScrapNote =  [
 ]
 // 半成品上架记录 已调整
 export const partiallyPreparedProductsNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -1060,9 +1060,9 @@ export const partiallyPreparedProductsNote =  [
 ]
 // 成品发货申请 已调整
 export const DeliverRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "发货库区", prop: "areaCode" },
@@ -1077,9 +1077,9 @@ export const DeliverRequest =  [
 ]
 // 成品发货任务 已调整
 export const DeliverJob =  [
-    { label: "物料代码", prop: "itemCode", fixed: "left" },
-    { label: "物料名称", prop: "itemName" },
-    { label: "物料描述", prop: "itemDesc1" },
+    { label: "物品代码", prop: "itemCode", fixed: "left" },
+    { label: "物品名称", prop: "itemName" },
+    { label: "物品描述", prop: "itemDesc1" },
     { label: "出货数量", prop: "recommendQty" },
     { label: "单位", prop: "recommendUom" },
     { label: "出货库区", prop: "recommendLocationArea" },
@@ -1121,9 +1121,9 @@ export const DeliverJob =  [
 ]
 // 成品发货记录 已调整
 export const DeliverNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'fromLot' },
@@ -1164,9 +1164,9 @@ export const DeliverNote =  [
 ]
 // FIS发货申请 已调整
 export const FISDeliverRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
@@ -1183,9 +1183,9 @@ export const FISDeliverRequest =  [
 ]
 // FIS发货记录 已调整
 export const FISDeliverNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
@@ -1225,9 +1225,9 @@ export const FISDeliverNote =  [
 ]
 // 客户退拆申请 已调整
 export const customerDismantle = [
-  { label: "退拆物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "退拆物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "预定开工日", prop: "preStartTime",type: "dateTime" },
   { label: "退拆数量", prop: "qty" },
   { label: "单位", prop: 'uom' },
@@ -1253,9 +1253,9 @@ export const customerDismantle = [
 ]
 // 生产退库申请 已调整
 export const productionReturnRequest =  [
-  { label: "物料代码", prop: "itemCode",fixed:"left" },
-  { label: "物料名称", prop: 'itemName' },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed:"left" },
+  { label: "物品名称", prop: 'itemName' },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: 'qty' },
   { label: "单位", prop: 'uom' },
   { label: "批次", prop: 'lot' },
@@ -1284,9 +1284,9 @@ export const productionReturnRequest =  [
 ]
 // 生产退库任务 已调整
 export const productionReturnJob =  [
-  {  label: "物料代码", prop: "itemCode",fixed:"left" },
-  { label: "物料名称", prop: 'itemName' },
-  { label: "物料描述", prop: "itemDesc1" },
+  {  label: "物品代码", prop: "itemCode",fixed:"left" },
+  { label: "物品名称", prop: 'itemName' },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: 'recommendQty' },
   { label: "单位", prop: 'recommendUom' },
   { label: "批次", prop: 'recommendLot' },
@@ -1331,9 +1331,9 @@ export const productionReturnJob =  [
 ]
 // 生产退库记录 已调整
 export const productionReturnNote =  [
-  {  label: "物料代码", prop: "itemCode",fixed:"left" },
-  { label: "物料名称", prop: 'itemName' },
-  { label: "物料描述", prop: "itemDesc1" },
+  {  label: "物品代码", prop: "itemCode",fixed:"left" },
+  { label: "物品名称", prop: 'itemName' },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: 'qty' },
   { label: "单位", prop: 'uom' },
   { label: "批次", prop: 'toLot' },
@@ -1376,9 +1376,9 @@ export const productionReturnNote =  [
 /**/
 // 非生产领料申请 已调整
 export const pickingRequest =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "领料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1410,9 +1410,9 @@ export const pickingRequest =  [
 ]
 // 非生产领料审批 已调整
 export const pickingApproval =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "领料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1444,9 +1444,9 @@ export const pickingApproval =  [
 ]
 // 非生产领料记录 已调整
 export const pickingNote =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "领料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1479,9 +1479,9 @@ export const pickingNote =  [
 ]
 // 非生产退料申请 已调整
  export const materialReturnRequest =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "退料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1513,9 +1513,9 @@ export const pickingNote =  [
 ]
 // 非生产退料审批 已调整
 export const materialReturnApproval =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "退料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1547,9 +1547,9 @@ export const materialReturnApproval =  [
 ]
 // 非生产退料记录 已调整
 export const materialReturnNote =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "退料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1582,10 +1582,10 @@ export const materialReturnNote =  [
 ]
 // 回收料收货记录 已调整
 export const recycledMaterialsReceipt = [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述1", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1612,8 +1612,8 @@ export const recycledMaterialsReceipt = [
 export const recycledMaterialsAdjustmentApply = [ 
   { label: "来源物品代码", prop: "itemCode" },
   { label: "目标物品代码", prop: "toItemCode" },
-  { label: "物料描述1", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "来源箱标签", prop: "fromPackingCode" },
   { label: "目标箱标签", prop: "toPackingCode" },
   { label: "调整数量", prop: "fromQty" },
@@ -1648,8 +1648,8 @@ export const recycledMaterialsAdjustmentApply = [
 export const materialsAdjustment = [
   { label: "来源物品代码", prop: "itemCode" },
   { label: "目标物品代码", prop: "toItemCode" },
-  { label: "物料描述1", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "来源箱标签", prop: "fromPackingCode" },
   { label: "目标箱标签", prop: "toPackingCode" },
   { label: "调整数量", prop: "toQty" },
@@ -1681,9 +1681,9 @@ export const materialsAdjustment = [
 ]
 // 线边仓调拨申请 已调整
 export const lineSideWarehouseAllocationRequest =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -1721,9 +1721,9 @@ export const lineSideWarehouseAllocationRequest =  [
 ]
 // 线边仓调拨确认 已调整
 export const lineSideWarehouseAllocationConfirm =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -1761,9 +1761,9 @@ export const lineSideWarehouseAllocationConfirm =  [
 ]
 // 线边仓调拨记录 已调整
 export const lineSideWarehouseAllocationNote =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -1802,9 +1802,9 @@ export const lineSideWarehouseAllocationNote =  [
 ]
 // 储位调拨记录 已调整
 export const interStorageAllocationNote =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'toLot' },
@@ -1842,9 +1842,9 @@ export const interStorageAllocationNote =  [
 ]
 // 客户储位调拨申请 已调整
 export const customerStorageAllocationRequest =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -1887,9 +1887,9 @@ export const customerStorageAllocationRequest =  [
 ]
 // 客户储位调拨确认 已调整
 export const customerStorageAllocationConfirm =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -1932,9 +1932,9 @@ export const customerStorageAllocationConfirm =  [
 ]
 // 客户储位调拨记录 已调整
 export const customerStorageAllocationNote =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -1953,9 +1953,9 @@ export const customerStorageAllocationNote =  [
 ]
 // 储位内移库记录 已调整
 export const intraStorageTransferNote =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -1994,9 +1994,9 @@ export const intraStorageTransferNote =  [
 ]
 // 线边仓缴库申请 待确认
 export const lineSideWarehousePaymentRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "返线数量", prop: "returnQty" },
@@ -2024,9 +2024,9 @@ export const lineSideWarehousePaymentRequest =  [
 ]
 // 线边仓缴库记录 已调整
 export const lineSideWarehousePaymentNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "返线数量", prop: "returnQty" },
@@ -2055,9 +2055,9 @@ export const lineSideWarehousePaymentNote =  [
 ]
 //  线边仓报废申请 已调整
 export const lineSideWarehouseScrappingRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
@@ -2075,9 +2075,9 @@ export const lineSideWarehouseScrappingRequest =  [
 ]
 //  线边仓报废记录 已调整
 export const lineSideWarehouseScrappingNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"toLocationArea" },
@@ -2117,9 +2117,9 @@ export const lineSideWarehouseScrappingNote =  [
 ]
 // 线边仓调整申请 已调整
 export const lineSideWarehouseAdjustmentSheetRequest =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调整库位", prop: 'locationCode' },
@@ -2140,9 +2140,9 @@ export const lineSideWarehouseAdjustmentSheetRequest =  [
 ]
 // 线边仓调整记录 已调整
 export const lineSideWarehouseAdjustmentSheetNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "adjustQty" },
   { label: "单位", prop: "inventoryUom" },
   { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
@@ -2210,9 +2210,9 @@ export const InventoryInitialNote = [
 ]
 // 盘点计划 已调整
 export const CountPlan =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "初盘数量", prop: "firstCountQty" },
   { label: "最终盘点数量", prop: "finalCountQty" },
@@ -2230,7 +2230,7 @@ export const CountPlan =  [
   { label: "初盘操作员", prop: "firstCountOperator" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   // -----------------------------------------------------------------------
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
   { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
   { label: "重盘数量", prop: "repeatCountQty" },
@@ -2262,9 +2262,9 @@ export const CountPlan =  [
 ]
 // 盘点任务 已调整
 export const CountJob =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "盘点数量", prop: "countQty" },
   { label: "库存单位", prop: "inventoryUom" },
@@ -2280,7 +2280,7 @@ export const CountJob =  [
   { label: "盘点描述", prop: "countDescription" },
   // -----------------------------------------------------------------------
   { label: "单据号", prop: 'number', width:orderWidth },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "备注", prop: 'remark' },
   { label: "包装数量", prop: "stdPackQty" },
   { label: "包装单位", prop: "stdPackUom" },
@@ -2303,9 +2303,9 @@ export const CountJob =  [
 ]
 // 盘点记录 已调整
 export const CountNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "初盘数量", prop: "firstCountQty" },
   { label: "最终盘点数量", prop: "finalCountQty" },
@@ -2326,7 +2326,7 @@ export const CountNote =  [
   // -----------------------------------------------------------------------
   { label: "包装数量", prop: "stdPackQty" },
   { label: "包装单位", prop: "stdPackUom" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
   { label: "阶段", prop: "stage",type: "filter", filters: "stageType" },
   { label: "重盘数量", prop: "repeatCountQty" },
@@ -2358,9 +2358,9 @@ export const CountNote =  [
 ]
 // 盘点调整申请 已调整
 export const CountPlanAdjust =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "盘点数量", prop: "countQty" },
   { label: "调整数量", prop: "qty" },
   { label: "库存数量", prop: "inventoryQty" },
@@ -2376,7 +2376,7 @@ export const CountPlanAdjust =  [
   { label: "原因代码", prop: "reasonCode", },
   { label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
   // -----------------------------------------------------------------------
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "单位", prop: "uom" },
   { label: "供应商批次", prop: "supplierBatch" },
   { label: "备注", prop: 'remark' },
@@ -2398,9 +2398,9 @@ export const CountPlanAdjust =  [
 ]
 // 盘点调整记录 已调整
  export const CountAdjustNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "盘点差异数量", prop: "diffQty" },
   { label: "盘点数量", prop: "countQty" },
@@ -2419,7 +2419,7 @@ export const CountPlanAdjust =  [
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "操作员", showProp:"worker",type:"outerMainFilter" },
   // -----------------------------------------------------------------------
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "供应商批次", prop: "supplierBatch" },
   { label: "生产日期", prop: "produceDate",type:"dateTime" },
   { label: "备注", prop: 'remark' },
diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js
index c8523ce10..a78fd15ac 100644
--- a/fe/PC/src/utils/summaryTableColumns/index.js
+++ b/fe/PC/src/utils/summaryTableColumns/index.js
@@ -6,10 +6,10 @@ const orderWidth = 180
 // 报检单 已调整
 export const InspectNotice =  [
   // { label: "检验详情", fixed: "left", type: "button" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料单位", prop: "receiveUom" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品单位", prop: "receiveUom" },
   { label: "生产批次", prop: "lot" },
   { label: "收货数量", prop: 'receiveQty' },
   { label: "检验数量", prop: 'inspectQty' },
@@ -45,10 +45,10 @@ export const InspectNotice =  [
 ]
 // 检验记录  字段需要确定
 export const InspectNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料单位", prop: 'receiveUom' },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品单位", prop: 'receiveUom' },
   { label: "生产批次", prop: "lot" },
   { label: "收货数量", prop: 'receiveQty' },
   { label: "检验数量", prop: 'inspectQty' },
@@ -61,7 +61,7 @@ export const InspectNote =  [
   // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
   // -----------------------------------------------------------------------
   { label: "单据号", prop: "number" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "创建时间", prop: "completeTime",type: "dateTime" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "创建者Id", prop: 'creatorId' },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index fc98d76b1..5f6e0b58b 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -5,14 +5,14 @@ const orderWidth = 180
 // 物品基础信息 20230328
 export const ItemBasic = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "code",
     fixed: "left",
     type: "name"
   },
-  { label: "物料名称", prop: "name" },
-  { label: "物料描述1", prop: "desc1" },
-  { label: "物料描述2", prop: "desc2" },
+  { label: "物品名称", prop: "name" },
+  { label: "物品描述1", prop: "desc1" },
+  { label: "物品描述2", prop: "desc2" },
   { label: "状态", prop: "status", type: "filter", filters: "itemStatus" },
   { label: "类型", prop: 'type', type: "filter", filters: "ItemTypeBasic" },
   { label: "ABC类", prop: 'abcClass', type: "filter", filters: "abcClass" },
@@ -20,10 +20,10 @@ export const ItemBasic = [
   { label: "采购件", prop: 'canBuy', type: "filter", filters: "whetherOrNot" },
   { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
-  { label: "是否虚拟物料", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "产品类", prop: 'productLine' },
   { label: "E-LEVEL等级", prop: 'elevel' },
-  // { label: "物料分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
+  // { label: "物品分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
   { label: "颜色", prop: "color" },
   // ---------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -52,7 +52,7 @@ export const ItemBasic = [
 // 物品质量信息 20230328
 export const ItemQuality = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -76,7 +76,7 @@ export const ItemQuality = [
 // 物品分类信息 20230328
 export const ItemCategory = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -106,11 +106,11 @@ export const ItemPack = [
   },
   { label: "包装名称", prop: "packName" },
   { label: '包装类型', prop: "packType" },
-  { label: '物料代码', prop: "itemCode" },
+  { label: '物品代码', prop: "itemCode" },
   // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" },
   // { label: '标包编号', prop: "stdPackCode" },
   // { label: "包装数量", prop: "packQty" },
-  // { label: "物料单位", prop: "packUom" },
+  // { label: "物品单位", prop: "packUom" },
   // { label: "转换率", prop: "conversionRate" },
   // -----------------------------------------------------------------------
   { label: '包装计量单位', prop: "basicUom" },
@@ -126,11 +126,11 @@ export const ItemPack = [
   //   fixed: "right"
   // },
 ]
-// 物料质检标准信息 20230328
+// 物品质检标准信息 20230328
 export const AQL = [
   {
-    //label: "物料代码",
-    label: "物料代码",
+    //label: "物品代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -154,17 +154,17 @@ export const AQL = [
   //   fixed: "right"
   // },
 ]
-// 物料清单信息 20230328
+// 物品清单信息 20230328
 export const Bom = [
   {
-    label: "父物料号",
+    label: "父物品号",
     prop: "product",
     fixed: "left",
     type: "name"
   },
-  { label: "子物料号", prop: "component" },
-  { label: "子物料用量", prop: 'componentQty' },
-  { label: "子物料用量单位", prop: 'componentUom' },
+  { label: "子物品号", prop: "component" },
+  { label: "子物品用量", prop: 'componentQty' },
+  { label: "子物品用量单位", prop: 'componentUom' },
   { label: "ERP工序", prop: "erpOp" },
   { label: "制造工序", prop: "mfgOp" },
   { label: "配送方式", prop: "distributionType", type: "filter", filters: "distributionType" },
@@ -185,19 +185,19 @@ export const Bom = [
   //   fixed: "right"
   // },
 ]
-// 物料清单信息 - 详情【父物料信息、子物料信息】 20230331
+// 物品清单信息 - 详情【父物品信息、子物品信息】 20230331
 export const BomInner = [
   {
-    label: "父物料号",
+    label: "父物品号",
     prop: "product",
     fixed: "left",
     type: "name"
   },
-  { label: "子物料号", prop: "component" },
-  { label: "子物料用量", prop: 'componentQty' },
-  { label: "子物料用量单位", prop: 'componentUom' },
-  // { label: "子物料用量", prop: 'perQty', type:"object",showProp: 'qty' },
-  // { label: "子物料用量单位", prop: 'perQty', type:"object",showProp: 'uom' },
+  { label: "子物品号", prop: "component" },
+  { label: "子物品用量", prop: 'componentQty' },
+  { label: "子物品用量单位", prop: 'componentUom' },
+  // { label: "子物品用量", prop: 'perQty', type:"object",showProp: 'qty' },
+  // { label: "子物品用量单位", prop: 'perQty', type:"object",showProp: 'uom' },
   { label: "ERP工序", prop: "erpOp" },
   { label: "制造工序", prop: "mfgOp" },
   { label: "配送方式", prop: "distributionType", type: "filter", filters: "distributionType" },
@@ -265,8 +265,8 @@ export const CustomerItem = [
     fixed: "left",
     type: "name"
   },
-  { label: "客户物料代码", prop: "customerItemCode" },
-  { label: "物料代码", prop: "itemCode" },
+  { label: "客户物品代码", prop: "customerItemCode" },
+  { label: "物品代码", prop: "itemCode" },
   { label: "包装数量", prop: "customerPackQty" },
   { label: "包装单位", prop: "customerPackUom" },
   { label: "开始时间", prop: "beginTime", type: "dateTime" },
@@ -382,9 +382,9 @@ export const SupplierItem = [
     fixed: "left",
     type: "name"
   },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "供应商物料代码", prop: "supplierItemCode" },
-  { label: "供应商物料名称", prop: "itemName" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "供应商物品代码", prop: "supplierItemCode" },
+  { label: "供应商物品名称", prop: "itemName" },
   { label: "供应商简称", prop: "supplierSimpleName" },
   { label: "版本", prop: "version" },
   // -----------------------------------------------
@@ -597,7 +597,7 @@ export const Location = [
 // 库位零件关系 20230331
 export const ItemStoreRelation = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -655,7 +655,7 @@ export const InventoryLocationCapacity = [
 // 物品安全库存信息 20230328
 export const ItemSafetyStock = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -768,7 +768,7 @@ export const ProductionLine = [
 ]
 // 生产线零件关系 20230328
 export const ProductionLineItem = [
-  { label: "物料代码", prop: "itemCode", type: "name" },
+  { label: "物品代码", prop: "itemCode", type: "name" },
   { label: "生产线编号", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
@@ -860,15 +860,15 @@ export const Shift = [
 // 作业指导书信息 20230328
 export const ItemGuideBook = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name"
   },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   // -----------------------------------------------------------------------
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -1228,11 +1228,11 @@ export const qualifiedInfo = [
     width: orderWidth
   },
   { label: "状态",prop: "purchaseReceiptInspectStatus",  type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
-  { label: "物料单位", prop: "uom" },
+  { label: "物品单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "ERP库位", prop: "recommendErpCode" },
@@ -1249,11 +1249,11 @@ export const unqualifiedInfo = [
     width: orderWidth
   },
   { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
-  { label: "物料单位", prop: "uom" },
+  { label: "物品单位", prop: "uom" },
   { label: "箱码", prop: "packingCode" },
   { label: "ERP库位", prop: "recommendErpCode" },
   { label: "不合格原因代码", prop: 'failedReason' },
@@ -1265,9 +1265,9 @@ export const unqualifiedInfo = [
 ]
 // 采购收货记录-详情【收货缺料明细】
 export const lackMaterialsInfo = [
-  { label: "物料代码", prop: "itemCode",fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "批次", prop: "lot" },
   { label: "ERP库位", prop: "recommendErpCode" },
 ]
@@ -1344,9 +1344,9 @@ export const InspectNote = [
 export const unqualifiedToQualified = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   // { label: "发货单号", prop: "asnNumber", width: orderWidth },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -2146,9 +2146,9 @@ export const customerDismantleNote = [
 ]
 // 客户退拆记录-明细【即回冲记录】 已调整
 export const customerDismantleBackFlushNote = [
-  { label: "退拆物料号", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1", },
+  { label: "退拆物品号", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1", },
   { label: "预定开工日", prop: "preStartTime" ,type: "dateTime", },
   { label: "退拆数量", prop: "qty" },
   { label: "扣账库位", prop: 'locationCode' },
@@ -2352,9 +2352,9 @@ export const labelsList =  [
     type: "name",
     fixed:"left" 
   },
-  { label: "物料代码",  prop: 'itemCode' },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码",  prop: 'itemCode' },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -2391,15 +2391,15 @@ export const InventoryInitialNote = [
 // 库存余额
 export const InventoryBalance = [
   {
-    label: "物料代码",
+    label: "物品代码",
     prop: "itemCode",
     fixed: "left",
     type: "name",
     width: orderWidth
   },
-  { label: "物料名称", prop: 'itemName' },
-  { label: "物料描述1", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品名称", prop: 'itemName' },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "库存数量", prop: "qty" },
   { label: "计量单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -2426,9 +2426,9 @@ export const InventoryTransaction = [
     type: "name",
     width: orderWidth
   },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
   { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
   { label: "事务数量", prop: "qty" },
@@ -2463,9 +2463,9 @@ export const InventoryTransferLog =  [
   },
   { label: "从状态", prop: "fromStatus",type: "filter", filters: "requestStatus" },
   { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "到货数量", prop: "qty" },
   { label: "到货单位", prop: "uom" },
   { label: "从库位编号", prop: "fromLocationCode" },
@@ -2488,9 +2488,9 @@ export const expectOut = [
   },
   { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "占用数量", prop: "qty" },
   { label: "库位代码", prop: "locationCode" },
   { label: "箱码", prop: "packingCode" },
@@ -2512,9 +2512,9 @@ export const expectIn = [
   },
   { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "占用数量", prop: "qty" },
   { label: "库位代码", prop: "locationCode" },
   { label: "箱码", prop: "packingCode" },
@@ -2996,7 +2996,7 @@ export const CountPlan = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "事务代码", prop: "tenantId" },
-  { label: "物料代码JSON", prop: 'jsonItemCodes' },
+  { label: "物品代码JSON", prop: 'jsonItemCodes' },
   { label: "库位JSON", prop: 'jsonLocationCodes' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 877c8490e..a2261fdd9 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -2,10 +2,10 @@
 /**/
 // 物品基础信息 20230328
 export const ItemBasic =  [
-  { label: "物料代码", prop: 'code' },
-  { label: "物料名称", prop: "name" },
-  { label: "物料描述1", prop: "desc1" },
-  { label: "物料描述2", prop: "desc2" },
+  { label: "物品代码", prop: 'code' },
+  { label: "物品名称", prop: "name" },
+  { label: "物品描述1", prop: "desc1" },
+  { label: "物品描述2", prop: "desc2" },
   { label: "状态", prop: "status", type: "filter", filters: "itemStatus" },
   { label: "计量单位", prop: 'basicUom' },
   { label: "ABC类", prop: 'abcClass',type: "filter",  filters: "abcClass" },
@@ -26,7 +26,7 @@ export const ItemBasic =  [
   { label: "版本", prop: 'version' },
   { label: "工程变更", prop: 'eco' },
   { label: "E-LEVEL等级", prop: 'elevel' },
-  { label: "是否虚拟物料", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "标包数", prop: "stdPackQty" },
@@ -40,7 +40,7 @@ export const ItemBasic =  [
 ]
 // 物品质量信息 20230328
 export const ItemQuality =  [
-  { label: "物料代码", prop: "itemCode" },
+  { label: "物品代码", prop: "itemCode" },
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" },
@@ -58,7 +58,7 @@ export const ItemQuality =  [
 ]
 // 物品分类信息 20230328
 export const ItemCategory =  [
-  { label: "物料代码", prop: 'itemCode' },
+  { label: "物品代码", prop: 'itemCode' },
   { label: "分类编号", prop: "categoryCode" },
   { label: "分类值", prop: "value" },
   { label: "备注", prop: 'remark' },
@@ -76,13 +76,13 @@ export const ItemCategory =  [
 export const ItemPack =  [
   { label: "包装代码", prop: 'packCode' },
   { label: "包装名称", prop: "packName" },
-  { label: '物料代码', prop: "itemCode" },
+  { label: '物品代码', prop: "itemCode" },
   { label: '包装计量单位', prop: "basicUom" },
   { label: '包装数量', prop: "qty" },
   // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" },
   // { label: '标包编号', prop: "stdPackCode" },
   // { label: "包装数量", prop: "packQty" },
-  // { label: "物料单位", prop: "packUom" },
+  // { label: "物品单位", prop: "packUom" },
   // { label: "转换率", prop: "conversionRate" },
   { label: "备注", prop: 'remark', colSpan: 12 },
   // -----------------------------------------------------------------------
@@ -96,9 +96,9 @@ export const ItemPack =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物料质检标准信息 20230328
+// 物品质检标准信息 20230328
 export const AQL =  [
-  { label: "物料代码", prop: "itemCode" },
+  { label: "物品代码", prop: "itemCode" },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "数量上限", prop: 'ceilingQty' },
   { label: "数量下限", prop: "floorQty" },
@@ -117,12 +117,12 @@ export const AQL =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物料清单信息 20230328
+// 物品清单信息 20230328
 export const Bom =  [
-  { label: "父物料号", prop: "product" },
-  { label: "子物料号", prop: 'component' },
-  { label: "子物料用量", prop: 'componentQty' },
-  { label: "子物料用量单位", prop: 'componentUom' },
+  { label: "父物品号", prop: "product" },
+  { label: "子物品号", prop: 'component' },
+  { label: "子物品用量", prop: 'componentQty' },
+  { label: "子物品用量单位", prop: 'componentUom' },
   { label: "开始时间", prop: "beginTime",type: "dateTime" },
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "ERP工序", prop: "erpOp" },
@@ -171,8 +171,8 @@ export const Customer =  [
 // 客户物品信息 20230328
 export const CustomerItem =  [
   { label: "客户代码", prop: 'customerCode' },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "客户物料代码", prop: "customerItemCode" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "客户物品代码", prop: "customerItemCode" },
   { label: "版本", prop: "version" },
   { label: "开始时间", prop: "beginTime", type: "dateTime" },
   { label: "结束时间", prop: "endTime" ,type: "dateTime" },
@@ -261,10 +261,10 @@ export const Supplier =  [
 ]
 // 供应商物品信息 20230328
 export const SupplierItem =  [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
   { label: "供应商代码", prop: 'supplierCode' },
-  { label: "供应商物料代码", prop: "supplierItemCode" },
+  { label: "供应商物品代码", prop: "supplierItemCode" },
   { label: "供应商简称", prop: "SupplierSimpleName" },
   { label: "版本", prop: "version" },
   { label: "备注", prop: 'remark' },
@@ -465,7 +465,7 @@ export const Location =  [
 ]
 // 库位零件关系 20230331
 export const ItemStoreRelation =  [
-  { label: "物料代码", prop: "itemCode" },
+  { label: "物品代码", prop: "itemCode" },
   { label: "储存关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
   { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" },
@@ -509,7 +509,7 @@ export const InventoryLocationCapacity =  [
 ]
 // 物品安全库存信息 20230328
 export const ItemSafetyStock = [
-  { label: "物料代码", prop: "itemCode" },
+  { label: "物品代码", prop: "itemCode" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "值", prop: "storeValue" },
@@ -599,7 +599,7 @@ export const ProductionLine =  [
 ]
 // 生产线零件关系 20230328
 export const ProductionLineItem =  [
-  { label: "物料代码", prop: "itemCode" },
+  { label: "物品代码", prop: "itemCode" },
   { label: "生产线编号", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
@@ -670,10 +670,10 @@ export const Shift =  [
 ]
 // 作业指导书信息 20230328
 export const ItemGuideBook = [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg" },
   { label: "步骤", prop: "step", type:'textarea', rows: 5 ,readonly:true },
   // -----------------------------------------------------------------------
@@ -1858,10 +1858,10 @@ export const productionReturnNote =  [
 // 标签查询 已调整 1
 export const labelsList =  [
   { label: "箱码", prop: "code" },
-  { label: "物料代码",  prop: 'itemCode' },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品代码",  prop: 'itemCode' },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -1878,8 +1878,8 @@ export const labelsList =  [
   { label: "供应商名称", prop: 'supplierName' },
   { label: "供应商简称", prop: 'supplierSimpleName' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "供应商物料代码", prop: 'supplierItemCode' },
-  { label: "供应商物料名称", prop: 'supplierItemName' },
+  { label: "供应商物品代码", prop: 'supplierItemCode' },
+  { label: "供应商物品名称", prop: 'supplierItemName' },
   { label: "完整条码文本", prop: "fullBarcodeString" },
   { label: "发货单号", prop: "asnNumber" },
   { label: "采购订单号", prop: "poNumber" },
@@ -1923,8 +1923,8 @@ export const InventoryInitialNote = [
 ]
 // 库存余额 1
  export const InventoryBalance = [
-  { label: "物料代码", prop: 'itemCode' },
-  { label: "物料名称", prop: "itemName" },
+  { label: "物品代码", prop: 'itemCode' },
+  { label: "物品名称", prop: "itemName" },
   { label: "库存数量", prop: "qty" },
   { label: "计量单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1942,8 +1942,8 @@ export const InventoryInitialNote = [
   { label: "上次盘点单号", prop: "lastCountPlanNumber" },
   { label: "上次盘点标签号", prop: "lastCountLabel" },
   // -----------------------------------------------------------------------
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
@@ -1966,9 +1966,9 @@ export const InventoryInitialNote = [
 // 库存事务 1
 export const InventoryTransaction = [
   { label: "事务编号", prop: "transNumber" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "事务分类", prop: "transType" ,type: "filter", filters: "TransTypeBase" },
   { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
   { label: "事务数量", prop: "qty" },
@@ -1981,7 +1981,7 @@ export const InventoryTransaction = [
   { label: "事务日期", prop: "transTime",type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "备注", prop: 'remark' },
   { label: "单位", prop: "uom" },
   { label: "标包数量", prop: 'stdPackQty' },
@@ -2012,10 +2012,10 @@ export const InventorySnapshot = [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "序号", prop: "serialNumber" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "箱码", prop: "packingCode" },
   { label: "批次", prop: "lot" },
   { label: "数量", prop: "qty" },
@@ -2047,9 +2047,9 @@ export const InventoryTransferLog = [
   { label: "生效日期", prop: "activeDate",type: "dateTime" },
   { label: "从状态", prop: "fromStatus", type: "filter", filters: "requestStatus" },
   { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
   { label: "到货数量", prop: "qty" },
   { label: "到货单位", prop: "uom" },
   { label: "批次", prop: 'toLot' },
@@ -2066,7 +2066,7 @@ export const InventoryTransferLog = [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "任务编号", prop: "jobNumber" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
@@ -2095,8 +2095,8 @@ export const InventoryTransferLog = [
 ]
 // 预计出库存 1
 export const expectIn = [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位代码", prop: "locationCode" },
@@ -2111,8 +2111,8 @@ export const expectIn = [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "序号", prop: "serialNumber" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: 'lot' },
   { label: "单位", prop: "uom" },
   { label: "创建者Id", prop: "creatorId" },
@@ -2128,8 +2128,8 @@ export const expectIn = [
 ]
 // 预计入库存 1
 export const expectOut = [
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位代码", prop: "locationCode" },
@@ -2144,8 +2144,8 @@ export const expectOut = [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "序号", prop: "serialNumber" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: 'lot' },
   { label: "单位", prop: "uom" },
   { label: "创建者Id", prop: "creatorId" },
@@ -2719,7 +2719,7 @@ export const CountPlan = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "事务代码", prop: "tenantId" },
-  { label: "物料代码JSON", prop: 'jsonItemCodes' },
+  { label: "物品代码JSON", prop: 'jsonItemCodes' },
   { label: "库位JSON", prop: 'jsonLocationCodes' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "id", prop: 'id' },

From 9cc989c4f3066af50e3939a2bc2f6fef640d73e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 3 Apr 2023 14:03:14 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=89=A9=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      |  6 ++---
 .../components/commonTabel-drawer/index.vue   |  6 ++---
 fe/PC/src/filters/excelOrReportsOption.js     |  4 +--
 fe/PC/src/filters/options.js                  |  2 +-
 fe/PC/src/filters/status.js                   |  8 +++---
 fe/PC/src/mixins/printMixin.js                | 14 +++++-----
 fe/PC/src/utils/primarySearchOption/index.js  |  2 +-
 fe/PC/src/utils/quicklySearchOption/index.js  |  2 +-
 fe/PC/src/views/basicData/BomManage/Bom.vue   | 26 +++++++++----------
 .../basicData/CustomerManage/CustomerItem.vue | 12 ++++-----
 .../basicData/CustomerManage/Project.vue      |  4 +--
 fe/PC/src/views/basicData/ItemsManage/AQL.vue |  8 +++---
 .../views/basicData/ItemsManage/ItemBasic.vue | 20 +++++++-------
 .../basicData/ItemsManage/ItemCategory.vue    |  8 +++---
 .../views/basicData/ItemsManage/ItemPack.vue  |  6 ++---
 .../basicData/ItemsManage/ItemQuality.vue     |  8 +++---
 .../basicData/SupplierManage/SupplierItem.vue | 12 ++++-----
 .../WarehouseManage/ItemSafetyStock.vue       |  4 +--
 .../WarehouseManage/ItemStoreRelation.vue     |  4 +--
 .../basicData/WorkshopManage/ProdLineItem.vue |  4 +--
 .../itemGuideBookManage/itemGuideBook.vue     | 10 +++----
 .../deliver/DeliverJob-msQuery.vue            |  4 +--
 .../productionReturn/returnJob.vue            |  8 +++---
 .../Count/CountJob-msQuery.vue                |  6 ++---
 .../InventoryQuery/InventoryBalance.vue       |  6 ++---
 .../InventoryTransferLog-Query.vue            |  6 ++---
 .../PartiallyPreparedProducts.vue             | 16 ++++++------
 .../RecycledMaterialsLabel.vue                | 22 ++++++++--------
 .../productionReturnLabel.vue                 | 20 +++++++-------
 fe/PC/src/views/labelManage/RepairLabels.vue  |  2 +-
 .../automaticCallJob-msQuery.vue              | 12 ++++-----
 .../manualMaterialRequest/IssueJob.vue        | 12 ++++-----
 .../PurchaseReceiptJob-msQuery.vue            |  6 ++---
 .../purchaseReceipt/SupplierAsn-msQuery.vue   |  4 +--
 .../purchaseReturn/returnJob.vue              |  4 +--
 .../quality/InspectNotice.vue                 | 20 +++++++-------
 36 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 27ad86c46..7d96a106d 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -286,7 +286,7 @@ export function byItem(itemCode, url ){
   })
 }
 
-// 详情tabs页 通过父物料号 获取列表
+// 详情tabs页 通过父物品号 获取列表
 export function byProduct(product, url ){
   return request({
     url: baseURL + url + '/get-list-by-product',
@@ -295,7 +295,7 @@ export function byProduct(product, url ){
   })
 }
 
-// 详情tabs页 通过子物料号 获取列表
+// 详情tabs页 通过子物品号 获取列表
 export function byComponent(component, url ){
   return request({
     url: baseURL + url + '/get-list-by-component',
@@ -339,7 +339,7 @@ export function relationByLocationCode(locationCode, url ){
   })
 }
 
-// 详情tabs页 通过子物料号 获取子层级列表
+// 详情tabs页 通过子物品号 获取子层级列表
 export function byComponentCJ(component, url ){
   return request({
     url: baseURL + url + '/get-list-by-component-with-tree',
diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue
index 0208b1ea7..c45b70de8 100644
--- a/fe/PC/src/components/commonTabel-drawer/index.vue
+++ b/fe/PC/src/components/commonTabel-drawer/index.vue
@@ -134,7 +134,7 @@
               <slot></slot>
             </template>		
           </umyTable>
-          <!-- 自定义扩展（tree）的形式 目前使用位置：物料清单信息-子物料层级  todo:待优化-->
+          <!-- 自定义扩展（tree）的形式 目前使用位置：物品清单信息-子物品层级  todo:待优化-->
           <currenTable
             v-if="
               scope.value == zdyValue &&
@@ -456,7 +456,7 @@ export default {
                 parent.tableLoading = false
               })
             } 
-            // 基础数据管理-物料清单维护-物料清单信息-详情-子物料层级
+            // 基础数据管理-物品清单维护-物品清单信息-详情-子物品层级
             else if (item.functionName == 'byComponentCJ') {
               this.otherData = []
               byComponentCJ({component:this.propsData.component}, item.url).then(res => {
@@ -545,7 +545,7 @@ export default {
         }
       })
     },
-    // 递归 物料子级层级
+    // 递归 物品子级层级
     recursion(val){
       val.forEach(item => {
         if(item.componentDTOs) {
diff --git a/fe/PC/src/filters/excelOrReportsOption.js b/fe/PC/src/filters/excelOrReportsOption.js
index b24906cbb..7442740b1 100644
--- a/fe/PC/src/filters/excelOrReportsOption.js
+++ b/fe/PC/src/filters/excelOrReportsOption.js
@@ -12,11 +12,11 @@ export const supplierAsnExcel = {
     shipDate:"发货日期",
     details:{
         projectCode:"明细-项目编号",
-        itemCode:"明细-物料代码",
+        itemCode:"明细-物品代码",
         ctype:"明细-类型",
         recommendErpCode:"明细-指定ERP储位",
         qty:"明细-发货数量",
-        uom:"明细-物料单位",
+        uom:"明细-物品单位",
         lot:"明细-生产批次",
         produceDate:"明细-生产时间",
         expireDate:"明细-过期时间",
diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js
index 9a226bfd1..7632bcbc1 100644
--- a/fe/PC/src/filters/options.js
+++ b/fe/PC/src/filters/options.js
@@ -126,7 +126,7 @@ export function Roles(val){
     // "Warehouse": "仓库",
     // "Area": "区域",
     // "AreaItem": "区域零件",
-    // "Bom": "物料清单",
+    // "Bom": "物品清单",
     // "InterfaceCalendar": "日历接口",
     // "Calendar": "日历",
     // "Company": "公司",
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index eab6678b9..4a91aaedb 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -1592,9 +1592,9 @@ export function SupplierAsnCtypeStaBack(name){
       value: '原料',
       label: '原料',
     },
-    '物料': {
-      value: '物料',
-      label: '物料',
+    '物品': {
+      value: '物品',
+      label: '物品',
     },
     '半成品': {
       value: '半成品',
@@ -1629,7 +1629,7 @@ export function SupplierAsnCtypeStaBack(name){
     },
     3: {
       value: 3,
-      label: '物料',
+      label: '物品',
       UK: 'MAT'
     },
     4: {
diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js
index 01d4b360f..2cd2e93da 100644
--- a/fe/PC/src/mixins/printMixin.js
+++ b/fe/PC/src/mixins/printMixin.js
@@ -19,7 +19,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
     let _options = options ? options : {}
     propsData.details.forEach((item,key) => {
         _printData["boxlabel"].push({
-            "title":propsData[_options.title] || propsData.title || "FATY 物料发运单",//title
+            "title":propsData[_options.title] || propsData.title || "FATY 物品发运单",//title
             "contacts": propsData[_options.contacts] || propsData.contacts,//客户名称
             "customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
             "supplierCode": propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码
@@ -36,8 +36,8 @@ export function initPrintPackingCodeData(propsData,options,name,url){
                     "produceDate": item[_options.produceDate] || item.produceDate,//生产时间
                     "lot": item[_options.lot] || item.lot,//生产批次
                     "locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位
-                    "itemName": item[_options.itemName] || item.itemName,//物料名称
-                    "itemCode": item[_options.itemCode] || item.itemCode,//物料代码（ERP号）
+                    "itemName": item[_options.itemName] || item.itemName,//物品名称
+                    "itemCode": item[_options.itemCode] || item.itemCode,//物品代码（ERP号）
                     "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量
                     "qty": item[_options.qty] || item.qty,//要货数量
                     "packingCode": item[_options.packingCode] || item.packingCode,//条形码
@@ -127,7 +127,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
                     _index = Number(_index) + 1
                 }
             }
-            let _title = propsData ? "FATY 物料发运单" : ""
+            let _title = propsData ? "FATY 物品发运单" : ""
             _label['title'+Number(key2 + 1)]=propsData[_options.title] || propsData.title || _title,//title
             _label['contacts'+Number(key2 + 1)]= propsData[_options.contacts] || propsData.contacts,//客户名称
             _label['customerAddressCode'+Number(key2 + 1)]=propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
@@ -144,7 +144,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
             _label['produceDate'+Number(key2 + 1)] = item[_options.produceDate] || item2.produceDate;//生产时间
             _label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次
             _label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位
-            _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物料代码（ERP号）
+            _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号）
             _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量
             _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量
             _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
@@ -273,7 +273,7 @@ const printEnumOption = {
 // 使用位置:自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue) 
 // 使用位置:人工发料任务 (IssueJob.vue)  | 人工发料记录 (IssueNote.vue)
 // 单号:number; 制表日:creationTime; 部门名称:deptName; 
-// 物品代码:itemCode; 物品名称:itemName; 物料描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
+// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
 // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
 
 // xbctl.rdlx  使用参数  xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段
@@ -282,7 +282,7 @@ const printEnumOption = {
 // zjfl.rdlx  使用参数
 // 使用位置:直接发料记录 (directIssueNote.vue)
 // 单号:number; 制表日:creationTime; 部门名称:deptName; 
-// 物品代码:itemCode; 物品名称:itemName; 物料描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
+// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
 // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
 
 // hslrkd.rdlx  使用参数
diff --git a/fe/PC/src/utils/primarySearchOption/index.js b/fe/PC/src/utils/primarySearchOption/index.js
index 294aaad6f..92b65f505 100644
--- a/fe/PC/src/utils/primarySearchOption/index.js
+++ b/fe/PC/src/utils/primarySearchOption/index.js
@@ -2,7 +2,7 @@
 // 示例配置  primarySearchOptionExample
 export const ItemBasic = [
   // type == input
-  { type: "input", label: "物料编码", prop: "code", action:"Like"},
+  { type: "input", label: "物品编码", prop: "code", action:"Like"},
   // type == select 枚举options(filters/status.js)
   { type: "select", label: "状态", prop: "status", options: "itemStatus"},
   // type == select 自定义options(使用userOptions参数)
diff --git a/fe/PC/src/utils/quicklySearchOption/index.js b/fe/PC/src/utils/quicklySearchOption/index.js
index c7ab75917..d3d992209 100644
--- a/fe/PC/src/utils/quicklySearchOption/index.js
+++ b/fe/PC/src/utils/quicklySearchOption/index.js
@@ -3,7 +3,7 @@
 // export const primarySearchOptionExample = {
 //   action:"Like",//筛选方式：可不写，默认等于== 
 //   prop:'code',//接口要查的参数
-//   placeholder:'请输入物料代码',//placeholder
+//   placeholder:'请输入物品代码',//placeholder
 // }
 
 // 原料管理
diff --git a/fe/PC/src/views/basicData/BomManage/Bom.vue b/fe/PC/src/views/basicData/BomManage/Bom.vue
index 7c237d625..557532d5f 100644
--- a/fe/PC/src/views/basicData/BomManage/Bom.vue
+++ b/fe/PC/src/views/basicData/BomManage/Bom.vue
@@ -149,14 +149,14 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "父物料号", prop: "product", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "父物品号", prop: "product", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "子物料号", prop: "component", optionsLabel: "name", optionsValue: "code", 
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "filterSelect", label: "子物品号", prop: "component", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
-        { type: "input", label: "子物料用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
+        { type: "input", label: "子物品用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
         { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
@@ -168,10 +168,10 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "父物料号", prop: "product",disabled:"true",  colSpan: 12 },
-        { type: "input", label: "子物料号", prop: 'component', disabled:"true", colSpan: 12 },
-        { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
-        { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
+        { type: "input", label: "父物品号", prop: "product",disabled:"true",  colSpan: 12 },
+        { type: "input", label: "子物品号", prop: 'component', disabled:"true", colSpan: 12 },
+        { type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
+        { type: "input", label: "子物品用量单位", prop: 'componentUom', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
         { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
@@ -205,14 +205,14 @@ export default {
           name: 'xq'
         },
         {
-          label: "父物料信息",
+          label: "父物品信息",
           name: 'fwlxx',
           url: 'basedata/bom',
           tableColumns: 'BomInner',
           functionName: 'byProduct'
         },
         {
-          label: "子物料信息",
+          label: "子物品信息",
           name: 'zwlxx',
           url: 'basedata/bom',
           tableColumns: 'BomInner',
@@ -220,7 +220,7 @@ export default {
         }
         ,
         // {
-        //   label: "子物料层级",
+        //   label: "子物品层级",
         //   name: 'zwlcj',
         //   url: 'basedata/bom',
         //   tableColumns: 'Bom',
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
index 8eb23c27f..c253405ae 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
@@ -156,15 +156,15 @@ export default {
         reportGroupId: [],
       },
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         
         { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
         focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
-        searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
+        searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
         
-        { type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
         { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
@@ -174,9 +174,9 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
         { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/CustomerManage/Project.vue b/fe/PC/src/views/basicData/CustomerManage/Project.vue
index 9ed42b4e4..4c54760f2 100644
--- a/fe/PC/src/views/basicData/CustomerManage/Project.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/Project.vue
@@ -153,7 +153,7 @@ export default {
       CreateForm: [
         { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "项目代码", prop: 'code', validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "项目名称", prop: 'name', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -164,7 +164,7 @@ export default {
       editForm: [
         { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.editFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "项目代码", prop: 'code', disabled:"true", colSpan: 12 },
         { type: "input", label: "项目名称", prop: 'name', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue
index 2ab31b1fe..8b16796f7 100644
--- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue
@@ -186,9 +186,9 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
@@ -201,9 +201,9 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.editFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'SupplierBasic', '供应商选择', this.editFormData) }, colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
index 42e46e8df..dc9aa89d9 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
@@ -202,10 +202,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物料代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
-        { type: "input", label: "物料名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 },
-        { type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
+        { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
+        { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
         { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
@@ -230,15 +230,15 @@ export default {
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
         { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物料", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
-        { type: "input", label: "物料名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 },
-        { type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
+        { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
+        { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
         { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
@@ -263,7 +263,7 @@ export default {
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
         { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物料", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
index 8087f3b4b..6f7363db5 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
@@ -142,17 +142,17 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "分类编号", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/category")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物料分类选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物品分类选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
         { type: "input", label: "分类编号", prop: "categoryCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
index 6bf84fb62..040406501 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
@@ -151,9 +151,9 @@ export default {
         { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
         { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -162,7 +162,7 @@ export default {
         { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
         { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
         { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
index e903fab05..8633482a7 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
@@ -150,10 +150,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物料名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
+        { type: "filterSelect", label: "物品名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
@@ -166,8 +166,8 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "input",label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "name", colSpan: 12,disabled:"true", },
+        { type: "input",label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
         { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
index 93639f132..768d06abc 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
@@ -158,20 +158,20 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
+        { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "供应商代码", prop: "supplierCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
         { type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
index 01c68e688..b36e54f1a 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
@@ -185,7 +185,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
@@ -201,7 +201,7 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
index 5b24b409f..08ed7a0d9 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
@@ -186,7 +186,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
@@ -203,7 +203,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
index e3a6fd4e1..c0690d096 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
@@ -149,7 +149,7 @@ export default {
         type: []
       },
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
@@ -158,7 +158,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物料代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
diff --git a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
index 0f3f0e5b5..541b34d24 100644
--- a/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
+++ b/fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
@@ -158,17 +158,17 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
         { type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
         { type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: 'itemCode', disabled: true, colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'itemCode', disabled: true, colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
         { type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
         { type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },
diff --git a/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue b/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue
index 712866778..17c7b9885 100644
--- a/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue
@@ -143,7 +143,7 @@ export default {
           label: "实际箱标签",
           prop: "handledPackingCode",
         },
-        { label: "物料代码", prop: "itemCode", },
+        { label: "物品代码", prop: "itemCode", },
         { type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "handledQty", showProp: "qty", },
         { type: "objectInput", label: "实际单位", prop: "handledQty", showProp: "uom", },
         { type: "object", label: "推荐数量", prop: "recomendQty", showProp: "qty", },
@@ -154,7 +154,7 @@ export default {
         { type: "objectDateTimeInput", label: "实际日期", prop: "handledBatch", showProp: "produceDate", },
         { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", },
         { type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品名称",  prop: "itemName" },
         { label: "包装数量", prop: "stdPackQty", },
         { label: "包装单位", prop: "stdPackUom", },
         { label: "备注", prop: 'remark', },
diff --git a/fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue b/fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue
index 7806b1cda..02c701d38 100644
--- a/fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue
+++ b/fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue
@@ -121,8 +121,8 @@ export default {
       //     label: "箱标签",
       //     prop: "handledPackingCode",
       //   },
-      //   { label: "物料代码", prop: "itemCode", },
-      //   { label: "物料名称",  prop: "itemName" },
+      //   { label: "物品代码", prop: "itemCode", },
+      //   { label: "物品名称",  prop: "itemName" },
       //   // { type: "objectInput", rules: detailsRules.detailsRules, label: "供应商批次", prop: "supplierBatch",},
       //   // { type: "objectDateTimeInput", rules: detailsRules.detailsRules, label: "生产日期", prop: "produceDate",},
       //   { type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
@@ -130,8 +130,8 @@ export default {
       //   { type: "input", rules: detailsRules.detailsRules, label: "实际库位", prop: "handledLocationCode", },
       //   { label: "推荐库位", prop: "recommendLocationCode", },
       //   // { label: "托标签", prop: "handledContainerCode", },
-      //   // { label: "物料名称1",  prop: "itemDesc1" },
-      //   // { label: "物料名称2",  prop: "itemDesc2" },
+      //   // { label: "物品名称1",  prop: "itemDesc1" },
+      //   // { label: "物品名称2",  prop: "itemDesc2" },
       //   { label: "包装单位", prop: "stdPackUom", },
       //   { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom", },
       //   { label: "订单号", prop: "poNumber", },
diff --git a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
index 9a41b5b06..baaecb443 100644
--- a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
+++ b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
@@ -126,7 +126,7 @@ export default {
       ],
       handleDetailsTableColumns: [
         { label: "箱标签", prop: "packingCode", },
-        { label: "物料代码", prop: "itemCode", },
+        { label: "物品代码", prop: "itemCode", },
         { type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "countQty", showProp: "qty", },
         { type: "objectInput", label: "实际单位", prop: "countQty", showProp: "uom", },
         { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
@@ -134,8 +134,8 @@ export default {
         { type: "input", rules: detailsRules.detailsRules, label: "库位编号", prop: "locationCode", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", },
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { label: "供应商批次", prop: "supplierBatch", },
         { label: "备注", prop: 'remark', },
       ],
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
index 8c9faacec..d33e8be87 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
@@ -147,13 +147,13 @@ export default {
         { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
         { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
         { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
-        { type: "input", label: "物料代码", prop: 'itemCode', colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
         { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "itemName", disabled:true, colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 },
         { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 },
         { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 },
         { type: "input", label: "箱标签", prop: "packingCode", disabled:true, colSpan: 12 },
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
index fdc52ddca..bd092b93e 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
@@ -168,7 +168,7 @@ export default {
         { type: "radio", label: "转移方式", prop: "queryType",radio:'queryTypeRadio', value: '1', colSpan: 9 },
         { type: "radio", label: "清除箱码", prop: "clearPackCode",radio:'radio', value: '2', colSpan: 5 },
         { type: "radio", label: "清除批次", prop: "clearLot",radio:'radio', value: '2', colSpan: 5 },
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "itemCode", optionsValue: "packingCode", 
@@ -185,8 +185,8 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, colSpan: 12 },
       ],
       myTableColumns:[
-        {label: "物料代码", prop: "itemCode", width:'180px'},
-        {label: "物料名称", prop: "itemName", width:'150px'},
+        {label: "物品代码", prop: "itemCode", width:'180px'},
+        {label: "物品名称", prop: "itemName", width:'150px'},
         {label: "来源库位", prop: "locationCode",},
         {label: "箱码", prop: "packingCode", width:'110px'},
         {label: "批次", prop: "lot", width:'110px'},
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
index 382eff4c8..6d4abe1ac 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
@@ -91,7 +91,7 @@ export default {
         {title:"预览信息"},
         {title:"打印"},
       ],
-      selectItemInfo:{},//已选物料信息
+      selectItemInfo:{},//已选物品信息
       // 筛选数据
       selectData:{
         itemCode:"",
@@ -104,18 +104,18 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
             {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"半成品"}
           ])},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,[
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
             {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"半成品"}
           ]) }, 
           colSpan: 12,
         },
-        { type: "input",disabled:true,label: "物料名称", prop: "itemName",  colSpan: 12 },
+        { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
         { type: "input",disabled:true,label: "标包数量", prop: "packQty",  colSpan: 12 },
         { type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12},
@@ -124,15 +124,15 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物料代码", prop: "itemCode", },
-        { width:"auto",label: "物料名称", prop: "itemName", },
+        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "标包数量", prop: "packQty", },
         { width:"auto",label: "标包单位", prop: "packUom", },
@@ -161,7 +161,7 @@ export default {
       this.$refs.steps_bcpsj.returnFirstActive()
       this.$refs.form_bcpsj.getDom().resetFields();
     },
-    // 第一部物料代码点击拉取
+    // 第一部物品代码点击拉取
     detailsDataPush (val) {
       if(val[1].prop == "itemCode"){
         this.pageLoading = true
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
index 1bbc07893..6d3d37f06 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
@@ -107,8 +107,8 @@ export default {
         {title:"预览信息",cancle:()=>{return _this.sencondPre()}},
         {title:"打印"},
       ],
-      selectItemInfo:{},//已选物料信息
-      selectSupplierInfo:{},//已选物料信息对应的供应商信息
+      selectItemInfo:{},//已选物品信息
+      selectSupplierInfo:{},//已选物品信息对应的供应商信息
       // 默认筛选数据
       defaultSelectData:{
         itemCode:"",
@@ -130,16 +130,16 @@ export default {
       // 筛选条件
       selectForm:[
         { 
-          type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+          type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", 
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件
           )},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}]  //原回收料的条件
           )}, 
           colSpan: 12,
         },
-        { type: "input",disabled:true,label: "物料名称", prop: "itemName",  colSpan: 12 },
+        { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
         { type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
         { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
@@ -149,7 +149,7 @@ export default {
         { type: "input",  label: "批次", prop: "lot", colSpan: 12 },
         { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
             this.isFilter("itemCode", this.selectData.itemCode)
@@ -160,15 +160,15 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" },],
+        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
         // lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
       },
       // 表格头部信息
       flexTableColumns:[
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称", prop: "itemName", },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称", prop: "itemName", },
         { label: "批次", prop: "lot", },
         // { width:"auto",label: "标包数量", prop: "packQty", },
         // { width:"auto",label: "标包单位", prop: "packUom", },
@@ -206,9 +206,9 @@ export default {
       this.$refs.steps_create.returnFirstActive()
       this.$refs.form_create.getDom().resetFields();
     },
-    // 第一部物料代码点击拉取
+    // 第一部物品代码点击拉取
     detailsDataPush (val) {
-      // 点击物料
+      // 点击物品
       if(val[1].prop == "itemCode"){
         this.canForm.canType = null
         this.selectItemInfo = val[0];
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
index 696eca9d5..a5590b1e2 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
@@ -92,7 +92,7 @@ export default {
         {title:"预览信息"},
         {title:"打印"},
       ],
-      selectItemInfo:{},//已选物料信息
+      selectItemInfo:{},//已选物品信息
       // 筛选数据
       selectData:{
         itemCode:"",
@@ -107,20 +107,20 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ])},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,[
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ]) }, 
           colSpan: 12,
         },
-        { type: "input",disabled:true,label: "物料名称", prop: "itemName",  colSpan: 12 },
+        { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
             this.isFilter("itemCode", this.selectData.itemCode)
@@ -129,7 +129,7 @@ export default {
         },
         { 
           type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
           colSpan: 12,
         },
@@ -140,7 +140,7 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
         supplierCode: [{ required: true, trigger: "change", message: "供应商代码不能为空" }],
         poNumber: [{ required: true, trigger: "change", message: "采购订单号不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
@@ -149,8 +149,8 @@ export default {
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物料代码", prop: "itemCode", },
-        { width:"auto",label: "物料名称", prop: "itemName", },
+        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "订单号", prop: "poNumber", },
         { width:"auto",label: "供应商代码", prop: "supplierCode", },
@@ -218,7 +218,7 @@ export default {
         this.selectData.poNumberInfo = val[0]
       }
     },
-    // 第一部物料代码点击拉取
+    // 第一部物品代码点击拉取
     filterClearHandle(val){
       if(val[0].prop == "itemCode"){
         this.selectData.supplierCode = ""
diff --git a/fe/PC/src/views/labelManage/RepairLabels.vue b/fe/PC/src/views/labelManage/RepairLabels.vue
index 8cd1ffc3a..ce86eab32 100644
--- a/fe/PC/src/views/labelManage/RepairLabels.vue
+++ b/fe/PC/src/views/labelManage/RepairLabels.vue
@@ -128,7 +128,7 @@ export default {
       flexTableData:[],
       // 箱码表格头部信息
       flexTableColumns:[
-        { label: "物料代码", prop: "itemCode", width:"auto" },
+        { label: "物品代码", prop: "itemCode", width:"auto" },
         { label: "物品名称", prop: "itemName", width:"auto" },
         { label: "箱标签", prop: "packingCode", width:"auto" },
         { label: "数量", prop: "qty", width:"auto" },
diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
index 415a504df..9476d8d50 100644
--- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
@@ -118,8 +118,8 @@ export default {
         // },
       ],
       handleDetailsTableColumns: [
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { label: "实际库位", prop: "handledLocationCode", },
         { label: "推荐库位", prop: "recommendLocationCode", },
         { label: "实际箱标签", prop: "handledPackingCode", },
@@ -266,7 +266,7 @@ export default {
           reject()
         } else {
           if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物料发到目标库位?', '提示', {
+            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -276,7 +276,7 @@ export default {
               reject()
             })
           } else {
-            that.$confirm('是否要将物料发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
+            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -386,7 +386,7 @@ export default {
             }
             getPageList(params, 'basedata/item-basic').then(res => {
               if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物料信息!')
+                this.$errorMsg('未查询到该物品信息!')
               } else {
                 let findRs = that.CreateFormData.details.find(item => (
                   item.code == that.CreateFormData.itemCode
@@ -419,7 +419,7 @@ export default {
               }
               for (var i = 0; i < this.CreateFormData.details.length; i++) {
                 if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物料[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
+                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
                   return
                 } else {
                   params.details.push({
diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
index c8bd313f1..e2b13c917 100644
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
@@ -118,8 +118,8 @@ export default {
         },
       ],
       handleDetailsTableColumns: [
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { label: "实际库位", prop: "handledLocationCode", },
         { label: "推荐库位", prop: "recommendLocationCode", },
         { label: "实际箱标签", prop: "handledPackingCode", },
@@ -267,7 +267,7 @@ export default {
           reject()
         } else {
           if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物料发到目标库位?', '提示', {
+            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -277,7 +277,7 @@ export default {
               reject()
             })
           } else {
-            that.$confirm('是否要将物料发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
+            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -387,7 +387,7 @@ export default {
             }
             getPageList(params, 'basedata/item-basic').then(res => {
               if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物料信息!')
+                this.$errorMsg('未查询到该物品信息!')
               } else {
                 let findRs = that.CreateFormData.details.find(item => (
                   item.code == that.CreateFormData.itemCode
@@ -420,7 +420,7 @@ export default {
               }
               for (var i = 0; i < this.CreateFormData.details.length; i++) {
                 if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物料[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
+                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
                   return
                 } else {
                   params.details.push({
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
index 14149e2b9..5eb434366 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
@@ -196,7 +196,7 @@ export default {
         formFile: [],
       },
       uploadDialogForm: [
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12, },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12, },
         { type: "objectSelect", label: "不合格原因", prop: "item", showProp: "failedReason", options: "purchaseReceiptFailedReason", colSpan: 12,  },
         { type: "objectTextarea", label: "质量缺陷", prop: "item", showProp: "massDefect"},
         { type: "uploadPictureCard", label: "上传图片", prop: "formFile", limit: 3, picExt:'.jpg,.png', multiple:true}
@@ -251,8 +251,8 @@ export default {
         // }
       ],
       handleDetailsTableColumns: [
-        { label: "物料代码", prop: "itemCode" ,fixed:"left",width:"auto"},
-        { label: "物料名称", prop: "itemName",width:"auto"},
+        { label: "物品代码", prop: "itemCode" ,fixed:"left",width:"auto"},
+        { label: "物品名称", prop: "itemName",width:"auto"},
         { label: "箱标签", prop: "recommendPackingCode",width:"auto"},
         { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty",width:"auto"},
         { type: "object", label: "单据数量", prop: "recommendQty", showProp: "qty" ,width:"auto"},
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
index 7a3fdb889..df0664e9a 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
@@ -144,7 +144,7 @@ export default {
       if(index == '1'){
         let _result = data.results;
         let _data = [];
-        // 查询物料代码是否重复
+        // 查询物品代码是否重复
         // let _itemArr = [];
         // let _hasSame = false
         // data.results.forEach(item=>{
@@ -155,7 +155,7 @@ export default {
         //   }
         // })
         // if(_hasSame){
-        //   this.$message.error("模板中存在相同物料代码，请修改模板重新导入")
+        //   this.$message.error("模板中存在相同物品代码，请修改模板重新导入")
         //   return 
         // }
         // 查重重组
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
index fd704c0f9..5e4c7c742 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
@@ -129,8 +129,8 @@ export default {
           label: "箱标签",
           prop: "handledPackingCode",
         },
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
         { label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "实际库位", prop: "handledLocationCode", },
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue
index ae1581ac1..b62848a04 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue
@@ -337,8 +337,8 @@ export default {
         }],
       },
       inspectForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 12  },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12  },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
         { type: "input", label: "箱码", prop: "packingCode", disabled: true, colSpan: 12 },
         { type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },
         { type: "input", label: "尺寸", prop: "volume", colSpan: 12  },
@@ -385,8 +385,8 @@ export default {
       //   }]
       // },
       // supplierForm: [
-      //   { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 12  },
-      //   { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12  },
+      //   { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+      //   { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
       //   { type: "input", label: "描述", prop: "lot", disabled: true, colSpan: 12 },
       //   { type: "input", label: "外观", prop: "jysl", disabled: true, colSpan: 12  },
       //   { type: "input", label: "尺寸", prop: "jysl", disabled: true, colSpan: 12  },
@@ -450,8 +450,8 @@ export default {
       },
       // 质检详情页面-form字段
       inspectNoticeDetailsForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 8  },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 8  },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 8  },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 8  },
         { type: "input", label: "单位", prop: "stdPackUom", disabled: true,  colSpan: 8  },
         // { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true,  colSpan: 8  },
         { type: "input", label: "生产批次", prop: "lot", disabled: true, colSpan: 8 },
@@ -473,8 +473,8 @@ export default {
       ],
       inspectNoticeDetailsTableColumns: [
         { label: "箱码", prop: "packingCode", width:'100%' },
-        { label: "物料代码", prop: "itemCode", width:'100%'  },
-        { label: "物料名称", prop: "itemName", width:'100%' },
+        { label: "物品代码", prop: "itemCode", width:'100%'  },
+        { label: "物品名称", prop: "itemName", width:'100%' },
         { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
         { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus", width:'100%' },
@@ -654,8 +654,8 @@ export default {
                   }
                 }
                 if (this.inspectNoticeDetailsFormData.sampleQty == 0) {
-                  this.$alert('没有找到当前物料代码对应的质检标准！')
-                //   this.$confirm('没有找到当前物料代码对应的质检标准！, 是否继续?', '提示', {
+                  this.$alert('没有找到当前物品代码对应的质检标准！')
+                //   this.$confirm('没有找到当前物品代码对应的质检标准！, 是否继续?', '提示', {
                 //   confirmButtonText: '继续',
                 //   cancelButtonText: '取消',
                 //   type: 'warning'

From b3839ff9f20ceed3788ac47d509903d43d19cfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 3 Apr 2023 14:37:37 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=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/tableColumns/index.js         | 24 +++++++--------
 fe/PC/src/utils/tabsDesTions/index.js         | 30 +++++++++----------
 .../CustomerManage/CustomerAddress.vue        |  8 ++---
 .../basicData/CustomerManage/CustomerItem.vue |  8 ++---
 .../basicData/DictionaryManage/Category.vue   |  4 +--
 fe/PC/src/views/basicData/ItemsManage/AQL.vue |  4 +--
 .../views/basicData/ItemsManage/ItemBasic.vue | 24 +++++++--------
 .../basicData/ItemsManage/ItemCategory.vue    |  4 +--
 .../basicData/ItemsManage/ItemQuality.vue     |  4 +--
 .../basicData/SupplierManage/SupplierTime.vue |  4 +--
 .../views/basicData/WarehouseManage/Dock.vue  |  4 +--
 .../Count/CountJob-msQuery.vue                |  2 +-
 12 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 5f6e0b58b..7cf490cdd 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -20,9 +20,9 @@ export const ItemBasic = [
   { label: "采购件", prop: 'canBuy', type: "filter", filters: "whetherOrNot" },
   { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
-  { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "产品类", prop: 'productLine' },
-  { label: "E-LEVEL等级", prop: 'elevel' },
+  { label: "Elevel", prop: 'elevel' },
   // { label: "物品分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
   { label: "颜色", prop: "color" },
   // ---------------------------------------
@@ -36,8 +36,8 @@ export const ItemBasic = [
   { label: "项目", prop: "project" },
   { label: "版本", prop: "version" },
   { label: "工程变革", prop: "eco" },
-  { label: "有效期值", prop: "validity" },
-  { label: "有效期", prop: "validityUnit", type: "filter", filters: "validityUnit" },
+  { label: "有效期", prop: "validity" },
+  { label: "有效期单位", prop: "validityUnit", type: "filter", filters: "validityUnit" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "备注", prop: "remark" },
 
@@ -81,7 +81,7 @@ export const ItemCategory = [
     fixed: "left",
     type: "name"
   },
-  { label: "分类编号", prop: 'categoryCode' },
+  { label: "分类代码", prop: 'categoryCode' },
   { label: "分类值", prop: 'value' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
@@ -267,8 +267,8 @@ export const CustomerItem = [
   },
   { label: "客户物品代码", prop: "customerItemCode" },
   { label: "物品代码", prop: "itemCode" },
-  { label: "包装数量", prop: "customerPackQty" },
-  { label: "包装单位", prop: "customerPackUom" },
+  { label: "客户包装数量", prop: "customerPackQty" },
+  { label: "客户包装数量单位", prop: "customerPackUom" },
   { label: "开始时间", prop: "beginTime", type: "dateTime" },
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "备注", prop: 'remark' },
@@ -295,8 +295,8 @@ export const CustomerAddress = [
   },
   { label: "客户地址名称", prop: "name" },
   { label: "客户代码", prop: "customerCode" },
-  { label: "仓库编号", prop: "warehouseCode" },
-  { label: "库位编号", prop: "locationCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "库位代码", prop: "locationCode" },
   { label: "城市", prop: "city" },
   { label: "地址", prop: "address" },
   { label: "联系人", prop: "contact" },
@@ -411,7 +411,7 @@ export const SupplierTimeWindow = [
     type: "name"
   },
   { label: "供应商名称", prop: "supplierName" },
-  { label: "当前时间", prop: "week", type: "filter", filters: "week" },
+  { label: "当前星期", prop: "week", type: "filter", filters: "week" },
   { label: "时间窗口", prop: "timeSlot" },
   // ------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -929,7 +929,7 @@ export const Dict = [
 // 分类信息 20230328
 export const Category = [
   {
-    label: "分类编号",
+    label: "分类代码",
     prop: "code",
     fixed: "left",
     type: "name"
@@ -1407,7 +1407,7 @@ export const PutawayNote =  [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "供应商编号", prop: 'supplierCode' },
+  { label: "供应商代码", prop: 'supplierCode' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
   { label: "到货单号", prop: 'arriveNoticeNumber' },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index a2261fdd9..24d5c47b9 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -14,8 +14,8 @@ export const ItemBasic =  [
   { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
   // { label: "产品类", prop: 'productLine' },
-  { label: "有效值", prop: "validity" },
-  { label: "有效期", prop: "validityUnit", type: "filter", filters: "validityUnit" },
+  { label: "有效期", prop: "validity" },
+  { label: "有效期单位", prop: "validityUnit", type: "filter", filters: "validityUnit" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "类型", prop: 'type' },
   { label: "种类", prop: 'category' },
@@ -24,9 +24,9 @@ export const ItemBasic =  [
   { label: "配置", prop: 'configuration' },
   { label: "项目", prop: 'project' },
   { label: "版本", prop: 'version' },
-  { label: "工程变更", prop: 'eco' },
-  { label: "E-LEVEL等级", prop: 'elevel' },
-  { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "工程变革", prop: 'eco' },
+  { label: "Elevel", prop: 'elevel' },
+  { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "标包数", prop: "stdPackQty" },
@@ -59,7 +59,7 @@ export const ItemQuality =  [
 // 物品分类信息 20230328
 export const ItemCategory =  [
   { label: "物品代码", prop: 'itemCode' },
-  { label: "分类编号", prop: "categoryCode" },
+  { label: "分类代码", prop: "categoryCode" },
   { label: "分类值", prop: "value" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
@@ -178,8 +178,8 @@ export const CustomerItem =  [
   { label: "结束时间", prop: "endTime" ,type: "dateTime" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "包装数量", prop: "customerPackQty" },
-  { label: "包装单位", prop: "customerPackUom" },
+  { label: "客户包装数量", prop: "customerPackQty" },
+  { label: "客户包装数量单位", prop: "customerPackUom" },
   { label: "事务代码", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "创建者Id", prop: "creatorId" },
@@ -194,8 +194,8 @@ export const CustomerItem =  [
 export const CustomerAddress =  [
   { label: "客户地址编号", prop: "code" },
   { label: "客户地址名称", prop: 'name' },
-  { label: "客户编号", prop: 'customerCode' },
-  { label: "库位编号", prop: 'locationCode' },
+  { label: "客户代码", prop: 'customerCode' },
+  { label: "库位代码", prop: 'locationCode' },
   { label: "城市", prop: "city" },
   { label: "地址", prop: "address" },
   { label: "联系人", prop: "contact" },
@@ -286,7 +286,7 @@ export const SupplierTimeWindow =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商名称", prop: 'supplierName' },
   { label: "时间窗口", prop: "timeSlot" },
-  { label: "当前时间", prop: "week" },
+  { label: "当前星期", prop: "week" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
@@ -726,7 +726,7 @@ export const Dict = [
 ]
 // 分类信息 20230328
 export const Category =  [
-  { label: "分类编号", prop: "code" },
+  { label: "分类代码", prop: "code" },
   { label: "分类名称", prop: 'name' },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
@@ -883,7 +883,7 @@ export const ArriveNotice =  [
   { label: "到货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "发货单号", prop: 'asnNumber' },
-  { label: "供应商编号", prop: "supplierCode" },
+  { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
   { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
@@ -1075,7 +1075,7 @@ export const PutawayNote =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "事务代码", prop: "tenantId" },
-  { label: "供应商编号", prop: 'supplierCode' },
+  { label: "供应商代码", prop: 'supplierCode' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
   { label: "到货单号", prop: 'arriveNoticeNumber' },
@@ -2756,7 +2756,7 @@ export const CountJob = [
   { label: "描述", prop: "description" },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "工作组代码", prop: "workGroupCode" },
-  { label: "仓库编号", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "id", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
index 01a2d9ad0..a5b3b23c1 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
@@ -155,10 +155,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "客户编号", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '客户选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
           ])},
@@ -174,8 +174,8 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-      { type: "input", label: "客户编号", prop: 'customerCode', disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+      { type: "input", label: "客户代码", prop: 'customerCode', disabled:"true", colSpan: 12 },
+        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
           ])},
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
index c253405ae..89d857382 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
@@ -165,8 +165,8 @@ export default {
         searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
         
         { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
+        { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
+        { type: "input", label: "客户包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -177,8 +177,8 @@ export default {
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
+        { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
+        { type: "input", label: "客户包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/DictionaryManage/Category.vue b/fe/PC/src/views/basicData/DictionaryManage/Category.vue
index 49edee035..ac22264ae 100644
--- a/fe/PC/src/views/basicData/DictionaryManage/Category.vue
+++ b/fe/PC/src/views/basicData/DictionaryManage/Category.vue
@@ -124,13 +124,13 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "分类编号", prop: "code", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "分类代码", prop: "code", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "分类名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "分类编号", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "分类代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "分类名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue
index 8b16796f7..5c6bb8070 100644
--- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue
@@ -197,7 +197,7 @@ export default {
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
@@ -212,7 +212,7 @@ export default {
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
index dc9aa89d9..a6d9086cb 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
@@ -207,7 +207,7 @@ export default {
         { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
         { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
-        { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
+        { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
@@ -216,21 +216,21 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
-        { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
+        { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
+        { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
         { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -240,7 +240,7 @@ export default {
         { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
         { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
-        { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
+        { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
@@ -249,21 +249,21 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
-        { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
+        { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
+        { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
         { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
index 6f7363db5..984a99b5b 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
@@ -145,7 +145,7 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "分类编号", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "分类代码", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/category")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物品分类选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
@@ -153,7 +153,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
-        { type: "input", label: "分类编号", prop: "categoryCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "分类代码", prop: "categoryCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
index 8633482a7..3f5b3743a 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
@@ -156,7 +156,7 @@ export default {
         { type: "filterSelect", label: "物品名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },
@@ -168,7 +168,7 @@ export default {
       editForm: [
         { type: "input",label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
         { type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
-        { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
index 87098b369..e0bf2dd84 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
@@ -154,7 +154,7 @@ export default {
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "当前时间", prop: "week", options: "week", colSpan: 12 },
+        { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -165,7 +165,7 @@ export default {
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
-        { type: "select", label: "当前时间", prop: "week", options: "week", colSpan: 12 },
+        { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
index aa44c5808..099c7b2e4 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
@@ -147,7 +147,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 },
@@ -157,7 +157,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "收货口编号", prop: "code", disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
diff --git a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
index baaecb443..ca7bc0db8 100644
--- a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
+++ b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
@@ -131,7 +131,7 @@ export default {
         { type: "objectInput", label: "实际单位", prop: "countQty", showProp: "uom", },
         { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
         { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom", },
-        { type: "input", rules: detailsRules.detailsRules, label: "库位编号", prop: "locationCode", },
+        { type: "input", rules: detailsRules.detailsRules, label: "库位代码", prop: "locationCode", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", },
         { label: "物品代码", prop: "itemCode", },

From 71f224831189548875d5a5d6c323890bb2ac6d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 3 Apr 2023 14:54:54 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=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/tabsDesTions/index.js                         | 2 +-
 fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue | 4 ++--
 .../src/views/basicData/WarehouseManage/ItemStoreRelation.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 24d5c47b9..e6251f8ba 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -466,7 +466,7 @@ export const Location =  [
 // 库位零件关系 20230331
 export const ItemStoreRelation =  [
   { label: "物品代码", prop: "itemCode" },
-  { label: "储存关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
+  { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
   { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" },
   { label: "主存储容量", prop: "umQty" },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
index b36e54f1a..6a034a97b 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
@@ -188,7 +188,7 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url, this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
@@ -202,7 +202,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url, this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
index 08ed7a0d9..7cb687052 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
@@ -189,7 +189,7 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
@@ -204,7 +204,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },

From 3e406a03b49935bf3a4d8525bc9681a03887dd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Apr 2023 15:33:11 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=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/filters/options.js                  |   2 +-
 fe/PC/src/utils/tableColumns/index.js         |  81 +++++++-------
 fe/PC/src/utils/tabsDesTions/index.js         | 101 +++++++++---------
 .../views/basicData/WarehouseManage/Dock.vue  |  14 +--
 .../WarehouseManage/ItemSafetyStock.vue       |  16 +--
 .../WarehouseManage/ItemStoreRelation.vue     |  12 ++-
 .../basicData/WarehouseManage/Location.vue    |  26 +++--
 .../WarehouseManage/LocationGroup.vue         |  82 +++++++-------
 .../basicData/WorkshopManage/ProdLineItem.vue |   4 +-
 .../basicData/WorkshopManage/WorkCenter.vue   |  20 ++--
 10 files changed, 190 insertions(+), 168 deletions(-)

diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js
index 7632bcbc1..c3c5f518d 100644
--- a/fe/PC/src/filters/options.js
+++ b/fe/PC/src/filters/options.js
@@ -132,7 +132,7 @@ export function Roles(val){
     // "Company": "公司",
     // "Customer": "客户",
     // "CustomerItem": "客户物品",
-    // "WorkStation": "工作站",
+    // "WorkStation": "工作中心",
     // "Team": "班组",
     // "Supplier": "供应商",
     // "SupplierItem": "供应商物品",
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 5f6e0b58b..8d2c18568 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -442,6 +442,7 @@ export const Dock = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
+  { label: "仓库代码", prop: 'warehouseCode' },
 
   // {
   //   label: "操作",
@@ -487,28 +488,28 @@ export const LocationGroup = [
   { label: "区域代码", prop: "areaCode" },
   { label: "库位组名称", prop: 'name' },
   { label: "仓库代码", prop: "warehouseCode" },
-  { label: "类型", prop: "groupType", type: "filter", filters: "locationType" },
-  { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
+  { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "描述", prop: "description" },
   // ------------------------------------------
   { label: "溢流库位组", prop: "overflowLocationGroup" },
-  { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
@@ -558,8 +559,8 @@ export const Location = [
   { label: "区域代码", prop: "areaCode" },
   { label: "库位组代码", prop: "locationGroupCode" },
   { label: "工作组代码", prop: "workGroupCode" },
-  { label: "类型", prop: "type", type: "filter", filters: "locationType" },
-  { label: "ERP库位", prop: "erpLocationCode" },
+  { label: "库位类型", prop: "type", type: "filter", filters: "locationType" },
+  { label: "ERP系统库位代码", prop: "erpLocationCode" },
   { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' },
   // -----------------------------------------------------------------------
   { label: "货架号", prop: "shelfCode" },
@@ -567,21 +568,21 @@ export const Location = [
   { label: "列号", prop: "columnCode" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "拣料顺序", prop: "pickOrder" },
-  { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: "remark" },
   { label: "描述", prop: "description" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -662,7 +663,7 @@ export const ItemSafetyStock = [
   },
   { label: "仓库代码", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
-  { label: "值", prop: "storeValue" },
+  { label: "存储关系代码", prop: "storeValue" },
   { label: "最大库存", prop: "maxStock" },
   { label: "最小库存", prop: "minStock" },
   { label: "安全库存", prop: "safetyStock" },
@@ -769,7 +770,7 @@ export const ProductionLine = [
 // 生产线零件关系 20230328
 export const ProductionLineItem = [
   { label: "物品代码", prop: "itemCode", type: "name" },
-  { label: "生产线编号", prop: "prodLineCode" },
+  { label: "生产线代码", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -782,7 +783,7 @@ export const ProductionLineItem = [
   //   fixed: "right"
   // },
 ]
-// 工作站信息 20230328
+// 工作中心信息 20230328
 export const WorkCenter = [
   {
     label: "编号",
@@ -791,10 +792,10 @@ export const WorkCenter = [
     prop: "code"
   },
   { label: "生产线", prop: "productionLineCode" },
-  { label: "类型", prop: "type", type: "filter", filters: "workCenterType" },
+  { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" },
   // ---------------------------------------
   { label: "名称", prop: "name" },
-  { label: "描述", prop: "description" },
+  { label: "工作中心描述", prop: "description" },
   { label: "原料库位", prop: "rawLocationCode" },
   { label: "成品库位", prop: "productLocationCode" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index a2261fdd9..5adebb9fa 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -300,8 +300,8 @@ export const SupplierTimeWindow =  [
 ]
 // 收货口信息 20230328
 export const Dock =  [
-  { label: "默认库位编号", prop: "defaultLocationCode" },
-  { label: "收货口编号", prop: "code" },
+  { label: "默认库位代码", prop: "defaultLocationCode" },
+  { label: "收货口代码", prop: "code" },
   { label: "收货口名称", prop: 'name' },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
@@ -311,7 +311,7 @@ export const Dock =  [
   { 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' },
   // -----------------------------------------------------------------------
@@ -338,8 +338,8 @@ export const Area =  [
 // 库位组信息 20230328
 export const LocationGroup =  [
   { label: "区域代码", prop: "areaCode" },
-  { label: "类型", prop: "groupType", type: "filter", filters: "locationType" },
-  { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
+  { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "编号", prop: "code" },
   { label: "名称", prop: 'name' },
@@ -350,7 +350,7 @@ export const LocationGroup =  [
   // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" },
   // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" },
   // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" },
-  // { label: "是否机会盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
+  // { label: "是否动态盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
   // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" },
   // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" },
   // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" },
@@ -367,24 +367,24 @@ export const LocationGroup =  [
   { label: "创建者Id", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   { label: "id", prop: 'id' },
-  { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -412,35 +412,36 @@ export const Location =  [
   { label: "区域代码", prop: "areaCode" },
   { label: "库位组代码", prop: "locationGroupCode" },
   { label: "工作组代码", prop: "workGroupCode" },
-  { label: "类型", prop: "type", type: "filter", filters: "locationType" },
+  { label: "库位类型", prop: "type", type: "filter", filters: "locationType" },
   { label: "行号", prop: "rowCode" },
   { label: "列号", prop: "columnCode" },
   { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "拣料顺序", prop: "pickOrder" },
   { label: "货架号", prop: "shelfCode" },
-  { label: "ERP库位", prop: "erpLocationCode" },
-  { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "ERP系统库位代码", prop: "erpLocationCode" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   // { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" },
   // { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" },
   // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" },
   // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" },
   // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" },
-  // { label: "是否盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
+  // { label: "是否动态盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
   // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" },
   // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" },
   // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" },
@@ -466,7 +467,7 @@ export const Location =  [
 // 库位零件关系 20230331
 export const ItemStoreRelation =  [
   { label: "物品代码", prop: "itemCode" },
-  { label: "储存关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
+  { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
   { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" },
   { label: "主存储容量", prop: "umQty" },
@@ -512,7 +513,7 @@ export const ItemSafetyStock = [
   { label: "物品代码", prop: "itemCode" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
-  { label: "值", prop: "storeValue" },
+  { label: "存储关系代码", prop: "storeValue" },
   { label: "最大库存", prop: "maxStock" },
   { label: "最小库存", prop: "minStock" },
   { label: "安全库存", prop: "safetyStock" },
@@ -600,7 +601,7 @@ export const ProductionLine =  [
 // 生产线零件关系 20230328
 export const ProductionLineItem =  [
   { label: "物品代码", prop: "itemCode" },
-  { label: "生产线编号", prop: "prodLineCode" },
+  { label: "生产线代码", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
@@ -612,15 +613,15 @@ export const ProductionLineItem =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 工作站信息 20230328
+// 工作中心信息 20230328
 export const WorkCenter =  [
-  { label: "生产线编号", prop: "productionLineCode" },
+  { label: "生产线代码", prop: "productionLineCode" },
   { label: "原料库位", prop: "rawLocation" },
   { label: "成品库位", prop: "productLocation" },
-  { label: "工作站编号", prop: "code" },
-  { label: "工作站名称", prop: 'name' },
-  { type: "filter", label: "类型", prop: "type", filters: "workCenterType" },
-  { label: "描述", prop: "description" },
+  { label: "工作中心代码", prop: "code" },
+  { label: "工作中心名称", prop: 'name' },
+  { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" },
+  { label: "工作中心描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
index aa44c5808..60f2ffd02 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
@@ -132,7 +132,7 @@ export default {
         defaultLocationCode: null,
         description: null,
         name: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: null
       },
       //编辑
@@ -142,27 +142,29 @@ export default {
         defaultLocationCode: null,
         description: null,
         name: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: null
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "收货口代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "收货口编号", prop: "code", disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "input", label: "收货口代码", prop: "code", disabled:"true", colSpan: 12 },
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
index b36e54f1a..ea2e1563c 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
@@ -154,7 +154,7 @@ export default {
       //新增
       CreateFormData: {
         itemCode: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         maxStock: null,
@@ -170,7 +170,7 @@ export default {
       //编辑
       editFormData: {
         itemCode: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         maxStock: null,
@@ -188,8 +188,8 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url, this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
@@ -199,11 +199,13 @@ export default {
         { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url, this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
@@ -213,6 +215,8 @@ export default {
         { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        
       ],
       editRules: {
         cerateRule: {
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
index 08ed7a0d9..ba13e0d81 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
@@ -153,7 +153,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         enabled: true,
@@ -171,7 +171,7 @@ export default {
       editFormData: {
         itemCode: null,
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         enabled: true,
@@ -189,7 +189,7 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
@@ -201,10 +201,12 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url , this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
@@ -216,6 +218,8 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url , this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
diff --git a/fe/PC/src/views/basicData/WarehouseManage/Location.vue b/fe/PC/src/views/basicData/WarehouseManage/Location.vue
index f732163c4..d294cb812 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/Location.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/Location.vue
@@ -133,7 +133,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         type: 1,
@@ -187,7 +187,7 @@ export default {
       //编辑
       editFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         type: 1,
@@ -237,20 +237,20 @@ export default {
         { type: "input", label: "名称", prop: "name", colSpan: 12 },
         // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
         // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "locationType", colSpan: 12 },
+        { type: "select", label: "库位类型", prop: "type", options: "locationType", colSpan: 12 },
         { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' },
         { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' },
         { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' },
         { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
-        { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
+        { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -260,12 +260,13 @@ export default {
         { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -277,6 +278,7 @@ export default {
         // { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "库位代码", prop: "code", disabled:"true", colSpan: 12 },
@@ -292,20 +294,20 @@ export default {
         { type: "input", label: "名称", prop: "name", colSpan: 12 },
         // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
         // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
+        { type: "select", label: "库位类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
         { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' },
         { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' },
         { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' },
         { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
-        { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
+        { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -313,10 +315,12 @@ export default {
         { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否拆箱", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -328,6 +332,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
           rowCode:[{required: true, trigger: "change", message: "不可为空"}],
           columnCode:[{required: true, trigger: "change", message: "不可为空"}],
+          defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}],
         },
         editRule: {
           pickPriority: [{ required: true, trigger: "change", message: "不可为空" },],
@@ -337,6 +342,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
           rowCode:[{required: true, trigger: "change", message: "不可为空"}],
           columnCode:[{required: true, trigger: "change", message: "不可为空"}],
+          defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}],
         }
       },
       // 自定义详情明细汇总等table页
diff --git a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
index 762857846..768c3bad1 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
@@ -208,34 +208,34 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "库位组代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 },
-        { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
+        { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
+        { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
+        { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -245,6 +245,7 @@ export default {
         // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editForm: [
         { type: "filterSelect", label: "区域代码", prop: "areaCode", optionsLabel: "name", optionsValue: "code", 
@@ -252,29 +253,30 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "库位组代码", prop: "code", disabled:"true", colSpan: 12 },
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 },
-        { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
+        { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
+        { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
+        { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -284,11 +286,13 @@ export default {
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
           pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
+          defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
           pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
+          defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         }
       },
     };
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
index c0690d096..544f751c4 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
@@ -152,7 +152,7 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -161,7 +161,7 @@ export default {
         { type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
index b5fe0fcc3..f3ce98d3d 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
@@ -151,7 +151,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
@@ -160,14 +160,14 @@ export default {
         { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 },
+        { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
@@ -176,10 +176,10 @@ export default {
         { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 },
+        { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

From 1e95355a4c910bf2418a179282fd6cc3b97b64cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Apr 2023 16:14:45 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/tablePagination/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe/PC/src/components/tablePagination/index.vue b/fe/PC/src/components/tablePagination/index.vue
index 0dc850f0b..80d345f81 100644
--- a/fe/PC/src/components/tablePagination/index.vue
+++ b/fe/PC/src/components/tablePagination/index.vue
@@ -139,7 +139,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    // todo:当前组件内没有使用，待确定是否可以删除
+    // 选择当前行数据
     multipleSelection: {
       type: Array,
       default: () => {

From 87157629c462bd4aa6556fa9f1c6c77517a8642a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 10:06:42 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-core.js                     |  2 +-
 fe/PC/src/filters/options.js                  |  2 +-
 fe/PC/src/filters/status.js                   |  4 ++--
 fe/PC/src/mixins/TableMixins.js               |  4 ++++
 fe/PC/src/mixins/printMixin.js                |  2 +-
 fe/PC/src/utils/detailsTableColumns/index.js  | 22 +++++++++++++------
 fe/PC/src/utils/tableColumns/index.js         | 14 +++++++-----
 fe/PC/src/utils/tabsDesTions/index.js         | 12 +++++-----
 .../basicData/SupplierManage/Supplier.vue     |  2 +-
 ...tice-ms.vue => PurchaseReceiptRequest.vue} |  5 +++--
 10 files changed, 42 insertions(+), 27 deletions(-)
 rename fe/PC/src/views/rawMaterialManage/purchaseReceipt/{ArriveNotice-ms.vue => PurchaseReceiptRequest.vue} (97%)

diff --git a/fe/PC/src/api/wms-core.js b/fe/PC/src/api/wms-core.js
index ce1e420bb..965aa35c5 100644
--- a/fe/PC/src/api/wms-core.js
+++ b/fe/PC/src/api/wms-core.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // let baseURL = localStorage.getItem('print') + '/api/'
 let baseURL = localStorage.getItem('base') + '/api/'
 
-// 批量获取箱标签信息 | 到货通知
+// 批量获取箱标签信息 | 到货请求
 export function getInventoryLabelByCodes(data) {
   return request({
     url: baseURL + 'label/inventory-label/by-codes',
diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js
index c3c5f518d..9fee56b6f 100644
--- a/fe/PC/src/filters/options.js
+++ b/fe/PC/src/filters/options.js
@@ -179,7 +179,7 @@ export function Roles(val){
     // "PreparationPlan": "备料计划",
     // "ProductReceiptNote": "完工收货记录",
     // "OfflineSettlementNote": "下线结算记录",
-    // "ArriveNotice": "到货通知",
+    // "PurchaseReceiptRequest": "到货请求",
     // "PurchaseReceiptNote": "采购收货记录",
     // "ReceiptAbnormalNote": "收货异常记录",
     // "PurchaseReturnNote": "采购退货记录",
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 4a91aaedb..6ad595c34 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -430,9 +430,9 @@ export function calendarStatus(index, prop) {
 }
 /**
  * @param {Boolean} 
- * @returns {object} '到货通知状态'
+ * @returns {object} '到货请求'
  */
-export function arriveNoticeStatus(index, prop) {
+export function PurchaseReceiptRequestStatus(index, prop) {
   let status = {
     1: {
       label: "关闭",
diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js
index 56d45b967..3a00b2674 100644
--- a/fe/PC/src/mixins/TableMixins.js
+++ b/fe/PC/src/mixins/TableMixins.js
@@ -136,6 +136,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤tableData
     getSupplierByCodesHandle_table() {
+      this.Loading.tableLoading = false
+      return
       for(let i=0;i<this.tableColumns.length;i++){
         if(this.tableColumns[i].prop == 'supplierName' || this.tableColumns[i].prop == "supplierAddress"){
           let _allSuCode = []
@@ -173,6 +175,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤propsData
     getSupplierByCodesHandle_props() {
+      this.Loading.DrawerLoading = false
+      return
       for(let i=0;i<this.tabsDesTions.length;i++){
         if(!this.propsData.supplierCode){
           this.Loading.DrawerLoading = false
diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js
index 2cd2e93da..6b47c491f 100644
--- a/fe/PC/src/mixins/printMixin.js
+++ b/fe/PC/src/mixins/printMixin.js
@@ -93,7 +93,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
 
 // 打印【箱标签-单页4个】 (xiangbq_many.rdlx)
 // 使用位置：半成品上架标签 (PartiallyPreparedProducts.vue) | 生产退库标签 (productionReturnLabel.vue)
-//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货通知详情 (ArriveNotice-ms.vue)
+//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货请求详情 (PurchaseReceiptRequest.vue)
 /**
  * @param {*} propsData 必填 详情数据 示例：this.propsData
  * @param {*} options 自定义特殊配置值 示例：{'number':'poNumber'} (number值将传为poNumber)
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 4dc7ef91d..fe06fd09b 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -67,11 +67,12 @@ export const PurchaseOrder =  [
   { label: "lineStatus", prop: 'lineStatus' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整
-export const ArriveNotice =  [
+// 到货请求 已调整
+export const PurchaseReceiptRequest =  [
   { 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" },
@@ -81,19 +82,26 @@ export const ArriveNotice =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
+  { label: "创建者Id", prop: "creatorId" },
+  // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
   { label: "订单号", prop:'poNumber', width: orderWidth },
   // -----------------------------------------------------------------------
+  { label: "单据号", prop:'number', width: orderWidth },
+  { label: "备注", prop:'remark'},
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  // { label: "公司", prop: 'company' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop:'supplierPackUom' },
   { label: "供应商包装数量", prop:'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
+  { label: "事务代码", prop: "tenantId" },
+  { label: "id", prop: 'id' },
+  { label: "masterID", prop: '主表ID' },
   // { label: "项目编号", prop: "projectCode" },
   // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   // -----------------------------------------------------------------------
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 498025eb2..ed2e917ab 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1112,8 +1112,8 @@ export const PurchaseOrder = [
   { label: "orderStatus", prop: 'orderStatus' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整
-export const ArriveNotice = [
+// 到货请求 已调整 20230404
+export const PurchaseReceiptRequest = [
   {
     label: "到货单号",
     prop: "number",
@@ -1126,16 +1126,18 @@ export const ArriveNotice = [
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName",showProp: true },
   { label: "供应商地址", prop: "supplierAddress",showProp: true },
-  { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "实际到货日期", prop: "arriveDate ",type: "dateTime" },
+  { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  // { label: "实际到货日期", prop: "arriveDate ",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index fd34e3e66..e6bf9f6b9 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -879,21 +879,21 @@ export const PurchaseOrder =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整 20221220
-export const ArriveNotice =  [
+// 到货请求 已调整 20230404
+export const PurchaseReceiptRequest =  [
   { label: "到货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "发货单号", prop: 'asnNumber' },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
-  { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
+  { label: "计划到货日期", prop: "planArriveDate",type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+  { label: "请求状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   { label: "创建者Id", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
@@ -907,9 +907,9 @@ export const ArriveNotice =  [
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
   { label: "时间窗口", prop: 'timeWindow' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "id", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 采购收货任务 已调整 20221220
diff --git a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue
index 0591e825e..7d718c077 100644
--- a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue
@@ -222,7 +222,7 @@ export default {
           label: "发货单列表",
           name: 'fhdlb',
           url: 'wms/store/arrive-notice',
-          tableColumns: 'ArriveNotice',
+          tableColumns: 'PurchaseReceiptRequest',
           functionName: 'bySupplierCode'
         },
         {
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue
similarity index 97%
rename from fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue
rename to fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue
index 6fb58bdee..1340ec3ba 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue
@@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
 import { mixins } from "@/mixins/mixins";
 import {initPrintPackingCodeManyData } from "@/mixins/printMixin"
 export default {
-  name: "ArriveNotice",
+  name: "PurchaseReceiptRequest",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -83,7 +83,7 @@ export default {
   },
   data() {
     return {
-      URL: "wms/store/arrive-notice",
+      URL: "wms/store/purchase-receipt-request",
       DrawerButtonData: [
         {
           type: 'info',
@@ -96,6 +96,7 @@ export default {
       ],
       //常用按钮数据
       currenButtonData: [
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

From e1a2ceaa24840e48ffbbd860b4c494fc2a198f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 10:30:47 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=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  |  38 ++++-
 fe/PC/src/utils/tableColumns/index.js         |  50 ++++--
 fe/PC/src/utils/tabsDesTions/index.js         |  45 +++---
 .../purchaseReceipt/SupplierAsn-msQuery.vue   | 149 ------------------
 4 files changed, 87 insertions(+), 195 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 4dc7ef91d..64e4f4661 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -12,12 +12,12 @@ export const Dict = [
 ]
 
 // 原料管理
-/**/
-// 供应商发货通知 已调整
+// 供应商发货通知 20230404
 export const SupplierAsn =  [
   { 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" },
@@ -31,22 +31,31 @@ export const SupplierAsn =  [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "发货单号", prop: 'number', width: orderWidth },
   { label: "订单号", prop: 'poNumber', width: orderWidth },
+  { label: "订单行", prop: 'poLine', width: orderWidth },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
+  { label: "转换率", prop: 'convertRate' },
+  { label: "筹措员代码", prop: 'planUserCode' },
   { label: "备注", prop: 'remark' },
+  { label: "ID", prop: 'id' },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "主表ID", prop: 'masterID' },
+  { label: "事务代码", prop: "tenantId" },
   // -----------------------------------------------------------------------
 ]
 
-// 采购订单信息 已调整
+// 采购订单信息 20230404
 export const PurchaseOrder =  [
   { 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" },
@@ -54,17 +63,32 @@ export const PurchaseOrder =  [
   { label: "项目编号", prop: "projectCode" },
   { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   { label: "生产时间", prop: "produceDate", type: "dateTime" },
+  { label: "已发货数量", prop: "shippedQty" },
+  { label: "已收货数量", prop: "receivedQty" },
+  { label: "已退货数量", prop: "returnedQty" },
+  { label: "已上架数量", prop: "putAwayQty" },
   // -----------------------------------------------------------------------
+  { label: "筹措员代码", prop: 'planUserCode' },
+  { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" },
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
+  { label: "发货单号", prop: 'number' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
   { label: "是否寄存订单", prop: 'isConsignment' },
+  { label: "备注", prop: 'remark' },
+  { label: "订单备注", prop: 'orderRemark' },
+  { label: "事务代码", prop: "tenantId" },
   { label: "lineStatus", prop: 'lineStatus' },
+  { label: "id", prop: 'id' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "主表ID", prop: 'masterID' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
 // 到货通知 已调整
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 7cf490cdd..0e6d3aec8 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1046,8 +1046,7 @@ export const documentBasic = [
 
 
 // 原料管理
-/**/
-// 供应商发货通知 已调整
+// 供应商发货通知 20230404
 export const SupplierAsn = [
   {
     label: "发货单号",
@@ -1058,27 +1057,40 @@ export const SupplierAsn = [
   },
   { label: "订单号", prop: "poNumber",width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "供应商名称", prop: "supplierName",showProp: true },
+  { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
   { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
   { label: "发货日期", prop: "shipDate",type: "dateTime" },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
+  { label: "到期日期", prop: 'dueDate', type: "dateTime" },
+  { label: "时间窗口", prop: 'timeWindow' },
+  { label: "筹措员代码", prop: 'planUserCode' },
+  { label: "事务代码", prop: "tenantId" },
   { label: "status", prop: 'status' },
+  { label: "createType", prop: 'createType' },
+  // { label: "联系人电话", prop: 'contactUserPhone' },
+  // { label: "联系人邮件", prop: 'contactUserEmail' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "供应商名称", prop: "supplierName",showProp: true },
+  // { label: "供应商地址", prop: "supplierAddress" },
   // -----------------------------------------------------------------------
 ]
-// 采购订单信息 已调整
+// 采购订单信息 20230404
 export const PurchaseOrder = [
   {
     label: "采购订单号",
@@ -1090,25 +1102,31 @@ export const PurchaseOrder = [
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress",showProp: true },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "发货日期", prop: "shipDate",type: "dateTime" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "订单类型", prop: 'poType' },
   { label: "是否寄存订单", prop: 'isConsignment' },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
   { label: "截止日期", prop: 'dueDate',type: "dateTime" },
   { label: "版本", prop: 'version' },
   { label: "税率", prop: 'taxRate' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
   { label: "orderStatus", prop: 'orderStatus' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "事务代码", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "发货日期", prop: "shipDate",type: "dateTime" },
+  // { label: "联系人电话", prop: 'contactUserPhone' },
+  // { label: "联系人邮件", prop: 'contactUserEmail' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 到货通知 已调整
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index e6251f8ba..deee9c778 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -813,69 +813,68 @@ export const documentBasic = [
 ]
 
 // 原料管理
-/**/
-// 供应商发货通知 已调整 20221220
+// 供应商发货通知 20230404
 export const SupplierAsn =  [
   { label: "发货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "供应商名称", prop: "supplierName" },
-  { label: "供应商地址", prop: "supplierAddress" },
-  { label: "要求到货日期", prop: 'planArriveDate', type:'dateTime' },
-  { label: "发货日期", prop: 'shipDate', type:'dateTime' },
-  { label: "实际到货日期", prop: "dueDate",type: "dateTime" },
-  { label: "筹措员代码", prop: "planUserCode" },
+  // { label: "供应商名称", prop: "supplierName" },
+  // { label: "供应商地址", prop: "supplierAddress" },
+  { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "发货日期", prop: "shipDate",type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "事务代码", prop: "tenantId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
+  { label: "到期日期", prop: 'dueDate', type: "dateTime" },
   { label: "时间窗口", prop: 'timeWindow' },
-  { label: "联系人姓名", prop: 'contactUserName' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
+  { label: "筹措员代码", prop: 'planUserCode' },
+  { label: "status", prop: 'status' },
   { label: "id", prop: "id" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "createType", prop: 'createType' },
-  { label: "status", prop: 'status' },
-  { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 采购订单信息  已调整 20221220
+// 采购订单信息 20230404
 export const PurchaseOrder =  [
   { label: "采购订单号", prop: 'number' },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "创建者Id", prop: "creatorId" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务代码", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "订单类型", prop: 'poType' },
   { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
   { label: "截止日期", prop: 'dueDate',type: "dateTime" },
   { label: "版本", prop: 'version' },
   { label: "税率", prop: 'taxRate' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
   { label: "orderStatus", prop: 'orderStatus' },
   { label: "id", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "联系人电话", prop: 'contactUserPhone' },
+  // { label: "联系人邮件", prop: 'contactUserEmail' },
   // -----------------------------------------------------------------------
 ]
 // 到货通知 已调整 20221220
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
index df0664e9a..2416b205a 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
@@ -25,14 +25,6 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 表格导入 -->
-    <!-- <upload-excel-component 
-      :DrawerLoading="Loading.DrawerLoading"
-      :before-upload="beforeUpload"
-      :show="displayDialog.importDialog"
-      @postImportDown="importDown()"
-      @submitForm="uploadSubmitForm"
-    /> -->
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -56,17 +48,11 @@
   </div>
 </template>
 <script>
-import { supplierAsnCreateMany } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
-import UploadExcelComponent from '@/components/UploadExcel/index.vue'
-import { supplierAsnExcel } from "@/filters/excelOrReportsOption";
-import {SupplierAsnCtypeStaBack} from "@/filters/status"
-import { formatTimeToT,formatTimeStampToNorm } from "@/utils/formatTime"
-import store  from '@/store'
 export default {
   name: "SupplierAsn",
   mixins: [
@@ -76,7 +62,6 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
-  components: { UploadExcelComponent },
   computed: {
     editDialog: {
       get: function () {
@@ -87,7 +72,6 @@ export default {
   data () {
     return {
       URL: 'wms/store/supplier-asn',
-      // importUploadURL:"wms/store/supplier-asn/newImport",
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
@@ -100,139 +84,6 @@ export default {
   mounted () {
     this.paging();
   },
-  methods: {
-    // 创建外部主表数据
-    build(data,str){
-      
-      return {
-        str:str,//用于对比数据
-        details:[],
-        supplierCode:data[supplierAsnExcel.supplierCode],
-        planUserCode:data[supplierAsnExcel.planUserCode],
-        contactUserName:data[supplierAsnExcel.planUserCode],
-        planArriveDate:formatTimeStampToNorm(data[supplierAsnExcel.planArriveDate],'datetime'),
-        shipDate:formatTimeStampToNorm(data[supplierAsnExcel.shipDate],'datetime'),
-        remark:data[supplierAsnExcel.remark],
-        // 接口需要默认配置项：
-        company:localStorage.getItem("company"),
-        warehouseCode:localStorage.getItem("warehouseCode"),//仓库
-        dockCode:"FWDY",//收货口
-        rpNumber:"123456",//要货计划单号
-        timeWindow:"00:00-24:00",//时间窗口
-      }
-    },
-    // 创建详情detail数据
-    builddDeails(data,item){
-      data.details.push({
-        ctype:SupplierAsnCtypeStaBack(item[supplierAsnExcel.details.ctype]) || null,
-        projectCode:item[supplierAsnExcel.details.projectCode] || null,
-        itemCode:item[supplierAsnExcel.details.itemCode] || null,
-        uom:item[supplierAsnExcel.details.uom] || null,
-        qty:item[supplierAsnExcel.details.qty] || null,
-        recommendErpCode:item[supplierAsnExcel.details.recommendErpCode] || null,
-        lot:item[supplierAsnExcel.details.lot] || null,
-        supplierBatch:item[supplierAsnExcel.details.lot] ? item[supplierAsnExcel.details.lot].replaceAll('-','') : '',
-        produceDate:formatTimeStampToNorm(item[supplierAsnExcel.details.produceDate],'datetime'),
-        expireDate:formatTimeStampToNorm(item[supplierAsnExcel.details.expireDate],'datetime'),
-        packingCode:item['明细-箱标签'] || null,
-        // 默认配置项：
-        warehouseCode:localStorage.getItem("warehouseCode"),//仓库
-      })
-    },
-    uploadSubmitForm(index,data){
-      // 确定
-      if(index == '1'){
-        let _result = data.results;
-        let _data = [];
-        // 查询物品代码是否重复
-        // let _itemArr = [];
-        // let _hasSame = false
-        // data.results.forEach(item=>{
-        //   if(_itemArr.indexOf(item[supplierAsnExcel.details.itemCode]) >= 0){
-        //     _hasSame = true
-        //   }else{
-        //     _itemArr.push(item[supplierAsnExcel.details.itemCode])
-        //   }
-        // })
-        // if(_hasSame){
-        //   this.$message.error("模板中存在相同物品代码，请修改模板重新导入")
-        //   return 
-        // }
-        // 查重重组
-        for(let i=0;i<_result.length;i++){
-          let _itemStr = ""
-          // _itemStr =(_result[i][supplierAsnExcel.poNumber] || '') + (_result[i][supplierAsnExcel.number] || '')
-          let entity=this.build(_result[i],_itemStr);
-    
-         if(_data.find(e => e.str == _itemStr)){
-          continue;
-         }
-         _result.forEach((element,key) => {
-            // let temp =(element[supplierAsnExcel.poNumber] || '') + (element[supplierAsnExcel.number] || '')
-            let temp = ""
-            if(temp==_itemStr){
-              this.builddDeails(entity,element);
-            }
-          });
-          _data.push(entity);
-        }
-        // 提交数据处理
-        _data.forEach(item=>{
-          item.createType = 1
-          item.planArriveDate = formatTimeToT(item.planArriveDate)
-          item.shipDate = formatTimeToT(item.shipDate)
-          item.details.forEach(item_d=>{
-            item_d.produceDate = formatTimeToT(item_d.produceDate)
-            item_d.expireDate = formatTimeToT(item_d.expireDate)
-            item_d.itemName = ""
-          })
-          item.worker = store.getters.name.userName;
-          return delete item.str
-        })
-        this.Loading.appMainLoading = true
-        supplierAsnCreateMany(_data)
-          .then((response) => {
-            this.$message.success("创建成功！")
-            this.Loading.appMainLoading = false
-            this.displayDialog.importDialog = false;
-            this.paging();
-          })
-          .catch(()=>{
-            this.Loading.appMainLoading = false
-            this.$message.error("创建失败，请重试。")
-          })
-      }
-      // 取消
-      else{
-        if(!data.results || data.results.length <= 0){
-          this.displayDialog.importDialog = false;
-          return;
-        }
-        this.$confirm('您还未提交, 是否取消?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.displayDialog.importDialog = false;
-        }).catch(() => {
-          document.getElementsByClassName("v-modal")[0].style.display = "none"
-        });
-      }
-    },
-    beforeUpload(file) {
-      // const isLt1M = file.size / 1024 / 1024 < 1
-      // if (isLt1M) {
-      //   return true
-      // }
-      // this.$message({
-      //   message: 'Please do not upload files larger than 1m in size.',
-      //   type: 'warning'
-      // })
-      // return false
-      return true
-    }
-
-  },
 };
 </script>
 <style lang="scss" scoped>

From 3b4296ee44f240c5e8e5ddab3f669682906e9b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 11:32:35 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=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 | 27 +++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 43f0b0060..da19c06d1 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -2,13 +2,22 @@
 const orderWidth = 180
 // 基础数据管理
 /**/
-// 字典信息
+// 字典信息 20230404
 export const Dict = [
   { label: "字典项代码", prop: "code" },
   { label: "字典项名称", prop: "name" },
   { label: "字典项值", prop: "value" },
   { label: "字典项描述", prop: "description" },
   { label: "是否生效", prop: "enabled", type: "filter", filters: "whetherOrNot" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "主表ID", prop: 'masterId' },
+  { label: "事务代码", prop: "tenantId" },
+  { label: "ID", prop: "id" },
 ]
 
 // 原料管理
@@ -34,7 +43,7 @@ export const SupplierAsn =  [
   { label: "订单行", prop: 'poLine', width: orderWidth },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
   // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
@@ -73,7 +82,7 @@ export const PurchaseOrder =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "发货单号", prop: 'number' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
@@ -84,14 +93,14 @@ export const PurchaseOrder =  [
   { label: "订单备注", prop: 'orderRemark' },
   { label: "事务代码", prop: "tenantId" },
   { label: "lineStatus", prop: 'lineStatus' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "主表ID", prop: 'masterID' },
   // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
-// 到货请求 已调整
+// 到货请求 20230404
 export const PurchaseReceiptRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
@@ -106,14 +115,14 @@ export const PurchaseReceiptRequest =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
   { label: "订单号", prop:'poNumber', width: orderWidth },
   // -----------------------------------------------------------------------
   { label: "单据号", prop:'number', width: orderWidth },
   { label: "备注", prop:'remark'},
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   // { label: "公司", prop: 'company' },
   { label: "供应商批次", prop: 'supplierBatch' },
   // { label: "仓库", prop: 'warehouseCode' },
@@ -124,8 +133,8 @@ export const PurchaseReceiptRequest =  [
   { label: "供应商包装数量", prop:'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
   { label: "事务代码", prop: "tenantId" },
-  { label: "id", prop: 'id' },
-  { label: "masterID", prop: '主表ID' },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: 'masterID' },
   // { label: "项目编号", prop: "projectCode" },
   // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   // -----------------------------------------------------------------------

From b4a3430b5e409ffe386431557b2e67d5b9ab73b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 11:57:21 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseReceipt/SupplierAsn-msQuery.vue        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
index 2416b205a..e44ee95d7 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
@@ -25,6 +25,19 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      methodValue="0"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -75,6 +88,7 @@ export default {
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

From b57820e420cb3dd07f2ba1f6a7459edc8e9164d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 12:05:46 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=B8=A6=E6=9C=89id?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E5=A4=A7=E5=86=99ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js |  60 +-
 fe/PC/src/utils/summaryTableColumns/index.js |   6 +-
 fe/PC/src/utils/tableColumns/index.js        |  58 +-
 fe/PC/src/utils/tabsDesTions/index.js        | 908 +++++++++----------
 4 files changed, 516 insertions(+), 516 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index da19c06d1..c477f3157 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -16,7 +16,7 @@ export const Dict = [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "主表ID", prop: 'masterId' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "ID", prop: "id" },
 ]
 
@@ -55,7 +55,7 @@ export const SupplierAsn =  [
   { label: "ID", prop: 'id' },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "主表ID", prop: 'masterID' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   // -----------------------------------------------------------------------
 ]
 
@@ -91,7 +91,7 @@ export const PurchaseOrder =  [
   { label: "是否寄存订单", prop: 'isConsignment' },
   { label: "备注", prop: 'remark' },
   { label: "订单备注", prop: 'orderRemark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "lineStatus", prop: 'lineStatus' },
   { label: "ID", prop: 'id' },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -132,7 +132,7 @@ export const PurchaseReceiptRequest =  [
   { label: "供应商包装计量单位", prop:'supplierPackUom' },
   { label: "供应商包装数量", prop:'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "ID", prop: 'id' },
   { label: "主表ID", prop: 'masterID' },
   // { label: "项目编号", prop: "projectCode" },
@@ -285,14 +285,14 @@ export const InspectNote =  [
   { label: "样品率", prop: 'samplePercent' },
   { label: "检验数量", prop: 'inspectQty' },
   { label: "AbcClass类别", prop: 'abcClass' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "检验人邮件", prop: 'inspectUserEmail' },
   { label: "检验人姓名", prop: 'inspectUserName' },
   { label: "检验人电话", prop: 'inspectUserPhone' },
   { label: "status", prop: 'status' },
   { label: "masterID", prop: "masterID" },
   { label: "inspectType", prop: 'inspectType' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // { label: "其他属性", prop: 'otherPropertyJson' },
   // -----------------------------------------------------------------------
 ]
@@ -2233,10 +2233,10 @@ export const InventoryInitialNote = [
   { label: "包装单位", prop: "stdPackUom" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "生产日期", prop: "produceDate",type:"dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
@@ -2246,7 +2246,7 @@ export const InventoryInitialNote = [
   { label: "监盘描述", prop: 'auditCountDescription' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "masterID", prop: "masterID" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 盘点计划 已调整
@@ -2289,16 +2289,16 @@ export const CountPlan =  [
   { label: "单据号", prop: 'number', width:orderWidth },
   { label: "包装数量", prop: "stdPackQty" },
   { label: "包装单位", prop: "stdPackUom" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "托标签", prop: "containerCode" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "masterID", prop: "masterID" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 盘点任务 已调整
@@ -2326,10 +2326,10 @@ export const CountJob =  [
   { label: "包装数量", prop: "stdPackQty" },
   { label: "包装单位", prop: "stdPackUom" },
   { label: "供应商批次", prop: "supplierBatch" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "生产日期", prop: "produceDate",type:"dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
@@ -2339,7 +2339,7 @@ export const CountJob =  [
   { label: "监盘描述", prop: 'auditCountDescription' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "masterID", prop: "masterID" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 盘点记录 已调整
@@ -2385,16 +2385,16 @@ export const CountNote =  [
   { label: "备注", prop: 'remark' },
   { label: "盘点计划单号", prop: "countPlanNumber" },
   { label: "单据号", prop: 'number', width:orderWidth },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   { label: "托标签", prop: "containerCode" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "masterID", prop: "masterID" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 盘点调整申请 已调整
@@ -2424,17 +2424,17 @@ export const CountPlanAdjust =  [
   { label: "单据号", prop: 'number' },
   { label: "包装数量", prop: "stdPackQty" },
   { label: "包装单位", prop: "stdPackUom" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "生产日期", prop: "produceDate",type:"dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   // { label: "托标签", prop: "containerCode" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "masterID", prop: "masterID" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 盘点调整记录 已调整
@@ -2468,10 +2468,10 @@ export const CountPlanAdjust =  [
   { label: "包装数量", prop: "stdPackQty" },
   { label: "包装单位", prop: "stdPackUom" },
   { label: "供应商批次", prop: "supplierBatch" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "生产日期", prop: "produceDate",type:"dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
@@ -2479,6 +2479,6 @@ export const CountPlanAdjust =  [
   { label: "盘点标签", prop: "countLabel" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "masterID", prop: "masterID" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
\ No newline at end of file
diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js
index a78fd15ac..f25e56551 100644
--- a/fe/PC/src/utils/summaryTableColumns/index.js
+++ b/fe/PC/src/utils/summaryTableColumns/index.js
@@ -64,9 +64,9 @@ export const InspectNote =  [
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "创建时间", prop: "completeTime",type: "dateTime" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "备注", prop: 'remark' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
@@ -79,7 +79,7 @@ export const InspectNote =  [
   { label: "样品率", prop: 'samplePercent' },
   { label: "破坏数量", prop: 'crackQty' },
   { label: "最终不合格数量", prop: 'notPassedQty' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "检验人邮件", prop: 'inspectUserEmail' },
   { label: "检验人姓名", prop: 'inspectUserName' },
   { label: "检验人电话", prop: 'inspectUserPhone' },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index a4fa51eb8..6999b4f3f 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -210,12 +210,12 @@ export const BomInner = [
   { label: "备注", prop: 'remark' },
   // -------------------------------------
   { label: "层级", prop: "layer" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -685,7 +685,7 @@ export const ItemSafetyStock = [
 // 事务类型信息 20230328
 export const TransactionType = [
   {
-    label: "事务代码",
+    label: "事务ID",
     prop: "id",
     fixed: "left",
     type: "name", 
@@ -1032,7 +1032,7 @@ export const documentBasic = [
   { label: "单号流水长度", prop: "numberSerialLength" },
   { label: "单号分隔符", prop: "numberSeparator" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "备注", prop: "remark" },
@@ -1066,7 +1066,7 @@ export const SupplierAsn = [
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "要货计划单号", prop: 'rpNumber' },
@@ -1079,7 +1079,7 @@ export const SupplierAsn = [
   { label: "到期日期", prop: 'dueDate', type: "dateTime" },
   { label: "时间窗口", prop: 'timeWindow' },
   { label: "筹措员代码", prop: 'planUserCode' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "status", prop: 'status' },
   { label: "createType", prop: 'createType' },
   // { label: "联系人电话", prop: 'contactUserPhone' },
@@ -1119,9 +1119,9 @@ export const PurchaseOrder = [
   { label: "税率", prop: 'taxRate' },
   { label: "orderStatus", prop: 'orderStatus' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "创建者ID", prop: 'creatorId' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   // { label: "公司", prop: 'company' },
   // { label: "筹措员代码", prop: "contactUserName" },
   // { label: "发货日期", prop: "shipDate",type: "dateTime" },
@@ -2390,7 +2390,7 @@ export const labelsList =  [
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "采购单号", prop: "asnNumber",width:orderWidth },
   { label: "要货计划单号", prop: "rpNumber",width:orderWidth },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
 ]
 
 // 库存管理
@@ -3008,20 +3008,20 @@ export const CountPlan = [
   { label: "类型", prop: "type",type: "filter", filters: "checkType" },
   { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
   { label: "生效时间", prop: 'activeDate', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { 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: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "物品代码JSON", prop: 'jsonItemCodes' },
   { label: "库位JSON", prop: 'jsonLocationCodes' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 盘点任务 已调整
@@ -3048,21 +3048,21 @@ export const CountJob =  [
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "类型", prop: "type",type: "filter", filters: "checkType"  },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot"},
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "承接者Id", prop: "acceptUserId" },
-  { label: "完成者Id", prop: "completeUserId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "承接者ID", prop: "acceptUserId" },
+  { label: "完成者ID", prop: "completeUserId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "优先级", prop: 'priority',},
   { label: "优先级增量", prop: 'priorityIncrement',},
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
   { label: "描述", prop: "description" },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "工作组代码", prop: "workGroupCode" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 盘点记录 已调整
@@ -3084,15 +3084,15 @@ export const CountNote = [
   { label: "类型", prop: "type", type: "filter", filters: "checkType" },
   { label: "阶段", prop: "stage", type: "filter", filters: "stageType" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "生效时间", prop: "activeDate", type: "dateTime" },
   { label: "描述", prop: "description" },
   { label: "公司", prop: 'company',},
   { label: "仓库", prop: 'warehouseCode',},
-  { label: "id", prop: 'id',},
+  { label: "ID", prop: 'id',},
   // -----------------------------------------------------------------------
 ]
 // 盘点调整申请 已调整
@@ -3111,14 +3111,14 @@ export const CountPlanAdjust = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId"},
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId"},
   { label: "生效时间", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 盘点调整记录 已调整
@@ -3137,14 +3137,14 @@ export const CountAdjustNote = [
   // -----------------------------------------------------------------------
   { label: "类型", prop: "type" },
   { label: "备注", prop: "remark" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "生效时间", prop: "activeDate", type: "dateTime" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 1983186c5..3cda75594 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -30,12 +30,12 @@ export const ItemBasic =  [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "标包数", prop: "stdPackQty" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
 ]
 // 物品质量信息 20230328
@@ -46,13 +46,13 @@ export const ItemQuality =  [
   { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" },
   { label: "描述", prop: "description" },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -63,12 +63,12 @@ export const ItemCategory =  [
   { label: "分类值", prop: "value" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -86,13 +86,13 @@ export const ItemPack =  [
   // { label: "转换率", prop: "conversionRate" },
   { label: "备注", prop: 'remark', colSpan: 12 },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: '包装类型', prop: "packType" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -108,12 +108,12 @@ export const AQL =  [
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
   { label: "ABC类", prop: 'abcClass',type: "filter",  filters: "abcClass" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -133,12 +133,12 @@ export const Bom =  [
   { label: "计划拆分规则", prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -158,13 +158,13 @@ export const Customer =  [
   // -----------------------------------------------------------------------
   { label: "简称", prop: "shortName" },
   { label: "状态", prop: "isActive", type: "filter",filters: "openToCloseBit" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "type", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -180,12 +180,12 @@ export const CustomerItem =  [
   // -----------------------------------------------------------------------
   { label: "客户包装数量", prop: "customerPackQty" },
   { label: "客户包装数量单位", prop: "customerPackUom" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   { label: "版本", prop: 'version' },
   // -----------------------------------------------------------------------
@@ -202,13 +202,13 @@ export const CustomerAddress =  [
   { label: "描述", prop: "desc" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "仓库", prop: "warehouseCode", },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -222,12 +222,12 @@ export const Project =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -250,12 +250,12 @@ export const Supplier =  [
   { label: "货币", prop: 'currency' },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -271,13 +271,13 @@ export const SupplierItem =  [
   // -----------------------------------------------------------------------
   { label: "供应商包装数量", prop: "supplierPackQty" },
   { label: "供应商包装单位", prop: "supplierPackUom" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   // { label: "每托盘数量", prop: 'qtyPerPallet' },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -289,12 +289,12 @@ export const SupplierTimeWindow =  [
   { label: "当前星期", prop: "week" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -306,13 +306,13 @@ export const Dock =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "仓库代码", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -325,13 +325,13 @@ export const Area =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -362,11 +362,11 @@ export const LocationGroup =  [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "是否拆箱", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableSplitBox" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "仓库代码", prop: 'warehouseCode' },
   { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
   { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
@@ -384,7 +384,7 @@ export const LocationGroup =  [
   { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
   { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
   { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -396,12 +396,12 @@ export const WorkGroup =  [
   { label: "仓库", prop: "warehouseCode" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -454,13 +454,13 @@ export const Location =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -480,13 +480,13 @@ export const ItemStoreRelation =  [
   // -----------------------------------------------------------------------
   { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" },
   { label: "库位代码", prop: "locationCode" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -500,11 +500,11 @@ export const InventoryLocationCapacity =  [
   { label: "已用容量", prop: "usedCapacity" },
   { label: "可承受过载容量", prop: "bearableOverloadCapacity" },
   { label: "库位", prop: "locationCode" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -522,12 +522,12 @@ export const ItemSafetyStock = [
   { label: "补料单位", prop: "feedUM" },
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -552,12 +552,12 @@ export const TransactionType = [
   { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" },
   { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -568,12 +568,12 @@ export const Workshop =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -589,12 +589,12 @@ export const ProductionLine =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -604,12 +604,12 @@ export const ProductionLineItem =  [
   { label: "生产线代码", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -624,12 +624,12 @@ export const WorkCenter =  [
   { label: "工作中心描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -641,12 +641,12 @@ export const Team =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -660,12 +660,12 @@ export const Shift =  [
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -679,12 +679,12 @@ export const ItemGuideBook = [
   { label: "步骤", prop: "step", type:'textarea', rows: 5 ,readonly:true },
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -700,12 +700,12 @@ export const accountPeriodNote = [
   { label: "代码", prop: "code" },
   { label: "描述", prop: "description" },
   { label: "备注", prop: "remark" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -716,12 +716,12 @@ export const Dict = [
   { label: "描述", prop: "description" },
   // -----------------------------------------------------------------------
   { label: "备注", prop: "remark" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -732,12 +732,12 @@ export const Category =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -749,12 +749,12 @@ export const Uom =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -766,12 +766,12 @@ export const Calendar =  [
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -782,12 +782,12 @@ export const Configuration =  [
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "id", prop: 'id' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -795,18 +795,18 @@ export const Configuration =  [
 export const documentBasic = [
   { label: "编号", prop: "code" },
   { label: "名称", prop: "name" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "事务类型", prop: "transactionType" ,type: "filter", filters: "TransTypeBaseForStr" },
   { label: "单号前缀", prop: "numberPrefix" },
   { label: "单号格式", prop: "numberFormat" },
   { label: "单号流水长度", prop: "numberSerialLength" },
   { label: "单号分隔符", prop: "numberSeparator" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: "remark" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   { label: "描述", prop: "description" },
   // -----------------------------------------------------------------------
   // { label: "公司", prop: 'company' },
@@ -827,7 +827,7 @@ export const SupplierAsn =  [
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "车牌号", prop: 'truckNumber' },
@@ -840,7 +840,7 @@ export const SupplierAsn =  [
   { label: "时间窗口", prop: 'timeWindow' },
   { label: "筹措员代码", prop: 'planUserCode' },
   { label: "status", prop: 'status' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "createType", prop: 'createType' },
   // -----------------------------------------------------------------------
@@ -853,16 +853,16 @@ export const PurchaseOrder =  [
   { label: "供应商地址", prop: "supplierAddress" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "联系人姓名", prop: 'contactName' },
   { label: "联系人电话", prop: 'contactPhone' },
   { label: "联系人邮件", prop: 'contactEmail' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "订单类型", prop: 'poType' },
   { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
@@ -870,7 +870,7 @@ export const PurchaseOrder =  [
   { label: "版本", prop: 'version' },
   { label: "税率", prop: 'taxRate' },
   { label: "orderStatus", prop: 'orderStatus' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
   // { label: "仓库", prop: 'warehouseCode' },
   // { label: "筹措员代码", prop: "contactUserName" },
@@ -893,11 +893,11 @@ export const PurchaseReceiptRequest =  [
   // -----------------------------------------------------------------------
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "请求状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@@ -907,7 +907,7 @@ export const PurchaseReceiptRequest =  [
   { label: "收货口", prop: 'dockCode' },
   { label: "时间窗口", prop: 'timeWindow' },
   // { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -932,8 +932,8 @@ export const PurchaseReceiptJob = [
   { label: "完成时间", prop: "completeTime",type: "dateTime" },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" },
@@ -941,13 +941,13 @@ export const PurchaseReceiptJob = [
   { label: "优先级增量", prop: 'priorityIncrement' },
   { label: "工作组", prop: 'workGroupCode' },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "时间窗口", prop: 'timeWindow' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   { label: "type", prop: "type" },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -968,17 +968,17 @@ export const PurchaseReceiptNote =  [
   { label: "是否有不合格", prop: "hasNoOk" },
   { label: "是否有缺料", prop: "hasNoReceipt" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "type", prop: 'type' },
   { label: "status", prop: 'status' },
   { label: "任务代码", prop: 'jobNumber' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1000,23 +1000,23 @@ export const InspectNotice = [
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" },
   { label: "优先级", prop: 'priority' },
   { label: "优先级增量", prop: 'priorityIncrement' },
   { label: "工作组", prop: 'workGroupCode' },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "nextAction", prop: 'nextAction' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1034,14 +1034,14 @@ export const InspectNote = [
   // -----------------------------------------------------------------------
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1051,14 +1051,14 @@ export const unqualifiedToQualifiedNote = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1070,11 +1070,11 @@ export const PutawayNote =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "任务单号", prop: 'jobNumber' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
@@ -1083,7 +1083,7 @@ export const PutawayNote =  [
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "完工收货单号", prop: 'productReceiptNumber' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "type", prop: 'type' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -1104,15 +1104,15 @@ export const IssueRequest =  [
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "备料计划单号", prop: 'preparationPlanNumber' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1132,22 +1132,22 @@ export const IssueJob = [
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "上游任务编号", prop: 'upStreamJobNumber',},
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "优先级", prop: 'priority' },
   { label: "优先级增量", prop: 'priorityIncrement' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "工作组", prop: 'workGroupCode' },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1163,15 +1163,15 @@ export const IssueNote =  [
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate' },
   { label: "车间", prop: 'workshop' },
   { label: "确认时间", prop: 'confirmTime' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1190,16 +1190,16 @@ export const automaticCallApply =  [
   { label: "叫料类型", prop: 'type' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备料计划单号", prop: 'preparationPlanNumber' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1218,23 +1218,23 @@ export const automaticCallJob =  [
   { label: "叫料请求类型", prop: 'requestType' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "优先级", prop: 'priority' },
   { label: "优先级增量", prop: 'priorityIncrement' },
   { label: "工作组", prop: 'workGroupCode' },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -1249,17 +1249,17 @@ export const automaticCallNote =  [
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate' },
   { label: "车间", prop: 'workshop' },
   { label: "确认时间", prop: 'confirmTime' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 上架前退货记录 已调整 1
@@ -1273,17 +1273,17 @@ export const beforeGroundingReturnNote =  [
   { label: "操作员", prop: 'worker' },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "收货单号", prop: "rpNumber" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { 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: "ID", prop: 'id' },
   { label: "returnType", prop: 'returnType' },
   { label: "status", prop: 'status' },
   // -----------------------------------------------------------------------
@@ -1304,17 +1304,17 @@ export const PurchaseReturnRequest =  [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "收货单号", prop: 'rpNumber' },
   { label: "returnType", prop: 'returnType' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 上架后退货任务 已调整 1
@@ -1334,12 +1334,12 @@ export const PurchaseReturnJob =  [
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "公司", prop: 'company' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "操作员", prop: 'worker' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
@@ -1348,11 +1348,11 @@ export const PurchaseReturnJob =  [
   { label: "优先级增量", prop: 'priorityIncrement' },
   { label: "工作组", prop: 'workGroupCode' },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "收货单号", prop: 'rpNumber' },
   { label: "任务描述", prop: 'jobDescription' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 上架后退货记录 已调整 1
@@ -1365,20 +1365,20 @@ export const PurchaseReturnNote =  [
   { label: "退货时间", prop: "returnTime",type:"dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate',type: "dateTime" },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "收货单号", prop: 'rpNumber' },
   { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
   { label: "returnType", prop: 'returnType' },
   { label: "status", prop: 'status' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 原料报废记录 已调整 1
@@ -1388,17 +1388,17 @@ export const ScrapNote =  [
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "公司", prop: 'company' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "报废类型", prop: 'type' },
   { label: "报废请求单号", prop: 'scrapRequestNumber' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 原料直发记录 已调整 1
@@ -1411,11 +1411,11 @@ export const materialDirectSendNote =  [
   // -----------------------------------------------------------------------
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "发货计划单号", prop: 'deliverPlanNumber' },
   { label: "发货申请单号", prop: 'deliverRequestNumber' },
@@ -1426,7 +1426,7 @@ export const materialDirectSendNote =  [
   { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 直接发料记录 
@@ -1439,15 +1439,15 @@ export const directIssueNote =  [
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate' },
   { label: "车间", prop: 'workshop' },
   { label: "确认时间", prop: 'confirmTime' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   { label: "申请单号", prop: 'requestNumber' },
   { label: "任务单号", prop: 'jobNumber' },
@@ -1468,13 +1468,13 @@ export const ProductReceiptRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "生产计划编号", prop: 'productionPlanNumber' },
   { label: "车间", prop: 'workshop' },
@@ -1483,7 +1483,7 @@ export const ProductReceiptRequest = [
   { label: "班组", prop: 'team' },
   { label: "计划日期", prop: 'planDate',type: "dateTime" },
   { label: "类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货缴库记录 已调整 1
@@ -1492,13 +1492,13 @@ export const ProductReceiptNote = [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate',type: "dateTime" },
   { label: "完工时间", prop: 'completeTime',type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "上级关联菜单号", prop: 'sourceNumber' },
@@ -1507,7 +1507,7 @@ export const ProductReceiptNote = [
   { label: "车间", prop: 'workShop' },
   { label: "类型", prop: 'type' },
   { label: "receiptType", prop: 'receiptType' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货报废申请 1
@@ -1522,16 +1522,16 @@ export const ProductReceiptScrapRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "报废类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 完工收货报废记录 已调整 1
@@ -1540,18 +1540,18 @@ export const ProductReceiptScrapNote = [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "报废请求单号", prop: 'scrapRequestNumber' },
   { label: "报废类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 半成品上架记录 已调整 1
@@ -1560,12 +1560,12 @@ export const partiallyPreparedProductsNote =  [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "供应商代码", prop: 'supplierCode' },
@@ -1577,7 +1577,7 @@ export const partiallyPreparedProductsNote =  [
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "完工收货单号", prop: 'productReceiptNumber' },
   { label: "类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 成品发货申请 已调整 1
@@ -1595,16 +1595,16 @@ export const DeliverRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "发货计划单号", prop: 'deliverPlanNumber' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 成品发货任务 已调整 1
@@ -1621,11 +1621,11 @@ export const DeliverJob = [
   { label: "完成用户", prop: 'completeUserName' },
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
@@ -1634,8 +1634,8 @@ export const DeliverJob = [
   { label: "优先级增量", prop: 'priorityIncrement' },
   { label: "工作组", prop: 'workGroupCode' },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "客户地址", prop: 'customerAddressCode' },
   { label: "发货计划单号", prop: 'deliverPlanNumber' },
@@ -1643,7 +1643,7 @@ export const DeliverJob = [
   { label: "到库区", prop: 'toLocationArea' },
   { label: "到库位组", prop: 'toLocationGroup' },
   { label: "到ERP库位代码", prop: 'toLocationErpCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 成品发货记录 已调整 1
@@ -1657,11 +1657,11 @@ export const DeliverNote = [
   { label: "客户地址", prop: 'customerAddressCode' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
@@ -1671,7 +1671,7 @@ export const DeliverNote = [
   { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "目标ERP库位代码", prop: 'toLocationErpCode' },
   { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // FIS发货申请 已调整 1
@@ -1689,16 +1689,16 @@ export const FISDeliverRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "发货计划单号", prop: 'deliverPlanNumber' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // FIS发货记录 已调整 1
@@ -1709,12 +1709,12 @@ export const FISDeliverNote = [
   { label: "客户代码", prop: "customerCode" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "发货时间", prop: "deliverTime", type: "dateTime" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
@@ -1726,7 +1726,7 @@ export const FISDeliverNote = [
   { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "目标ERP库位代码", prop: 'toLocationErpCode' },
   { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 客户退拆申请 已调整 1
@@ -1736,11 +1736,11 @@ export const customerDismantle = [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "车间", prop: 'workshop' },
   { label: "公司", prop: 'company' },
   { label: "班次", prop: 'shift' },
@@ -1751,7 +1751,7 @@ export const customerDismantle = [
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 客户退拆记录 已调整 1
@@ -1760,19 +1760,19 @@ export const customerDismantleNote = [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效时间", prop: "activeDate",type: "dateTime" },
   { label: "回收时间", prop: "recycleTime" ,type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "申请单号", prop: 'requestNumber' },
   { label: "备注", prop: 'remark' },
   { label: "公司", prop: 'company' },
   { label: "班次", prop: 'shift' },
   { label: "车间", prop: 'workshop' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 生产退库申请 已调整 1
@@ -1788,15 +1788,15 @@ export const productionReturnRequest =  [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备注", prop: 'remark' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "id", prop: 'id' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 生产退库任务 已调整 1
@@ -1812,9 +1812,9 @@ export const productionReturnJob =  [
   { label: "完成用户", prop: 'completeUserName' },
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
@@ -1824,11 +1824,11 @@ export const productionReturnJob =  [
   { label: "优先级增量", prop: 'priorityIncrement' },
   { label: "工作组", prop: 'workGroupCode' },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "承接者Id", prop: 'acceptUserId' },
-  { label: "完成者Id", prop: 'completeUserId' },
+  { label: "承接者ID", prop: 'acceptUserId' },
+  { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "id", prop: 'id' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 生产退库记录 已调整 1
@@ -1840,16 +1840,16 @@ export const productionReturnNote =  [
   { label: "备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "退料时间", prop: 'returnTime', type: "dateTime" },
   { label: "任务ID", prop: 'jobNumber' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 
@@ -1870,7 +1870,7 @@ export const labelsList =  [
   { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
   { label: "创建时间", prop: "creationTime",type:"dateTime" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "备注", prop: "remark" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "标包计量单位", prop: 'stdPackUom' },
@@ -1888,16 +1888,16 @@ export const labelsList =  [
   { label: "生产时间", prop: "produceDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId",type:"dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId",type:"dateTime" },
   { label: "规格", prop: "specifications" },
   { label: "生产线", prop: "prodLine" },
   { label: "班次", prop: 'shift' },
   { label: "班组", prop: 'team' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "质量级别", prop: "qLevel" },
   { label: "质检文件", prop: "qualityFile" },
   { label: "labelStatus", prop: "labelStatus" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   { label: "公司", prop: "company" },
 ]
 
@@ -1912,13 +1912,13 @@ export const InventoryInitialNote = [
   { label: "库存初始化请求单号", prop: "requestNumber" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 库存余额 1
@@ -1947,11 +1947,11 @@ export const InventoryInitialNote = [
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "序号", prop: "serialNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "上次事务编号", prop: "lastTransNumber" },
   { label: "上次事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" },
   { label: "库区", prop: "locationArea" },
@@ -1960,7 +1960,7 @@ export const InventoryInitialNote = [
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
   { label: "公司", prop: "company" },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 库存事务 1
@@ -1988,9 +1988,9 @@ export const InventoryTransaction = [
   { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: "activeDate",type: "dateTime" },
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
@@ -1999,11 +1999,11 @@ export const InventoryTransaction = [
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "库区", prop: "locationArea" },
   { label: "库位组", prop: "locationGroup" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
   { label: "公司", prop: "company" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 库存快照 1
@@ -2027,18 +2027,18 @@ export const InventorySnapshot = [
   { label: "库区", prop: "locationArea" },
   { label: "ERP库位", prop: "locationErpCode" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "快照日期", prop: "snapshotDate",type: "dateTime" },
   { label: "生产时间", prop: "produceDate",type: "dateTime" },
   { label: "到货时间", prop: "arriveDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
   { label: "入库时间", prop: "putInTime", type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: "company" },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: "id" },
+  { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
 // 库存转移日志 1
@@ -2070,10 +2070,10 @@ export const InventoryTransferLog = [
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "单据号", prop: "docNumber" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
@@ -2090,7 +2090,7 @@ export const InventoryTransferLog = [
   { label: "从仓库", prop: "fromWarehouseCode" },
   { label: "到仓库", prop: "toWarehouseCode" },
   { label: "公司", prop: "company" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 预计出库存 1
@@ -2115,15 +2115,15 @@ export const expectIn = [
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: 'lot' },
   { label: "单位", prop: "uom" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 预计入库存 1
@@ -2148,15 +2148,15 @@ export const expectOut = [
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: 'lot' },
   { label: "单位", prop: "uom" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "到达时间", prop: "arriveDate",type:"dateTime" },
   { label: "过期时间", prop: "expireDate",type:"dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 非生产领料申请 已调整 1
@@ -2175,14 +2175,14 @@ export const pickingRequest =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 非生产领料审批 已调整 1
@@ -2201,14 +2201,14 @@ export const pickingApproval =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 非生产领料记录 已调整 1 
@@ -2222,14 +2222,14 @@ export const pickingNote =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 非生产退料申请 已调整 1
@@ -2248,14 +2248,14 @@ export const materialReturnRequest =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 非生产退料审批 已调整 1
@@ -2269,19 +2269,19 @@ export const materialReturnApproval =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { 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: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 非生产退料记录 已调整 1
@@ -2295,14 +2295,14 @@ export const materialReturnNote =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 回收料收货记录 已调整 1
@@ -2311,15 +2311,15 @@ export const recycledMaterialsReceipt = [
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 回收料调整申请 已调整 1
@@ -2334,15 +2334,15 @@ export const recycledMaterialsAdjustmentApply =  [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "仓库", prop: "warehouseCode" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 回收料调整记录 已调整 1
@@ -2352,16 +2352,16 @@ export const materialsAdjustment = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "仓库", prop: "warehouseCode" },
   { label: "任务单号", prop: "jobNumber" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调拨申请 已调整 1
@@ -2378,15 +2378,15 @@ export const lineSideWarehouseAllocationRequest =  [
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调拨确认 已调整 1
@@ -2400,16 +2400,16 @@ export const lineSideWarehouseAllocationConfirm =  [
   { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "任务单号", prop: "jobNumber" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调拨记录 已调整 1
@@ -2423,16 +2423,16 @@ export const lineSideWarehouseAllocationNote =  [
   { label: "使用在途库", prop: "useOnTheWayLocation",type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: "remark" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: "company" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "任务ID", prop: "jobNumber" },
   { label: "调拨类型", prop: "type" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 储位调拨记录 已调整 1
@@ -2442,20 +2442,20 @@ export const interStorageAllocationNote =  [
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
   { label: "确认时间", prop: "confirmTime",type:"dateTime" },
   { label: "申请单号", prop: "requestNumber" },
   { label: "备注", prop: "remark" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
   { label: "公司", prop: "company" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "任务ID", prop: "jobNumber" },
   { label: "类型", prop: "type" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨申请 已调整 1
@@ -2472,15 +2472,15 @@ export const customerStorageAllocationRequest =  [
   { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨确认 已调整 1
@@ -2494,16 +2494,16 @@ export const customerStorageAllocationConfirm =  [
   { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "任务ID", prop: 'jobNumber' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨记录 已调整 1
@@ -2516,17 +2516,17 @@ export const customerStorageAllocationNote =  [
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "调拨类型", prop: 'type' },
   { label: "备注", prop: 'remark' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 储位内移库记录 已调整 1
@@ -2536,20 +2536,20 @@ export const intraStorageTransferNote =  [
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   { label: "确认时间", prop: 'confirmTime' },
   { label: "申请单号", prop: 'requestNumber' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "任务ID", prop: 'jobNumber' },
   { label: "类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓缴库申请 已调整 1
@@ -2565,9 +2565,9 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "仓库", prop: 'warehouseCode' },
@@ -2576,10 +2576,10 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "生产线", prop: 'prodLine' },
   { label: "班次", prop: 'shift' },
   { label: "班组", prop: 'team' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "计划日期", prop: 'planDate' },
   { label: "类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓缴库记录 已调整 1
@@ -2589,9 +2589,9 @@ export const lineSideWarehousePaymentNote = [
   { label: "缴库时间", prop: 'completeTime',type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
@@ -2599,11 +2599,11 @@ export const lineSideWarehousePaymentNote = [
   { label: "上级关联菜单号", prop: 'sourceNumber' },
   { label: "生产计划单号", prop: 'productionPlanNumber' },
   { label: "任务ID", prop: 'jobNumber' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "车间", prop: 'workShop' },
   { label: "receiptType", prop: 'receiptType' },
   { label: "类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓报废申请 已调整 1
@@ -2618,16 +2618,16 @@ export const lineSideWarehouseScrappingRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "公司", prop: 'company' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "报废类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓报废记录 已调整 1
@@ -2638,16 +2638,16 @@ export const lineSideWarehouseScrappingNote = [
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "任务ID", prop: 'jobNumber' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "报废类型", prop: 'type' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调整申请 已调整 1
@@ -2662,15 +2662,15 @@ export const lineSideWarehouseAdjustmentSheetRequest =  [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "备注", prop: 'remark' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓调整记录 已调整 1
@@ -2679,19 +2679,19 @@ export const lineSideWarehouseAdjustmentSheetNote =  [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "类型", prop: 'type' },
   { label: "盘点记录单号", prop: 'countNoteNumber' },
   { label: "盘点计划号", prop: "countPlanNumber" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "是否调整", prop: "isAdjusted", type: "filter", filters: "whetherOrNot" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "备注", prop: 'remark' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 盘点计划 已调整 1
@@ -2711,18 +2711,18 @@ export const CountPlan = [
   { label: "类型", prop: "type",type: "filter", filters: "checkType" },
   { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
   { label: "生效时间", prop: 'activeDate', type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { 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: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "物品代码JSON", prop: 'jsonItemCodes' },
   { label: "库位JSON", prop: 'jsonLocationCodes' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -2745,19 +2745,19 @@ export const CountJob = [
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "类型", prop: "type",type: "filter", filters: "checkType" },
   { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "承接者Id", prop: "acceptUserId" },
-  { label: "完成者Id", prop: "completeUserId" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "承接者ID", prop: "acceptUserId" },
+  { label: "完成者ID", prop: "completeUserId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "优先级", prop: 'priority' },
   { label: "优先级增量", prop: 'priorityIncrement' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
   { label: "描述", prop: "description" },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "工作组代码", prop: "workGroupCode" },
   { label: "仓库代码", prop: "warehouseCode" },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -2776,13 +2776,13 @@ export const CountNote = [
   { label: "类型", prop: "type",type: "filter", filters: "checkType" },
   { label: "阶段", prop: "stage", type: "filter", filters: "stageType" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "描述", prop: "description" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 盘点调整申请 已调整 1
@@ -2796,13 +2796,13 @@ export const CountPlanAdjust = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: 'remark' },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 // 盘点调整记录 已调整 1
@@ -2816,13 +2816,13 @@ export const CountAdjustNote = [
   // -----------------------------------------------------------------------
   { label: "类型", prop: "type",type: "filter", filters: "checkType" },
   { label: "备注", prop: "remark" },
-  { label: "事务代码", prop: "tenantId" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
   { label: "上次修改者", prop: "lastModifierId" },
   { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 
@@ -2835,16 +2835,16 @@ export const MessageType = [
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "电子邮件模板", prop: "emailTemplate" },
   { label: "sms模板", prop: "smsTemplate" },
   { label: "是否发送Email", prop: 'isSendEmail', type: "filter", filters: "whetherOrNot" },
   { label: "是否发送Sms", prop: 'isSendSms', type: "filter", filters: "whetherOrNot" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
 
@@ -2860,10 +2860,10 @@ export const Department =  [
   { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "公司", prop: 'company' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
\ No newline at end of file

From ce485c9b58575887a97f6ded4d849e37e7a0a994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 14:00:55 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=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 | 59 +++++++++++++-------
 fe/PC/src/utils/tableColumns/index.js        | 14 +++--
 fe/PC/src/utils/tabsDesTions/index.js        |  8 +--
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index c477f3157..413866740 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/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 =  [
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 6999b4f3f..a47a92237 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/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 },
   // -----------------------------------------------------------------------
 ]
 // 采购收货记录 已调整
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 3cda75594..9b301d42f 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/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

From 1983799070a4ef115ea030803d42a10c9dd38002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 14:09:59 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseReceipt/PurchaseReceiptJob-msQuery.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
index 5eb434366..6491e85ee 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
@@ -162,7 +162,7 @@ export default {
   data () {
     let _this = this
     return {
-      URL: 'wms/job/purchase-receipt-job',
+      URL: 'wms/store/purchase-receipt-job',
       handleMultipleSelection: [],
       uploadDialogShow: false,
       uploadLoading:false,//上传图片Loading

From 1fbb8b06880b74b7199fb8df8673a4bab28b2879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 14:18:44 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js | 171 +++++++++++++++++++++++---
 fe/PC/src/utils/tabsDesTions/index.js |  13 +-
 2 files changed, 162 insertions(+), 22 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 6999b4f3f..f0083a0e3 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1209,7 +1209,7 @@ export const PurchaseReceiptJob =  [
   { label: "时间窗口", prop: 'timeWindow' },
   // -----------------------------------------------------------------------
 ]
-// 采购收货记录 已调整
+// 采购收货记录 已调整 20230404
 export const PurchaseReceiptNote = [
   {
     label: "收货单号",
@@ -1220,26 +1220,27 @@ export const PurchaseReceiptNote = [
   },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { 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" },
-  { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "筹措员代码", prop: "contactUserName" },
   { label: "备注", prop: 'remark' },
   { label: "收货时间", prop: 'receiveTime',type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "生效日期", prop: "activeDate",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "type", prop: 'type' },
   { label: "status", prop: 'status' },
   { label: "任务代码", prop: 'jobNumber' },
   // -----------------------------------------------------------------------
 ]
-// 采购收货记录-详情【合格品收货明细】
+// 采购收货记录-详情【合格品收货明细】 20230404
 export const qualifiedInfo = [
   {
     label: "检验单号",
@@ -1251,16 +1252,61 @@ export const qualifiedInfo = [
   { label: "状态",prop: "purchaseReceiptInspectStatus",  type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
   { 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: "lot" },
   { label: "箱码", prop: "packingCode" },
-  { label: "ERP库位", prop: "recommendErpCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  // { label: "ERP库位", prop: "recommendErpCode" },
   { label: "到货时间", prop: "arriveDate",type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
+  // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "订单号", prop: "poNumber" },
+  { label: "订单行", prop: "poLine" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
+  { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
+  { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
+  { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
+  { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "库区", prop: "locationArea" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "推荐批次排序", prop: "recommendLot" },
+  { label: "实际批次排序", prop: "handledLot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "目检照片Json", prop: 'inspectPhotoJson' },
+  { label: "不合格原因代码", prop: 'failedReason' },
+  { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  { label: "质量缺陷", prop: "massDefect" },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "status", prop: 'status' },
 ]
-// 采购收货记录-详情【不合格品收货明细】
+// 采购收货记录-详情【不合格品收货明细】 20230404
 export const unqualifiedInfo = [
   {
     label: "检验单号",
@@ -1272,25 +1318,118 @@ export const unqualifiedInfo = [
   { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
   { 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: "packingCode" },
-  { label: "ERP库位", prop: "recommendErpCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
   { label: "不合格原因代码", prop: 'failedReason' },
   { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
   { label: "质量缺陷", prop: "massDefect" },
-  { label: "到货时间", prop: "arriveTime",type: "dateTime" },
+  { label: "到货时间", prop: "arriveDate",type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
-  { label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" }
+  { label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" },
+  // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "订单号", prop: "poNumber" },
+  { label: "订单行", prop: "poLine" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
+  { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
+  { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
+  { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
+  { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "库区", prop: "locationArea" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "批次排序", prop: "lot" },
+  { label: "推荐批次排序", prop: "recommendLot" },
+  { label: "实际批次排序", prop: "handledLot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "目检照片Json", prop: 'inspectPhotoJson' },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "status", prop: 'status' },
 ]
-// 采购收货记录-详情【收货缺料明细】
+// 采购收货记录-详情【收货缺料明细】 20230404
 export const lackMaterialsInfo = [
   { label: "物品代码", prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "批次", prop: "lot" },
-  { label: "ERP库位", prop: "recommendErpCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  // -----------------------------------------------------------------------
+  { label: "单据号", prop: "number" },
+  { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "订单号", prop: "poNumber" },
+  { label: "订单行", prop: "poLine" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "物品单位", prop: "uom" },
+  { label: "数量", prop: "qty" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "到货时间", prop: "arriveDate",type: "dateTime" },
+  { label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
+  { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
+  { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type: "dateTime" },
+  { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
+  { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "库区", prop: "locationArea" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "推荐批次排序", prop: "recommendLot" },
+  { label: "实际批次排序", prop: "handledLot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "目检照片Json", prop: 'inspectPhotoJson' },
+  { label: "不合格原因代码", prop: 'failedReason' },
+  { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  { label: "质量缺陷", prop: "massDefect" },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "status", prop: 'status' },
 ]
 // 报检单 已调整
 export const InspectNotice =  [
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 3cda75594..e4570d3ef 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -952,12 +952,12 @@ export const PurchaseReceiptJob = [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 采购收货记录 已调整 20221220
+// 采购收货记录 已调整 20230404
 export const PurchaseReceiptNote =  [
   { label: "收货单号", prop: 'number' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "发货单号", prop: "asnNumber" },
-  { label: "到货单号", prop: 'arriveNoticeNumber' },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "采购订单号", prop: "poNumber" },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
@@ -965,8 +965,9 @@ export const PurchaseReceiptNote =  [
   { label: "备注", prop: 'remark' },
   { label: "收货时间", prop: "receiveTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
-  { label: "是否有不合格", prop: "hasNoOk" },
-  { label: "是否有缺料", prop: "hasNoReceipt" },
+  // TODO:两个字段
+  // { label: "是否有不合格", prop: "hasNoOk" },
+  // { label: "是否有缺料", prop: "hasNoReceipt" },
   // -----------------------------------------------------------------------
   { label: "创建者ID", prop: "creatorId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
@@ -977,9 +978,9 @@ 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' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 报检单 已调整 20221220

From 9c9d0c3dd9ea4182c914fe0a1d0f70d998da4310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 14:19:08 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/views/basicData/ItemsManage/ItemPack.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
index 040406501..f88e1e788 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
@@ -155,7 +155,7 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
@@ -164,7 +164,7 @@ export default {
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
         { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

From 1bb607be453291bdec5651e4f81c0557289d479c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 14:50:16 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AA=97=E5=8F=A3=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=AD=9B=E9=80=89=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicData/SupplierManage/SupplierTime.vue | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
index e0bf2dd84..89b691ad3 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
@@ -151,9 +151,13 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier",
+            this.isFilter("code", this.CreateFormData.supplierCode)
+          )},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
+        
         { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -162,9 +166,13 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier",
+            this.isFilter("code", this.editFormData.supplierCode)
+          )},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -191,6 +199,18 @@ export default {
     this.paging();
   },
   methods: {
+    //过滤查询条件
+    isFilter (val, data) {
+      let filter = [
+        {
+          logic: "And",
+          column: val,
+          action: "==",
+          value: data
+        }
+      ]
+      return filter
+    },
     addNewDataPush (val) {
       if (this.theEvent == 'newly') {
         if (val[1].prop == 'supplierCode' || val[1].prop == 'supplierName') {

From 36a807cc8dc57400a45effaae64b4f8d954e9d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 15:17:53 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js                     | 2 +-
 fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 51a189db8..e4fba05f4 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1112,7 +1112,7 @@ export const PurchaseOrder = [
   { label: "联系人邮件", prop: 'contactEmail' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "订单类型", prop: 'poType' },
-  { label: "是否寄存订单", prop: 'isConsignment' },
+  { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
   { label: "截止日期", prop: 'dueDate',type: "dateTime" },
   { label: "版本", prop: 'version' },
diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
index 768d06abc..2c55bdcc6 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
@@ -131,7 +131,8 @@ export default {
         supplierItemCode: null,
         version: null,
         supplierPackQty: 0,
-        supplierPackUom: '包装单位',
+        // supplierPackUom: '包装单位',
+        supplierPackUom: '',
         itemName: null,
         supplierCode: null,
         itemCode: null,
@@ -164,6 +165,8 @@ export default {
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
+        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -173,7 +176,8 @@ export default {
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
-        { type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

From 2524e81d2b46900bbf4bc449633fae499234f8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 16:06:47 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E5=AF=BC=E5=85=A5method=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/mixins/mixins.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fe/PC/src/mixins/mixins.js b/fe/PC/src/mixins/mixins.js
index 5daf230f7..28308e0ab 100644
--- a/fe/PC/src/mixins/mixins.js
+++ b/fe/PC/src/mixins/mixins.js
@@ -219,7 +219,15 @@ export const mixins = {
 
             let fd = new FormData();
             fd.append("fileType", 1) //文件类型  固定1
-            fd.append("method", val[1].method) //导入方式 0 更新 1 追加 2 覆盖
+            let methodVal = ''
+            if (val[1].method == '0') {
+              methodVal = 'Update'
+            } else if (val[1].method == '1') {
+              methodVal = 'Append'
+            } else if (val[1].method == '2') {
+              methodVal = 'Replace'
+            }
+            fd.append("method", methodVal) //导入方式 0 更新 1 追加 2 覆盖
             fd.append("isAllowPartImport", val[1].isAllowPartImport=='0'?true:false) //是否部分错误导入 
             fd.append("route", _isSpecial ? _uploadURL : _uploadURL + '/import') //路由 
             fd.append("function", menuName) //菜单名

From 93b12d19aaf81ed84ee6a7926797b38e480b004d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 16:25:46 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index e4fba05f4..cea25d174 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -227,12 +227,12 @@ export const BomInner = [
 // 客户信息 20230328
 export const Customer = [
   {
-    label: "客户名称",
-    prop: "name",
+    label: "客户代码",
+    prop: "code",
     fixed: "left",
     type: "name"
   },
-  { label: "客户代码", prop: "code" },
+  { label: "客户名称", prop: "name" },
   { label: "状态", prop: "isActive", type: "filter", filters: "openToCloseBit" },
   { label: "联系人", prop: "contacts" },
   { label: "电话", prop: "phone" },