From 4cdcf84577f52d8dd991cd90045264170da81c0c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 18 九月 2023 01:26:19 +0800
Subject: [PATCH] 晚上调试修改的内容

---
 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 8c8565a..b078f4a 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
@@ -101,14 +101,15 @@
                     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.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
                    spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//鏂板璋冨害浠诲姟
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
                         S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-                        String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                        System.out.println(datas);  
                         outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
                     return Result.success(cagecell); //缁撴潫
 
@@ -127,14 +128,15 @@
                     datas.add((short) prcid2);
                     datas.add((short) 2);
                     datas.add((short) 1);
+                    String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
                     spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//鏂板璋冨害浠诲姟
                     spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
-                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
                     spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
                     spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
                         S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�    
-                        String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                        
                         outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID         
                      return Result.success(cagecell); //缁撴潫
 
@@ -313,15 +315,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.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
                    spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
                    spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
                    spianMapper.Inserttask(2, 0,cageout.getId(),ids,glassid);//鏂板璋冨害浠诲姟
                    spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板鍑虹墖浠诲姟
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
                         S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-                        String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                        
                         outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID         
                     return (200); //缁撴潫
 
@@ -340,15 +343,16 @@
                     datas.add((short) prcid2);
                     datas.add((short) 2);
                     datas.add((short) 1);
+                    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.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
                     spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
-                    spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
                     spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
                     // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
                         S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�   
-                        String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+                        
                         outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
                      return (200);//缁撴潫
 
@@ -359,11 +363,13 @@
     }
 
     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
     }
 

--
Gitblit v1.8.0