From 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:22:06 +0800
Subject: [PATCH] 自动充放电自动化流程
---
src/main/java/com/whyc/controller/InterfaceWmsController.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index 20f7ce5..6f0982a 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.pojo.db_wms.Task;
+import com.whyc.dto.*;
import com.whyc.service.WmsService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +38,29 @@
}
/**
+ * 涓嬪彂鍏ュ簱浠诲姟
+ * @param taskDto
+ * @return
+ */
+ @PostMapping("sendTaskInbound")
+ public Response sendTaskInbound(@RequestBody WmsTaskDto taskDto){
+
+ return service.sendTaskInbound(taskDto);
+ }
+
+
+ /**
+ * 鍙栨秷浠诲姟
+ * @param cancelDto
+ * @return
+ */
+ @PostMapping("cancelTask")
+ public Response cancelTask(@RequestBody WmsTaskCancelDto cancelDto){
+
+ return service.cancelTask(cancelDto);
+ }
+
+ /**
* 浠诲姟鐘舵�佷笂鎶ユ帴鍙�
* TODO 寰呯幇鍦虹‘璁ゅ惈涔� API鍚嶇О 涓婂眰绯荤粺鎻愪緵
*/
@@ -56,10 +76,15 @@
return service.getLocationList();
}
+ /**
+ * @param MaterialType 0=鑾峰彇鎵�鏈夈��1=杞藉叿銆�2=鐢垫睜
+ * @param PalletStatus 0=搴撲綅銆�1=鑾峰彇鎵�鏈夈��4=寰呭嚭搴�
+ * @return
+ */
@GetMapping("getPalletList")
- public Response getPalletList(){
+ public Response getPalletList(@RequestParam int MaterialType,@RequestParam int PalletStatus){
- return service.getPalletList();
+ return service.getPalletList(MaterialType,PalletStatus);
}
/**
@@ -72,4 +97,14 @@
return service.sendTaskStatus(taskDto);
}
+ @GetMapping("task/getFinishedPage")
+ public Response getFinishedPage(@RequestParam int pageNum,@RequestParam int pageSize){
+ return service.getFinishedPage(pageNum,pageSize);
+ }
+
+ @GetMapping("task/getOngoingList")
+ public Response getOngoingList(){
+ return service.getOngoingList();
+ }
+
}
--
Gitblit v1.9.1