From 230615d093a235e2e481355edb47f37e380b3069 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 07 六月 2025 08:09:04 +0800 Subject: [PATCH] #app --- src/main/java/com/zy/asrs/service/LocMastService.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 168d694..a0677de 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,6 +12,7 @@ * 妫�绱㈠彲鐢ㄥ簱浣� */ LocMast queryFreeLocMast(Integer row, Short locType1); + LocMast queryFreeLocMast(Integer row, Short locType1, Long whsType); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 @@ -20,6 +20,7 @@ * @return 鍚岀粍绌哄簱浣嶉泦鍚� */ List<String> queryGroupEmptyStock(String sourceLocNo); + List<String> queryGroupEmptyStock(String sourceLocNo, Long whsType); /** * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲� @@ -27,17 +28,38 @@ * @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); + + /* + * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + * */ +// 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 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); + + //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹� + List<LocMast> selectLocByLev(Integer lev); } -- Gitblit v1.9.1