From 4f9f6a63ecdd3406c5e1f4db86232717824f469b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 01 十二月 2023 16:38:30 +0800
Subject: [PATCH] 更新测试后的理片逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java |  682 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 441 insertions(+), 241 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..f5d8671 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,7 @@
 package com.example.springboot.service;
 
+import java.lang.reflect.Array;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,146 +12,17 @@
 import com.example.springboot.component.S7control;
 import com.example.springboot.entity.Glass;
 import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.north_glass_buffer1;
 import com.example.springboot.mapper.SpianMapper;
+import com.google.common.primitives.Bytes;
 
 @Service
 public class SpianService {
     @Autowired
     private SpianMapper spianMapper;
 
-    // @GetMapping("/all2")
-    public Result selectout(String orderid) {
-        
-        spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
-        // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
-        List<String> adddresslist = new ArrayList<>();
-        adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
-        adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
-        adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
-        adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
-        List<Short> datas = new ArrayList<>();
-        // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
-        StorageCage cageout = spianMapper.selectOut(orderid);
-        if(cageout==null){
-           return Result.success("200");
-        }
-        
-       
-        
-
-        int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
-        int cell = cageout.getCell();// 鍑虹墖鏍煎彿
-        int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
-        int prcid = cageout.getPrcId();// prcid
-        int prcid2;
-        int ids;
-        int cages;
-        int cells;
-        double glasswidth = cageout.getGlassWidth();
-        // 鍒ゆ柇鐜荤拑鍐呭鐗�
-        if (tier == 2) {
-            // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
-            // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-            datas.add((short) prcid);
-            datas.add((short) 1000);
-            datas.add((short) 1);
-            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); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-            S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-            return Result.success(datas);//缁撴潫
-        } else {
-            // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
-            int state = spianMapper.selectGlassState(cage, cell);
-            // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
-            if (state == 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.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); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-                //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
-                return Result.success(datas);//缁撴潫
-
-            } else {
-                // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
-                if (cage < 6) {
-                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
-                    if (cagecell == null) {
-                        return Result.success(cagecell);
-                    }
-                    // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
-                    prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
-                    ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
-                    cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
-                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-                                          
-                    
-                   
-                 
-                    // 濉叆璋冩嫧鏁版嵁
-                    datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
-                    datas.add((short) prcid2);
-                    datas.add((short) 2);
-                    datas.add((short) 1);
-                   // 鏇存崲鐜荤拑鐨勭瀛�
-                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
-                   spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
-                   spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
-                    // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                        S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                        S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�          
-                    return Result.success(cagecell); //缁撴潫
-
-                } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
-                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
-                    if (cagecell == null) {
-                        return Result.success(cagecell);
-                    }
-                    // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
-                    prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
-                    ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
-                    cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
-                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-                    // 濉叆璋冩嫧鏁版嵁
-                    datas.add((short) prcid);
-                    datas.add((short) prcid2);
-                    datas.add((short) 2);
-                    datas.add((short) 1);
-                    spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
-                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
-                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
-                    // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                        S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
-                        S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                        S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�             
-                     return Result.success(cagecell); //缁撴潫
-
-                }
-
-            }
-        }
-
-    }
-
     // @GetMapping("/all")
-    // 杩涚墖浠诲姟,浼犺鍗昳d
-    // 鎸夎鍗曚紭鍏堣繘鐗�
-    public Short selectAll(Short glassid) {
+    public Short selectAll(String glassid) {
 
         int cage1;
         int cells;
@@ -157,25 +30,28 @@
         int prcid;
         int tiers;
         int prctier;
-        
-        spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟
-        Glass glasslist = spianMapper.selectGlass(glassid);
-        if(glasslist==null){
-          return (300);
+        double width;
+        double minwidth = 0;
+
+        north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+        if (glasslist == null) {
+            return (300);
         }
-        double widths = glasslist.getWidth();
-        Short orderids = glasslist.getOrderId();
+        double widths = glasslist.getglasslengthmm();
+        String orderids = glasslist.getordernumber();
 
         List<String> adddresslist = new ArrayList<>();
         adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
         adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
-        adddresslist.add("DB105.4");// 杩涚墖绗肩幓鐠冩暟
-        adddresslist.add("DB105.12");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+        adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹� 
+        adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
+        adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+        
         List<Short> datas = new ArrayList<>();
 
         // String orderid="A001";
         // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
-        List<StorageCage> storageCage = spianMapper.selectAll(orderids);
+        List<StorageCage> storageCage = spianMapper.selectAll(orderids.toString());
         if (storageCage == null) {
             return (400);
         }
@@ -184,36 +60,55 @@
             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) {
-                    // 鎵ц杩涚墖
-                    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.UpdataAddCage1(widths, cage1, cells);//鍑忓皯鏍煎瓙瀹藉害
-                    
+                width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
+                widths = glasslist.getglasslengthmm();
+
+                // 鎵ц杩涚墖
+                datas.add((short) 1000);//璧峰浣嶇疆
+                datas.add((short) prcid);//鐩爣浣嶇疆
+                datas.add((short) widths);//杩涚墖鐜荤拑瀹�
+                datas.add((short) prctier); //鐜荤拑鏁�
+                datas.add((short) 1);//浠诲姟鍚姩
+                //鑾峰彇璇ユ牸瀛愬唴鏄惁鏈夌幓鐠�
+                int cellint=spianMapper.selectcell(cage1,cells);
+                if(cellint==1){
+                    //灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
+                    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());// 鏂板浠诲姟
                     S7control.getinstance().WriteWord(adddresslist, datas);
-                    S7control.getinstance().WriteWord("DB106.10", (short)0); //杩涚墖浠诲姟瀹屾垚鏀规垚0
-                    S7control.getinstance().WriteWord("DB106.8", (short)1); //杩涚墖杞︾姸鎬佹敼鎴愬繖纰�
-                    return (200);
+                   
+                }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());// 鏂板浠诲姟
+                S7control.getinstance().WriteWord(adddresslist, datas);
+
+                // S7control.getinstance().WriteByte("DB105.16",glassid);
                 }
+                outmesid(glassid,"DB105.20");
+                return (200);
+
             }
 
         }
@@ -221,23 +116,299 @@
 
     }
 
