lty
6 天以前 0b6c8b7687ff593d254cfcacacf72a75bfdf11ca
#限制线体上托盘数量
3个文件已修改
15 ■■■■■ 已修改文件
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/mapper/WrkMastMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -123,6 +123,8 @@
     */
    List<WrkMast> selectPakOutStep12(@Param("crnNo")Integer crnNO);
    Integer countPakOut();
    WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1577,7 +1577,12 @@
     */
    public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol) {
        List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
        Integer count = wrkMastMapper.countPakOut();
        for (WrkMast wrkMast : wrkMasts) {
            if(count > 30){ //设备上走托盘不超过30个
                continue;
            }
            // 判断堆垛机站点是否可用
            if (!crnEnabled(wrkMast)){
                continue;
src/main/resources/mapper/WrkMastMapper.xml
@@ -187,6 +187,14 @@
        select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and (io_type>100 or io_type = 12) order by io_pri desc,io_time,wrk_no asc
    </select>
    <select id="countPakOut" resultType="Integer">
        select count(*)
        from dbo.asr_wrk_mast
        where io_type = 101
          and wrk_sts = 2
    </select>
    <!--                                       入出库模式相关                                      -->
    <select id="selectWorkingPakin" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no