#

yxFwq

2024-07-14 2d98b2ec8e7f523e2047730534068d4d9b382c60

#

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

@@ -7460,6 +7460,9 @@

                                BasJarMast jarMastByWrkNo = new BasJarMast(basJar);
                                jarMastByWrkNo.setWrkNo(Integer.toUnsignedLong(wrkMastExecute.getWrkNo().intValue()));//工作号
                                jarMastByWrkNo.setJarEnterStaNo(basJar.getEnterRgvNo());
                                jarMastByWrkNo.setEnterStaNo(basJar.getEnterRgvNo());
                                jarMastByWrkNo.setOutStaNo(basJar.getOutRgvNo());
                                //B==>A
                                if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByWrkNo,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),11,1})){
                                    log.error("JarWrkMastExecute任务创建===>执行异常===》异常数据：BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByWrkNo));
@@ -7512,6 +7515,9 @@

                                BasJarMast jarMastByWrkNo = new BasJarMast(basJar);
                                jarMastByWrkNo.setWrkNo(Integer.toUnsignedLong(wrkMastExecute.getWrkNo().intValue()));//工作号
                                jarMastByWrkNo.setJarEnterStaNo(basJar.getEnterRgvNo());
                                jarMastByWrkNo.setEnterStaNo(basJar.getEnterRgvNo());
                                jarMastByWrkNo.setOutStaNo(basJar.getOutRgvNo());
                                //C==>B
                                if (!jarWrkMastExecuteGenerateExecute(basJar,jarMastByWrkNo,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),8,1})){
                                    log.error("JarWrkMastExecute任务创建===>执行异常===》异常数据：BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(jarMastByWrkNo));
@@ -7590,6 +7596,9 @@
                        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(7));//充电工作号
                        BasJarMast basJarMast = new BasJarMast(basJar);
                        basJarMast.setWrkNo(Integer.toUnsignedLong(workNo));//工作号
                        basJarMast.setJarEnterStaNo(basJar.getEnterRgvNo());
                        basJarMast.setEnterStaNo(basJar.getEnterRgvNo());
                        basJarMast.setOutStaNo(basJar.getOutRgvNo());
                        if (!jarWrkMastExecuteGenerateExecute(basJar,basJarMast,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),100,1})){
                            log.error("JarWrkMastExecute充电任务创建===>执行异常===》异常数据：BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
                        }
@@ -7632,6 +7641,9 @@
                        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(7));//充电工作号
                        BasJarMast basJarMast = new BasJarMast(basJar);
                        basJarMast.setWrkNo(Integer.toUnsignedLong(workNo));//工作号
                        basJarMast.setJarEnterStaNo(basJar.getEnterRgvNo());
                        basJarMast.setEnterStaNo(basJar.getEnterRgvNo());
                        basJarMast.setOutStaNo(basJar.getOutRgvNo());
                        if (!jarWrkMastExecuteGenerateExecute(basJar,basJarMast,basJar.getJarNo(),new int[]{basJar.getOutSteNo(),basJar.getOutRgvNo(),100,1})){
                            log.error("JarWrkMastExecute充电任务创建===>执行异常===》异常数据：BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
                        }
@@ -7662,7 +7674,7 @@
                    continue;
                }
                WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId());
                if (!Cools.isEmpty(wrkMastExecuteByCharge)){
                if (Cools.isEmpty(wrkMastExecuteByCharge)){
                    continue;
                }

@@ -7672,13 +7684,13 @@
                            continue;
                        }
                    }
                } else if (steProtocol.getCharge()>95.0F || steProtocol.getFullCharge()){
                } else if (steProtocol.getCharge()>97.0F || steProtocol.getFullCharge()){
                } else {
                    continue;
                }

                try{
                    if (jarWrkMastExecuteGenerateSteStatusCharge(steSlave.getId(),1,SteStatusType.MOVING,true)){
                    if (jarWrkMastExecuteGenerateSteStatusCharge(steSlave.getId(),1,SteStatusType.CHARGE,true)){
                        //完成充电任务
                        //调车  == > 断开充电
                        if (!jarSteTake(wrkMastExecuteByCharge,SteLocaType.POINT20.id,SteLocaType.POINT20.id,SteTaskModeType.CLOSE_CHARGE,false,wrkMastExecuteByCharge.getJarId())){

 src/main/java/com/zy/core/enums/SteStatusType.java

@@ -8,6 +8,7 @@
    SOS(2, "停止中"),
    SOS2(3, "报警：故障中"),
    SOS3(4, "复位中"),
    CHARGE(5, "充电中"),
    WAITING(10, "等待确认"),
    WAITING2(11, "有物待作业"),
    OTHER(100, "其它"),

 src/main/java/com/zy/core/enums/SteTaskModeType.java

@@ -29,8 +29,8 @@
    STE_WFQH_12(12,"往返取货"),
    STE_WFFH_13(13,"往返放货"),
    STE_MOVE_14(14,"移动"),
    START_CHARGE(16, "开始充电"),   // 开始充电
    CLOSE_CHARGE(17, "断开充电"),   // 断开充电
    START_CHARGE(15, "开始充电"),   // 开始充电
    CLOSE_CHARGE(16, "断开充电"),   // 断开充电
    ;

    public Integer id;

 src/main/java/com/zy/core/thread/SteThread.java

@@ -155,8 +155,8 @@

                boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 27, 1);

                steProtocol.setChargeStatus(status[0]?(short)1:(short)0);
                steProtocol.setTrack(status[1]?(short)1:(short)0);
                steProtocol.setChargeStatus(status2[0]?(short)1:(short)0);
                steProtocol.setTrack(status2[1]?(short)1:(short)0);

//                steProtocol.setLoad(status2[6]?(short)1:(short)0);
                steProtocol.setLoad(status2[7]?(short)1:(short)0);