From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 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 2e10cc7..b4e79a9 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,11 +3,15 @@
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.entity.enums.TaskType;
+import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
+import com.vincent.rsf.server.api.entity.params.ExMsgParams;
+import com.vincent.rsf.server.api.entity.params.WcsTaskParams;
+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;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +26,8 @@
@Autowired
private WcsService wcsService;
-// @ApiOperation(value = "wcs鐢熸垚鍏ュ簱浠诲姟鎺ュ彛")
+
+ @ApiOperation(value = "wcs鐢熸垚鍏ュ簱浠诲姟鎺ュ彛")
@PostMapping("/create/in/task")
public R createInTask(@RequestBody TaskInParam param) {
if (Cools.isEmpty(param.getIoType())) {
@@ -37,10 +42,83 @@
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鍙栬揣瀹屾垚鎺ュ彛")
+ @PostMapping("/agv/pickUp/complete")
+ public R AgvTaskPickUpComplete(@RequestBody TaskInParam param) {
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ 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);
}
--
Gitblit v1.9.1