#

mrzhssss

2022-12-22 b5a808d20a234afed5dec6951b1d0cd6a6a6b310

#

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

@@ -303,19 +303,16 @@
        Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(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)
                    || Cools.isEmpty(mat.getStoreMax())
                    || Cools.isEmpty(mat.getStoreMaxDate())
                    || Cools.isEmpty(mat.getStoreMin())) {
                continue;
            } else if (Cools.isEmpty(locDetl.getBatch())) {
                continue;
            } else if (locDetl.getBatch().length() != 8) {
            if (Cools.isEmpty(mat)) {
                continue;
            }
            AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();


            if (!Cools.isEmpty(mat.getStoreMax())
                    || !Cools.isEmpty(mat.getStoreMin())) {
            abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
            abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
            abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
@@ -324,24 +321,27 @@
            abnormalLocDetlParam.setMatnr(mat.getMatnr());
            abnormalLocDetlParam.setSpecs(mat.getSpecs());
            abnormalLocDetlParam.setBatch(locDetl.getBatch());
            try {
                SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
                Date maxDate = simple.parse(locDetl.getBatch());
                long time = maxDate.getTime();
                Date now = new Date();
                long time1 = now.getTime();
                abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
            } catch (ParseException e) {
                e.printStackTrace();
            }
            if (locDetl.getAnfme() > mat.getStoreMax()) {
                result.add(abnormalLocDetlParam);
                continue;
            } else if (locDetl.getAnfme() < mat.getStoreMin()) {
                result.add(abnormalLocDetlParam);
                continue;
            }

//                SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
//                Date maxDate = simple.parse(locDetl.getBatch());
//                long time = maxDate.getTime();
//                Date now = new Date();
//                long time1 = now.getTime();
//                abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));

                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);
                    continue;
                }
            } else if (!Cools.isEmpty(mat.getStoreMaxDate())) {
                if (Cools.isEmpty(locDetl.getBatch())) {
                    continue;
                } else if (locDetl.getBatch().length() != 8) {
                    continue;
                }
            try {
                SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
                Date maxDate = simple.parse(locDetl.getBatch());
@@ -352,6 +352,14 @@
                // 这个时间就是日期往后推一天的结果
                maxDate = calendar.getTime();
                Date now = new Date();
                    abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
                    abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
                    abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
                    abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
                    abnormalLocDetlParam.setMaktx(mat.getMaktx());
                    abnormalLocDetlParam.setMatnr(mat.getMatnr());
                    abnormalLocDetlParam.setSpecs(mat.getSpecs());
                    abnormalLocDetlParam.setBatch(locDetl.getBatch());
                if (now.compareTo(maxDate) > 0) {
                    result.add(abnormalLocDetlParam);
                }
@@ -359,6 +367,7 @@
                continue;
            }
        }
        }

        Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
        locDetlPage.setRecords(paging(result, curr, limit));

 src/main/resources/application.yml

@@ -10,9 +10,9 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
#    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
#    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
    username: sa
#    password: Zoneyung@zy56$
    password: sa@123