#

luxiaotao1123

2022-03-10 b325ae27b093aedb99345fcfa4082e55228d4de1

#

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

@@ -35,7 +35,7 @@

    WrkMast selectPakInStep45(@Param("workNo")Integer workNo);

    WrkMast selectPakInStep8(@Param("workNo")Integer workNo);
    WrkMast selectPakInStep8(@Param("steNo")Integer steNo);

    // 拣料再入库时，站点有物且需求时查询
//    @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")

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

@@ -987,9 +987,20 @@
            SteProtocol steProtocol = steThread.getSteProtocol();
            if (steProtocol == null) { continue; }
            if (steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
                // 查询是否有待入库的任务
                WrkMast wrkMast = wrkMastMapper.selectPakInStep8(steProtocol.getSteNo().intValue());
                if (wrkMast == null) { continue; }

                wrkMastMapper.selectPakInStep8()

                // 修改工作档状态 8.小车搬入库 => 9.入库完成
                Date now = new Date();
                wrkMast.setWrkSts(9L);
                wrkMast.setCrnStrTime(now);
                wrkMast.setModiTime(now);
                if (wrkMastMapper.updateById(wrkMast) == 0) {
                    log.error("修改工作档状态 8.小车搬入库 => 9.入库完成 失败！！，工作号={}", wrkMast.getWrkNo());
                } else {
                    steThread.setResetFlag(true);
                }
            }
        }
    }
@@ -1035,6 +1046,7 @@
     * 执行对工作档的完成操作
     */
    @Async
    @Transactional
    public void storeFinished() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
@@ -1051,25 +1063,51 @@
                }
                // 入库 + 库位转移
                if (wrkMast.getWrkSts() == 7 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)){
                    // 判断是否需要小车入库
                    if (locMastService.isOutMost(wrkMast.getLocNo())) {
                        // ==> 9.入库完成
                        wrkMast.setWrkSts(9L);
                        Date now = new Date();
                        wrkMast.setCrnEndTime(now);
                        wrkMast.setModiTime(now);
                        // 修改成功后复位堆垛机
                        if (wrkMastMapper.updateById(wrkMast) > 0) {
                            // 堆垛机复位
                            crnThread.setResetFlag(true);
                        } else {
                            log.error("修改工作档状态 7.吊车入库中 => 9.入库完成 失败！！，工作号={}", wrkMast.getWrkNo());
                        }
                    } else {
                        // ==> 8.小车搬入库
                        wrkMast.setWrkSts(8L);
                        // 给穿梭车下发命令
                        Integer steNo = wrkMast.getSteNo();
                        SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
                        SteProtocol steProtocol = steThread.getSteProtocol();
                        if (steProtocol == null) { continue; }
                        if (steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
                            // 命令下发区 --------------------------------------------------------------------------
                            SteCommand steCommand = new SteCommand();
                            steCommand.setSteNo(steNo); // 穿梭车编号
                            steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
                            steCommand.setTaskMode(SteTaskModeType.TO_B); // 任务模式:  去近点 等待堆垛机叉取
                            // todo:luxiaotao
                            if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
                                log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
                            } else {
                                // 修改工作档状态 7.吊车入库中 => 8.小车搬入库
                                Date now = new Date();
                                wrkMast.setWrkSts(8L);
                                wrkMast.setCrnStrTime(now);
                                wrkMast.setModiTime(now);
                                if (wrkMastMapper.updateById(wrkMast) > 0) {
                                    // 堆垛机复位
                                    crnThread.setResetFlag(true);
                                } else {
                                    log.error("修改工作档状态 7.吊车入库中 => 8.小车搬入库 失败！！，工作号={}", wrkMast.getWrkNo());
                                }
                            }
                        }
                    }
                } else {
                    continue;
                }
                Date now = new Date();
                wrkMast.setCrnEndTime(now);
                wrkMast.setModiTime(now);
                // 修改成功后复位堆垛机
                if (wrkMastMapper.updateById(wrkMast) > 0) {
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                }

            }
        }
    }

 src/main/java/com/zy/core/thread/SteThread.java

@@ -12,8 +12,8 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.SteStatusType;
import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.SteCommand;
@@ -168,7 +168,7 @@
                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

                // 复位信号
                if (steProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                if (steProtocol.getStatusType().equals(SteStatusType.WAITING)) {
                    if (resetFlag) {
                        SteCommand steCommand = new SteCommand();
//                        steCommand.setAckFinish((short)1);

 src/main/resources/mapper/WrkMastMapper.xml

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

    <select id="selectPakInStep8" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts = 8
        select top 1 * from dbo.asr_wrk_mast where ste_no=#{steNo} and wrk_sts = 8
    </select>

    <select id="selectPickStep" resultMap="BaseResultMap">