liuwf 1 year ago
commit 4b0e316eb2

@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api
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.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames = build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes = 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 = build_property._RazorSourceGeneratorDebug =

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Common 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\

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.EventBus 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\

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Model 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\

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Serilog.Es 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\

@ -246,36 +246,35 @@ namespace Aucma.Core.BoxFoam.Business
{ {
foreach (var plan in planInfoList) 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; log.Warn($"计划:{plan.OrderCode},班组切换标识更新成功");
plan.CompleteAmount = 0;
plan.ShiftType = 1;
int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; if (plan.PlanAmount > plan.CompleteAmount)
if (saveFlag > 0)
{
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 else
{ {
plan.ShiftType = 0; log.Warn($"计划:{plan.OrderCode},班组切换标识更新失败");
bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result;
if (updateFlag)
{
log.Warn($"计划:{plan.OrderCode},班组切换标识更新成功");
}
else
{
log.Warn($"计划:{plan.OrderCode},班组切换标识更新失败");
}
} }
} }
} }
} }

@ -7,6 +7,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Timers; using System.Timers;
@ -148,43 +149,10 @@ namespace Aucma.Core.OldBoxFoam.Business
try try
{ {
//下发PLC清空产量信号 //下发PLC清空产量信号
#region 清空PLC产量 #region 清空PLC产量,写1保持500毫秒后写0
var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1")); ClearPlcOutPut("1");
if (obj1 != null) Thread.Sleep(500);
{ ClearPlcOutPut("0");
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 ? "" : "")}");
}
}
#endregion #endregion
//小时统计报表数据存至记录表,清空小时统计报表 //小时统计报表数据存至记录表,清空小时统计报表
@ -246,35 +214,34 @@ namespace Aucma.Core.OldBoxFoam.Business
{ {
foreach (var plan in planInfoList) 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; log.Warn($"计划:{plan.OrderCode},班组切换标识更新成功");
plan.CompleteAmount = 0;
plan.ShiftType = 1;
int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result; if (plan.PlanAmount > plan.CompleteAmount)
if (saveFlag > 0)
{ {
log.Warn($"计划:{plan.OrderCode},剩余计划:{plan.PlanAmount},未完成进行顺延,执行成功"); plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount;
} plan.CompleteAmount = 0;
else plan.ShiftType = 1;
{
log.Warn($"计划:{plan.OrderCode},剩余计划:{plan.PlanAmount},未完成进行顺延,执行失败"); int saveFlag = _boxFoamPlanServices.AddAsync(plan).Result;
if (saveFlag > 0)
{
log.Warn($"计划:{plan.OrderCode},剩余计划:{plan.PlanAmount},未完成进行顺延,执行成功");
}
else
{
log.Warn($"计划:{plan.OrderCode},剩余计划:{plan.PlanAmount},未完成进行顺延,执行失败");
}
} }
} }
else else
{ {
plan.ShiftType = 0; log.Warn($"计划:{plan.OrderCode},班组切换标识更新失败");
bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result;
if (updateFlag)
{
log.Warn($"计划:{plan.OrderCode},班组切换标识更新成功");
}
else
{
log.Warn($"计划:{plan.OrderCode},班组切换标识更新失败");
}
} }
} }
} }
@ -284,5 +251,49 @@ namespace Aucma.Core.OldBoxFoam.Business
log.Warn($"{(shiftType == 1 ? "" : "")}班组切换,切换逻辑处理异常:{ex.Message}"); log.Warn($"{(shiftType == 1 ? "" : "")}班组切换,切换逻辑处理异常:{ex.Message}");
} }
} }
/// <summary>
/// 清空PLC产量数据
/// </summary>
/// <param name="value"></param>
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 ? "" : "")}");
}
}
}
} }
} }

@ -136,6 +136,7 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
case "Exit": case "Exit":
if (System.Windows.MessageBox.Show("确定要退出系统吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) 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(); Application.Current.Shutdown();
Environment.Exit(0); Environment.Exit(0);
} }

@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
@ -56,7 +57,20 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
{ {
OldBoxFoamTypeModel model= new OldBoxFoamTypeModel(); OldBoxFoamTypeModel model= new OldBoxFoamTypeModel();
model.MaterialCode = item.MaterialCode; 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.ObjId = item.ObjId;
model.Status = "1"; model.Status = "1";
Shapes.Add(model); Shapes.Add(model);

@ -166,17 +166,17 @@
<TextBlock Text="当日小时产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="当日小时产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" > <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<lvc:CartesianChart Series="{Binding HourAchievement, UpdateSourceTrigger=PropertyChanged}" Foreground="White" DisableAnimations="True"> <lvc:CartesianChart Series="{Binding HourAchievement, UpdateSourceTrigger=PropertyChanged}" DisableAnimations="True">
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding HourOutPutList}" FontSize="15"> <lvc:Axis Foreground="White" Labels="{Binding HourOutPutList}" FontSize="15">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="Transparent" > <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="Transparent" >
</lvc:Separator> </lvc:Separator>
</lvc:Axis.Separator> </lvc:Axis.Separator>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15" MinValue="0" LabelFormatter="{Binding YAxisLabelFormatter}" > <lvc:Axis Foreground="White" FontSize="15" MinValue="0" LabelFormatter="{Binding YAxisLabelFormatter}" >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="Transparent"> <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="Transparent">
</lvc:Separator> </lvc:Separator>
@ -198,9 +198,9 @@
<TextBlock Text="当日型号产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="当日型号产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" > <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<lvc:CartesianChart Series="{Binding MaterialTypeAchievement, UpdateSourceTrigger=PropertyChanged}" Margin="5" Foreground="White" DisableAnimations="True"> <lvc:CartesianChart Series="{Binding MaterialTypeAchievement, UpdateSourceTrigger=PropertyChanged}" Margin="5" DisableAnimations="True">
<lvc:CartesianChart.AxisX > <lvc:CartesianChart.AxisX >
<lvc:Axis Labels="{Binding MaterialTypeOutPutList}" FontSize="15"> <lvc:Axis Foreground="White" Labels="{Binding MaterialTypeOutPutList}" FontSize="15">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="Transparent" > <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="Transparent" >
</lvc:Separator> </lvc:Separator>
@ -208,7 +208,7 @@
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15" MinValue="0" LabelFormatter="{Binding YAxisLabelFormatter}"> <lvc:Axis Foreground="White" FontSize="15" MinValue="0" LabelFormatter="{Binding YAxisLabelFormatter}">
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="Transparent" > <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="Transparent" >
</lvc:Separator> </lvc:Separator>

@ -206,7 +206,7 @@
<Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
<Button Command="{Binding DataContext.SubmitCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent"> <Button Command="{Binding DataContext.SubmitCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
<TextBlock Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" />
</Button> </Button>
<!--<TextBlock x:Name="spaceCodeText2" Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>--> <!--<TextBlock x:Name="spaceCodeText2" Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
</Border> </Border>

@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
/// GeneratedInternalTypeHelper /// GeneratedInternalTypeHelper
/// </summary> /// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()] [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)] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = HwControlLib build_property.RootNamespace = HwControlLib
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\

@ -4,7 +4,7 @@
library library
C# C#
.cs .cs
D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\ E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
HwControlLib HwControlLib
none none
false false
@ -13,8 +13,8 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
1204305769 1204305769
71208292394 71208292394
194-2067936865 194-1617825143
Themes\Generic.xaml; Themes\Generic.xaml;
False True

Loading…
Cancel
Save