zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java
New file @@ -0,0 +1,16 @@ package com.zy.asrs.common.openapi.entity.dto; import com.zy.asrs.common.wms.entity.Order; import com.zy.asrs.common.wms.entity.OrderDetl; import lombok.Data; import java.util.List; @Data public class OrderListDto { private Order order; private List<OrderDetl> orderDetls; } zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java
New file @@ -0,0 +1,23 @@ package com.zy.asrs.common.openapi.entity.param; import lombok.Data; @Data public class OrderListParam { /** * 订单类型 */ private Integer orderType; /** * 订单号 */ private String orderNo; /** * 订单状态 */ private Integer status; } zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
@@ -1,6 +1,8 @@ package com.zy.asrs.common.openapi.service; 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.wms.entity.DocType; import java.util.List; @@ -14,4 +16,6 @@ List<DocType> getOrderType(); List<OrderListDto> getOrderList(OrderListParam param, Long hostId); } zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -2,7 +2,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.common.domain.dto.DetlDto; 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.*; @@ -23,15 +25,13 @@ @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; @Override public void generateOrderPakIn(GenerateOrderPakInParam param) { @@ -126,4 +126,30 @@ List<DocType> list = docTypeService.list(); return 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; } } zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.common.openapi.entity.HostKey; 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.openapi.service.HostKeyService; import com.zy.asrs.common.web.BaseController; @@ -37,7 +39,7 @@ */ @PostMapping("/generateOrderPakIn") @AppAuth(memo = "生成入库订单") public synchronized R generateOrderPakIn(@RequestHeader(required = false) String appkey, public synchronized R generateOrderPakIn(@RequestHeader(required = true) String appkey, @RequestBody GenerateOrderPakInParam param) { HostKey hostKey = auth(appkey, param, true); if (Cools.isEmpty(param)) { @@ -61,12 +63,23 @@ * 获取订单类型 */ @PostMapping("/getOrderType") public synchronized R getOrderType(@RequestHeader(required = false) String appkey) { public synchronized R getOrderType(@RequestHeader(required = true) String appkey) { auth(appkey, null, false); List<DocType> list = apiService.getOrderType(); return R.ok().add(list); } /** * 获取订单列表 */ @PostMapping("/getOrderList") public synchronized R getOrderList(@RequestHeader(required = true) String appkey, @RequestBody(required = false) OrderListParam param) { HostKey hostKey = auth(appkey, null, false); List<OrderListDto> orderList = apiService.getOrderList(param, hostKey.getHostId()); return R.ok().add(orderList); } private HostKey auth(String appkey, Object obj, boolean signCheck) { request.setAttribute("cache", obj); if (Cools.isEmpty(appkey)) {