From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] -切换大模组代码更改

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java |   90 +++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index 866ec12..8f30776 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -11,43 +11,45 @@
      * OP230
      */
 //    public static final String PACK_OP010_RecordSN = "PACK.OP1010.RecordSN";//璇锋眰涓嬪彂SN鍙�
-    public static final String PACK_OP230_RecordData = "PACK.OP230.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP230_RecordData = "PACK.POP230.RecordData";//璇锋眰璁板綍鏁版嵁
     public static final String PACK_OP230_AngleResult = "PACK.OP230.AngleResult";//璇锋眰鎷х揣鏁版嵁
     /**
      * OP240
      */
-    public static final String PACK_OP240_RecordData = "PACK.OP240.RecordData";//璇锋眰璁板綍鏁版嵁
-    public static final String PACK_OP240_AngleResult = "PACK.OP240.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP240_RecordData = "PACK.POP240.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP240_TighteningFrequency = "PACK.POP240.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_PPOP241_TighteningFrequency = "PACK.PPOP241.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_PPOP242_TighteningFrequency = "PACK.PPOP242.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP301_TighteningFrequency = "PACK.POP301.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
 
-//    public static final String PACK_OP2502_RecordData = "PACK.OP250-2.RecordData";//璇锋眰璁板綍鏁版嵁
-    public static final String PACK_OP2501_AngleResult = "PACK.OP250-1.AngleResult";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP2502_AngleResult = "PACK.OP250-2.AngleResult";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP2503_AngleResult = "PACK.OP250-3.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP3601_RecordData = "PACK.POP360-1.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP3602_RecordData = "PACK.POP360-2.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP3603_RecordData = "PACK.POP360-3.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP3604_RecordData = "PACK.POP360-4.RecordData";//璇锋眰鎷х揣鏁版嵁
 
-    public static final String PACK_OP4301_RecordData = "PACK.OP430-1.RecordData";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP4302_RecordData = "PACK.OP430-2.RecordData";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP4303_RecordData = "PACK.OP430-3.RecordData";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP4304_RecordData = "PACK.OP430-4.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP4101_RecordData = "PACK.POP410-1.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP4102_RecordData = "PACK.POP410-2.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP4103_RecordData = "PACK.POP410-3.RecordData";//璇锋眰鎷х揣鏁版嵁
 
-    public static final String PACK_OP4801_RecordData = "PACK.OP480-1.RecordData";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP4802_RecordData = "PACK.OP480-2.RecordData";//璇锋眰鎷х揣鏁版嵁
-    public static final String PACK_OP4803_RecordData = "PACK.OP480-3.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP4201_RecordData = "PACK.POP420-1.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP4202_RecordData = "PACK.POP420-2.RecordData";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP4203_RecordData = "PACK.POP420-3.RecordData";//璇锋眰鎷х揣鏁版嵁
 
 
 
     /**
      * OP260
      */
-    public static final String PACK_OP260_RecordData = "PACK.OP260.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP250_RecordData = "PACK.POP250.RecordData";//璇锋眰璁板綍鏁版嵁
 
-    public static final String PACK_OP260_AngleResult = "PACK.OP260.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP250_TighteningFrequency = "PACK.POP250.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
 
     /**
      * OP270
      */
-    public static final String PACK_OP270_RecordData = "PACK.OP270.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP260_RecordData = "PACK.POP260.RecordData";//璇锋眰璁板綍鏁版嵁
 
-    public static final String PACK_OP270_AngleResult = "PACK.OP270.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP260_TighteningFrequency = "PACK.POP260.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
     /**
      * OP290
      */
@@ -58,76 +60,70 @@
     /**
      * OP300
      */
-    public static final String PACK_OP300A_RecordData = "PACK.OP300A.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP281_RecordData = "PACK.POP281.RecordData";//璇锋眰璁板綍鏁版嵁
 
     public static final String PACK_OP300B_RecordData = "PACK.OP300B.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP310
      */
-    public static final String PACK_OP310A_RecordData = "PACK.OP310A.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP282_RecordData = "PACK.POP282.RecordData";//璇锋眰璁板綍鏁版嵁
 
     public static final String PACK_OP310B_RecordData = "PACK.OP310B.RecordData";//璇锋眰璁板綍鏁版嵁
 
 
-    public static final String PACK_OP320A_RecordData = "PACK.OP320A.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP283_RecordData = "PACK.POP283.RecordData";//璇锋眰璁板綍鏁版嵁
 
     public static final String PACK_OP320B_RecordData = "PACK.OP320B.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP330
      */