-    // @GetMapping("/all2")
+    public Short selectAll2() { // 澶氱墖涓婄墖
+        int cage1;
+        int cells;
+        int ids;
+        int prcid;
+        int tiers;
+        int prctier;
+        double width;
+        double minwidth = 0;
+        List<String> adddresslist = new ArrayList<>();
+        adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
+        adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
+        adddresslist.add("DB105.4");// 杩涚墖绗肩幓鐠冩暟
+        adddresslist.add("DB105.12");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+        List<Short> datas = new ArrayList<>();
+
+        // 鑾峰彇澶氱墖搴忓垪鐜荤拑瀹藉害
+        StorageCage queGlass = spianMapper.SelectQueueWidth();
+        double widths = queGlass.getWidth();
+        String orderids = queGlass.getOrderId();
+        int num = spianMapper.SelectQueOrder();
+        if (num == 1) {
+
+            // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
+            List<StorageCage> storageCage = spianMapper.selectAll(orderids);
+            if (storageCage == null) {
+                return (400);
+            }
+            for (StorageCage storageCage2 : storageCage) {
+                // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+                cage1 = storageCage2.getCage();
+                // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
+                int cages = spianMapper.selectCage(cage1);
+                StorageCage cages1;
+                // 鍒ゆ柇鏄惁鏈夊悎閫傚畬鏁寸┖鏍�
+                cages1 = spianMapper.selectqueCage1(cage1, storageCage2.getCell(), widths);
+                // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
+                // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+                if (cages1 != null && cages >= 1) {
+                    ids = cages1.getId();// 鏁版嵁搴揑D
+                    cells = cages1.getCell();// 鏍煎瓙鍙�
+                    prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+                    String glassid="";
+                    // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠�
+                    for (int i = 2; i > 0; i--) {
+                        north_glass_buffer1 qglass = spianMapper.SelectQueueGlass(i);
+                        width = qglass.getglasslengthmm();// 鏍煎瓙鍓╀綑瀹藉害
+                        glassid=qglass.getbarcode();
+                        spianMapper.UpdataAddqueCage(qglass.getordernumber(), qglass.getbarcode(), width, cage1, cells, i,1);
+                        spianMapper.UpdataAddCage1(width, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+                        spianMapper.Inserttask(0, 0, 1000, ids, qglass.getbarcode().toString());// 鏂板浠诲姟
+                    }
+                    // 鎵ц杩涚墖
+                    datas.add((short) 1000);
+                    datas.add((short) prcid);
+                    datas.add((short) 0);
+                    datas.add((short) 1);
+                    S7control.getinstance().WriteWord(adddresslist, datas);
+                    outmesid(glassid,"DB105.20");
+                    return (200);
+
+                }
+            }
+
+        } else {
+            for (int i = 2; i > 0; i--) {
+                north_glass_buffer1 qglass = spianMapper.SelectQueueGlass(i);
+                String orderid = qglass.getordernumber().toString();
+                String glassid = qglass.getbarcode();
+                widths = qglass.getglasslengthmm();
+                List<StorageCage> storageCage = spianMapper.selectAll(orderid);
+                if (storageCage == null) {
+                    return (400);
+                }
+                for (StorageCage storageCage2 : storageCage) {
+                    // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+                    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);
+                    }
+                    // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
+                    // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+                    if (cages1 != null && cages >= 1) {
+                        ids = cages1.getId();// 鏁版嵁搴揑D
+                        tiers = cages1.getTier();// 鍐呭鐗�
+                        cells = cages1.getCell();// 鏍煎瓙鍙�
+                        prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+                        width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
+                        widths = qglass.getglasslengthmm();
+
+                        // 鎵ц杩涚墖
+                        datas.add((short) 1000);
+                        datas.add((short) prcid);
+                        datas.add((short) prctier);
+                        datas.add((short) 1);
+                        // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠�
+                        spianMapper.UpdataAddCage(orderid, glassid, widths, cage1, cells, ids, 2);
+                        spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+                        spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟
+                        outmesid(glassid,"DB105.20");//娲惧彂杩涚墖id
+                        // S7control.getinstance().WriteWord(adddresslist, datas);
+                        break;
+                        // S7control.getinstance().WriteByte("DB105.16",glassid);
+
+                    }
+
+                }
+
+            }
+
+        }
+        return (400);
+
+    }
+
+    // 鎸夎鍗曞嚭鐗�
+    public Result selectout(String orderid) {
+
+        // spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔★紝鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
+        // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
+        List<String> adddresslist = new ArrayList<>();
+        adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
+        adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
+        adddresslist.add("DB105.14");// 鍑虹墖绗肩幓鐠冩暟
+        adddresslist.add("DB105.18");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+        List<Short> datas = new ArrayList<>();
+        // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
+        StorageCage cageout = spianMapper.selectOut(orderid);
+        if (cageout == null) {
+            return Result.success("200");
+        }
+        // 鍒ゆ柇鏄惁鍚屼竴鏍煎唴閮戒负鍚屼竴璁㈠崟
+
+        int orders = Integer.valueOf(cageout.getOrderId()).intValue();
+
+        int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+        int cell = cageout.getCell();// 鍑虹墖鏍煎彿
+        int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
+        int prcid = cageout.getPrcId();// prcid
+        String glassid = cageout.getGlassId();
+        int prcid2;
+        int ids;
+        int cages;
+        int cells;
+        double glasswidth = cageout.getGlassWidth();
+        // 褰撲竴鏍煎唴閮戒负鍚屼竴璁㈠崟鏃�
+
+        if (orders == 2) {
+            datas.add((short) prcid);
+            datas.add((short) 1000);
+            datas.add((short) 2);
+            datas.add((short) 1);
+            spianMapper.UpdatequeOut(cage, cell);
+            return Result.success("200");
+        } else {
+            // 鍒ゆ柇鏄惁闄ゆ鏍煎瓙鍐呰繕鏈夊叾浠栨牸瀛愭湁鍗曠嫭鐨勮鍗曠幓鐠�
+            StorageCage pd = spianMapper.SelectQueout(orderid,cage, cell);
+            // 鍒ゆ柇鐜荤拑鍐呭鐗�
+            if (tier == 2) {
+
+                // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
+                // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+                datas.add((short) prcid);
+                datas.add((short) 1000);
+                datas.add((short) 1);
+                datas.add((short) 1);
+
+                spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+                spianMapper.Inserttask(1, 0, cageout.getId(), 1000, orderid);// 鏂板浠诲姟
+                S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
+                if (pd != null) {
+                    cage = pd.getCage();
+                    cell = pd.getCage();
+                    // 娓呴櫎鏈牸鏁版嵁鍑虹墖
+                    spianMapper.UpdatequeOut(cage, cell);
+                    return Result.success("200");
+                }
+                return Result.success(datas);// 缁撴潫
+            } else {
+                // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
+                int state = spianMapper.selectGlassState(cage, cell);
+                // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
+                if (state == 1) {
+                    // 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,prcid, 1000, orderid);// 鏂板浠诲姟
+                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+                    //S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                    //outmesid(glassid);// 娲惧彂鍑虹墖ID
+                    if (pd != null) {
+                        cage = pd.getCage();    
+                        cell = pd.getCage();
+                        // 娓呴櫎鏈牸鏁版嵁鍑虹墖
+                        spianMapper.UpdatequeOut(cage, cell);
+                        return Result.success("200");
+                    }
+                    return Result.success(datas);// 缁撴潫
+
+                } else {
+                    // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+                    if (cage < 6) {
+                        StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
+                        if (cagecell == null) {
+                            return Result.success(cagecell);
+                        }
+                        // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+                        prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
+                        ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+                        cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+                        cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
+
+                        // 濉叆璋冩嫧鏁版嵁
+                        datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
+                        datas.add((short) prcid2);
+                        datas.add((short) 2);
+                        datas.add((short) 1);
+                        // 鏇存崲鐜荤拑鐨勭瀛�
+                        String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                        spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+                        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(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                        System.out.println(datas);
+                        outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+                        return Result.success(cagecell); // 缁撴潫
+
+                    } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
+                        StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
+                        if (cagecell == null) {
+                            return Result.success(cagecell);
+                        }
+                        // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+                        prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
+                        ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+                        cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+                        cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
+                        // 濉叆璋冩嫧鏁版嵁
+                        datas.add((short) prcid);
+                        datas.add((short) prcid2);
+                        datas.add((short) 2);
+                        datas.add((short) 1);
+                        String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                        spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+                        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(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+                        outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+                        return Result.success(cagecell); // 缁撴潫
+
+                    }
+                }
+
+            }
+        }
+
+    }
+
+    
     public Short selectout2(String glassid) {
         // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
         List<String> adddresslist = new ArrayList<>();
-        adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
-        adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
-        adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
-        adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+        char[] a=glassid.toCharArray();
+
+        adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
+        adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
+        adddresslist.add("DB105.14");// 鍑虹墖绗肩幓鐠冩暟
+        adddresslist.add("DB105.18");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
         List<Short> datas = new ArrayList<>();
         // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
         StorageCage cageout = spianMapper.selectOut2(glassid);
-        if(cageout==null){
-           return (300);
+        if (cageout == null) {
+            return (300);
         }
-        
-       
-        
 
         int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
         int cell = cageout.getCell();// 鍑虹墖鏍煎彿
@@ -250,39 +421,46 @@
         double glasswidth = cageout.getGlassWidth();
         // 鍒ゆ柇鐜荤拑鍐呭鐗�
         if (tier == 2) {
+            int state = spianMapper.selectGlassState(cage, cell);// 鑾峰彇鏍煎瓙鏁伴噺
             // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
             // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
             datas.add((short) prcid);
             datas.add((short) 1000);
+            datas.add((short) state);
             datas.add((short) 1);
-            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); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-            S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-            return (200);//缁撴潫
+            spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+            spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+            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,"DB105.34");// 娲惧彂鍑虹墖ID
+
+            return (200);// 缁撴潫
         } else {
             // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
             int state = spianMapper.selectGlassState(cage, cell);
             // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
-            if (state == 0) {
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+            if (state == 1) {
+                // 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.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); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
-                S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-                //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
-                return (200);//缁撴潫
+                outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
+                spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+                spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
+                spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+                spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
+                S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+                return (200);// 缁撴潫
 
             } else {
                 // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
@@ -294,28 +472,27 @@
                     // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
                     prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
                     ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
-                    cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
-                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-                    
-                       
-                    
-                   
-                 
+                    cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+                    cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
+
                     // 濉叆璋冩嫧鏁版嵁
                     datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
                     datas.add((short) prcid2);
                     datas.add((short) 2);
                     datas.add((short) 1);
-                   // 鏇存崲鐜荤拑鐨勭瀛�
-                   spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
-                   spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                   spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
-                   spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
+                    // 鏇存崲鐜荤拑鐨勭瀛�
+                    String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                    spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+                    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);//娲惧彂鍑虹墖杞︿换鍔�          
-                    return (200); //缁撴潫
+                    S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+                    outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+                    return (200); // 缁撴潫
 
                 } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
                     StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
@@ -325,46 +502,69 @@
                     // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
                     prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
                     ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
-                    cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
-                    cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
+                    cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+                    cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
                     // 濉叆璋冩嫧鏁版嵁
                     datas.add((short) prcid);
                     datas.add((short) prcid2);
                     datas.add((short) 2);
                     datas.add((short) 1);
-                    spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
-                    spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
-                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+                    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,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+                    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);//娲惧彂鍑虹墖杞︿换鍔�             
-                     return (200);//缁撴潫
+                    S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+                    outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+                    return (200);// 缁撴潫
 
                 }
             }
         }
 
     }
