#

luxiaotao1123

2022-03-12 cf1d6c11717509f4d744d41ee817112d0b07738b

#

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

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

    /**
     * 排
     */
    @ApiModelProperty(value= "排")
    private Integer row;

    /**
     * 列
     */
    @ApiModelProperty(value= "列")
    private Integer bay;

    /**
     * 层
     */
    @ApiModelProperty(value= "层")
    private Integer lev;

    /**
     * 暂存库位
     */
    @ApiModelProperty(value= "暂存库位")

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

@@ -591,7 +591,7 @@
                // 没有小车
                } else {
                    if (wrkMast.getWrkSts() == 2L && wrkMast.getStaNo() == null) {
                        // 寻找最近的小车
                        // 寻找当前堆垛机对应的小车
                        SteThread steThread = queryIdleCar(wrkMast);
                        if (steThread != null) {
                            // 让小车等待搬运待续
@@ -824,7 +824,7 @@
                }

                // 最外层库位，直接堆垛机出库
                if (locMastService.isOutMost(wrkMast.getLocNo())) {
                if (locMastService.isOutMost(wrkMast.getSourceLocNo())) {
                    // 已经存在吊车执行任务时，则过滤
                    if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                        continue;
@@ -997,9 +997,9 @@
                                log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
                            } else {
                                // 修改工作档状态 7.吊车入库中 => 8.小车搬入库
                                Date now = new Date();
                                wrkMast.setWrkSts(8L);
                                wrkMast.setCrnStrTime(now);
                                Date now = new Date();
                                wrkMast.setCrnEndTime(now);
                                wrkMast.setModiTime(now);
                                if (wrkMastMapper.updateById(wrkMast) > 0) {
                                    // 堆垛机复位

 src/main/resources/mapper/BasSteMapper.xml

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