#

yxFwq

2025-01-01 716f7e3dec477b1dffe2ff33182116f558be60b0

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

@@ -3111,10 +3111,10 @@
                if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
                    continue;
                }
//                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
//                if (wrkCount>=12){
//                    continue;
//                }
                int wrkCountGt = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
                if (wrkCountGt > 2){
                    continue;
                }
//                RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
//                if (Cools.isEmpty(bigTurn)){
//                    continue;
@@ -5158,7 +5158,7 @@
                            if (jarMaxLoc == 0 || basJarOther.getJarCount() == 0) {
                                break;
                            }
                            int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 6));
                            int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 5));
                            if (count>0){
                                break;
                            }
@@ -5967,9 +5967,9 @@
                if (!basJarMastListOther.isEmpty() && basJarMastListOther.size() < basJarOther.getJarCount()){
                    return false;
                }
                if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && !basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 4).equals(basJarOther.getJarCount() )){
                    return false;
                }
//                if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && !basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 4).equals(basJarOther.getJarCount() )){
//                    return false;
//                }

//                //临时
//                if (basJar.getJarCode()==1){
@@ -8090,6 +8090,30 @@
                    log.error("{}号硫化罐查询设备档案无信息！！！",jarProtocol.getJarNo());
                    continue;
                }
                if (jarProtocol.getJarErr()==0 && (jarProtocol.getStatusType().equals(JarStatusType.WAITING1) || jarProtocol.getStatusType().equals(JarStatusType.MOVING))
                        && jarProtocol.isRightDoor() && jarProtocol.isLeftDoor()
                        && jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0
                ){
                    List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
                        add(6);//硫化完成
                    }});
                    if (!basJarMastList.isEmpty()){
                        WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
                        wrkMastExecuteSou.setWrkSts(3);
                        List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
                        for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
                            if (wrkMastExecute.getIoType() == 3){
                                wrkMastExecute.setWrkSts(4);
                                if (!wrkMastExecuteService.updateById(wrkMastExecute)){
                                    log.error("硫化罐Jar命令修改失败===>更新wrkMastExecute失败，jar号={},任务数据={},硫化罐数据={},sign={}",
                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                    return false;
                                }
                                return true;
                            }
                        }
                    }
                }
                //WAITING2(4, "硫化完成"),
                if (jarProtocol.getJarErr()==0 && jarProtocol.getStatusType().equals(JarStatusType.WAITING2)
                        && !jarProtocol.isRightDoor() && !jarProtocol.isLeftDoor()