From 6ce4a910ba6ad4004ed2797287e917770e948cc7 Mon Sep 17 00:00:00 2001 From: wenjy Date: Sat, 30 Mar 2024 12:40:22 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E5=88=87=E6=8D=A2=EF=BC=8C=E6=B3=A8=E9=87=8Amain?= =?UTF-8?q?=E4=B8=AD=E7=9A=84//await=20ClearProduct();?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Business/TeamSwitchBusiness.cs | 85 +++++++++++++------ .../ViewModels/MainWindowViewModel.cs | 2 +- 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs index bcf96c1c..51fe91cb 100644 --- a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs @@ -146,36 +146,41 @@ namespace Aucma.Core.BoxFoam.Business private void UpdateShiftInfo(int shiftType) { log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑"); + Console.WriteLine($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑"); try { - #region 240325 添加清空夹具产量功能 + #region 240325 liulb 添加清空夹具产量功能； Delete By wenjy 2024-03-30 删除清空产量逻辑 //下发PLC清空产量信号 - #region 清空PLC产量，新线暂时未清除产量，如需清除可将注释取消 - var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); - if (obj1 != null) - { - if (obj1.plc.IsConnected) - { - var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空 - Thread.Sleep(500); - obj1.plc.WriteBool("M6.0", false);//数据清空后复位 - Console.WriteLine($"【{DateTime.Now}】班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); - log.Warn($"班组切换清空1~6区产量数据：{(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", true);//换班 数据清空 - Thread.Sleep(500); - obj2.plc.WriteBool("M6.0", false);//数据清空后复位 - Console.WriteLine($"【{DateTime.Now}】班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); - log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } + //var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); + //if (obj1 != null) + //{ + // if (obj1.plc.IsConnected) + // { + // var flag = obj1.plc.WriteBool("M6.0", true);//换班 数据清空 + // Thread.Sleep(500); + // obj1.plc.WriteBool("M6.0", false);//数据清空后复位 + // Console.WriteLine($"【{DateTime.Now}】班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); + // log.Warn($"班组切换清空1~6区产量数据：{(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", true);//换班 数据清空 + // Thread.Sleep(500); + // obj2.plc.WriteBool("M6.0", false);//数据清空后复位 + // Console.WriteLine($"【{DateTime.Now}】班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); + // log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); + // } + //} #endregion + + #region Add By wenjy 2024-03-30 10:56:00 清空PLC产量,写true保持500毫秒后写false + ClearPlcOutPut(true); + Thread.Sleep(3000); + ClearPlcOutPut(false); #endregion //小时统计报表数据存至记录表，清空小时统计报表 @@ -274,5 +279,33 @@ namespace Aucma.Core.BoxFoam.Business log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，切换逻辑处理异常：{ex.Message}"); } } + + /// + /// 清空PLC产量数据 + /// + /// + 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 ? "成功" : "失败")}"); + } + } + } } } diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index a10e728d..a14025df 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -48,7 +48,7 @@ namespace Aucma.Core.BoxFoam.ViewModels { await init(); await RefreshTeamTime();//班组时间 - await ClearProduct(); + //await ClearProduct(); }); TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness();