From 9057d8571f11a552a326fa35fda9b5ec614f5c58 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 09:33:09 +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 | 240 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 132 insertions(+), 108 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 fda114a..30061c1 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
@@ -1,9 +1,11 @@
package com.example.springboot.component;
+import java.time.LocalDateTime;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
+import com.example.springboot.service.SpianServiceNew;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -16,6 +18,7 @@
private JdbcConnections jdbcConnections;
private SpianMapper spianMapper;
private SpianService spianService;
+ private SpianServiceNew spianServiceNew;
int aaa;
@Override
@@ -29,141 +32,162 @@
// \\ TODO Auto-generated catch block
e.printStackTrace();
}
+
// if (S7control.getinstance().CheckConnected() == false) {
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
- // try {
- // north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
- // // System.out.println(glass.getOrderId());
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
- // spianService.selectAll("X21942610402GV");
- // 鍑虹墖浠诲姟////////////////////////////////
- List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
- List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
- // StringBuilder writedstrIdOut = new StringBuilder();
- // 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
- String writedstrIdOut = new String(writedglassidbytesOut);
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ spianServiceNew = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
+ // try {
+ // north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
+ // // System.out.println(glass.getOrderId());
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
- boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
- boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
- if (outlist != null && outlist1 != null) {
+ // 鍑虹墖浠诲姟////////////////////////////////
+ spianServiceNew.selectout2("X21942613103GV");
- outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂� 褰撳嚭鐗囪溅绌洪棽鏃朵负true
- outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔� 褰撳嚭鐗囪溅浠诲姟鍚姩鏃朵负true
+ List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
+ List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
- // 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
- int outnum = spianMapper.SelectOutSliceshu();
- int cageoutsum = spianMapper.Selectcageout(3);
- // 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
- if (outnum == 0 && outstate == true && Plchome.isAllowQueue == true && cageoutsum == 0) {
- // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
- String outglassid = spianMapper.SelectOutSlice();
- // 褰撴湁寰呭嚭鐗囩殑鐜荤拑鏃�
- if (outglassid != null) {
- // 鑾峰彇璇ョ幓鐠冩槸鍚﹁绂佺敤
- int glassdisabled = spianMapper.SelectCageGlassState(outglassid);
- //鏈鐢ㄤ笅鍙戜换鍔�
- if (glassdisabled == 0) {
- spianService.selectout2(outglassid);
- Plchome.isQueueWarning = false;
- outstate = false;
- } else { //绂佺敤鏇存敼鐘舵�佸脊鍑烘彁绀�
- Plchome.isQueueWarning = true;
- }
+ boolean Plcout = spianService.listbool("DB106.64"); // 鍑虹墖璇锋眰瀛�
+ boolean Plcout2 = spianService.listbool("DB105.18"); // 鍑虹墖鍚姩
+ if (Plcout == false&&Plcout2==true) {
+ S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
+ System.out.println("鍏抽棴鍑虹墖鍚姩" + LocalDateTime.now());// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负0
+ }
+ boolean Plcadd = spianService.listbool("DB106.24"); // 杩涚墖璇锋眰瀛�
+ boolean Plcadd2 = spianService.listbool("DB105.16"); // 杩涚墖鍚姩
+ if (Plcadd == false&&Plcadd2==true) {
+ S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
+ System.out.println("鍏抽棴杩涚墖鍚姩" + LocalDateTime.now());// 杩涚墖浠诲姟鍙戦�佸瓧鏀逛负0
+ }
+
+
+ // StringBuilder writedstrIdOut = new StringBuilder();
+ // 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
+ String writedstrIdOut = new String(writedglassidbytesOut);
+
+
+ if (Plcout == true) {
+ // 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
+ int outnum = spianMapper.SelectOutSliceshu();//鏄惁鏈夋鍦ㄥ嚭鐗囩殑浠诲姟
+ int cageoutsum = spianMapper.Selectcageout(3);//绗煎瓙鍐呮槸鍚﹁繕鏈夊湪鍑虹墖鐨勭幓鐠�
+ // 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
+ if (outnum == 0 && Plchome.isAllowQueue == true && cageoutsum == 0) {
+ // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
+ String outglassid = spianMapper.SelectOutSlice();
+ // 褰撴湁寰呭嚭鐗囩殑鐜荤拑鏃�
+ if (outglassid != null) {
+ // 鑾峰彇璇ョ幓鐠冩槸鍚﹁绂佺敤
+ int glassdisabled = spianMapper.SelectCageGlassState(outglassid);
+ // 鏈鐢ㄤ笅鍙戜换鍔�
+ if (glassdisabled == 0) {
+ spianService.selectout2(outglassid);
+ Plchome.isQueueWarning = false;
+ } else { // 绂佺敤鏇存敼鐘舵�佸脊鍑烘彁绀�
+ Plchome.isQueueWarning = true;
}
- }
- if (outstate == true) {// 褰撳嚭鐗囪溅绌洪棽鏃�,涓斿嚭鐗囧惎鍔ㄤ负1鏃讹紝浠诲姟鍚姩鏀逛负0
- if (outstate1 == true) {
- S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
- }
+
}
}
+
+ }
- ///////////// 杩涚墖浠诲姟
- List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
+ ///////////// 杩涚墖浠诲姟
+ List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+ List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
- boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
+ boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
+ boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
+ StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
+ StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
- boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
- StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
- StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
-
- // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
- if (B01backs == true) {
+ // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if (B01backs == true) {
+ // 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
+ int HB = spianMapper.SelectHB(B01glassid.toString());
+ if (HB > 0) {
// 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1
- spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
- S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
- boolean yingda = spianService.listbool("DB106.60");// b01姹囨姤
+ S7control.getinstance().WriteWord("DB105.48", (short) 1);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+ boolean yingda = spianService.listbool("DB105.48");// b01姹囨姤
+ if (yingda == true) {
+ spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
+ }
System.out.println("姹囨姤鏃禕01|绗�" + aaa + "娆�" + B01glassid + "搴旂瓟" + yingda);
aaa += 1;
}
- // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
- if (B02backs == true) {
+ }else{
+ S7control.getinstance().WriteWord("DB105.48", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+ }
+
+ // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if (B02backs == true) {
+ // 鍒ゆ柇鏄惁姹囨姤姝ｇ‘鐨刬d
+ int HB = spianMapper.SelectHB(B02glassid.toString());
+ System.out.println("姹囨姤鏃禕02|" + B02glassid);
+ if (HB > 0) {
// 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
- spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟
- S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
- System.out.println("姹囨姤鏃禕02|" + B02glassid);
- boolean yingda = spianService.listbool("DB106.62");// b02姹囨姤
+
+ S7control.getinstance().WriteWord("DB105.50", (short) 1);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
+ System.out.println("姹囨姤鏃禕02ID|" + B02glassid);
+ boolean yingda = spianService.listbool("DB105.50");// b02姹囨姤
+ if (yingda == true) {
+ spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟
+ }
System.out.println("姹囨姤鏃禕02|绗�" + aaa + "娆�" + B02glassid + "搴旂瓟" + yingda);
}
+ }else{
+ S7control.getinstance().WriteWord("DB105.50", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
+ }
- // 鑾峰彇DO1鏁版嵁
- StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
- // 鑾峰彇DO2鏁版嵁
- StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
- int questate = spianMapper.Selectquecount(queueid1.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
- // queueid1.toString().isEmpty()
- north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01鐨勭幓鐠冧俊鎭�
- north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
- // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
- if (queueid1 != null && questate == 0) {
- // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
- if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
- spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
- } else {
+ // 鑾峰彇DO1鏁版嵁
+ StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
+ // 鑾峰彇DO2鏁版嵁
+ StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
- spianMapper.Updatequeue(queueid1.toString(), glass1.getordernumber(), glass1.getlistnumber(),
- glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
- glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
- }
+ int questate = spianMapper.Selectquecount(queueid1.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
+ // queueid1.toString().isEmpty()
+ north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01鐨勭幓鐠冧俊鎭�
+ north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
+ // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
+ if (queueid1 != null && questate == 0) {
+ // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
+ spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
+ } else {
- }
- if (queueid2 != null) {
- // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
- if (glass2 == null) {
- spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
- } else {
- spianMapper.Updatequeue(queueid2.toString(), glass2.getordernumber(), glass2.getlistnumber(),
- glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
- glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
- spianMapper.overqueue2(queueid2.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
- S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
- }
-
+ spianMapper.Updatequeue(queueid1.toString(), glass1.getordernumber(), glass1.getlistnumber(),
+ glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
+ glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
}
- // if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
- // Integer state = spianMapper.Selectoutstate();
- // String orderid = spianMapper.SelectOrderout();
+ }
- // if (orderid != null && state == 0) {
- // spianService.selectout(orderid);
- // }
- // }
+ if (queueid2 != null) {
+ // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ if (glass2 == null) {
+ spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
+ } else {
+ spianMapper.Updatequeue(queueid2.toString(), glass2.getordernumber(), glass2.getlistnumber(),
+ glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
+ glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
+ spianMapper.overqueue2(queueid2.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
+ S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
+ }
- // 鏌ヨ鏁版嵁搴�
- // 鎺ㄩ�佸埌鍓嶇
+ }
+
+ // 鏌ヨ鏁版嵁搴�
+ // 鎺ㄩ�佸埌鍓嶇
// }
}
--
Gitblit v1.8.0