From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 16 十月 2025 09:55:35 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/service/LocMastService.java | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index c13f719..d6ffc19 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -3,7 +3,6 @@ import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,52 +12,62 @@ * 妫�绱㈠彲鐢ㄥ簱浣� */ LocMast queryFreeLocMast(Integer row, Short locType1); + LocMast queryFreeLocMast(Integer row, Short locType1, Long whsType); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 + * * @param sourceLocNo 婧愬簱浣� * @return 鍚岀粍绌哄簱浣嶉泦鍚� */ List<String> queryGroupEmptyStock(String sourceLocNo); + List<String> queryGroupEmptyStock(String sourceLocNo, Long whsType); /** * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲� + * * @param locMast * @return */ Boolean checkEmptyCount(LocMast locMast); + Boolean checkEmptyCount(LocMast locMast, Long whsType); /** * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵� */ Boolean checkWhole(List<LocDetl> locDetls); + Boolean checkWhole(List<LocDetl> locDetls, Long whsType); /** * 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹� + * * @return */ List<LocMast> queryShallowLocFMast(Integer crnNo); + List<LocMast> queryShallowLocFMast(Integer crnNo, Long whsType); - List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo); - List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo, Long whsType); + List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo); + + List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo, Long whsType); /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� * */ // LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos); // LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType); - LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType); + LocMast selectLocByLocStsPakInF(Integer curRow, Integer nearRow, LocMast locNo, Long whsType); - LocMast selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType); + LocMast selectLocByLocStsPakInShuttleF(Integer curRow, Integer nearRow, LocMast locNo, Long whsType); + /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 * */ // LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos); // LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType); - LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locNoo, Long whsType); + LocMast selectLocByLocStsPakInO(Integer curRow, Integer nearRow, LocMast locNoo, Long whsType); } -- Gitblit v1.9.1