#

zjj

12 小时以前 6ba157825d34078a75fee36cb66ead17327f5b32

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

@@ -195,14 +195,18 @@
    }


    /**
     * 库位使用情况统计
     */


    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        List<Map<String, Object>> pie = new ArrayList<>();


        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", "在库");
@@ -211,7 +215,7 @@

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

            Map<String, Object> map2 = new HashMap<>();
@@ -225,25 +229,72 @@
            pie.add(map3);
        }

        // 总库位数
        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, total);
        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", locUseRate.getOqty())
                .add("noneCount", locUseRate.getXqty())
                .add("total", total)
                .add("used", used)
                .add("usedPr", usedPr)
                        .add("stockCunt", locUseRate.getFqty())
                        .add("emptyCount", 11200-used)
                        .add("noneCount", locUseRate.getXqty())
                        .add("total", 11200)
                        .add("used", used)
                        .add("usedPr", usedPr)
        );
    }


    /**
     * 库位使用情况统计
     */
//    @GetMapping("/loc/rep")
//    public R monitorLocRep(){
//        List<Map<String, Object>> pie = new ArrayList<>();
//
//        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
//        if(locUseRate!=null) {
//            Map<String, Object> map = new HashMap<>();
//            map.put("name", "在库");
//            map.put("value", locUseRate.getFqty());
//            pie.add(map);
//
//            Map<String, Object> map1 = new HashMap<>();
//            map1.put("name", "空");
//            map1.put("value", locUseRate.getOqty());
//            pie.add(map1);
//
//            Map<String, Object> map2 = new HashMap<>();
//            map2.put("name", "使用");
//            map2.put("value", locUseRate.getUqty());
//            pie.add(map2);
//
//            Map<String, Object> map3 = new HashMap<>();
//            map3.put("name", "禁用");
//            map3.put("value", locUseRate.getXqty());
//            pie.add(map3);
//        }
//
//        // 总库位数
//        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, total);
//        double usedPr = Arith.multiplys(1, usedDivides, 100);
//
//        return R.ok(
//                Cools.add("pie", pie)
//                        .add("stockCunt", locUseRate.getFqty())
//                        .add("emptyCount", locUseRate.getOqty())
//                        .add("noneCount", locUseRate.getXqty())
//                        .add("total", total)
//                        .add("used", used)
//                        .add("usedPr", usedPr)
//        );
//    }

    /**
     * 获取其他信息
     */