修改仓库启用禁用

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

@@ -585,13 +585,6 @@ public class DepositoryController {
                     }
                 }).start();
             }
-        } else if (state == 1) { // 如果是启用仓库，则只启用当前仓库下的物品
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-//                    UpdateSonMaterialState(id, state);
-                }
-            }).start();
         }
         return CrudUtil.postHandle(depositoryService.updateDepository(map), 1);
     }
@@ -607,10 +600,6 @@ public class DepositoryController {
 
         // 获取当前仓库所有子仓库
         List<Depository> depositoryRecordPByCondition = depositoryService.findDepositoryByCondition(param, userToken);
-//        if (envelop) {
-            // 将当前仓库下的产品状态改为禁用
-//            UpdateSonMaterialState(parentId, state);
-//        }
         for (Depository depository : depositoryRecordPByCondition) {
             int depositoryId = depository.getId();
             Map<String, Object> newMap = new HashMap<>();
@@ -623,18 +612,6 @@ public class DepositoryController {
         }
     }
 
-    /**
-     * 修改当前仓库下的物料状态
-     *
-     * @param parentId
-     * @param state
-     */
-    public void UpdateSonMaterialState(String parentId, Integer state) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("depositoryId", parentId);
-
-    }
-
     // 获取各类别库存容量
     @RequestMapping(value = "/layui/echart_back_invetory", method = RequestMethod.GET)
     @ResponseBody
@@ -1455,8 +1432,8 @@ public class DepositoryController {
             return true;
         }
         List<Depository> depositoryRecordPByCondition = depositoryService.findDepositoryByCondition(param, userToken);
-        for (int i = 0; i < depositoryRecordPByCondition.size(); i++) {
+        for (Depository depository : depositoryRecordPByCondition) {
-            String depositoryId = depositoryRecordPByCondition.get(i).getId().toString();
+            String depositoryId = depository.getId().toString();
             if (!findMaterialByDepository(depositoryId)) {
                 findAllSonDepository(depositoryId, userToken);
             } else {
@@ -1468,8 +1445,7 @@ public class DepositoryController {
 
     /**
      * 根据父级编号查询所有关联信息
-     *
+     * @param did 待查询仓库
-     * @param did
      * @return
      */
     public Boolean findAllSonDepositoryOfRelevancy(String did, HttpServletRequest request) {
@@ -1495,7 +1471,7 @@ public class DepositoryController {
     }
 
     /**
-     * 根据仓库编号判断该仓库是否有物品
+     * 根据仓库编号判断该仓库是否有库存
      *
      * @param depositoryId 待查询仓库id
      * @return
@@ -1504,8 +1480,9 @@ public class DepositoryController {
         Map<String, Object> param = new HashMap<>();
         param.put("state", 1);
         param.put("depositoryId", depositoryId);
-        List<InventoryP> materialPByCondition = materialService.findInventory(param);
+        // 获取当前库存
-        return materialPByCondition.size() > 0;
+        List<InventoryP> inventoryPList = materialService.findInventory(param);
+        return inventoryPList.size() > 0;
     }
 
     /**

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

@@ -243,15 +243,6 @@ public class MaterialController {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
         Integer maindeparment = userToken.getMaindeparment();
         List<Object> list = new ArrayList<>();
-        /*if ("1".equals(type)) {
-            list = materialService.InitTreeMenus(mname);
-        } else if ("2".equals(type)) {
-            list = materialService.InitTreeMenus(mname, String.valueOf(maindeparment));
-        } else if ("3".equals(type)) {
-            String depositoryId = (String) map.get("depositoryId");
-            String placeId = (String) map.get("placeId");
-            list = materialService.InitTreeMenus(mname, depositoryId, placeId);
-        }*/
         if (!"".equals(mname)) {
             // 如果是出入库
             list = materialService.InitTreeForSelectName(mname.split(",")[0], type, map);

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml

@@ -63,7 +63,7 @@
     <select id="findDepositoryByAdminorg" resultMap="depositoryMap" parameterType="string">
         SELECT
         <include refid="allColumns" />
-        FROM depository d WHERE 1 = 1 and d.state != 3
+        FROM depository d WHERE 1 = 1 and d.state = 1
         <if test="adminorg != null and adminorg != ''">
             and   d.adminorg = #{adminorg}
         </if>

src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml

@@ -82,7 +82,7 @@
         select
         <include refid="roleNameAnddepositoryName"/>
         from userroleanddepository
-        where userid = #{userid}
+        where userid = #{userid} and state = 1
     </select>
 
     <select id="findRoleByUid" parameterType="int" resultType="int">

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

@@ -574,15 +574,14 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
     /**
-     * 获取当前部门以及公共仓库
+     * 获取当前部门以及公共的正常使用的仓库
      *
      * @param adminorg
      * @return
      */
     @Override
     public List<Depository> findDepositoryByAdminorg(String adminorg) {
-        List<Depository> depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(adminorg);
+        return depositoryMapper.findDepositoryByAdminorg(adminorg);
-        return depositoryByAdminorg;
     }
 
     /**

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

@@ -28,7 +28,7 @@ public class RoleServiceImpl implements RoleService {
         return roleMapper.addUserOrPostRoleAndDepository(map);
     }
     /**
-     * 根据使用者id获取角色权限以及管理的仓库
+     * 根据使用者id获取角色权限以及管理的正常使用的仓库
      * @param userid
      * @return
      */

target/classes/com/dreamchaser/depository_manage/mapper/DepositoryMapper.xml

@@ -63,7 +63,7 @@
     <select id="findDepositoryByAdminorg" resultMap="depositoryMap" parameterType="string">
         SELECT
         <include refid="allColumns" />
-        FROM depository d WHERE 1 = 1 and d.state != 3
+        FROM depository d WHERE 1 = 1 and d.state = 1
         <if test="adminorg != null and adminorg != ''">
             and   d.adminorg = #{adminorg}
         </if>

target/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml

@@ -82,7 +82,7 @@
         select
         <include refid="roleNameAnddepositoryName"/>
         from userroleanddepository
-        where userid = #{userid}
+        where userid = #{userid} and state = 1
     </select>
 
     <select id="findRoleByUid" parameterType="int" resultType="int">