From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期五, 31 五月 2024 14:56:58 +0800 Subject: [PATCH] 仓库: 显示在库信息,入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成,单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔ --- src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java index 1dde7eb..2c51ea1 100644 --- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java @@ -7,11 +7,38 @@ import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.util.List; + @Mapper @Repository public interface LocMastMapper extends BaseMapper<LocMast> { - @Select("select top 1 * from asr_loc_mast where row1=#{row} and loc_sts='O' and loc_type=#{locType} order by loc_type desc ,lev1 asc,bay1 asc") - LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType") Integer locType); + LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1); + + @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}") + List<String> queryGroupEmptyStock(Integer crnNo); + + @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}") + Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo); + + List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo); + + List<LocMast> selectLocByLev(Integer lev); + + List<LocMast> selectByLocNo(@Param("locNo") List<String> locNo); + + + /** + * 鏌ヨ骞冲簱鎸囧畾搴撳尯鍜屾ゼ灞� + * @param area 搴撳尯 + * @param lev 妤煎眰 + * @return 搴撲綅淇℃伅 + */ + List<LocMast> selectNodeByLev(@Param("area") String area, @Param("lev") int lev); + + LocMast selectLocStatus(@Param("locno") String locno); + + + } -- Gitblit v1.9.1