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
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 12
CanadaMes-ui/src/views/home/index.vue | 16
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 714 +++++++++++++++++++++++++++--------------------
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 13
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 8
CanadaMes-ui/src/lang/locales/en-US.json | 4
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 24
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 2
CanadaMes-ui/src/configuration/ServoManualone.json | 8
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 52 ++-
CanadaMes-ui/src/lang/locales/zh-CN.json | 2
11 files changed, 491 insertions(+), 364 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 76998d9..4771acb 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -219,7 +219,7 @@
{
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
@@ -260,7 +260,7 @@
{
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
@@ -307,7 +307,7 @@
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
@@ -356,7 +356,7 @@
} ,{
"button": {
"name": "鏈洖闆�",
- "value":1,
+ "value":0,
"address":"DB10.0",
"type":"66"
}
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 85be4ab..b1acb4c 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
"Clear":"Clear",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"Mes Connection failed":"Mes Connection failed",
"Plc1 Connection failed":"Plc1 Connection failed",
"Plc2 Connection failed":"Plc2 Connection failed",
@@ -177,7 +177,7 @@
},
"Electrical": "Electrical",
"Parameter": "Parameter",
- "Manual/Automatic": "鎵嬪姩/鑷姩",
+ "Manual/Automatic": "Manual/Automatic",
"Action": "Action",
"Sign": "Sign",
"State": "State",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 6d244ff..ad84968 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,6 @@
{
"Clear":"娓呴櫎",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"Mes Connection failed":"Mes杩炴帴澶辫触",
"Plc1 Connection failed":"Plc1杩炴帴澶辫触",
"Plc2 Connection failed":"Plc2杩炴帴澶辫触",
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 9104e06..3993ce3 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -78,12 +78,12 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
<el-button v-if="item.button && language === 'en-US' && item.state != 0" :name="item.button.name"
v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 0,'error-button3': item.button.name === 'Zero' && item.button.value === 1,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
+ :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 1,'error-button3': item.button.name === 'Zero' && item.button.value === 0,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
item.button.name }}</el-button>
<el-button v-if="item.button && language === 'zh-CN' && item.state != 0" :name="item.button.name"
v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 0,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 1,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
+ :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 1,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 0,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
item.button.name }}</el-button>
</div>
@@ -707,7 +707,7 @@
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
let obj = arr[j];
- if (obj.button && obj.button.value===1) {
+ if (obj.button && obj.button.value===0) {
if ( obj.button.name==="鏈洖闆�" && this.language==="zh-CN") {
obj.button.name =obj.button.name.replace("鏈洖闆�","宸插洖闆�") ;
}
@@ -715,7 +715,7 @@
obj.button.name =obj.button.name.replace("NotZero","Zero") ;
}
}
- if (obj.button && obj.button.value===0) {
+ if (obj.button && obj.button.value===1) {
if ( obj.button.name==="宸插洖闆�"&& this.language==="zh-CN") {
obj.button.name =obj.button.name.replace("宸插洖闆�","鏈洖闆�") ;
}
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 9004e62..002579e 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -67,12 +67,12 @@
</div>
<div class="button-row" style="display: flex; justify-content: space-between;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
- <el-button v-if="item.button && language === 'en-US' && item.button.name !== 'NotZero'" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 0,'error-button3': item.button.name === 'Zero' && item.button.value ===1,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
+ <el-button v-if="item.button && language === 'en-US' " :name="item.button.name" v-model="item.button.value"
+ :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 1,'error-button3': item.button.name === 'Zero' && item.button.value ===0,'greenbutton': item.button.name !== 'NotZero' && item.button.name !== 'Fault' && item.button.value === 1 }"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
item.button.name }}</el-button>
- <el-button v-if="item.button && language === 'zh-CN' && item.button.name !== '鏈洖闆�'" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 0,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 1,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
+ <el-button v-if="item.button && language === 'zh-CN' " :name="item.button.name" v-model="item.button.value"
+ :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1, 'error-button2': item.button.name === '鏈洖闆�' && item.button.value === 1,'error-button3': item.button.name === '宸插洖闆�' && item.button.value === 0,'greenbutton': item.button.name !== '鏈洖闆�' && item.button.name !== '鏁呴殰' && item.button.value === 1 }"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
item.button.name }}</el-button>
</div>
@@ -538,7 +538,7 @@
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
let obj = arr[j];
- if (obj.button && obj.button.value===1) {
+ if (obj.button && obj.button.value===0) {
if ( obj.button.name==="鏈洖闆�" && this.language==="zh-CN") {
obj.button.name =obj.button.name.replace("鏈洖闆�","宸插洖闆�") ;
}
@@ -546,7 +546,7 @@
obj.button.name =obj.button.name.replace("NotZero","Zero") ;
}
}
- if (obj.button && obj.button.value===0) {
+ if (obj.button && obj.button.value===1) {
if ( obj.button.name==="宸插洖闆�"&& this.language==="zh-CN") {
obj.button.name =obj.button.name.replace("宸插洖闆�","鏈洖闆�") ;
}
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 0e4224b..bb50348 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -195,9 +195,9 @@
'error-button':
item.button.name === 'Fault' && item.button.value === 1,
'error-button2':
- item.button.name === 'NotZero' && item.button.value === 0,
+ item.button.name === 'NotZero' && item.button.value === 1,
'error-button3':
- item.button.name === 'Zero' && item.button.value === 1,
+ item.button.name === 'Zero' && item.button.value === 0,
fuwei:
item.button.name === 'Reset' && item.button.value === 1,
huiling:
@@ -238,9 +238,9 @@
'error-button':
item.button.name === '鏁呴殰' && item.button.value === 1,
'error-button3':
- item.button.name === '宸插洖闆�' && item.button.value === 1,
+ item.button.name === '宸插洖闆�' && item.button.value === 0,
'error-button2':
- item.button.name === '鏈洖闆�' && item.button.value === 0,
+ item.button.name === '鏈洖闆�' && item.button.value === 1,
fuwei: item.button.name === '澶嶄綅' && item.button.value === 1,
huiling:
item.button.name === '鍥為浂' && item.button.value === 1,
@@ -832,7 +832,7 @@
// console.log(jsonData2[5][4].button.value)
if (
- jsonData2[2][3].button.value === 1 &&
+ jsonData2[2][3].button.value === 0 &&
(jsonData2[2][3].button.name === "NotZero" ||
jsonData2[2][3].button.name === "鏈洖闆�")
) {
@@ -846,7 +846,7 @@
);
}
if (
- jsonData2[3][3].button.value === 1 &&
+ jsonData2[3][3].button.value === 0 &&
(jsonData2[3][3].button.name === "NotZero" ||
jsonData2[3][3].button.name === "鏈洖闆�")
) {
@@ -860,7 +860,7 @@
);
}
if (
- jsonData2[4][4].button.value === 1 &&
+ jsonData2[4][4].button.value === 0 &&
(jsonData2[4][4].button.name === "NotZero" ||
jsonData2[4][4].button.name === "鏈洖闆�")
) {
@@ -874,7 +874,7 @@
);
}
if (
- jsonData2[5][4].button.value === 1 &&
+ jsonData2[5][4].button.value === 0 &&
(jsonData2[5][4].button.name === "NotZero" ||
jsonData2[5][4].button.name === "鏈洖闆�")
) {
@@ -889,7 +889,7 @@
}
if (
- jsonData2[2][3].button.value === 0 &&
+ jsonData2[2][3].button.value === 1 &&
(jsonData2[2][3].button.name === "Zero" ||
jsonData2[2][3].button.name === "宸插洖闆�")
) {
@@ -903,7 +903,7 @@
);
}
if (
- jsonData2[3][3].button.value === 0 &&
+ jsonData2[3][3].button.value === 1 &&
(jsonData2[3][3].button.name === "Zero" ||
jsonData2[3][3].button.name === "宸插洖闆�")
) {
@@ -917,7 +917,7 @@
);
}
if (
- jsonData2[4][4].button.value === 0 &&
+ jsonData2[4][4].button.value === 1 &&
(jsonData2[4][4].button.name === "Zero" ||
jsonData2[4][4].button.name === "宸插洖闆�")
) {
@@ -931,7 +931,7 @@
);
}
if (
- jsonData2[5][4].button.value === 0 &&
+ jsonData2[5][4].button.value === 1 &&
(jsonData2[5][4].button.name === "Zero" ||
jsonData2[5][4].button.name === "宸插洖闆�")
) {
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 901bcdb..a5a1780 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1027,9 +1027,9 @@
}else{
const now = new Date();
console.log(this.count1,this.count2);
- alert(this.$t('Mes Connection failed')+now);
+ console.log(this.$t('Mes Connection failed')+now);
}
- }, 30000);
+ }, 60000);
},
activated() {
this.init();
@@ -1067,10 +1067,18 @@
// this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
}
if (obj.Plc1 != null) {
- this.plc1=this.$t('Plc1 Connection failed');
+ if(obj.Plc1[0]==true){
+ this.plc1="";
+ }else{
+ this.plc1=this.$t('Plc1 Connection failed');
+ }
}
if (obj.Plc2 != null) {
- this.plc2=this.$t('Plc2 Connection failed');
+ if(obj.Plc2[0]==true){
+ this.plc2="";
+ }else{
+ this.plc2=this.$t('Plc2 Connection failed');
+ }
}
this.tableData = obj.tableData[0];
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..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
@@ -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();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index b11acd4..237d034 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -49,6 +49,11 @@
public static StringBuilder feedglassid;
+ public static Boolean dbconnected = false;
+
+ public static Boolean plc1 = true;
+ public static Boolean plc2 = false;
+
// public Plchome() throws IOException {
// config = new Configuration("config.properties");
// }
@@ -73,15 +78,15 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- boolean dbconnected = false;
+ // boolean dbconnected = false;
try {
dbserve.getConn();
dbconnected = true;
} catch (Exception e) {
e.printStackTrace();
dbconnected = false;
+ log.info("dbconnected:" + dbconnected);
}
- log.info("dbconnected:"+dbconnected);
jsonObject.append("dbconnected", dbconnected);
// // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
// String CurrrentGlassId = "X22595911002GV";
@@ -160,14 +165,27 @@
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
-
- // 閾濇绾夸氦浜�
- if (S7controlLK.getinstance().CheckConnected() == true) {
+ try {
+ // 閾濇绾夸氦浜�
+ // if (S7controlLK.getinstance().CheckConnected() == true) {
// E02鐜荤拑id
- String E02id = S7controlLK.getinstance().readStrings("DB17.40");
+ // log.info("frame1"+S7controlLK.getinstance().CheckConnected());
+ String E02id="";
+ try {
+ E02id= S7controlLK.getinstance().readStrings("DB17.40");
+ plc2=true;
+ } catch (Exception e) {
+ // TODO: handle exception
+ plc2=false;
+ e.printStackTrace();
+ }
+
+ jsonObject.append("Plc2", plc2);
+ // log.info("閾濇绾胯鍙�2"+S7controlLK.getinstance().CheckConnected());
+
// log.info("E02id"+E02id);
outSliceServive.FrameStateUpdate(E02id);
- if (CurrentFrame.getBarCode() != null) {
+ if (CurrentFrame != null) {
S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
}
String J01id = S7controlLK.getinstance().readStrings("DB17.22");
@@ -199,18 +217,20 @@
}
S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
}
-
+
String E01id = S7controlLK.getinstance().readStrings("DB17.0");
// log.info("frameno:" + E01id);
List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
// log.info("frameflip:" + liststates);
- }else{
- jsonObject.append("Plc2", false);
+ // }else{
+ // log.info("Plc2"+S7controlLK.getinstance().CheckConnected());
+ // jsonObject.append("Plc2", false);
+ // }
+ } catch (Exception e) {
+ e.printStackTrace();
}
if (S7control.getinstance().CheckConnected() == true) {
-
-
// 鑾峰彇褰撳墠鎵爜鏂瑰紡
List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
@@ -364,11 +384,13 @@
}
}
}
- }else{
- jsonObject.append("Plc1", false);
+ plc1=true;
+ } else {
+ plc1=false;
+ log.info("Plc1" + S7controlLK.getinstance().CheckConnected());
}
jsonObject.append("zhi", zhi);
-
+ jsonObject.append("Plc1", plc1);
// jsonObject.append("params", new short[] { 30, 40, });
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 01bc770..4da549e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -12,9 +12,10 @@
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.north_glass_buffer1;
+
@Component
public class JdbcConnections {
- /**
+ /**
* 鏁版嵁搴撹繛鎺ュ弬鏁�
* driver,url,username,password
*/
@@ -22,331 +23,430 @@
private static final String URL = "jdbc:mysql://localhost:3306/canadames";
private static final String USERNAME = "root";
private static final String PASSWORD = "beibo.123/";
-
+
private static Connection conns = null;
private static PreparedStatement ps = null;
private static ResultSet rss = null;
-
- public north_glass_buffer1 selectGlass(int glassid) throws SQLException {
- Connection conn = getConn();
- north_glass_buffer1 glass=new north_glass_buffer1();
- String sql = "select ordernumber from north_glass_buffer1 where glassid=?";
- ps = conn.prepareStatement(sql);
- ps.setInt(1, glassid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- glass.setordernumber(rs.getString("ordernumber"));
- }
- conn.close();
- return glass;
- }
- public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameId(String glassid,String orderid,String frameid) throws SQLException {
- Connection conn = getConn();
- north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
- String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
- ps = conn.prepareStatement(sql);
- ps.setString(1, glassid);
- ps.setString(2, orderid);
- ps.setString(3, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- north_glass_buffer1s.setId(rs.getInt("Id"));
- north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
- north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
- north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
- north_glass_buffer1s.setbarcode(rs.getString("barcode"));
- north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
- north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
- north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
- north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
- north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
- north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
- north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
- north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
- north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
- }
- conn.close();
- return north_glass_buffer1s;
- }
+ public north_glass_buffer1 selectGlass(int glassid) throws SQLException {
+ try {
+ Connection conn = getConn();
+ north_glass_buffer1 glass = new north_glass_buffer1();
+ String sql = "select ordernumber from north_glass_buffer1 where glassid=?";
+ ps = conn.prepareStatement(sql);
+ ps.setInt(1, glassid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ glass.setordernumber(rs.getString("ordernumber"));
+ }
+ conn.close();
+ return glass;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
- public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameIdout(String glassid,String orderid,String frameid) throws SQLException {
- Connection conn = getConn();
- north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
- String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
- ps = conn.prepareStatement(sql);
- ps.setString(1, glassid);
- ps.setString(2, orderid);
- ps.setString(3, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- north_glass_buffer1s.setId(rs.getInt("Id"));
- north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
- north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
- north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
- north_glass_buffer1s.setbarcode(rs.getString("barcode"));
- north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
- north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
- north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
- north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
- north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
- north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
- north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
- north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
- north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
- }
- conn.close();
- return north_glass_buffer1s;
- }
-
- public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameIdouts(String glassid,String orderid,String frameid) throws SQLException {
- Connection conn = getConn();
- north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
- String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
- ps = conn.prepareStatement(sql);
- ps.setString(1, glassid);
- ps.setString(2, orderid);
- ps.setString(3, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- north_glass_buffer1s.setId(rs.getInt("Id"));
- north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
- north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
- north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
- north_glass_buffer1s.setbarcode(rs.getString("barcode"));
- north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
- north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
- north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
- north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
- north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
- north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
- north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
- north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
- north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
- }
- conn.close();
- return north_glass_buffer1s;
- }
-
- public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameIdplchold(String glassid,String orderid,String frameid) throws SQLException {
- Connection conn = getConn();
- north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
- String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
- ps = conn.prepareStatement(sql);
- ps.setString(1, glassid);
- ps.setString(2, orderid);
- ps.setString(3, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- north_glass_buffer1s.setId(rs.getInt("Id"));
- north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
- north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
- north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
- north_glass_buffer1s.setbarcode(rs.getString("barcode"));
- north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
- north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
- north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
- north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
- north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
- north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
- north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
- north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
- north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
- }
- conn.close();
- return north_glass_buffer1s;
- }
-
- //鏍规嵁鐜荤拑id锛岃鍗昳d锛岄摑妗唅d鏌ヨ瀹㈡埛鐜荤拑淇℃伅
- public Queue SelectGlassByGlassIdOrderIdFrameIdQueue(String glassid,String orderid,String frameid) throws SQLException {
- Connection conn = getConn();
- Queue queue=new Queue();
- String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
- ps = conn.prepareStatement(sql);
- ps.setString(1, glassid);
- ps.setString(2, orderid);
- ps.setString(3, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- queue.setid(rs.getInt("Id"));
- queue.setorderId(rs.getString("ordernumber"));
- queue.setlistId(rs.getString("listnumber"));
- queue.setboxId(rs.getString("boxnumber"));
- queue.setglassId(rs.getString("barcode"));
- queue.setglasswidthmm(rs.getDouble("glasslength"));
- queue.setglassheightmm(rs.getDouble("glassheight"));
- queue.setglasswidth(rs.getDouble("glasslength_mm"));
- queue.setglassheight(rs.getDouble("glassheight_mm"));
- // queue.setitemtype(rs.getString("itemtype"));
- // queue.setslotnumber(rs.getString("slotnumber"));
- // queue.setdatemodified(rs.getString("datemodified"));
- // queue.setdatecreated(rs.getString("datecreated"));
- // queue.setFrameBarcode(rs.getString("FrameBarcode"));
- }
- conn.close();
- return queue;
- }
-
-
-
- //鏍规嵁鐜荤拑id锛岃鍗昳d锛岄摑妗唅d鏌ヨ瀹㈡埛鐜荤拑淇℃伅
- public List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIds(String glassid,String orderid,String frameid) throws SQLException {
- Connection conn = getConn();
- // north_glass_buffer1 glass=new north_glass_buffer1();
- List<north_glass_buffer1> glass=new ArrayList<north_glass_buffer1>();
- String sql = "select * from north_glass_buffer1 where position(? in barcode) and position(? in ordernumber) and position(? in FrameBarcode)";
- ps = conn.prepareStatement(sql);
- ps.setString(1, glassid);
- ps.setString(2, orderid);
- ps.setString(3, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
-
- north_glass_buffer1s.setId(rs.getInt("Id"));
- north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
- north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
- north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
- north_glass_buffer1s.setbarcode(rs.getString("barcode"));
- north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
- north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
- north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
- north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
- north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
- north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
- north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
- north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
- north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
-
-
- glass.add(north_glass_buffer1s);
-
- }
- conn.close();
- return glass;
- }
-
- //鏍规嵁閾濇id鏌ヨ瀹㈡埛鐜荤拑淇℃伅
- public List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIdss(String frameid) throws SQLException {
- Connection conn = getConn();
- // north_glass_buffer1 glass=new north_glass_buffer1();
- List<north_glass_buffer1> glass=new ArrayList<north_glass_buffer1>();
- String sql = "select * from north_glass_buffer1 where FrameBarcode=?";
- ps = conn.prepareStatement(sql);
- ps.setString(1, frameid);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
-
- north_glass_buffer1s.setId(rs.getInt("Id"));
- north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
- north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
- north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
- north_glass_buffer1s.setbarcode(rs.getString("barcode"));
- north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
- north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
- north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
- north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
- north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
- north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
- north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
- north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
- north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
-
-
- glass.add(north_glass_buffer1s);
-
- }
- conn.close();
- return glass;
- }
-
- //鏍规嵁閾濇id鏌ヨl閾濇鏄惁缈昏浆
- public String SelectFlipByFrameBarcode(String frameBarcode) throws SQLException {
- Connection conn = getConn();
- // north_glass_buffer1 glass=new north_glass_buffer1();
- String flip="";
- String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
- ps = conn.prepareStatement(sql1);
- ps.setString(1, frameBarcode);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- flip=rs.getString("Flip");
-
- }
- conn.close();
- return flip;
}
- //鏍规嵁閾濇id鏌ヨ鏄惁閾濇鎽嗘斁
+
+ public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameId(String glassid, String orderid, String frameid)
+ throws SQLException {
+
+ try {
+ Connection conn = getConn();
+ north_glass_buffer1 north_glass_buffer1s = new north_glass_buffer1();
+ String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ north_glass_buffer1s.setId(rs.getInt("Id"));
+ north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
+ north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
+ north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
+ north_glass_buffer1s.setbarcode(rs.getString("barcode"));
+ north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
+ north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
+ north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
+ north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
+ north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
+ north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
+ north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
+ north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
+ north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
+ }
+ conn.close();
+ return north_glass_buffer1s;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameIdout(String glassid, String orderid, String frameid)
+ throws SQLException {
+ try {
+ Connection conn = getConn();
+ north_glass_buffer1 north_glass_buffer1s = new north_glass_buffer1();
+ String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ north_glass_buffer1s.setId(rs.getInt("Id"));
+ north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
+ north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
+ north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
+ north_glass_buffer1s.setbarcode(rs.getString("barcode"));
+ north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
+ north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
+ north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
+ north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
+ north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
+ north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
+ north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
+ north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
+ north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
+ }
+ conn.close();
+ return north_glass_buffer1s;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameIdouts(String glassid, String orderid, String frameid)
+ throws SQLException {
+ try {
+ Connection conn = getConn();
+ north_glass_buffer1 north_glass_buffer1s = new north_glass_buffer1();
+ String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ north_glass_buffer1s.setId(rs.getInt("Id"));
+ north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
+ north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
+ north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
+ north_glass_buffer1s.setbarcode(rs.getString("barcode"));
+ north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
+ north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
+ north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
+ north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
+ north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
+ north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
+ north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
+ north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
+ north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
+ }
+ conn.close();
+ return north_glass_buffer1s;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameIdplchold(String glassid, String orderid, String frameid)
+ throws SQLException {
+ try {
+ Connection conn = getConn();
+ north_glass_buffer1 north_glass_buffer1s = new north_glass_buffer1();
+ String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ north_glass_buffer1s.setId(rs.getInt("Id"));
+ north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
+ north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
+ north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
+ north_glass_buffer1s.setbarcode(rs.getString("barcode"));
+ north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
+ north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
+ north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
+ north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
+ north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
+ north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
+ north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
+ north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
+ north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
+ }
+ conn.close();
+ return north_glass_buffer1s;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ // 鏍规嵁鐜荤拑id锛岃鍗昳d锛岄摑妗唅d鏌ヨ瀹㈡埛鐜荤拑淇℃伅
+ public Queue SelectGlassByGlassIdOrderIdFrameIdQueue(String glassid, String orderid, String frameid)
+ throws SQLException {
+ try {
+ Connection conn = getConn();
+ Queue queue = new Queue();
+ String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ queue.setid(rs.getInt("Id"));
+ queue.setorderId(rs.getString("ordernumber"));
+ queue.setlistId(rs.getString("listnumber"));
+ queue.setboxId(rs.getString("boxnumber"));
+ queue.setglassId(rs.getString("barcode"));
+ queue.setglasswidthmm(rs.getDouble("glasslength"));
+ queue.setglassheightmm(rs.getDouble("glassheight"));
+ queue.setglasswidth(rs.getDouble("glasslength_mm"));
+ queue.setglassheight(rs.getDouble("glassheight_mm"));
+ // queue.setitemtype(rs.getString("itemtype"));
+ // queue.setslotnumber(rs.getString("slotnumber"));
+ // queue.setdatemodified(rs.getString("datemodified"));
+ // queue.setdatecreated(rs.getString("datecreated"));
+ // queue.setFrameBarcode(rs.getString("FrameBarcode"));
+ }
+ conn.close();
+ return queue;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ // 鏍规嵁鐜荤拑id锛岃鍗昳d锛岄摑妗唅d鏌ヨ瀹㈡埛鐜荤拑淇℃伅
+ public List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIds(String glassid, String orderid, String frameid)
+ throws SQLException {
+ try {
+ Connection conn = getConn();
+ // north_glass_buffer1 glass=new north_glass_buffer1();
+ List<north_glass_buffer1> glass = new ArrayList<north_glass_buffer1>();
+ String sql = "select * from north_glass_buffer1 where position(? in barcode) and position(? in ordernumber) and position(? in FrameBarcode)";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ north_glass_buffer1 north_glass_buffer1s = new north_glass_buffer1();
+
+ north_glass_buffer1s.setId(rs.getInt("Id"));
+ north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
+ north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
+ north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
+ north_glass_buffer1s.setbarcode(rs.getString("barcode"));
+ north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
+ north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
+ north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
+ north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
+ north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
+ north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
+ north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
+ north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
+ north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
+
+ glass.add(north_glass_buffer1s);
+
+ }
+ conn.close();
+ return glass;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ // 鏍规嵁閾濇id鏌ヨ瀹㈡埛鐜荤拑淇℃伅
+ public List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIdss(String frameid) throws SQLException {
+ try {
+ Connection conn = getConn();
+ // north_glass_buffer1 glass=new north_glass_buffer1();
+ List<north_glass_buffer1> glass = new ArrayList<north_glass_buffer1>();
+ String sql = "select * from north_glass_buffer1 where FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, frameid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ north_glass_buffer1 north_glass_buffer1s = new north_glass_buffer1();
+
+ north_glass_buffer1s.setId(rs.getInt("Id"));
+ north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
+ north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
+ north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
+ north_glass_buffer1s.setbarcode(rs.getString("barcode"));
+ north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
+ north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
+ north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
+ north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
+ north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
+ north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
+ north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
+ north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
+ north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));
+
+ glass.add(north_glass_buffer1s);
+
+ }
+ conn.close();
+ return glass;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ // 鏍规嵁閾濇id鏌ヨl閾濇鏄惁缈昏浆
+ public String SelectFlipByFrameBarcode(String frameBarcode) throws SQLException {
+ try {
+ Connection conn = getConn();
+ // north_glass_buffer1 glass=new north_glass_buffer1();
+ String flip = "";
+ String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
+ ps = conn.prepareStatement(sql1);
+ ps.setString(1, frameBarcode);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ flip = rs.getString("Flip");
+
+ }
+ conn.close();
+ return flip;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ // 鏍规嵁閾濇id鏌ヨ鏄惁閾濇鎽嗘斁
public String SelectPositionByFrameBarcode(String frameBarcode) throws SQLException {
- Connection conn = getConn();
- // north_glass_buffer1 glass=new north_glass_buffer1();
- String position="";
- String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
- ps = conn.prepareStatement(sql1);
- ps.setString(1, frameBarcode);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- position=rs.getString("flip");
- }
- conn.close();
- return position;
- }
+ try {
+ Connection conn = getConn();
+ // north_glass_buffer1 glass=new north_glass_buffer1();
+ String position = "";
+ String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
+ ps = conn.prepareStatement(sql1);
+ ps.setString(1, frameBarcode);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ position = rs.getString("flip");
+ }
+ conn.close();
+ return position;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
- //鏍规嵁閾濇id鏌ヨ閾濇瀹�
+ }
+
+ // 鏍规嵁閾濇id鏌ヨ閾濇瀹�
public String SelectFrameLengthByFrameBarcode(String frameBarcode) throws SQLException {
- Connection conn = getConn();
- // north_glass_buffer1 glass=new north_glass_buffer1();
- String position="";
- String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
- ps = conn.prepareStatement(sql1);
- ps.setString(1, frameBarcode);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- position=rs.getString("framelength");
- }
- conn.close();
- return position;
- }
+ try {
+ Connection conn = getConn();
+ // north_glass_buffer1 glass=new north_glass_buffer1();
+ String position = "";
+ String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
+ ps = conn.prepareStatement(sql1);
+ ps.setString(1, frameBarcode);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ position = rs.getString("framelength");
+ }
+ conn.close();
+ return position;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
- //鏍规嵁閾濇id鏌ヨ閾濇楂�
+ }
+
+ // 鏍规嵁閾濇id鏌ヨ閾濇楂�
public String SelectFrameHeightByFrameBarcode(String frameBarcode) throws SQLException {
- Connection conn = getConn();
- // north_glass_buffer1 glass=new north_glass_buffer1();
- String position="";
- String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
- ps = conn.prepareStatement(sql1);
- ps.setString(1, frameBarcode);
- ResultSet rs= ps.executeQuery();
- while (rs.next()) {
- position=rs.getString("frameheight");
- }
- conn.close();
- return position;
- }
-
+ try {
+ Connection conn = getConn();
+ // north_glass_buffer1 glass=new north_glass_buffer1();
+ String position = "";
+ String sql1 = "select * from north_glass_buffer1_frames where Barcode=? limit 1";
+ ps = conn.prepareStatement(sql1);
+ ps.setString(1, frameBarcode);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ position = rs.getString("frameheight");
+ }
+ conn.close();
+ return position;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
/**
* 1. 鍔犺浇椹卞姩
- * 2. 鑾峰彇杩炴帴 conn
+ * 2. 鑾峰彇杩炴帴 conn
* 3. 鍒涘缓璇彞 ps
* 4. 鎵ц璇彞 rs
* 5. 澶勭悊缁撴灉
* 6. 鍥炴敹璧勬簮
*
* 瀹炵幇CRUD
- * 鏇存柊锛�
- * 1澧炲姞
- * 2鍒犻櫎
- * 3淇敼
- * 鏌ヨ锛�
- * 1. 鏌ヤ竴涓紝涓�涓璞�
- * 2. 鏌ヤ竴缁勶紝鍋氭垚涓�涓璞″垪琛紝鏌ュ叏閮�
+ * 鏇存柊锛�
+ * 1澧炲姞
+ * 2鍒犻櫎
+ * 3淇敼
+ * 鏌ヨ锛�
+ * 1. 鏌ヤ竴涓紝涓�涓璞�
+ * 2. 鏌ヤ竴缁勶紝鍋氭垚涓�涓璞″垪琛紝鏌ュ叏閮�
*/
public static Connection getConn() throws SQLException {
- Connection conn = null;
- // conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
- conn = DriverManager.getConnection("jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false", "northglass", "n0rthgla55");
- return conn;
+ try {
+ Connection conn = null;
+ // conn =
+ // DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8",
+ // "root", "beibo.123/");
+ conn = DriverManager.getConnection(
+ "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
+ "northglass", "n0rthgla55");
+ return conn;
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return null;
+ }
+
}
static {
@@ -356,9 +456,5 @@
e.printStackTrace();
}
}
-
-
-
-
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 3edac09..0c05948 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -413,7 +413,7 @@
spianMapper.UpdateCageOver(glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
spianMapper.UpdateCageadd(glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
String barcode = spianMapper.SelectBarcode(glassid.toString());// 鑾峰彇璇ョ幓鐠冪殑閾濇id
- spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
+ //spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
}
--
Gitblit v1.8.0