From 3d1b968fdd97ac107d98404ec37d693b964cda07 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 一月 2024 07:55:53 +0800
Subject: [PATCH] 交互协议测试后更新

---
 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java |   28 +++---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java      |   73 +++++++++---------
 springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java     |    4 
 springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java     |    2 
 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java   |   44 +++++++---
 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java      |   62 ++++++++-------
 CanadaMes-ui/src/layout/index.vue                                                |    5 
 CanadaMes-ui/src/lang/locales/zh-CN.json                                         |    2 
 8 files changed, 119 insertions(+), 101 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 0591804..51c8d80 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -173,7 +173,7 @@
   "Parameter": "鍙傛暟璁剧疆",
   "Action": "寮�鍏虫帶鍒�",
   "Sign": "IO鐘舵��",
-  "State": "璁惧鐘舵��",
+  "State": "鐘舵��",
   "Alarm": "鎶ヨ淇℃伅",
   "Distribute": "涓嬪彂",
   "Search": "鎼滅储",
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 13cc3f5..25a28ce 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -130,7 +130,7 @@
 // import Tag from '../layout/tag.vue';
 // import store from '../store';
 let socket;
-
+let timer;
 export default {
   name: "Layout",
   // store,
@@ -312,8 +312,9 @@
     },
     //45绉掑浣嶅�掓暟璁℃椂
     CountDown() {
+      clearInterval(timer);
       let count = 45;
-      let timer = setInterval(
+      timer = setInterval(
         () => {
           if (this.EmergencyStop == true) {
             this.dialogFormCountDown = false;
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 77ac5ff..296a397 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
@@ -43,27 +43,38 @@
       // // TODO Auto-generated catch block
       // e.printStackTrace();
       // }
-      // spianService.selectAll("X21942610402GV");
+
       // 鍑虹墖浠诲姟////////////////////////////////
       List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
       List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
+
+      boolean Plcout = spianService.listbool("DB106.64"); // 鍑虹墖璇锋眰瀛�
+      boolean Plcout2 = spianService.listbool("DB105.18"); // 鍑虹墖鍚姩
+      if (Plcout == false&&Plcout2==true) {
+        S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
+        System.out.println("鍏抽棴鍑虹墖鍚姩" + LocalDateTime.now());// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负0
+      }
+      boolean Plcadd = spianService.listbool("DB106.24"); // 杩涚墖璇锋眰瀛�
+      boolean Plcadd2 = spianService.listbool("DB105.16"); // 杩涚墖鍚姩
+      if (Plcadd == false&&Plcadd2==true) {
+        S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
+        System.out.println("鍏抽棴杩涚墖鍚姩" + LocalDateTime.now());// 杩涚墖浠诲姟鍙戦�佸瓧鏀逛负0
+      }
+      
+
+
       // StringBuilder writedstrIdOut = new StringBuilder();
       // 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
       byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
       String writedstrIdOut = new String(writedglassidbytesOut);
 
-      boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
-      boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
-      if (outlist != null && outlist1 != null) {
-
-        outstate = outlist.contains((short) 0);// 鍑虹墖杞︾┖闂插垽鏂� 褰撳嚭鐗囪溅绌洪棽鏃朵负true
-        outstate1 = outlist1.contains((short) 1);// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔� 褰撳嚭鐗囪溅浠诲姟鍚姩鏃朵负true
-
+   
+      if (Plcout == true) {
         // 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
-        int outnum = spianMapper.SelectOutSliceshu();
-        int cageoutsum = spianMapper.Selectcageout(3);
+        int outnum = spianMapper.SelectOutSliceshu();//鏄惁鏈夋鍦ㄥ嚭鐗囩殑浠诲姟
+        int cageoutsum = spianMapper.Selectcageout(3);//绗煎瓙鍐呮槸鍚﹁繕鏈夊湪鍑虹墖鐨勭幓鐠�
         // 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
-        if (outnum == 0 && outstate == true && Plchome.isAllowQueue == true && cageoutsum == 0) {
+        if (outnum == 0 &&  Plchome.isAllowQueue == true && cageoutsum == 0) {
           // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
           String outglassid = spianMapper.SelectOutSlice();
           // 褰撴湁寰呭嚭鐗囩殑鐜荤拑鏃�
@@ -74,20 +85,13 @@
             if (glassdisabled == 0) {
               spianService.selectout2(outglassid);
               Plchome.isQueueWarning = false;
-              outstate = false;
             } else { // 绂佺敤鏇存敼鐘舵�佸脊鍑烘彁绀�
               Plchome.isQueueWarning = true;
             }
 
           }
         }
-        if (outstate == true) {// 褰撳嚭鐗囪溅绌洪棽鏃�,涓斿嚭鐗囧惎鍔ㄤ负1鏃讹紝浠诲姟鍚姩鏀逛负0
-          if (outstate1 == true) {
-            S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
-            System.out.println("鍏抽棴鍚姩" + LocalDateTime.now());
-
-          }
-        }
+     
       }
 
       ///////////// 杩涚墖浠诲姟
@@ -96,7 +100,6 @@
       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
@@ -107,33 +110,39 @@
         int HB = spianMapper.SelectHB(B01glassid.toString());
         if (HB > 0) {
           // 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1
-          S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
-          boolean yingda = spianService.listbool("DB106.60");// b01姹囨姤
-          if(yingda==false){
+          S7control.getinstance().WriteWord("DB105.48", (short) 1);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+          boolean yingda = spianService.listbool("DB105.48");// b01姹囨姤
+          if (yingda == true) {
             spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
           }
           System.out.println("姹囨姤鏃禕01|绗�" + aaa + "娆�" + B01glassid + "搴旂瓟" + yingda);
           aaa += 1;
         }
 
+      }else{
+        S7control.getinstance().WriteWord("DB105.48", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
       }
 
       // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
       if (B02backs == true) {
         // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
         int HB = spianMapper.SelectHB(B02glassid.toString());
+        System.out.println("姹囨姤鏃禕02|" + B02glassid);
         if (HB > 0) {
           // 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
 
-          S7control.getinstance().WriteWord("DB106.62", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
-          System.out.println("姹囨姤鏃禕02|" + B02glassid);
-          boolean yingda = spianService.listbool("DB106.62");// b02姹囨姤
-          if (yingda == false) {
+          S7control.getinstance().WriteWord("DB105.50", (short) 1);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
+          System.out.println("姹囨姤鏃禕02ID|" + B02glassid);
+          boolean yingda = spianService.listbool("DB105.50");// b02姹囨姤
+          if (yingda == true) {
             spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟
           }
           System.out.println("姹囨姤鏃禕02|绗�" + aaa + "娆�" + B02glassid + "搴旂瓟" + yingda);
         }
+      }else{
+         S7control.getinstance().WriteWord("DB105.50", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
       }
+
 
       // 鑾峰彇DO1鏁版嵁
       StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
@@ -157,6 +166,7 @@
         }
 
       }
+
       if (queueid2 != null) {
         // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
         if (glass2 == null) {
@@ -170,15 +180,6 @@
         }
 
       }
-
-      // if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
-      // Integer state = spianMapper.Selectoutstate();
-      // String orderid = spianMapper.SelectOrderout();
-
-      // if (orderid != null && state == 0) {
-      // spianService.selectout(orderid);
-      // }
-      // }
 
       // 鏌ヨ鏁版嵁搴�
       // 鎺ㄩ�佸埌鍓嶇
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 4de113f..2d0c98d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -28,7 +28,7 @@
     FileInputStream fileInputStream;
     try {
       // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
-      fileInputStream = new FileInputStream("D:/code/canadames/Alarm.json");
+      fileInputStream = new FileInputStream("D:/canadames/Alarm.json");
       // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙g爜涓哄瓧绗�
       InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
       // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 0850abc..ba8ef60 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -122,36 +122,38 @@
             // List<Short> listd17 = S7control.getinstance().ReadWord("DB17.0",10);
             // String id=spianService.queGlassid("DB17.10", 14).toString();
             //
-            // // 閾濇绾夸氦浜�
-            // try {
-            // if (CurrentFrame != null) {
-            // spianService.outmesid(CurrentFrame.getBarCode(), "DB17.0");
-            // }
-            // List<Short> framerequests = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
-            // for (Short framerequest : framerequests) {
-            // if (framerequest == 1) {
-            // // 閾濇id
-            // String franmeno = spianService.queGlassid("DB17.10", 14).toString();
-            // String position;
-            // try {
-            // position = dbserve.SelectPositionByFrameBarcode(franmeno);
-            // } catch (SQLException e) {
-            // // TODO Auto-generated catch block
-            // position = "0";
-            // e.printStackTrace();
-            // }
-            // Short send;
-            // if (position == "0") {
-            // send = 0;
-            // } else {
-            // send = 1;
-            // }
-            // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short) send);
-            // }
-            // }
-            // } catch (Exception e) {
-            // // TODO: handle exception
-            // }
+
+            // 閾濇绾夸氦浜�
+            try {
+                if (CurrentFrame != null) {
+                    spianService.outmesid(CurrentFrame.getBarCode(), "DB17.0");
+                }
+
+                List<Short> framerequests = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
+                for (Short framerequest : framerequests) {
+                    if (framerequest == 1) {
+                        // 閾濇id
+                        String franmeno = spianService.queGlassid("DB17.10", 14).toString();
+                        String position;
+                        try {
+                            position = dbserve.SelectPositionByFrameBarcode(franmeno);
+                        } catch (SQLException e) {
+                            // TODO Auto-generated catch block
+                            position = "0";
+                            e.printStackTrace();
+                        }
+                        Short send;
+                        if (position == "0") {
+                            send = 0;
+                        } else {
+                            send = 1;
+                        }
+                        S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short) send);
+                    }
+                }
+            } catch (Exception e) {
+                // TODO: handle exception
+            }
 
             if (S7control.getinstance().CheckConnected() == true) {
                 // 鑾峰彇褰撳墠鎵爜鏂瑰紡
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index e609d7f..6b392e3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,28 +17,28 @@
         //
         System.out.println("鍚姩瀹屾垚");
 
-        //  new PlcHold().start();
+         new PlcHold().start();
 
         new Plchome().start();
-        // new PlcLayout().start();
-        // new Plcalarm().start();
+        new PlcLayout().start();
+        new Plcalarm().start();
 
-        // new Plcsign().start();
+        new Plcsign().start();
 
-        // new Plcstate().start();
-        // new PlcPositioning1().start();
+        new Plcstate().start();
+        new PlcPositioning1().start();
 
-        // new PlcParameter2().start();
+        new PlcParameter2().start();
 
-        // new PLCAutomaticParameterSetting().start();
+        new PLCAutomaticParameterSetting().start();
 
-        // new PlcManualonePosition().start();
-        // new PlcManualonePosition2().start();
-        // new PlcServoManualone().start();
-        // new PLCManualJog().start();
-        // new Plclog().start();
+        new PlcManualonePosition().start();
+        new PlcManualonePosition2().start();
+        new PlcServoManualone().start();
+        new PLCManualJog().start();
+        new Plclog().start();
 
-        // new PlcInteractionState().start();
+        new PlcInteractionState().start();
         //new PlcParameter1Review().start();
        // new PLCAutomaticParameterSettingReview().start();
     }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 20a4424..82a81d4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -15,7 +15,7 @@
     @Select("select COUNT(if(a.state1=0,cell,0))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a  GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) and disabled=0 GROUP BY cage ORDER BY cell desc LIMIT 1")
     int selectCage(int cage1);
     // 鑾峰彇绗煎瓙鍙疯鍗曞彿鎺掑簭鐨勭┖璁㈠崟绗煎瓙
-    @Select("select a.cage,FrameBarcode,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,max(a.state)as state2,disabled,FrameBarcode from storage_cage a left join (select COUNT(*)shu,cage from storage_cage  where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c  on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY (FrameBarcode=#{Fbarcode} or ''='') desc,shu desc,shu2,state2 asc,cage asc;")
+    @Select("select a.cage,FrameBarcode,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,max(a.state)as state2,disabled,FrameBarcode from storage_cage a left join (select COUNT(*)shu,cage from storage_cage  where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c  on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY shu desc,shu2,state2 asc,cage asc;")
     List<StorageCage> selectAll(String orderids,String Fbarcode);
     //浼樺厛鍒ゆ柇涓�娆℃槸鍚︽湁鍚岄摑妗嗙殑绌轰綅
     @Select("select *,min(state) state1 from storage_cage where width>=(#{width}+#{width2})  GROUP BY cage,cell HAVING state1=0 and  FrameBarcode=#{Fbarcode} ORDER BY width desc LIMIT 1;")
@@ -233,6 +233,6 @@
     @Select(" select disabled from storage_cage where glass_id=#{glassid} limit 1;")
     int SelectCageGlassState(String glassid);
     //鍒ゆ柇姹囨姤鐨刬d鏄惁姝g‘
-    @Select("SELECT count(*) FROM `storage_cage` where state!=0 and state!=1 and glass_id=#{glassid}")
+    @Select("SELECT count(*) FROM `storage_cage` where state!=0 and glass_id=#{glassid}")
     int SelectHB(String glassid);
 }
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 1179f74..744a73a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -1,5 +1,11 @@
 package com.example.springboot.service;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,6 +17,9 @@
 import com.example.springboot.mapper.SpianMapper;
 import com.google.common.primitives.Bytes;
 
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+
 @Service
 public class SpianService {
     @Autowired
@@ -19,7 +28,7 @@
     // @GetMapping("/all")
     public Short selectAll(String glassid) {
 
-        int cage1=0;
+        int cage1 = 0;
         int cells;
         int ids;
         int prcid;
@@ -29,11 +38,11 @@
         double minwidth = 0;
 
         north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
-        //濡傛灉娌℃湁姝d鏃�
+        // 濡傛灉娌℃湁姝d鏃�
         if (glasslist == null) {
             return (300);
         }
-       
+
         double widths = glasslist.getglasslengthmm();
         String orderids = glasslist.getordernumber();
         String FrameBarcode = glasslist.getFrameBarcode();
@@ -48,11 +57,10 @@
         List<Short> datas = new ArrayList<>();
 
         // String orderid="A001";
-        // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
-        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode,widths,400);
-        //鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂�
-        
-        
+        // 鑾峰彇閾濇鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
+        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 400);
+        // 鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂�
+
         if (storageCage.size() == 0) {
             storageCage = spianMapper.selectAll(orderids, FrameBarcode);
         }
@@ -100,23 +108,24 @@
                     // 灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
                     spianMapper.UpdateDBCage(ids, cage1, cells, 1);
                     // 灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
-                    // spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids-1, 2);
+               
                     spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids - 1, 2);
                     spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
                     spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier);// 鏂板浠诲姟
                     S7control.getinstance().WriteWord(adddresslist, datas);
+
                     System.out.println("杩涚墖浠诲姟|" + datas);
 
                 } else {
                     // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠�
-                    // spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
+                   
                     spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids, 2);
                     spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
                     spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier);// 鏂板浠诲姟
                     S7control.getinstance().WriteWord(adddresslist, datas);
                     System.out.println("杩涚墖浠诲姟|" + datas);
 
-                    // S7control.getinstance().WriteByte("DB105.16",glassid);
+                 
                 }
                 outmesid(glassid, "DB105.20");
                 return (200);
@@ -170,11 +179,12 @@
             spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state);// 鏂板浠诲姟
             // int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
             // if (state == 2) {
-            //     spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
-            //     spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
+            // spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
+            // spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
             // }
             System.out.println("鍑虹墖浠诲姟|" + datas);
             S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+            S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
             outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
 
             return (200);// 缁撴潫
@@ -196,6 +206,7 @@
                 System.out.println("鍑虹墖浠诲姟|" + datas);
                 outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
                 S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
 
                 return (200);// 缁撴潫
 
@@ -227,7 +238,7 @@
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
                     System.out.println("鍑虹墖浠诲姟|" + datas);
                     S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
-
+                    S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
                     outmesid(glassids, "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
                     return (200); // 缁撴潫
 
@@ -256,7 +267,7 @@
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
                     System.out.println("鍑虹墖浠诲姟|" + datas);
                     S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
-
+                    S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
                     outmesid(glassids, "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
                     return (200);// 缁撴潫
 
@@ -277,6 +288,7 @@
         byte[] bytes = Bytes.toArray(glassidlist);
         System.out.println("outmesidbytes:" + bytes.length);
         S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
+
     }
 
     // 鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
@@ -329,4 +341,6 @@
         // }
 
     }
+ 
+    
 }

--
Gitblit v1.8.0