YiWuProject.git

			@@ -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);
			}




			}