Klosszhu 2 rokov pred
rodič
commit
76e8dadc9b
25 zmenil súbory, kde vykonal 477 pridanie a 3236 odobranie
  1. 0 1
      Fine.IHttpServer/obj/Debug/Fine.IHttpServer.csproj.FileListAbsolute.txt
  2. 55 38
      Fine.OPCDaClient9000/App/Common/AppUtil.cs
  3. 15 2
      Fine.OPCDaClient9000/TestForm.Designer.cs
  4. 169 12
      Fine.OPCDaClient9000/TestForm.cs
  5. 4 4
      Fine.OPCDaClient9000/bin/Debug/config/Router/JsonCfg/JL5K_POST.json
  6. 0 192
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/出柜段_Get.json
  7. 0 80
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/出柜段_Post.json
  8. 0 540
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加表料_Get.json
  9. 0 264
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加表料_Post.json
  10. 0 1030
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加里料_Get.json
  11. 0 331
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加里料_Post.json
  12. 0 317
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/烤机操作_Get.json
  13. 0 1
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/烤机操作_Post.json
  14. 0 263
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/进柜段_Get.json
  15. 0 80
      Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/进柜段_Post.json
  16. 4 4
      Fine.OPCDaClient9000/config/Router/JsonCfg/JL5K_POST.json
  17. 0 1
      MQTTClient/obj/Debug/MQTTClient.csproj.FileListAbsolute.txt
  18. 1 1
      OpcClientMqtt/obj/Debug/OpcClientMqtt.csproj.FileListAbsolute.txt
  19. 1 0
      OpcComRcw/obj/Debug/net20/OpcComRcw.csproj.FileListAbsolute.txt
  20. 9 3
      YS.Start.AdminLine/BackgroudService/ServerHander.cs
  21. 2 2
      YS.Start.AdminLine/BackgroudService/TickerBackGroundService.cs
  22. 2 3
      YS.Start.AdminLine/BackgroudService/TickerService.cs
  23. 206 65
      YS.Start.AdminLine/Core/App/Common/AppUtil.cs
  24. 8 1
      YS.Start.AdminLine/Core/DAServerMgr.cs
  25. 1 1
      YS.Start.AdminLine/Properties/launchSettings.json

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

@@ -33,7 +33,6 @@ E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHt
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.pdb
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\bin\Debug\Fine.IHttpServer.dll
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\bin\Debug\Fine.IHttpServer.pdb
-E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.csproj.AssemblyReference.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.csproj.CoreCompileInputs.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.dll
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.IHttpServer\obj\Debug\Fine.IHttpServer.pdb

+ 55 - 38
Fine.OPCDaClient9000/App/Common/AppUtil.cs

@@ -302,45 +302,62 @@ namespace Fine.OPCDaClient9000.Util
             {
                 Rlst = ReadList(strRead);   //进行写入值的回读操作
             }
-            rlt_All.Sucessful = true;   //默认成功,在下方的比较中只要其中有一个不正确,置为false。
-            rlt_All.Message = "批量写入---成功";
-            for (int i = 0; i < list.Count; i++)
+            //rlt_All.Sucessful = true;   //默认成功,在下方的比较中只要其中有一个不正确,置为false。
+            //rlt_All.Message = "批量写入---成功";
+            //for (int i = 0; i < list.Count; i++)
+            //{
+            //    var write = list[i].TagAddress;
+            //    var check = Rlst[i].TagAddress;
+
+            //    //if (write == check)  //标签名相同时,进行两个值的比较
+            //    //{
+            //    //if (write.ToString() == check.ToString())    allen 2023-04 检查代码出错,进行屏蔽,修改
+            //    if (Rlst[i].Value == null)   //判断是否读取值,没有读取到(一般是标签值不存在情况),  跳出返回:写入失败
+            //    {
+            //        LogUtil.WriteLog("错误信息", "批量写入---失败");
+            //        Rlst[i].IsSetSuccessful = false;
+            //        Rlst[i].Message = "写入失败";
+            //        rlt_All.Sucessful = false;
+            //        rlt_All.Message = "批量写入---失败";
+            //        continue;
+            //        //break;
+            //    }
+            //    var ValWrite = list[i].Value.ToString();
+            //    var ValRead = Rlst[i].Value.ToString();
+            //    if (ValWrite == ValRead)  //进行两者值的比较
+            //    {
+            //        Rlst[i].IsSetSuccessful = true;
+            //        Rlst[i].Message = "写入成功";
+            //    }
+            //    else
+            //    {
+            //        LogUtil.WriteLog( "错误信息", "批量写入---失败");
+            //        Rlst[i].IsSetSuccessful = false;
+            //        Rlst[i].Message = "写入失败";
+            //        rlt_All.Sucessful = false;
+            //        rlt_All.Message = "批量写入---失败";
+
+            //    }
+            //    rlt_All.PlcResults = Rlst;
+            //}
+
+            rlt_All.PlcResults = Rlst;
+            if (Rlst.Count == 0)
             {
-                var write = list[i].TagAddress;
-                var check = Rlst[i].TagAddress;
-
-                //if (write == check)  //标签名相同时,进行两个值的比较
-                //{
-                //if (write.ToString() == check.ToString())    allen 2023-04 检查代码出错,进行屏蔽,修改
-                if (Rlst[i].Value == null)   //判断是否读取值,没有读取到(一般是标签值不存在情况),  跳出返回:写入失败
-                {
-                    LogUtil.WriteLog("错误信息", "批量写入---失败");
-                    Rlst[i].IsSetSuccessful = false;
-                    Rlst[i].Message = "写入失败";
-                    rlt_All.Sucessful = false;
-                    rlt_All.Message = "批量写入---失败";
-                    continue;
-                    //break;
-                }
-                var ValWrite = list[i].Value.ToString();
-                var ValRead = Rlst[i].Value.ToString();
-                if (ValWrite == ValRead)  //进行两者值的比较
-                {
-                    Rlst[i].IsSetSuccessful = true;
-                    Rlst[i].Message = "写入成功";
-                }
-                else
-                {
-                    LogUtil.WriteLog( "错误信息", "批量写入---失败");
-                    Rlst[i].IsSetSuccessful = false;
-                    Rlst[i].Message = "写入失败";
-                    rlt_All.Sucessful = false;
-                    rlt_All.Message = "批量写入---失败";
-
-                }
-                rlt_All.PlcResults = Rlst;
+                rlt_All.Sucessful = false;
+                rlt_All.Message = "批量写入--失败";
+            }
+            else if (Rlst.Exists(a => a.IsSetSuccessful == false))
+            {
+                rlt_All.Sucessful = false;
+                rlt_All.Message = "批量写入--失败";
+            } else 
+            {
+                rlt_All.Sucessful = true;
+                rlt_All.Message = "写入成功";
             }
 
