From b092806a662b99310cdb050292de2721ba06acd9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 十一月 2024 14:43:18 +0800
Subject: [PATCH] 增加测量台直通模式，增加手动参数界面的JSON文件
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 9f6a8d9..de59f75 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
@@ -491,17 +491,27 @@
return Result.success(map);
}
- // 鍒囨崲PLC鑾峰彇浜岀淮鐮佹柟寮�
+ // 鏇存敼绗煎瓙鏁伴噺
@PostMapping("/UpdateStroageCageByCell")
public Result UpdateStroageCageByCell(Integer cell, Integer num) {
return storageCageService.UpdateStroageCageByCell(cell, num);
}
+ @PostMapping("/AddOutGlass")
+ public Result AddOutGlass(Integer cell, Integer glasstype) {
+ return storageCageService.AddOutGlass(cell,glasstype);
+ }
+
// 鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/FinishTask")
public Result FinishTask(Integer id) {
return storageCageService.FinishTask();
}
+ // 鎵嬪姩缁撴潫浠诲姟
+ @PostMapping("/TerminateTask")
+ public Result TerminateTask(Integer id) {
+ return storageCageService.TerminateTask(id);
+ }
// 鏌ヨ鐜荤拑淇℃伅
@PostMapping("/SelectGlassInfo")
@@ -541,8 +551,13 @@
// 寮�濮嬪伐绋�
@PostMapping("/StartChange")
- public Result StartChange(String flowcard,int orderstate) {
+ public Result StartChange(String flowcard,Integer orderstate) {
return storageCageService.StartChange(flowcard,orderstate);
+ }
+ // 寮�濮�/鏆傚仠鍑虹墖闃熷垪
+ @PostMapping("/UpdateOutTask")
+ public Result UpdateOutTask(Integer id,Integer state) {
+ return storageCageService.UpdateOutTask(id,state);
}
// 閲嶆柊娴嬮噺
@@ -563,7 +578,13 @@
System.out.println("鎺у埗鍣�:" + num);
return storageCageService.deleteTasks(num);
}
-
+//鍒犻櫎鍑虹墖闃熷垪
+ @PostMapping("/DeleteOutTask")
+ public Result DeleteOutTask(Integer id) {
+ System.out.println("鎺у埗鍣�:" + id);
+ return storageCageService.DeleteOutTask(id);
+ }
+
// 淇濆瓨鑶滅郴璁剧疆
@PostMapping("/SaveMeasure")
public Result SaveMeasure(String films, Integer thickness) {
@@ -571,4 +592,27 @@
return storageCageService.SaveMeasure(films,thickness);
}
+ @GetMapping("/writeValue")
+ public Result writeValue(String address, float value, String type) {
+ if ("0".equals(type)) {
+ System.err.println("鍐欏叆word" + address + "+" + value);
+ // S7control.getinstance().WriteWord(address, (short) value);
+ } else if("1".equals(type)) {
+
+ System.err.println("鍐欏叆float" + address + "+" + value);
+ // S7control.getinstance().writeFloat32(address, value);
+ }else{
+ System.err.println("鍐欏叆bit" + address + "+" + value);
+ // S7control.getinstance().WriteBit(address, true);
+ try {
+ TimeUnit.MILLISECONDS.sleep(300);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // S7control.getinstance().WriteBit(address, false);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0