From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期六, 26 八月 2023 10:07:46 +0800 Subject: [PATCH] # 导入订单增加单据类型 --- src/main/java/com/zy/asrs/service/LocMastService.java | 64 +++++++++++++++++++++++++++++++ 1 files changed, 63 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 79f0778..ec6efa3 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -1,6 +1,7 @@ package com.zy.asrs.service; import com.baomidou.mybatisplus.service.IService; +import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import java.util.List; @@ -10,7 +11,15 @@ /** * 妫�绱㈠彲鐢ㄥ簱浣� */ - LocMast queryFreeLocMast(Integer row, Short locType1); + List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1); + List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday); + List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday + , Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd); + List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1); + List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1); + List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday); + + List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 @@ -18,4 +27,57 @@ * @return 鍚岀粍绌哄簱浣嶉泦鍚� */ List<String> queryGroupEmptyStock(String sourceLocNo); + + /** + * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲� + * @param locMast + * @return + */ + Boolean checkEmptyCount(LocMast locMast, int quaOfBlank); + + /** + * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲� + * @param locMast + * @return + */ + Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank); + + /** + * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵� + */ + Boolean checkWhole(List<LocDetl> locDetls); + + /** + * 鍒ゆ柇鏄惁鏄渶澶栧眰鐨勫簱浣� + * @param locNo + * @return + */ + Boolean isOutMost(String locNo, Boolean pakin); + + // 鍚岀粍绌洪棽搴撲綅 + LocMast findOutMost(List<String> locNos); + + // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣� + void breakUp(String locNo, List<String> excludeLocNos); + + void updateLocSts(String locNo, String locSts); + + //鎵惧渚х┖搴撲綅 + List<LocMast> findOutMast(Short locType1, List<Integer> crnNos); + + //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣� + List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo); + + //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣� + List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo); + + //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣� + List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo); + + List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo); + + //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹� + List<LocMast> selectLocByLev(Integer lev); + + List<LocMast> selectByLocNos(List<String> locNos); } -- Gitblit v1.9.1