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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
index 24a0bc7..57419a0 100644
--- a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
+++ b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
@@ -20,28 +20,28 @@
@Autowired
private LoadGlassService loadGlassService;
- @PostMapping("/") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @PostMapping("/SelectAll") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
- public Result SelectTerritoryInfo() {
+ public Result SelectGlassInfo() {
List<UpWorkstation> glass = loadGlassService.selectAll();
System.out.println(glass);
return Result.seccess(glass);
}
- @PostMapping("/") //鏂板涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
+ @PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
@ResponseBody
- public void CutTerritory(@RequestBody UpWorkstation upwork) {
+ public void insertGlassinfo(@RequestBody UpWorkstation upwork) {
loadGlassService.insertGlass(upwork);
}
- @PostMapping("/") //鍒犻櫎涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d鍒犻櫎
+ @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
@ResponseBody
public void SelectCutTerritory(int upworkid) {
loadGlassService.deleteGlass(upworkid);
}
- @PostMapping("/") //寮�濮嬩笂鐗囦换鍔�
+ @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
@ResponseBody
public void selectPriority() {
boolean result = loadGlassService.isCanLoadGlass();
--
Gitblit v1.8.0