From 7dfc5501decb84bce7fe0563956eae705844a2f2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 17 五月 2024 08:52:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 82 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 39 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 4a86f46..c207593 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
@@ -23,6 +23,7 @@
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_frame_buffer1_frames;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
@@ -106,14 +107,15 @@
// 鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
@GetMapping("/Addglassid")
- public Result Addglassid(String glassid) {
+ public Result Addglassid(String glassid) throws SQLException {
Map<String, Object> map = new HashMap<>();
short taskno = homeMapper.SelectInTask();
if (taskno > 0) {
map.put("message2", "500");
} else {
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results = spianService.selectAll(glassid);
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
+ short results = spianService.selectAll(north_glass_buffer1);
if (results == 200) {
map.put("message2", "200");
} else if (results == 300) {
@@ -177,10 +179,10 @@
Map<String, Object> map = new HashMap<>();
Out_slice result = homeMapper.SelectQueueByglassid(glassid);
if (result == null) {
- north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdout(glassid, "", "");
String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
- if (flip != null) {
+ if (flip != null&&flip != "") {
String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
if (position != null) {
String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
@@ -273,20 +275,9 @@
// 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@PostMapping("/InsertQueueGlassId")
- public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
- Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
- if (result > 0) {
- map.put("message", "300");
- } else {
- homeMapper.InsertQueueGlassId(queue, id);
- if (id == 1) {
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianService.selectAll(queue.getglassId());
- }
- map.put("message", "200");
- }
- return Result.success(map);
+ public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) throws SQLException {
+ return storageCageService.InsertQueueGlassId(id, queue);
+
}
// 纭鎵爜浣嶇幓鐠冧俊鎭�
@@ -321,6 +312,7 @@
public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
List<north_glass_buffer1> AluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
+ Plchome.AluminumFrameInfo=jdbcConnections.SelectFrameBarcode(FrameBarcode);
Map<String, Object> map = new HashMap<>();
map.put("AluminumFrame", AluminumFrame);
map.put("flip", flip);
@@ -330,11 +322,7 @@
// 鏍规嵁閾濇id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
public Result DeleteProductionQueueGlass(String FrameNo) {
- homeMapper.CompleteQueueByFrameNo(FrameNo);
-
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
+ return outSliceServive.CompleteQueueByFrameNo(FrameNo);
}
// 娣诲姞閾濇id瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
@@ -343,6 +331,7 @@
// public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
// SQLException {
north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
+ Plchome.AluminumFrame = null;
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -377,7 +366,7 @@
return Result.success(map);
}
- // 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
+ // 淇槸鍚﹂渶瑕佺‘璁�
@PostMapping("/isConfirmStates")
public Result isConfirmStates(Boolean isConfirmStates) {
Plchome.isConfirm = isConfirmStates;
@@ -400,8 +389,12 @@
// 鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
@PostMapping("/WriteGlassID")
- public void WriteGlassID(String glassid) {
+ public Result WriteGlassID(String glassid) {
// 鎵爜浣嶅啓鍏ョ幓鐠僫d
+ spianService.outmesid(glassid, "DB103.286");
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
}
// 娓呴櫎鎸囧畾浣嶇疆id
@@ -414,6 +407,7 @@
@PostMapping("/CloseForm7")
public Result CloseForm7() {
Plchome.AluminumFrame = null;
+ Plchome.AluminumFrameInfo = new north_frame_buffer1_frames();
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -431,20 +425,30 @@
// 杞�ュ仠
@PostMapping("/SoftEmergencyStop")
public Result SoftEmergencyStop(Short num) {
- String position="DB101.11.3";
+ String position = "DB101.11.3";
Map<String, Object> map = new HashMap<>();
- if (S7control.getinstance().CheckConnected() == true) {
- S7control.getinstance().WriteBit(position, false);
- try {
- TimeUnit.MILLISECONDS.sleep(300);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- S7control.getinstance().WriteBit(position, true);
- map.put("message", "200");
- } else {
- map.put("message", "300");
- }
- return Result.success(map);
+ if (S7control.getinstance().CheckConnected() == true) {
+ S7control.getinstance().WriteBit(position, false);
+ try {
+ TimeUnit.MILLISECONDS.sleep(300);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ S7control.getinstance().WriteBit(position, true);
+ map.put("message", "200");
+ } else {
+ map.put("message", "300");
+ }
+ return Result.success(map);
}
+
+ // 鍒囨崲PLC鑾峰彇浜岀淮鐮佹柟寮�
+ @PostMapping("/SwitchScanMethod")
+ public Result SwitchScanMethod(Boolean scansmethod) {
+ S7control.getinstance().WriteBit("DB101.11.4", scansmethod);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0