From daed20c553f77fc48695f8523cd57bc56fb5a0fd Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 10 四月 2024 08:35:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java b/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
new file mode 100644
index 0000000..8fa7876
--- /dev/null
+++ b/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
@@ -0,0 +1,51 @@
+package com.mes.controller;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.mes.common.Result;
+import com.mes.entity.Tempering;
+import com.mes.service.TemperingOverService;
+import com.mes.service.TemperingService;
+
+
+@RestController
+@RequestMapping("/Tempering")
+
+// TidyUpGlassModule 閽㈠寲妯″潡
+public class TemperingController {
+
+ @Autowired
+ private TemperingService temperingService;
+
+ @Autowired
+ private TemperingOverService temperingOverService;
+
+ @GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
+ @ResponseBody
+ public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
+ List<Tempering> glass = temperingService.SelectWaitingGlass();
+ System.out.println(glass);
+ return Result.seccess(glass);
+ }
+
+ @GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
+ @ResponseBody
+ public Result SelectIntoGlass(String ProcessId) {
+ List<Tempering> glass = temperingService.SelectIntoGlass();
+ System.out.println(glass);
+ return Result.seccess(glass);
+ }
+
+ @GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+ @ResponseBody
+ public Result SelectOutGlass(String ProcessId) {
+ List<Tempering> glass = temperingOverService.SelectOutGlass();
+ System.out.println(glass);
+ return Result.seccess(glass);
+ }
+
+
+
+
+}
--
Gitblit v1.8.0