From 6c7e785a58ac3997ed640c7fcc56bf7be640ecea Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 一月 2024 12:44:18 +0800
Subject: [PATCH] #
---
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 c2e9ada..20815d3 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,8 +5,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.openapi.entity.HostKey;
import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
+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.service.DocTypeService;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -16,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -25,11 +29,15 @@
@Autowired
private HostKeyService hostKeyService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private ApiService apiService;
@PostMapping("/generateOrderPakIn")
- public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
+ public synchronized R generateOrderPakIn(@RequestHeader(required = false) String appkey,
@RequestBody GenerateOrderPakInParam param) {
- auth(appkey, param);
+ HostKey hostKey = auth(appkey, param, true);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -42,11 +50,19 @@
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
-// openService.pakinOrderCreate(param);
+ param.setHostId(hostKey.getHostId());
+ apiService.generateOrderPakIn(param);
return R.ok();
}
- private void auth(String appkey, Object obj) {
+ @PostMapping("/getOrderType")
+ public synchronized R getOrderType(@RequestHeader(required = false) String appkey) {
+ auth(appkey, null, false);
+ List<DocType> list = docTypeService.list();
+ return R.ok().add(list);
+ }
+
+ private HostKey auth(String appkey, Object obj, boolean signCheck) {
if (Cools.isEmpty(appkey)) {
throw new CoolException("璁よ瘉澶辫触锛岃纭appKey鏃犺锛�");
}
@@ -56,7 +72,7 @@
throw new CoolException("璁よ瘉澶辫触锛岃纭appKey鏃犺锛�");
}
- if (hostKey.getSignStatus() == 1) {
+ if (hostKey.getSignStatus() == 1 && signCheck) {
//闇�瑕佽繘琛岀鍚嶆牎楠�
//鍒涘缓鑷劧鎺掑簭map
JSONObject param = new JSONObject(true);
@@ -72,6 +88,8 @@
throw new CoolException("绛惧悕鏍￠獙澶辫触");
}
}
+
+ return hostKey;
}
}
--
Gitblit v1.9.1