From cb1db468bcaa90e9a0e2e4aee192088e9370ac52 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 27 五月 2024 09:19:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 19 +++++++++++++++----
1 files changed, 15 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 1c98cb3..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
@@ -38,6 +38,11 @@
@Autowired
private ApiService apiService;
+ @PostMapping("/test")
+ public R test() {
+ return R.ok();
+ }
+
/**
* 鐢熸垚鍏ュ簱璁㈠崟
*/
@@ -55,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);
@@ -80,8 +85,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.generateOrderPakOut(param);
@@ -162,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