From b42a154622d9eae11f67df3682d03ca26911b5cd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 一月 2024 09:52:35 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index 730e227..c51b6ef 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -2,19 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.openapi.entity.param.CombParam;
+import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
+import com.zy.asrs.common.openapi.entity.param.OrderListParam;
import com.zy.asrs.common.openapi.service.ApiService;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -26,15 +25,15 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private DocTypeService docTypeService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private MatService matService;
@Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private WaitPakinService waitPakinService;
+ private OrderSettleService orderSettleService;
@Override
public void generateOrderPakIn(GenerateOrderPakInParam param) {
@@ -129,4 +128,35 @@
List<DocType> list = docTypeService.list();
return list;
}
+
+ @Override
+ public List<OrderSettle> getOrderStatus() {
+ return orderSettleService.list();
+ }
+
+ @Override
+ public List<OrderListDto> getOrderList(OrderListParam param, Long hostId) {
+ ArrayList<OrderListDto> listDtos = new ArrayList<>();
+ LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId);
+ if (!Cools.isEmpty(param)) {
+ if (!Cools.isEmpty(param.getOrderType())) {
+ wrapper.eq(Order::getDocType, param.getOrderType());
+ }
+ if (!Cools.isEmpty(param.getOrderNo())) {
+ wrapper.eq(Order::getOrderNo, param.getOrderNo());
+ }
+ if (!Cools.isEmpty(param.getStatus())) {
+ wrapper.eq(Order::getStatus, param.getStatus());
+ }
+ }
+ List<Order> list = orderService.list(wrapper);
+ for (Order order : list) {
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getHostId, hostId).eq(OrderDetl::getOrderId, order.getId()));
+ OrderListDto dto = new OrderListDto();
+ dto.setOrder(order);
+ dto.setOrderDetls(orderDetls);
+ listDtos.add(dto);
+ }
+ return listDtos;
+ }
}
--
Gitblit v1.9.1