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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index 1c45208..6f0982a 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.Response;
-import com.whyc.dto.WmsPalletDto;
+import com.whyc.dto.*;
import com.whyc.service.WmsService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,12 +28,36 @@
/**
* 涓嬪彂浠诲姟
* API:/api/Wms_pallet/WmsOutTask
- * TODO 鐤戦棶鐐�: 浠诲姟濡傛灉鏄嚭搴�, 閭ｄ箞鍑哄簱鐨勫簱浣嶆槸鍝釜? 鎺ュ彛鍙傛暟閮芥病鏈夋寚鏄�
+ * See Also: {com.whyc.dto.WmsPalletDto} WmsPalletDto
+ * des Int 鏄� 浠诲姟绫诲瀷 1 =鍑哄簱銆�2=娴嬬數鍘嬨��3=娲诲寲
*/
@PostMapping("sendTask")
public Response sendTask(@RequestBody WmsPalletDto palletDto){
return service.sendTask(palletDto);
+ }
+
+ /**
+ * 涓嬪彂鍏ュ簱浠诲姟
+ * @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);
}
/**
@@ -53,5 +76,35 @@
return service.getLocationList();
}
+ /**
+ * @param MaterialType 0=鑾峰彇鎵�鏈夈��1=杞藉叿銆�2=鐢垫睜
+ * @param PalletStatus 0=搴撲綅銆�1=鑾峰彇鎵�鏈夈��4=寰呭嚭搴�
+ * @return
+ */
+ @GetMapping("getPalletList")
+ public Response getPalletList(@RequestParam int MaterialType,@RequestParam int PalletStatus){
+
+ return service.getPalletList(MaterialType,PalletStatus);
+ }
+
+ /**
+ * 鎻愪緵缁欑涓夋柟鐨勬帴鍙�,鐢ㄤ簬鎺ユ敹浠诲姟鐘舵��
+ * @param taskDto
+ * @return
+ */
+ @PostMapping("sendTaskStatus")
+ public Response sendTaskStatus(@RequestBody TaskDto taskDto){
+ 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