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

change - 门体发泡线地址修改，门体发泡机添加工位编号、发泡机状态

Browse Source
dev
wenjy 1 year ago
parent 7f1528506d
commit 2794fd6e13
15 changed files with 650 additions and 1409 deletions
Show Stats Download Patch File Download Diff File

7
Admin.Core.Api/Admin.Core.Model.xml
Unescape Escape View File

@ -1606,6 +1606,11 @@
所属系统;1系统 2系统 所属系统;1系统 2系统
</summary> </summary>
</member> </member>
<member name="P:Admin.Core.Model.BoxLastShotRecord.SystemStatus">
<summary>
系统状态
</summary>
</member>
<member name="P:Admin.Core.Model.BoxLastShotRecord.GunCode"> <member name="P:Admin.Core.Model.BoxLastShotRecord.GunCode">
<summary> <summary>
枪编号；A1枪,B1枪,A2枪,B2枪 枪编号；A1枪,B1枪,A2枪,B2枪
@ -2308,7 +2313,7 @@
</member> </member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.PerfusionCompleted"> <member name="P:Admin.Core.Model.Perfusion_Alarm.PerfusionCompleted">
<summary> <summary>
异常是否取消 灌注是否完成
</summary> </summary>
</member> </member>
<member name="P:Admin.Core.Model.Perfusion_Alarm.CreatedBy"> <member name="P:Admin.Core.Model.Perfusion_Alarm.CreatedBy">

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -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\

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -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\

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -1,3 +1,3 @@
is_global = true is_global = true
build_property.RootNamespace = Admin.Core.FrameWork build_property.RootNamespace = Admin.Core.FrameWork
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\

10
Admin.Core.Model/Model_New/BoxLastShotRecord.cs
Unescape Escape View File

@ -19,12 +19,22 @@ namespace Admin.Core.Model
/// </summary> /// </summary>
[SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)] [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
public int ObjId { get; set; } public int ObjId { get; set; }
[SugarColumn(ColumnName = "STATIONNUMBER")]
public string StationNumber { get; set; }
/// <summary> /// <summary>
/// 所属系统;1系统 2系统 /// 所属系统;1系统 2系统
/// </summary> /// </summary>
[SugarColumn(ColumnName = "SYSTEM")] [SugarColumn(ColumnName = "SYSTEM")]
public string System { get; set; } public string System { get; set; }
/// <summary>
/// 系统状态
/// </summary>
[SugarColumn(ColumnName = "SYSTEMSTATUS")]
public int SystemStatus { get; set; }
/// <summary> /// <summary>
/// 枪编号；A1枪,B1枪,A2枪,B2枪 /// 枪编号；A1枪,B1枪,A2枪,B2枪
/// </summary> /// </summary>

6
Admin.Core.Model/Model_New/DoorFoamMachine.cs
Unescape Escape View File

@ -39,7 +39,7 @@ namespace Admin.Core.Model
public string MoldStatus { get; set; } public string MoldStatus { get; set; }
[SugarColumn(ColumnName = "MOLDTYPEA")] [SugarColumn(ColumnName = "MOLDTYPEA")]
public string MoldType_A { get; set; } public string MoldType { get; set; }
/// <summary> /// <summary>
/// 模位类型 /// 模位类型
@ -77,5 +77,9 @@ namespace Admin.Core.Model
/// </summary> /// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")] [SugarColumn(ColumnName = "CREATED_TIME")]
public DateTime? CreateTime { get; set; } public DateTime? CreateTime { get; set; }
[SugarColumn(ColumnName = "MAINID")]
public int MainId { get; set; }
} }
} }

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -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.RealTimeService build_property.RootNamespace = Admin.Core.RealTimeService
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -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\

31
Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
Unescape Escape View File

