异常口任务冲突异常修复

pjb

2025-08-04 23a38baa92ff6b9a971b289df0ea988a34a28906

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

@@ -827,11 +827,16 @@
        if (config != null && config.getStatus() == 1) {
            crnAvailableOut = true;
        }
        // 限制去捆绑机器任务数
        int kbWrks = wrkMastMapper.selectCountByKb();
        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            for (WrkMast wrkMast : wrkMasts) {
                if (wrkMast == null) {
                    continue;
                }
                if (wrkMast.getStaNo() == 1031 && kbWrks > 1) {
                    continue;
                }
                // 工作档状态判断
@@ -1801,12 +1806,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;
                        }
                    }