#

yxFwq

2024-12-30 34045217b2ab791a01a6672cf5ab3830b55b900e

#

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

@@ -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()

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

@@ -183,13 +183,33 @@
//                } else
                if (jarProtocol.statusType .equals(JarStatusType.SOS2)){
                    jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
                    if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) {
                        if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
                            if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
                                jarProtocol.setLeftDoorClose(0);//close the left door  //进料门
                                jarProtocol.setRightDoorClose(0);//close the right door  //出料门
                            }
                        }
                        if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
                            if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
                                jarProtocol.setLeftDoorOpen(0);//open the left door  //进料门
                                jarProtocol.setRightDoorOpen(0);//open the right door  //出料门
                            }
                        }
                    }
                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING3) || jarProtocol.statusType .equals(JarStatusType.WAITING4)){
                    jarProtocol.setOpenDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING5) || jarProtocol.statusType .equals(JarStatusType.OFF_LINE)){
                    jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
                }

                if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) {
                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING1) || jarProtocol.statusType .equals(JarStatusType.MOVING)){
                    if (!jarProtocol.rightDoorOpen.equals(jarProtocol.leftDoorOpen)) {
                        if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
                            if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
                                jarProtocol.setLeftDoorOpen(0);//open the left door  //进料门
                                jarProtocol.setRightDoorOpen(0);//open the right door  //出料门
                            }
                        }
                    }
                    if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
                        if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
                            jarProtocol.setLeftDoorClose(0);//close the left door  //进料门
@@ -197,14 +217,9 @@
                        }
                    }
                }
                if (!jarProtocol.rightDoorOpen.equals(jarProtocol.leftDoorOpen)) {
                    if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
                        if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
                            jarProtocol.setLeftDoorOpen(0);//open the left door  //进料门
                            jarProtocol.setRightDoorOpen(0);//open the right door  //出料门
                        }
                    }
                }




                jarProtocol.setUpStatus(jarProtocol.getStatus());
//