@ -83,12 +83,15 @@ namespace Aucma.Core.DoorFoam.Business
foreach (KeyValuePair<string, BoxLastShotRecord> kvPair in gunKeys) foreach (KeyValuePair<string, BoxLastShotRecord> kvPair in gunKeys)
{ {
//程序启动缓存没数据查数据库 //程序启动缓存没数据查数据库
if (!tempKeys.ContainsKey(kvPair.Key)) if (!tempKeys.ContainsKey(kvPair.Key))
{ {
BoxLastShotRecord record = _lastShotRecordServices.Query(x => x.System == kvPair.Value.System && x.ProductLineCode == kvPair.Value.ProductLineCode && x.GunCode == kvPair.Value.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault(); BoxLastShotRecord record = _lastShotRecordServices.Query(x => x.System == kvPair.Value.System && x.ProductLineCode == kvPair.Value.ProductLineCode && x.GunCode == kvPair.Value.GunCode && kvPair.Value.StationNumber == "1004").OrderByDescending(x => x.CreateTime).FirstOrDefault();
if (record == null) if (record == null)
{ {
kvPair.Value.ProductLineCode = "CX_02";
kvPair.Value.StationNumber = "1004";
// 数据库也没数据 // 数据库也没数据
int a = _lastShotRecordServices.AddAsync(kvPair.Value).Result; int a = _lastShotRecordServices.AddAsync(kvPair.Value).Result;
RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value); RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value);
@ -98,6 +101,8 @@ namespace Aucma.Core.DoorFoam.Business
} }
if (!kvPair.Value.MixpistOff.Equals(tempKeys[kvPair.Key].MixpistOff)) if (!kvPair.Value.MixpistOff.Equals(tempKeys[kvPair.Key].MixpistOff))
{ {
kvPair.Value.ProductLineCode = "CX_02";
kvPair.Value.StationNumber = "1004";
int b = _lastShotRecordServices.AddAsync(kvPair.Value).Result; int b = _lastShotRecordServices.AddAsync(kvPair.Value).Result;
RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value); RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value);
} }
@ -203,6 +208,30 @@ namespace Aucma.Core.DoorFoam.Business
BoxLastShotRecord lastShotRecord = new BoxLastShotRecord(); BoxLastShotRecord lastShotRecord = new BoxLastShotRecord();
lastShotRecord.System = gunCode.Substring(1, 1); lastShotRecord.System = gunCode.Substring(1, 1);
lastShotRecord.GunCode = gunCode; lastShotRecord.GunCode = gunCode;
if (lastShotRecord.System == "1")
{
if (obj.plc.ReadBool("DB50.388.0"))
{
lastShotRecord.SystemStatus = 1;
}
else
{
lastShotRecord.SystemStatus = 0;
}
}
else
{
if (obj.plc.ReadBool("DB50.642.0"))
{
lastShotRecord.SystemStatus = 1;
}
else
{
lastShotRecord.SystemStatus = 0;
}
}
lastShotRecord.ProductLineCode = "CX_02"; lastShotRecord.ProductLineCode = "CX_02";
lastShotRecord.PolTemp = byteToFloat(info.Skip(0).Take(4).ToArray()).ToString(); lastShotRecord.PolTemp = byteToFloat(info.Skip(0).Take(4).ToArray()).ToString();

1907
Aucma.Core.DoorFoam/Business/DoorCollection.cs
View File

File diff suppressed because it is too large Load Diff

51
Aucma.Core.DoorFoam/ConvertTo/CarStatusConverter.cs
Unescape Escape View File

@ -0,0 +1,51 @@
using Admin.Core.Common;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
namespace Aucma.Core.DoorFoam.ConvertTo
{
public class CarStatusConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value == null)
{
return false;
}
else
{
//模式：0，不工作；1，A门工作；2，B门工作；3,AB门工作
string result = "";
switch (value.ObjToInt())
{
case 0:
result = "未工作";
break;
case 1:
result = "A门工作";
break;
case 2:
result = "B门工作";
break;
case 3:
result = "AB门工作";
break;
default:
result = "未工作";
break;
}
return result;
}
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

31
Aucma.Core.DoorFoam/Views/IndexPageView.xaml
Unescape Escape View File

@ -11,6 +11,7 @@
d:DesignWidth="1000" > d:DesignWidth="1000" >
<UserControl.Resources> <UserControl.Resources>
<local1:DeviceCodeConverter x:Key="DeviceCodeConverter" /> <local1:DeviceCodeConverter x:Key="DeviceCodeConverter" />
<local1:CarStatusConverter x:Key="CarStatusConverter" />
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}"> <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center"/> <Setter Property="HorizontalAlignment" Value="Center"/>
@ -42,7 +43,7 @@
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="#4285DE" /> <Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/> <Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/> <Setter Property="FontSize" Value="25"/>
<Setter Property="Background" Value="#4285DE"/> <Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/> <Setter Property="Foreground" Value="White"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/> <Setter Property="FontFamily" Value="Microsoft YaHei"/>
@ -54,7 +55,7 @@
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderBrush" Value="#4285DE" /> <Setter Property="BorderBrush" Value="#4285DE" />
<Setter Property="Height" Value="40"/> <Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/> <Setter Property="FontSize" Value="20"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}"> <ControlTemplate TargetType="{x:Type DataGridCell}">
@ -88,21 +89,20 @@
</WrapPanel> </WrapPanel>
<StackPanel> <StackPanel>
<DataGrid Grid.Row="0" ItemsSource="{Binding DoorFoamMachineDataGrid_Left}" Background="#00000000" <DataGrid Grid.Row="0" ItemsSource="{Binding DoorFoamMachineDataGrid_Left}" Background="#00000000"
ColumnHeaderHeight="30" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="25"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White"> Foreground="White">
<!--修改选中字体颜色--> <!--修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding StationTrolleyNumber,Converter={StaticResource DeviceCodeConverter}}" Header="台车号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding StationTrolleyNumber,Converter={StaticResource DeviceCodeConverter}}" Header="台车号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding GunNumber,Converter={StaticResource DeviceCodeConverter}}" Header="枪号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding MoldStatus,Converter={StaticResource CarStatusConverter}}" Header="模具状态" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MoldStatus}" Header="模具状态" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding MoldType}" Header="台车类型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldType_A}" Header="A门类型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldType_A}" Header="B门类型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldProdutionA}" Header="A门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <DataGridTextColumn Binding="{Binding MoldProdutionA}" Header="A门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldProdutionB}" Header="B门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <DataGridTextColumn Binding="{Binding MoldProdutionB}" Header="B门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding Takt}" Header="节拍" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <!--<DataGridTextColumn Binding="{Binding ProductTakt}" Header="台车节拍" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding Takt}" Header="整圈节拍" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />-->
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</StackPanel> </StackPanel>
@ -115,21 +115,20 @@
</WrapPanel>--> </WrapPanel>-->
<StackPanel > <StackPanel >
<DataGrid Grid.Row="0" ItemsSource="{Binding DoorFoamMachineDataGrid_Right}" Background="#00000000" <DataGrid Grid.Row="0" ItemsSource="{Binding DoorFoamMachineDataGrid_Right}" Background="#00000000"
ColumnHeaderHeight="30" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="25"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White"> Foreground="White">
<!--修改选中字体颜色--> <!--修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding StationTrolleyNumber,Converter={StaticResource DeviceCodeConverter}}" Header="台车号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding StationTrolleyNumber,Converter={StaticResource DeviceCodeConverter}}" Header="台车号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding GunNumber,Converter={StaticResource DeviceCodeConverter}}" Header="枪号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding MoldStatus,Converter={StaticResource CarStatusConverter}}" Header="模具状态" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MoldStatus}" Header="模具状态" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding MoldType}" Header="台车类型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldType_A}" Header="A门类型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldType_A}" Header="B门类型" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldProdutionA}" Header="A门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <DataGridTextColumn Binding="{Binding MoldProdutionA}" Header="A门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MoldProdutionB}" Header="B门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <DataGridTextColumn Binding="{Binding MoldProdutionB}" Header="B门产量" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding Takt}" Header="节拍" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> <!--<DataGridTextColumn Binding="{Binding ProductTakt}" Header="台车节拍" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding Takt}" Header="整圈节拍" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />-->
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</StackPanel> </StackPanel>

2
Aucma.Core.DoorFoam/appsettings.json
Unescape Escape View File

@ -210,7 +210,7 @@
"EquipName": "DoorPlc", "EquipName": "DoorPlc",
"PlcType": "Siemens", "PlcType": "Siemens",
"Enabled": true, "Enabled": true,
"IP": "127.0.0.1", "IP": "10.10.92.150",
"Port": 102 "Port": 102
} }
], ],

BIN
HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll
View File

Binary file not shown.

BIN
HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save