diff --git a/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue b/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue
index cbfb571..26568f3 100644
--- a/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue
+++ b/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue
@@ -27,7 +27,7 @@
 
 
 
-      <a-tab-pane key="2" tab="料品属性">
+      <a-tab-pane key="2" tab="料品自定义属性">
         <!-- 料品属性 Start -->
         <vxe-form :data="options.formOptions2.data" ref="xForm2" :title-width="options.formOptions2.titleWidth"
           :title-align="options.formOptions2.titleAlign" :rules="options.formOptions2.rules"
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/List.vue b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
index cf310cb..5c28e42 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/List.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
@@ -45,8 +45,8 @@ export default {
         keyName: 'id', // 主键字段名
         listFieldName: 'MesStock',
 
-        addPageUrl: "/MesWarehouse/MesWarehousePositionAdd",
-        editPageUrl: "/MesWarehouse/MesWarehousePositionUpdate/",
+        addPageUrl: "/MesStock/MesStockAdd",
+        editPageUrl: "/MesStock/MesStockUpdate/",
 
         // 接口动作
         actions: { // Api 接口地址
@@ -141,16 +141,19 @@ export default {
       this.pageOptions = pageData;
     },
 
-    // 出库
+    // 入库
     stockOut(id) {
       console.log("stockOut:"+id)
+      this.$router.push('/MesStock/MesStockOut/'+id) // 跳转路由
     },
 
     // 入库
     stockIn(id) {
       console.log("stockIn:"+id)
+      this.$router.push('/MesStock/MesStockIn/'+id) // 跳转路由
     },
 
+
   },
   watch: {
 
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/InList.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue
similarity index 94%
rename from src/pages/Middle/Mes/MesStock/MesStock/InList.vue
rename to src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue
index faedb8b..ec77df6 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/InList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue
@@ -2,7 +2,7 @@
   <basic-page-list :desc="desc" :options="pageOptions">
 
     <template v-slot:column1="{ row }">
-      <a-button class="in"  type="default" @click="stockIn(row.id)">查看详情</a-button>
+      <a-button class="in"  type="default" @click="LogDetail(row.id)">查看详情</a-button>
     </template>
   </basic-page-list>
 </template>
@@ -12,7 +12,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 
 export default {
-  i18n: require("./i18n"),
+  i18n: require("../i18n"),
   props: {
 
   },
@@ -80,7 +80,6 @@ export default {
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入仓位名称' } } },
           { span: 8, slots: { default: 'date' } },  // 自定义列
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -133,7 +132,6 @@ export default {
             //
             // =============================== 表格列 自动生成 Start ===============================
 
-            { title: '操作', slots: { default: 'op' }, width: 120 },
             { field: 'id' , slots: { default: 'column1' }, sortable: true, title: '查看详情', width: 100 }, // 查看详情
             { field: 'product_detail.name', sortable: true, title: '料品名称', width: 250 }, // 料品名称
             { field: 'in_type', sortable: true, title: '入库类型', width: 100 }, // 入库类型
@@ -180,14 +178,9 @@ export default {
       });
     },
 
-    // 入库
-    stockOut(id) {
-      console.log("stockOut:"+id)
-    },
-
-    // 入库
-    stockIn(id) {
-      console.log("stockIn:"+id)
+    LogDetail(id){
+      console.log("LogDetail:"+id)
+      this.$router.push('/MesStock/MesStockOutInLogDetail/'+id) // 跳转路由
     },
 
   },
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/LogDetail.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
similarity index 98%
rename from src/pages/Middle/Mes/MesStock/MesStock/LogDetail.vue
rename to src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
index caf2b15..d868f85 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/LogDetail.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
@@ -9,7 +9,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 export default {
 
-  i18n: require('./i18n'),
+  i18n: require('../i18n'),
   components: {},
   props: {
     pageMode: {
@@ -60,7 +60,7 @@ export default {
 
         uploadDefaultImg: null,
 
-        detailDataFieldName: "mes_unit",
+        detailDataFieldName: "product_stock_log",
 
         actions: {
           // =============================== 接口地址 自动生成 Start ===============================
@@ -170,7 +170,7 @@ export default {
 
       };
 
-      pageData.actions.get = pageData.actions.MesStockDetail;
+      pageData.actions.get = pageData.actions.ProductStockLogDetail;
       pageData.actions.create = pageData.actions.MesStockCreate;
       pageData.actions.update = pageData.actions.MesStockUpdate;
       // 合并表单数据及配置
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/LogEdit.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogEdit.vue
similarity index 90%
rename from src/pages/Middle/Mes/MesStock/MesStock/LogEdit.vue
rename to src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogEdit.vue
index 0db14fd..267a46d 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/LogEdit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogEdit.vue
@@ -9,7 +9,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 export default {
 
-  i18n: require('./i18n'),
+  i18n: require('../i18n'),
   components: {},
   props: {
     pageMode: {
@@ -60,7 +60,7 @@ export default {
 
         uploadDefaultImg: null,
 
-        detailDataFieldName: "mes_unit",
+        detailDataFieldName: "product_stock_log",
 
         actions: {
           // =============================== 接口地址 自动生成 Start ===============================
@@ -151,12 +151,18 @@ export default {
 
             { field: 'stock_pos_id', title: '库位ID', span: 12, itemRender: { name: '$input' } },
             { field: 'product_id', title: '产品ID', span: 12, itemRender: { name: '$input' } },
-            { field: 'stock', title: '入库数量', span: 12, itemRender: { name: '$input' } },
+            { field: 'stock', title: '剩余库存数量', span: 12, itemRender: { name: '$input' } },
+            { field: 'in_type', title: '入库类型', span: 12, itemRender: { name: '$input' } },
             { field: 'in_time', title: '入库时间', span: 12, itemRender: { name: '$input' }  ,props: { type: "date" }},
             { field: 'in_user_id', title: '入库人员id', span: 12, itemRender: { name: '$input' } },
             { field: 'in_user_name', title: '入库人员姓名', span: 12, itemRender: { name: '$input' } },
+            { field: 'in_stock', title: '入库数量', span: 12, itemRender: { name: '$input' } },
+            { field: 'out_stock', title: '出库数量', span: 12, itemRender: { name: '$input' } },
+            { field: 'out_time', title: '出库时间', span: 12, itemRender: { name: '$input' }  ,props: { type: "date" }},
+            { field: 'out_user_id', title: '出库人员id', span: 12, itemRender: { name: '$input' } },
+            { field: 'out_user_name', title: '出库人员姓名', span: 12, itemRender: { name: '$input' } },
+            { field: 'out_type', title: '出库类型', span: 12, itemRender: { name: '$input' } },
             { field: 'bill_date', title: '单据日期', span: 12, itemRender: { name: '$input' ,props: { type: "date" }} },
-            { field: 'in_type', title: '入库类型', span: 12, itemRender: { name: '$input' } },
             { field: 'business_type', title: '业务类型', span: 12, itemRender: { name: '$input' } },
             { field: 'business_no', title: '业务单号', span: 12, itemRender: { name: '$input' } },
             { field: 'out_type', title: '出库类型', span: 12, itemRender: { name: '$input' } },
@@ -174,6 +180,7 @@ export default {
             { field: 'contact', title: '联系人', span: 12, itemRender: { name: '$input' } },
             { field: 'phone', title: '联系电话', span: 12, itemRender: { name: '$input' } },
             { field: 'remark', title: '备注', span: 12, itemRender: { name: '$input' } },
+            { field: 'stock', title: '剩余库存数量', span: 12, itemRender: { name: '$input' } },
 
 
 
@@ -188,7 +195,7 @@ export default {
 
       };
 
-      pageData.actions.get = pageData.actions.MesStockDetail;
+      pageData.actions.get = pageData.actions.ProductStockLogDetail;
       pageData.actions.create = pageData.actions.MesStockCreate;
       pageData.actions.update = pageData.actions.MesStockUpdate;
       // 合并表单数据及配置
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutList.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue
similarity index 94%
rename from src/pages/Middle/Mes/MesStock/MesStock/OutList.vue
rename to src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue
index e304978..856ce9a 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue
@@ -2,7 +2,7 @@
   <basic-page-list :desc="desc" :options="pageOptions">
 
     <template v-slot:column1="{ row }">
-      <a-button class="in"  type="default" @click="stockIn(row.id)">查看详情</a-button>
+      <a-button class="in"  type="default" @click="LogDetail(row.id)">查看详情</a-button>
     </template>
   </basic-page-list>
 </template>
@@ -12,7 +12,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 
 export default {
-  i18n: require("./i18n"),
+  i18n: require("../i18n"),
   props: {
 
   },
@@ -80,7 +80,6 @@ export default {
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入仓位名称' } } },
           { span: 8, slots: { default: 'date' } },  // 自定义列
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -133,7 +132,6 @@ export default {
             //
             // =============================== 表格列 自动生成 Start ===============================
 
-            { title: '操作', slots: { default: 'op' }, width: 120 },
             { field: 'id' , slots: { default: 'column1' }, sortable: true, title: '查看详情', width: 100 }, // 查看详情
             { field: 'product_detail.name', sortable: true, title: '料品名称', width: 250 }, // 料品名称
             { field: 'out_type', sortable: true, title: '出库类型', width: 100 }, // 出库类型
@@ -180,14 +178,10 @@ export default {
       });
     },
 
-    // 出库
-    stockOut(id) {
-      console.log("stockOut:"+id)
-    },
 
-    // 入库
-    stockIn(id) {
-      console.log("stockIn:"+id)
+    LogDetail(id){
+      console.log("LogDetail:"+id)
+      this.$router.push('/MesStock/MesStockOutInLogDetail/'+id) // 跳转路由
     },
 
   },
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/PositionEdit.vue b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit.vue
similarity index 69%
rename from src/pages/Middle/Mes/MesStock/MesStock/PositionEdit.vue
rename to src/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit.vue
index feb799a..82cdc27 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/PositionEdit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit.vue
@@ -8,7 +8,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 export default {
 
-  i18n: require('./i18n'),
+  i18n: require('../i18n'),
   components: {},
   props: {
     pageMode: {
@@ -52,9 +52,9 @@ export default {
         // 当前项目ID
         currentBeid: 0,
 
-        addPageUrl: "/MesWarehouse/MesWarehousePositionAdd",
-        editPageUrl: "/MesWarehouse/MesWarehousePositionUpdate/",
-        listPageUrl: "/MesWarehouse/MesWarehousePositionList",
+        addPageUrl: "/MesStock/MesStockPositionAdd",
+        editPageUrl: "/MesStock/MesStockPositionUpdate/",
+        listPageUrl: "/MesStock/MesStockPositionList",
 
 
         uploadDefaultImg: null,
@@ -62,26 +62,23 @@ export default {
 
         actions: {
           // =============================== 接口地址 自动生成 Start ===============================
-          MesWarehouseList: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/list`, // 仓库列表
-          MesWarehouseDetail: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/detail`, // 仓库详情
-          MesWarehouseCreate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/create`, // 创建仓库
-          MesWarehouseUpdate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/update`, // 更新仓库
-          MesWarehouseDelete: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/detele`, // 删除仓库
-          MesWarehouseBatchDelete: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/batchDelete`, // 批量删除仓库
-          MesWarehouseBatchUpdate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/batchUpdate`, // 批量更新仓库
-          MesWarehouseBatchCreate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/batchCreate`, // 批量创建仓库
-          MesWarehouseExportExcel: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/export/excel`, // 导出仓库数据到EXCEL
-          MesWarehouseImportExcel: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/import/excel`, // 批量导入EXCEL仓库数据
-          WarehouseLocationList: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/list`, // 仓库库位列表
-          WarehouseLocationDetail: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/detail`, // 仓库库位详情
-          WarehouseLocationCreate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/create`, // 创建仓库库位
-          WarehouseLocationUpdate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/update`, // 更新仓库库位
-          WarehouseLocationDelete: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/detele`, // 删除仓库库位
-          WarehouseLocationBatchDelete: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/batchDelete`, // 批量删除仓库库位
-          WarehouseLocationBatchUpdate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/batchUpdate`, // 批量更新仓库库位
-          WarehouseLocationBatchCreate: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/batchCreate`, // 批量创建仓库库位
-          WarehouseLocationExportExcel: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/export/excel`, // 导出仓库库位数据到EXCEL
-          WarehouseLocationImportExcel: `${BASE_URL.BASE_URL}/MesWarehouse/v1/warehouse/location/import/excel`, // 批量导入EXCEL仓库库位数据
+          MesStockList: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/list`, // 库存列表
+          MesStockDetail: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/detail`, // 库存详情
+          MesStockCreate: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/create`, // 创建库存
+          MesStockUpdate: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/update`, // 更新库存
+          MesStockDelete: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/detele`, // 删除库存
+          MesStockBatchDelete: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/batchDelete`, // 批量删除库存
+          ProductStockOut: `${BASE_URL.BASE_URL}/MesStock/v1/product/stock/out`, // 商品出库
+          ProductStockIn: `${BASE_URL.BASE_URL}/MesStock/v1/product/stock/in`, // 商品入库
+          MesStockPositionList: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/list`, // 仓位库存列表
+          MesStockPositionDetail: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/detail`, // 仓位库存详情
+          MesStockPositionCreate: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/create`, // 创建仓位库存
+          MesStockPositionUpdate: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/update`, // 更新仓位库存
+          MesStockPositionDelete: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/detele`, // 删除仓位库存
+          MesStockPositionBatchDelete: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/batchDelete`, // 批量删除仓位库存
+          MesStockPositionBatchUpdate: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/batchUpdate`, // 批量更新仓位库存
+          MesStockPositionBatchCreate: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/batchCreate`, // 批量创建仓位库存
+          MesStockPositionBatchHandle: `${BASE_URL.BASE_URL}/MesStock/v1/mes/stock/position/batchHandle`, // 批量处理仓位库存
 
           // =============================== 接口地址 自动生成 End ===============================
         },
@@ -168,9 +165,9 @@ export default {
 
 
       };
-      pageData.actions.get = pageData.actions.MesWarehouseDetail;
-      pageData.actions.create = pageData.actions.MesWarehouseCreate;
-      pageData.actions.update = pageData.actions.MesWarehouseUpdate;
+      pageData.actions.get = pageData.actions.MesStockPositionDetail;
+      pageData.actions.create = pageData.actions.MesStockPositionCreate;
+      pageData.actions.update = pageData.actions.MesStockPositionUpdate;
 
       // 合并表单数据及配置
       pageData.formOptions = Object.assign({}, this.$mk.config.defaults.formOptions, pageData.formOptions);
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/PositionList.vue b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
similarity index 93%
rename from src/pages/Middle/Mes/MesStock/MesStock/PositionList.vue
rename to src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
index 11a5fad..0b3c3d9 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/PositionList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
@@ -2,8 +2,8 @@
   <basic-page-list :desc="desc" :options="pageOptions">
 
     <template v-slot:column1="{ row }">
-      <a-button class="in"  type="primary" @click="stockIn(row.id)">入库</a-button>
-      <a-button class="out" @click="stockIn(row.id)">出库</a-button>
+      <a-button class="in"  type="primary" @click="stockIn(row.stock_id)">入库</a-button>
+      <a-button class="out" @click="stockOut(row.stock_id)">出库</a-button>
     </template>
 
 
@@ -16,7 +16,7 @@ import BASE_URL from '@/services/mes/api.js';
 
 
 export default {
-  i18n: require("./i18n"),
+  i18n: require("../i18n"),
   props: {
 
   },
@@ -48,8 +48,8 @@ export default {
         keyName: 'id', // 主键字段名
         listFieldName: 'MesStockPosition',
 
-        addPageUrl: "/MesWarehouse/MesWarehousePositionAdd",
-        editPageUrl: "/MesWarehouse/MesWarehousePositionUpdate/",
+        addPageUrl: "/MesStock/MesStockPositionAdd",
+        editPageUrl: "/MesStock/MesStockPositionUpdate/",
 
         // 接口动作
         actions: { // Api 接口地址
@@ -148,14 +148,16 @@ export default {
       });
     },
 
-    // 出库
+    // 入库
     stockOut(id) {
       console.log("stockOut:"+id)
+      this.$router.push('/MesStock/MesStockOut/'+id) // 跳转路由
     },
 
     // 入库
     stockIn(id) {
       console.log("stockIn:"+id)
+      this.$router.push('/MesStock/MesStockIn/'+id) // 跳转路由
     },
 
   },
diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue
index feb799a..22b34c3 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue
@@ -168,9 +168,9 @@ export default {
 
 
       };
-      pageData.actions.get = pageData.actions.MesWarehouseDetail;
-      pageData.actions.create = pageData.actions.MesWarehouseCreate;
-      pageData.actions.update = pageData.actions.MesWarehouseUpdate;
+      pageData.actions.get = pageData.actions.WarehouseLocationDetail;
+      pageData.actions.create = pageData.actions.WarehouseLocationCreate;
+      pageData.actions.update = pageData.actions.WarehouseLocationUpdate;
 
       // 合并表单数据及配置
       pageData.formOptions = Object.assign({}, this.$mk.config.defaults.formOptions, pageData.formOptions);
@@ -241,7 +241,10 @@ export default {
   },
   // 监听属性
   watch: {
-
+      // 将 warehouse_id 转换为 数字
+      'pageOptions.formOptions.data.warehouse_id': function (val) {
+        this.pageOptions.formOptions.data.warehouse_id = parseInt(val);
+      },
   }
 };
 
diff --git a/src/router/Middle/Mes/MesStock/router.map.js b/src/router/Middle/Mes/MesStock/router.map.js
index c28bd40..875c46a 100644
--- a/src/router/Middle/Mes/MesStock/router.map.js
+++ b/src/router/Middle/Mes/MesStock/router.map.js
@@ -64,11 +64,14 @@ routerMap[FunName + 'Update']= {
     }
 };
 
+
+
+
 routerMap[FunName + 'PositionList']= {
   name: FunTitle,
   icon: 'idcard',
   path: `/${FunName}/${FunName}PositionList`,
-  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/PositionList`),
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/Position/PositionList`),
   meta:{
     page:{ cacheAble:false}
   },
@@ -77,11 +80,61 @@ routerMap[FunName + 'PositionList']= {
   }
 };
 
+
+
+
+routerMap[FunName + 'PositionDetail']= {
+  name: FunTitle,
+  icon: 'idcard',
+  path: `/${FunName}/${FunName}PositionDetail/:id`,
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit`),
+  meta:{
+    invisible: true,
+    page:{ cacheAble:false}
+  },
+  authority: {
+    permission: [],
+  }
+};
+
+
+routerMap[FunName + 'PositionUpdate']= {
+  name: FunTitle,
+  icon: 'idcard',
+  path: `/${FunName}/${FunName}PositionUpdate/:id`,
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit`),
+  meta:{
+    invisible: true,
+    page:{ cacheAble:false}
+  },
+  authority: {
+    permission: [],
+  }
+};
+
+routerMap[FunName + 'PositionAdd']= {
+  name: FunTitle,
+  icon: 'idcard',
+  path: `/${FunName}/${FunName}PositionAdd/:id`,
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit`),
+  meta:{
+    invisible: true,
+    page:{ cacheAble:false}
+  },
+  authority: {
+    permission: [],
+  }
+};
+
+
+
+
+
 routerMap[FunName + 'OutList']= {
   name: FunTitle,
   icon: 'idcard',
   path: `/${FunName}/${FunName}OutLogList`,
-  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/OutList`),
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList`),
   meta:{
     page:{ cacheAble:false}
   },
@@ -93,7 +146,7 @@ routerMap[FunName + 'InList']= {
   name: FunTitle,
   icon: 'idcard',
   path: `/${FunName}/${FunName}InLogList`,
-  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/InList`),
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/OutIn/InList`),
   meta:{
     page:{ cacheAble:false}
   },
@@ -102,11 +155,11 @@ routerMap[FunName + 'InList']= {
   }
 };
 
-routerMap[FunName + 'LogDetail']= {
+routerMap[FunName + 'Out']= {
   name: FunTitle,
   icon: 'idcard',
-  path: `/${FunName}/${FunName}LogDetail`,
-  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/LogDetail`),
+  path: `/${FunName}/${FunName}Out/:id`,
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/OutIn/LogEdit`),
   meta:{
     invisible: true,
     page:{ cacheAble:false}
@@ -115,6 +168,37 @@ routerMap[FunName + 'LogDetail']= {
     permission: [],
   }
 };
+routerMap[FunName + 'In']= {
+  name: FunTitle,
+  icon: 'idcard',
+  path: `/${FunName}/${FunName}In/:id`,
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/OutIn/LogEdit`),
+  meta:{
+    invisible: true,
+    page:{ cacheAble:false}
+  },
+  authority: {
+    permission: [],
+  }
+};
+
+
+routerMap[FunName + 'OutInLogDetail']= {
+  name: FunTitle,
+  icon: 'idcard',
+  path: `/${FunName}/${FunName}OutInLogDetail/:id`,
+  component: () => import(`@/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail`),
+  meta:{
+    invisible: true,
+    page:{ cacheAble:false}
+  },
+  authority: {
+    permission: [],
+  }
+};
+
+
+
 
 
 InvisibleRouters.forEach(item => {