修改密码 固化锁线程 加oldplctrigger,避免重复调用

This commit is contained in:
zhougf committed 2025-04-01 15:15:05 +08:00
1 parent 60cafc4f8c
commit d20b935213
9 files changed
+303 -195

No files matched your search

+101 -65
View File
@@ -42,7 +42,8 @@ namespace WindowsFormsApp1
// 在MainForm类的成员变量部分添加一个定时器
private System.Windows.Forms.Timer statusReportTimer = new System.Windows.Forms.Timer();
private ApiClient statusApiClient = new ApiClient(); // 专用于状态上报的API客户端
private object curingLock = new object();
private int OldPlcTrigger = 0;
public MainForm()
{
InitializeComponent();
@@ -78,6 +79,18 @@ namespace WindowsFormsApp1
操作人员ID.Text = Init.t_User.username;
if (Init.t_User.username == "admin")
{
修改密码ToolStripMenuItem.Enabled = true;
用户管理ToolStripMenuItem.Enabled = true;
产线管理ToolStripMenuItem.Enabled = true;
pLC管理ToolStripMenuItem.Enabled = true;
流程管理ToolStripMenuItem.Enabled = true;
mES接口配置ToolStripMenuItem.Enabled = true;
扫码枪配置ToolStripMenuItem.Enabled = true;
系统参数配置ToolStripMenuItem.Enabled = true;
}
// 添加窗体关闭事件处理
this.FormClosing += MainForm_FormClosing;
@@ -149,15 +162,17 @@ namespace WindowsFormsApp1
continue;
}
if(Plc.id == 1)
{
//if(Plc.id == 1)
//{
LOT号.Text = PlcData.Read_MaterialCode0;
Tray盘二维码.Text = PlcData.Read_MaterialCode1;
材料值.Text = PlcData.Read_MaterialCode2;
}
Init.ImageLocation = PlcData.Read_Other4;
Init.ImageName = PlcData.Read_Other3.ToString();
//}
当前时间.Text = $"PLC状态:{plcstatus.GetName(typeof(plcstatus),PlcData.Read_Status)}";
当前时间.Text = $"PLC状态:{plcstatus.GetName(typeof(plcstatus), PlcData.Read_Status)}";
DateTime Plc_Time = DateTime.Now;
@@ -176,12 +191,13 @@ namespace WindowsFormsApp1
otherdata otherdata = new otherdata();
//Init.SN = PlcData.Read_MaterialCode0;
#region 机台状态及报警
//机台状态
//机台状态.Text = "机台状态:" + Enum.GetName(typeof(plcstatus), Init.Plcstatus);
int oldstatus = Init.Plcstatus;
if (PlcData.Read_Status != 0)
//if (PlcData.Read_Status != 0)
if(false)
{
DateTime oldPlcstatus_LastTime = Init.Plcstatus_LastTime;
//状态+报警
if (oldstatus != PlcData.Read_Status)
{
@@ -256,8 +272,19 @@ namespace WindowsFormsApp1
{
//机台状态.BackColor = SystemColors.Control;
}
#endregion
#region 判断及查找流程
if (PlcData.Read_Trigger == OldPlcTrigger)
{
continue;
}
else
{
OldPlcTrigger = PlcData.Read_Trigger;
}
if (PlcData.Read_Trigger == 0 && PlcData.Write_Status == 0)
{
continue;
@@ -294,6 +321,7 @@ namespace WindowsFormsApp1
}
#endregion
#region 根据流程,判断是否需要扫码、气密、扭力等
if (nowflow.scan)
{
@@ -313,12 +341,13 @@ namespace WindowsFormsApp1
continue;
}
}
// ccd 扫码,dzcan不用了
if (nowflow.dzscan)
{
//扫码
var stationid = Init.t_Line.lineremark2;
// ccd扫码
if ("Assy1".Contains(stationid))
if ("Assy1,".Contains(stationid))
{
SQLiteHelper<t_keyvalue> sQLiteHelper_key = new db.SQLiteHelper<t_keyvalue>();
var key_sqlresult = sQLiteHelper_key.QueryAll();
@@ -382,6 +411,7 @@ namespace WindowsFormsApp1
// continue;
//}
}
//压力曲线
if (nowflow.finalpressurecurve)
{
//压力曲线
@@ -399,6 +429,7 @@ namespace WindowsFormsApp1
//{
// //扭力曲线(这里不处理,后端API获取)
//}
//螺丝扭力
if (nowflow.finaltorquevalue)
{
//螺丝枪扭力数据
@@ -412,11 +443,13 @@ namespace WindowsFormsApp1
}
otherdata.FinalTorqueValue = finaltorquevalue_result.Data;
}
//气密
if (nowflow.airtight)
{
//气密参数
otherdata.FinalAirtightValue = Init.airtight;
}
//螺丝角度
if (nowflow.finalanglevaluue)
{
//螺丝枪角度
@@ -435,77 +468,80 @@ namespace WindowsFormsApp1
//文件上传
}
#endregion
// NG料进站不判断,进站MES返回FAIL,记录。该站其他事件不触发MES,直接跳过
//if()
#region 判断物料调用次数 固化站
if (Init.t_Line.lineremark2 == "Curing")
{
SQLiteHelper<t_materialcall> materialCallHelper = new SQLiteHelper<t_materialcall>();
string materialId = PlcData.Read_MaterialCode0;
bool shouldCallApi = false;
var materialCall = materialCallHelper.QuerySingle(m => m.materialid == materialId).Data;
if (materialCall == null)
lock (curingLock)
{
if (Init.t_Line.lineremark2 == "Curing")
{
// 首次进站,需要调用接口
materialCall = new t_materialcall { materialid = materialId };
materialCall.checkin1 = DateTime.Now;
materialCallHelper.Insert(materialCall);
shouldCallApi = true;
}
else
{
// 判断当前是第几次调用
if (!materialCall.checkin1.HasValue)
SQLiteHelper<t_materialcall> materialCallHelper = new SQLiteHelper<t_materialcall>();
string materialId = PlcData.Read_MaterialCode0;
bool shouldCallApi = false;
var materialCall = materialCallHelper.QuerySingle(m => m.materialid == materialId).Data;
if (materialCall == null)
{
// 首次进站,需要调用接口
materialCall = new t_materialcall { materialid = materialId };
materialCall.checkin1 = DateTime.Now;
shouldCallApi = true;
}
else if (!materialCall.checkout3.HasValue
&& materialCall.checkout2.HasValue
&& materialCall.checkout1.HasValue
&& nowinterface.code.Contains("Checkout"))
{
// 第三次出站,需要调用接口
materialCall.checkout3 = DateTime.Now;
materialCallHelper.Insert(materialCall);
shouldCallApi = true;
}
else
{
// 更新对应的时间
if (nowinterface.code.Contains("SN_CheckIN"))
// 判断当前是第几次调用
if (!materialCall.checkin1.HasValue)
{
if (!materialCall.checkin2.HasValue)
materialCall.checkin2 = DateTime.Now;
else if (!materialCall.checkin3.HasValue)
materialCall.checkin3 = DateTime.Now;
PlcData.Write_Status = PLC_Status.SN_CheckIN;
materialCall.checkin1 = DateTime.Now;
shouldCallApi = true;
}
else if (nowinterface.code.Contains("SN_Checkout"))
else if (!materialCall.checkout3.HasValue
&& materialCall.checkout2.HasValue
&& materialCall.checkout1.HasValue
&& nowinterface.code.Contains("Checkout"))
{
if (!materialCall.checkout1.HasValue)
materialCall.checkout1 = DateTime.Now;
else if (!materialCall.checkout2.HasValue)
materialCall.checkout2 = DateTime.Now;
PlcData.Write_Status = PLC_Status.SN_Checkout;
// 第三次出站,需要调用接口
materialCall.checkout3 = DateTime.Now;
shouldCallApi = true;
}
else
{
// 更新对应的时间
if (nowinterface.code.Contains("SN_CheckIN"))
{
if (!materialCall.checkin2.HasValue)
materialCall.checkin2 = DateTime.Now;
else if (!materialCall.checkin3.HasValue)
materialCall.checkin3 = DateTime.Now;
PlcData.Write_Status = PLC_Status.SN_CheckIN;
}
else if (nowinterface.code.Contains("SN_Checkout"))
{
if (!materialCall.checkout1.HasValue)
materialCall.checkout1 = DateTime.Now;
else if (!materialCall.checkout2.HasValue)
materialCall.checkout2 = DateTime.Now;
PlcData.Write_Status = PLC_Status.SN_Checkout;
}
}
materialCallHelper.Update(materialCall);
}
materialCallHelper.Update(materialCall);
}
if (!shouldCallApi)
{
// 不需要调用接口,直接返回成功
PlcData.Write_Status = nowinterface.code.Contains("SN_CheckIN")
? (short)PLC_Status.SN_CheckIN
: (short)PLC_Status.SN_Checkout;
var writeresult = siemensHelp.WriteAddress(plcaddress, PlcData);
if (!writeresult.Success)
if (!shouldCallApi)
{
LogExecute.logNet.WriteError($"{Plc.plcip}写入地址处理错误:处理停止");
// 不需要调用接口,直接返回成功
PlcData.Write_Status = nowinterface.code.Contains("SN_CheckIN")
? (short)PLC_Status.SN_CheckIN
: (short)PLC_Status.SN_Checkout;
var writeresult = siemensHelp.WriteAddress(plcaddress, PlcData);
if (!writeresult.Success)
{
LogExecute.logNet.WriteError($"{Plc.plcip}写入地址处理错误:处理停止");
continue;
}
continue;
}
continue;
}
}
#endregion
@@ -1337,7 +1373,7 @@ namespace WindowsFormsApp1
dataBuilder.Append(Init.AirtightPort.ReadExisting());
}
var ReturnValue = dataBuilder.ToString();
LogExecute.logNet.WriteDebug($"通过气密仪获取到 {ReturnValue}");
//LogExecute.logNet.WriteDebug($"通过气密仪获取到 {ReturnValue}");
int index1 = 1;
int index2 = 1;
@@ -1391,8 +1427,8 @@ namespace WindowsFormsApp1
Init.airtight.Airtight_Value = sealInt[0].ToString();
Init.airtight.Leak_Value = sealInt[1].ToString();
Init.airtight.LastTime = DateTime.Now;
LogExecute.logNet.WriteDebug($"通过气密仪获取到 压力值:{Init.airtight.Airtight_Value},泄露值:{Init.airtight.Leak_Value}");
CsvLogger.Log($"{Init.airtight.Airtight_Value},{Init.airtight.Leak_Value}");
LogExecute.SNlogNet.WriteDebug($"通过气密仪获取到 压力值:{Init.airtight.Airtight_Value},泄露值:{Init.airtight.Leak_Value}");
}
catch (Exception ex)
{