初始化

zwl

6 天以前 c6b6c90518697fdb2f89853a75921ff2af41ee73

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

@@ -142,15 +142,15 @@
    @PostMapping("/table/crn/msg")
    @ManagerAuth(memo = "堆垛机数据表")
    public R crnMsgTable(){
        Config crnSearchDetectTaskCountConfig = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "crnSearchDetectTaskCount")
        );
        int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());

        Config applyInTaskTotalCountConfig = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "applyInTaskTotalCount")
        );
        int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
//        Config crnSearchDetectTaskCountConfig = configService.selectOne(new EntityWrapper<Config>()
//                .eq("code", "crnSearchDetectTaskCount")
//        );
//        int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
//
//        Config applyInTaskTotalCountConfig = configService.selectOne(new EntityWrapper<Config>()
//                .eq("code", "applyInTaskTotalCount")
//        );
//        int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());

        List<CrnMsgTableVo> list = new ArrayList<>();
        List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -189,8 +189,8 @@
            vo.setYdistance(crnProtocol.getYDistance());  //  升降距离(Km)
            vo.setXduration(crnProtocol.getXDuration());    //  走行时长(H)
            vo.setYduration(crnProtocol.getYDuration());    //  升降时长(H)
            vo.setCrnSearchDetectTaskCount(crnSearchDetectTaskCount);
            vo.setApplyInTaskTotalCount(applyInTaskTotalCount);
//            vo.setCrnSearchDetectTaskCount(crnSearchDetectTaskCount);
//            vo.setApplyInTaskTotalCount(applyInTaskTotalCount);

            List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                    .eq("crn_no", basCrnp.getCrnNo())