修改出库记录查询页面

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

@@ -453,7 +453,7 @@ public class DepositoryRecordController {
         }
         if (integer != 0 && params.size() < 1) {
             return CrudUtil.postHandle(integer, 1);
-        } else if (integer != 0 && params.size() > 1) {
+        } else if (integer != 0 && params.size() >= 1) {
             return CrudUtil.postHandle(integer, params.size() + 1);
         } else {
             return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作"));
@@ -599,8 +599,9 @@ public class DepositoryRecordController {
     // 查看出库申请
     @GetMapping("/applicationOutView")
     public RestResponse findApplicationOutRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
+        UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
         // 获取对应主订单
-        List<ApplicationOutRecordP> list = depositoryRecordService.findApplicationOutRecordPByCondition(map, request);
+        List<ApplicationOutRecordP> list = depositoryRecordService.findApplicationOutRecordPByUser(userByPort,map);
         for (ApplicationOutRecordP outRecordP : list) {
             // 根据主订单获取所有子订单
             List<ApplicationOutRecordMin> applicationOutMinByParentId = depositoryRecordService.findApplicationOutMinByParentId(outRecordP.getId());
@@ -628,7 +629,7 @@ public class DepositoryRecordController {
             outRecordP.setQuantity(sumQuantity);
             outRecordP.setPrice(sumPrice);
         }
-        return new RestResponse(list, depositoryRecordService.findApplicationOutRecordPCountByCondition(map), 200);
+        return new RestResponse(list, depositoryRecordService.findApplicationOutRecordPCountByUser(userByPort,map), 200);
     }
 
 
@@ -833,7 +834,7 @@ public class DepositoryRecordController {
     }
 
     //    删除入库记录
-    @PostMapping("deleteApplicationInRecord")
+    @PostMapping("/deleteApplicationInRecord")
     public RestResponse deleteApplicationInRecord(@RequestBody Map<String, Object> map) {
         if (map.containsKey("id")) {
             Integer id = ObjectFormatUtil.toInteger(map.get("id"));
@@ -847,7 +848,7 @@ public class DepositoryRecordController {
     }
 
     //    删除出库记录
-    @PostMapping("deleteApplicationOutRecord")
+    @PostMapping("/deleteApplicationOutRecord")
     public RestResponse deleteApplicationOutRecord(@RequestBody Map<String, Object> map) {
         if (map.containsKey("id")) {
             Integer id = ObjectFormatUtil.toInteger(map.get("id"));
@@ -860,6 +861,20 @@ public class DepositoryRecordController {
         }
     }
 
+    // 用于判断该记录是否正在运行
+    @PostMapping("/judgeApplicationOutRecordStatus")
+    public RestResponse judgeApplicationOutRecordStatus(@RequestBody Map<String,Object> map){
+        if (map.containsKey("id")) {
+            Integer id = ObjectFormatUtil.toInteger(map.get("id"));
+
+        } else if (map.containsKey("ids")) {
+            List<Integer> ids = (List<Integer>) map.get("ids");
+        }
+        return null;
+    }
+
+
+
 
     /**
      * 自动生成出入库订单

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

@@ -765,8 +765,18 @@ public class PageController {
     }
 
     @GetMapping("/table_out")
-    public ModelAndView table_out() {
+    public ModelAndView table_out(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
+        UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+        Integer isadmin = userToken.getIsadmin();
+        if (isadmin == null) {
+            isadmin = 1;
+        }
+        if (isadmin == 4) {
+            mv.addObject("display", "inline-block");
+        } else {
+            mv.addObject("display", "none");
+        }
         mv.setViewName("pages/depository/table-out");
         return mv;
     }

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java

@@ -252,6 +252,19 @@ public interface DepositoryRecordMapper {
      */
     List<ApplicationOutRecordP> findApplicationOutRecordPByCondition(Map<String,Object> map);
 
+    /**
+     * 查询当前用户出库记录及其管理仓库的出库记录
+     * @param map 查询条件
+     * @return
+     */
+    List<ApplicationOutRecordP> findApplicationOutRecordPByUser(Map<String,Object> map);
+
+    /**
+     * 查询当前用户出库记录及其管理仓库的出库记录数目
+     * @param map 查询条件
+     * @return
+     */
+    Integer findApplicationOutRecordPCountByUser(Map<String,Object> map);
 
 
     /**
@@ -311,6 +324,15 @@ public interface DepositoryRecordMapper {
      */
     Integer deleteApplicationOutRecordById(Integer id);
 
+
+    /**
+     * 根据主id删除具体出库记录
+     * @return 受影响的行数
+     * @param id
+     */
+    Integer deleteApplicationOutRecordMinById(Integer id);
+
+
     /**
      * 根据id集合删除多条出库记录
      * @param list id集合
@@ -318,6 +340,14 @@ public interface DepositoryRecordMapper {
      */
     Integer deleteApplicationOutRecordByIds(List<Integer> list);
 
+
+    /**
+     * 根据主id集合删除多条出库记录
+     * @param list id集合
+     * @return 受影响的行数
+     */
+    Integer deleteApplicationOutRecordMinByIds(List<Integer> list);
+
     /**
      * 根据申请单号获取入库申请
      * @param code

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

@@ -481,6 +481,56 @@
         </if>
 
     </select>
+
+
+    <select id="findApplicationOutRecordPByUser" parameterType="map"   resultMap="applicationOutRecord">
+        select
+        <include refid="ApplicationOutRecordInfo"/>
+        from applicationOutRecordInfo
+        where 1 = 1
+        <if test="depositoryIdList != null">
+            and depositoryId
+             in
+            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            <if test="applicantId != null and applicantId != ''">
+                or applicantId = #{applicantId}
+            </if>
+        </if>
+        <if test="depositoryIdList == null">
+            <if test="applicantId != null and applicantId != ''">
+                and applicantId = #{applicantId}
+            </if>
+        </if>
+        GROUP BY aorid
+        order by applicantTime desc
+        <if test="begin != null and size != null">
+            LIMIT #{begin},#{size}
+        </if>
+    </select>
+
+    <select id="findApplicationOutRecordPCountByUser" resultType="int" parameterType="map">
+        select
+        count(DISTINCT aorid)
+        from applicationOutRecordInfo
+        where 1 = 1
+        <if test="depositoryIdList != null">
+            and depositoryId in
+            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            <if test="applicantId != null and applicantId != ''">
+                or applicantId = #{applicantId}
+            </if>
+        </if>
+        <if test="depositoryIdList == null">
+            <if test="applicantId != null and applicantId != ''">
+                and applicantId = #{applicantId}
+            </if>
+        </if>
+    </select>
+
     <!--    查询所有入库记录-->
     <select id="findApplicationInRecordPAll" resultMap="applicationInRecord">
         select
@@ -1327,6 +1377,7 @@
     </select>
 
 
+
     <!-- 根据主键删除数据 -->
     <delete id="deleteApplicationInRecordById" parameterType="integer">
         DELETE FROM application_in_record WHERE id = #{id}
@@ -1353,5 +1404,16 @@
         </foreach>
     </delete>
 
+    <delete id="deleteApplicationOutRecordMinById">
+        delete  from application_out_record_min where parentId = #{id}
+    </delete>
+
+    <delete id="deleteApplicationOutRecordMinByIds" parameterType="list">
+        DELETE FROM application_out_record_min WHERE parentId IN
+        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
 
 </mapper>

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

@@ -431,4 +431,11 @@ public interface DepositoryRecordService {
      * @return
      */
     Integer reviewByQyWxApproval(String mainId, ApprovalInfo_Details approvalInfo_details, String userAgent,String spStatus,String spNo,boolean flagForFirst);
+
+    /**
+     * 判断当前出库记录运行状态
+     * @param id
+     * @return
+     */
+    boolean judgeApplicationOutRecordStatus(Integer id);
 }

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

@@ -230,14 +230,37 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         return depositoryRecordMapper.insertApplicationOutRecord(map);
     }
 
+    /**
+     * 根据id删除出库记录
+     * @return 受影响的行数
+     * @param id
+     */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Integer deleteApplicationOutRecordById(Integer id) {
-        return depositoryRecordMapper.deleteApplicationOutRecordById(id);
+        // 删除主单
+        Integer integer = depositoryRecordMapper.deleteApplicationOutRecordById(id);
+        // 开启一个线程去删除子订单
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                depositoryRecordMapper.deleteApplicationOutRecordMinById(id);
+            }
+        }).start();
+        return integer;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Integer deleteApplicationOutRecordByIds(List<Integer> list) {
-        return depositoryRecordMapper.deleteApplicationOutRecordByIds(list);
+        Integer integer = depositoryRecordMapper.deleteApplicationOutRecordByIds(list);
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                depositoryRecordMapper.deleteApplicationOutRecordMinByIds(list);
+            }
+        }).start();
+        return integer;
     }
 
     /**
@@ -1813,6 +1836,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     }
 
+    /**
+     * 判断当前出库记录运行状态
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean judgeApplicationOutRecordStatus(Integer id) {
+        return false;
+    }
+
     /**
      * 转移申请
      *
@@ -2974,7 +3007,18 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             String applyTime = (String) map.get("applyTime");
             map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime));
         }
-        List<ApplicationOutRecordP> list = depositoryRecordMapper.findApplicationOutRecordPByCondition(map);
+        List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
+        List<Integer> depositoryIdList = new ArrayList<>();
+        for (RoleAndDepository depository: depositoryAndRole
+        ) {
+            depositoryIdList.add(depository.getDepositoryId());
+        }
+        if(depositoryIdList.size() == 0){
+            depositoryIdList = null;
+        }
+        map.put("depositoryIdList",depositoryIdList);
+        map.put("applicantId",userByPort.getId());
+        List<ApplicationOutRecordP> list = depositoryRecordMapper.findApplicationOutRecordPByUser(map);
         for (ApplicationOutRecordP recordP : list) {
             UserByPort userByPortById = LinkInterfaceUtil.FindUserById(recordP.getApplicantId(), userByPort);
             String time = DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime()));
@@ -2992,7 +3036,22 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
      */
     @Override
     public Integer findApplicationOutRecordPCountByUser(UserByPort userByPort, Map<String, Object> map) {
-        return null;
+        if (map.containsKey("applyTime")) {
+            String applyTime = (String) map.get("applyTime");
+            map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime));
+        }
+        List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
+        List<Integer> depositoryIdList = new ArrayList<>();
+        for (RoleAndDepository depository: depositoryAndRole
+        ) {
+            depositoryIdList.add(depository.getDepositoryId());
+        }
+        if(depositoryIdList.size() == 0){
+            depositoryIdList = null;
+        }
+        map.put("depositoryIdList",depositoryIdList);
+        map.put("applicantId",userByPort.getId());
+        return depositoryRecordMapper.findApplicationOutRecordPCountByUser(map);
     }
 
 

src/main/resources/templates/pages/depository/table-out.html

@@ -72,7 +72,7 @@
         <script type="text/html" id="toolbarDemo">
             <div class="layui-btn-container">
                 <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
-                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除</button>
+                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
             </div>
         </script>
 
@@ -80,7 +80,7 @@
 
         <script type="text/html" id="currentTableBar">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
-            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
         </script>
 
     </div>