From af5edce322ff326356a32011e140182846c5dbed Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 28 十一月 2023 08:02:15 +0800
Subject: [PATCH] 测试后调整理片逻辑
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 85 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 38 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 ec56e0c..eca4e84 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
@@ -2,6 +2,7 @@
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.List;
import org.apache.ibatis.javassist.compiler.ast.Symbol;
@@ -39,12 +40,12 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- String str = "Hello";
- char[] charArray = new char[str.length()];
- for (int i = 0; i < str.length(); i++) {
- charArray[i] = str.charAt(i);
- }
- System.out.println(charArray);
+ // String str = "Hello";
+ // char[] charArray = new char[str.length()];
+ // for (int i = 0; i < str.length(); i++) {
+ // charArray[i] = str.charAt(i);
+ // }
+ // System.out.println(charArray);
// spianService.selectout("1145");
// spianService.selectAll("11");
// spianService.selectAll2();
@@ -95,7 +96,8 @@
// 褰撹繘鐗囪溅绌洪棽鏃�
if (exist1 == true) {
// 鑾峰彇宸蹭笅鍙戠殑杩涚墖id 涓巔lc璇锋眰鐨刬d浣滄瘮杈�
- byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 13);
+ byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 14);
+ String teststr1=new String(writedglassidbytes);
if (writedglassidbytes != null) { //
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytes) {
@@ -103,21 +105,23 @@
}
}
// 鑾峰彇杩涚墖id
- byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 13);
- if (datas1ListID != null) {
+ byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 14);
+ String teststr=new String(datas1ListID);
+ if (teststr != null) {
// 鑾峰彇鐜荤拑id
- for (byte list1 : datas1ListID) {
- strId.append(list1);
-
- }
- if (!writedstrId.toString().equals(strId.toString())) // 宸茬粡涓嬪彂鐨刬d涓巔lc璇锋眰鐨刬d涓嶄竴鏍锋椂锛岃涓轰笉鏄噸澶嶇殑浠诲姟锛屾墠鎵ц涓嬪彂浠诲姟鎸囦护
+
+ if (teststr1.equals(teststr)) // 宸茬粡涓嬪彂鐨刬d涓巔lc璇锋眰鐨刬d涓嶄竴鏍锋椂锛岃涓轰笉鏄噸澶嶇殑浠诲姟锛屾墠鎵ц涓嬪彂浠诲姟鎸囦护
{
+ north_glass_buffer1 glass1 = spianMapper.selectGlass(teststr.toString());
+ int questate = spianMapper.Selectqueuestate();
+
+ if (questate == 0) {
+
+ spianMapper.insertqueue(teststr, 1,glass1.getglasslengthmm());
+ //spianService.selectAll(teststr);
- int glasslimit = 1;// 鍒ゆ柇鏄惁鏄鐗囦笂鐗�
- if (glasslimit == 1) {
- spianService.selectAll(strId.toString());
} else {
- spianService.selectAll(strId.toString());
+ //spianService.selectAll(teststr);
}
S7control.getinstance().WriteByte("DB105.16", datas1ListID);// 娲惧彂杩涚墖id
@@ -136,29 +140,34 @@
}
}
+ // 鑾峰彇DO1鏁版嵁
+ StringBuilder queueid1 = spianService.queGlassid("DB106.DBB26");
+
+ // 鑾峰彇DO2鏁版嵁
+ StringBuilder queueid2 = spianService.queGlassid("DB103.DBB46");
+ int questate = spianMapper.Selectqueuestate();
+ //queueid1.toString().isEmpty()
+ if (queueid1!=null&& questate == 0) {
+ // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());
+ spianMapper.insertqueue(queueid1.toString(), 1, glass1.getglasslengthmm());
+ }
+ if (queueid2.toString().isEmpty()) {
+ // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());
+ spianMapper.insertqueue(queueid2.toString(), 2, glass2.getglasslengthmm());
+ }
+
+
+
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.14", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
- StringBuilder writedstrIdOut = new StringBuilder();
+ //StringBuilder writedstrIdOut = new StringBuilder();
// 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 13);
- if (writedglassidbytesOut != null) {
- // 鑾峰彇鐜荤拑id
- for (byte iditem : writedglassidbytesOut) {
- writedstrIdOut.append((char) iditem);
- }
- }
- // 鑾峰彇BO1鏁版嵁
- StringBuilder queueid1 = spianService.queGlassid("DB103.DBB32");
- // 鑾峰彇BO2鏁版嵁
- StringBuilder queueid2 = spianService.queGlassid("DB103.DBB46");
- if (queueid1 != null) {
- // 鍐欏叆B01鐨勬暟鎹埌涓婄墖闃熷垪琛�
- spianMapper.insertqueue(queueid1.toString(), 1, 0);
- }
- if (queueid2 != null) {
- // 鍐欏叆B02鐨勬暟鎹埌涓婄墖闃熷垪琛�
- spianMapper.insertqueue(queueid2.toString(), 2, 0);
- }
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
+ String writedstrIdOut=new String(writedglassidbytesOut);
+
+
// 鍑虹墖浠诲姟////////////////////////////////
boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
--
Gitblit v1.8.0