From 9a37464e943154d3fcc5db659e2d5abb6db98909 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 16:34:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 91f6ecf..54e013d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,14 +1,14 @@
package com.zy.asrs.controller;
import com.core.common.R;
+import com.zy.asrs.domain.param.CancelTaskParam;
+import com.zy.asrs.domain.param.CompleteTaskParam;
import com.zy.asrs.domain.param.CreateMoveTaskParam;
import com.zy.common.service.CommonService;
import com.zy.core.dispatcher.ShuttleDispatchUtils;
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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@@ -21,15 +21,39 @@
private ShuttleDispatchUtils shuttleDispatchUtils;
@PostMapping("/createMoveTask")
- public R createMoveTask(CreateMoveTaskParam param) {
+ public R createMoveTask(@RequestBody CreateMoveTaskParam param) {
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
- boolean dispatchShuttle = shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(99), param.getLocNo(), param.getShuttleNo());
+ boolean dispatchShuttle = shuttleDispatchUtils.dispatchShuttle(null, param.getLocNo(), param.getShuttleNo());
if (dispatchShuttle) {
return R.ok();
}
- return R.error();
+ return R.error("鐢熸垚澶辫触");
+ }
+
+ @PostMapping("/completeTask")
+ public R completeTask(@RequestBody CompleteTaskParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean completeTask = commonService.completeTask(param);
+ if (completeTask) {
+ return R.ok();
+ }
+ return R.error("浠诲姟瀹屾垚澶辫触");
+ }
+
+ @PostMapping("/cancelTask")
+ public R cancelTask(@RequestBody CancelTaskParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean completeTask = commonService.cancelTask(param);
+ if (completeTask) {
+ return R.ok();
+ }
+ return R.error("浠诲姟鍙栨秷澶辫触");
}
}
--
Gitblit v1.9.1