From 55db77e61e5a55c30dc19d599dadcfc1469c962e Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:13:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/service/warehouse/WarehouseService.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/warehouse/WarehouseService.java b/src/main/java/com/mzl/flower/service/warehouse/WarehouseService.java
index 98a13de..c939f09 100644
--- a/src/main/java/com/mzl/flower/service/warehouse/WarehouseService.java
+++ b/src/main/java/com/mzl/flower/service/warehouse/WarehouseService.java
@@ -22,6 +22,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
@@ -125,15 +126,13 @@
public List<WarehouseLocationDTO> queryWarehouseLocation(Long warehouseId, String code) {
List<WarehouseLocationDTO> locations = warehouseLocationMapper.findAll(warehouseId, code);
for (WarehouseLocationDTO location : locations) {
- OrderDTO orderDTO = getOrderByWarehouseLocation(location.getId());
- if(orderDTO == null){
+ List<OrderDTO> orderDTOs = getOrderByWarehouseLocation(location.getId());
+ if(orderDTOs == null || orderDTOs.size()==0){
location.setUsed(false);
}else{
- location.setItems(orderService.getPtCuOrderItems(orderDTO.getId()));
location.setUsed(true);
}
- location.setOrderDTO(orderDTO);
-
+ location.setOrderDTO(orderDTOs);
}
return locations;
}
@@ -142,16 +141,21 @@
* 查询库位订单信息
*
*/
- public OrderDTO getOrderByWarehouseLocation(Long warehouseLocationId){
+ public List<OrderDTO> getOrderByWarehouseLocation(Long warehouseLocationId){
LocalDateTime start = LocalDate.now().plusDays(-1).atTime(17, 0, 0);
LocalDateTime end = LocalDate.now().atTime(16, 59, 59);
- Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("deleted", 0)
+ List<Order> orders = orderMapper.selectList(new QueryWrapper<Order>().eq("deleted", 0)
.eq("warehouse_location_id", warehouseLocationId)
.gt("payment_time", start).le("payment_time", end));
- if(order!=null){
- OrderDTO dto = new OrderDTO();
- BeanUtils.copyProperties(order, dto);
- return dto;
+ if(orders!=null && orders.size()>0){
+ List<OrderDTO> dtos = new ArrayList<>();
+ for (Order order : orders) {
+ OrderDTO dto = new OrderDTO();
+ BeanUtils.copyProperties(order, dto);
+ dto.setItems(orderService.getPtCuOrderItems(dto.getId()));
+ dtos.add(dto);
+ }
+ return dtos;
}
return null;
}
--
Gitblit v1.9.3