From 72403912dc984290de2ce7c812d3ae8ceda09bd4 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 29 九月 2025 13:38:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1c26f05..4d96559 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -223,6 +223,7 @@
* 鍒嗘嫞绾夸笂鎶ユ帴鏀�
*/
@PostMapping("/arm/task/v1")
+ @AppAuth(memo = "鍒嗘嫞绾夸笂鎶ユ帴鏀�")
public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmReportParam param,
HttpServletRequest request) {
@@ -257,6 +258,7 @@
* 鍗曠爜瀹屾垚
*/
@PostMapping("/arm/task/cycle_result")
+ @AppAuth(memo = "鍗曠爜瀹屾垚")
public synchronized R TaskArmCycleResult(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmCycleResultParam param,
HttpServletRequest request) {
@@ -288,6 +290,7 @@
* 鎵樼洏瀹屾垚
*/
@PostMapping("/arm/task/workspace_status")
+ @AppAuth(memo = "鎵樼洏瀹屾垚")
public synchronized R TaskArmWorkspaceStatus(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmWorkspaceStatusParam param,
HttpServletRequest request) {
@@ -317,6 +320,7 @@
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
+ @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmErrorParam param,
HttpServletRequest request) {
@@ -336,6 +340,7 @@
* 璁㈠崟瀹屾垚涓婃姤
*/
@PostMapping("/arm/task/order_result")
+ @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
@RequestBody OrderArmEndParam param,
HttpServletRequest request) {
@@ -359,4 +364,33 @@
return R.ok();
}
+
+
+ /**
+ * 鏄惁瀛樺湪鍚庣画鎵樼洏
+ */
+ @PostMapping("/arm/task/order_sign")
+ public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
+ @RequestBody OrderArmEndParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrder_id())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ try{
+ param.OrderIdTwo(sign_arm_order,sign_arm_sku);
+ } catch (Exception e){
+ return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+
+ boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
+ return R.ok().add(taskArmWorkOrderSign);
+ }
+
}
--
Gitblit v1.9.1