From cb8959244281f922d3a972472853d0bb1df1e5b8 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 20 十二月 2023 13:35:56 +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 | 93 +++++++++++----------------------------------- 1 files changed, 23 insertions(+), 70 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 89da29c..448b959 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,16 +1,9 @@ package com.example.springboot.component; -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,92 +16,70 @@ private JdbcConnections jdbcConnections; private SpianMapper spianMapper; private SpianService spianService; - + int aaa; @Override public void run() { - boolean inglassbegin = false; - boolean outglassbegin = false; + while (this != null) { try { - Thread.sleep(1000); + Thread.sleep(100); } catch (InterruptedException e) { // \\ TODO Auto-generated catch block e.printStackTrace(); } - spianService = WebSocketServer.applicationContext.getBean(SpianService.class); + spianService = WebSocketServer.applicationContext.getBean(SpianService.class); spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class); jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class); -// List<String> adddresslist = new ArrayList<>(); -// adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃� -// adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃� -// adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹� -// adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁� -// adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔� -// List<Short> datas = new ArrayList<>(); -// datas.add((short) 1000);//璧峰浣嶇疆 -// datas.add((short) 5);//鐩爣浣嶇疆 -// datas.add((short) 610);//杩涚墖鐜荤拑瀹� -// datas.add((short) 1); //鐜荤拑鏁� -// spianService.outmesid("123321","DB105.20"); -// datas.add((short) 1);//浠诲姟鍚姩 -// S7control.getinstance().WriteWord(adddresslist, datas); // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧� // try { // north_glass_buffer1 glass = jdbcConnections.selectGlass(112); // // System.out.println(glass.getOrderId()); // } catch (SQLException e) { // // TODO Auto-generated catch block - // e.printStackTrace(); + // e.printStackTrace(); // } - //spianService.selectout2("250"); + 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("DB103.184", 14);// BO1鐨勭幓鐠僫d StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d + // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂 if (B01backs == true) { - // 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1 - spianMapper.UpdateCageOver(B01glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬� - spianMapper.Updatetask(1, 0);// 鏇存敼杩涚墖浠诲姟鐘舵�佷负1 - spianMapper.UpdatetaskOut(B01glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔� - spianMapper.OverOutSlice(B01glassid.toString(), 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟 - spianMapper.UpdataGlassCage(B01glassid.toString(),0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅 + // 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1 + spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟 S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0 - System.out.println("姹囨姤鏃禕01|" + B01glassid); - - // S7control.getinstance().WriteWord("DB105.48", (short) 1);//姹囨姤B01灏忚溅鏀跺埌 + boolean yingda = spianService.listbool("DB106.60");// b01姹囨姤 + System.out.println("姹囨姤鏃禕01|绗�"+aaa+"娆�"+ B01glassid+"搴旂瓟"+yingda); + aaa+=1; } // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂 if (B02backs == true) { // 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0 - spianMapper.UpdateCageOver(B02glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬� - spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔� - spianMapper.OverOutSlice(B02glassid.toString(), 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟 - spianMapper.UpdataGlassCage(B01glassid.toString(),0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅 + spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟 S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0 - // S7control.getinstance().WriteWord("DB105.50", (short) 1);//姹囨姤B02灏忚溅鏀跺埌 System.out.println("姹囨姤鏃禕02|" + B02glassid); + boolean yingda = spianService.listbool("DB106.62");// b01姹囨姤 + System.out.println("姹囨姤鏃禕01|绗�"+aaa+"娆�"+ B02glassid+"搴旂瓟"+yingda); } // 鑾峰彇DO1鏁版嵁 StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓� // 鑾峰彇DO2鏁版嵁 StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14); -// System.out.println("D01|" + queueid1); -// System.out.println("D02|" + queueid2); 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) { // 褰撴病鏈夊�兼椂浼犵┖ @@ -116,8 +87,8 @@ } else { spianMapper.Updatequeue(queueid1.toString(), glass1.getordernumber(), glass1.getlistnumber(), - glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(), - glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1); + glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(), + glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1); } } @@ -127,8 +98,8 @@ 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); + 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);// 鍏抽棴浠诲姟鍚姩 } @@ -146,36 +117,18 @@ boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂� boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔� if (outlist != null && outlist1 != null) { - // 鍒ゆ柇鎸夎鍗曞嚭鐗� + outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂� 褰撳嚭鐗囪溅绌洪棽鏃朵负true outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔� 褰撳嚭鐗囪溅浠诲姟鍚姩鏃朵负true - 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) { + if (outnum == 0 && outstate == true && Plchome.isAllowQueue == true) { // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑 String outglassid = spianMapper.SelectOutSlice(); if (outglassid != null) { - + spianService.selectout2(outglassid); outstate = false; } -- Gitblit v1.8.0