+            
             if (bCheck == false)   //在不检查状态下
             {
                 rlt_All.Sucessful = true;
@@ -364,7 +381,7 @@ namespace Fine.OPCDaClient9000.Util
                     DataItem dataItem = null;
                     if (AppUtil.DataItemQueue.TryGetValue(item.TagAddress, out dataItem))
                     {
-                        if (float.Parse( item.Value.ToString()) == (float)dataItem.Value)
+                        if ( Convert.ToDouble( item.Value.ToString()) ==Convert.ToDouble( dataItem.Value.ToString()))
                         {
                             result.Add(true);
                             dataItem.IsSetSuccessful = true;
@@ -416,7 +433,7 @@ namespace Fine.OPCDaClient9000.Util
                     rlt.Add(new DataItem()
                     {
                         TagAddress = item.TagAddress,
-                        Value = Read<float>(item.TagAddress),
+                        Value =Convert.ToDouble( Read<float>(item.TagAddress)),
 
                     });
                 }

+ 15 - 2
Fine.OPCDaClient9000/TestForm.Designer.cs

@@ -43,6 +43,7 @@ namespace Fine.OPCDaClient9000
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.richTextBox2 = new System.Windows.Forms.RichTextBox();
+            this.button3 = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -92,6 +93,7 @@ namespace Fine.OPCDaClient9000
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.button3);
             this.groupBox2.Controls.Add(this.label2);
             this.groupBox2.Controls.Add(this.button2);
             this.groupBox2.Controls.Add(this.button1);
@@ -99,7 +101,7 @@ namespace Fine.OPCDaClient9000
             this.groupBox2.Controls.Add(this.textBox1);
             this.groupBox2.Location = new System.Drawing.Point(417, 26);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(751, 102);
+            this.groupBox2.Size = new System.Drawing.Size(859, 102);
             this.groupBox2.TabIndex = 10;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "查询";
@@ -189,11 +191,21 @@ namespace Fine.OPCDaClient9000
             this.richTextBox2.TabIndex = 0;
             this.richTextBox2.Text = "";
             // 
+            // button3
+            // 
+            this.button3.Location = new System.Drawing.Point(702, 24);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(151, 34);
+            this.button3.TabIndex = 5;
+            this.button3.Text = "自定义参数测试";
+            this.button3.UseVisualStyleBackColor = true;
+            this.button3.Click += new System.EventHandler(this.button3_Click);
+            // 
             // TestForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1180, 862);
+            this.ClientSize = new System.Drawing.Size(1288, 862);
             this.Controls.Add(this.groupBox4);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
@@ -227,5 +239,6 @@ namespace Fine.OPCDaClient9000
         private System.Windows.Forms.RichTextBox richTextBox3;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Button button3;
     }
 }

+ 169 - 12
Fine.OPCDaClient9000/TestForm.cs

@@ -262,8 +262,8 @@ namespace Fine.OPCDaClient9000
             int i = 1;
             foreach (var api in timmerapis)
             {
-                
-                label2.Text = $"查询个数:{timmerapis.Count()},已完成{i},测试进度{ Math.Floor(Convert.ToDecimal(1.00*i/ timmerapis.Count())*100)}%";
+
+                label2.Text = $"查询个数:{timmerapis.Count()},已完成{i},测试进度{ Math.Floor(Convert.ToDecimal(1.00 * i / timmerapis.Count()) * 100)}%";
                 label2.Update();
                 i++;
                 StringBuilder stringBuilder = new StringBuilder();
@@ -281,15 +281,16 @@ namespace Fine.OPCDaClient9000
                     {
                         errorapi.Add(api.APIName + "   网络异常");
                     }
-                    else {
-                       var js=  JsonConvert.SerializeObject(rtl.Result);
+                    else
+                    {
+                        var js = JsonConvert.SerializeObject(rtl.Result);
                         var re = JsonConvert.DeserializeObject<PLCResultAll>(js);
-                            if (re.Sucessful == false)
-                            {
-                                errorapi.Add(api.APIName + "   接口异常");
-                            }
+                        if (re.Sucessful == false)
+                        {
+                            errorapi.Add(api.APIName + "   接口异常");
+                        }
                     }
-                    
+
                     swatch.Stop(); //计时结束
                     string time = swatch.ElapsedMilliseconds.ToString(); //获取代码段执行时间
                     stringBuilder.AppendLine($"{api.APIName} {api.Method} 总耗时" + time);
@@ -381,13 +382,169 @@ namespace Fine.OPCDaClient9000
             {
                 richTextBox3.Text = string.Join("\t\n", errorapi);
             }
-            else {
+            else
+            {
                 richTextBox3.Text = "正常";
             }
-            
-          
+
+
         }
 
+        private void button3_Click(object sender, EventArgs e)
+        {
+            if (listBox1.Items.Count == 0)
+            {
+                MessageBox.Show("请查询接口名称后测试");
+                return;
+            }
+            richTextBox1.Text = "";
+            richTextBox1.Update();
+
+
+            List<string> fitler = new List<string>();
+            List<string> errorapi = new List<string>();
+            foreach (string item in listBox1.Items)
+            {
+                fitler.Add(item);
+            }
+            List<IoModal> timmerapis = AppUtil.newsConfig.SelectMany(a => a.Data).Where(a => fitler.Any(c => c == a.APIName)).ToList();
+            if (timmerapis.Count > 1)
+            {
+                MessageBox.Show("参数测试只能选择一个接口测试");
+                return;
+            }
+            int i = 1;
+            foreach (var api in timmerapis)
+            {
 
+                label2.Text = $"查询个数:{timmerapis.Count()},已完成{i},测试进度{ Math.Floor(Convert.ToDecimal(1.00 * i / timmerapis.Count()) * 100)}%";
+                label2.Update();
+                i++;
+                StringBuilder stringBuilder = new StringBuilder();
+                string Parms = string.Empty;
+                if (api.Method == "get")
+                {
+
+                    Stopwatch swatch = new Stopwatch();
+                    swatch.Start(); //计时开始
+                    HttpMethods http = new HttpMethods();
+                    var url = $"{GetServerAddress()}{api.APIName}";
+                    var result = http.HttpGet(url);
+                    var rtl = JsonConvert.DeserializeObject<HttpResult>(result);
+                    if (rtl.Success == false)
+                    {
+                        errorapi.Add(api.APIName + "   网络异常");
+                    }
+                    else
+                    {
+                        var js = JsonConvert.SerializeObject(rtl.Result);
+                        var re = JsonConvert.DeserializeObject<PLCResultAll>(js);
+                        if (re.Sucessful == false)
+                        {
+                            errorapi.Add(api.APIName + "   接口异常");
+                        }
+                    }
+
+                    swatch.Stop(); //计时结束
+                    string time = swatch.ElapsedMilliseconds.ToString(); //获取代码段执行时间
+                    stringBuilder.AppendLine($"{api.APIName} {api.Method} 总耗时" + time);
+                    stringBuilder.AppendLine($"请求参数:{Parms}");
+                    stringBuilder.AppendLine($"返回值:{result}");
+                }
+                else if (api.Method == "post")
+                {
+
+                    switch (api.PType)
+                    {
+                        case EAPIparType.NoParam:
+                            Parms = "";
+                            break;
+                        case EAPIparType.InOneVal:
+                            Parms = richTextBox2.Text;
+                            break;
+                        case EAPIparType.inMultiValObj:
+                            var json = JsonConvert.DeserializeObject(richTextBox2.Text);
+                            if (api.Params.SelectMany(a => a.keys).Any(a => a.InputName.Contains("Weight")))
+                            {
+                                WeightModel weight = JsonConvert.DeserializeObject<WeightModel>(richTextBox2.Text); //new WeightModel() { Weight = 21, BrandNo = "abc", BranchNo = "def" };
+                                Parms = JsonConvert.SerializeObject(weight);
+
+                            }
+                            else if (api.Params.SelectMany(a => a.keys).Any(a => a.InputName.Contains("GDNum")))
+                            {
+                                SelYPno sel = JsonConvert.DeserializeObject<SelYPno>(richTextBox2.Text);// new SelYPno { GDNum = "abc", BatchNum = " ", BrandNum = " " };
+                                Parms = JsonConvert.SerializeObject(sel);
+                            }
+
+                            break;
+                        case EAPIparType.InSel:
+                            var first = api.Params.FirstOrDefault();
+                            Parms = first.Param;
+                            break;
+                        case EAPIparType.inSelAndMultiVal:
+                            //Dictionary<string, object> obj = new Dictionary<string, object>();
+                            var firsts = api.Params.FirstOrDefault();
+                            //obj.Add("GDNum", firsts.Param);
+                            //obj.Add("BatchNum", "abc");
+                            //obj.Add("BrandNum", "def");
+                            SelYPno obj = JsonConvert.DeserializeObject<SelYPno>(richTextBox2.Text);
+                            Parms = JsonConvert.SerializeObject(obj);
+                            break;
+                        case EAPIparType.OnlyRead:
+                            Parms = "";
+                            break;
+                        case EAPIparType.Error:
+                            Parms = "";
+                            break;
+                        default:
+                            break;
+                    }
+
+                    Stopwatch swatch = new Stopwatch();
+                    swatch.Start(); //计时开始
+                    HttpMethods http = new HttpMethods();
+                    var url = $"{GetServerAddress()}{api.APIName}";
+                    var result = http.HttpPost(url, Parms);
+                    var rtl = JsonConvert.DeserializeObject<HttpResult>(result);
+                    if (rtl.Success == false)
+                    {
+                        errorapi.Add(api.APIName + "   网络异常");
+                    }
+                    else
+                    {
+                        var js = JsonConvert.SerializeObject(rtl.Result);
+                        var re = JsonConvert.DeserializeObject<PLCResultAll>(js);
+                        if (re.Sucessful == false)
+                        {
+                            errorapi.Add(api.APIName + "   接口异常");
+                        }
+                    }
+                    swatch.Stop(); //计时结束
+                    string time = swatch.ElapsedMilliseconds.ToString(); //获取代码段执行时间
+                    stringBuilder.AppendLine($"{api.APIName} {api.Method} 总耗时" + time);
+                    stringBuilder.AppendLine($"请求参数:{Parms}");
+                    stringBuilder.AppendLine($"返回值:{result}");
+
+                }
+                else
+                {
+                    stringBuilder.AppendLine($"错误信息:{api.APIName}接口配置异常,请检查接口");
+                    return;
+                }
+                richTextBox1.Text += stringBuilder.ToString();
+                richTextBox1.Update();
+            }
+            if (errorapi.Count > 0)
+            {
+                richTextBox3.Text = string.Join("\t\n", errorapi);
+            }
+            else
+            {
+                richTextBox3.Text = "正常";
+            }
+
+
+        }
     }
 }
