#

TQS

2024-08-19 d2b19008230941c105b57b8f7b49b291560f2cfb

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

@@ -1065,7 +1065,7 @@
                        //  判断堆垛机状态等待确认
                        if (crnProtocol.modeType == CrnModeType.AUTO
                                && crnProtocol.statusType == CrnStatusType.IDLE
                                && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                                && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()!=(short)4) {
                            News.info("堆垛机接驳任务执行，工作号："+staProtocol.getWorkNo()+"；执行堆垛机号："+slave.getId()+"；接驳取货位："+crnStn.getStaNo()+"；接驳放货位："+staProtocol.getSiteId());
                            // 堆垛机接驳任务命令下发区 --------------------------------------------------------------------------
                            CrnCommand crnCommand = new CrnCommand();
@@ -1097,7 +1097,7 @@
                        //  判断堆垛机状态等待确认
                        if (crnProtocol.modeType == CrnModeType.AUTO
                                && crnProtocol.statusType == CrnStatusType.IDLE
                                && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                                && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()==(short)4) {
                            News.info("堆垛机接驳任务执行，工作号："+staProtocol.getWorkNo()+"；执行堆垛机号："+slave.getId()+"；接驳取货位："+crnStn.getStaNo()+"；接驳放货位："+staProtocol.getSiteId());
                            // 堆垛机接驳任务命令下发区 --------------------------------------------------------------------------
                            CrnCommand crnCommand = new CrnCommand();
@@ -3578,6 +3578,7 @@
            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
            SteProtocol steProtocol = steThread.getSteProtocol();
            if (steProtocol == null) { continue; }
            if (Cools.isEmpty(steProtocol.loca)) continue;
            if (steProtocol.loca==0) continue;
            if (steProtocol.getWaiting() && steProtocol.getTaskNo() == 0){
                News.info("ste[id={}] 收到等待WCS确认信号，但是任务号(地址V824)为0", steProtocol.getSteNo());
@@ -4873,8 +4874,8 @@
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());

                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    Integer sourceStaNo = inSta.getStaNo()==103 ? 104 : inSta.getStaNo()==113 ? 104 : 204;
                    WrkMast pakout = wrkMastMapper.selectWorkingPakout(sourceStaNo);
                    Integer staNoEnd = inSta.getStaNo()==113 ? 114 : 214;
                    WrkMast pakout = wrkMastMapper.selectWorkingPakoutTwoF(staNoEnd);
                    boolean sign = true;
                    int[] staNos = new int[3];

@@ -4883,7 +4884,8 @@
                            staNos = new int[]{112,113,114};
                            for (int staNo : staNos){
                                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                                if (!staProtocol.isAutoing() || staProtocol.isLoading()){
                                if (Cools.isEmpty(staProtocol)) continue;
                                if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo()>0){
                                    sign = false;
                                }
                            }
@@ -4912,6 +4914,7 @@
                            staNos = new int[]{212,213,214};
                            for (int staNo : staNos){
                                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                                if (Cools.isEmpty(staProtocol)) continue;
                                if (!staProtocol.isAutoing() || staProtocol.isLoading()){
                                    sign = false;
                                }