From db837564174910001c8964f4d09d847289879a25 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 10 四月 2024 08:08:28 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java new file mode 100644 index 0000000..57419a0 --- /dev/null +++ b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java @@ -0,0 +1,55 @@ +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.entity.UpWorkstation; +import com.mes.service.LoadGlassService; +import com.mes.service.TemperingOverService; +import com.mes.service.TemperingService; + + +@RestController +@RequestMapping("/LoadGlass") + +// TidyUpGlassModule 閽㈠寲妯″潡 +public class LoadGlassController { + + @Autowired + private LoadGlassService loadGlassService; + + @PostMapping("/SelectAll") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅 + @ResponseBody + public Result SelectGlassInfo() { + List<UpWorkstation> glass = loadGlassService.selectAll(); + System.out.println(glass); + return Result.seccess(glass); + } + + @PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d + @ResponseBody + public void insertGlassinfo(@RequestBody UpWorkstation upwork) { + loadGlassService.insertGlass(upwork); + + } + + @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null + @ResponseBody + public void SelectCutTerritory(int upworkid) { + loadGlassService.deleteGlass(upworkid); + } + + @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔� + @ResponseBody + public void selectPriority() { + boolean result = loadGlassService.isCanLoadGlass(); + if(result==true){ + loadGlassService.selectPriority(); + } + } + + + +} -- Gitblit v1.8.0