写入冷却加热时间
测试模式切换时对应的定时器也要开启关闭 读到3触发字,关闭扫码页面
This commit is contained in:
1 parent
817b66ad53
commit
eb64a3fc2f
2 files changed
+49
-9
No files matched your search
@@ -178,7 +178,7 @@ namespace WindowsFormsApp1
|
|||||||
// 更新对应PLC的状态指示器为红色
|
// 更新对应PLC的状态指示器为红色
|
||||||
UpdatePlcStatus(Plc.id, false);
|
UpdatePlcStatus(Plc.id, false);
|
||||||
|
|
||||||
LogExecute.logNet.WriteError($"{Plc.plcname}:{Plc.plcip}建立S7连接失败");
|
//LogExecute.logNet.WriteError($"{Plc.plcname}:{Plc.plcip}建立S7连接失败");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -266,13 +266,15 @@ namespace WindowsFormsApp1
|
|||||||
PlcData.Write_Other0 = 1;
|
PlcData.Write_Other0 = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
var okNgresult = siemensHelp.WriteAddress(plcaddress, PlcData);
|
if (PlcData.Write_Other0 == 1)
|
||||||
if (!okNgresult.Success)
|
|
||||||
{
|
{
|
||||||
LogExecute.logNet.WriteError($"{Plc.plcip}写入OK/NG:处理停止");
|
var okNgresult = siemensHelp.WriteAddress(plcaddress, PlcData);
|
||||||
continue;
|
if (!okNgresult.Success)
|
||||||
|
{
|
||||||
|
LogExecute.logNet.WriteError($"{Plc.plcip}写入OK/NG:处理停止");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var imageFormIsOpened = false;
|
var imageFormIsOpened = false;
|
||||||
foreach (Form form in Application.OpenForms)
|
foreach (Form form in Application.OpenForms)
|
||||||
{
|
{
|
||||||
@@ -1795,7 +1797,27 @@ namespace WindowsFormsApp1
|
|||||||
};
|
};
|
||||||
kvHelper.Insert(newSetting);
|
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();
|
UpdateTestModeButtonState();
|
||||||
|
|
||||||
@@ -2012,7 +2034,7 @@ namespace WindowsFormsApp1
|
|||||||
{
|
{
|
||||||
SiemensHelp siemensHelp = Plc.plchelp;
|
SiemensHelp siemensHelp = Plc.plchelp;
|
||||||
List<t_plcaddress> plcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id
|
List<t_plcaddress> plcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id
|
||||||
&& a.code == "Write_Heartbeat");
|
&& a.code == "Write_Heartbeat" || a.code == "Read_Trigger");
|
||||||
|
|
||||||
List<t_plcaddress> timeplcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id
|
List<t_plcaddress> timeplcaddress = Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id
|
||||||
&& a.code == "NowDateTime");
|
&& a.code == "NowDateTime");
|
||||||
@@ -2024,7 +2046,19 @@ namespace WindowsFormsApp1
|
|||||||
{
|
{
|
||||||
LogExecute.logNet.WriteError($"{Plc.plcname}:{Plc.plcip}读取全部地址处理错误!");
|
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;
|
PlcData.Write_Heartbeat = PlcData.Write_Heartbeat == 0 ? (short)1 : (short)0;
|
||||||
|
|
||||||
|
|||||||
@@ -1008,6 +1008,12 @@ namespace WindowsFormsApp1.server
|
|||||||
Result = result
|
Result = result
|
||||||
});
|
});
|
||||||
CsvLogger.Log($"{PlcData.Write_stSN},{PlcData.Read_UploadData0.ToString()},{jrTime}");
|
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
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user