#

whycq

2024-05-03 f3e9a20a198160228e66c1deed012e075327c035

#

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

@@ -216,6 +216,7 @@
     */
    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        try{
        List<Map<String, Object>> pie = new ArrayList<>();

        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
@@ -258,6 +259,10 @@
                        .add("used", used)
                        .add("usedPr", usedPr)
        );
        }catch (Exception e){
            System.out.println("/loc/rep异常"+e);
            return R.error();
        }
    }

    /**

 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);
                    }
                }