From abccd023bae40d5d8ad2fcdbf848b4240928414d Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 23 四月 2025 14:00:23 +0800
Subject: [PATCH] 更新取消任务接口
---
src/main/java/com/whyc/service/WmsService.java | 8 +++-----
src/main/java/com/whyc/dto/WmsResponseTaskCancelDto.java | 2 +-
src/main/java/com/whyc/dto/WmsTaskCancelDto.java | 2 +-
src/main/java/com/whyc/controller/InterfaceWmsController.java | 7 +++----
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index 2c8a8fa..d401648 100644
--- a/src/main/java/com/whyc/controller/InterfaceWmsController.java
+++ b/src/main/java/com/whyc/controller/InterfaceWmsController.java
@@ -1,7 +1,6 @@
package com.whyc.controller;
import com.whyc.dto.*;
-import com.whyc.pojo.db_wms.Task;
import com.whyc.service.WmsService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,10 +54,10 @@
* @param stopDto
* @return
*/
- @PostMapping("stopTask")
- public Response stopTask(@RequestBody WmsTaskStopDto stopDto){
+ @PostMapping("cancelTask")
+ public Response cancelTask(@RequestBody WmsTaskCancelDto cancelDto){
- return service.stopTask(stopDto);
+ return service.cancelTask(cancelDto);
}
/**
diff --git a/src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java b/src/main/java/com/whyc/dto/WmsResponseTaskCancelDto.java
similarity index 84%
rename from src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java
rename to src/main/java/com/whyc/dto/WmsResponseTaskCancelDto.java
index 272d5d8..bb5ee48 100644
--- a/src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java
+++ b/src/main/java/com/whyc/dto/WmsResponseTaskCancelDto.java
@@ -5,7 +5,7 @@
@Data
@ToString
-public class WmsResponseTaskStopDto {
+public class WmsResponseTaskCancelDto {
private Boolean status;
private Integer code;
diff --git a/src/main/java/com/whyc/dto/WmsTaskStopDto.java b/src/main/java/com/whyc/dto/WmsTaskCancelDto.java
similarity index 83%
rename from src/main/java/com/whyc/dto/WmsTaskStopDto.java
rename to src/main/java/com/whyc/dto/WmsTaskCancelDto.java
index 3c3acf4..e0505b8 100644
--- a/src/main/java/com/whyc/dto/WmsTaskStopDto.java
+++ b/src/main/java/com/whyc/dto/WmsTaskCancelDto.java
@@ -5,7 +5,7 @@
@Data
@ToString
-public class WmsTaskStopDto {
+public class WmsTaskCancelDto {
private String task_no;
/**1=寮哄埗鍙栨秷*/
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index daca90b..3fc27d9 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -5,14 +5,12 @@
import com.google.gson.reflect.TypeToken;
import com.whyc.dto.*;
import com.whyc.pojo.db_abe_ram.AbeInf;
-import com.whyc.pojo.db_param.PageParam;
import com.whyc.pojo.db_wms.Task;
import com.whyc.util.HttpUtil;
import com.whyc.util.JsonUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import sun.applet.Main;
import java.util.Date;
import java.util.HashMap;
@@ -125,13 +123,13 @@
return response;
}
- public Response stopTask(WmsTaskStopDto stopDto) {
- String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/inbound";
+ public Response cancelTask(WmsTaskCancelDto stopDto) {
+ String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/force_send";
Response response = HttpUtil.doPost(httpUrl, JsonUtil.getGson().toJson(stopDto));
//瀵圭粨鏋滆繘琛屽鐞�
if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
String dataStr = (String) response.getData();
- WmsResponseTaskStopDto responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponseTaskStopDto.class);
+ WmsResponseTaskCancelDto responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponseTaskCancelDto.class);
response.set(1,responseInside);
/*if(responseInside.getCode() ==0) {
--
Gitblit v1.9.1