From 1c5e44cdff0f7900914a883056d93979265e306f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 08:20:16 +0800
Subject: [PATCH] 删除不需要的代码,parameter、action页不需要输入密码

---
 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java |  181 +++++++++++++++++++++++++-------------------
 1 files changed, 103 insertions(+), 78 deletions(-)

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 942e6dd..d37ea94 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,6 @@
 package com.example.springboot.service;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -11,6 +12,7 @@
 import com.example.springboot.entity.Glass;
 import com.example.springboot.entity.StorageCage;
 import com.example.springboot.mapper.SpianMapper;
+import com.google.common.primitives.Bytes;
 
 @Service
 public class SpianService {
@@ -20,7 +22,7 @@
     // @GetMapping("/all2")
     public Result selectout(String orderid) {
         
-        spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
+        //spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔★紝鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
         // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
         List<String> adddresslist = new ArrayList<>();
         adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
@@ -41,6 +43,7 @@
         int cell = cageout.getCell();// 鍑虹墖鏍煎彿
         int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
         int prcid = cageout.getPrcId();// prcid
+        String glassid=cageout.getGlassId();
         int prcid2;
         int ids;
         int cages;
@@ -56,29 +59,26 @@
             datas.add((short) 1);
                
             spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
-            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
-            spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
-           
-            S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-            S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+            spianMapper.Inserttask(1, 0,cageout.getId(),1000,orderid);//鏂板浠诲姟         
             S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+            outmesid(glassid);//娲惧彂鍑虹墖ID
             return Result.success(datas);//缁撴潫
         } else {
             // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
             int state = spianMapper.selectGlassState(cage, cell);
             // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
             if (state == 0) {
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+                //spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
                 datas.add((short) prcid);
                 datas.add((short) 1000);
                 datas.add((short) 1);
                 datas.add((short) 1);
-                spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+                spianMapper.Inserttask(1, 0,cageout.getId(),1000,orderid);//鏂板浠诲姟
                 spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
-                S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
                 S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+                outmesid(glassid);//娲惧彂鍑虹墖ID
                 //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
                 return Result.success(datas);//缁撴潫
 
@@ -93,10 +93,7 @@
                     prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
                     ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
                     cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
-                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-                                          
-                    
-                   
+                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�                                                          
                  
                     // 濉叆璋冩嫧鏁版嵁
                     datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
@@ -104,14 +101,16 @@
                     datas.add((short) 2);
                     datas.add((short) 1);
                    // 鏇存崲鐜荤拑鐨勭瀛�
-                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                   String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
-                   spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
+                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                   spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+                   spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//鏂板璋冨害浠诲姟
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                        S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                        S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�          
+                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+                        System.out.println(datas);  
+                        outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
                     return Result.success(cagecell); //缁撴潫
 
                 } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -129,14 +128,16 @@
                     datas.add((short) prcid2);
                     datas.add((short) 2);
                     datas.add((short) 1);
-                    spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
-                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                    String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
                     spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+                    spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//鏂板璋冨害浠诲姟
+                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                        S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                        S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�             
+                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�    
+                        
+                        outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID         
                      return Result.success(cagecell); //缁撴潫
 
                 }
@@ -149,7 +150,7 @@
     // @GetMapping("/all")
     // 杩涚墖浠诲姟,浼犺鍗昳d
     // 鎸夎鍗曚紭鍏堣繘鐗�
-    public Short selectAll(Short glassid) {
+    public Short selectAll(String glassid) {
 
         int cage1;
         int cells;
@@ -157,14 +158,15 @@
         int prcid;
         int tiers;
         int prctier;
-        
-        spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟
-        Glass glasslist = spianMapper.selectGlass(glassid);
+        double width;
+        double minwidth=0;
+        //spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
+            Glass glasslist = spianMapper.selectGlass(glassid);
         if(glasslist==null){
           return (300);
         }
         double widths = glasslist.getWidth();
-        Short orderids = glasslist.getOrderId();
+        Short orderids = glasslist.getOrderId(); 
 
         List<String> adddresslist = new ArrayList<>();
         adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
@@ -184,36 +186,38 @@
             cage1 = storageCage2.getCage();
             // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
             int cages = spianMapper.selectCage(cage1);
+            StorageCage cages1 ;
+            //鍒ゆ柇鏄惁鏄浜岀墖闇�瑕佸姞闂撮殧鐗�
+            prctier = spianMapper.selectsum(cage1, storageCage2.getCell());// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
+                if(prctier>0){
+                   cages1 = spianMapper.selectCage1(cage1,storageCage2.getCell(),widths+400);
+                }else{
+                    cages1 = spianMapper.selectCage1(cage1,storageCage2.getCell(),widths);
+                }
             // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
-            StorageCage cages1 = spianMapper.selectCage1(cage1, widths);
-            if (cages1 != null) {
+             // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+            if (cages1 != null&&cages>=1) {
                 ids = cages1.getId();// 鏁版嵁搴揑D
                 tiers = cages1.getTier();// 鍐呭鐗�
                 cells = cages1.getCell();// 鏍煎瓙鍙�
                 prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
-                
-                
-               if (glasslist == null) {
-                    return (300);
-                }
-                spianMapper.Inserttask(0, 0, 1000, ids);//鏂板浠诲姟
-                prctier = spianMapper.selectsum(cage1, cells);// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
-                // 鏈夊悎閫傜┖鏍兼椂杩涚墖
-                if (cages > 1 && cages1.getTier() != null) {
+                width=cages1.getWidth();//鏍煎瓙鍓╀綑瀹藉害
+                widths=glasslist.getWidth();
+
                     // 鎵ц杩涚墖
                     datas.add((short) 1000);
                     datas.add((short) prcid);
                     datas.add((short) prctier);
                     datas.add((short) 1);
                     // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠�
-                    spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
+                    spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
                     spianMapper.UpdataAddCage1(widths, cage1, cells);//鍑忓皯鏍煎瓙瀹藉害
-                    
+                    spianMapper.Inserttask(0, 0, 1000, ids,glassid.toString());//鏂板浠诲姟  
                     S7control.getinstance().WriteWord(adddresslist, datas);
-                    S7control.getinstance().WriteWord("DB106.10", (short)0); //杩涚墖浠诲姟瀹屾垚鏀规垚0
-                    S7control.getinstance().WriteWord("DB106.8", (short)1); //杩涚墖杞︾姸鎬佹敼鎴愬繖纰�
-                    return (200);
-                }
+                    
+                   // S7control.getinstance().WriteByte("DB105.16",glassid);
+                   return (200);              
+               
             }
 
         }
@@ -223,6 +227,7 @@
 
     // @GetMapping("/all2")
     public Short selectout2(String glassid) {
+        //spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
         // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
         List<String> adddresslist = new ArrayList<>();
         adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
@@ -246,42 +251,48 @@
         int prcid2;
         int ids;
         int cages;
-        int cells;
+        int cells; 
         double glasswidth = cageout.getGlassWidth();
         // 鍒ゆ柇鐜荤拑鍐呭鐗�
         if (tier == 2) {
+            int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
             // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
             // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
             datas.add((short) prcid);
             datas.add((short) 1000);
-            datas.add((short) 1);
+            datas.add((short) state);
             datas.add((short) 1);
                
             spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
-            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
-            spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
-           
-            S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-            S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+            spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+            spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板浠诲姟
+            //int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
+            if(state==2){
+                spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
+                spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
+            }
             S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+            outmesid(glassid);//娲惧彂鍑虹墖ID
+            
+            
             return (200);//缁撴潫
         } else {
             // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
             int state = spianMapper.selectGlassState(cage, cell);
             // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
             if (state == 0) {
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+                //spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);
                 datas.add((short) prcid);
                 datas.add((short) 1000);
                 datas.add((short) 1);
                 datas.add((short) 1);
-                spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+                spianMapper.Inserttask(1, 0,cageout.getId(),1000 ,glassid);//鏂板浠诲姟
                 spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
-                S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+                outmesid(glassid);//娲惧彂鍑虹墖ID
                 S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-                //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
+                
+                
                 return (200);//缁撴潫
 
             } else {
@@ -295,10 +306,7 @@
                     prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
                     ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
                     cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
-                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-                    
-                       
-                    
+                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�   
                    
                  
                     // 濉叆璋冩嫧鏁版嵁
@@ -307,14 +315,17 @@
                     datas.add((short) 2);
                     datas.add((short) 1);
                    // 鏇存崲鐜荤拑鐨勭瀛�
-                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                   String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
-                   spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
+                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                   spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+                   spianMapper.Inserttask(2, 0,cageout.getId(),ids,glassid);//鏂板璋冨害浠诲姟
+                   spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板鍑虹墖浠诲姟
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                        S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                        S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�          
+                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+                        
+                        outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID         
                     return (200); //缁撴潫
 
                 } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -332,14 +343,17 @@
                     datas.add((short) prcid2);
                     datas.add((short) 2);
                     datas.add((short) 1);
-                    spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
-                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                    String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                    spianMapper.Inserttask(2, 0,cageout.getId()+1,ids,glassid);//鏂板璋冨害浠诲姟
+                    spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板鍑虹墖浠诲姟
                     spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                        S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                        S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�             
+                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�   
+                        
+                        outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
                      return (200);//缁撴潫
 
                 }
@@ -348,6 +362,17 @@
 
     }
 
+    public void outmesid(String glassid) {
+        System.out.println("outmesid:"+glassid);
+        List<Byte> glassidlist=new ArrayList();
+            for (char iditem : glassid.toCharArray()) { 
+                glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
+            }
+            byte[] bytes=  Bytes.toArray(glassidlist);          
+            System.out.println("outmesidbytes:"+bytes.length);
+            S7control.getinstance().WriteByte("DB105.30", bytes);//娲惧彂鍑虹墖id
+    }
+
     /*** 淇敼鐢ㄦ埛* @throws SQLException */
     // public static int updateUser(Glass user) throws SQLException {conn =
     // getConn();

--
Gitblit v1.8.0