+

+ 4 - 4
Fine.OPCDaClient9000/bin/Debug/config/Router/JsonCfg/JL5K_POST.json

@@ -173,15 +173,15 @@
           {
             "WriteTagName": "FIX.YT6022_GP_2138R_JOB.A_CV",
             "CheckTagName": "FIX.YT6022_GP_2138R_JOB.A_CV",
-            "StrValue": "",
-            "CheckValue": "",
+            "StrValue": " ",
+            "CheckValue": " ",
             "DelayTime": 3000
           },
           {
             "WriteTagName": "FIX.YT6022_GP_2138R_BRAND.A_CV",
             "CheckTagName": "FIX.YT6022_GP_2138R_BRAND.A_CV",
-            "StrValue": "",
-            "CheckValue": "",
+            "StrValue": " ",
+            "CheckValue": " ",
             "DelayTime": 3000
           }
         ]

+ 0 - 192
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/出柜段_Get.json

@@ -1,192 +0,0 @@
-[
-    {
-        "APIName": "LPBLYJG_ZHStart_BatchStart",
-        "Content": "批开始",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPBatchStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPBatchStart.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_ZHStart_UnitDevice_Auto",
-        "Content": "设备单元自动",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPBatchStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPBatchStop.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_NO_OutYPGCheck",
-        "Content": "0",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3139OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3139OutSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.GP3139_1OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3139_1OutSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_ZHStart_Start",
-        "Content": "进柜段组合启动",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPGStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPGStart.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_ZHStop_BatchEnd",
-        "Content": "批结束【确认】",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPBatchStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPBatchStart.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPBatchStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPBatchStop.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_ZHSTOP_CLEAR_BATCH",
-        "Content": "批次清零",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPGStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPGStart.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_ZHStop_Stop",
-        "Content": "设备组合停止",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OutGPGStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612OutGPGStop.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_FK_AlarmReset",
-        "Content": "参考昆船原的功能?",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT606OutGPReset.F_CV",
-                        "CheckTagName": "THISNODE.YT606OutGPReset.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    }
-]

+ 0 - 80
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/出柜段_Post.json

@@ -1,80 +0,0 @@
-[
-    {
-        "APIName": "LPBLYJG_ZHStart_OutYPGCheck",
-        "Content": "临时",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "BLG5",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3139OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3139OutSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG6",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3139_1OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3139_1OutSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLYJG_ZHQD_YPGSelno1_InfoSet",
-        "Content": "后柜信息清零",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "BLG5",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG5BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG5BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG5Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG5Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG6",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG6BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG6BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG6Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG6Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 4
-    }
-]

+ 0 - 540
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加表料_Get.json

@@ -1,540 +0,0 @@
-[
-    {
-        "APIName": "LPBLYJL2_SBYR_START",
-        "Content": "预热启动",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135PreHeatStart.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135PreHeatStart.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_SBYR_CLOSE",
-        "Content": "预热结束",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135PreHeatStop.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135PreHeatStop.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_UnitDevice_Auto",
-        "Content": "单机",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffAUTO.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffAUTO.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffLOCK.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffLOCK.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffMAN.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffMAN.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_UnitDevice_Mamual",
-        "Content": "自动",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffMAN.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffMAN.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffAUTO.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffAUTO.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffLOCK.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffLOCK.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_UnitDevice_Lock",
-        "Content": "闭锁",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffMAN.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffMAN.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffAUTO.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffAUTO.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffLOCK.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffLOCK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_YL_Tank1Select",
-        "Content": "加表料段SJ3115料筒1选择",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135Tank1SelCur.F_CV",
-                        "CheckTagName": "THISNODE.SJ3135Tank1SelCur.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_YL_TankNoSelect",
-        "Content": "加表料段SJ3115不选择料筒",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135Tank1SelCur.F_CV",
-                        "CheckTagName": "THISNODE.SJ3135Tank1SelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_BatchStart",
-        "Content": "批开始",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffBatchStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffBatchStart.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffBatchStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffBatchStop.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_NO_OutYPGCheck",
-        "Content": "加里料段不出柜",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3119OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3119OutSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.GP3119_1OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3119_1OutSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_NO_INYPGCheck",
-        "Content": "加表料段不进柜",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3139InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3139InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.GP3139_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3139_1InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_Start",
-        "Content": "进柜段组合启动",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffGStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffGStart.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStopRec_Tank1_InMRoom",
-        "Content": "桶一余料回收",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135tank1BackStuff.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135tank1BackStuff.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.SJ3135tank1AskStuff.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135tank1AskStuff.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStopRec_Tank1_InMRoomCANCEL",
-        "Content": "桶一余料回收取消",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135tank1BackStuff.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135tank1BackStuff.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.SJ3135tank1AskStuff.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135tank1AskStuff.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_Reclaim_Tank1Wash",
-        "Content": "桶一喷吹",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135Tank1Blow.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135Tank1Blow.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2__Nozzl_Clear",
-        "Content": "桶一清洗",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135Tank1AutoClear.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135Tank1AutoClear.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStop_BatchEnd",
-        "Content": "批结束【确认】",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffBatchStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffBatchStart.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffBatchStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffBatchStop.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHSTOP_CLEAR_BATCH",
-        "Content": "批次清零",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.CH3133Clear.f_cv",
-                        "CheckTagName": "THISNODE.CH3133Clear.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.SJ3135WaterClear.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135WaterClear.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.SJ3135StuffClear.f_cv",
-                        "CheckTagName": "THISNODE.SJ3135StuffClear.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHSTOP_CLEAR_PRODINFO",
-        "Content": "生产清零",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_YT612_SURFACESC_CLEAR.F_CV",
-                        "CheckTagName": "THISNODE.JK_YT612_SURFACESC_CLEAR_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStop_Stop",
-        "Content": "设备组合停止",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612OuterStuffGStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612OuterStuffGStop.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJL2_FK_AlarmReset",
-        "Content": "参考昆船原的功能?",
-        "IsCheck": false,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT606InnerStuffReset.F_CV",
-                        "CheckTagName": "THISNODE.YT606InnerStuffReset.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    }
-]

+ 0 - 264
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加表料_Post.json

@@ -1,264 +0,0 @@
-[
-    {
-        "APIName": "LPBLYJL2_SBYR_YRWDSET",
-        "Content": "预热温度值设定",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135WORKTEMPSET.F_CV",
-                        "CheckTagName": "THISNODE.SJ3135WORKTEMPSET.F_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 1
-    },
-    {
-        "APIName": "LPBLYJL2_SBYR_YXWDSET",
-        "Content": "预热生产温度值设定",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3135WORKTEMPSET.F_CV",
-                        "CheckTagName": "THISNODE.SJ3135WORKTEMPSET.F_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 1
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_GDInfoSet",
-        "Content": "工单信息下发",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "InputName": "GDNum",
-                        "WriteTagName": "THISNODE.OuterStuffEntryID.A_CV",
-                        "CheckTagName": "THISNODE.OuterStuffEntryID.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.OuterStuffBatchNo.A_CV",
-                        "CheckTagName": "THISNODE.OuterStuffBatchNo.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.OuterStuffBrand.A_CV",
-                        "CheckTagName": "THISNODE.OuterStuffBrand.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 2
-    },
-    {
-        "APIName": "LPBLYJL2_YL_Tank1Info_Set",
-        "Content": "要料信息下发-料筒1",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "InputName": "Weight",
-                        "WriteTagName": "THISNODE.SJ3135Tank1AskQty.F_CV",
-                        "CheckTagName": "THISNODE.SJ3135Tank1AskQty.F_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BranchNo",
-                        "WriteTagName": "THISNODE.SJ3135Tank1AskBatch.A_CV",
-                        "CheckTagName": "THISNODE.SJ3135Tank1AskBatch.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNo",
-                        "WriteTagName": "THISNODE.SJ3135Tank1AskBrand.A_CV",
-                        "CheckTagName": "THISNODE.SJ3135Tank1AskBrand.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 2
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_OutYPGCheck",
-        "Content": "加里料段出BLG3柜操作",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "BLG3",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3119OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3119OutSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG4",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3119_1OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3119_1OutSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_INYPGCheck",
-        "Content": "加表料段进BLG5柜",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "BLG5",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3139InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3139InSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG6",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3139_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3139_1InSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLYJL2_ZHStart_InYgInfoSet",
-        "Content": "BLG5",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "BLG5",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG5BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG5BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG5Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG5Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG6",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG6BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG6BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG6Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG6Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 4
-    },
-    {
-        "APIName": "LPBLYJL2_ZHQD_YPGSelno1_InfoSet",
-        "Content": "中柜信息清零",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "BLG3",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG3BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG3BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG3Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG3Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG4",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG4BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG4BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG4Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG4Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 4
-    }
-]

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 1030
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加里料_Get.json


+ 0 - 331
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/加里料_Post.json

@@ -1,331 +0,0 @@
-[
-    {
-        "APIName": "LPBLYJL1_SBYR_YRWDSET",
-        "Content": "预热温度值设定",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3112WorkTempSet.F_CV",
-                        "CheckTagName": "THISNODE.SJ3112WorkTempSet.F_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 1
-    },
-    {
-        "APIName": "LPBLYJL1_SBYR_YXWDSET",
-        "Content": "生产温度值设定",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SJ3112WorkTempSet.F_CV",
-                        "CheckTagName": "THISNODE.SJ3112WorkTempSet.F_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 1
-    },
-    {
-        "APIName": "LPBLYJL1_ZHStart_GDInfoSet",
-        "Content": "工单信息下发",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "InputName": "GDNum",
-                        "WriteTagName": "THISNODE.InnerStuffEntryID.A_CV",
-                        "CheckTagName": "THISNODE.InnerStuffEntryID.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.InnerStuffBatchNo.A_CV",
-                        "CheckTagName": "THISNODE.InnerStuffBatchNo.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.InnerStuffBrand.A_CV",
-                        "CheckTagName": "THISNODE.InnerStuffBrand.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 2
-    },
-    {
-        "APIName": "LPBLYJL1_YL_Tank1Info_Set",
-        "Content": "要料信息下发-料筒1",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "InputName": "Weight",
-                        "WriteTagName": "THISNODE.SJ3112Tank1AskQty.F_CV",
-                        "CheckTagName": "THISNODE.SJ3112Tank1AskQty.F_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BranchNo",
-                        "WriteTagName": "THISNODE.SJ3112Tank1AskBatch.A_CV",
-                        "CheckTagName": "THISNODE.SJ3112Tank1AskBatch.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNo",
-                        "WriteTagName": "THISNODE.SJ3112Tank1AskBrand.A_CV",
-                        "CheckTagName": "THISNODE.SJ3112Tank1AskBrand.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 2
-    },
-    {
-        "APIName": "LPBLYJL1_YL_Tank2Info_Set",
-        "Content": "要料信息下发-料筒2",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "InputName": "Weight",
-                        "WriteTagName": "THISNODE.SJ3112Tank2AskQty.F_CV",
-                        "CheckTagName": "THISNODE.SJ3112Tank2AskQty.F_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BranchNo",
-                        "WriteTagName": "THISNODE.SJ3112Tank2AskBatch.A_CV",
-                        "CheckTagName": "THISNODE.SJ3112Tank2AskBatch.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNo",
-                        "WriteTagName": "THISNODE.SJ3112Tank2AskBrand.A_CV",
-                        "CheckTagName": "THISNODE.SJ3112Tank2AskBrand.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 2
-    },
-    {
-        "APIName": "LPBLYJL1_ZHStart_OutYPGCheck",
-        "Content": "出柜段出BLG1柜操作",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG1",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3104OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3104OutSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG2",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3104_1OutSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3104_1OutSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLYJL1_ZHStart_INYPGCheck",
-        "Content": "加里料段中柜进BLG3选择",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG3",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3119InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3119InSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG4",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3119_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3119_1InSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLYJL1_NO_INYPGCheck",
-        "Content": "加里料段不进中柜选",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG1",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3119InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3119InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG2",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3119_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3119_1InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLYJL1_ZHStart_InYgInfoSet",
-        "Content": "BLG3",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG3",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG3BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG3BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG3Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG3Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG4",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG4BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG4BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG4Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG4Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 4
-    },
-    {
-        "APIName": "LPBLYJL1_ZHQD_YPGSelno1_InfoSet",
-        "Content": "前柜信息清零",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG1",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG1BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG1BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG3Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG3Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG2",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG2BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG2BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG4Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG4Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 4
-    }
-]

+ 0 - 317
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/烤机操作_Get.json

@@ -1,317 +0,0 @@
-[
-    {
-        "APIName": "LPBLYJG_KJ_Local",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-lj.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-lj.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_Remote",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-lj.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-lj.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_Mamual",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-zd.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-zd.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_Auto",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-zd.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-zd.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_Lights",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-qyzmkg.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-qyzmkg.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_Lightup",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-qyzmkg.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-qyzmkg.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_ZHStart_Start",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-zhqd.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-zhqd.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_ZHStop_Stop",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.kzmb-zhtz.f_cv",
-                        "CheckTagName": "THISNODE.kzmb-zhtz.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_QZHC_Start",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SBForceTide.f_cv",
-                        "CheckTagName": "THISNODE.SBForceTide.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_QZHC_Stop",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.SBForceTide.f_cv",
-                        "CheckTagName": "THISNODE.SBForceTide.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_CGZ_Start",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.ytsb_cgzxz.f_cv",
-                        "CheckTagName": "THISNODE.ytsb_cgzxz.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_CGZ_Stop",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.ytsb_cgzxz.f_cv",
-                        "CheckTagName": "THISNODE.ytsb_cgzxz.f_cv",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_XFJC",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.xfjc.f_cv",
-                        "CheckTagName": "THISNODE.xfjc.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_BJXY",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.bjxy.f_cv",
-                        "CheckTagName": "THISNODE.bjxy.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLYJG_KJ_VFERRRESET",
-        "IsCheck": true,
-        "DelayTime": 3000,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.VFERRRESET.f_cv",
-                        "CheckTagName": "THISNODE.VFERRRESET.f_cv",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    }
-]

+ 0 - 1
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/烤机操作_Post.json

@@ -1 +0,0 @@
-[]

+ 0 - 263
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/进柜段_Get.json

@@ -1,263 +0,0 @@
-[
-    {
-        "APIName": "LPBLY_ZHStart_UnitDevice_Auto",
-        "Content": "设备单元自动",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPMAN.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPMAN.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPAUTO.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPAUTO.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPLOCK.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPLOCK.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHStart_UnitDevice_Mamual",
-        "Content": "设备单元单机",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPMAN.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPMAN.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPAUTO.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPAUTO.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPLOCK.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPLOCK.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHStart_UnitDevice_Lock",
-        "Content": "设备单元闭锁",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPMAN.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPMAN.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPAUTO.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPAUTO.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPLOCK.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPLOCK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHStart_INPYG_CANCEL",
-        "Content": "不进柜",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3104InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3104InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.GP3104_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3104_1InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHStart_Start",
-        "Content": "进柜段组合启动",
-        "IsCheck": false,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPGStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPGStart.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHStop_BatchEnd",
-        "Content": "批结束【确认】",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPBatchStart.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPBatchStart.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPBatchStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPBatchStop.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHStop_Clear",
-        "Content": "路径清零",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.GP3104InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3104InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    },
-                    {
-                        "WriteTagName": "THISNODE.GP3104_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.GP3104_1InSelCur.F_CV",
-                        "StrValue": "0",
-                        "CheckValue": "0",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_ZHSTOP_Stop",
-        "Content": "设备组合停止",
-        "IsCheck": false,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPGStop.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPGStop.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    },
-    {
-        "APIName": "LPBLY_FK_AlarmReset",
-        "Content": "故障复位",
-        "IsCheck": false,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.YT612InGPReset.F_CV",
-                        "CheckTagName": "THISNODE.YT612InGPReset.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "get",
-        "PType": 0
-    }
-]

+ 0 - 80
Fine.OPCDaClient9000/bin/Debug/config/Router/白肋烟/进柜段_Post.json

@@ -1,80 +0,0 @@
-[
-    {
-        "APIName": "LPBLY_ZHStart_INPYGCheck",
-        "Content": "进预配柜条件验证",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG1",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3104InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3104InSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG2",
-                "keys": [
-                    {
-                        "WriteTagName": "THISNODE.JK_GP3104_1InSelCur.F_CV",
-                        "CheckTagName": "THISNODE.JK_GP3104_1InSelCur_OK.F_CV",
-                        "StrValue": "1",
-                        "CheckValue": "1",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 3
-    },
-    {
-        "APIName": "LPBLY_ZHStart_InYPGInfoSet",
-        "Content": "进预配柜信息下发(增加柜号写入ifix点)",
-        "IsCheck": true,
-        "DelayTime": 0,
-        "Params": [
-            {
-                "Param": "BLG1",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG1BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG1BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG1Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG1Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            },
-            {
-                "Param": "BLG2",
-                "keys": [
-                    {
-                        "InputName": "BatchNum",
-                        "WriteTagName": "THISNODE.BLG2BatchNo1.A_CV",
-                        "CheckTagName": "THISNODE.BLG2BatchNo1.A_CV",
-                        "DelayTime": 0
-                    },
-                    {
-                        "InputName": "BrandNum",
-                        "WriteTagName": "THISNODE.BLG2Brand1.A_CV",
-                        "CheckTagName": "THISNODE.BLG2Brand1.A_CV",
-                        "DelayTime": 0
-                    }
-                ]
-            }
-        ],
-        "Method": "post",
-        "PType": 4
-    }
-]

+ 4 - 4
Fine.OPCDaClient9000/config/Router/JsonCfg/JL5K_POST.json

@@ -173,15 +173,15 @@
           {
             "WriteTagName": "FIX.YT6022_GP_2138R_JOB.A_CV",
             "CheckTagName": "FIX.YT6022_GP_2138R_JOB.A_CV",
-            "StrValue": "",
-            "CheckValue": "",
+            "StrValue": " ",
+            "CheckValue": " ",
             "DelayTime": 3000
           },
           {
             "WriteTagName": "FIX.YT6022_GP_2138R_BRAND.A_CV",
             "CheckTagName": "FIX.YT6022_GP_2138R_BRAND.A_CV",
-            "StrValue": "",
-            "CheckValue": "",
+            "StrValue": " ",
+            "CheckValue": " ",
             "DelayTime": 3000
           }
         ]

+ 0 - 1
MQTTClient/obj/Debug/MQTTClient.csproj.FileListAbsolute.txt

@@ -12,7 +12,6 @@ E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClie
 E:\远舢智能\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\obj\Debug\MQTTClient.csproj.AssemblyReference.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\bin\Debug\MQTTClient.dll
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\bin\Debug\MQTTClient.pdb
-E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\obj\Debug\MQTTClient.csproj.AssemblyReference.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\obj\Debug\MQTTClient.csproj.CoreCompileInputs.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\obj\Debug\MQTTClient.dll
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\MQTTClient\obj\Debug\MQTTClient.pdb

+ 1 - 1
OpcClientMqtt/obj/Debug/OpcClientMqtt.csproj.FileListAbsolute.txt

@@ -733,8 +733,8 @@ E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\bi
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\bin\Debug\System.Threading.Tasks.Extensions.xml
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\bin\Debug\System.ValueTuple.xml
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.App.config
-E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.AssemblyReference.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.CoreCompileInputs.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.CopyComplete
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.exe
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.pdb
+E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.AssemblyReference.cache

+ 1 - 0
OpcComRcw/obj/Debug/net20/OpcComRcw.csproj.FileListAbsolute.txt

@@ -4,3 +4,4 @@ E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcComRcw\obj\De
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcComRcw\obj\Debug\net20\OpcComRcw.csproj.CoreCompileInputs.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcComRcw\obj\Debug\net20\OpcComRcw.dll
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcComRcw\obj\Debug\net20\OpcComRcw.pdb
+E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcComRcw\obj\Debug\net20\OpcComRcw.csproj.AssemblyReference.cache

+ 9 - 3
YS.Start.AdminLine/BackgroudService/ServerHander.cs

@@ -15,9 +15,15 @@ public static class ServerHander
         httpserver = new HttpServer<AppHandle>(httppar);
         httpserver.Start();
     }
-    public static bool Status{get{
-            return httpserver==null?false: httpserver.Status;
-}}
+    public static bool ApiStatus
+    {
+        get
+        {
+            return httpserver == null ? false : httpserver.Status;
+        }
+    }
+
+    public static bool IFixStatus { get { return true; } }
 
 
 }

+ 2 - 2
YS.Start.AdminLine/BackgroudService/TickerBackGroundService.cs

@@ -18,12 +18,12 @@ namespace YS.Start.AdminLine.BackgroudService
             {
                 _tickerService.OnTick(DateTime.Now);
               
-                if (!ServerHander.Status)
+                if (!ServerHander.ApiStatus)
                 {
                     Console.WriteLine("接口服务已启动");
                     ServerHander.Start();
                 }
-                await Task.Delay(5000, stoppingToken);
+                await Task.Delay(2000, stoppingToken);
             }
         }
 

