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 d57995ef..49f1a9f2 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ 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.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index f17e3fdc..173f98e4 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ 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.BoxFoam/Business/TeamSwitchBusiness.cs b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs index 04f12893..5a7762be 100644 --- a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs @@ -246,36 +246,35 @@ namespace Aucma.Core.BoxFoam.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) - { - 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/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 @@ 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 a056af0d..8c7cf623 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache differ 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