From d8d107072cde858bdc4d23318c56d52e91f28c93 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 21 七月 2023 09:47:13 +0800
Subject: [PATCH] #wrkmast==>sheetNo:徐工汉云拆垛标记  0: 未拆  1: 已拆  2:已处理可下一步(转历史档)

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   31 +++++++++++++++----------------
 1 files changed, 15 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..3005376 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,7 +255,7 @@
                                             HttpServletRequest request) {
         auth(appkey, param, request);
         openService.singleMountUnstackingComplete(param);
-        return R.ok();
+        return R.ok(param);
     }
 
 

--
Gitblit v1.9.1