#

whycq

2024-05-03 f3e9a20a198160228e66c1deed012e075327c035

#

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

@@ -216,48 +216,53 @@
     */
    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        List<Map<String, Object>> pie = new ArrayList<>();
        try{
            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);
            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> 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> 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);
                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)
            );
        }catch (Exception e){
            System.out.println("/loc/rep异常"+e);
            return R.error();
        }

        // 总库位数
        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)
        );
    }

    /**

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -219,6 +219,8 @@
                            .in("io_type", 107,103,57,53));
                    if (!Cools.isEmpty(checkPick)) {
                        continue;
                    } else {
                        News.info("新板入库条码===>>" + barcode);
                    }
//                    WrkMast checkPick2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
//                            .eq("barcode", barcode)
@@ -630,6 +632,7 @@
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
                            News.info("crnStnToOutStn堆垛机复位时工作号===>>" + crnProtocol.getTaskNo());
                            crnThread.setResetFlag(true);
                        } else {
                            News.error(methodName + ":更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
@@ -1529,6 +1532,7 @@
                    // 修改成功后复位堆垛机
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        // 堆垛机复位
                        News.info("storeFinished堆垛机复位时工作号===>>" + crnProtocol.getTaskNo());
                        crnThread.setResetFlag(true);
                    }
                }