From fa35f658190d4d929591c5e93417373be0ded91e Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 13 十月 2025 14:02:21 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 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 ef22698..d69c327 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -249,6 +249,9 @@
         if (Cools.isEmpty(param.getStaNo())) {
             return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
         }
+        if (Cools.isEmpty(param.getBindingTags())) {
+            return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
+        }
         openService.taskArmReport(param);
         return R.ok();
     }
@@ -303,6 +306,9 @@
         }
         if (Cools.isEmpty(param.getId())) {
             return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+        }
+        if (Integer.parseInt(param.getId())<2){
+            return R.ok().add("鏉ユ枡鍙g┖闂村浣嶆垚鍔�");
         }
         if (Cools.isEmpty(param.getType())) {
             return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
@@ -364,4 +370,34 @@
         return R.ok();
     }
 
+
+
+    /**
+     * 鏄惁瀛樺湪鍚庣画鎵樼洏
+     */
+    @PostMapping("/arm/task/order_sign")
+    @AppAuth(memo = "鏄惁瀛樺湪鍚庣画鎵樼洏")
+    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