From 259e38eb55c12b501427702d551d4de61182406c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 十二月 2025 15:03:12 +0800
Subject: [PATCH] 接口对接功能完善
---
src/main/java/com/zy/asrs/controller/MesController.java | 64 +++++++++++---------------------
1 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MesController.java b/src/main/java/com/zy/asrs/controller/MesController.java
index 92c13b4..d8e2634 100644
--- a/src/main/java/com/zy/asrs/controller/MesController.java
+++ b/src/main/java/com/zy/asrs/controller/MesController.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.mes.*;
import com.zy.asrs.service.MesService;
import com.zy.common.web.BaseController;
@@ -13,6 +12,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
@RestController
@Slf4j
@@ -29,11 +29,13 @@
// 鐗╂枡淇℃伅鍚屾
@PostMapping("/api/mes/synMatInfo")
@AppAuth(memo = "鐗╂枡淇℃伅鍚屾")
- public MesReturn synMatInfo(@RequestHeader(required = false) String appkey,@RequestBody MesMatRecvForm param, HttpServletRequest request){
+ public MesReturn synMatInfo(@RequestHeader(required = false) String appkey, @RequestBody List<MesMatRecvForm> param, HttpServletRequest request){
auth(appkey, param, request);
MesReturn mesReturn = new MesReturn();
try {
- mesReturn = mesService.matInfoAndInBound(param);
+ for(MesMatRecvForm matRecvForm:param) {
+ mesReturn = mesService.matInfoAndInBound(matRecvForm);
+ }
} catch (Exception e) {
mesReturn.setSuccess("2");
mesReturn.setMessage("鐗╂枡淇℃伅鍚屾澶辫触");
@@ -41,73 +43,51 @@
return mesReturn;
}
- // 鍑哄簱鐢宠
@PostMapping("/api/mes/outBoundOrder")
- public MesReturn outBoundOrder(@RequestBody MesOutApply param){
-
+ @AppAuth(memo = "鍑哄簱鐢宠")
+ public MesReturn outBoundOrder(@RequestHeader(required = false) String appkey,@RequestBody MesOutApply param, HttpServletRequest request){
+ auth(appkey, param, request);
MesReturn mesReturn = new MesReturn();
mesReturn.setSuccess(mesService.outBoundOrder(param) == 1 ? "1" : "2");
return mesReturn;
}
- // 鍑哄簱鐢宠锛堝彨鏂欙級锛岃閰嶅簱銆佹粦鍧楀簱
- @PostMapping("/api/mes/callOutBoundOrder")
- public MesReturn callOutBoundOrder(@RequestBody MesCallOutApply param){
-
- MesReturn mesReturn = new MesReturn();
- mesReturn.setSuccess(mesService.callOutBoundOrder(param) == 1 ? "1" : "2");
- return mesReturn;
- }
-
// 鍏ュ簱鐢宠
@PostMapping("/api/mes/inBoundOrder")
- public MesReturn inBoundOrder(@RequestBody MesInApply param){
-
+ @AppAuth(memo = "鍏ュ簱鐢宠")
+ public MesReturn inBoundOrder(@RequestHeader(required = false) String appkey,@RequestBody MesInApply param, HttpServletRequest request){
+ auth(appkey, param, request);
MesReturn mesReturn = new MesReturn();
mesReturn.setSuccess(mesService.inBoundOrder(param) == 1 ? "1" : "2");
return mesReturn;
}
- // 鍏ョ珯鍏佽
@PostMapping("/api/mes/allowInStation")
- public MesReturn allowInStation(@RequestBody TransInOutStationAllow param){
-
+ @AppAuth(memo = "鍏ョ珯鍏佽")
+ public MesReturn allowInStation(@RequestHeader(required = false) String appkey,@RequestBody TransInOutStationAllow param, HttpServletRequest request){
+ auth(appkey, param, request);
return mesService.allowInStation(param);
}
// 绂荤珯鍏佽锛岃閰嶅簱銆佹粦鍧楀簱
@PostMapping("/api/mes/allowOutStation")
- public MesReturn allowOutStation(@RequestBody TransInOutStationAllow param){
-
+ public MesReturn allowOutStation(@RequestHeader(required = false) String appkey,@RequestBody TransInOutStationAllow param, HttpServletRequest request){
+ auth(appkey, param, request);
return mesService.allowOutStation(param);
}
- // 涓嬪彂杩愯緭浠诲姟
@PostMapping("/api/mes/submitTask")
- public JSONObject submitTask(@RequestBody TransTask param){
-
+ @AppAuth(memo = "涓嬪彂杩愯緭浠诲姟")
+ public JSONObject submitTask(@RequestHeader(required = false) String appkey,@RequestBody TransTask param, HttpServletRequest request){
+ auth(appkey, param, request);
return mesService.submitTask(param);
}
- // region 涓存椂娴嬭瘯
-
- @GetMapping("/api/mes/testInFeedback")
- public int test(@RequestParam String orderNo){
-
- return mesService.inFeedback(orderNo);
- }
-
- @GetMapping("/api/mes/testInFeedback2")
- public int test(@RequestParam String orderNo, @RequestParam String zapplet){
-
- return mesService.recvFeedback(orderNo, zapplet);
- }
- // endregion
-
- // 搴撳瓨鏌ヨ鎺ュ彛
// 鎸� 鐗╂枡缂栫爜+oderNo
@PostMapping("/api/mes/queryInventory")
- public MesReturn queryInventory(@RequestBody JSONObject param){
+ @AppAuth(memo = "搴撳瓨鏌ヨ鎺ュ彛")
+ public MesReturn queryInventory(@RequestHeader(required = false) String appkey,@RequestBody JSONObject param, HttpServletRequest request){
+ auth(appkey, param, request);
MesReturn mesReturn = new MesReturn();
String itemno = param.getString("itemno");
String orderNo = param.getString("orderNo");
--
Gitblit v1.9.1