-    public static final String PACK_OP330_RecordData = "PACK.OP330.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP284_RecordData = "PACK.POP284.RecordData";//璇锋眰璁板綍鏁版嵁
 
 //    public static final String PACK_OP330B_RecordData = "PACK.OP330B.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP380
      */
-    public static final String PACK_OP380_RecordData = "PACK.OP380.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP310_RecordData = "PACK.POP310.RecordData";//璇锋眰璁板綍鏁版嵁
 
-    public static final String PACK_OP380_AngleResult = "PACK.OP380.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP310_TighteningFrequency = "PACK.POP310.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
     /**
      * OP400
      */
-    public static final String PACK_OP400_RecordData = "PACK.OP400.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP330_RecordData = "PACK.POP330.RecordData";//璇锋眰璁板綍鏁版嵁
 
-    public static final String PACK_OP400_AngleResult = "PACK.OP400.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP330_TighteningFrequency = "PACK.POP330.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
     /**
      * OP410
      */
-    public static final String PACK_OP410_RecordData = "PACK.OP410.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP340_RecordData = "PACK.POP340.RecordData";//璇锋眰璁板綍鏁版嵁
 
-    public static final String PACK_OP410_AngleResult = "PACK.OP410.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP340_TighteningFrequency = "PACK.POP340.TighteningFrequency";//璇锋眰鎷х揣鏁版嵁
     /**
      * OP440
      */
-    public static final String PACK_OP440_RecordData = "PACK.OP440.RecordData";//璇锋眰璁板綍鏁版嵁
-
-    public static final String PACK_OP440_AngleResult = "PACK.OP440.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP370_RecordData = "PACK.POP370.RecordData";//璇锋眰璁板綍鏁版嵁
     /**
      * OP450
      */
-    public static final String PACK_OP450_RecordData = "PACK.OP450.RecordData";//璇锋眰璁板綍鏁版嵁
-
-    public static final String PACK_OP450_AngleResult = "PACK.OP450.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP380_RecordData = "PACK.POP380.RecordData";//璇锋眰璁板綍鏁版嵁
     /**
      * OP460
      */
-    public static final String PACK_OP460_RecordData = "PACK.OP460.RecordData";//璇锋眰璁板綍鏁版嵁
-
-    public static final String PACK_OP460_AngleResult = "PACK.OP460.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK_POP390_RecordData = "PACK.POP390.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
-     * OP500
+     *
      */
-    public static final String PACK_OP500_RecordData = "PACK.OP500.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP430_RecordData = "PACK.POP430.RecordData";//璇锋眰璁板綍鏁版嵁
 
-    public static final String PACK_OP500_AngleResult = "PACK.OP500.AngleResult";//璇锋眰鎷х揣鏁版嵁
+    public static final String PACK__AngleResult = "PACK..AngleResult";//璇锋眰鎷х揣鏁版嵁
     /**
      * OP280
      */
-    public static final String PACK_OP280_RecordData = "PACK.OP280.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP270_RecordData = "PACK.POP270.RecordData";//璇锋眰璁板綍鏁版嵁
     /**
      * OP320
      */
@@ -135,36 +131,36 @@
     /**
      * OP340
      */
-    public static final String PACK_OP340A_RecordData = "PACK.OP340A.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP285_RecordData = "PACK.POP285.RecordData";//璇锋眰璁板綍鏁版嵁
 
     public static final String PACK_OP340B_RecordData = "PACK.OP340B.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP350
      */
-    public static final String PACK_OP350A_RecordData = "PACK.OP350A.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP286_RecordData = "PACK.POP286.RecordData";//璇锋眰璁板綍鏁版嵁
 
     public static final String PACK_OP350B_RecordData = "PACK.OP350B.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP360
      */
-    public static final String PACK_OP360_RecordData = "PACK.OP360.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP290_RecordData = "PACK.POP290.RecordData";//璇锋眰璁板綍鏁版嵁
 
     public static final String PACK_OP365_RecordData = "PACK.OP365.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP370
      */
-    public static final String PACK_OP370_RecordData = "PACK.OP370.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP300_RecordData = "PACK.POP300.RecordData";//璇锋眰璁板綍鏁版嵁
     /**
      * OP390
      */
-    public static final String PACK_OP390_RecordData = "PACK.OP390.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP320_RecordData = "PACK.POP320.RecordData";//璇锋眰璁板綍鏁版嵁
     /**
      * OP470
      */
-    public static final String PACK_OP470_RecordData = "PACK.OP470.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String PACK_POP400_RecordData = "PACK.POP400.RecordData";//璇锋眰璁板綍鏁版嵁
 
 
 }
\ No newline at end of file

--
Gitblit v1.9.3