Explorar el Código

feat: 产成品出入库流水e2e

xyh hace 2 años
padre
commit
a2573e01c8

+ 60 - 0
cypress/e2e/productInStream.cy.ts

@@ -0,0 +1,60 @@
+import {
+  loginIntercept,
+  menuIntercept,
+  loginSetup,
+  optionsIntercept,
+  dictionaryIntercept,
+  intoMenu,
+  intercept,
+  validateTableList,
+  exportIntercept,
+  validateExport,
+  validateTableSearch,
+  clickDatePicker,
+} from './utils';
+
+describe('产成品入库流水', function() {
+  beforeEach(function() {
+    loginIntercept();
+    menuIntercept();
+    loginSetup();
+    optionsIntercept();
+    dictionaryIntercept();
+    intoMenu('流水管理', '产成品入库流水列表');
+  });
+
+  beforeEach(function() {
+    intercept('/warehousing/getHalf', function({search, reply}) {
+      if (search.has('wllbCode') && search.get('wllbCode').length)
+        return reply({fixture: 'product-in-stream/search1'});
+
+      if (
+        search.has('startTime') && search.get('startTime').length
+            && search.has('endTime') && search.get('endTime').length
+      )
+        return reply({fixture: 'product-in-stream/search2'});
+
+      const page = search.get('page');
+      reply({fixture: `product-in-stream/list${page}`});
+    });
+
+    exportIntercept('/warehousing/getRemovalHalfExcel');
+  });
+
+  it('表格', function() {
+    const tableName = 'product_in_stream_table';
+
+    validateTableList(tableName);
+
+    const validate = validateTableSearch(tableName);
+
+    cy.get('#filter_finishProductInCode').type('code');
+    validate('search1');
+
+    cy.get('#filter_finishProductInCode').clear();
+    clickDatePicker('date_filter_finishProductInDates');
+    validate('search2');
+
+    validateExport();
+  });
+});

+ 60 - 0
cypress/e2e/productOutStream.cy.ts

@@ -0,0 +1,60 @@
+import {
+  loginIntercept,
+  menuIntercept,
+  loginSetup,
+  optionsIntercept,
+  dictionaryIntercept,
+  intoMenu,
+  intercept,
+  validateTableList,
+  exportIntercept,
+  validateExport,
+  validateTableSearch,
+  clickDatePicker,
+} from './utils';
+
+describe('产成品出库流水', function() {
+  beforeEach(function() {
+    loginIntercept();
+    menuIntercept();
+    loginSetup();
+    optionsIntercept();
+    dictionaryIntercept();
+    intoMenu('流水管理', '产成品出库流水列表');
+  });
+
+  beforeEach(function() {
+    intercept('/askGoods/getRemovalHalf', function({search, reply}) {
+      if (search.has('wllbCode') && search.get('wllbCode').length)
+        return reply({fixture: 'product-out-stream/search1'});
+
+      if (
+        search.has('startTime') && search.get('startTime').length
+            && search.has('endTime') && search.get('endTime').length
+      )
+        return reply({fixture: 'product-out-stream/search2'});
+
+      const page = search.get('page');
+      reply({fixture: `product-out-stream/list${page}`});
+    });
+
+    exportIntercept('/askGoods/getRemovalHalfExcel');
+  });
+
+  it('表格', function() {
+    const tableName = 'product_out_stream_table';
+
+    validateTableList(tableName);
+
+    const validate = validateTableSearch(tableName);
+
+    cy.get('#filter_finishProductOutCode').type('code');
+    validate('search1');
+
+    cy.get('#filter_finishProductOutCode').clear();
+    clickDatePicker('date_filter_finishProductOutDates');
+    validate('search2');
+
+    validateExport();
+  });
+});

+ 0 - 2
cypress/e2e/utils/utils.ts

@@ -139,8 +139,6 @@ export function validateExport(testid?: string) {
 
   cy.getTestId(testid ?? 'export_btn').should('have.class', 'ant-btn-loading');
 
-  cy.wait('@export');
-
   cy.getTestId(testid ?? 'export_btn').should('not.have.class', 'ant-btn-loading');
 }
 

+ 100 - 22
cypress/fixtures/menu/basic.json

@@ -11,7 +11,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "13"
     },
     {
@@ -24,7 +25,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "user",
       "pid": "0"
     },
     {
@@ -37,7 +39,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "15"
     },
     {
@@ -50,7 +53,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "25"
     },
     {
@@ -63,7 +67,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "13"
     },
     {
@@ -76,7 +81,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "50"
     },
     {
@@ -89,9 +95,24 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "53"
     },
