From c330e65b8ea172fface685efaa8e9c2e8a7f9520 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 23 四月 2025 13:57:13 +0800
Subject: [PATCH] 更新停止任务接口
---
src/main/java/com/whyc/dto/WmsTaskStopDto.java | 14 +++++++
src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java | 17 ++++++++
src/main/java/com/whyc/service/WmsService.java | 15 +++++++
src/main/java/com/whyc/controller/InterfaceWmsController.java | 17 ++++++--
4 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index c2351bd..2c8a8fa 100644
--- a/src/main/java/com/whyc/controller/InterfaceWmsController.java
+++ b/src/main/java/com/whyc/controller/InterfaceWmsController.java
@@ -1,9 +1,6 @@
package com.whyc.controller;
-import com.whyc.dto.Response;
-import com.whyc.dto.TaskDto;
-import com.whyc.dto.WmsPalletDto;
-import com.whyc.dto.WmsTaskDto;
+import com.whyc.dto.*;
import com.whyc.pojo.db_wms.Task;
import com.whyc.service.WmsService;
import io.swagger.annotations.Api;
@@ -52,6 +49,18 @@
return service.sendTaskInbound(taskDto);
}
+
+ /**
+ * 鍙栨秷浠诲姟
+ * @param stopDto
+ * @return
+ */
+ @PostMapping("stopTask")
+ public Response stopTask(@RequestBody WmsTaskStopDto stopDto){
+
+ return service.stopTask(stopDto);
+ }
+
/**
* 浠诲姟鐘舵�佷笂鎶ユ帴鍙�
* TODO 寰呯幇鍦虹‘璁ゅ惈涔� API鍚嶇О 涓婂眰绯荤粺鎻愪緵
diff --git a/src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java b/src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java
new file mode 100644
index 0000000..272d5d8
--- /dev/null
+++ b/src/main/java/com/whyc/dto/WmsResponseTaskStopDto.java
@@ -0,0 +1,17 @@
+package com.whyc.dto;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class WmsResponseTaskStopDto {
+
+ private Boolean status;
+ private Integer code;
+ private String codeStr;
+ private String message;
+
+ private Integer data;
+
+}
diff --git a/src/main/java/com/whyc/dto/WmsTaskStopDto.java b/src/main/java/com/whyc/dto/WmsTaskStopDto.java
new file mode 100644
index 0000000..3c3acf4
--- /dev/null
+++ b/src/main/java/com/whyc/dto/WmsTaskStopDto.java
@@ -0,0 +1,14 @@
+package com.whyc.dto;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class WmsTaskStopDto {
+
+ private String task_no;
+ /**1=寮哄埗鍙栨秷*/
+ private Integer operate;
+
+}
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index b2cfe9e..daca90b 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -125,6 +125,21 @@
return response;
}
+ public Response stopTask(WmsTaskStopDto stopDto) {
+ String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/inbound";
+ 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);
+ response.set(1,responseInside);
+ /*if(responseInside.getCode() ==0) {
+
+ }*/
+ }
+ return response;
+ }
+
public Response getLocationList() {
String httpUrl = "http://192.168.10.133:8051"+"/api/wms_location/get_all";
Response response = HttpUtil.doGet(httpUrl, (String) null);
--
Gitblit v1.9.1