From ef47083c90ff7e70362a32741a0a4d5770037e7f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 三月 2024 10:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index c7a5a08..0a52ee2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -21,6 +21,7 @@
import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
+import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
@@ -446,4 +447,45 @@
return Result.success(map);
}
+ // 鍒囨崲PLC鑾峰彇浜岀淮鐮佹柟寮�
+ @PostMapping("/UpdateStroageCageByCell")
+ public Result UpdateStroageCageByCell(Integer cell,Integer num) {
+ return storageCageService.UpdateStroageCageByCell(cell,num);
+ }
+
+ //鎵嬪姩瀹屾垚浠诲姟
+ @PostMapping("/FinishTask")
+ public Result FinishTask(Integer tasktype,Integer id) {
+ return storageCageService.FinishTask(tasktype,id);
+ }
+
+ //鏌ヨ鐜荤拑淇℃伅
+ @PostMapping("/SelectGlassInfo")
+ public Result SelectGlassInfo(String width,String height,String thickness,String films) {
+ return storageCageService.SelectGlassInfo(width,height,thickness,films);
+ }
+
+ //娣诲姞鐜荤拑淇℃伅鍒扮瀛�
+ @PostMapping("/StorageCageAddGlass")
+ public Result StorageCageAddGlass(String cell,@RequestBody GlassInfo glassInfo) {
+ return storageCageService.StorageCageAddGlass(cell,glassInfo);
+ }
+
+ //棰嗗彇/鏆傚仠浠诲姟
+ @PostMapping("/ClaimTasks")
+ public Result ClaimTasks(String flowcard,Integer state) {
+ return storageCageService.ClaimTasks(flowcard,state);
+ }
+
+ //淇敼鍑虹墖鏂瑰紡
+ @PostMapping("/ModeChange")
+ public Result ModeChange(String flowcard,Integer method) {
+ return storageCageService.ModeChange(flowcard,method);
+ }
+
+ //娣诲姞鐜荤拑淇℃伅鍒版祴閲忎俊鎭�
+ @PostMapping("/UpdateQueue")
+ public Result UpdateQueue(@RequestBody GlassInfo glassInfo) {
+ return storageCageService.UpdateQueue(glassInfo);
+ }
}
--
Gitblit v1.8.0