+ 2 - 3
YS.Start.AdminLine/BackgroudService/TickerService.cs

@@ -1,7 +1,6 @@
 using System;
 
-namespace YS.Start.AdminLine.BackgroudService
-{
+
     internal class TickerService
     {
         private event EventHandler<TickerEventArgs> Ticked;
@@ -34,4 +33,4 @@ namespace YS.Start.AdminLine.BackgroudService
             Time = time;
         }
     }
-}
+

+ 206 - 65
YS.Start.AdminLine/Core/App/Common/AppUtil.cs

@@ -11,9 +11,8 @@ using System.Threading;
 
 public static class AppUtil
 {
-
-    //private static List<IoModal> newConfig;
     public static List<DicIO> newsConfig;
+    //private static List<IoModal> newConfig;
 
     private static string apppath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "config", "Router");
 
@@ -21,17 +20,46 @@ public static class AppUtil
 
     public static List<DataItem> DataPointCheckList = new List<DataItem>();
 
-    public static IConfiguration configuration;
+
     public static void InitAllDirectoryCfg()
     {
         if (Directory.Exists(apppath))
         {
+            //newConfig = GetFiles(apppath, "*.json");
             newsConfig = GetFilesGo(apppath, "*.json");
         }
     }
 
     public static List<string> CheckPointConfig { get { return newsConfig.SelectMany(a => a.Data).SelectMany(a => a.Params).SelectMany(a => a.keys).Select(a => a.CheckTagName).Distinct().ToList(); } }
 
