From a8d31b3d7b6e0d60b8045ace9be49cdfb590696f Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期四, 09 十一月 2023 15:46:37 +0800
Subject: [PATCH] 拉取后对应翻译没了，部分代码报错，修改后提交
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 94 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 81 insertions(+), 13 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 1637ab3..b5023ae 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
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.ibatis.javassist.compiler.ast.Symbol;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.service.JdbcConnections;
@@ -23,7 +24,8 @@
@Override
public void run() {
-
+ boolean inglassbegin=false;
+ boolean outglassbegin=false;
while (this != null) {
try {
@@ -36,8 +38,15 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ spianService.selectout("1145");
+ //spianService.selectAll2();
+ //澧炲姞闃熷垪琛ㄦ暟鎹�
+ //spianMapper.insertqueue("1",1,1500);
+
+
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
+
// Glass glass = jdbcConnections.selectGlass(112);
// // System.out.println(glass.getOrderId());
@@ -45,14 +54,22 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
- // spianService.selectAll((short)257);
+
//鍒ゆ柇杩涚墖璇锋眰
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.12", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
-
+ //娴嬭瘯鍚姩鑷畾涔塸rc鍊�
+ // List<Short> datas1List=new ArrayList<>();
+ // datas1List.add((short)1);
+ // List<Short> datas1ListState=new ArrayList<>();
+ // datas1List.add((short)0);
+ // List<Short> datas1ListState2=new ArrayList<>();
+ // datas1List.add((short)0);
+
+
if (datas1List != null && datas1ListState != null) {
+
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
boolean exist = datas1List.contains((short) 1);
// 鑾峰彇杩涚墖杞︾姸鎬�
@@ -62,11 +79,30 @@
String glassid="";
StringBuilder strId=new StringBuilder();
-
+ StringBuilder writedstrId=new StringBuilder();
+
+ if(!inglassbegin&!exist1)//褰撹繘鐗囪溅涓嶇┖闂叉椂
+ {
+ inglassbegin=true;
+ }
+ if(inglassbegin&exist1)//褰撹繘鐗囪溅绌洪棽鏃�
+ {
+ inglassbegin=false;
+ spianMapper.Updatetask(1, 0);//绔嬪嵆缁撴潫鏁版嵁搴撹〃涓殑涓婄墖浠诲姟
+ spianMapper.UpdataAddCageState(1,2);
+ }
// 杩涚墖璇锋眰涓�1鏃�
if (exist == true) {
// 褰撹繘鐗囪溅绌洪棽鏃�
if (exist1 == true) {
+ //鑾峰彇宸蹭笅鍙戠殑杩涚墖id 涓巔lc璇锋眰鐨刬d浣滄瘮杈�
+ byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 1);
+ if (writedglassidbytes != null) { //
+ // 鑾峰彇鐜荤拑id
+ for (byte iditem : writedglassidbytes) {
+ writedstrId.append(iditem);
+ }
+ }
// 鑾峰彇杩涚墖id
byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 1);
if (datas1ListID != null) {
@@ -75,17 +111,27 @@
strId.append(list1);
}
- spianService.selectAll(strId.toString());
+ if(!writedstrId.toString().equals(strId.toString())) //宸茬粡涓嬪彂鐨刬d涓巔lc璇锋眰鐨刬d涓嶄竴鏍锋椂锛岃涓轰笉鏄噸澶嶇殑浠诲姟锛屾墠鎵ц涓嬪彂浠诲姟鎸囦护
+ {
+
+ int glasslimit=1;//鍒ゆ柇鏄惁鏄鐗囦笂鐗�
+ if(glasslimit==1){
+ spianService.selectAll(strId.toString());
+ }else{
+ spianService.selectAll(strId.toString());
+ }
+ S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
+
+ }
//spianService.selectAll(Short.parseShort(strId.toString()));
- S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
}
}
// System.out.println(exist);
}
-
- if(exist1==false){//涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0
- if(exist2==true) {
+//涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0
+ if(exist1==false){ //杩涚墖杞﹀繖纰屾椂
+ if(exist2==true) { //浠诲姟宸插惎鍔ㄦ椂
S7control.getinstance().WriteWord("DB105.12",(short)0);//杩涚墖浠诲姟鍚姩鏀逛负0
}
}
@@ -95,6 +141,15 @@
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.14", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
+ StringBuilder writedstrIdOut=new StringBuilder();
+ //鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 1);
+ if (writedglassidbytesOut != null) {
+ // 鑾峰彇鐜荤拑id
+ for (byte iditem : writedglassidbytesOut) {
+ writedstrIdOut.append(iditem);
+ }
+ }
boolean outstate=false;//鍑虹墖杞︾┖闂插垽鏂�
boolean outstate1=false;//鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
if (outlist != null&&outlist1!=null) {
@@ -104,8 +159,19 @@
Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
- if(outstate== true ){
- if(glass.getId()==2){
+ if(!outglassbegin&!outstate)//褰撲换鍔¤繕鏈紑濮嬶紝涓斿嚭鐗囪溅涓嶇┖闂叉椂,浠诲姟鐘舵�佹敼涓哄紑濮�
+ {
+ outglassbegin=true;
+ }
+ if(outglassbegin&outstate)//褰撲换鍔″紑濮嬩笖鍑虹墖杞︾┖闂叉椂
+ {
+ outglassbegin=false;
+ spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
+ spianMapper.UpdataAddCageState(0,3);
+ }
+
+ if(outstate== true &glass.getGlassId()!=null){ //褰撳嚭鐗囪溅绌洪棽涓旀湁鍑虹墖浠诲姟寰呭畬鎴愭椂
+ if(glass.getId()==2&!writedstrIdOut.toString().equals(glass.getGlassId().toString())){
spianService.selectout2(glass.getGlassId().toString());
}
}
@@ -120,8 +186,10 @@
if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
+ Integer state=spianMapper.Selectoutstate();
String orderid = spianMapper.SelectOrderout();
- if (orderid != null) {
+
+ if (orderid != null &&state==0) {
spianService.selectout(orderid);
}
}
--
Gitblit v1.8.0