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/ApiService.java | 3 +++
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 7 +++++++
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 11 +++++++++++
3 files changed, 21 insertions(+), 0 deletions(-)
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 d1622bd..a8ea905 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
@@ -4,6 +4,7 @@
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 com.zy.asrs.common.wms.entity.OrderSettle;
import java.util.List;
@@ -16,6 +17,8 @@
List<DocType> getOrderType();
+ List<OrderSettle> getOrderStatus();
+
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 1580199..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
@@ -32,6 +32,8 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private MatService matService;
+ @Autowired
+ private OrderSettleService orderSettleService;
@Override
public void generateOrderPakIn(GenerateOrderPakInParam param) {
@@ -128,6 +130,11 @@
}
@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);
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 c159367..2acaaac 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
@@ -11,6 +11,7 @@
import com.zy.asrs.common.openapi.service.HostKeyService;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.DocType;
+import com.zy.asrs.common.wms.entity.OrderSettle;
import com.zy.asrs.framework.annotations.AppAuth;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
@@ -70,6 +71,16 @@
}
/**
+ * 鑾峰彇璁㈠崟鐘舵�佸垪琛�
+ */
+ @PostMapping("/getOrderStatus")
+ public synchronized R getOrderStatus(@RequestHeader(required = true) String appkey) {
+ auth(appkey, null, false);
+ List<OrderSettle> list = apiService.getOrderStatus();
+ return R.ok().add(list);
+ }
+
+ /**
* 鑾峰彇璁㈠崟鍒楄〃
*/
@PostMapping("/getOrderList")
--
Gitblit v1.9.1