野心家
2023-08-10 fe87eb25a80054e54d3a58307a135edaa8289e8d
每次盘点只出一托
3个文件已修改
19 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WrkMastMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -106,4 +106,12 @@
    WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
    /**
     * 查找堆垛机号对应所有已出库工作档
     * @param crnNO
     * @param sourceStaNo
     * @return
     */
    WrkMast selectPakOutStep14(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -777,6 +777,11 @@
            // 获取工作状态为11(生成出库ID)的出库工作档
//            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            // 获取工作状态为14的工作档 且 出库任务为盘点/拣料出库的任务
            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
            if ( wrkMast1 !=null) {
                continue;
            }
            for (WrkMast wrkMast : wrkMasts){
                if (wrkMast == null) {
                    continue;
src/main/resources/mapper/WrkMastMapper.xml
@@ -187,4 +187,10 @@
    <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where  barcode = #{barcode}
    </select>
    <select id="selectPakOutStep14" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast
        where crn_no=#{crnNo}
          and ((wrk_sts=14 and io_type in (103,107) and source_sta_no=#{sourceStaNo}) or (wrk_sts in (2,3) and io_type in (53,57) and sta_no=#{sourceStaNo}))
        order by io_pri desc,io_time,wrk_no asc
    </select>
</mapper>