From e6e97e4b558d40a46887a4abb52ba4bbdbba71a2 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 一月 2026 17:57:23 +0800
Subject: [PATCH] #

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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..0a7d0b8 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,6 +2,9 @@
 
 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.dto.SyncLocsDto;
+import com.vincent.rsf.openApi.entity.params.ExMsgCallbackParams;
 import com.vincent.rsf.openApi.entity.params.RcsPubTaskParams;
 import com.vincent.rsf.openApi.entity.params.SyncRcsLocsParam;
 import com.vincent.rsf.openApi.service.WmsRcsService;
@@ -13,6 +16,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -32,7 +36,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 +51,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 +61,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);
     }
 
@@ -72,11 +76,12 @@
      */
     @ApiOperation("RCS搴撲綅淇℃伅鍚屾")
     @PostMapping("/sync/locs")
-    public R syncLocsToWms(@RequestBody SyncRcsLocsParam params) {
+    public CommonResponse syncLocsToWms(@RequestBody SyncRcsLocsParam params) {
          if (Objects.isNull(params)) {
-             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
          }
-         return R.ok().add(wmsRcsService.syncLocs(params));
+         List<SyncLocsDto> result = wmsRcsService.syncLocs(params);
+         return CommonResponse.ok(result);
     }
 
 

--
Gitblit v1.9.1