diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 0a462d96..74e0026b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -788,16 +788,32 @@ public class PageController { } @GetMapping("/application_out") - public ModelAndView application_out() { + public ModelAndView application_out(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); mv.setViewName("pages/application/application-out"); + if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { + mv.setViewName("pages/applicationForStorageCenter/application-out"); + } return mv; } @GetMapping("/application_out_back") - public ModelAndView application_out_back(String code, String depositoryId) { + public ModelAndView application_out_back(String code, String depositoryId, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/application/application-out_back"); + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { + mv.setViewName("pages/applicationForStorageCenter/application-out"); + } InventoryP inventoryP = new InventoryP(); if (code != null) { Map map = new HashMap<>(); @@ -2620,12 +2636,15 @@ public class PageController { } else if (depository != null && place == null) { // 如果选中仓库未选中库位 mv.addObject("depository", depository); - } else if (place != null && depository == null) { + } else if (depository == null) { // 如果选中库位未选中仓库 mv.addObject("place", place); } mv.addObject("materialList", materialList); mv.setViewName("pages/application/application-out_scanQrCode"); + if (Integer.compare(userByPort.getMaindeparment(), 361) == 0) { + mv.setViewName("pages/applicationForStorageCenter/application-out"); + } return mv; } @@ -2910,22 +2929,22 @@ public class PageController { } @GetMapping("/constructionUnitAdd") - public String constructionUnitAdd(){ + public String constructionUnitAdd() { return "pages/constructionunit/constructionunit_add"; } @GetMapping("/constructionUnitOut") - public String constructionUnitOut(){ + public String constructionUnitOut() { return "pages/constructionunit/constructionunit_out"; } @GetMapping("/constructionUnitEdit") - public ModelAndView constructionUnitEdit(Integer id){ + public ModelAndView constructionUnitEdit(Integer id) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/constructionunit/constructionunit_edit"); ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(id); - mv.addObject("record",constructionUnitById); + mv.addObject("record", constructionUnitById); return mv; } } diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html new file mode 100644 index 00000000..044d525b --- /dev/null +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html @@ -0,0 +1,1521 @@ + + + + + 分步表单 + + + + + + + + + +
+
+
+
+
    +
  • 物料出库
    • +
  • 组合出库
    • +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html new file mode 100644 index 00000000..0493704c --- /dev/null +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html @@ -0,0 +1,395 @@ + + + + + 分步表单 + + + + + + + + + +
+
+
+
+
+ +
+
+
+

说明


+ 申请提交后，24小时内审核完毕 +
+
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html new file mode 100644 index 00000000..bbb894a7 --- /dev/null +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html @@ -0,0 +1,600 @@ + + + + + 分步表单 + + + + + + + + + +
+
+
+ + +
+
+

说明


+ 申请提交后，24小时内审核完毕 +
+
+ +
+
+ + + + + \ No newline at end of file