From 5232d8b5939cb832c3d17c2aa1d6eaf66e5acb74 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 25 十二月 2025 14:11:05 +0800
Subject: [PATCH] 出入库历史 +月结管理 按钮权限+sql
---
src/main/java/com/zy/asrs/controller/OpenController.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8b0604a..e73c358 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,9 +4,15 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.AgvCallbackDto;
+import com.zy.asrs.entity.param.MatSyncParam;
+import com.zy.asrs.entity.param.OpenOrderCompleteParam;
+import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.MesPakinParam;
+import com.zy.common.model.MesPakoutParam;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,11 +39,45 @@
@Autowired
private OpenService openService;
+ @PostMapping("/api/agv_callback")
+ @AppAuth(memo = "agv浠诲姟鍥炶皟")
+ public synchronized R agvCallback(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) AgvCallbackDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.agvCallback(param);
+ }
+
+ // 鍏ュ簱瀹屾垚涓婃姤娴嬭瘯鎺ュ彛
+ @PostMapping("/inOrderFinishReport")
+ public synchronized R inOrderFinishReport(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakinParam param,
+ HttpServletRequest request) {
+ return R.ok();
+ }
+
+ // 鍑哄簱瀹屾垚涓婃姤娴嬭瘯鎺ュ彛
+ @PostMapping("/outOrderFinishReport")
+ public synchronized R outOrderFinishReport(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakoutParam param,
+ HttpServletRequest request) {
+ return R.ok();
+ }
+
+ //鍛煎彨agv娴嬭瘯鎺ュ彛
+ @PostMapping("/api/entity/create/one")
+ @AppAuth(memo = "鍛煎彨agv娴嬭瘯鎺ュ彛")
+ public synchronized R create(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakoutParam param,
+ HttpServletRequest request) {
+ return R.ok();
+ }
+
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam.MatParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -52,12 +92,12 @@
}
@PostMapping("/order/matSync/default/v1")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ @AppAuth(memo = "鐗╂枡淇℃伅鍚屾")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param,param.getMatDetails())) {
return R.parse(BaseRes.PARAM);
}
openService.syncMat(param);
@@ -85,6 +125,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -99,6 +140,9 @@
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakinOrderCreate(param);
@@ -120,7 +164,7 @@
* 娣诲姞鍑哄簱鍗�
*/
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ @AppAuth(memo = "鍑哄簱鍗曟嵁涓嬪彂")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
HttpServletRequest request) {
@@ -135,6 +179,9 @@
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakoutOrderCreate(param);
@@ -164,7 +211,7 @@
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
--
Gitblit v1.9.1