完成调试

zc

2025-07-16 186432933336d96c19402c5aee61064df4a7390a

完成调试

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -27,7 +27,7 @@

    WrkMast selectPakInStepBarcode(@Param("barcode")String barcode);

    WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
    List<WrkMast> selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);


    // 入库第二步，当托盘物料在堆垛机入库站时时查询

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

@@ -307,39 +307,41 @@
                && 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;
            }
            if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
                News.watchInfo(wrkMast.getWrkNo() + "任务-2.5F入库", "工作档和完结工作号不匹配，{}，{}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
                return;
            }
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                return;
            }
            if (!config.getValue().equalsIgnoreCase("1")) {
                News.watchInfo(wrkMast.getWrkNo() + "任务-2.5F入库", "模式不对1");
                return;
            }
            // 命令下发区 --------------------------------------------------------------------------

            // 更新站点信息 且 下发plc命令
            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
            devpThread.setPakMk(staProtocol.getSiteId(), false);
            boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
            log.error("输送线下发3：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
            if (result) {
                // 更新工作主档
                wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
                wrkMast.setModiTime(new Date());
                if (wrkMastMapper.updateById(wrkMast) == 0) {
                    News.error("" + mark + " - 1" + " - 更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
            for (WrkMast wrkMast : wrkMasts) {
                if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
                    News.watchInfo(wrkMast.getWrkNo() + "任务-2.5F入库", "工作档和完结工作号不匹配，{}，{}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
                    continue;
                }
            } else {
                News.error("" + mark + " - 2" + " - 发布命令至输送线队列失败！！！ [plc编号：{}]", 1);
                Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
                if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                    continue;
                }
                if (!config.getValue().equalsIgnoreCase("1")) {
                    News.watchInfo(wrkMast.getWrkNo() + "任务-2.5F入库", "模式不对1");
                    continue;
                }
                // 命令下发区 --------------------------------------------------------------------------

                // 更新站点信息 且 下发plc命令
                staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                devpThread.setPakMk(staProtocol.getSiteId(), false);
                boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                log.error("输送线下发3：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
                if (result) {
                    // 更新工作主档
                    wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
                    wrkMast.setModiTime(new Date());
                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                        News.error("" + mark + " - 1" + " - 更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
                    }
                } else {
                    News.error("" + mark + " - 2" + " - 发布命令至输送线队列失败！！！ [plc编号：{}]", 1);
                }
            }

        } else {
@@ -1276,7 +1278,7 @@
                        }
                        break;
                    }
                }else {
                } else {
                    News.watchError(wrkMast.getWrkNo() + "任务-堆垛机出库", "堆垛机站点状态需要满足：自动、可出, 站点编号={}", staProtocol.getSiteId());
                }
            }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -91,7 +91,7 @@
    </select>

    <select id="selectPakInStep11" resultMap="BaseResultMap">
        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
        select  * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
    </select>