组合入库审批完成

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -788,7 +788,7 @@ public class PageController {
         if (isadmin == null) {
             isadmin = 1;
         }
-        if (isadmin == 4) {
+        if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(),361) == 0) {
             mv.addObject("display", "inline-block");
         } else {
             mv.addObject("display", "none");
@@ -1198,7 +1198,7 @@ public class PageController {
         return mv;
     }
 
-    @GetMapping("findWareHouseByParentId")
+    @GetMapping("/findWareHouseByParentId")
     public ModelAndView findWareHouseByParentId(Integer parentId, HttpServletRequest request) {
         UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
         ModelAndView mv = new ModelAndView();
@@ -1286,7 +1286,7 @@ public class PageController {
         return mv;
     }
 
-    @GetMapping("findMaterialTypeByParentId")
+    @GetMapping("/findMaterialTypeByParentId")
     public ModelAndView findMaterialTypeByParentId(Integer parentId, HttpServletRequest request) {
         UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
         ModelAndView mv = new ModelAndView();

src/main/resources/templates/pages/warehouse/warehouseByParentId.html

@@ -110,7 +110,7 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-265',//固定高度-即固定表头固定第一行首行
+            height: 'full-165',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit

target/classes/templates/pages/warehouse/depository-out.html

@@ -102,7 +102,7 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-265',//固定高度-即固定表头固定第一行首行
+            height: 'full-165',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit
@@ -155,7 +155,7 @@
             if (data.depositoryId !== '') {
                 req.depositoryId = data.depositoryId;
             }
-            if (data.state != '') {
+            if (data.state !== '') {
                 req.state = data.state;
             }
             req.parentId = parentId;

target/classes/templates/pages/warehouse/warehouseByParentId.html

@@ -110,7 +110,7 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-265',//固定高度-即固定表头固定第一行首行
+            height: 'full-165',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit