From 1499c24f7de5940b4158d53047a2b5c73cec712b Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 10 Jan 2024 12:43:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change=20-=E8=80=81=E7=BA=BF=E7=AE=B1?= =?UTF-8?q?=E4=BD=93=E5=8F=91=E6=B3=A1=E7=BB=86=E8=8A=82=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Business/TeamSwitchBusiness.cs | 129 ++++++++++-------- .../ViewModels/MainWindowViewModel.cs | 1 + .../ViewModels/RoadKindPageViewModel.cs | 16 ++- .../Views/RealRoadPageView.xaml | 16 +-- .../Views/RoadKindPageView.xaml | 2 +- 8 files changed, 98 insertions(+), 72 deletions(-) diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index decf85c2..2f9c868b 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\ diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index f38a35e7..0f098310 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\ diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index a581a844..a3d7d5ba 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\ diff --git a/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs b/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs index 6252ad5f..e7bb1fae 100644 --- a/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs +++ b/Aucma.Core.OldBoxFoam/Business/TeamSwitchBusiness.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Timers; @@ -148,43 +149,10 @@ namespace Aucma.Core.OldBoxFoam.Business try { //下发PLC清空产量信号 - #region 清空PLC产量 - var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1")); - if (obj1 != null) - { - if (obj1.plc.IsConnected) - { - var flag = obj1.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空A区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } - var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc2")); - if (obj2 != null) - { - if (obj2.plc.IsConnected) - { - bool flag = obj2.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空B区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } - var obj3 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc3")); - if (obj3 != null) - { - if (obj3.plc.IsConnected) - { - var flag = obj3.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空C区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } - var obj4 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc4")); - if (obj4 != null) - { - if (obj4.plc.IsConnected) - { - var flag = obj4.plc.WriteInt16("M216", "1");//换班 数据清空 - log.Warn($"班组切换清空D区产量数据：{(flag == true ? "成功" : "失败")}"); - } - } + #region 清空PLC产量,写1保持500毫秒后写0 + ClearPlcOutPut("1"); + Thread.Sleep(500); + ClearPlcOutPut("0"); #endregion //小时统计报表数据存至记录表，清空小时统计报表 @@ -246,35 +214,34 @@ namespace Aucma.Core.OldBoxFoam.Business { foreach (var plan in planInfoList) { - if (plan.PlanAmount > plan.CompleteAmount) + + plan.ShiftType = 0; + + bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; + if (updateFlag) { - plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; - plan.CompleteAmount = 0; - plan.ShiftType = 1; + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; - if (saveFlag > 0) + if (plan.PlanAmount > plan.CompleteAmount) { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); - } - else - { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; + plan.CompleteAmount = 0; + plan.ShiftType = 1; + + int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; + if (saveFlag > 0) + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); + } + else + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + } } } else { - plan.ShiftType = 0; - - bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; - if (updateFlag) - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - } - else - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); - } + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); } } } @@ -284,5 +251,49 @@ namespace Aucma.Core.OldBoxFoam.Business log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，切换逻辑处理异常：{ex.Message}"); } } + + /// + /// 清空PLC产量数据 + /// + /// + private void ClearPlcOutPut(string value) + { + var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1")); + if (obj1 != null) + { + if (obj1.plc.IsConnected) + { + var flag = obj1.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空A区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc2")); + if (obj2 != null) + { + if (obj2.plc.IsConnected) + { + bool flag = obj2.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空B区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + var obj3 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc3")); + if (obj3 != null) + { + if (obj3.plc.IsConnected) + { + var flag = obj3.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空C区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + var obj4 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc4")); + if (obj4 != null) + { + if (obj4.plc.IsConnected) + { + var flag = obj4.plc.WriteInt16("M216", value);//换班 数据清空 + log.Warn($"班组切换清空D区产量数据写{value}：{(flag == true ? "成功" : "失败")}"); + } + } + } } } diff --git a/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs index c0d82566..c4a5f281 100644 --- a/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs @@ -136,6 +136,7 @@ namespace Aucma.Core.OldBoxFoam.ViewModels case "Exit": if (System.Windows.MessageBox.Show("确定要退出系统吗？", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) { + log.Warn($"系统退出，当前时间：{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Application.Current.Shutdown(); Environment.Exit(0); } diff --git a/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs index f65842c3..f8673ae2 100644 --- a/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs +++ b/Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows; @@ -56,7 +57,20 @@ namespace Aucma.Core.OldBoxFoam.ViewModels { OldBoxFoamTypeModel model= new OldBoxFoamTypeModel(); model.MaterialCode = item.MaterialCode; - model.MaterialName = item.MaterialName; + + string pattern = @",(.*)"; + Regex regex = new Regex(pattern); + Match match = regex.Match(item.MaterialName); + + if (match.Success) + { + string result = match.Groups[1].Value; + model.MaterialName = result; + } + else + { + model.MaterialName = item.MaterialName; + } model.ObjId = item.ObjId; model.Status = "1"; Shapes.Add(model); diff --git a/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml b/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml index 13a5726d..b0b67600 100644 --- a/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml +++ b/Aucma.Core.OldBoxFoam/Views/RealRoadPageView.xaml @@ -166,17 +166,17 @@ - + - - - + + + - + @@ -198,9 +198,9 @@ - + - + @@ -208,7 +208,7 @@ - + diff --git a/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml b/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml index 25fdb814..c198646d 100644 --- a/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml +++ b/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml @@ -206,7 +206,7 @@ From e4f78599c7d26f5316196f9280dfa2b78399d61f Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 10 Jan 2024 12:50:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change=20-=20=E6=96=B0=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E7=BA=BF=E7=8F=AD=E7=BB=84=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 140916 -> 56 bytes ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Business/TeamSwitchBusiness.cs | 43 +++++++++--------- .../GeneratedInternalTypeHelper.g.i.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 152 -> 152 bytes .../HwControlLib_MarkupCompile.i.cache | 6 +-- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 601c80d9..d1d06cea 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index d57995efc7954aaf5f62c45db37abc2783259951..49f1a9f2a16243ec53dc4768f820a9d0f0ad8241 100644 GIT binary patch literal 56 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 plan.CompleteAmount) + plan.ShiftType = 0; + + bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; + if (updateFlag) { - plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; - plan.CompleteAmount = 0; - plan.ShiftType = 1; + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; - if (saveFlag > 0) - { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); - } - else + if (plan.PlanAmount > plan.CompleteAmount) { - log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount; + plan.CompleteAmount = 0; + plan.ShiftType = 1; + + int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; + if (saveFlag > 0) + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行成功"); + } + else + { + log.Warn($"计划：{plan.OrderCode}，剩余计划：{plan.PlanAmount}，未完成进行顺延，执行失败"); + } } } else { - plan.ShiftType = 0; - - bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result; - if (updateFlag) - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新成功"); - } - else - { - log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); - } + log.Warn($"计划：{plan.OrderCode}，班组切换标识更新失败"); } + } } } diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index 36288f46..57f88858 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index a4db58d9..54fddce2 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index a056af0d3f9dc463157ec9d2f3a3a69d49f71e33..8c7cf623647bf2a0c37ba5b4a3a756ded13a9157 100644 GIT binary patch delta 55 zcmV-70LcHC0hj?PP)kQa3;+NCr8yS$>!B4}74X+VEuo9+W7`x2N2FZ|s} diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache index 303b31a5..6a03d169 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache @@ -4,7 +4,7 @@ library C# .cs -D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\ +E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\ HwControlLib none false @@ -13,8 +13,8 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP 1204305769 71208292394 -194-2067936865 +194-1617825143 Themes\Generic.xaml; -False +True