From 58d7b0e12ccd92cf3934f6582b51b5fbcecaa39a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:41 +0800
Subject: [PATCH] 修改注入方式

---
 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java |  730 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 475 insertions(+), 255 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 951216b..0c05948 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,287 +1,507 @@
 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.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import com.example.springboot.common.Result;
 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.HomeMapper;
 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){
-        //瀹氫箟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);
-         int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
-         int cell =cageout.getCell();//鍑虹墖鏍煎彿
-         int tier =cageout.getTier();//鍑虹墖鍐呭鐗�
-         int prcid=cageout.getPrcId();//prcid
-         int prcid2;
-         int ids;
-         double glasswidth=cageout.getGlassWidth();
-         //鍒ゆ柇鐜荤拑鍐呭鐗�
-         if(tier==2){
-             //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
-                //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-                spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
-               
-                datas.add((short)prcid);
-                datas.add((short)1000);
-                datas.add((short)1);
-                datas.add((short)1);
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                return Result.success(datas);  
-         }
-         else{  
-            //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
-           int state= spianMapper.selectGlassState(cage,cell);
-            //鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
-            if(state==0){
-             return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");  
-             }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
-                //鏇存崲鐜荤拑鐨勭瀛�
-                spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
-                //濉叆璋冩嫧鏁版嵁
-                datas.add((short)prcid);//璋冩嫧澶栫墖璧峰浣嶇疆
-                datas.add((short)prcid2);
-                datas.add((short)2);
-                datas.add((short)1);
-                //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
-                //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
-                datas.add((short)prcid);
-                datas.add((short)1000);
-                datas.add((short)1);
-                datas.add((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
-                //濉叆璋冩嫧鏁版嵁
-                datas.add((short)prcid);
-                datas.add((short)prcid2);
-                datas.add((short)2);
-                datas.add((short)1);
-                //杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
-                spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
-                //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
-                //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
-                //濉叆鍑虹墖鏁版嵁
-                datas.add((short)prcid);
-                datas.add((short)1000);
-                datas.add((short)1);
-                datas.add((short)1);
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                return Result.success(cagecell);  //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
-                
-               }
-               
-             }
-        }
+    @Autowired
+    private HomeMapper homeMapper;
+    public static List<String> result=new ArrayList<String>();
+    // @GetMapping("/all")
+    public Short selectAll(north_glass_buffer1 glasslist) {
+    try {
+        
     
-}
-
-   @GetMapping("/all")
-   //杩涚墖浠诲姟,浼犺鍗昳d
-   //鎸夎鍗曚紭鍏堣繘鐗�
-    public Result selectAll(Short glassid){
-        //return spianMapper.selectAll(); 
-        int cage1;
+        int cage1 = 0;
         int cells;
         int ids;
         int prcid;
         int tiers;
         int prctier;
+        double width;
+        double minwidth = 0;
+        double widths;
+        // north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+        // 濡傛灉娌℃湁姝d鏃�
+        if (glasslist == null) {
+            return (300);
+        }
+        if(glasslist.getglasslengthmm()>glasslist.getglassheightmm()) {
+            widths= glasslist.getglasslengthmm();
+        }else{
+            widths= glasslist.getglassheightmm();
+        }
+        // Map result=new HashMap();
+       
 
-        Glass glasslist=spianMapper.selectGlass(glassid);
-        double widths=glasslist.getWidth();
-        Short orderids=glasslist.getOrderId();
+        String orderids = glasslist.getordernumber();
+        String FrameBarcode = glasslist.getFrameBarcode();
+        String glassid = glasslist.getbarcode();
+        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<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<>();
+        List<Short> datas = new ArrayList<>();
 
-        //String orderid="A001";
-        //鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
-        List<StorageCage> storageCage=spianMapper.selectAll(glassid);
-        if(storageCage==null){
-                    return Result.success(storageCage);
-                }
+        // String orderid="A001";
+        // 鑾峰彇閾濇鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
+        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 400);
+        // 鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂�
+
+        if (storageCage.size() == 0) {
+            storageCage = spianMapper.selectAll(orderids, FrameBarcode);
+        }
+
+        if (storageCage == null) {
+            return (400);
+        }
         for (StorageCage storageCage2 : storageCage) {
-            //淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
-            cage1=storageCage2.getCage();
-            //鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
-            int cages=spianMapper.selectCage(cage1);
-            //鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
-            StorageCage cages1=spianMapper.selectCage1(cage1,widths);
-            ids=cages1.getId();//鏁版嵁搴揑D
-            tiers=cages1.getTier();//鍐呭鐗�
-            cells=cages1.getCell();//鏍煎瓙鍙�
-            prcid=cages1.getPrcId();//浼犵粰prc鐨勭洰鏍囧湴id
-            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);
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                //鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠�
-               
-                spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
-                return Result.success(cages1);
+            // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+            cage1 = storageCage2.getCage();
+            // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
+            StorageCage cages = spianMapper.selectCage(cage1);
+
+            // 濡傛灉鐩搁偦绗煎瓙娌℃湁绌烘牸,鎴栬�呮湁姝e湪鎵ц鐨勫嚭鐗囦换鍔℃椂杩斿洖400
+            if (cages == null) {
+                return (400);
             }
-            
-             
-        }         
-        return Result.success("涓嶅彲杩涚墖");      
-      
+            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.getCell() >= 1 && storageCage2.getDisabled() == 0) {
+                ids = cages1.getId();// 鏁版嵁搴揑D
+                tiers = cages1.getTier();// 鍐呭鐗�
+                cells = cages1.getCell();// 鏍煎瓙鍙�
+                prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+                width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
+                
+
+                // 鎵ц杩涚墖
+                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) {
+                    result.add("杩涚墖浠诲姟|feedstart1:" + datas+ LocalDateTime.now());
+                    outmesid(glassid, "DB105.20");
+                    S7control.getinstance().WriteWord(adddresslist, datas);
+                    boolean qidong = listbool("DB105.16");
+                    int qidong2 = 0;
+                    if (qidong == true) {
+                        qidong2 = 1;
+                    } else {
+                        while (qidong) {
+                            S7control.getinstance().WriteWord("DB105.16", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                            qidong = listbool("DB105.16");
+                        }
+                    }
+                    // 灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
+                    spianMapper.UpdateDBCageAdd(ids, cage1, cells, 1);
+                    // 灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
+                    spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids - 1, 2,widths);
+                    spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+                    spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier, qidong2);// 鏂板浠诲姟
+                    result.add("杩涚墖浠诲姟|feedend1" + datas+ LocalDateTime.now());
+                   
+
+                } else {
+                    // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠�
+                    result.add("杩涚墖浠诲姟|feedstart2" + datas+ LocalDateTime.now());
+                    outmesid(glassid, "DB105.20");
+                    S7control.getinstance().WriteWord(adddresslist, datas); 
+                    boolean qidong = listbool("DB105.16");
+                    int qidong2 = 0;
+                    if (qidong == true) {
+                        qidong2 = 1;
+                    } else {
+                        while (qidong) {
+                            S7control.getinstance().WriteWord("DB105.16", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                            qidong = listbool("DB105.16");
+                        }
+                    }
+                    spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids, 2,widths);
+                    spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+                    spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier, qidong2);// 鏂板浠诲姟
+                    result.add("杩涚墖浠诲姟|feedend2" + datas+ LocalDateTime.now());
+
+                }
+                
+                return (200);
+
+            }
+
+        }
+        return (400);
+    } catch (Exception e) {
+        e.printStackTrace();
+        return (500);
+        // TODO: handle exception
     }
 
