#

luxiaotao1123

2022-03-10 56041b57276b07632368780ff942f679a9a161a0

#

 src/main/java/com/zy/asrs/entity/BasSte.java

@@ -63,6 +63,13 @@
    private Integer crnNo;

    /**
     * 暂存库位
     */
    @ApiModelProperty(value= "暂存库位")
    @TableField("idle_loc")
    private String idleLoc;

    /**
     * 错误码
     */
    @ApiModelProperty(value= "错误码")

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

@@ -787,6 +787,14 @@
        if (steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
            // 堆垛机空闲
            if (crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() == 0) {

                BasSte basSte = basSteService.selectById(steNo);
                if (basSte == null) {
                    log.error("{}号穿梭车在数据库不存在！！！", steNo);
                    return;
                }
                String idleLocNo = basSte.getIdleLoc();

                // 堆垛机命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
@@ -796,9 +804,9 @@
                crnCommand.setSourcePosX(steProtocol.getRow());     // 源库位排
                crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列
                crnCommand.setSourcePosZ(steProtocol.getLev());     // 源库位层
                crnCommand.setDestinationPosX(locMast.getRow1().shortValue());     // 目标库位排
                crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 目标库位列
                crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 目标库位层
                crnCommand.setDestinationPosX((short) Utils.getRow(idleLocNo));     // 目标库位排
                crnCommand.setDestinationPosY((short) Utils.getBay(idleLocNo));     // 目标库位列
                crnCommand.setDestinationPosZ((short) Utils.getLev(idleLocNo));     // 目标库位层
                if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                    log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
                } else {

 src/main/resources/mapper/BasSteMapper.xml

@@ -10,6 +10,7 @@
        <result column="ste_sts" property="steSts" />
        <result column="wrk_no" property="wrkNo" />
        <result column="crn_no" property="crnNo" />
        <result column="idle_loc" property="idleLoc" />
        <result column="ste_err" property="steErr" />
        <result column="pak_mk" property="pakMk" />
        <result column="status" property="status" />