From 4c51dcc99e41edfb4fdc198aa740fa52d29bf641 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 11 九月 2024 16:26:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 34b6159..6ce0ea6 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -554,6 +555,36 @@ @Override + public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) { + ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>(); + EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>(); + locDetlEntityWrapper.ge("create_time",param.getStartTime()); + locDetlEntityWrapper.le("create_time",param.getEndTime()); + List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper); + if (!Cools.isEmpty(locDetls)) { + for (LocDetl locDetl : locDetls) { + LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO(); + if (!Cools.isEmpty(locDetl.getOrderNo())){ + Order order = orderService.selectByNo(locDetl.getOrderNo()); + if (!Cools.isEmpty(order)) { + locDetlByTimeDTO.setDate(order.getOrderTime()); + locDetlByTimeDTO.setWarehouse(order.getItemName()); + locDetlByTimeDTO.setOrderType(order.getDocType().toString()); + } + } + + locDetlByTimeDTO.setMatnr(locDetl.getMatnr()); + locDetlByTimeDTO.setLocNo(locDetl.getLocNo()); + locDetlByTimeDTO.setBatch(locDetl.getBatch()); + locDetlByTimeDTO.setAnfme(locDetl.getAnfme()); + locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo()); + locDetlByTimeDTOS.add(locDetlByTimeDTO); + } + } + return locDetlByTimeDTOS; + } + + @Override @Transactional public boolean agvHaiKang(String wrkNo) { WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Long.parseLong(wrkNo))); -- Gitblit v1.9.1