From 8a8a404516c6ab5a9b9012b148cbc83b78020a65 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 三月 2024 16:56:10 +0800
Subject: [PATCH] 更新代码、增加json文件和读写

---
 /dev/null                                                                         |   51 ---
 springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java    |   14 
 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java  |    3 
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java    |   47 +-
 springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java         |   42 --
 springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java |   23 +
 springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java    |  156 +++++----
 springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java         |    2 
 springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java        |    6 
 springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java      |    4 
 springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java        |   74 +---
 springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json                       |  424 ++++++++++++++++++++++++++++
 12 files changed, 592 insertions(+), 254 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
index 6181031..e9e5ee3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
@@ -24,29 +24,30 @@
 
     // 鍗曚緥瀹炰緥
     private static PLCAutoMes instance;
-    private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
-    private static String PlcRead = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
-    private static String Plcframe = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
-    private static String PlcParameter = PLCAutomaticParameterSettingReview2.class
-            .getResource("/JsonFile/PlcParameter.json").getPath();
-    private static String PlcSign = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json")
-            .getPath();
-    private static String PlcState = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json")
-            .getPath();
-    private static String PlcAlarm = PLCAutoMes.class.getResource("/JsonFile/PlcAlarm.json").getPath();
-    private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
+    // private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
+    private static String PlcAlbania = PLCAutoMes.class.getResource("/JsonFile/PlcAlbania.json").getPath();
+    // private static String PlcRead = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
+    // private static String Plcframe = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
+    // private static String PlcParameter = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcParameter.json").getPath();
+            
+    // private static String PlcSign = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json").getPath();
+            
+    // private static String PlcState = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json").getPath();
+            
+    // private static String PlcAlarm = PLCAutoMes.class.getResource("/JsonFile/PlcAlarm.json").getPath();
+    // private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
 
     // 璋冪敤initword鏂规硶
 
-    public static PlcParameterObject plcParameterObject = initUtil.initword(PlcParameter);
-    public static PlcBitObject plcPlcTest = initUtil.initbit(PlcTest);
-    public static PlcBitObject  plcBitObject = initUtil.initbit(PlcSign);
-    public static PlcParameterObject  plcStateObject= initUtil.initword(PlcState);
-    public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
-    public static PlcParameterObject PlcMesObject = initUtil.initword(PlcMes);
-    public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
-    public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-
+    // public static PlcParameterObject plcParameterObject = initUtil.initword(PlcParameter);
+    // public static PlcBitObject plcPlcTest = initUtil.initbit(PlcTest);
+    // public static PlcBitObject  plcBitObject = initUtil.initbit(PlcSign);
+    // public static PlcParameterObject  plcStateObject= initUtil.initword(PlcState);
+    // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
+    public static PlcParameterObject PlcMesObject = initUtil.initword(PlcAlbania);
+    // public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
+    // public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
+  
     // 绉佹湁鏋勯�犲嚱鏁�
     public PLCAutoMes() throws IOException {
         config = new Configuration("config.properties");
@@ -73,9 +74,9 @@
 
             // System.out.println(jsonFilePath);
 
-            readAndUpdateWordValues(PlcReadObject);
+            //readAndUpdateWordValues(PlcReadObject);
             readAndUpdateWordValues(PlcMesObject);
-            readAndUpdateWordValues(PlcframeObject);
+            //readAndUpdateWordValues(PlcframeObject);
             // readAndUpdateWordValues(PlcframeObject);
 
             // readAndUpdateWordValues(plcStateObject);
@@ -92,7 +93,7 @@
             addresses2.add("FeedID");
             addresses2.add("FeedCarStatus");
 
-            System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
+            //System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
 
         }
     }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
deleted file mode 100644
index 30061c1..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.example.springboot.component;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.service.JdbcConnections;
-import com.example.springboot.service.SpianService;
-import com.example.springboot.service.SpianServiceNew;
-import com.example.springboot.entity.north_glass_buffer1;
-import com.example.springboot.mapper.AlarmMapper;
-import com.example.springboot.mapper.SpianMapper;
-
-public class PlcHold extends Thread {
-
-  private AlarmMapper alarmMapper;
-
-  @Autowired
-  private JdbcConnections jdbcConnections;
-  private SpianMapper spianMapper;
-  private SpianService spianService;
-  private SpianServiceNew spianServiceNew;
-  int aaa;
-
-  @Override
-  public void run() {
-
-    while (this != null) {
-      try {
-
-        Thread.sleep(100);
-      } catch (InterruptedException e) {
-        // \\ TODO Auto-generated catch block
-        e.printStackTrace();
-      }
-
-      // if (S7control.getinstance().CheckConnected() == false) {
-      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
-      spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
-      spianServiceNew = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
-      jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
-      // 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
-      // try {
-      // north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
-      // // System.out.println(glass.getOrderId());
-      // } catch (SQLException e) {
-      // // TODO Auto-generated catch block
-      // e.printStackTrace();
-      // }
-
-      // 鍑虹墖浠诲姟////////////////////////////////
-      spianServiceNew.selectout2("X21942613103GV");
-
-      List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
-      List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
-
-      boolean Plcout = spianService.listbool("DB106.64"); // 鍑虹墖璇锋眰瀛�
-      boolean Plcout2 = spianService.listbool("DB105.18"); // 鍑虹墖鍚姩
-      if (Plcout == false&&Plcout2==true) {
-        S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
-        System.out.println("鍏抽棴鍑虹墖鍚姩" + LocalDateTime.now());// 鍑虹墖浠诲姟鍙戦�佸瓧鏀逛负0
-      }
-      boolean Plcadd = spianService.listbool("DB106.24"); // 杩涚墖璇锋眰瀛�
-      boolean Plcadd2 = spianService.listbool("DB105.16"); // 杩涚墖鍚姩
-      if (Plcadd == false&&Plcadd2==true) {
-        S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
-        System.out.println("鍏抽棴杩涚墖鍚姩" + LocalDateTime.now());// 杩涚墖浠诲姟鍙戦�佸瓧鏀逛负0
-      }
-      
-
-
-      // StringBuilder writedstrIdOut = new StringBuilder();
-      // 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
-      byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
-      String writedstrIdOut = new String(writedglassidbytesOut);
-
-   
-      if (Plcout == true) {
-        // 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
-        int outnum = spianMapper.SelectOutSliceshu();//鏄惁鏈夋鍦ㄥ嚭鐗囩殑浠诲姟
-        int cageoutsum = spianMapper.Selectcageout(3);//绗煎瓙鍐呮槸鍚﹁繕鏈夊湪鍑虹墖鐨勭幓鐠�
-        // 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
-        if (outnum == 0 &&  Plchome.isAllowQueue == true && cageoutsum == 0) {
-          // 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
-          String outglassid = spianMapper.SelectOutSlice();
-          // 褰撴湁寰呭嚭鐗囩殑鐜荤拑鏃�
-          if (outglassid != null) {
-            // 鑾峰彇璇ョ幓鐠冩槸鍚﹁绂佺敤
-            int glassdisabled = spianMapper.SelectCageGlassState(outglassid);
-            // 鏈鐢ㄤ笅鍙戜换鍔�
-            if (glassdisabled == 0) {
-              spianService.selectout2(outglassid);
-              Plchome.isQueueWarning = false;
-            } else { // 绂佺敤鏇存敼鐘舵�佸脊鍑烘彁绀�
-              Plchome.isQueueWarning = true;
-            }
-
-          }
-        }
-     
-      }
-
-      ///////////// 杩涚墖浠诲姟
-      List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
-      List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
-      List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
-      boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
-      boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
-      StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
-      StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
-
-      // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
-      if (B01backs == true) {
-        // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
-        int HB = spianMapper.SelectHB(B01glassid.toString());
-        if (HB > 0) {
-          // 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1
-          S7control.getinstance().WriteWord("DB105.48", (short) 1);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
-          boolean yingda = spianService.listbool("DB105.48");// b01姹囨姤
-          if (yingda == true) {
-            spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
-          }
-          System.out.println("姹囨姤鏃禕01|绗�" + aaa + "娆�" + B01glassid + "搴旂瓟" + yingda);
-          aaa += 1;
-        }
-
-      }else{
-        S7control.getinstance().WriteWord("DB105.48", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
-      }
-
-      // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
-      if (B02backs == true) {
-        // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
-        int HB = spianMapper.SelectHB(B02glassid.toString());
-        System.out.println("姹囨姤鏃禕02|" + B02glassid);
-        if (HB > 0) {
-          // 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
-
-          S7control.getinstance().WriteWord("DB105.50", (short) 1);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
-          System.out.println("姹囨姤鏃禕02ID|" + B02glassid);
-          boolean yingda = spianService.listbool("DB105.50");// b02姹囨姤
-          if (yingda == true) {
-            spianService.overtask(B02glassid.toString());// 瀹屾垚浠诲姟
-          }
-          System.out.println("姹囨姤鏃禕02|绗�" + aaa + "娆�" + B02glassid + "搴旂瓟" + yingda);
-        }
-      }else{
-         S7control.getinstance().WriteWord("DB105.50", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
-      }
-
-
-      // 鑾峰彇DO1鏁版嵁
-      StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
-      // 鑾峰彇DO2鏁版嵁
-      StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
-
-      int questate = spianMapper.Selectquecount(queueid1.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
-      // queueid1.toString().isEmpty()
-      north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01鐨勭幓鐠冧俊鎭�
-      north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
-      // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
-      if (queueid1 != null && questate == 0) {
-        // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
-        if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
-          spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
-        } else {
-
-          spianMapper.Updatequeue(queueid1.toString(), glass1.getordernumber(), glass1.getlistnumber(),
-              glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
-              glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
-        }
-
-      }
-
-      if (queueid2 != null) {
-        // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
-        if (glass2 == null) {
-          spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
-        } else {
-          spianMapper.Updatequeue(queueid2.toString(), glass2.getordernumber(), glass2.getlistnumber(),
-              glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
-              glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
-          spianMapper.overqueue2(queueid2.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
-          S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
-        }
-
-      }
-
-      // 鏌ヨ鏁版嵁搴�
-      // 鎺ㄩ�佸埌鍓嶇
-
-      // }
-    }
-  }
-
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 6821383..b42984e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.example.springboot.service.JdbcConnections;
-import com.example.springboot.service.SpianService;
+import com.example.springboot.service.SpianServiceNew;
 import com.example.springboot.entity.north_glass_buffer1;
 import com.example.springboot.entity.device.PlcParameterObject;
 import com.example.springboot.mapper.AlarmMapper;
@@ -19,7 +19,7 @@
   @Autowired
   private JdbcConnections jdbcConnections;
   private AlbaniaMapper albaniaMapper;
-  private SpianService spianService;
+  private SpianServiceNew spianService;
   int aaa;
 
   @Override
@@ -35,7 +35,7 @@
       }
 
       // if (S7control.getinstance().CheckConnected() == false) {
-      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+      spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
       albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
 
       //璇诲彇DB105鍖烘枃浠�
@@ -48,95 +48,103 @@
       String OutActivate=plcmes.getPlcParameter("OutActivate").getValue();//鍑虹墖璇锋眰浜岀嚎
       String AddRequest=plcmes.getPlcParameter("AddRequest").getValue();//杩涚墖璇锋眰
       String CarRequest=plcmes.getPlcParameter("CatReque").getValue();//杩愰�佽溅璇锋眰
-           
-      // 鍑虹墖浠诲姟
+      String Tastoverid=plcmes.getPlcParameter("Tastoverid").getValue();//浠诲姟瀹屾垚
+      String glassid=plcmes.getPlcParameter("glassid").getValue();//鐜荤拑id
       
+      //璋冪敤鍑虹墖浠诲姟
       if (OutActivate.equals("1") == false&&CarRequest.equals("0")==true) {
-        S7control.getinstance().WriteWord("DB105.18", (short)1);// 灏嗗ぇ杞︾殑鐘舵�佹敼涓鸿繍杈撲腑
-
+        //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
+        spianService.selectout(glassid);
       }
-      
+      //璋冪敤杩涚墖浠诲姟
+      if(AddRequest.equals("1")==true&&CarRequest.equals("0")==true){
+        //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
+        
+        spianService.selectAll(albaniaMapper.SelectGlass());
+      }
       
 
       ///////////// 杩涚墖浠诲姟      
 
-      String B01backs = plcread.getPlcParameter("B01CompleteTheReport").getValue();// b01姹囨姤
-      String B02backs = plcread.getPlcParameter("B02CompleteTheReport").getValue();// b02姹囨姤
+      // String B01backs = plcread.getPlcParameter("B01CompleteTheReport").getValue();// b01姹囨姤
+      // String B02backs = plcread.getPlcParameter("B02CompleteTheReport").getValue();// b02姹囨姤
       
-      String B01glassid = plcstate.getPlcParameter("B01ID1").getValue();// BO1鐨勭幓鐠僫d
-      String B02glassid = plcstate.getPlcParameter("B02ID1").getValue();// B02鐨勭幓鐠僫d
+      // String B01glassid = plcstate.getPlcParameter("B01ID1").getValue();// BO1鐨勭幓鐠僫d
+      // String B02glassid = plcstate.getPlcParameter("B02ID1").getValue();// B02鐨勭幓鐠僫d
 
-      // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
-      if (B01backs.equals("1") == true) {
-        // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
-        int HB = spianMapper.SelectHB(B01glassid.toString());
-        if (HB > 0) {
-          // 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
-          S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
-          String yingda =plcmes.getPlcParameter("B01report").getValue();// b01姹囨姤
-          if (yingda.equals("1")) {
-            spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
-          }       
-        }
+      // // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
+      // if (B01backs.equals("1") == true) {
+      //   // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
+      //   int HB = spianMapper.SelectHB(B01glassid.toString());
+      //   if (HB > 0) {
+      //     // 鎭㈠B01灏忚溅搴旂瓟鏀逛负1
+      //     S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
+      //     String yingda =plcmes.getPlcParameter("B01report").getValue();// b01姹囨姤
+      //     if (yingda.equals("1")) {
+      //       spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
+      //     }       
+      //   }
 
-      }else{
-        // 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
-        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 0);
-      }
+      // }else{
+      //   // 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
+      //   S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 0);
+      // }
 
-      // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
-      if (B02backs.equals("1") == true) {
-        // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
-        int HB = spianMapper.SelectHB(B02glassid);
-        if (HB > 0) {
-          // 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
-          S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 1);
-          String yingda =plcmes.getPlcParameter("B01report").getValue();// b02搴旂瓟
-          if (yingda.equals("1") == true) {
-            spianService.overtask(B02glassid);// 瀹屾垚浠诲姟
-          }    
-        }
-      }else{
-        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 0);
-      }
+      // // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
+      // if (B02backs.equals("1") == true) {
+      //   // 鍒ゆ柇鏄惁姹囨姤姝g‘鐨刬d
+      //   int HB = spianMapper.SelectHB(B02glassid);
+      //   if (HB > 0) {
+      //     // 鎭㈠B02灏忚溅搴旂瓟鏀逛负1
+      //     S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 1);
+      //     String yingda =plcmes.getPlcParameter("B01report").getValue();// b02搴旂瓟
+      //     if (yingda.equals("1") == true) {
+      //       spianService.overtask(B02glassid);// 瀹屾垚浠诲姟
+      //     }    
+      //   }
+      // }else{
+      //   S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 0);
+      // }
 
 
-      // 鑾峰彇DO1鏁版嵁
-      String Do1ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
-      // 鑾峰彇DO2鏁版嵁
-      String Do2ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
+      // // 鑾峰彇DO1鏁版嵁
+      // String Do1ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
+      // // 鑾峰彇DO2鏁版嵁
+      // String Do2ID=plcread.getPlcParameter("FeedID").getValue();// 鑾峰彇璇锋眰鐨刬d璺烡O1鍚屾椂娓�
 
 
-      int questate = spianMapper.Selectquecount(Do1ID.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
-      // queueid1.toString().isEmpty()
-      north_glass_buffer1 glass1 = spianMapper.selectGlass(Do1ID);// D01鐨勭幓鐠冧俊鎭�
-      north_glass_buffer1 glass2 = spianMapper.selectGlass(Do2ID);// D02鐜荤拑淇℃伅
-      // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
-      if (Do1ID != null && questate == 0) {
-        // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
-        if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
-          spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
-        } else {
-          spianMapper.Updatequeue(Do1ID.toString(), glass1.getordernumber(), glass1.getlistnumber(),
-          glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
-          glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
-        }
+      // int questate = spianMapper.Selectquecount(Do1ID.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
+      // // queueid1.toString().isEmpty()
+      // north_glass_buffer1 glass1 = spianMapper.selectGlass(Do1ID);// D01鐨勭幓鐠冧俊鎭�
+      // north_glass_buffer1 glass2 = spianMapper.selectGlass(Do2ID);// D02鐜荤拑淇℃伅
+      // // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
+      // if (Do1ID != null && questate == 0) {
+      //   // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
+      //   if (glass1 == null) { // 褰撴病鏈夊�兼椂浼犵┖
+      //     spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 1);
+      //   } else {
+      //     spianMapper.Updatequeue(Do1ID.toString(), glass1.getordernumber(), glass1.getlistnumber(),
+      //     glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
+      //     glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
+      //   }
 
-      }
+      // }
 
-      if (Do2ID != null) {
-        // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
-        if (glass2 == null) {
-          spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
-        } else {
-          spianMapper.Updatequeue(Do2ID.toString(), glass2.getordernumber(), glass2.getlistnumber(),
-          glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
-          glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
-          spianMapper.overqueue2(Do2ID.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
-          S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
-        }
+      // if (Do2ID != null) {
+      //   // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+      //   if (glass2 == null) {
+      //     spianMapper.Updatequeue(null, null, null, null, 0, null, null, null, null, 2);
+      //   } else {
+      //     spianMapper.Updatequeue(Do2ID.toString(), glass2.getordernumber(), glass2.getlistnumber(),
+      //     glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
+      //     glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
+      //     spianMapper.overqueue2(Do2ID.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
+      //     S7control.getinstance().WriteWord("DB105.16", (short) 0);// 鍏抽棴浠诲姟鍚姩
+      //   }
 
-      }
+      // }
 
       // 鏌ヨ鏁版嵁搴�
       // 鎺ㄩ�佸埌鍓嶇
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 1ec9b0b..70c26d9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -18,9 +18,10 @@
         System.out.println("鍚姩瀹屾垚");
 
         //  new PlcHold().start();
+        new PlcHoldNew().start();
         // new PLCAutoMes().start();
 
-        new Plchome().start();
+        //new Plchome().start();
         //  new PlcLayout().start();
         //  new Plcalarm().start();
 
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
index 0d6a010..252f38e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -8,7 +8,7 @@
 
 @Data
 @TableName("`flowcard`")
-public class flowcard {
+public class FlowCard {
   private Integer id;// 鑷id
   private String flowcard;// 娴佺▼鍗d
   private Integer number;// 鐜荤拑鏁伴噺
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
index 568facc..b378802 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
@@ -8,17 +8,17 @@
 
 @Data
 @TableName("`glassinfo`")
-public class glassinfo {
+public class GlassInfo {
   private Integer id;// 鑷id
   private String flowcard;// 娴佺▼鍗d
   private Integer glasstype;// 鐜荤拑绫诲瀷
   private Integer mateid;// 閰嶇墖id
-  private Integer glassid;// 鐜荤拑id
+  private String glassid;// 鐜荤拑id
   private Integer tier;// 灞�
   private String films;// 鑶滅郴
   private Double width;// 瀹�
   private Double height;// 楂�
-  private String thickness;// 鍘�
+  private Double thickness;// 鍘�
   private Integer number;// 鏁伴噺
   private Integer finishnumber;// 瀹屾垚鏁伴噺
 
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
index 972b185..c9a594f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -63,11 +63,11 @@
     /**
      * 缂栧彿
      */
-    private String listId;
+    private String thickness;
     /**
      * 绠卞瓙鍙�
      */
-    private String boxId;
+    private String films;
     /**
      * 鐘舵�侊紙0锛氭棤鐜荤拑锛�1锛氭湁鐜荤拑锛�2锛氳繘鐗囦腑锛�3锛氬嚭鐗囦腑锛�4锛氳皟搴︿腑锛�
      */
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
index f90a3bc..252f38e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
@@ -1,43 +1,19 @@
 package com.example.springboot.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import lombok.Data;
 
-/**
- * 娴佺▼鍗¤〃
- */
 @Data
-@TableName("flowcard")
+@TableName("`flowcard`")
 public class FlowCard {
-
-    /**
-     * 涓婚敭锛岃嚜鍔ㄧ敓鎴�
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 娴佺▼鍗�
-     */
-    private String flowcard;
-    /**
-     * 鎬诲眰鏁�
-     */
-    private Integer totaltier;
-    /**
-     * 鐜荤拑鏁伴噺
-     */
-    private Integer number;
-    /**
-     * 浠诲姟绾胯矾
-     */
-    private Integer line;
-    /**
-     * 鐘舵��
-     */
-    private Integer state;
+  private Integer id;// 鑷id
+  private String flowcard;// 娴佺▼鍗d
+  private Integer number;// 鐜荤拑鏁伴噺
+  private Integer line;// 浠诲姟璺嚎
+  private Integer state;// 鐘舵��
+ 
 
 }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
index 977b843..b378802 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
@@ -1,69 +1,25 @@
 package com.example.springboot.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import lombok.Data;
 
-/**
- * 鐜荤拑琛�
- */
 @Data
-@TableName("glassinfo")
+@TableName("`glassinfo`")
 public class GlassInfo {
-
-    /**
-     * 涓婚敭锛岃嚜鍔ㄧ敓鎴�
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 娴佺▼鍗d
-     */
-    private Integer flowcard;
-    /**
-     * 鐜荤拑绫诲瀷
-     */
-    private Integer glasstype;
-    /**
-     * 閰嶇墖id
-     */
-    private Integer mateid;
-    /**
-     * 鐜荤拑id
-     */
-    private String glassid;
-    /**
-     * 灞�
-     */
-    private Integer tier;
-    /**
-     * 鑶滅郴
-     */
-    private String films;
-    /**
-     * 瀹�
-     */
-    private Double width;
-    /**
-     * 楂�
-     */
-    private Double height;
-    /**
-     * 鍘氬害
-     */
-    private Double thickness;
-    /**
-     * 鏁伴噺
-     */
-    private Integer number;
-    /**
-     * 瀹屾垚鏁伴噺
-     */
-    private Integer finishnumber;
+  private Integer id;// 鑷id
+  private String flowcard;// 娴佺▼鍗d
+  private Integer glasstype;// 鐜荤拑绫诲瀷
+  private Integer mateid;// 閰嶇墖id
+  private String glassid;// 鐜荤拑id
+  private Integer tier;// 灞�
+  private String films;// 鑶滅郴
+  private Double width;// 瀹�
+  private Double height;// 楂�
+  private Double thickness;// 鍘�
+  private Integer number;// 鏁伴噺
+  private Integer finishnumber;// 瀹屾垚鏁伴噺
 
 }
-
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index 0318b11..f53c73e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -1,10 +1,10 @@
 package com.example.springboot.mapper;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
-import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.GlassInfo;
 
 @Mapper
 @Repository
@@ -21,7 +21,15 @@
     //鍑忓皯鐜荤拑鏁�
     @Update("update storage_cage set number=number-1,width=width+glasswidth where id=#{id}")
     void UpdateCageNumberOut(int id);
-    
+    //澧炲姞浠诲姟璁板綍
+    @Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id,count,finsh_time) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid},#{count},#{qidong});")
+    void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int count,int qidong);
+    //鏂板涓�鏉$瀛愭暟鎹�
+    @Update("UPDATE `albania`.`storage_cage` SET `glass_id` =#{glassid}, `width` =width-#{glasswidth}, `glasswidth` =#{glasswidth}, `glassheight` =#{glassheight}, `glasswidthmm` =#{glasswidthmm}, `glassheightmm` = #{glassheightmm},  `state` = #{state}, `glasstype` = #{glasstype}, `number` = #{number} WHERE `id` =#{id};")
+    void AddCage(int id,String glassid,Double glasswidth,Double glassheight,Double glasswidthmm,Double glassheightmm,int state,int glasstype,int number);
+    //鑾峰彇杩涚墖鏁版嵁
+    @Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype from queue where glasstype=1")
+    GlassInfo SelectGlass();
     
 
 }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 262411c..f779ef2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -7,11 +7,8 @@
 import com.example.springboot.component.PLCAutoMes;
 import com.example.springboot.component.S7control;
 import com.example.springboot.entity.GlassInfo;
-import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.glassinfo;
 import com.example.springboot.entity.device.PlcParameterObject;
 import com.example.springboot.mapper.AlbaniaMapper;
-import com.example.springboot.mapper.SpianMapper;
 import com.google.common.primitives.Bytes;
 
 
@@ -24,11 +21,20 @@
 public Short selectAll(GlassInfo glassInfo) {
     //瀹氫箟鍒濆瀛楁
     int cageid;
+    String glassid=glassInfo.getGlassid();
+    Double width=glassInfo.getWidth();
+    Double height=glassInfo.getHeight();
+    int glasstype=glassInfo.getGlasstype();
+    
+    
 
     //鍒ゆ柇鏄惁鏈夊悓绫诲瀷鐨�
      cageid=albaniaMapper.SelectCage(glassInfo.getGlasstype(), glassInfo.getWidth(), 50);
     //濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
     if(cageid!=Integer.MIN_VALUE){
+        //鍙戦�乸lc浠诲姟
+        
+        //浠诲姟瀹屾垚鍚庡鍔犳暟閲�
         albaniaMapper.UpdateCageNumberAdd(cageid);
     }else{
          //鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
@@ -36,17 +42,26 @@
             cageid=albaniaMapper.SelectNewCell(3,5);
         }else{
             cageid=albaniaMapper.SelectNewCell(3,5);
+            //鍙戦�乸lc浠诲姟
         }
         //褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
         if(cageid==Integer.MIN_VALUE){
             return(400);
+        }else{
+            //鍒ゆ柇瀹屾垚浠诲姟鍚庡鍔犳暟閲�
+            albaniaMapper.AddCage(cageid, glassid, width, height, width, height, 0, glasstype, 1);
         }
     }
+    //澧炲姞浠诲姟璁板綍
+    albaniaMapper.Inserttask(0, 0, 0, cageid, glassInfo.getGlassid(), 0, 0);
     return(200);
 
 }
 
-    public Short selectout2(String glassid) {
+
+    public Short selectout(String glasstype) {
+        //鍒ゆ柇绗煎瓙鏈�鍏堝嚭鍝墖
+         
        
         return(200);// 缁撴潫
     }
diff --git a/springboot-vue3/src/main/resources/JsonFile/Albania.json b/springboot-vue3/src/main/resources/JsonFile/Albania.json
deleted file mode 100644
index 751f96c..0000000
--- a/springboot-vue3/src/main/resources/JsonFile/Albania.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-   "plcAddressBegin":"DB17.0",
-   "plcAddressLenght":"272",
-   "dataType":"word",
-   "parameteInfor":[
-      {
-         "codeId": "PLCToMesIn",  
-         "addressIndex":"0",
-         "addressLenght":"2", 
-         "ratio":"1", 
-         "unit":"m/min"    
-      },
-      {
-          "codeId": "PLCINID",
-          "addressIndex":"16",
-          "addressLenght":"2",
-          "ratio":"1",
-          "unit":"m/min"      
-       },
-       {
-          "codeId": "InIdState",
-          "addressIndex":"18",
-          "addressLenght":"2",
-          "ratio":"1",
-          "unit":"m/min"       
-       },
-       {
-          "codeId": "J01Quest",
-          "addressIndex":"20",
-          "addressLenght":"2",
-          "ratio":"1",
-          "unit":"mm/S"
-       },
-       {
-          "codeId": "J01id",
-          "addressIndex":"22",
-          "addressLenght":"14",
-          "ratio":"1",
-          "unit":"mm/S"
-       },
-       {
-          "codeId": "J01TurnGo",
-          "addressIndex":"38",
-          "addressLenght":"2",
-          "ratio":"1",
-          "unit":"mm/S"
-       }
-
-
-   ]
-}
diff --git a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
new file mode 100644
index 0000000..bfde5fe
--- /dev/null
+++ b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
@@ -0,0 +1,424 @@
+{
+   "plcAddressBegin":"DB14.0",
+   "plcAddressLenght":"210",
+   "dataType":"word",
+   "parameteInfor":[
+      {
+         "codeId": "PLCToMES",  
+         "addressIndex":"0",
+         "addressLenght":"2", 
+         "ratio":"1", 
+         "unit":"m/min"    
+      },
+      {
+          "codeId": "IDStatus1",
+          "addressIndex":"2",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"m/min"      
+       },
+       {
+          "codeId": "IDStatus2",
+          "addressIndex":"4",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"m/min"       
+       },
+       {
+          "codeId": "IDStatus3",
+          "addressIndex":"6",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "IDStatus4",
+          "addressIndex":"8",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "IDStatus5",
+          "addressIndex":"10",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       }
+       ,
+       {
+          "codeId": "IDStatus6",
+          "addressIndex":"12",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "StautsID1",
+          "addressIndex":"14",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       }
+       ,
+       {
+          "codeId": "StautsID2",
+          "addressIndex":"16",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       }
+       ,
+       {
+          "codeId": "StautsID3",
+          "addressIndex":"18",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       }
+       ,
+       {
+          "codeId": "StautsID4",
+          "addressIndex":"20",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       }
+       ,
+       {
+          "codeId": "StautsID5",
+          "addressIndex":"22",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "StautsID6",
+          "addressIndex":"24",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "GaToMES",
+          "addressIndex":"26",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "Height",
+          "addressIndex":"28",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "width",
+          "addressIndex":"30",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "ExportTOMES1",
+          "addressIndex":"32",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       }
+       ,
+       {
+          "codeId": "ExportToMES2",
+          "addressIndex":"34",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       } ,
+       {
+          "codeId": "MESToPLC",
+          "addressIndex":"36",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       } ,
+       {
+          "codeId": "MESID1",
+          "addressIndex":"38",
+          "addressLenght":"14",
+          "ratio":"1",
+          "unit":"mm/S"
+       } ,
+       {
+          "codeId": "MESID2",
+          "addressIndex":"54",
+          "addressLenght":"14",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "MESID3",
+          "addressIndex":"70",
+          "addressLenght":"14",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "MESID4",
+          "addressIndex":"86",
+          "addressLenght":"14",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "MESID5",
+          "addressIndex":"102",
+          "addressLenght":"14",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "MESID6",
+          "addressIndex":"118",
+          "addressLenght":"14",
+          "ratio":"1",
+          "unit":"mm/S"
+       },
+       {
+          "codeId": "MESToPLCStart1",
+          "addressIndex":"134",
+          "addressLenght":"2",
+          "ratio":"1",
+          "unit":"mm/S"
+       },{
+         "codeId": "MESToPLCStart2",
+         "addressIndex":"136",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStart3",
+         "addressIndex":"138",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      }
+      ,{
+         "codeId": "MESToPLCStart4",
+         "addressIndex":"140",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      }
+      ,{
+         "codeId": "MESToPLCStart5",
+         "addressIndex":"142",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      }
+      ,{
+         "codeId": "MESToPLCStart6",
+         "addressIndex":"144",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCTarget1",
+         "addressIndex":"146",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCTarget2",
+         "addressIndex":"148",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCTarget3",
+         "addressIndex":"150",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCTarget4",
+         "addressIndex":"152",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCTarget5",
+         "addressIndex":"154",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCTarget6",
+         "addressIndex":"156",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStatus1",
+         "addressIndex":"158",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStatus2",
+         "addressIndex":"160",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStatus3",
+         "addressIndex":"162",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStatus4",
+         "addressIndex":"164",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStatus5",
+         "addressIndex":"166",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToPLCStatus6",
+         "addressIndex":"168",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MESToGaStatus",
+         "addressIndex":"170",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "A01Err",
+         "addressIndex":"172",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "A02Err",
+         "addressIndex":"174",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "B01Err",
+         "addressIndex":"176",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "C01Err",
+         "addressIndex":"178",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "C02Err",
+         "addressIndex":"180",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "ErrSpace1",
+         "addressIndex":"182",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "ErrSpace2",
+         "addressIndex":"184",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "ErrSpace3",
+         "addressIndex":"186",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "B01Position",
+         "addressIndex":"188",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "C01Position",
+         "addressIndex":"190",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "C02Position",
+         "addressIndex":"192",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "DeviceState",
+         "addressIndex":"194",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "AllFVRun",
+         "addressIndex":"196",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "A01State",
+         "addressIndex":"198",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "A02State",
+         "addressIndex":"200",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "B01State",
+         "addressIndex":"202",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "C01State",
+         "addressIndex":"204",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "C02State",
+         "addressIndex":"206",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      },{
+         "codeId": "MainControl",
+         "addressIndex":"208",
+         "addressLenght":"2",
+         "ratio":"1",
+         "unit":"mm/S"
+      }
+
+
+
+
+   ]
+}

--
Gitblit v1.8.0