修改查看我的申请时盘点申请查看错误的问题

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

@@ -91,6 +91,24 @@ public class CompanyController {
     }
 
 
+    /**
+     * 用于查询所有公司
+     * @param request
+     * @return
+     */
+    @GetMapping("/findAllCompany")
+    public RestResponse findAllCompany(HttpServletRequest request){
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
+        Map<String, Object> administration = LinkInterfaceUtil.findAdministration(userByPort);
+        List<AdministrationP> administrationPList = (List<AdministrationP>) administration.get("administrationPList");
+        return new RestResponse(administrationPList);
+    }
+
+
     /**
      * 获取当前公司下的部门
      * @param company

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

@@ -86,6 +86,13 @@ public class DepositoryController {
         return new RestResponse(list, depositoryService.findCountByCondition(map), 200);
     }
 
+
+    @GetMapping("/getDepositoryForNoParent")
+    public RestResponse getDepositoryForNoParent(HttpServletRequest request){
+        List<Depository> depositoryForNoParent = depositoryService.findDepositoryForNoParent();
+        return  new RestResponse(depositoryForNoParent);
+    }
+
     /**
      * 根据父级编号获取所有仓库
      *
@@ -191,6 +198,27 @@ public class DepositoryController {
         return CrudUtil.insertHandle(depositoryService.insertDepository(map, userToken), 1);
     }
 
+
+    /**
+     * 判断当前用户是否存在被设置的开放仓库
+     * @param request
+     * @return
+     */
+    public RestResponse getWareHouseVisiblePermissionByUser(HttpServletRequest request){
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        // 获取当前用户是否存在可见仓库
+        List<Integer> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
+        boolean flag = false;
+        if(union.size()>0){
+            flag = true;
+        }
+        return new RestResponse(flag);
+    }
+
     /**
      * 根据主键删除仓库记录
      *

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

@@ -10,10 +10,7 @@ import com.dreamchaser.depository_manage.pojo.RestResponse;
 import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
 import com.dreamchaser.depository_manage.pojo.StatusInfo;
 import com.dreamchaser.depository_manage.security.pool.AuthenticationTokenPool;
-import com.dreamchaser.depository_manage.service.DepositoryService;
-import com.dreamchaser.depository_manage.service.GroupService;
-import com.dreamchaser.depository_manage.service.MaterialService;
-import com.dreamchaser.depository_manage.service.RoleService;
+import com.dreamchaser.depository_manage.service.*;
 import com.dreamchaser.depository_manage.service.impl.QyWxOperationService;
 import com.dreamchaser.depository_manage.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +45,10 @@ public class GroupController {
     private RoleService roleService;
 
 
+    @Autowired
+    private SplitUnitService splitUnitService;
+
+
     /**
      * 用于添加一条组合记录
      *
@@ -572,6 +573,12 @@ public class GroupController {
         return CrudUtil.updateHandle(result, integer);
     }
 
+    /**
+     * 入库审核
+     * @param map
+     * @param request
+     * @return
+     */
     @PutMapping("/reviewIn")
     public RestResponse reviewIn(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String token = request.getHeader("user-token");
@@ -590,6 +597,29 @@ public class GroupController {
     }
 
 
+    /**
+     * 用于获取当前物料在组合中的详细信息
+     * @param map
+     * @return
+     */
+    @PostMapping("/materialInfoForGroup")
+    public RestResponse materialInfoForGroup(@RequestBody Map<String,String>map){
+        if(map.containsKey("mid") && map.containsKey("gid")){
+            Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
+            Integer gid = ObjectFormatUtil.toInteger(map.get("gid"));
+            GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid);
+            Map<String,Object> result = new HashMap<>();
+            if (groupInfoByMidAndGid != null) {
+                List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(groupInfoByMidAndGid.getMid());
+                result.put("groupInfo",groupInfoByMidAndGid);
+                result.put("splitList",splitInfoByMid);
+            }
+            return new RestResponse(result);
+        }else{
+            throw new MyException("缺少必要参数");
+        }
+    }
+
     /**
      * 用于构造组合出库单
      *

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

@@ -1723,8 +1723,6 @@ public class MaterialController {
         } else {
             return new RestResponse(null);
         }
-
-
     }
 
 
@@ -1755,4 +1753,113 @@ public class MaterialController {
     }
 
 
+    /**
+     * 用于获取当前位置该单位下的库存数量
+     * @param map 待查询条件
+     * @return
+     */
+    @PostMapping("/getQuantityForLocationAndUnit")
+    public RestResponse getQuantityForLocationAndUnit(@RequestBody Map<String,String> map){
+        // 当前计量单位
+        String unit = map.get("unit");
+        // 当前的仓库id
+        String depositoryId = map.get("depositoryId");
+        // 当前库位编码
+        String placeCode = map.get("placeCode");
+        // 当前物料id
+        Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
+        MaterialAndPlace placeAndMaterialByMidAndPid = null;
+        double quantity = 0.0;
+        int placeId = 0;
+        if ("0000".equals(placeCode)) {
+            // 如果要改变默认库位
+
+            // 获取当前物料的对应关系
+            placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, mid);
+
+        } else {
+            // 获取当前库位id
+            Map<String, Object> paramForPlace = new HashMap<>();
+            paramForPlace.put("code", placeCode);
+            paramForPlace.put("depositoryId", depositoryId);
+            List<Place> placeByCondition = placeService.findPlaceByCondition(paramForPlace);
+            //获取对应库位
+            Place place = placeByCondition.get(0);
+            // 获取当前物料的对应关系
+            placeId = place.getId();
+            placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(placeId, mid);
+        }
+        Inventory inventoryById = materialService.findInventoryById(mid);
+        if (inventoryById.getUnit().equals(unit)) {
+            // 如果转移的基础单位
+            quantity = (placeAndMaterialByMidAndPid.getQuantity() / 100.0);
+        } else {
+            // 获取当前的拆单记录
+            Map<String, Object> paramForSplitInfo = new HashMap<>();
+
+            paramForSplitInfo.put("mid", inventoryById.getMid());
+            paramForSplitInfo.put("newUnit", unit);
+            SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo);
+            SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId());
+            if (splitInventory != null) {
+                quantity = splitInventory.getSaveQuantity() / 100.0;
+            } else {
+                int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
+                quantity = (inventoryById.getQuantity() * Scale / 100.0);
+            }
+        }
+        Map<String,Object> result = new HashMap<>();
+        result.put("quantity",quantity);
+        result.put("placeId",placeId);
+        return new RestResponse(result);
+    }
+
+    /**
+     * 根据库存id查询库存记录
+     * @param map 待查询数据
+     * @return
+     */
+    @PostMapping("/findInventoryById")
+    public RestResponse findInventoryById(@RequestBody Map<String,String> map){
+        if(map.containsKey("id")){
+            Integer id = ObjectFormatUtil.toInteger(map.get("id"));
+            Inventory inventoryById = materialService.findInventoryById(id);
+            InventoryP inventory = new InventoryP(inventoryById);
+            List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(inventoryById.getId(), inventory.getDepositoryId());
+            inventory.setPlacePList(placeByMidAndDid);
+            List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid());
+            inventory.setSplitInfoList(splitInfoByMid);
+            return new RestResponse(inventoryById);
+        }else{
+            throw new MyException("缺少必要参数");
+        }
+    }
+
+    @PostMapping("/findInventoryByMcodeAndDepository")
+    public RestResponse findInventoryByMcodeAndDepository(@RequestBody Map<String,String> map,HttpServletRequest request){
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        String code = map.get("code");
+        Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
+        InventoryP inventoryP = new InventoryP();
+        if (code != null) {
+            Map<String, Object> param = new HashMap<>();
+            Depository depositoryByCode = depositoryService.findDepositoryById(depositoryId);
+            param.put("depositoryId", depositoryByCode.getId());
+            param.put("mcode", code);
+            List<InventoryP> inventory = materialService.findInventory(param);
+            if (inventory.size() > 0) {
+                inventoryP = inventory.get(0);
+                List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryP.getMid());
+                inventoryP.setSplitInfoList(splitInfoByMid);
+                List<Depository> depositoryList = new ArrayList<>();
+                depositoryList.add(depositoryByCode);
+                inventoryP.setDepositoryList(depositoryList);
+            }
+        }
+        return  new RestResponse(inventoryP);
+    }
 }

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

