From 3c048df38b6970f434c0672b5afb385dca750e66 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 一月 2026 17:54:41 +0800
Subject: [PATCH] #wcs任务申请返回值实装
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 111 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index 129de11..8334ef3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -3,7 +3,9 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
+import com.vincent.rsf.server.api.entity.params.*;
+import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -23,6 +25,7 @@
@Autowired
private WcsService wcsService;
+
@ApiOperation(value = "wcs鐢熸垚鍏ュ簱浠诲姟鎺ュ彛")
@PostMapping("/create/in/task")
public R createInTask(@RequestBody TaskInParam param) {
@@ -38,10 +41,8 @@
if (Cools.isEmpty(param.getLocType1())){
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
- InTaskMsgDto msgDto = wcsService.createInTask(param,getLoginUserId());
+ InTaskMsgDto msgDto = wcsService.createInTask(param);
return R.ok(msgDto);
-
-
}
@ApiOperation(value = "agv鍙栬揣瀹屾垚鎺ュ彛")
@@ -56,14 +57,119 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- if (param.getIoType().equals(TaskType.TASK_TYPE_AGV_IN.type)) {
+ if (!param.getIoType().equals(TaskType.TASK_TYPE_IN.type)) {
return R.error("鍏ュ簱绫诲瀷鏈夎");
}
wcsService.agvTaskPickUpComplete(param);
return R.ok();
+ }
+ /**
+ * 鎺ユ敹WCS璋冨害锛屽洖浼犳墽琛岀姸鎬�
+ * TODO 1. 鎷ｆ枡鍑哄簱锛屽啀鍏ュ簱鎵ц锛屼慨鏀圭姸鎬佷负199.浠诲姟瀹屾垚 骞惰褰曞叆搴撶珯鐐癸紙婧愮珯鐐癸級锛屾坊鍔犱换鍔″彿鍙傛暟
+ * @param param
+ * @return
+ */
+ @ApiOperation("鎺ユ敹WCS璋冨害锛屽洖浼犳墽琛岀姸鎬�")
+ @PostMapping("/exce/status")
+ public R receiveTask(@RequestBody TaskInParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/27
+ * @description: RCS搴撲綅淇℃伅鍚屾
+ * @version 1.0
+ */
+ @ApiOperation("RCS搴撲綅淇℃伅鍚屾")
+ @OperationLog("RCS搴撲綅淇℃伅鍚屾")
+ @PostMapping("/sync/locs")
+ public R syncLocsToWms() {
+ wcsService.syncLocsToWms();
+ return R.ok();
+ }
+
+ /**
+ * 涓嬪彂浠诲姟鑷砏CS锛孉PI涓浆
+ * @param
+ * @return
+ */
+ @ApiOperation("涓嬪彂浠诲姟鑷砏CS")
+ @OperationLog("涓嬪彂浠诲姟鑷砏CS")
+ @PostMapping("/pub/task/wcs")
+ public R pubTaskToWcs(@RequestBody WcsTaskParams params) {
+ return wcsService.pubWcsTask(params);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/28
+ * @description: RCS涓婃姤寮傚父淇℃伅
+ * @version 1.0
+ */
+ @ApiOperation("RCS涓婃姤寮傚父鎵ц淇℃伅")
+ @OperationLog("RCS涓婃姤寮傚父鎵ц淇℃伅")
+ @PostMapping("/receive/ex/msg")
+ public R receiveExMsg(@RequestBody ExMsgParams params) {
+ return wcsService.receiveExMsg(params);
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: WCS鍏ュ簱浠诲姟鐢宠
+ * @version 1.0
+ */
+ @ApiOperation("WCS鍏ュ簱浠诲姟鐢宠")
+ @OperationLog("WCS鍏ュ簱浠诲姟鐢宠")
+ @PostMapping("/createInTask")
+ public R wcsCreateInTask(@RequestBody CreateInTaskParam params) {
+ return wcsService.wcsCreateInTask(params);
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: WCS浠诲姟涓婃姤閫氱煡
+ * @version 1.0
+ */
+ @ApiOperation("WCS浠诲姟涓婃姤閫氱煡")
+ @OperationLog("WCS浠诲姟涓婃姤閫氱煡")
+ @PostMapping("/task/report")
+ public R wcsTaskReport(@RequestBody TaskReportParam params) {
+ return wcsService.wcsTaskReport(params);
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: WCS鐢宠浠诲姟閲嶆柊鍒嗛厤鍏ュ簱
+ * @version 1.0
+ */
+ @ApiOperation("WCS鐢宠浠诲姟閲嶆柊鍒嗛厤鍏ュ簱")
+ @OperationLog("WCS鐢宠浠诲姟閲嶆柊鍒嗛厤鍏ュ簱")
+ @PostMapping("/reassign/loc")
+ public R wcsReassignLoc(@RequestBody ReassignLocParam params) {
+ return wcsService.wcsReassignLoc(params);
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
+ * @version 1.0
+ */
+ @ApiOperation("WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅")
+ @OperationLog("WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅")
+ @PostMapping("/change/loc")
+ public R wcsChangeLoc(@RequestBody ChangeLocParam params) {
+ return wcsService.wcsChangeLoc(params);
}
--
Gitblit v1.9.1