zc
2025-07-16 186432933336d96c19402c5aee61064df4a7390a
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -307,21 +307,22 @@
                && staProtocol.isPakMk()) {
            News.warnNoLog("" + mark + " - 0" + " - 开始执行");
            // 判断重复工作档
            WrkMast wrkMast = wrkMastMapper.selectPakInStep11(1135);
            if (wrkMast == null) {
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakInStep11(1135);
            if (Cools.isEmpty(wrkMasts)) {
                return;
            }
            for (WrkMast wrkMast : wrkMasts) {
            if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
                News.watchInfo(wrkMast.getWrkNo() + "任务-2.5F入库", "工作档和完结工作号不匹配,{},{}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
                return;
                    continue;
            }
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                return;
                    continue;
            }
            if (!config.getValue().equalsIgnoreCase("1")) {
                News.watchInfo(wrkMast.getWrkNo() + "任务-2.5F入库", "模式不对1");
                return;
                    continue;
            }
            // 命令下发区 --------------------------------------------------------------------------
@@ -341,6 +342,7 @@
            } else {
                News.error("" + mark + " - 2" + " - 发布命令至输送线队列失败!!! [plc编号:{}]", 1);
            }
            }
        } else {
            News.watchError(staProtocol.getSiteId() + "站-2.5F入库", "" + mark + " - 6" + " - 站点信息不符合入库条件!!!" + " 自动信号:" + staProtocol.isLoading() + "、可入信号:" + staProtocol.isInEnable()