+
+    //初始化获取有配置文件
+    //public static void InitAllDirectoryCfg()
+    //{
+    //    if (Directory.Exists(apppath))
+    //    {
+    //        newConfig = GetFiles(apppath, "*.json");
+    //    }
+    //}
+
+    static List<DicIO> GetFilesGo(string directory, string pattern = "*.*")
+    {
+        List<DicIO> files = new List<DicIO>();
+        foreach (var item in Directory.GetFiles(directory, pattern))
+        {
+            files.Add(new DicIO { path = item, Data = JsonConvert.DeserializeObject<List<IoModal>>(File.ReadAllText(item)) });
+        }
+        foreach (var item in Directory.GetDirectories(directory))
+        {
+            //files.AddRange(GetFiles(item, pattern));
+
+            files.AddRange(GetFilesGo(item, pattern));
+        }
+        return files;
+    }
+
+    //public static List<string> CheckPointConfig { get { return newConfig.SelectMany(a => a.Params).SelectMany(a => a.keys).Select(a => a.CheckTagName).Distinct().ToList(); } }
+
     /// <summary>
     /// 读取文件夹下所有json,并转化为ioModal
     /// </summary>
@@ -51,22 +79,69 @@ public static class AppUtil
         return files;
     }
 
-    static List<DicIO> GetFilesGo(string directory, string pattern = "*.*")
+    public static PLCResultAll TryFunc_AIRun(string action, string method, string param = null)
     {
-        List<DicIO> files = new List<DicIO>();
-        foreach (var item in Directory.GetFiles(directory, pattern))
+        try
         {
-            files.Add(new DicIO { path = item, Data = JsonConvert.DeserializeObject<List<IoModal>>(File.ReadAllText(item)) });
+            return Func_AIRun(action, method, param);
         }
-        foreach (var item in Directory.GetDirectories(directory))
+        catch (Exception ext)
         {
-            //files.AddRange(GetFiles(item, pattern));
 
-            files.AddRange(GetFilesGo(item, pattern));
+            LogUtil.WriteError($"AI:{action}异常", ext.Message);
+            return new PLCResultAll { Sucessful = false, Message = "AI接口失败" };
         }
-        return files;
     }
 
