#库龄、库存异常分离

LSH

2023-09-27 c94a87065a12006c1b3251418a13a459b23aa7e4

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -301,9 +301,9 @@

    /**********************************************************异常库存相关controller**********************************************************/

    @RequestMapping(value = "/locDetl/grouplist/auth")
    @RequestMapping(value = "/locDetl/groupLocList/auth")
    @ManagerAuth
    public R groupList(@RequestParam(defaultValue = "1") Integer curr,
    public R groupLocList(@RequestParam(defaultValue = "1") Integer curr,
                       @RequestParam(defaultValue = "10") Integer limit,
                       @RequestParam(required = false) String orderByField,
                       @RequestParam(required = false) String orderByType,
@@ -326,8 +326,7 @@
            }


            if (!Cools.isEmpty(mat.getStoreMax())
                    || !Cools.isEmpty(mat.getStoreMin())) {
            if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
                abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
                abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
                abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
@@ -346,12 +345,46 @@

                if (!Cools.isEmpty(mat.getStoreMax()) && locDetl.getAnfme() > mat.getStoreMax()) {
                    result.add(abnormalLocDetlParam);
                    continue;
                } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
                    result.add(abnormalLocDetlParam);
                }
            }
        }

        Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
        locDetlPage.setRecords(paging(result, curr, limit));
        locDetlPage.setTotal(result.size());
        locDetlPage.setCurrent(curr);
        locDetlPage.setSize(limit);
        return R.ok(locDetlPage);
    }

    @RequestMapping(value = "/locDetl/groupDateList/auth")
    @ManagerAuth
    public R groupDateList(@RequestParam(defaultValue = "1") Integer curr,
                       @RequestParam(defaultValue = "10") Integer limit,
                       @RequestParam(required = false) String orderByField,
                       @RequestParam(required = false) String orderByType,
                       @RequestParam(required = false) String condition,
                       @RequestParam Map<String, Object> param) {

//        List<LocDetl> result = new ArrayList<>();
        List<AbnormalLocDetlParam> result = new ArrayList<>();
//        excludeTrash(param);
        param.put("curr", curr);
        param.put("limit", limit);
        Page<LocDetl> groupLocDetl = locDetlService.getStockStatisDate(toPage(1, 10000, param, LocDetl.class));
//        List<LocDetl> groupLocDetl = locDetlService.selectGroupPage(param, curr, limit);
        for (LocDetl locDetl : groupLocDetl.getRecords()) {
            AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
            Mat mat = matService.selectOne(new EntityWrapper<Mat>()
                    .eq("matnr", locDetl.getMatnr()));
            if (Cools.isEmpty(mat)) {
                    continue;
                }
            } else if (!Cools.isEmpty(mat.getStoreMaxDate())) {


            if (!Cools.isEmpty(mat.getStoreMaxDate())) {
                if (Cools.isEmpty(locDetl.getBatch())) {
                    continue;
                } else if (locDetl.getBatch().length() != 8) {
@@ -367,7 +400,7 @@
                    // 这个时间就是日期往后推一天的结果
                    maxDate = calendar.getTime();
                    Date now = new Date();
                    abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
                    abnormalLocDetlParam.setLocNo(locDetl.getLocNo());
                    abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
                    abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
                    abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
@@ -376,10 +409,12 @@
                    abnormalLocDetlParam.setSpecs(mat.getSpecs());
                    abnormalLocDetlParam.setBatch(locDetl.getBatch());
                    if (now.compareTo(maxDate) > 0) {
                        long difference = (now.getTime() - maxDate.getTime()) / (24 * 60 * 60 * 1000);
                        abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
                        result.add(abnormalLocDetlParam);
                    }
                } catch (Exception e) {
                    continue;
                    System.out.println(e.getMessage());
                }
            }
        }