From 9472449b4ca46f482d13b6e628660c61101b443f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 五月 2024 14:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 763907d..1fc3c55 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -36,8 +36,9 @@
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
- // spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
-
+ // //spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
+ // north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
+ // spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
// } catch (SQLException e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
@@ -166,13 +167,14 @@
north_glass_buffer1 glass2 =new north_glass_buffer1();
try {
- if(queueid1.toString()!=""){
- glass1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid1.toString(),"","");// D01鐜荤拑淇℃伅
+ if(Plchome.dbconnected==true){
+ if(queueid1.toString()!=""){
+ glass1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid1.toString(),"","");// D01鐜荤拑淇℃伅
+ }
+ if(queueid2.toString()!=""){
+ glass2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid2.toString(),"","");// D02鐜荤拑淇℃伅
+ }
}
- if(queueid2.toString()!=""){
- glass2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid2.toString(),"","");// D02鐜荤拑淇℃伅
- }
-
} catch (SQLException e) {
e.printStackTrace();
}
@@ -204,7 +206,7 @@
}
}
- System.out.println(spianService.result);
+ // System.out.println(spianService.result);
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0