From dfdf98629fa109a18a76bcc00a63a812c4ecbcaa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:01:55 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   92 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b81ae14..44751bb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -197,7 +197,7 @@
      * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
      */
     @PostMapping("/labeller/mat/auth/v1")
-    @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+    @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
     public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
                                       @RequestBody LabellerMatParam param,
                                       HttpServletRequest request) {
@@ -209,7 +209,7 @@
      * 璐存爣鏈鸿创鏍囧畬鎴�
      */
     @PostMapping("/labeller/complete/auth/v1")
-    @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�")
+    @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
     public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
                                            @RequestBody LabellerCompleteParam param,
                                            HttpServletRequest request) {
@@ -219,16 +219,42 @@
     }
 
     /**
-     * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+     * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
      */
     @PostMapping("/palletizing/complete/auth/v1")
-    @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
-    public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
-                                           @RequestBody PalletizingCompleteParam param,
+    @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+    public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+                                           @RequestBody PalletizingCompleteTwoFloorParam param,
                                            HttpServletRequest request) {
         auth(appkey, param, request);
-        openService.palletizingComplete(param);
+        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);
     }
 
 
@@ -241,7 +267,11 @@
                                             @RequestBody SingleUnstackingCompleteParam param,
                                             HttpServletRequest request) {
         auth(appkey, param, request);
-        openService.singleUnstackingComplete(param);
+        try{
+            openService.singleUnstackingComplete(param);
+        } catch (Exception e){
+            return R.error(e.getMessage()).add(e.getMessage());
+        }
         return R.ok(param);
     }
 
@@ -254,12 +284,56 @@
                                             @RequestBody SingleMountUnstackingCompleteParam param,
                                             HttpServletRequest request) {
         auth(appkey, param, request);
-        openService.singleMountUnstackingComplete(param);
+        try{
+            openService.singleMountUnstackingComplete(param);
+        } catch (Exception e){
+            return R.error(e.getMessage()).add(e.getMessage());
+        }
         return R.ok(param);
+    }
+
+    /**
+     * FQC璐ㄦ
+     */
+    @PostMapping("/quality/inspection/auth/v1")
+    @AppAuth(memo = "FQC璐ㄦ")
+    public synchronized R qualityInspection(@RequestHeader(required = false) String appkey,
+                                           @RequestBody QualityInspectionParam param,
+                                           HttpServletRequest request) {
+        auth(appkey, param, request);
+        openService.qualityInspection(param);
+        return R.ok();
     }
 
 
 
+    /**
+     * 娣诲姞鍑哄簱鍗曘�佹甯搁��搴撹嚦浜屾ゼ鍖呰
+     */
+    @PostMapping("/order/normalTransferToTheSecond-floorPackagingArea/v1")
+    @AppAuth(memo = "姝ｅ父閫�搴撹嚦浜屾ゼ鍖呰")
+    public synchronized R packagingAreaOrderCreate(@RequestHeader(required = false) String appkey,
+                                            @RequestBody QualityInspectionParam param,
+                                            HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getBoxNo())){
+            throw new CoolException("鍙傛暟锛氱鍙� boxNo涓虹┖");
+        }
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getModel())){
+            throw new CoolException("鍙傛暟锛氬嵎鍙� Model涓虹┖");
+        }
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getMemo())){
+            throw new CoolException("鍙傛暟锛氬娉� Memo涓虹┖");
+        }
+
+        return openService.packagingAreaOrderCreate(param);
+    }
 
     /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
 

--
Gitblit v1.9.1