From 1e1cedc70758a7c17ccf63ea11d1db70c409aa66 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 09:45:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 4167a0f..afa3d5b 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,7 @@
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.RcsPubTaskParams;
import com.vincent.rsf.openApi.entity.params.SyncRcsLocsParam;
@@ -33,7 +34,7 @@
*/
@ApiOperation("璋冨害浠诲姟涓嬪彂")
@PostMapping("/pub/task")
- public R pubTasks(@RequestBody RcsPubTaskParams params) {
+ public CommonResponse pubTasks(@RequestBody RcsPubTaskParams params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -48,7 +49,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);
}
@@ -60,7 +61,7 @@
*/
@ApiOperation("鐘舵�佷笂鎶ュ洖璋�")
@PostMapping("/callback/event")
- public R callBackEvent(@RequestBody ExMsgCallbackParams params) {
+ public CommonResponse callBackEvent(@RequestBody ExMsgCallbackParams params) {
return wmsRcsService.callBackEvent(params);
}
--
Gitblit v1.9.1