From 0267cc2886bbdce2c9a55755789c10e0dcaff9f0 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 14:46:24 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 75d0fc2..76e14e1 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
@@ -1,13 +1,19 @@
package com.zy.acs.manager.core.integrate.wms;
-import com.zy.acs.manager.common.annotation.OperationLog;
+import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.system.controller.BaseController;
+import com.zy.acs.manager.common.annotation.OperationLog;
+import com.zy.acs.manager.common.constant.Constants;
+import com.zy.acs.manager.core.integrate.dto.OpenBusCancelParam;
+import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.core.service.MainService;
-import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
+import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.Task;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,13 +29,41 @@
@Autowired
private MainService mainService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private BusService busService;
- @PreAuthorize("hasAuthority('open:bus:submit')")
@PostMapping("/bus/submit")
@OperationLog("generate task from open api")
- public R save(@RequestBody OpenBusSubmitParam param) {
+ public R submit(@RequestBody OpenBusSubmitParam param) {
mainService.generateBusAndTask(param, null);
return R.ok("generate tasks success");
}
+ @PostMapping("/bus/cancel")
+ @OperationLog("cancel task from open api")
+ public R cancel(@RequestBody OpenBusCancelParam param) {
+ if (Cools.isEmpty(param.getTasks())) {
+ return R.error("tasks is empty");
+ }
+ Long busId = null;
+ if (!Cools.isEmpty(param.getBatchNo())) {
+ Bus bus = busService.selectByBusNo(param.getBatchNo());
+ if (null != bus) {
+ busId = bus.getId();
+ }
+ } else {
+// return R.error("batch_no is empty");
+ }
+ for (String taskNo : param.getTasks()) {
+ Task task = taskService.selectBySeqNum(busId, taskNo);
+ if (null == task) {
+ continue;
+ }
+ taskService.cancel(task.getId(), null, Constants.UPLINK);
+ }
+ return R.ok("cancel tasks success");
+ }
+
}
--
Gitblit v1.9.1