#

yxFwq

2025-01-12 8f31f11b595eb1ec0b1c10210549d499efcc25a6

#

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

@@ -5904,6 +5904,42 @@
            if (basJarMastList.isEmpty()){
                return false;
            }

            StaProtocol staProtocolEnd = new StaProtocol();
            staProtocolEnd.setAutoing(false);
            for (DevpSlave devp : slaveProperties.getDevp()) {
                if (devp.getId() == 1){
                    continue;
                }
                // 遍历入库口
                for (DevpSlave.Sta inSta : devp.getOutJarInSta()) {
                    if (jarSlave.getId() == 1 || jarSlave.getId() == 2){
                        if (inSta.getStaNo() == 627){
                            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                            StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                            if (staProtocol == null) {
                                break;
                            }
                            staProtocolEnd = staProtocol;
                            break;
                        }
                    } else if (jarSlave.getId() == 3 || jarSlave.getId() == 4){
                        if (inSta.getStaNo() == 628){
                            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                            StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                            if (staProtocol == null) {
                                break;
                            }
                            staProtocolEnd = staProtocol;
                            break;
                        }
                    }

                }
            }
            if (!staProtocolEnd.isAutoing() || staProtocolEnd.isLoading()){
                return false;
            }
            List<BasJarMast> basJarMastList10 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
                add(10);
            }});
@@ -8279,7 +8315,7 @@
                            log.error("硫化罐Jar命令下发失败，jar号={},任务数据={},硫化罐数据={},sign={}",
                                    execute.getJarId(), JSON.toJSON(execute), JSON.toJSON(jarProtocol),sign);
                        }
                        return true;
                        continue;
                    }
                    for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
                        if (wrkMastExecute.getIoType() == 2 || wrkMastExecute.getIoType() == 4){
@@ -8294,7 +8330,7 @@
                                        wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                return false;
                            }
                            return true;
                            continue;
                        }
                    }
                }