From 7ed7b800442bcac4689a0f445664073b7afcf785 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 一月 2024 09:49:55 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java | 4 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 34 +++++++++++++++--
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java | 23 +++++++++++
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 17 +++++++-
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java | 16 ++++++++
5 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java
new file mode 100644
index 0000000..d40fa6f
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java
@@ -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;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java
new file mode 100644
index 0000000..eff2b47
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java
@@ -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;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
index fe86971..d1622bd 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
+++ b/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);
+
}
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 5f1a4da..1580199 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,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;
+ }
}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
index 944eed3..c159367 100644
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
+++ b/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)) {
--
Gitblit v1.9.1