From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:44:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 740d65a..c78f5bf 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,12 +1,13 @@
package com.mes.temperingglass.controller;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingOverService;
import com.mes.temperingglass.service.TemperingService;
import com.mes.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@@ -16,7 +17,7 @@
public class TemperingGlassInfoController {
@Autowired
- TemperingService temperingService;
+ TemperingService temperingService;
@Autowired
private TemperingOverService temperingOverService;
@@ -26,7 +27,7 @@
public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
System.out.println(glass);
- return Result.build(200,"", glass);
+ return Result.build(200, "", glass);
}
@GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
@@ -34,7 +35,7 @@
public Result SelectIntoGlass(String ProcessId) {
List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
System.out.println(glass);
- return Result.build(200,"", glass);
+ return Result.build(200, "", glass);
}
@GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
@@ -42,10 +43,8 @@
public Result SelectOutGlass(String ProcessId) {
List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
System.out.println(glass);
- return Result.build(200,"", glass);
+ return Result.build(200, "", glass);
}
-
-
}
--
Gitblit v1.8.0