From 8a0ae6d19d78d2295a10b1cc97bfe17e651234ea Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 01 十二月 2023 08:08:28 +0800
Subject: [PATCH] 更新理片笼逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 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 da4a94e..fa82621 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
@@ -48,8 +48,11 @@
       // // TODO Auto-generated catch block
       // e.printStackTrace();
       // }
-      // 鍒ゆ柇杩涚墖璇锋眰
-      List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
+      
+      
+      
+      
+       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);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
 
@@ -62,22 +65,25 @@
         // 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负1
         spianMapper.UpdateCageOver(B01glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
         spianMapper.Updatetask(1, 0);// 鏇存敼杩涚墖浠诲姟鐘舵�佷负1
-        spianMapper.overqueue(B01glassid.toString(), 0);// 鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+         spianMapper.UpdatetaskOut(B01glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔�
+         spianMapper.OverOutSlice(B01glassid.toString(),2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
         S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
-        S7control.getinstance().WriteWord("DB105.48", (short) 1);//姹囨姤B01灏忚溅鏀跺埌
+       
+        //S7control.getinstance().WriteWord("DB105.48", (short) 1);//姹囨姤B01灏忚溅鏀跺埌
       }
 
       // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
       if (B02backs == true) {
         // 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
         spianMapper.UpdateCageOver(B02glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
-        spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
-        S7control.getinstance().WriteWord("DB105.50", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
+        spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔�
+        spianMapper.OverOutSlice(B02glassid.toString(),2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
+        S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
         // S7control.getinstance().WriteWord("DB105.50", (short) 1);//姹囨姤B02灏忚溅鏀跺埌
       }
 
       // 鑾峰彇DO1鏁版嵁
-      StringBuilder queueid1 = spianService.queGlassid("DB103.44", 14);
+      StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);//鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓� 
       // 鑾峰彇DO2鏁版嵁
       StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
       System.out.println("D01|" + queueid1);
@@ -88,12 +94,12 @@
       north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
       // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
        
-      if (queueid1 != null&&questate==0) {
+      if (queueid1 != null &&questate==0) {
         // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
         if (glass1 == null) { //褰撴病鏈夊�兼椂浼犵┖
           spianMapper.Updatequeue(null,null,null,null, 0, null, null, null, null, 1);
         } else {
-          spianMapper.overqueue2(queueid2.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负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);
         }
 
@@ -103,8 +109,8 @@
         if(glass2==null){
           spianMapper.Updatequeue(null,null,null,null, 0, null, null, null, null, 2);
         }else{
-        spianMapper.Updatequeue(queueid1.toString(),glass2.getordernumber(),glass2.getlistnumber(),glass2.getboxnumber(),0,glass2.getglasslengthmm().toString(),glass2.getglassheightmm().toString(),glass2.getglasslength().toString(),glass2.getglassheight().toString(),2);
-        
+        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);//鍏抽棴浠诲姟鍚姩
         }
         
@@ -122,8 +128,8 @@
       boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
       if (outlist != null && outlist1 != null) {
         // 鍒ゆ柇鎸夎鍗曞嚭鐗�
-        outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂�
-        outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
+        outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂�    褰撳嚭鐗囪溅绌洪棽鏃朵负true
+        outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔� 褰撳嚭鐗囪溅浠诲姟鍚姩鏃朵负true
 
         north_glass_buffer1 glass = spianMapper.SelectDBOut();// 鍒ゆ柇鏄惁鏈夎皟鎷ㄥ悗鐨勫嚭鐗囦换鍔℃湭瀹屾垚
 
@@ -150,11 +156,12 @@
           // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
           String outglassid = spianMapper.SelectOutSlice();
           if (outglassid != null) {
+            spianMapper.OverOutSlice(outglassid,1);
             spianService.selectout2(outglassid);
             outstate = false;
           }
         }
-        if (outstate == true) {// 涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0//鍑虹墖杞︾┖闂插垽鏂�
+        if (outstate == true) {//褰撳嚭鐗囪溅绌洪棽鏃�,涓斿嚭鐗囧惎鍔ㄤ负1鏃讹紝浠诲姟鍚姩鏀逛负0
           if (outstate1 == true) {
             S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
           }

--
Gitblit v1.8.0