+    {
+      "id": "71",
+      "name": "其他出库",
+      "url": "/stock/out",
+      "pId": "70",
+      "idCode": null,
+      "type": null,
+      "page": 0,
+      "limit": 0,
+      "orderBy": null,
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
+      "pid": "70"
+    },
     {
       "id": "16",
       "name": "角色管理",
@@ -102,7 +123,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "15"
     },
     {
@@ -115,7 +137,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "25"
     },
     {
@@ -128,7 +151,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "25"
     },
     {
@@ -141,7 +165,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "truck-fast",
       "pid": "0"
     },
     {
@@ -154,7 +179,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "50"
     },
     {
@@ -167,7 +193,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "53"
     },
     {
@@ -180,7 +207,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "58"
     },
     {
@@ -193,7 +221,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "58"
     },
     {
@@ -206,7 +235,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "cloud",
       "pid": "0"
     },
     {
@@ -219,7 +249,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "25"
     },
     {
@@ -232,7 +263,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "paint-roller",
       "pid": "0"
     },
     {
@@ -245,7 +277,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "53"
     },
     {
@@ -258,7 +291,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "chart-simple",
       "pid": "0"
     },
     {
@@ -271,7 +305,50 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
+      "pid": "53"
+    },
+    {
+      "id": "68",
+      "name": "产成品入库流水列表",
+      "url": "/stream/productin",
+      "pId": "53",
+      "idCode": null,
+      "type": null,
+      "page": 0,
+      "limit": 0,
+      "orderBy": null,
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
+      "pid": "53"
+    },
+    {
+      "id": "70",
+      "name": "出入库管理",
+      "url": ".",
+      "pId": "0",
+      "idCode": null,
+      "type": null,
+      "page": 0,
+      "limit": 0,
+      "orderBy": null,
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "clipboard",
+      "pid": "0"
+    },
+    {
+      "id": "69",
+      "name": "产成品出库流水列表",
+      "url": "/stream/productout",
+      "pId": "53",
+      "idCode": null,
+      "type": null,
+      "page": 0,
+      "limit": 0,
+      "orderBy": null,
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": null,
       "pid": "53"
     },
     {
@@ -284,7 +361,8 @@
       "page": 0,
       "limit": 0,
       "orderBy": null,
-      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,",
+      "menu": "23,15,16,14,13,29,26,25,47,48,49,51,50,52,54,53,56,59,58,60,61,62,68,69,70,71,72,",
+      "img": "gear",
       "pid": "0"
     }
   ]

+ 140 - 0
cypress/fixtures/product-in-stream/list1.json

