From 4c622f3fb68660f69ccf1894afcfff72cf866be5 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 10:56:00 +0800
Subject: [PATCH] #
---
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 2acaaac..4716cb8 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
@@ -5,7 +5,9 @@
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;
@@ -22,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;
@@ -34,6 +37,11 @@
private HostKeyService hostKeyService;
@Autowired
private ApiService apiService;
+
+ @PostMapping("/test")
+ public R test() {
+ return R.ok();
+ }
/**
* 鐢熸垚鍏ュ簱璁㈠崟
@@ -52,11 +60,36 @@
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);
+ return R.ok();
+ }
+
+ /**
+ * 鐢熸垚鍑哄簱璁㈠崟
+ */
+ @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();
}
@@ -91,6 +124,18 @@
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)) {
@@ -122,4 +167,10 @@
return hostKey;
}
+ @PostMapping("order/execute/auth/v1")
+ public R wms1(@RequestBody Map<String, Object> map) {
+ log.info("order/execute/auth/v1锛�" + JSON.toJSONString(map));
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1