-
-    /*** 淇敼鐢ㄦ埛* @throws SQLException */
-    // public static int updateUser(Glass user) throws SQLException {conn =
-    // getConn();
-    // String sql = "update t_user set name=?,gender=?,age=?,score=?"+ " where
-    // id=?";ps = conn.prepareStatement(sql);
-    // ps.setString(1, user.getName());ps.setString(2, user.getGender());
-    // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());ps.setInt(5,
-    // user.getId());return ps.executeUpdate();}
-    // /*** 澧炲姞鐢ㄦ埛* @throws SQLException */
-    // public static int insertUser(User user) throws SQLException {
-    // conn = getConn();
-    // String sql = "insert into t_user(name,gender,age,score)"+ " values(?,?,?,?)";
-    // ps = conn.prepareStatement(sql);ps.setString(1,
-    // user.getName());ps.setString(2, user.getGender());
-    // ps.setInt(3, user.getAge());ps.setDouble(4, user.getScore());return
-    // ps.executeUpdate();
-    // }
-
+    //娲惧彂浠诲姟鐜荤拑id
+    public void outmesid(String glassid,String address) {
+        //System.out.println("outmesid:" + glassid);
+        List<Byte> glassidlist = new ArrayList();
+        char ds[]=glassid.toCharArray();
+        for (char iditem : ds) {
+            glassidlist.add((byte)iditem);
+        }
+        byte[] bytes = Bytes.toArray(glassidlist);
+        System.out.println("outmesidbytes:" + bytes.length);
+        S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
+    }
+    //鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
+    public StringBuilder queGlassid(String address,int count) {
+        StringBuilder writedstrIdOut = new StringBuilder();
+        byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
+      if (writedglassidbytesOut != null) {
+        // 鑾峰彇鐜荤拑id
+        for (byte iditem : writedglassidbytesOut) {
+          writedstrIdOut.append((char) iditem);
+        }
+      }
+        return writedstrIdOut;
+    }
+    //char鏁扮粍杞寲鎴恇it鏁扮粍
+       public static byte[] toBytes(char[] chars) {
+        String s = new String(chars);
+        return s.getBytes(StandardCharsets.UTF_8);
+    }
+    //bit鏁扮粍杞寲鎴恈har鏁扮粍
+    public static char[] toChars(byte[] bytes) {
+        String s = new String(bytes, StandardCharsets.UTF_8);
+        return s.toCharArray();
+    }
+    //鍒ゆ柇闆嗗悎閲屾槸鍚︿负1
+    public  boolean listbool(String address) {
+       List<Short> list = S7control.getinstance().ReadWord(address, 1);//杩斿洖涓簍ure鏃朵负1
+       boolean listbool = list.contains((short) 1);
+        return listbool;
+    }
 }
-

--
Gitblit v1.8.0