From 16170b1d8429f7c31bb1a323b93c2de5137f2c6f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 九月 2025 08:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java
index af9354e..5b9cd83 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java
@@ -51,6 +51,32 @@
}
}
+ @ApiOperation("鏌ヨ鍗曞皬鏃朵骇閲�")
+ @PostMapping("/findHourlyOutput")
+ @ResponseBody
+ public Result findHourlyOutput(@RequestBody Map<String, String> map) {
+ try {
+ int dayCount = Integer.valueOf(map.get("dayCount").toString());
+ Map<String, Object> result = taskingLogService.findHourlyOutput(dayCount);
+ return Result.build(200, "鏌ヨ鎴愬姛", result);
+ } catch (Exception e) {
+ return Result.build(199, "鏌ヨ澶辫触: " + e.getMessage(), null);
+ }
+ }
+
+ @ApiOperation("鏌ヨ搴撲綅鏁版嵁")
+ @PostMapping("/selectWareHouse")
+ @ResponseBody
+ public Result selectWareHouse(@RequestBody Map<String, String> map) {
+ try {
+ int dayCount = Integer.valueOf(map.get("dayCount").toString());
+ List<Map<String, Object>> result = taskingLogService.selectWareHouse(dayCount);
+ return Result.build(200, "鏌ヨ鎴愬姛", result);
+ } catch (Exception e) {
+ return Result.build(199, "鏌ヨ澶辫触: " + e.getMessage(), null);
+ }
+ }
+
@ApiOperation("鎻愪氦鏃ュ織浠ュ強鎶ュ伐鏁版嵁鍒颁節鐗ф暟鎹簱")
@PostMapping("/reportTaskingLog")
@ResponseBody
--
Gitblit v1.8.0