From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 92 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c16c8af..038da27 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,10 +4,7 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-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.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -19,6 +16,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -36,30 +34,83 @@
@Autowired
private OpenService openService;
+ @PostMapping("/agv/queryMatByBatch")
+ @AppAuth(memo = "鏍规嵁鎵瑰彿鏌ヨ绔嬪簱鏄惁瀛樺湪搴撳瓨")
+ public synchronized R queryMatByBatch(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,Object> param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ String batch = (String) param.get("batch");
+ if (Cools.isEmpty(batch)) {
+ throw new CoolException("鎵瑰彿涓嶈兘涓虹┖");
+ }
+ return openService.queryMatByBatch(batch);
+ }
+ @PostMapping("/agv/allowWarehousing")
+ @AppAuth(memo = "鏄惁鍏佽agv鐢宠鍏ュ簱鎺ュ彛")
+ public synchronized R synCallowWarehousing(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,Object> param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ return openService.synCallowWarehousing();
+ }
+
+ @PostMapping("/agv/warehousing")
+ @AppAuth(memo = "agv鐢宠鍏ュ簱鎺ュ彛")
+ public synchronized R syncWarehousing(@RequestHeader(required = false) String appkey,
+ @RequestBody CombParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ return openService.syncWarehousing(param);
+ }
+
+ @PostMapping("/agv/agvAskOpen")
+ @AppAuth(memo = "agv鍑哄叆搴撹姹倃ms寮�闂�")
+ public synchronized R agvAskOpen(@RequestHeader(required = false) String appkey,
+ @RequestBody AgvAskOpenParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if(Cools.isEmpty(param)) {
+ throw new CoolException("璇锋娴嬪叆搴撳弬鏁帮細" + param);
+ }
+ return openService.agvAskOpen(param);
+ }
+
+ @PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncMat(param);
+ return R.ok();
+ }
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
/****************************************************************************/
-
- @PostMapping("/order/pakin/new/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) PackParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.packageUp(param);
- return R.ok();
- }
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -94,7 +145,7 @@
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
+ @PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
@@ -144,9 +195,8 @@
return R.ok().add(openService.queryStock());
}
-
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