liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Browse Source
main
liuwf 10 months ago
parent 401487996f 1df04ca5ff
commit f600c4c894
2 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File

85
Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs
Unescape Escape View File

@ -146,36 +146,41 @@ namespace Aucma.Core.BoxFoam.Business
private void UpdateShiftInfo(int shiftType) private void UpdateShiftInfo(int shiftType)
{ {
log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑"); log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑");
Console.WriteLine($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑");
try try
{ {
#region 240325 添加清空夹具产量功能 #region 240325 liulb 添加清空夹具产量功能； Delete By wenjy 2024-03-30 删除清空产量逻辑
//下发PLC清空产量信号 //下发PLC清空产量信号
#region 清空PLC产量，新线暂时未清除产量，如需清除可将注释取消 //var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); //if (obj1 != null)
if (obj1 != null) //{
{ // if (obj1.plc.IsConnected)
if (obj1.plc.IsConnected) // {
{ // var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空
var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空 // Thread.Sleep(500);
Thread.Sleep(500); // obj1.plc.WriteBool("M6.0", false);//数据清空后复位
obj1.plc.WriteBool("M6.0", false);//数据清空后复位 // Console.WriteLine($"【{DateTime.Now}】班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}");
Console.WriteLine($"【{DateTime.Now}】班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); // log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}");
log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); // }
} //}
} //var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc")); //if (obj2 != null)
if (obj2 != null) //{
{ // if (obj2.plc.IsConnected)
if (obj2.plc.IsConnected) // {
{ // bool flag = obj2.plc.WriteBool("M6.0", true);//换班 数据清空
bool flag = obj2.plc.WriteBool("M6.0", true);//换班 数据清空 // Thread.Sleep(500);
Thread.Sleep(500); // obj2.plc.WriteBool("M6.0", false);//数据清空后复位
obj2.plc.WriteBool("M6.0", false);//数据清空后复位 // Console.WriteLine($"【{DateTime.Now}】班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}");
Console.WriteLine($"【{DateTime.Now}】班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); // log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}");
log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); // }
} //}
}
#endregion #endregion
#region Add By wenjy 2024-03-30 10:56:00 清空PLC产量,写true保持500毫秒后写false
ClearPlcOutPut(true);
Thread.Sleep(3000);
ClearPlcOutPut(false);
#endregion #endregion
//小时统计报表数据存至记录表，清空小时统计报表 //小时统计报表数据存至记录表，清空小时统计报表
@ -274,5 +279,33 @@ namespace Aucma.Core.BoxFoam.Business
log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，切换逻辑处理异常：{ex.Message}"); log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，切换逻辑处理异常：{ex.Message}");
} }
} }
/// <summary>
/// 清空PLC产量数据
/// </summary>
/// <param name="value"></param>
private void ClearPlcOutPut(bool value)
{
var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
if (obj1 != null)
{
if (obj1.plc.IsConnected)
{
var flag = obj1.plc.WriteBool("M6.0", value);//换班 数据清空
log.Warn($"班组切换清空A区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
Console.WriteLine($"班组切换清空A区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
}
}
var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
if (obj2 != null)
{
if (obj2.plc.IsConnected)
{
bool flag = obj2.plc.WriteBool("M6.0", value);//换班 数据清空
log.Warn($"班组切换清空B区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
Console.WriteLine($"班组切换清空B区产量数据写{value}：{(flag == true ? "成功" : "失败")}");
}
}
}
} }
} }

2
Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -48,7 +48,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
await init(); await init();
await RefreshTeamTime();//班组时间 await RefreshTeamTime();//班组时间
await ClearProduct(); //await ClearProduct();
}); });
TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness(); TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness();

Write Preview
Loading…
Cancel
Save