自动化立体仓库 - WCS系统
#
luxiaotao1123
2021-01-16 29377e64aa049612af1ea511cbbc451e884952fc
#
4个文件已修改
13 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WrkMastMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -51,6 +51,8 @@
    WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
    WrkMast selectWorking(@Param("crnNo")Integer crnNo);
    // work log -------------------------------------------------------
    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
    int saveWrkMastLog(Integer workNo);
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -599,6 +599,11 @@
                    }
                }
                // 已经存在吊车执行任务时,则过滤
                if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                    return;
                }
                // 1.堆垛机开始移动
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
src/main/resources/application.yml
@@ -137,7 +137,7 @@
      staNo: 205
    # 空板入库口1
    emptyInSta[1]:
      staNo: 205
      staNo: 202
    # 出库口1
    outSta[0]:
      staNo: 200
src/main/resources/mapper/WrkMastMapper.xml
@@ -115,4 +115,8 @@
        select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
    </select>
    <select id="selectWorking" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and crn_no=#{crnNo} order by io_time,wrk_no
    </select>
</mapper>