@@ -0,0 +1,140 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "6",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:14:44",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      },
+      {
+        "id": "5",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:08:35",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      },
+      {
+        "id": "4",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": null,
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "111111",
+        "seq": null,
+        "userName": null,
+        "scrq": "2023-03-16 09:07:37",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "6"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 6,
+    "startRow": 1,
+    "endRow": 6,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 102 - 0
cypress/fixtures/product-in-stream/list2.json

@@ -0,0 +1,102 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "6",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:14:44",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      },
+      {
+        "id": "5",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:08:35",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 6,
+    "startRow": 1,
+    "endRow": 6,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 102 - 0
cypress/fixtures/product-in-stream/search1.json

@@ -0,0 +1,102 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "6",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "search1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:14:44",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      },
+      {
+        "id": "5",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:08:35",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 6,
+    "startRow": 1,
+    "endRow": 6,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 102 - 0
cypress/fixtures/product-in-stream/search2.json

@@ -0,0 +1,102 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "6",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "search2",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:14:44",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      },
+      {
+        "id": "5",
+        "noticeId": null,
+        "noticeCode": null,
+        "companyNumber": null,
+        "noticeTime": null,
+        "sourceType": null,
+        "moveType": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": null,
+        "type": null,
+        "warehousingNum": null,
+        "page": 0,
+        "limit": 0,
+        "startTime": null,
+        "endTime": null,
+        "materialName": "产成品1",
+        "wllbClass": null,
+        "materialCode": null,
+        "userId": "3",
+        "askGoodsId": null,
+        "wllbCode": "CCP001",
+        "serial": "3",
+        "producBatch": "20221020",
+        "attribute": "3",
+        "storageLocationCode": "0003",
+        "seq": "0",
+        "userName": "admin",
+        "scrq": "2023-03-16 11:08:35",
+        "uniqueCode": null,
+        "partType": null,
+        "supplierId": null,
+        "capacity": "5"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 6,
+    "startRow": 1,
+    "endRow": 6,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 164 - 0
cypress/fixtures/product-out-stream/list1.json

@@ -0,0 +1,164 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "1",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "2",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "3",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 1,
+    "startRow": 1,
+    "endRow": 1,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 118 - 0
cypress/fixtures/product-out-stream/list2.json

@@ -0,0 +1,118 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "1",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "2",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 1,
+    "startRow": 1,
+    "endRow": 1,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 164 - 0
cypress/fixtures/product-out-stream/search1.json

@@ -0,0 +1,164 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "1",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "search1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "2",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "3",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 1,
+    "startRow": 1,
+    "endRow": 1,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 164 - 0
cypress/fixtures/product-out-stream/search2.json

@@ -0,0 +1,164 @@
+{
+  "msg": "200",
+  "data": {
+    "total": 12,
+    "list": [
+      {
+        "id": "1",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "search2",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "2",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      },
+      {
+        "id": "3",
+        "askGoodsId": null,
+        "entryNumber": null,
+        "productionCode": null,
+        "storageLocationName": null,
+        "userName": "admin",
+        "materialId": null,
+        "wbs": null,
+        "measurementId": null,
+        "num": "10",
+        "outNum": null,
+        "askGoodsCode": null,
+        "companyNumber": "2",
+        "sqrq": null,
+        "departmentId": null,
+        "departmentName": null,
+        "department": null,
+        "sourceType": null,
+        "moveType": null,
+        "materialName": "半成品1",
+        "materialCode": null,
+        "uniqueCode": null,
+        "storageLocationCode": null,
+        "supplierId": null,
+        "serial": null,
+        "type": null,
+        "userId": "3",
+        "scrq": "2023-03-15 16:51:12",
+        "supplierName": null,
+        "producDate": null,
+        "wllbCode": "BCP001",
+        "page": 0,
+        "limit": 0,
+        "askGoodsType": null,
+        "startTime": null,
+        "endTime": null,
+        "process": null,
+        "askGoodsApplyType": null,
+        "partType": null,
+        "attribute": null,
+        "deliveryId": "002",
+        "customerName": "供应商1",
+        "warehouseWhere": null,
+        "companyName": "测试"
+      }
+    ],
+    "pageNum": 1,
+    "pageSize": 10,
+    "size": 1,
+    "startRow": 1,
+    "endRow": 1,
+    "pages": 1,
+    "prePage": 0,
+    "nextPage": 0,
+    "isFirstPage": true,
+    "isLastPage": true,
+    "hasPreviousPage": false,
+    "hasNextPage": false,
+    "navigatePages": 8,
+    "navigatepageNums": [
+      1
+    ],
+    "navigateFirstPage": 1,
+    "navigateLastPage": 1
+  }
+}

+ 9 - 3
packages/app/src/components/modal-field/index.module.css

@@ -11,20 +11,26 @@
 
 .text-right {
   display: block;
+  width: 100px;
   height: 32px;
   line-height: 2.2;
   color: #666;
-  text-align: right;
-}
+  text-align: left;
 
-.field-required {
   &::before {
     padding-right: 4px;
     color: #f20c00;
+    visibility: hidden;
     content: '*';
   }
 }
 
+.field-required {
+  &::before {
+    visibility: visible;
+  }
+}
+
 .filed-width {
   width: 260px;
 }

+ 5 - 3
packages/app/src/pages/home/menu/hooks.tsx

@@ -84,7 +84,11 @@ export function useOpenKey(menus: ParseMenuType[]) {
 }
 
 export function useCollapsedMenu() {
-  const [state, setState] = useState(false);
+  const [state, setState] = useState(function() {
+    const width = window.innerWidth;
+
+    return width <= 1200;
+  });
 
   function onResize() {
     const width = window.innerWidth;
@@ -94,7 +98,5 @@ export function useCollapsedMenu() {
 
   useEventListener('resize', onResize);
 
-  useEffect(onResize, []);
-
   return state;
 }

+ 1 - 1
packages/app/src/pages/product-out-stream/table/index.tsx

@@ -22,7 +22,7 @@ const TableList: FC = function() {
       <Table
         columns={columns}
         data={data}
-        data-testid='product_in_stream_table'
+        data-testid='product_out_stream_table'
         count={count}
         pageContext={pageContext}
         searchContext={searchContext}

+ 1 - 0
packages/app/src/pages/user/table/modal/Info.tsx

@@ -29,6 +29,7 @@ const UserModalInfo: FC<Props> = function({id}) {
         label='用户密码'
         width={width}
         type='password'
+        disabled={Boolean(id)}
       />
       <ModalField
         control={control}

+ 4 - 0
packages/app/src/styles/index.css

@@ -141,3 +141,7 @@ img {
     background-color: #fdf0e4 !important;
   }
 }
+
+.grey-icon {
+  color: #bbb;
+}

+ 1 - 2
packages/app/src/utils/sortMenu/index.tsx

@@ -1,4 +1,3 @@
-import {FontIcon} from '@components';
 import {TreeRoleMenuData} from '@models';
 import {ReactNode} from 'react';
 
@@ -24,7 +23,7 @@ export function sortMenu(menus: TreeRoleMenuData[]) {
       label: name,
       pid: pId,
       url,
-      icon: img && <FontIcon name={img} />,
+      icon: img && <i className={`fa-solid fa-${img} grey-icon`} />,
     };
 
     pId === '0'