#

yxFwq

2024-10-24 e597fc1db67c560adecbd8d1e37d13c8f5a50fe3

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

@@ -5658,9 +5658,9 @@
            List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
                add(4);
            }});
//            if (basJarMastList.size() != jarMaxLoc){
//                return false;
//            }
            if (basJarMastList.isEmpty()){
                return false;
            }

            BasJarMast basJarMastSign = basJarMastList.get(0);
            if (Cools.isEmpty(basJarMastSign)){
@@ -5751,6 +5751,9 @@
//                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=jarMaxLoc*2){
//                return false;
//            }
            if (basJarMastList.isEmpty()){
                return false;
            }

            BasJarMast basJarMastSign = basJarMastList.get(0);
            if (Cools.isEmpty(basJarMastSign)){
@@ -8392,7 +8395,14 @@
                    continue;
                }
                SteProtocol steProtocol = steThread.getSteProtocol();
                if (steProtocol == null || steProtocol.getChargeStatus()!=0) {
                if (steProtocol == null) {
                    continue;
                }
                if (Cools.isEmpty(steProtocol.getChargeStatus())) {
                    log.error("{}号小车，充电状态信息异常，小车信息：{}",steProtocol.getSteNo(),steProtocol.toString());
                    continue;
                }
                if (steProtocol.getChargeStatus()!=0) {
                    continue;
                }
                WrkMastExecute wrkMastExecuteByCharge = wrkMastExecuteService.getWrkMastExecuteByCharge(steSlave.getId());
@@ -8506,7 +8516,14 @@
                    continue;
                }
                SteProtocol steProtocol = steThread.getSteProtocol();
                if (steProtocol == null || steProtocol.getChargeStatus()!=1) {
                if (steProtocol == null) {
                    continue;
                }
                if (Cools.isEmpty(steProtocol.getChargeStatus())) {
                    log.error("{}号小车，充电状态信息异常，小车信息：{}",steProtocol.getSteNo(),steProtocol.toString());
                    continue;
                }
                if (steProtocol.getChargeStatus()!=1) {
                    continue;
                }

@@ -8750,14 +8767,16 @@
                    add(3);
                    add(4);
                }});
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);

                Integer count = basJarMastList.size();
                ArrayList<Integer> wrkNoList = new ArrayList<>();

                for (Integer staNoEnt : staNos){
                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
                    StaProtocol staProtocolEnt = devpThread.getStation().get(staNoEnt);
                    if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
                    if (staProtocolEnt == null || (staProtocolEnt.isLoading() && staProtocolEnt.getWorkNo()==0)){
                        log.error("站点异常,计数加一，站点号："+staNoEnt);
                        count++;
                    } else if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
                        if (staProtocolEnt.getStaNo().equals(basJar.getEntStaNo$())){
                            count++;
                            wrkNoList.add(staProtocolEnt.getWorkNo());