From e36b74525f9c7400da2d3438c5e4164622da059a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 24 一月 2024 13:14:21 +0800
Subject: [PATCH] 封装初始化方法为工具类,方便调用, getPlcParameterValues getPlcBitValues 方法codeid 按照传入参数的顺序遍历 来获取值

---
 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 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 7d4844b..1179f74 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
@@ -19,7 +19,7 @@
     // @GetMapping("/all")
     public Short selectAll(String glassid) {
 
-        int cage1;
+        int cage1=0;
         int cells;
         int ids;
         int prcid;
@@ -33,12 +33,7 @@
         if (glasslist == null) {
             return (300);
         }
-        //鍒ゆ柇鏄惁杩樻湁杩涚墖浠诲姟鏈畬鎴愮殑
-        int cagestate=spianMapper.SelectCageState(2);
-        //鏈夎繘鐗囦换鍔℃湭瀹屾垚鏃惰繑鍥炰笉杩涚墖
-        if(cagestate>0){
-            return (300);
-        }
+       
         double widths = glasslist.getglasslengthmm();
         String orderids = glasslist.getordernumber();
         String FrameBarcode = glasslist.getFrameBarcode();
@@ -54,7 +49,10 @@
 
         // String orderid="A001";
         // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
-        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode);
+        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode,widths,400);
+        //鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂�
+        
+        
         if (storageCage.size() == 0) {
             storageCage = spianMapper.selectAll(orderids, FrameBarcode);
         }
@@ -171,10 +169,10 @@
 
             spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state);// 鏂板浠诲姟
             // int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
-            if (state == 2) {
-                spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
-                spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
-            }
+            // if (state == 2) {
+            //     spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
+            //     spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
+            // }
             System.out.println("鍑虹墖浠诲姟|" + datas);
             S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
             outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID

--
Gitblit v1.8.0