#

yxFwq

2024-08-10 2fc41a25a6acfad60e1ec6fa1234f98efb0b3a82

#

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

@@ -5441,7 +5441,7 @@
            if (basJarMastList.size() != jarMaxLoc){
                return false;
            }
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0){
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0&&(basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7)){
                return false;
            }

@@ -8113,7 +8113,7 @@
                }
            }
        } catch (Exception e){
            log.error("硫化区域分段任务完成异常,异常信息={}",e.getMessage());
            log.error("硫化区域分段充电任务创建异常,异常信息={}",e.getMessage());
        }
        return false;
    }
@@ -8190,7 +8190,7 @@
                }
            }
        } catch (Exception e){
            log.error("硫化区域分段任务完成异常,异常信息={}",e.getMessage());
            log.error("硫化区域分段任务充电任务完成异常,异常信息={}",e.getMessage());
        }
        return false;
    }

 src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java

@@ -34,7 +34,7 @@
        }
    }

    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){//上传开式冷却信号
        int[] jarList =new int[]{1,2,3,4,5,6};
        for (int jarNo : jarList){

 src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java

@@ -21,4 +21,5 @@
    private Integer ioType;//        是    字符串    时间戳
    private Integer devNo;//        是    字符串    时间戳
    private Double weight;//        是    字符串    时间戳
    private String wrkno;//        是    字符串    时间戳
}

 src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java

@@ -95,6 +95,7 @@
                    staEscalationParam.setOrderNo(wrkDetl.getSpecs());
                    staEscalationParam.setTaskNo(wrkDetl.getModel());
                    staEscalationParam.setWeight(wrkDetl.getWeight());
                    staEscalationParam.setWrkno(wrkDetl.getWrkNo().toString());
                    ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
                    if (result.getCode()==200){
                        wrkMast.setSheetNo("2");