+    /// <summary>
+    /// AI模型的执行操作,依据不同的检查值,分别调用
+    /// </summary>
+    /// <param name="action"></param>
+    /// <param name="method"></param>
+    /// <param name="param"></param>
+    /// <returns></returns>
+    public static PLCResultAll Func_AIRun(string action, string method, string param = null)
+    {
+        //判断不同的API调用
+        //依据不同的API名称的标识区分不同的检测点,后期可封装到配置文件中. along202305
+
+        float rlt = 0;
+        try
+        {
+            if (action.Contains("WQ2116_AIFuc"))   //回潮机
+            {
+                rlt = Read<float>("THISNODE.JK_YT6022_L5KYPHC_MODE.F_CV");  //读取模式状态点
+            }
+            if (action.Contains("SJ2147_AIFuc"))   //加料机
+            {
+                rlt = Read<float>("THISNODE.JK_YT6022_L5KYPJL_MODE.F_CV");  //读取模式状态点
+            }
+
+            //Console.WriteLine("时间:{0},调用API:{1},参数:{2},模式:{3}", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff"),action,param,rlt);
+            LogUtil.Write(",调用API:" + action + ",参数:" + param + ", 模式:" + rlt);
+            string MyAction = "";   //转换后的调用API名称
+
+            switch (rlt)
+            {
+                case 1:   //AI模型控制
+                    MyAction = action + "_AI";
+                    return ConfigRouter(MyAction, method, param);
+                case 2:
+                    MyAction = action + "_Test";
+                    return ConfigRouter(MyAction, method, param);
+                default:
+                    return new PLCResultAll { Sucessful = false, Message = "AI控制模式错误、请重新选择" };
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message);
+            return new PLCResultAll { Sucessful = false, Message = "程序异常!" };
+        }
+
+    }
+
+
     public static PLCResultAll ConfigRouter(string action, string method, string param = null)
     {
         var first = newsConfig.SelectMany(a => a.Data).FirstOrDefault(a => "api/" + a.APIName == action && a.Method == method);
@@ -89,6 +164,8 @@ public static class AppUtil
             return new PLCResultAll { Sucessful = false, Message = "文档错误,访问失败" };
         }
     }
