From 11972d7f05a60a2e117665ef4900f5f3ad43607d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 13:47:49 +0800
Subject: [PATCH] #贴标机修改完成
---
src/main/java/com/zy/asrs/controller/OpenController.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 690fb42..efc1528 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -191,7 +191,19 @@
/*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+ /**
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ */
+ @PostMapping("/labeller/mat/auth/v1")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+ public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
+ }
/**
* 璐存爣鏈鸿创鏍囧畬鎴�
@@ -207,19 +219,6 @@
}
/**
- * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
- */
- @PostMapping("/labeller/mat/auth/v1")
- @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
- public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
- @RequestBody LabellerMatParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.labellerMat(param);
- return R.ok();
- }
-
- /**
* 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
@PostMapping("/palletizing/complete/auth/v1")
@@ -229,7 +228,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.palletizingComplete(param);
- return R.ok();
+ return R.ok(param);
}
@@ -243,7 +242,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.singleUnstackingComplete(param);
- return R.ok();
+ return R.ok(param);
}
/**
@@ -256,10 +255,48 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.singleMountUnstackingComplete(param);
- return R.ok();
+ return R.ok(param);
}
+ /**
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯1
+ */
+ @PostMapping("/cs1/auth/v1")
+ @AppAuth(memo = "涓帶锛氱爜鍨涘墠涓婃姤鏉＄爜,鐢熸垚娴嬭瘯宸ヤ綔妗�")
+ public synchronized R cs1(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.cs1(param.getBarcode());
+ return R.ok(param);
+ }
+
+ /**
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯2
+ */
+ @PostMapping("/cs2/auth/v1")
+ @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�,鐢熸垚娴嬭瘯宸ヤ綔妗�")
+ public synchronized R cs2(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.cs2();
+ return R.ok(param);
+ }
+
+ /**
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯3
+ */
+ @PostMapping("/cs3/auth/v1")
+ @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�,鐢熸垚娴嬭瘯宸ヤ綔妗�")
+ public synchronized R cs3(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.cs3();
+ return R.ok(param);
+ }
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1