From 0c79b5072495ad34c3a408e4b5a9e39de4e1a741 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期四, 22 八月 2024 11:00:30 +0800 Subject: [PATCH] 出库代码 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java index 6773409..b84d50a 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java @@ -2,12 +2,11 @@ import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.controller.req.OutReq; -import com.zy.asrs.wms.asrs.entity.Loc; -import com.zy.asrs.wms.asrs.entity.LocDetl; -import com.zy.asrs.wms.asrs.entity.Task; -import com.zy.asrs.wms.asrs.entity.TaskDetl; +import com.zy.asrs.wms.asrs.entity.*; import com.zy.asrs.wms.asrs.entity.param.FieldParam; import com.zy.asrs.wms.asrs.service.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,6 +21,8 @@ @Service public class OutManage { + private static Logger logger = LoggerFactory.getLogger(LocManage.class); + @Autowired private TaskService taskService; @@ -32,6 +33,7 @@ @Autowired private LocService locService; + @Autowired private LocDetlService locDetlService; @@ -40,12 +42,19 @@ private WorkService workService; + @Autowired + private OrderService orderService; + + @Autowired + private OrderDetlService orderDetlService; + + /** * 鑾峰彇搴撳瓨 * * @param map */ - public List<LocDetl> getSuitableMat(Map<String, Object> map) { + public List<LocDetl> listSuitableMat(Map<String, Object> map) { List<FieldParam> param = new ArrayList<>(); map.entrySet().stream().filter(entry -> entry.getValue() != null).forEach(entry -> { FieldParam fieldParam = new FieldParam(); @@ -54,7 +63,41 @@ param.add(fieldParam); }); //TODO 杩欓噷鍔犱笂鍑哄簱瑙勫垯 - List<LocDetl> stock = locDetlService.getSuitableMat(param, null); + + List<LocDetl> stock = locDetlService.listSuitableMat(param, null); + return stock; + } + + /** + * 鏍规嵁璁㈠崟id鑾峰彇搴撳瓨 + * + * @param orderId 璁㈠崟ID + */ + public List<LocDetl> listSuitableMatByOrder(Long orderId) { + Order order = orderService.getById(orderId); + List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId); + //TODO 杩欓噷鍔犱笂鍑哄簱瑙勫垯 + for (OrderDetl orderDetl : orderDetls) { + + } + List<FieldParam> param = new ArrayList<>(); + + + List<LocDetl> stock = locDetlService.listSuitableMat(param, null); + return stock; + } + + /** + * 鏍规嵁璁㈠崟id鑾峰彇搴撳瓨 + * + * @param waveId 璁㈠崟ID + */ + public List<LocDetl> listSuitableMatByWave(Long waveId) { + + List<FieldParam> param = new ArrayList<>(); + + + List<LocDetl> stock = locDetlService.listSuitableMat(param, null); return stock; } -- Gitblit v1.9.1