+
+
     public static PLCResultAll Test()
     {
         var first = newsConfig.SelectMany(a => a.Data).FirstOrDefault(a => a.APIName == "Ifix_Status" && a.Method == "get");
@@ -97,9 +174,10 @@ public static class AppUtil
         //LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:fff") + "--PING IFX返回结果:",JsonConvert.SerializeObject(data));
         return data;
     }
+
     private static PLCResultAll WrNewCheckList(IoModal iovar, string pras = null)
     {
-        //Console.WriteLine("API调用时间 {0}", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff"));
+        //Console.WriteLine("API调用时间: {0}", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff"));
         bool IsCheck = iovar.IsCheck;  //获取是否要校验读写结果
 
         try
@@ -204,8 +282,8 @@ public static class AppUtil
         }
         catch (Exception ex)
         {
-            LogUtil.WriteLog("错误信息", iovar.APIName + ex.Message);
-            LogUtil.WriteError("错误信息", iovar.APIName + ex.Message);
+            LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "错误信息", iovar.APIName + ex.Message);
+
             //Console.WriteLine("错误信息:{0}", ex.Message);
             return new PLCResultAll
             {
@@ -220,12 +298,6 @@ public static class AppUtil
     }
 
 
-
-
-
-
-
-
     //写入批操作,加入是否检查标志(为1时检查,默认0为 不检查状态)
     public static PLCResultAll WriteListIsCheck(string strWrite, string strRead, int duration, bool bCheck)   //写入标签LIST
     {
@@ -236,22 +308,14 @@ public static class AppUtil
 
         if (list.Count > 20)   //判断写入的数量,超过20不进行操作
         {
-            LogUtil.WriteLog("错误信息", "写入数据过多,执行失败");
+            LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "错误信息", "写入数据过多,执行失败");
             rlt_All.Sucessful = false;
             rlt_All.Message = "写入数据过多,执行失败";
             return rlt_All;
         }
         foreach (var item in list)
         {
-            if (item.Value == "" || item.Value == null)
-            {
-                OPCHelper.daServerMgr.Write(new List<DataItem> { new DataItem { TagAddress = item.TagAddress, Value = null } });
-            }
-            else
-            {
-                OPCHelper.daServerMgr.Write(new List<DataItem> { new DataItem { TagAddress = item.TagAddress, Value = item.Value } });
-            }
-
+            OPCHelper.daServerMgr.Write(new List<DataItem> { new DataItem { TagAddress = item.TagAddress, Value = item.Value } });
             Thread.Sleep(5);  //间隔 时间
 
         }
@@ -259,7 +323,7 @@ public static class AppUtil
         /// 1:在不检查状态下,直接返回结果信息 
         if (!bCheck)   //在不检查状态下
         {
-            LogUtil.WriteLog("不检查", "不检查");
+            LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "不检查", "不检查");
             rlt_All.Sucessful = true;
             rlt_All.Message = "不检查";
             rlt_All.PlcResults = new List<DataItem>() { new DataItem { TagAddress = "", IsSetSuccessful = false } };
@@ -275,28 +339,109 @@ public static class AppUtil
 
         //间隔等待,写入后数据更新再读出
         //Thread.Sleep(duration);
-        int delatTime = 300;
-        bool listerner = false;
+        int delatTime = 500;
+        bool listerner = false;   //True为正确读取值
         List<DataItem> Rlst = null;
-        while (delatTime <= duration)
+        while (delatTime <= duration)    //循环增时,判断缓存的数据是否更新
         {
-            var resultbool = GetPointFromListerner(strRead);
-            if (resultbool.Count > 0 && !resultbool.Exists(a => a == false))
+            //var resultbool = GetPointFromListerner(strRead);  //读取缓存记录
+            //if (resultbool.Count > 0 && ! resultbool.Exists(a => a == false))   //结果大于0 或 结果为false
+            //{
+            //    listerner = true;
+            //    break;
+            //}
+
+            Thread.Sleep(500);
+            delatTime += 500;
+            //定时主动读取 along 202305
+            PLCResultAll Rall = TimeReadList(list, strRead);
+            if (Rall.Sucessful == true)
             {
-                listerner = true;
-                break;
+                //Console.WriteLine("*************主动读取,获取全部正确值!************");
+                LogUtil.Write(",动作:" + "主动读取,获取正确值!");
+                return Rall;
             }
-            Thread.Sleep(300);
-            delatTime += 300;
-        }
-        if (listerner)
-        {
-            Rlst = DataPointCheckList;   //根据监听数据更新结果
-        }
-        else
-        {
-            Rlst = ReadList(strRead);   //进行写入值的回读操作
+            //else
+            //{
+            //    LogUtil.Write(",结果:" + "数据不匹配"+",读取结果:"+ JsonUtil.SerializeObject(Rall));
+            //}
+
+
         }
