refactor: 调整beforeSetup autologin 默认值

cypress/e2e/auth.cy.ts

@@ -2,7 +2,7 @@ import {beforeSetup} from './utils';
 
 describe('登录测试', function () {
   beforeEach(function () {
-    beforeSetup();
+    beforeSetup(false);
   });
 
   function inputLogin() {

cypress/e2e/container.cy.ts

@@ -44,7 +44,7 @@ const scrapBasicData = {
 
 describe('容器管理', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('基础资料', '容器管理');
   });
 

cypress/e2e/dictionary.cy.ts

@@ -42,7 +42,7 @@ const basicData = {
 
 describe('字典列表, 只用仓库管理做测试', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('基础资料', '仓库管理');
   });
 

cypress/e2e/manager.cy.ts

@@ -46,7 +46,7 @@ const TABLE_NAME = 'user_table',
 
 describe('首页', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('系统设置', '用户管理');
   });
 

cypress/e2e/material.cy.ts

@@ -42,7 +42,7 @@ const basicData = {
 
 describe('物料管理', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('基础资料', '物料管理');
   });
 

cypress/e2e/materialBind.cy.ts

@@ -28,7 +28,7 @@ const basicData = {
 
 describe('物料绑定管理', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('基础资料', '物料绑定管理');
   });
 

cypress/e2e/matter.cy.ts

@@ -39,7 +39,7 @@ const TABLE_NAME = 'matter_table';
 
 describe('库位绑定管理', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('基础资料', '库位绑定管理');
   });
 

cypress/e2e/menu.cy.ts

@@ -33,7 +33,7 @@ const TABLE_NAME = 'menu_table',
 
 describe('菜单管理', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('系统设置', '菜单管理');
   });
 

cypress/e2e/pdaMenu.cy.ts

@@ -31,7 +31,7 @@ const TABLE_NAME = 'menu_table';
 
 describe('pda菜单', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('系统设置', 'PDA菜单管理');
   });
 

cypress/e2e/purchase.cy.ts

@@ -40,7 +40,7 @@ const basicData = {
 
 describe('采购单列表', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('入库管理', '采购单列表');
   });
 

cypress/e2e/quality.cy.ts

@@ -44,7 +44,7 @@ const basicData = {
 
 describe('质检单列表', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('入库管理', '质检单列表');
   });
 

cypress/e2e/rawInStream.cy.ts

@@ -45,7 +45,7 @@ const basicData = {
 
 describe('原材料入库明细', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('入库管理', '原材料入库明细');
   });
 

cypress/e2e/role.cy.ts

@@ -35,7 +35,7 @@ const TABLE_NAME = 'role_table',
 
 describe('角色', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('系统设置', '角色管理');
   });
 

cypress/e2e/semiReport.cy.ts

@@ -0,0 +1,56 @@
+import {beforeSetup} from './utils';
+
+const basicData = {
+  id: '26',
+  noticeId: 'TGD01202303230001',
+  noticeCode: 'TGD01202303230001',
+  companyNumber: '8130',
+  noticeTime: '2023-04-12',
+  sourceType: 'G',
+  moveType: '104',
+  entryNumber: '1',
+  productionCode: 'DD01',
+  materialId: '00000000000000012034',
+  wbs: '',
+  measurementId: '00000000000000000001',
+  num: '20',
+  type: '0',
+  warehousingNum: '0',
+  page: 0,
+  limit: 0,
+  startTime: null,
+  endTime: null,
+  materialName: '酒精纸\\',
+  companyName: '青岛特来电智能设备有限公司',
+  wllbClass: null,
+  materialCode: null,
+  userId: null,
+  askGoodsId: null,
+  wllbCode: '2205010010020003',
+  serial: null,
+  producBatch: null,
+  attribute: null,
+  storageLocationCode: null,
+  storageLocationName: null,
+  storageCode: null,
+  seq: null,
+  userName: null,
+  realName: null,
+  scrq: null,
+  uniqueCode: null,
+  partType: null,
+  supplierId: null,
+  capacity: null,
+  accountName: null,
+  wmsItemId: null,
+  wmsId: null,
+  code: null,
+  name: null,
+  warehouseWhere: null,
+};
+
+describe('半成品报工单管理', function () {
+  beforeEach(function () {
+    beforeSetup();
+  });
+});

cypress/e2e/storage.cy.ts

@@ -37,7 +37,7 @@ const TABLE_NAME = 'storage_table';
 
 describe('库位管理', function () {
   beforeEach(function () {
-    beforeSetup(true);
+    beforeSetup();
     intoMenu('基础资料', '库位管理');
   });
 

cypress/e2e/utils/setup.ts

@@ -94,7 +94,7 @@ export function exportIntercept(url: string) {
   successIntercept(url).as('export');
 }
 
-export function beforeSetup(autoLogin = false) {
+export function beforeSetup(autoLogin = true) {
   loginIntercept();
   menuIntercept();
   dictionaryIntercept();

cypress/fixtures/menu/basic.json

@@ -1,6 +1,22 @@
 {
   "msg": "200",
   "data": [
+    {
+      "id": "7",
+      "name": "系统设置",
+      "url": ".",
+      "pId": "0",
+      "idCode": null,
+      "type": null,
+      "page": 0,
+      "limit": 0,
+      "orderBy": null,
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "xitongguanli",
+      "modifyUser": null,
+      "modifyTime": null,
+      "pid": "0"
+    },
     {
       "id": "41",
       "name": "用户管理",
@@ -11,43 +27,43 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "7"
     },
     {
-      "id": "64",
-      "name": "呆滞品明细",
-      "url": "/deadproduct",
-      "pId": "45",
+      "id": "79",
+      "name": "接口日志",
+      "url": "/log/gsinterface",
+      "pId": "78",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "45"
+      "pid": "78"
     },
     {
-      "id": "7",
-      "name": "系统设置",
-      "url": ".",
-      "pId": "0",
+      "id": "64",
+      "name": "呆滞品明细",
+      "url": "/deadproduct",
+      "pId": "45",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "xitongguanli",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "0"
+      "pid": "45"
     },
     {
       "id": "47",
@@ -59,28 +75,12 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "46"
     },
-    {
-      "id": "79",
-      "name": "接口日志",
-      "url": "/log/gsinterface",
-      "pId": "78",
-      "idCode": null,
-      "type": null,
-      "page": 0,
-      "limit": 0,
-      "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "",
-      "modifyUser": null,
-      "modifyTime": null,
-      "pid": "78"
-    },
     {
       "id": "52",
       "name": "采购单列表",
@@ -91,7 +91,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -99,7 +99,7 @@
     },
     {
       "id": "65",
-      "name": "物料储量预警明细",
+      "name": "物料储量预警",
       "url": "/reservewarning",
       "pId": "45",
       "idCode": null,
@@ -107,7 +107,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -123,27 +123,27 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "7"
     },
     {
-      "id": "61",
-      "name": "原材料出库明细",
-      "url": "/stream/rawout",
-      "pId": "44",
+      "id": "48",
+      "name": "库位绑定管理",
+      "url": "/matter",
+      "pId": "46",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "44"
+      "pid": "46"
     },
     {
       "id": "46",
@@ -155,27 +155,27 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "jichuziliao",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "0"
     },
     {
-      "id": "48",
-      "name": "库位绑定管理",
-      "url": "/matter",
-      "pId": "46",
+      "id": "61",
+      "name": "原材料出库明细",
+      "url": "/stream/rawout",
+      "pId": "44",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "46"
+      "pid": "44"
     },
     {
       "id": "88",
@@ -187,7 +187,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -203,123 +203,123 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "7"
     },
     {
-      "id": "66",
-      "name": "库存明细",
-      "url": "/stock",
-      "pId": "45",
+      "id": "43",
+      "name": "入库管理",
+      "url": ".",
+      "pId": "0",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "rukuguanli",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "45"
+      "pid": "0"
     },
     {
-      "id": "59",
-      "name": "半成品领料单管理",
-      "url": "/semi/draw",
-      "pId": "44",
+      "id": "49",
+      "name": "物料管理",
+      "url": "/goods",
+      "pId": "46",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "44"
+      "pid": "46"
     },
     {
-      "id": "54",
-      "name": "质检单列表",
-      "url": "/quality",
-      "pId": "43",
+      "id": "93",
+      "name": "GS错误日志",
+      "url": "/log/error",
+      "pId": "78",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "43"
+      "pid": "78"
     },
     {
-      "id": "49",
-      "name": "物料管理",
-      "url": "/goods",
-      "pId": "46",
+      "id": "59",
+      "name": "半成品领料单管理",
+      "url": "/semi/draw",
+      "pId": "44",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "46"
+      "pid": "44"
     },
     {
-      "id": "91",
-      "name": "GS错误日志",
-      "url": "/log/error",
-      "pId": "78",
+      "id": "54",
+      "name": "质检单列表",
+      "url": "/quality",
+      "pId": "43",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "78"
+      "pid": "43"
     },
     {
-      "id": "43",
-      "name": "入库管理",
-      "url": ".",
-      "pId": "0",
+      "id": "66",
+      "name": "库存明细",
+      "url": "/stock",
+      "pId": "45",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "rukuguanli",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "0"
+      "pid": "45"
     },
     {
-      "id": "56",
-      "name": "原材料入库明细",
-      "url": "/stream/rawin",
-      "pId": "43",
+      "id": "45",
+      "name": "库内管理",
+      "url": ".",
+      "pId": "0",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "pandianguanli",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "43"
+      "pid": "0"
     },
     {
       "id": "51",
@@ -331,27 +331,27 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "46"
     },
     {
-      "id": "45",
-      "name": "库内管理",
-      "url": ".",
-      "pId": "0",
+      "id": "56",
+      "name": "原材料入库明细",
+      "url": "/stream/rawin",
+      "pId": "43",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "pandianguanli",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "0"
+      "pid": "43"
     },
     {
       "id": "62",
@@ -363,7 +363,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -379,27 +379,27 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "7"
     },
     {
-      "id": "83",
-      "name": "移库单明细",
-      "url": "/relocation",
-      "pId": "45",
+      "id": "55",
+      "name": "半成品报工单管理",
+      "url": "/semi/report",
+      "pId": "43",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "45"
+      "pid": "43"
     },
     {
       "id": "69",
@@ -411,27 +411,27 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "46"
     },
     {
-      "id": "63",
-      "name": "产成品出库明细",
-      "url": "/stream/productout",
-      "pId": "44",
+      "id": "50",
+      "name": "容器管理",
+      "url": "/container",
+      "pId": "46",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "44"
+      "pid": "46"
     },
     {
       "id": "44",
@@ -443,91 +443,91 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "chukuguanli",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "0"
     },
     {
-      "id": "50",
-      "name": "容器管理",
-      "url": "/container",
-      "pId": "46",
+      "id": "83",
+      "name": "移库单明细",
+      "url": "/relocation",
+      "pId": "45",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "46"
+      "pid": "45"
     },
     {
-      "id": "55",
-      "name": "半成品报工单管理",
-      "url": "/semi/report",
-      "pId": "43",
+      "id": "63",
+      "name": "销售发货明细",
+      "url": "/stream/productout",
+      "pId": "44",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "43"
+      "pid": "44"
     },
     {
-      "id": "70",
-      "name": "公司管理",
-      "url": "/dictionary/corporation",
-      "pId": "46",
+      "id": "57",
+      "name": "半成品入库明细",
+      "url": "/stream/semiin",
+      "pId": "43",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "46"
+      "pid": "43"
     },
     {
-      "id": "89",
-      "name": "盘点明细",
-      "url": "/inventory",
-      "pId": "45",
+      "id": "70",
+      "name": "公司管理",
+      "url": "/dictionary/corporation",
+      "pId": "46",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "45"
+      "pid": "46"
     },
     {
-      "id": "85",
-      "name": "产成品报工单",
-      "url": "/product/report",
-      "pId": "43",
+      "id": "78",
+      "name": "系统日志",
+      "url": ".",
+      "pId": "0",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "gongzuoguanli",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "43"
+      "pid": "0"
     },
     {
       "id": "80",
@@ -539,59 +539,59 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "44"
     },
     {
-      "id": "57",
-      "name": "半成品入库明细",
-      "url": "/stream/semiin",
+      "id": "85",
+      "name": "产成品报工单",
+      "url": "/product/report",
       "pId": "43",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "43"
     },
     {
-      "id": "78",
-      "name": "系统日志",
-      "url": ".",
-      "pId": "0",
+      "id": "89",
+      "name": "盘点明细",
+      "url": "/inventory",
+      "pId": "45",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "gongzuoguanli",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
+      "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "0"
+      "pid": "45"
     },
     {
-      "id": "81",
-      "name": "销售单明细",
-      "url": "/sellorder",
-      "pId": "44",
+      "id": "58",
+      "name": "产成品入库明细",
+      "url": "/stream/productin",
+      "pId": "43",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "44"
+      "pid": "43"
     },
     {
       "id": "71",
@@ -603,27 +603,27 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "46"
     },
     {
-      "id": "58",
-      "name": "产成品入库明细",
-      "url": "/stream/productin",
-      "pId": "43",
+      "id": "81",
+      "name": "销售单明细",
+      "url": "/sellorder",
+      "pId": "44",
       "idCode": null,
       "type": null,
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
-      "pid": "43"
+      "pid": "44"
     },
     {
       "id": "72",
@@ -635,44 +635,12 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
       "pid": "46"
     },
-    {
-      "id": "92",
-      "name": "半成品其他入库",
-      "url": "/putin/other",
-      "pId": "43",
-      "idCode": null,
-      "type": null,
-      "page": 0,
-      "limit": 0,
-      "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "",
-      "modifyUser": null,
-      "modifyTime": null,
-      "pid": "43"
-    },
-    {
-      "id": "93",
-      "name": "半成品其他出库",
-      "url": "/putout/other",
-      "pId": "44",
-      "idCode": null,
-      "type": null,
-      "page": 0,
-      "limit": 0,
-      "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
-      "img": "",
-      "modifyUser": null,
-      "modifyTime": null,
-      "pid": "44"
-    },
     {
       "id": "73",
       "name": "计量单位管理",
@@ -683,7 +651,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -699,7 +667,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -715,7 +683,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,
@@ -731,7 +699,7 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,91,93,92,",
+      "menu": "28,7,27,65,45,64,63,44,62,61,59,58,43,57,56,55,54,52,50,46,51,49,48,47,42,41,66,69,76,75,74,73,72,71,70,79,78,80,81,83,85,88,89,93,95,96,",
       "img": "",
       "modifyUser": null,
       "modifyTime": null,