Klosszhu преди 2 години
родител
ревизия
88761b26f1

+ 1 - 0
Fine.IHttpServer/obj/Debug/Fine.IHttpServer.csproj.FileListAbsolute.txt

@@ -31,3 +31,4 @@ E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHt
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.csproj.CoreCompileInputs.cache
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.dll
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.pdb
+E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.csproj.AssemblyReference.cache

+ 0 - 11
Fine.OPCDaClient/App/Common/AppUtil.cs

@@ -765,18 +765,7 @@ namespace Fine.OPCDaClient.Util
             LogMsg msg = new LogMsg();
             msg.Retinfo = new RetMsg();
             msg.ExeTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff");
-            //msg.ExeProc = "START_HC";
-            ///操作标签,从配置文件中获取
-            ///
-            //string strCurMethod = MethodBase.GetCurrentMethod().Name;
-            //IoModal iovar=new IoModal();
             IoModal iovar = GetObjtag(varIOS, strMethod);
-            //if (iovar == null || iovar.CheckTagName == "" || iovar.WriteTagName == "")   //没有获取到配置信息
-            //{
-            //    msg.Retinfo.IsSetSuccessful = false;
-            //    msg.Retinfo.Message = "无法获取配置项!";
-            //    return msg.Retinfo;
-            //}
             //判断标签的数据类型
 
 

Файловите разлики са ограничени, защото са твърде много
+ 196 - 730
Fine.OPCDaClient/App/L5K_YP_HC.cs


+ 2 - 2
Fine.OPCDaClient/DataMode/IoModal.cs

@@ -21,8 +21,8 @@ namespace Fine.OPCDaClient
         public string CheckValue { get; set; }
 
         public bool VerityCheck { get; set; } = true;
-        public bool? IsCheck { get; set; } = true;  //是否进行标签读写校验,默认为:校验
-        public int? DelayTime { get; set; }   //读写间隔延时
+        public bool IsCheck { get; set; } = true;  //是否进行标签读写校验,默认为:校验
+        public int DelayTime { get; set; }   //读写间隔延时
         public List<Params> @Params { get; set; } = new List<Params>();
     }
 

+ 96 - 63
Fine.OPCDaClient/bin/Debug/config/IOL5KHC.json

@@ -420,81 +420,114 @@
     "DelayTime": 3000
   },
 
