From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 09:28:06 +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 | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 7e7d35b..c223eb0 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,11 +36,11 @@
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
- // //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
+ // spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X22670914802GV","",""));
+ //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();
// }
// spianService.selectout2("X21942610602GV");
@@ -167,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();
}
--
Gitblit v1.8.0