From 96b63f125687d8ef610745fd9041da2cc77a24af Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 10 四月 2024 08:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java b/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
index deeca44..8fa7876 100644
--- a/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
+++ b/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
@@ -21,25 +21,25 @@
@Autowired
private TemperingOverService temperingOverService;
- @GetMapping("/") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
+ @GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
@ResponseBody
- public Result SelectTerritoryInfo(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
+ public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
List<Tempering> glass = temperingService.SelectWaitingGlass();
System.out.println(glass);
return Result.seccess(glass);
}
- @GetMapping("/") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
+ @GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
@ResponseBody
- public Result CutTerritory(String ProcessId) {
+ public Result SelectIntoGlass(String ProcessId) {
List<Tempering> glass = temperingService.SelectIntoGlass();
System.out.println(glass);
return Result.seccess(glass);
}
- @GetMapping("/") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+ @GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
@ResponseBody
- public Result SelectCutTerritory(String ProcessId) {
+ public Result SelectOutGlass(String ProcessId) {
List<Tempering> glass = temperingOverService.SelectOutGlass();
System.out.println(glass);
return Result.seccess(glass);
--
Gitblit v1.8.0