From e9543f18fbe81fb492df941fdc6fce59424f8f49 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 08:39:36 +0800
Subject: [PATCH] RCS对接

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java
index 0b846cf..4a4dcb8 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java
@@ -2,11 +2,16 @@
 
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.openApi.entity.dto.CommonResponse;
+import com.vincent.rsf.openApi.entity.params.ExMsgCallbackParams;
+import com.vincent.rsf.openApi.entity.params.LocSiteParams;
 import com.vincent.rsf.openApi.entity.params.RcsPubTaskParams;
 import com.vincent.rsf.openApi.entity.params.SyncRcsLocsParam;
+import com.vincent.rsf.openApi.entity.params.TaskReportParams;
 import com.vincent.rsf.openApi.service.WmsRcsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +21,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+@Slf4j
 @RestController
 @Api("RCS璋冨害浜や簰鎺ュ彛")
 @RequestMapping("/rcs")
@@ -32,7 +38,7 @@
      */
     @ApiOperation("璋冨害浠诲姟涓嬪彂")
     @PostMapping("/pub/task")
-    public R pubTasks(@RequestBody RcsPubTaskParams params) {
+    public CommonResponse pubTasks(@RequestBody RcsPubTaskParams params) {
         if (Objects.isNull(params)) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
@@ -47,7 +53,7 @@
      */
     @ApiOperation("鍙栨秷璋冨害浠诲姟")
     @PostMapping("/cancel/task")
-    public R cancelTasks(@RequestBody Map<String, Object> params) {
+    public CommonResponse cancelTasks(@RequestBody Map<String, Object> params) {
         return wmsRcsService.cancelTasks(params);
     }
 
@@ -57,9 +63,9 @@
      * @description: 浠诲姟鍥炶皟锛岀姸鎬佸洖鍐�
      * @version 1.0
      */
-    @ApiOperation("寮傚父浠诲姟鍥炶皟")
+    @ApiOperation("鐘舵�佷笂鎶ュ洖璋�")
     @PostMapping("/callback/event")
-    public R callBackEvent(@RequestBody Map<String, Object> params) {
+    public CommonResponse callBackEvent(@RequestBody ExMsgCallbackParams params) {
         return wmsRcsService.callBackEvent(params);
     }
 
@@ -79,5 +85,35 @@
          return R.ok().add(wmsRcsService.syncLocs(params));
     }
 
+    /**
+     * @author Ryan
+     * @date 2025/11/10
+     * @description: WMS 鍑哄簱鎴愬姛鍚庯紝淇敼搴撲綅銆佺珯鐐圭姸鎬�
+     * @version 1.0
+     */
+    @ApiOperation("RCS淇敼搴撲綅鎴栫珯鐐圭姸鎬�")
+    @PostMapping("/modify/status")
+    public R modifyLocOrSite(@RequestBody LocSiteParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return wmsRcsService.modifyLocOrSite(params);
+    }
+
+    /**
+     * @author Ryan
+     * @date 2026/2/3
+     * @description: RCS鍥炶皟鎺ュ彛
+     * @version 1.0
+     */
+    @ApiOperation("RCS鍥炶皟鎺ュ彛")
+    @PostMapping("/api/open/task/report")
+    public CommonResponse reportTask(@RequestBody TaskReportParams params) {
+        log.debug("RCS鍥炶皟锛歿}", params);
+        if (Objects.isNull(params)) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return wmsRcsService.reportTask(params);
+    }
 
 }

--
Gitblit v1.9.1