From 3ca4638e436076b583ae5da6ffef3e52a080b70a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 16:37:34 +0800
Subject: [PATCH] #
---
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
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..3a87444 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,11 +4,16 @@
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.CreateMatParam;
import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
+import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakOutParam;
+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;
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;
@@ -19,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -32,12 +38,17 @@
@Autowired
private ApiService apiService;
+ @PostMapping("/test")
+ public R test() {
+ return R.ok();
+ }
+
/**
* 鐢熸垚鍏ュ簱璁㈠崟
*/
@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)) {
@@ -49,8 +60,8 @@
if (Cools.isEmpty(param.getOrderType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getMats())) {
+ return R.error("鐗╂枡[mats]涓嶈兘涓虹┖");
}
param.setHostId(hostKey.getHostId());
apiService.generateOrderPakIn(param);
@@ -58,15 +69,73 @@
}
/**
+ * 鐢熸垚鍑哄簱璁㈠崟
+ */
+ @PostMapping("generateOrderPakOut")
+ @AppAuth(memo = "鐢熸垚鍑哄簱璁㈠崟")
+ public synchronized R generateOrderPakOut(@RequestHeader(required = false) String appkey,
+ @RequestBody GenerateOrderPakOutParam param) {
+ HostKey hostKey = auth(appkey, param, true);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getMats())) {
+ return R.error("鐗╂枡[mats]涓嶈兘涓虹┖");
+ }
+ param.setHostId(hostKey.getHostId());
+ apiService.generateOrderPakOut(param);
+ return R.ok();
+ }
+
+ /**
* 鑾峰彇璁㈠崟绫诲瀷
*/
@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("/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")
+ 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);
+ }
+
+ /**
+ * 鍒涘缓鐗╂枡淇℃伅
+ */
+ @PostMapping("/createMat")
+ public synchronized R createMat(@RequestHeader(required = true) String appkey,
+ @RequestBody(required = false) CreateMatParam param) {
+ HostKey hostKey = auth(appkey, param, true);
+ param.setHostId(hostKey.getHostId());
+ int result = apiService.createMat(param);
+ return R.ok().add(result);
+ }
+
private HostKey auth(String appkey, Object obj, boolean signCheck) {
request.setAttribute("cache", obj);
if (Cools.isEmpty(appkey)) {
--
Gitblit v1.9.1