+
+
+        return TimeReadList(list, strRead);
+
+        //if (listerner)
+        //{
+        //    Rlst = DataPointCheckList;   //根据监听数据更新结果
+        //}
+        //else
+        //{
+        //    Rlst = ReadList(strRead);   //进行写入值的回读操作
+        //}
+        //rlt_All.Sucessful = true;   //默认成功,在下方的比较中只要其中有一个不正确,置为false。
+        //rlt_All.Message = "批量写入---成功";
+        //for (int i = 0; i < list.Count; i++)
+        //{
+        //    var write = list[i].TagAddress;
+        //    var check = Rlst[i].TagAddress;
+
+        //    //if (write == check)  //标签名相同时,进行两个值的比较
+        //    //{
+        //    //if (write.ToString() == check.ToString())    allen 2023-04 检查代码出错,进行屏蔽,修改
+        //    if (Rlst[i].Value == null)   //判断是否读取值,没有读取到(一般是标签值不存在情况),  跳出返回:写入失败
+        //    {
+        //        LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "错误信息", "批量写入---失败");
+        //        Rlst[i].IsSetSuccessful = false;
+        //        Rlst[i].Message = "写入失败";
+        //        rlt_All.Sucessful = false;
+        //        rlt_All.Message = "批量写入---失败";
+        //        continue;
+        //        //break;
+        //    }
+        //    var ValWrite = list[i].Value.ToString();
+        //    var ValRead = Rlst[i].Value.ToString();
+        //    if (ValWrite == ValRead)  //进行两者值的比较
+        //    {
+        //        Rlst[i].IsSetSuccessful = true;
+        //        Rlst[i].Message = "写入成功";
+        //    }
+        //    else
+        //    {
+        //        LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "错误信息", "批量写入---失败");
+        //        Rlst[i].IsSetSuccessful = false;
+        //        Rlst[i].Message = "写入失败";
+        //        rlt_All.Sucessful = false;
+        //        rlt_All.Message = "批量写入---失败";
+
+        //    }
+        //    rlt_All.PlcResults = Rlst;
+        //}
+
+        //if (bCheck == false)   //在不检查状态下
+        //{
+        //    rlt_All.Sucessful = true;
+        //    rlt_All.Message = "不检查写入值";
+        //    //return rlt_All;
+        //    //还要读取,时间调整为1S时间
+        //}
+        //return rlt_All;
+
+    }
+
+    /// <summary>
+    /// 定时读取OPC标签,获取结果集 along 202305
+    /// </summary>
+    /// <param name="strList"></param>
+    /// <returns></returns>
+    public static PLCResultAll TimeReadList(List<DataItem> list, string strRead)
+    {
+        PLCResultAll rlt_All = new PLCResultAll();
+        rlt_All.PlcResults = new List<DataItem>();
+        List<DataItem> Rlst = null;
+
+        Rlst = ReadList(strRead);   //进行写入值的回读操作
         rlt_All.Sucessful = true;   //默认成功,在下方的比较中只要其中有一个不正确,置为false。
         rlt_All.Message = "批量写入---成功";
         for (int i = 0; i < list.Count; i++)
@@ -309,7 +454,7 @@ public static class AppUtil
             //if (write.ToString() == check.ToString())    allen 2023-04 检查代码出错,进行屏蔽,修改
             if (Rlst[i].Value == null)   //判断是否读取值,没有读取到(一般是标签值不存在情况),  跳出返回:写入失败
             {
-                LogUtil.WriteLog("错误信息", "批量写入---失败");
+                //LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "错误信息", "批量写入---读取后比较1");
                 Rlst[i].IsSetSuccessful = false;
                 Rlst[i].Message = "写入失败";
                 rlt_All.Sucessful = false;
@@ -326,7 +471,7 @@ public static class AppUtil
             }
             else
             {
-                LogUtil.WriteLog("错误信息", "批量写入---失败");
+                //LogUtil.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff") + "错误信息", "批量写入---读取后比较2");
                 Rlst[i].IsSetSuccessful = false;
                 Rlst[i].Message = "写入失败";
                 rlt_All.Sucessful = false;
@@ -336,17 +481,17 @@ public static class AppUtil
             rlt_All.PlcResults = Rlst;
         }
 
-        if (bCheck == false)   //在不检查状态下
-        {
-            rlt_All.Sucessful = true;
-            rlt_All.Message = "不检查写入值";
-            //return rlt_All;
-            //还要读取,时间调整为1S时间
-        }
+
         return rlt_All;
 
     }
 
+
+    /// <summary>
+    /// 从回调的更新缓存读取结果值
+    /// </summary>
+    /// <param name="str"></param>
+    /// <returns></returns>
     private static List<bool> GetPointFromListerner(string str)
     {
         DataPointCheckList = new List<DataItem>();
@@ -354,7 +499,7 @@ public static class AppUtil
         List<DataItem> list = JsonUtil.DeserializeObject<List<DataItem>>(str);
         foreach (var item in list)
         {
-            if (item.TagAddress.ToUpper().EndsWith(".F_CV"))
+            if (item.TagAddress.EndsWith(".F_CV"))
             {
                 DataItem dataItem = null;
                 if (AppUtil.DataItemQueue.TryGetValue(item.TagAddress, out dataItem))
@@ -373,15 +518,11 @@ public static class AppUtil
                 }
 
             }
-            else if (item.TagAddress.ToUpper().EndsWith(".A_CV"))
+            else if (item.TagAddress.EndsWith(".A_CV"))
             {
                 DataItem dataItem = null;
                 if (AppUtil.DataItemQueue.TryGetValue(item.TagAddress, out dataItem))
                 {
-                    if (item.Value == null)
-                    {
-                        item.Value = "";
-                    }
                     if (item.Value.ToString() == dataItem.Value.ToString())
                     {
                         result.Add(true);
@@ -406,7 +547,7 @@ public static class AppUtil
         List<DataItem> rlt = new List<DataItem>();
         foreach (var item in list)
         {
-            if (item.TagAddress.ToUpper().EndsWith(".F_CV"))
+            if (item.TagAddress.EndsWith(".F_CV"))
             {
                 rlt.Add(new DataItem()
                 {
@@ -415,7 +556,7 @@ public static class AppUtil
 
                 });
             }
-            else if (item.TagAddress.ToUpper().EndsWith(".A_CV"))
+            else if (item.TagAddress.EndsWith(".A_CV"))
             {
                 rlt.Add(new DataItem()
                 {

+ 8 - 1
YS.Start.AdminLine/Core/DAServerMgr.cs

@@ -37,7 +37,9 @@ public class DAServerMgr : IDisposable
     {
         substate = new SubscriptionState();
     }
-
+     ~DAServerMgr() {
+        Dispose();
+    }
 
 
     public void Start()
@@ -471,6 +473,11 @@ public class DAServerMgr : IDisposable
 
     public void Dispose()
     {
+        if (_server.IsConnected)
+        {
+            _server.Disconnect();
+        }
+        substate.Active = false;
         _server.Dispose();
     }
 }

+ 1 - 1
YS.Start.AdminLine/Properties/launchSettings.json

@@ -12,7 +12,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5047",
+      "applicationUrl": "http://127.0.0.1:5047",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }