From eb64a3fc2fc471d3570654736cb7281259492a0b Mon Sep 17 00:00:00 2001 From: gf zhou Date: Mon, 2 Jun 2025 16:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=99=E5=85=A5=E5=86=B7=E5=8D=B4=E5=8A=A0?= =?UTF-8?q?=E7=83=AD=E6=97=B6=E9=97=B4=20=E6=B5=8B=E8=AF=95=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2=E6=97=B6=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E4=B9=9F=E8=A6=81=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=85=B3=E9=97=AD=20=E8=AF=BB=E5=88=B03=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E5=AD=97=EF=BC=8C=E5=85=B3=E9=97=AD=E6=89=AB=E7=A0=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WindowsFormsApp1/MainForm.cs | 52 +++++++++++++++++++++++----- WindowsFormsApp1/server/ApiClient.cs | 6 ++++ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/WindowsFormsApp1/MainForm.cs b/WindowsFormsApp1/MainForm.cs index 932b021..f6b4ac1 100644 --- a/WindowsFormsApp1/MainForm.cs +++ b/WindowsFormsApp1/MainForm.cs @@ -178,7 +178,7 @@ namespace WindowsFormsApp1 // 更新对应PLC的状态指示器为红色 UpdatePlcStatus(Plc.id, false); - LogExecute.logNet.WriteError($"{Plc.plcname}:{Plc.plcip}建立S7连接失败"); + //LogExecute.logNet.WriteError($"{Plc.plcname}:{Plc.plcip}建立S7连接失败"); continue; } @@ -266,13 +266,15 @@ namespace WindowsFormsApp1 PlcData.Write_Other0 = 1; } - var okNgresult = siemensHelp.WriteAddress(plcaddress, PlcData); - if (!okNgresult.Success) + if (PlcData.Write_Other0 == 1) { - LogExecute.logNet.WriteError($"{Plc.plcip}写入OK/NG:处理停止"); - continue; + var okNgresult = siemensHelp.WriteAddress(plcaddress, PlcData); + if (!okNgresult.Success) + { + LogExecute.logNet.WriteError($"{Plc.plcip}写入OK/NG:处理停止"); + continue; + } } - var imageFormIsOpened = false; foreach (Form form in Application.OpenForms) { @@ -1795,7 +1797,27 @@ namespace WindowsFormsApp1 }; kvHelper.Insert(newSetting); } - + if (newMode) + { + //调试 + if ("ScrewE,Assy2,Assy3,ScrewS,ScrewM,ScrewTC".ToLower().Contains(Init.t_Line.lineremark2.ToLower())) + { + if (screwReportTimer.Enabled) + screwReportTimer.Stop(); + } + if (fileUploadTimer.Enabled) + fileUploadTimer.Stop(); + } + else + { + if ("ScrewE,Assy2,Assy3,ScrewS,ScrewM,ScrewTC".ToLower().Contains(Init.t_Line.lineremark2.ToLower())) + { + if(!screwReportTimer.Enabled) + screwReportTimer.Start(); + } + if(!fileUploadTimer.Enabled) + fileUploadTimer.Start(); + } // 更新按钮状态 UpdateTestModeButtonState(); @@ -2012,7 +2034,7 @@ namespace WindowsFormsApp1 { SiemensHelp siemensHelp = Plc.plchelp; List plcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id - && a.code == "Write_Heartbeat"); + && a.code == "Write_Heartbeat" || a.code == "Read_Trigger"); List timeplcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id && a.code == "NowDateTime"); @@ -2024,7 +2046,19 @@ namespace WindowsFormsApp1 { LogExecute.logNet.WriteError($"{Plc.plcname}:{Plc.plcip}读取全部地址处理错误!"); } - + if(PlcData.Read_Trigger == 3 && Application.OpenForms.Count > 1) + { + foreach (Form form in Application.OpenForms) + { + if (form.Name == "ScanForm") + { + this.Invoke(new Action(() => + { + form.Close(); + })); + } + } + } //写入心跳 PlcData.Write_Heartbeat = PlcData.Write_Heartbeat == 0 ? (short)1 : (short)0; diff --git a/WindowsFormsApp1/server/ApiClient.cs b/WindowsFormsApp1/server/ApiClient.cs index 367ee35..0fa6335 100644 --- a/WindowsFormsApp1/server/ApiClient.cs +++ b/WindowsFormsApp1/server/ApiClient.cs @@ -1008,6 +1008,12 @@ namespace WindowsFormsApp1.server Result = result }); CsvLogger.Log($"{PlcData.Write_stSN},{PlcData.Read_UploadData0.ToString()},{jrTime}"); + + var jrtime = ((TimeSpan)((material.Data.checkin2 ?? new DateTime()) - (material.Data.checkout1 ?? new DateTime()))).TotalSeconds; + PlcData.Write_ReceiveData0 = (float)jrtime; + + var lqtime = ((TimeSpan)((material.Data.checkin3 ?? new DateTime()) - (material.Data.checkout2 ?? new DateTime()))).TotalSeconds; + PlcData.Write_ReceiveData1 = (float)lqtime; } else {