pjb
8 天以前 c17493e1a45d8cf1bf5d384fe271ecd5865b6f26
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -836,8 +836,16 @@
                if (wrkMast == null) {
                    continue;
                }
                if (wrkMast.getStaNo() == 1031 && kbWrks > 1) {
                    continue;
                if (wrkMast.getStaNo() == 1031) {
                    // 获取1033无状态时任务数+1
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
                    StaProtocol staProtocol = devpThread.getStation().get(1033);
                    if (staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
                        kbWrks ++;
                    }
                    if (kbWrks > 1) {
                        continue;
                    }
                }
                // 工作档状态判断
                if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
@@ -1806,12 +1814,12 @@
                        DevpThread devpThread2 = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
                        StaProtocol staProtocol2 = devpThread2.getStation().get(1090);
                        if(!staProtocol2.isAutoing() || staProtocol2.isLoading() || staProtocol2.getWorkNo() != 0) {
                            log.info("去异常口目标站点,非自动,有物,工作号为:{}",staProtocol2.getWorkNo());
                            log.info("{}去异常口目标站点,自动:{},有物:{},工作号为:{}",wrkMast.getWrkNo(),staProtocol2.isAutoing(),staProtocol2.isLoading(),staProtocol2.getWorkNo());
                            continue;
                        }
                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 and wrk_sts in (9,10)"));
                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 AND (wrk_sts IN (9,10) OR (wrk_sts = 2 AND rgv_finish_time IS NOT NULL))"));
                        if (count > 0) {
                            log.info("去异常口,但是前面有去异常口任务数:{}",count);
                            log.info("{}去异常口,但是前面有去异常口任务数:{}",wrkMast.getWrkNo(),count);
                            continue;
                        }
                    }