-  { //进预配柜条件验证-检查":   
-    "APIName": "L5KYPHC_ZHQD_YPGCHECK_RP04",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A04.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_YP04_INT_UNITERR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1500
-  },
+  {
+    "APIName": "L5KYPHC_ZHQD_YPGCHECK",
+    "Params": [
+      {
+        "Param": "YP04",
+        "keys": [
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A04.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_YP04_INT_UNITERR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
+        ]
+      },
+      {
+        "Param": "YP05",
+        "keys": [
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A03.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_YP05_INT_UNITERR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
+        ]
 
+      },
+      {
+        "Param": "YP06",
+        "keys": [
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A02.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_YP06_INT_UNITERR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
 
-  { //进预配柜条件验证-检查":   
-    "APIName": "L5KYPHC_ZHQD_YPGCHECK_RP05",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A03.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_YP05_INT_UNITERR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1000
-  },
+        ]
+      },
+      {
+        "Param": "YP07",
+        "keys": [
 
-  { //进预配柜条件验证-检查":   
-    "APIName": "L5KYPHC_ZHQD_YPGCHECK_RP06",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A02.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_YP06_INT_UNITERR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1000
-  },
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A01.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_YP07_INT_UNITERR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
 
-  { //进预配柜条件验证-检查":   
-    "APIName": "L5KYPHC_ZHQD_YPGCHECK_RP07",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A01.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_YP07_INT_UNITERR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1000
+        ]
+      }
+    ]
   },
 
 
+  {
+    "APIName": "L5KYPHC_ZHQD_YPGCANCEL",
+    "Params": [
+      {
+        "Param": "YP04",
+        "keys": [
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A04_CLEAR.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_TASK1_A04_CLEAR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
+        ]
+      },
+      {
+        "Param": "YP05",
+        "keys": [
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A03_CLEAR.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_TASK1_A03_CLEAR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
+        ]
 
+      },
+      {
+        "Param": "YP06",
+        "keys": [
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A02_CLEAR.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_TASK1_A02_CLEAR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
 
+        ]
+      },
+      {
+        "Param": "YP07",
+        "keys": [
 
-  { //进预配柜取消选择":   
-    "APIName": "L5KYPHC_ZHQD_YPGCANCEL_RP04",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A04_CLEAR.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_TASK1_A04_CLEAR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1500
-  },
-
-
-  { //进预配柜取消选择":   
-    "APIName": "L5KYPHC_ZHQD_YPGCANCEL_RP05",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A03_CLEAR.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_TASK1_A03_CLEAR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1500
-  },
-
-  { //进预配柜取消选择":   
-    "APIName": "L5KYPHC_ZHQD_YPGCANCEL_RP06",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A02_CLEAR.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_TASK1_A02_CLEAR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1500
-  },
+          {
+            "WriteTagName": "FIX.JK_YT6022_TASK1_A01_CLEAR.F_CV",
+            "CheckTagName": "FIX.JK_YT6022_TASK1_A01_CLEAR.F_CV",
+            "StrValue": "1",
+            "DelayTime": 1500
+          }
 
-  { //进预配柜取消选择":   
-    "APIName": "L5KYPHC_ZHQD_YPGCANCEL_RP07",
-    "WriteTagName": "FIX.JK_YT6022_TASK1_A01_CLEAR.F_CV",
-    "CheckTagName": "FIX.JK_YT6022_TASK1_A01_CLEAR.F_CV",
-    "StrValue": "1",
-    "DelayTime": 1500
+        ]
+      }
+    ]
   },
-
-
-
-
-
-
   { //L5KYPHC_YPHC_YRWDSET":   //5K线-叶片段-回潮工序(叶片回潮预热温度设置)
     "APIName": "L5KYPHC_YPHC_YRWDSET",
     "WriteTagName": "FIX.YT6022_VALUE_WQ2116_P_SET_1.F_CV",

+ 2 - 2
Fine.OPCDaClient/bin/Debug/config/L3K_YP/L3KHC_ZH.json

@@ -632,7 +632,7 @@
   },
   { //设备组合启动
     "APIName": "L3KYPHC_ZHQD_START",
-    "IsCheck": 1,
+    "IsCheck": false,
     "delayTime": 3000,
     "Params": [
       {
@@ -819,7 +819,7 @@
   },
   { //设备组合停止
     "APIName": "L3KYPHC_ZHSTOP_STOP",
-    "IsCheck": 1,
+    "IsCheck": false,
     "delayTime": 3000,
     "Params": [
       {

+ 5 - 5
Fine.OPCDaClient/bin/Debug/config/L3K_YP/L3KJL_2.json

@@ -419,8 +419,8 @@
   },
   {
     "APIName": "L3KYPJL2_TS_TSStart",
-    "VerityCheck": true,
-    "DelayTime": 3000,
+    "ischeck": false,
+    "DelayTime": 3500,
     "Params": [
       {
         "Param": "",
@@ -437,7 +437,7 @@
   },
   {
     "APIName": "L3KYPJL2_TS_TSForceStart",
-    "VerityCheck": true,
+    "ischeck": false,
     "DelayTime": 3000,
     "Params": [
       {
@@ -455,7 +455,7 @@
   },
   {
     "APIName": "L3KYPJL2_TS_TSForceStop",
-    "VerityCheck": true,
+    "ischeck": false,
     "DelayTime": 3000,
     "Params": [
       {
@@ -473,7 +473,7 @@
   },
   {
     "APIName": "L3KYPJL2_ZHStop_BatchEnd",
-    "ischeck": false,
+    "ischeck": true,
     "DelayTime": 3000,
     "Params": [
       {

+ 1 - 1
Fine.OPCDaClient/bin/Debug/config/httpserver.json

@@ -1,5 +1,5 @@
 {
   "Host": "+",
-  "Port": 9031
+  "Port": 9011
 
 }

BIN
Fine.OPCDaExcelImport/config/config.rar


+ 1 - 0
Fine.Util/obj/Debug/Fine.Util.csproj.FileListAbsolute.txt

@@ -41,3 +41,4 @@ E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Uti
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.csproj.CopyComplete
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.dll
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.pdb
+E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.csproj.AssemblyReference.cache