@@ -67,7 +67,7 @@ public class MaterialTypeController {
     @GetMapping("/allMaterialTypeByParent")
     public RestResponse findMaterialTypeByNoParent(@RequestParam Map<String,Object> param){
         String parentId = (String) param.get("parentId");
-        if ("".equals(parentId)) {
+        if (parentId == null ||"".equals(parentId)) {
             parentId = "0";
         }
         param.put("parentId",parentId);

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

@@ -41,8 +41,6 @@ public class PageController {
     @Autowired
     private DepositoryService depositoryService;
     @Autowired
-    private UserService userService;
-    @Autowired
     private DepositoryRecordService depositoryRecordService;
     @Autowired
     private NoticeService noticeService;
@@ -61,9 +59,6 @@ public class PageController {
     @Autowired
     private PlaceService placeService;
 
-    @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
-
     @Autowired
     private RedisTemplate<String, String> redisTemplateForHash;
 
@@ -81,6 +76,11 @@ public class PageController {
     private ConstructionUnitService constructionUnitService;
 
 
+    /**
+     * 初始化路由跳转
+     * @param request
+     * @return
+     */
     @GetMapping("/")
     public ModelAndView Init(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -104,7 +104,6 @@ public class PageController {
 
     /**
      * 用于正常登录
-     *
      * @param request
      * @return
      */
@@ -121,7 +120,11 @@ public class PageController {
         return mv;
     }
 
-
+    /**
+     * 用于跳转到物料选择树页面
+     * @param map 查询条件
+     * @return
+     */
     @GetMapping("/getMaterialAll")
     public ModelAndView getMaterialAll(@RequestParam Map<String, Object> map) {
         ModelAndView mv = new ModelAndView();
@@ -147,6 +150,11 @@ public class PageController {
     }
 
 
+    /**
+     * 初始化系统
+     * @param request
+     * @return
+     */
     @GetMapping("/index")
     public ModelAndView index(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -168,11 +176,21 @@ public class PageController {
     }
 
 
+    /**
+     * 账号注册，弃用
+     * @return
+     */
     @GetMapping("/register")
     public String register() {
         return "pages/user/register";
     }
 
+
+    /**
+     * 系统首页
+     * @param request
+     * @return
+     */
     @GetMapping("/welcome")
     public ModelAndView welcome(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -239,6 +257,11 @@ public class PageController {
     }
 
 
+    /***
+     * 个人消息页面
+     * @param request
+     * @return
+     */
     @GetMapping("/message")
     public ModelAndView userMessage(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -274,6 +297,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 仓库创建页面
+     * @param request
+     * @return
+     */
     @GetMapping("/depository_add")
     public ModelAndView depository_add(HttpServletRequest request) {
         String token = request.getHeader("user-token");
@@ -289,6 +317,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 仓库查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/depository-out")
     public ModelAndView depository_out(HttpServletRequest request) {
         String token = request.getHeader("user-token");
@@ -315,8 +348,14 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 拆零记录编辑页面
+     * @param id 待编辑拆零记录id
+     * @param request
+     * @return
+     */
     @GetMapping("/split_edit")
-    public ModelAndView split_edit(Integer id,HttpServletRequest request) {
+    public ModelAndView split_edit(Integer id, HttpServletRequest request) {
         if (id == null) {
             throw new MyException("缺少必要参数");
         }
@@ -340,7 +379,11 @@ public class PageController {
         return mv;
     }
 
-
+    /**
+     * 拆零记录查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/split_out")
     public ModelAndView split_out(HttpServletRequest request) {
         String token = request.getHeader("user-token");
@@ -366,6 +409,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 物料查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/material_out")
     public ModelAndView material_out(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -375,10 +423,6 @@ public class PageController {
             token = (String) request.getSession().getAttribute("userToken");
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
-        // 获取当天时间戳
-        String currentDate = DateUtil.getCurrentDate();
-        Long aLong = DateUtil.DateTimeByDayToTimeStamp(currentDate);
-        mv.addObject("nowDay", aLong);
         Integer maindeparment = userToken.getMaindeparment();
         if (PortConfig.roleAdminorgList.contains(maindeparment)) {
             mv.addObject("display", "inline-block");
@@ -395,6 +439,10 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 物料添加页面
+     * @return
+     */
     @GetMapping("/material_add")
     public ModelAndView material_add() {
         ModelAndView mv = new ModelAndView();
@@ -426,8 +474,8 @@ public class PageController {
         return mv;
     }
 
-    @GetMapping("/selectPlaceByDepository")
     // 库位树形菜单
+    @GetMapping("/selectPlaceByDepository")
     public ModelAndView selectPlaceByDepository(Integer depositoryId, Integer mid, String placeCode, String unit) {
         ModelAndView mv = new ModelAndView();
         MaterialAndPlace placeAndMaterialByMidAndPid = null;
@@ -452,7 +500,7 @@ public class PageController {
         Inventory inventoryById = materialService.findInventoryById(mid);
         if (inventoryById.getUnit().equals(unit)) {
             // 如果转移的基础单位
-            mv.addObject("quantity", (int) (placeAndMaterialByMidAndPid.getQuantity() / 100));
+            mv.addObject("quantity", (placeAndMaterialByMidAndPid.getQuantity() / 100));
         } else {
             // 获取当前的拆单记录
             Map<String, Object> paramForSplitInfo = new HashMap<>();
@@ -462,10 +510,10 @@ public class PageController {
             SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo);
             SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId());
             if (splitInventory != null) {
-                mv.addObject("quantity", (int) (splitInventory.getSaveQuantity() / 100));
+                mv.addObject("quantity", (splitInventory.getSaveQuantity() / 100));
             } else {
                 int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
-                mv.addObject("quantity", (int) (inventoryById.getQuantity() * Scale / 100));
+                mv.addObject("quantity", (inventoryById.getQuantity() * Scale / 100));
             }
         }
         mv.addObject("depositoryId", depositoryId);
@@ -476,7 +524,15 @@ public class PageController {
     }
 
 
-    // 专用于卡片仓库树形菜单页面
+
+    /**
+     * 专用于卡片仓库树形菜单页面
+     * @param type 类型
+     * @param clickObj 点击卡片
+     * @param flagForGroup 是否为组合
+     * @param request
+     * @return
+     */
     @GetMapping("/selectDepositoryByCard")
     public ModelAndView selectDepositoryByCard(Integer type, String clickObj, @RequestParam(value = "flagForGroup", required = false) boolean flagForGroup, HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -495,7 +551,11 @@ public class PageController {
         return mv;
     }
 
-    // 物料树形菜单页面
+    /**
+     * 物料树形菜单页面
+     * @param map 条件
+     * @return
+     */
     @GetMapping("/selectMaterial")
     public ModelAndView selectMaterial(@RequestParam Map<String, String> map) {
         ModelAndView mv = new ModelAndView();
@@ -604,15 +664,23 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 物料类型创建页面
+     * @return
+     */
     @GetMapping("/materialType_add")
     public ModelAndView materialType_add() {
         ModelAndView mv = new ModelAndView();
         mv.setViewName("pages/materialtype/materialType_add");
-        List<MaterialType> materialTypeAll = materialTypeService.findMaterialTypeAll();
-        mv.addObject("materialTypes", materialTypeAll);
         return mv;
     }
 
+
+    /**
+     * 物料类型查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/materialType_view")
     public ModelAndView materialType_view(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -636,6 +704,10 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到入库页面
+     * @return
+     */
     @GetMapping("/application_in")
     public ModelAndView application_in() {
         ModelAndView mv = new ModelAndView();
@@ -645,7 +717,6 @@ public class PageController {
 
     /**
      * 跳转到库存多选处理页面
-     *
      * @return
      */
     @GetMapping("/application_multi")
@@ -668,6 +739,12 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到入库申请页面（从库存查询跳转）
+     * @param mid 当前库存记录
+     * @param depositoryId 仓库id
+     * @return
+     */
     @GetMapping("/application_in_back")
     public ModelAndView applicationIn(Integer mid, Integer depositoryId) {
         ModelAndView mv = new ModelAndView();
@@ -690,6 +767,11 @@ public class PageController {
         return mv;
     }
 
+
+    /**
+     * 跳转到入库批量处理页面
+     * @return
+     */
     @GetMapping("/application_in_multi")
     public ModelAndView applicationInMulti() {
         ModelAndView mv = new ModelAndView();
@@ -697,6 +779,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到出库申请页面
+     * @param request
+     * @return
+     */
     @GetMapping("/application_out")
     public ModelAndView application_out(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -720,6 +807,13 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 用于跳转到出库申请页面(从库存页面跳转而来)
+     * @param code 当前物料编码
+     * @param depositoryId 当前仓库id
+     * @param request
+     * @return
+     */
     @GetMapping("/application_out_back")
     public ModelAndView application_out_back(String code, String depositoryId, HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -762,6 +856,11 @@ public class PageController {
         return mv;
     }
 
+
+    /**
+     * 库存转移页面
+     * @return
+     */
     @GetMapping("/application_transfer")
     public ModelAndView application_transfer() {
         ModelAndView mv = new ModelAndView();
@@ -769,6 +868,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到入库查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/table_in")
     public ModelAndView table_in(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -780,9 +884,9 @@ public class PageController {
         Integer maindeparment = userToken.getMaindeparment();
         if (PortConfig.roleAdminorgList.contains(maindeparment)) {
             mv.addObject("display", "inline-block");
-            mv.addObject("type","2");
+            mv.addObject("type", "2");
         } else {
-            mv.addObject("type","1");
+            mv.addObject("type", "1");
             mv.addObject("display", "none");
         }
         mv.setViewName("pages/depository/table-in");
@@ -795,6 +899,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到出库查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/table_out")
     public ModelAndView table_out(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
@@ -806,10 +915,10 @@ public class PageController {
         Integer maindeparment = userToken.getMaindeparment();
         if (PortConfig.roleAdminorgList.contains(maindeparment)) {
             mv.addObject("display", "inline-block");
-            mv.addObject("type","2");
+            mv.addObject("type", "2");
         } else {
             mv.addObject("display", "none");
-            mv.addObject("type","1");
+            mv.addObject("type", "1");
         }
         mv.setViewName("pages/depository/table-out");
         String userAgent = request.getHeader("user-agent");
@@ -821,6 +930,10 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到拆单创建页面
+     * @return
+     */
     @GetMapping("/split_add")
     public ModelAndView split_add() {
         ModelAndView mv = new ModelAndView();
@@ -828,6 +941,11 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到用户列表
+     * @param request
+     * @return
+     */
     @GetMapping("/table_user")
     public ModelAndView table_user(HttpServletRequest request) {
         String token = request.getHeader("user-token");
@@ -842,6 +960,12 @@ public class PageController {
         return mv;
     }
 
+
+    /**
+     * 跳转到库存查询页面
+     * @param request
+     * @return
+     */
     @GetMapping("/table_stock")
     public ModelAndView table_stock(HttpServletRequest request) {
         String token = request.getHeader("user-token");
@@ -854,10 +978,10 @@ public class PageController {
         Integer maindeparment = userToken.getMaindeparment();
         if (PortConfig.roleAdminorgList.contains(maindeparment)) {
             mv.addObject("display", "table-cell");
-            mv.addObject("type","2");
+            mv.addObject("type", "2");
         } else {
             mv.addObject("display", "none");
-            mv.addObject("type","1");
+            mv.addObject("type", "1");
         }
         mv.addObject("number", userToken.getNumber());
         String userAgent = request.getHeader("user-agent");
@@ -869,32 +993,58 @@ public class PageController {
         return mv;
     }
 
+    /**
+     * 跳转到我的任务页面
+     * @return
+     */
     @GetMapping("/my_task")
     public String my_task() {
         return "pages/application/my-task";
     }
 
+    /**
+     * 跳转到我的申请页面
+     * @return
+     */
     @GetMapping("/my_apply")
     public String my_apply() {
         return "pages/application/my-apply";
     }
 
+    /**
+     * 跳转到公告编辑页面
+     * @return
+     */
     @GetMapping("/notice_edit")
     public String notice_edit() {
         return "pages/notice/notice-edit";
     }
 
+    /**
+     * 跳转到公告创建页面
+     * @return
+     */
     @GetMapping("/notice_add")
     public String notice_add() {
         return "pages/notice/notice-add";
     }
 
+    /**
+     * 跳转到公告查询页面
+     * @return
+     */
     @GetMapping("/notice_out")
     public String notice_out() {
         return "pages/notice/notice-out";
     }
 
 
+    /**
+     * 跳转到库存详情页面
+     * @param id 待查看库存
+     * @param request
+     * @return
+     */
     @GetMapping("/InventoryView")
     public ModelAndView InventoryView(Integer id, HttpServletRequest request) {
         if (id != null) {
@@ -2802,9 +2952,9 @@ public class PageController {
         StringBuilder departmentHeadName = new StringBuilder();
         StringBuilder departmentHeadId = new StringBuilder();
 
-        List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(),userToken);
-        for (UserByPort departmentHead:departmentHeadByUser
-             ) {
+        List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken);
+        for (UserByPort departmentHead : departmentHeadByUser
+        ) {
             departmentHeadName.append(departmentHead.getName()).append(",");
             departmentHeadId.append(departmentHead.getNumber()).append(",");
         }

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

@@ -269,8 +269,8 @@ public class StockTakingController {
         }
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         map.put("userId", userToken.getId());
-        List<SimpleStockTakingP> myTask = stockTakingService.findMyApply(map, userToken);
-        return new RestResponse(myTask, stockTakingService.findMyApplyCount(map), 200);
+        List<SimpleStockTakingP> myApply = stockTakingService.findMyApply(map, userToken);
+        return new RestResponse(myApply, stockTakingService.findMyApplyCount(map), 200);
     }
 
 

src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java

@@ -113,18 +113,10 @@ public interface DepositoryService {
 
 
     /**
-     * 查询当前仓库的最上层仓库
-     * @param depositoryId 当前仓库
+     * 查询顶级仓库
      * @return
      */
-    Depository findTopDepositoryByDepository(Integer depositoryId);
-
-
-    /**
-     * 计算未删除的仓库总和
-     * @return
-     */
-    Integer findAllCountByNoDelete();
+    List<Depository> findDepositoryForNoParent();
 
 
     /**

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@@ -282,24 +282,12 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
     /**
-     * 查询当前仓库的最上层仓库
-     *
-     * @param depositoryId 当前仓库
+     * 查询顶级仓库
      * @return
      */
     @Override
-    public Depository findTopDepositoryByDepository(Integer depositoryId) {
-        Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId);
-        if (Integer.compare(0, depositoryById.getParentId()) == 0) {
-            // 如果当前仓库没有父级仓库
-            return depositoryById;
-        } else {
-            // 如果不是最高
-
-            // 获取所有仓库
-            List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
-            return findParentDepository(depositoryById, depositoryAll);
-        }
+    public List<Depository> findDepositoryForNoParent() {
+        return depositoryMapper.findDepositoryByNoParent();
     }
 
 
@@ -317,15 +305,7 @@ public class DepositoryServiceImpl implements DepositoryService {
         return null;
     }
 
-    /**
-     * 计算未删除仓库综合
-     *
-     * @return
-     */
-    @Override
-    public Integer findAllCountByNoDelete() {
-        return depositoryMapper.findAllCountByState();
-    }
+
 
     /**
      * 获取本部门以及个人管理仓库的名称和id

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -300,7 +300,7 @@ public class StockTakingServiceImpl implements StockTakingService {
             page = ObjectFormatUtil.toInteger(map.get("page"));
             map.put("begin", (page - 1) * size);
         }
-        List<StockTaking> myTask = stockTakingMapper.findMyTask(map);
+        List<StockTaking> myTask = stockTakingMapper.findMyApply(map);
         List<SimpleStockTakingP> stockTakingPS = new ArrayList<>();
         for (StockTaking stockTaking : myTask) {
             SimpleStockTakingP ssp = new SimpleStockTakingP(stockTaking);

src/main/resources/templates/pages/material/material-out.html

@@ -16,8 +16,6 @@
 <div class="layuimini-container">
     <div class="layuimini-main">
 
-
-        <input style="display:none;" id="nowDay" th:value="${nowDay}">
         <input style="display:none;" id="display" th:value="${display}">
         <input style="display: none" th:value="${number}" id="number">
 

src/main/resources/templates/pages/materialtype/materialType_add.html

@@ -34,10 +34,6 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">父级类型:</label>
                                     <div class="layui-input-block">
-                                        <!--<select name="parentId" >
-                                            <option value="" selected>请选择类型</option>
-                                            <option th:each="materialType,iterStar:${materialTypes}" th:value="${materialType?.getId()}" th:text="${materialType?.getTname()}" >顶级类型</option>
-                                        </select>-->
                                         <input type="text"  placeholder="请选择物料类型"  class="layui-input" id="openSonByMateralType" readonly                                               />
                                         <input type="text" id="materialTypeId"  placeholder="请选择物料类型" name="materialTypeId" class="layui-input"  style="display: none" />
                                     </div>

src/test/java/com/dreamchaser/depository_manage/OtherTest.java

@@ -14,6 +14,7 @@ import com.dreamchaser.depository_manage.pojo.AdministrationP;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
 import com.dreamchaser.depository_manage.service.*;
+import com.dreamchaser.depository_manage.service.impl.QyWxOperationService;
 import com.dreamchaser.depository_manage.utils.DateUtil;
 import com.dreamchaser.depository_manage.utils.HttpUtils;
 import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil;
@@ -45,16 +46,20 @@ public class OtherTest {
     @Autowired
     DepositoryMapper depositoryMapper;
 
+    @Autowired
+    QyWxOperationService qyWxOperationService;
+
 
     @Test
     public void main() {
-//        UserByPort userByPort = LinkInterfaceUtil.FindUserById(87, null);
-        ApprovalInfo_Details approvalInfo = new ApprovalInfo_Details();
-        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
-        approver.setUserId("PangFuZhen");
-        approvalInfo.setApprover(approver);
-        depositoryRecordService.reviewByQyWxApprovalIn("[2]",approvalInfo,"634c7f15fe74b4ba6c857df4032ed21e","2","202304260024");
+        UserByPort userByPort = LinkInterfaceUtil.FindUserById(7060, null);
+//        ApprovalInfo_Details approvalInfo = new ApprovalInfo_Details();
+//        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
+//        approver.setUserId("PangFuZhen");
+//        approvalInfo.setApprover(approver);
+//        depositoryRecordService.reviewByQyWxApprovalIn("[2]",approvalInfo,"634c7f15fe74b4ba6c857df4032ed21e","2","202304260024");
 //        stockTakingService.reviewByQyWxApproval("4",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240042");
+        JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate("634c7f15fe74b4ba6c857df4032ed21e", userByPort, 20);
     }