From 3c74551a7f5d9f2ead6cc4a22fe8a7ec4696d8f5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 08:16:35 +0800
Subject: [PATCH] 完善主界面功能，添加手动任务到出片队列
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 191 +++++++++++++++++++++++++++++++++--------------
1 files changed, 133 insertions(+), 58 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 c410d62..a38d1f2 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,13 +2,16 @@
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Base64;
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;
import com.example.springboot.service.SpianService;
import com.example.springboot.entity.Glass;
+import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -23,11 +26,12 @@
@Override
public void run() {
-
+ boolean inglassbegin = false;
+ boolean outglassbegin = false;
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
// \\ TODO Auto-generated catch block
e.printStackTrace();
@@ -38,72 +42,143 @@
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
- // Glass glass = jdbcConnections.selectGlass(112);
-
- // // System.out.println(glass.getOrderId());
+ // north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
+ // // System.out.println(glass.getOrderId());
// } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
// }
- spianService.selectAll((short)257);
- //鍒ゆ柇杩涚墖璇锋眰
- List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);
-
-
- if (datas1List != null && datas1ListState != null) {
- // 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
- boolean exist = datas1List.contains((short) 1);
- // 鑾峰彇杩涚墖杞︾姸鎬�
- boolean exist1 = datas1ListState.contains((short) 0);
- String glassid="";
- // 杩涚墖璇锋眰涓�1鏃�
- if (exist == true) {
- // 褰撹繘鐗囪溅绌洪棽鏃�
- if (exist1 == true) {
- // 鑾峰彇杩涚墖id
- List<Short> datas1ListID = S7control.getinstance().ReadWord("DB106.26", 1);
- if (datas1ListID != null) {
- // 鑾峰彇鐜荤拑id
- for (Short list1 : datas1ListID) {
- glassid=glassid.concat(list1.toString());
-
- }
- spianService.selectAll(Short.parseShort(glassid));
- }
- }
- // System.out.println(exist);
- }
+ // 鍒ゆ柇杩涚墖璇锋眰
+ 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 B02backs = spianService.listbool("DB106.62");// b02姹囨姤
+ StringBuilder B01glassid=spianService.queGlassid("DB106.DBB26");//BO1鐨勭幓鐠僫d
+ StringBuilder B02glassid=spianService.queGlassid("DB106.DBB26");//B02鐨勭幓鐠僫d
+ //褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if(B01backs==true){
+ //褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负1
+ spianMapper.UpdateCageOver(B01glassid.toString(),1);//鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
+ spianMapper.Updatetask(1,0);//鏇存敼杩涚墖浠诲姟鐘舵�佷负1
+ spianMapper.overqueue(B01glassid.toString(),0);//鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+ S7control.getinstance().WriteWord("DB105.48", (short) 1);//搴旂瓟B01灏忚溅鏀跺埌
+ S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
+ }else{
+ S7control.getinstance().WriteWord("DB105.48", (short) 0);//鎭㈠B01灏忚溅搴旂瓟
+ }
+ //褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if(B02backs==true){
+ //褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
+ spianMapper.UpdateCageOver(B02glassid.toString(),0);//鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
+ spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
+ S7control.getinstance().WriteWord("DB105.50", (short) 1);//搴旂瓟B02灏忚溅鏀跺埌
+ }else{
+ S7control.getinstance().WriteWord("DB105.50", (short) 0);//鎭㈠B02灏忚溅搴旂瓟
+ }
+
+
+
+ // 鑾峰彇DO1鏁版嵁
+ StringBuilder queueid1 = spianService.queGlassid("DB106.DBB26");
+ // 鑾峰彇DO2鏁版嵁
+ StringBuilder queueid2 = spianService.queGlassid("DB103.DBB78");
+ System.out.println("D01"+queueid1);
+ System.out.println("D02"+queueid2);
+ int questate = spianMapper.Selectqueuestate();//鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
+ // queueid1.toString().isEmpty()
+ north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());//D01鐨勭幓鐠冧俊鎭�
+ north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());//D02鐜荤拑淇℃伅
+ double quewitdh=0;
+ double quewitdh2=0;
+ //褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
+ if(glass1==null){
+ quewitdh=0;
+ queueid1=new StringBuilder("");
+ }else{
+ quewitdh=glass1.getglasslengthmm();
+ }
+ if(glass2==null){
+ quewitdh2=0;
+ queueid2=new StringBuilder("");
+ }else{
+ quewitdh2=glass2.getglasslengthmm();
}
- //spianService.selectAll((short) 111);
-
+
+ if (queueid1!=null&& questate == 0) {
+ // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ spianMapper.insertqueue(queueid1.toString(), 1, quewitdh);
+ }
+ if (queueid2!=null) {
+ // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ spianMapper.insertqueue(queueid2.toString(), 2, quewitdh2);
+ spianMapper.overqueue2(queueid2.toString(),0,1);//鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+ }
+
+ // 鍑虹墖浠诲姟////////////////////////////////
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
- boolean outstate=false;//鍑虹墖杞︾┖闂插垽鏂�
- if (outlist != null) {
- // 鍒ゆ柇鎸夎鍗曞嚭鐗�
- outstate = outlist.contains((short) 0);
- Glass glass=spianMapper.SelectDBOut();//鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
+ 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);
- if(outstate== true ){
- if(glass.getId()==2){
- spianService.selectout2(glass.getGlassId().toString());
- }
+
+ boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
+ boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
+ if (outlist != null && outlist1 != null) {
+ // 鍒ゆ柇鎸夎鍗曞嚭鐗�
+ outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂�
+ outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
+
+ north_glass_buffer1 glass = spianMapper.SelectDBOut();// 鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
+
+ if (!outglassbegin & !outstate)// 褰撲换鍔¤繕鏈紑濮嬶紝涓斿嚭鐗囪溅涓嶇┖闂叉椂,浠诲姟鐘舵�佹敼涓哄紑濮�
+ {
+ outglassbegin = true;
+ }
+ if (outglassbegin & outstate)// 褰撲换鍔″紑濮嬩笖鍑虹墖杞︾┖闂叉椂
+ {
+ outglassbegin = false;
+ }
+
+ if (outstate == true & glass.getbarcode() != null) { // 褰撳嚭鐗囪溅绌洪棽涓旀湁鍑虹墖浠诲姟寰呭畬鎴愭椂
+ // 鍒ゆ柇鏈変袱涓嚭鐗囨垨璋冩嫧浠诲姟鏃跺苟涓斿嚭鐗噄d鍜屾湭瀹屾垚鐨勫嚭鐗囦换鍔d涓嶄竴鏍锋椂鎵ц鍑虹墖
+ if (!writedstrIdOut.toString().equals(glass.getbarcode().toString())) {
+ spianService.selectout2(glass.getbarcode().toString());
+ outstate=false;
+ }
+ }
+ // 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
+ int outnum = spianMapper.SelectOutSliceshu();
+ //褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
+ if (outnum == 0&&outstate == true ) {
+ // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
+ String outglassid = spianMapper.SelectOutSlice();
+ if (outglassid != null) {
+ spianService.selectout2(outglassid);
+ outstate=false;
+ }
+ }
+ if (outstate == true) {// 涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0//鍑虹墖杞︾┖闂插垽鏂�
+ if (outstate1 == true) {
+ S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
+ }
}
}
-
-
-
-
- if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
- String orderid = spianMapper.SelectOrderout();
- if (orderid != null) {
- spianService.selectout(orderid);
- }
- }
-
+ // if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
+ // Integer state = spianMapper.Selectoutstate();
+ // String orderid = spianMapper.SelectOrderout();
+
+ // if (orderid != null && state == 0) {
+ // spianService.selectout(orderid);
+ // }
+ // }
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0