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

@@ -29,6 +29,7 @@

    WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);


    // 入库第二步，当托盘物料在堆垛机入库站时时查询
//    @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
    WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);

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

@@ -38,6 +38,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -93,7 +95,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private BasRgvMapService basRgvMapService;

    @Autowired
    private ConfigService configService;
    @Value("${wms.url}")
    private String wmsUrl;

@@ -284,64 +287,60 @@
     * 入库站，根据条码扫描生成入库工作档，工作状态 1 ==>> 2
     */
    public synchronized void generateStoreWrkFile0(Integer mark) {
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                if (inSta.getStaNo() != 1035) {
                    continue;
                }
                // 获取入库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }


                // 判断是否满足入库条件
                if (!staProtocol.isLoading()) {
                    continue;
                }
                if (staProtocol.isAutoing() && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999)
                        && staProtocol.isPakMk()) {
                    News.warnNoLog("" + mark + " - 0" + " - 开始执行");
                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
                    if (wrkMast == null) {
                        continue;
                    }

                    // 命令下发区 --------------------------------------------------------------------------

                    // 更新站点信息 且 下发plc命令
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), 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编号：{}]", devp.getId());
                    }

                } else {
                    News.errorNoLog("" + mark + " - 6" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isLoading() + "、可入信号：" + staProtocol.isInEnable()
                            + "、空板信号：" + staProtocol.isEmptyMk() + "、工作号：" + staProtocol.getWorkNo()
                            + "、锁定标记" + staProtocol.isPakMk() + "、入库印记：" + staProtocol.getStamp());
                }
            }
        // 获取入库站信息
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        StaProtocol staProtocol = devpThread.getStation().get(1135);
        if (staProtocol == null) {
            return;
        } else {
            staProtocol = staProtocol.clone();
        }
//        News.infoNoLog(""+mark+" - 0"+" - wms入库  ===》执行完成");

        // 判断是否满足入库条件
        if (!staProtocol.isLoading()) {
            return;
        }
        if (staProtocol.isAutoing()
                && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999)
                && staProtocol.isPakMk()) {
            News.warnNoLog("" + mark + " - 0" + " - 开始执行");
            // 判断重复工作档
            WrkMast wrkMast = wrkMastMapper.selectPakInStep11(1135);
            if (wrkMast == null) {
                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")) {
                log.info("模式不对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());
                }
            } else {
                News.error("" + mark + " - 2" + " - 发布命令至输送线队列失败！！！ [plc编号：{}]", 1);
            }

        } else {
            News.errorNoLog("" + mark + " - 6" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isLoading() + "、可入信号：" + staProtocol.isInEnable()
                    + "、空板信号：" + staProtocol.isEmptyMk() + "、工作号：" + staProtocol.getWorkNo()
                    + "、锁定标记" + staProtocol.isPakMk() + "、入库印记：" + staProtocol.getStamp());
        }

    }

@@ -920,45 +919,91 @@
                News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
                continue;
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                flag = true;
            }
            if (!flag) {
                News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                        + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading()
                        + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable()
                        + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
                continue;
            }
            // 获取工作状态为2（设备上走）的入库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
            if (null == wrkMast) {
                News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
            WrkMast wrkMast;
            LocMast locMast;
            if (crnStn.getStaNo() == 1131) {
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getFinishWorkNo() > 0
                        && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                    flag = true;
                }

                if (!flag) {
                    News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                            + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading()
                            + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable()
                            + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
                    continue;
                }
                // 获取工作状态为2（设备上走）的入库工作档
                wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getFinishWorkNo().intValue(), crnStn.getStaNo());
                if (null == wrkMast) {
                    News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getFinishWorkNo());
//                log.error("查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
                continue;
            }
            // 获取库位信息
            LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
            if (locMast == null) {
                News.error("" + mark + " - 1" + " - 5" + " - 查询库存无数据--库位号{}", wrkMast.getLocNo());
                continue;
            }
            if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
                News.error("" + mark + " - 1" + " - 6" + " - 入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
                continue;
            }
                    continue;
                }
                // 获取库位信息
                locMast = locMastService.selectById(wrkMast.getLocNo());
                if (locMast == null) {
                    News.error("" + mark + " - 1" + " - 5" + " - 查询库存无数据--库位号{}", wrkMast.getLocNo());
                    continue;
                }
                if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
                    News.error("" + mark + " - 1" + " - 6" + " - 入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
                    continue;
                }

            // 堆垛机控制过滤
            if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
                // 堆垛机控制过滤
                if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                News.infoNoLog(""+mark+" - 1"+" - 7"+" - 堆垛机控制过滤:堆垛机是否空闲={}，任务号={}", crnProtocol.getStatusType(),crnProtocol.getTaskNo());
                continue;
                    continue;
                }

                // 已经存在吊车执行任务时，则过滤
                if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                    continue;
                }
            } else {
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                        && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                    flag = true;
                }
                if (!flag) {
                    News.errorNoLog("" + mark + " - 1" + " - 3" + " - 堆垛机入库站信息(以下需要全true):"
                            + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading()
                            + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isInEnable()
                            + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanining());
                    continue;
                }
                // 获取工作状态为2（设备上走）的入库工作档
                wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
                if (null == wrkMast) {
                    News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
//                log.error("查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
                    continue;
                }
                // 获取库位信息
                locMast = locMastService.selectById(wrkMast.getLocNo());
                if (locMast == null) {
                    News.error("" + mark + " - 1" + " - 5" + " - 查询库存无数据--库位号{}", wrkMast.getLocNo());
                    continue;
                }
                if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
                    News.error("" + mark + " - 1" + " - 6" + " - 入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
                    continue;
                }

                // 堆垛机控制过滤
                if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                News.infoNoLog(""+mark+" - 1"+" - 7"+" - 堆垛机控制过滤:堆垛机是否空闲={}，任务号={}", crnProtocol.getStatusType(),crnProtocol.getTaskNo());
                    continue;
                }

                // 已经存在吊车执行任务时，则过滤
                if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                    continue;
                }
            }

            // 已经存在吊车执行任务时，则过滤
            if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                continue;
            }

            // 双深库位且浅库位有货，则需先对浅库位进行库位移转
            if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
@@ -1069,6 +1114,15 @@
//            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            for (WrkMast wrkMast : wrkMasts) {
                if (crnStn.getStaNo() == 1131) {
                    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("2")) {
                        return;
                    }
                }
                if (wrkMast == null) {
                    continue;
                }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -94,6 +94,7 @@
        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>


    <select id="selectPakInStep2" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
    </select>