#

zjj

2025-04-03 8130c6c5be33aa8d22869b7997648f9c2ddc51e7

#

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

@@ -218,10 +218,6 @@


        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        // 总库位数
        Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
        // 使用中
        Integer used = locUseRate.getFqty() + locUseRate.getUqty();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库");
@@ -230,7 +226,7 @@

            Map<String, Object> map1 = new HashMap<>();
            map1.put("name", "空");
            map1.put("value", 11200-used);
            map1.put("value", locUseRate.getOqty());
            pie.add(map1);

            Map<String, Object> map2 = new HashMap<>();
@@ -245,18 +241,22 @@
        }


        // 总库位数
        Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
        // 使用中
        Integer used = locUseRate.getFqty() + locUseRate.getUqty();
        // 库位使用率
        double usedDivides = Arith.divides(3, used, 11200);
        double usedPr = Arith.multiplys(1, usedDivides, 100);

        return R.ok(
                Cools.add("pie", pie)
                .add("stockCunt", locUseRate.getFqty())
                .add("emptyCount", 11200-used)
                .add("noneCount", locUseRate.getXqty())
                .add("total", 11200)
                .add("used", used)
                .add("usedPr", usedPr)
                        .add("stockCunt", locUseRate.getFqty())
                        .add("emptyCount", 11200-used)
                        .add("noneCount", locUseRate.getXqty())
                        .add("total", total)
                        .add("used", used)
                        .add("usedPr", usedPr)
        );
    }