From 3e6cd2231fc99a855129d1a293b8d65adf1683b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 04 二月 2026 10:55:11 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
index 7a571f2..b3bf360 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
@@ -10,10 +10,11 @@
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.IntegrationRecord;
import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.manager.service.TaskService;
-import com.zy.acs.manager.system.controller.BaseController;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@
@Api(tags = "Open Api")
@RestController
@RequestMapping("/api/open")
-public class OpenController extends BaseController {
+public class OpenController {
@Autowired
private MainService mainService;
@@ -41,6 +42,26 @@
@PostMapping("/bus/submit")
@OperationLog("generate task from open api")
public R submit(@RequestBody OpenBusSubmitParam param) {
+ IntegrationRecord integrationRecord = new IntegrationRecord(
+ null, // 缂栧彿
+ null, // 鍚嶇О绌洪棿
+ null, // 鎺ュ彛鍦板潃
+ null, // 骞冲彴瀵嗛挜
+ null, // 璋冪敤鏂规爣璇�
+ null, // 鏂瑰悜[闈炵┖]
+ null, // 鏃堕棿鎴�
+ null, // 瀹㈡埛绔疘P
+ null, // 璇锋眰鍐呭
+ null, // 鍝嶅簲鍐呭
+ null, // 寮傚父鍐呭
+ null, // 缁撴灉
+ null, // 鑰楁椂
+ null, // 鐘舵��
+ null, // 娣诲姞鏃堕棿[闈炵┖]
+ null, // 淇敼鏃堕棿[闈炵┖]
+ null // 澶囨敞
+ );
+
mainService.generateBusAndTask(param, null);
return R.ok("generate tasks success");
}
@@ -63,7 +84,11 @@
for (String taskNo : param.getTasks()) {
Task task = taskService.selectBySeqNum(bus.getId(), taskNo);
if (null == task) {
- result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE, taskNo + " is not exist"));
+ result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE, "task " + taskNo + " is not exist"));
+ continue;
+ }
+ if (!task.getTaskSts().equals(TaskStsType.INIT.val())) {
+ result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE, "task " + taskNo + " has already been assigned"));
continue;
}
Boolean cancel = false;
@@ -72,7 +97,7 @@
} catch (Exception e) {
log.error("failed to cancel task {}", taskNo, e);
}
- result.getTasks().add(new TaskBoolDto(taskNo, cancel));
+ result.getTasks().add(new TaskBoolDto(taskNo, cancel, "failed to cancel task " + taskNo));
}
return R.ok("cancel tasks success").add(result);
}
--
Gitblit v1.9.1