From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 90 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a8b9c0a..f1ee3f2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -191,45 +191,70 @@
/*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
-
-
- /**
- * 璐存爣鏈鸿创鏍囧畬鎴�
- */
- @PostMapping("/labeller/complete/auth/v1")
- @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�")
- public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
-
- return R.ok();
- }
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
/**
* 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
*/
@PostMapping("/labeller/mat/auth/v1")
- @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
+ }
+
+ /**
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ */
+ @PostMapping("/labeller/complete/auth/v1")
+ @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
+ public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
-
+ openService.labellerComplete(param);
return R.ok();
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
@PostMapping("/palletizing/complete/auth/v1")
- @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
- public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
+// @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+ public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteTwoFloorParam param,
HttpServletRequest request) {
auth(appkey, param, request);
+ openService.PalletizingCompleteTwoFloorParam(param);
+ return R.ok(param);
+ }
+ /**
+ * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @PostMapping("/palletizing/complete/auth/v2")
+ @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�")
+ public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.palletizingCompleteS(param);
return R.ok();
+ }
+
+ /**
+ * 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
+ */
+ @PostMapping("/balcony/complete/auth/v1")
+ @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀�
+ public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.balconyComplete(param);
+ return R.ok(param);
}
@@ -239,11 +264,15 @@
@PostMapping("/single/unstacking/complete/auth/v1")
@AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡")
public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
+ @RequestBody SingleUnstackingCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
-
- return R.ok();
+ try{
+ openService.singleUnstackingComplete(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
+ return R.ok(param);
}
/**
@@ -252,15 +281,16 @@
@PostMapping("/single/mount/unstacking/complete/auth/v1")
@AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡")
public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
+ @RequestBody SingleMountUnstackingCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
-
- return R.ok();
+ try{
+ openService.singleMountUnstackingComplete(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
+ return R.ok(param);
}
-
-
-
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1