#
lsh
2023-01-31 194097d02fb098eb158ff5db24929a8f5a7cfa4c
#
3个文件已修改
22 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WrkMastMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -113,4 +113,6 @@
     * @return
     */
    WrkMast selectSteNoData(@Param("steNo")Integer steNo);
    List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour);
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -304,6 +304,7 @@
                        case 104:
                        case 108:
                            staNo = 103;
                            break;
                        case 204:
                        case 208:
@@ -987,6 +988,14 @@
                continue;
            }
            if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
                Integer sour = wrkMast.getStaNo();
                List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
                if (wrkMasts.size()!=0){
                    continue;
                }
            }
            // 判断是否已存在小车绑定任务
            BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
            if(basSte == null) continue;
src/main/resources/mapper/WrkMastMapper.xml
@@ -188,4 +188,15 @@
    <select id="selectSteNoData" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where ste_no=#{steNo} and wrk_sts!=17 and wrk_sts!=18 order by io_pri desc,io_time,wrk_no asc
    </select>
    <select id="selectWrkStsAndIoType" resultMap="BaseResultMap">
        select * from dbo.asr_wrk_mast where 1=1 and wrk_sts>11 and (io_type==103 or io_type==107)
        <if test="sour > 200">
            and source_sta_no > 200
        </if>
        <if test="sour &lt; 200">
            and source_sta_no &lt; 200
        </if>
    </select>
</mapper>