From 632c1351c9f0ba96d1f43e46aed2bcbd4a50e7d6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 21 十月 2024 14:13:36 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1abf6c2..f3f6a82 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -20,7 +20,7 @@
 @Slf4j
 @RestController
 @RequestMapping("open/rcs")
-public class OpenController extends BaseController {
+public class  OpenController extends BaseController {
 
     private static final boolean auth = true;
     public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -51,20 +51,25 @@
         if (Cools.isEmpty(param.getEndSta())  || param.getEndSta$()==0) {
             return R.error("缁堢偣[endSta]涓嶈兘涓虹┖");
         }
-        openService.wcsTaskDistribution(param);
+//        openService.wcsTaskDistribution(param);
 
-        return R.ok();
+        return openService.wcsTaskDistribution(param);
     }
 
-
     /**
-     * 搴撳瓨缁熻
+     * 鏁版嵁鍚屾
      */
-    @RequestMapping("/stock/default/v1")
-    public R queryStock(@RequestHeader(required = false) String appkey,
-                        HttpServletRequest request) {
-        auth(appkey, null, request);
-        return R.ok().add(openService.queryStock());
+    @PostMapping("/status/cs/default/v1")
+    @AppAuth(memo = "WCS鏁版嵁鍚屾")
+    public synchronized R wcsTaskStatus(@RequestHeader(required = false) String appkey,
+                                              @RequestBody Long timestamp,
+                                              HttpServletRequest request) {
+        auth(appkey, timestamp, request);
+        if (Cools.isEmpty(timestamp)) {
+            return R.parse(BaseRes.PARAM);
+        }
+
+        return openService.wcsTaskStatus(timestamp);
     }
 
 

--
Gitblit v1.9.1