-   @GetMapping("/all2")
-    public Result 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涓哄惎鍔�
-        List<Short> datas=new ArrayList<>();
-        //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
-         StorageCage cageout=spianMapper.selectOut2(glassid);
-         int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
-         int cell =cageout.getCell();//鍑虹墖鏍煎彿
-         int tier =cageout.getTier();//鍑虹墖鍐呭鐗�
-         int prcid=cageout.getPrcId();//prcid
-         int prcid2;
-         int ids;
-         double glasswidth=cageout.getGlassWidth();
-         //鍒ゆ柇鐜荤拑鍐呭鐗�
-         if(tier==2){
-             //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
-                //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-                spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
-               
-                datas.add((short)prcid);
-                datas.add((short)1000);
-                datas.add((short)1);
-                datas.add((short)1);
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                return Result.success(datas);  
-         }
-         else{  
-            //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
-           int state= spianMapper.selectGlassState(cage,cell);
-            //鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
-            if(state==0){
-             return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");  
-             }else{
-              //鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
-               if(cage<6){
-                StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
-                if(cagecell==null){
-                    return Result.success(cagecell);
+    }
+
+    public Short selectout2(String glassid) {
+        try {
+        // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
+        List<String> adddresslist = new ArrayList<>();
+        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);
+        }
+
+        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) {
+            int state = spianMapper.selectGlassState(cage, cell);// 鑾峰彇鏍煎瓙鏁伴噺
+            // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
+            // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+            datas.add((short) prcid);
+            datas.add((short) 1000);
+            datas.add((short) state);
+            datas.add((short) 1);
+            spianMapper.OverOutSlice(glassid.toString(), 1, 0);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+            spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+            spianMapper.UpdataGlassCageState(glassid.toString(), 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+
+            result.add("鍑虹墖浠诲姟|outstart1" + datas+ LocalDateTime.now());
+            S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+            //S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+            boolean qidong = listbool("DB105.18");
+            int qidong2 = 0;
+            if (qidong == true) {
+                qidong2 = 1;
+            } else {
+                while (qidong) {
+                    S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                    qidong = listbool("DB105.18");
                 }
-                //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
-                prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峆RCID
-                ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
-                //鏇存崲鐜荤拑鐨勭瀛�
-                spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
-                //濉叆璋冩嫧鏁版嵁
-                datas.add((short)prcid);//璋冩嫧澶栫墖璧峰浣嶇疆
-                datas.add((short)prcid2);
-                datas.add((short)2);
-                datas.add((short)1);
-                //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
-                //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
-                datas.add((short)prcid);
-                datas.add((short)1000);
-                datas.add((short)1);
-                datas.add((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);
+            }
+            spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state, qidong2);// 鏂板浠诲姟
+            outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
+            result.add("鍑虹墖浠诲姟|outend1" + datas+ LocalDateTime.now());
+            return (200);// 缁撴潫
+        } else {
+            // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
+            int state = spianMapper.selectGlassState(cage, cell);
+            // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
+            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);
+                result.add("鍑虹墖浠诲姟|outstart2" + datas+ LocalDateTime.now());
+                outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
+                S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                //S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                boolean qidong = listbool("DB105.18");
+                int qidong2 = 0;
+                if (qidong == true) {
+                    qidong2 = 1;
+                } else {
+                    while (qidong) {
+                        S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                        qidong = listbool("DB105.18");
+                    }
                 }
-                //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
-                prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峱rcID
-                ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
-                //濉叆璋冩嫧鏁版嵁
-                datas.add((short)prcid);
-                datas.add((short)prcid2);
-                datas.add((short)2);
-                datas.add((short)1);
-                //杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
-                spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
-                spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
-                //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
-                //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
-                //濉叆鍑虹墖鏁版嵁
-                datas.add((short)prcid);
-                datas.add((short)1000);
-                datas.add((short)1);
-                datas.add((short)1);
-                S7control.getinstance().WriteWord(adddresslist, datas);
-                return Result.success(cagecell);  //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
-                
-               }
-               
-             }
+                spianMapper.OverOutSlice(glassid.toString(), 1, 0);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+                spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+                spianMapper.UpdataGlassCageState(glassid, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+                spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, 1, qidong2);// 鏂板浠诲姟
+                result.add("鍑虹墖浠诲姟|outend2" + datas+ LocalDateTime.now());
+                return (200);// 缁撴潫
+
+            } else {
+                // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+                if (cage < 6) {
+                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6, cell);
+                    if (cagecell == null) {
+                        return (300);
+                    }
+                    // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+                    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);
+                    // 鏇存崲鐜荤拑鐨勭瀛�
+                    StorageCage glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+
+                    // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+                    result.add("鍑虹墖浠诲姟|outstart3" + datas+ LocalDateTime.now());
+                    outmesid(glassids.getGlassId(), "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+                    S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                    //S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                    boolean qidong = listbool("DB105.18");
+                    int qidong2 = 0;
+                    if (qidong == true) {
+                        qidong2 = 1;
+                    } else {
+                        while (qidong) {
+                            S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                            qidong = listbool("DB105.18");
+                        }
+                    }
+                    spianMapper.UpdataGlassCageState(glassids.getGlassId(), 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+                    spianMapper.UpdateDBCage(ids, cage, cell, 2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+                    spianMapper.UpdataAddCage1(glassids.getGlassWidth(), cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
+                    spianMapper.UpdataOutCage1(glassids.getGlassWidth(), cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+                    spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassids.getGlassId(), 2, qidong2);// 鏂板璋冨害浠诲姟
+                    result.add("鍑虹墖浠诲姟|outend3" + datas+ LocalDateTime.now());
+                    return (200); // 缁撴潫
+
+                } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
+                    StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11, cell);
+                    if (cagecell == null) {
+                        return (300);
+                    }
+                    // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+                    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);
+                    StorageCage glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                    // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+                    result.add("鍑虹墖浠诲姟|outstart4" + datas+ LocalDateTime.now());
+                    outmesid(glassids.getGlassId(), "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+                    S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+                    //S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                    boolean qidong = listbool("DB105.18");
+                    int qidong2 = 2;
+                    if (qidong == true) {
+                        qidong2 = 1;
+                    } else {
+                        while (qidong) {
+                            S7control.getinstance().WriteWord("DB105.18", (short) 1);// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负1
+                            qidong = listbool("DB105.18");
+                        }
+                    }
+                    spianMapper.UpdataGlassCageState(glassids.getGlassId(), 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+                    spianMapper.UpdateDBCage(ids, cage, cell, 2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+                    spianMapper.UpdataAddCage1(glassids.getGlassWidth(), cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
+                    spianMapper.UpdataOutCage1(glassids.getGlassWidth(), cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+                    spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassids.getGlassId(), 2, qidong2);// 鏂板璋冨害浠诲姟
+                    result.add("鍑虹墖浠诲姟|outend4" + datas+ LocalDateTime.now());
+                    return (200);// 缁撴潫
+
+                }
+            }
+        }
+    } catch (Exception e) {
+        e.printStackTrace();
+        return (500);
+        // TODO: handle exception
+    }
+}
+
+    // 娲惧彂浠诲姟鐜荤拑id
+    public void outmesid(String glassid, String address) {
+        try {
+            
+       
+        // 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
+    } catch (Exception e) {
+        e.printStackTrace();
+    }
+    }
+
+    // 鑾峰彇鍦板潃鍐呯殑鐜荤拑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;
+    }
+
+    // 鏍规嵁鐜荤拑id瀹屾垚鍦ㄨ繘琛屼腑鐨勪换鍔�
+    public void overtask(String glassid) {
+
+        spianMapper.UpdatetaskOut(glassid.toString());// 瀹屾垚涓婁竴娆� 鍑虹墖鎴栬�呰繘鐗囦换鍔�
+        spianMapper.OverOutSlice(glassid.toString(), 2, 1);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+        spianMapper.UpdataGlassCage(glassid.toString(), 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
+        spianMapper.UpdateCageOver(glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
+        spianMapper.UpdateCageadd(glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
+        String barcode = spianMapper.SelectBarcode(glassid.toString());// 鑾峰彇璇ョ幓鐠冪殑閾濇id
+        //spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
+        
+
+    }
+
+
+    public Short selectAlls(north_glass_buffer1 glasslist) {
+        try {
+            
+            int cage1 = 0;
+            int cells;
+            int ids;
+            int prcid;
+            int tiers;
+            int prctier;
+            double width;
+            double minwidth = 0;
+            double widths;
+            // north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+            // 濡傛灉娌℃湁姝d鏃�
+            if (glasslist == null) {
+                return (300);
+            }
+            //鍒ゆ柇鏄惁瀛樺湪绗煎瓙閲�
+            short result = homeMapper.SelectStorageByGlassId(glasslist.getbarcode());
+            if (result > 0) {
+                return (500);
+            }
+
+            
+            if(glasslist.getglasslengthmm()>glasslist.getglassheightmm()) {
+                widths= glasslist.getglasslengthmm();
+            }else{
+                widths= glasslist.getglassheightmm();
+            }
+            // Map result=new HashMap();
+           
+    
+            String orderids = glasslist.getordernumber();
+            String FrameBarcode = glasslist.getFrameBarcode();
+            String glassid = glasslist.getbarcode();
+    
+    
+            // String orderid="A001";
+            // 鑾峰彇閾濇鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
+            List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 400);
+            // 鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂�
+    
+            if (storageCage.size() == 0) {
+                storageCage = spianMapper.selectAll(orderids, FrameBarcode);
+            }
+    
+            if (storageCage == null) {
+                return (400);
+            }
+            for (StorageCage storageCage2 : storageCage) {
+                // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+                cage1 = storageCage2.getCage();
+                // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
+                StorageCage cages = spianMapper.selectCage(cage1);
+    
+                // 濡傛灉鐩搁偦绗煎瓙娌℃湁绌烘牸,鎴栬�呮湁姝e湪鎵ц鐨勫嚭鐗囦换鍔℃椂杩斿洖400
+                if (cages == null) {
+                    return (400);
+                }
+                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.getCell() >= 1 && storageCage2.getDisabled() == 0) {
+                    
+                    return (0);
+    
+                }
+    
+            }
+            return (400);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return (500);
+            // TODO: handle exception
         }
     
-}
-    
+        }
+
 }

--
Gitblit v1.8.0