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

new

Browse Source
dev
liulb@mesnac.com 1 year ago
parent e6fb9177a9
commit 230a59598a
12 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File

22
Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -19,7 +19,7 @@ namespace Aucma.Core.Palletiz.ViewModels
public IndexPageViewModel()
{
StationName = "成品分垛入库";
MaterialName = "SC-AUCMA-农夫山泉，SC 门体";
MaterialName = "SC-AUCMA-农夫山泉，SC";
OrderNo = "8512365486";
BeginTime = DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss");
@ -85,14 +85,14 @@ namespace Aucma.Core.Palletiz.ViewModels
{
ChartValues<double> achievement = new ChartValues<double>();
Random random = new Random();
for (int i = 0; i < 5; i++)
for (int i = 0; i < 2; i++)
{
achievement.Add(random.Next(60, 100));
achievement.Add(random.Next(1, 50));
}
var column = new ColumnSeries();
column.DataLabels = true;
column.Title = "型号";
column.Title = "小时产量";
column.Values = achievement;
column.Foreground = Brushes.White;
@ -100,22 +100,22 @@ namespace Aucma.Core.Palletiz.ViewModels
ProductionHourList = new List<string>()
{
"12",
"13",
"14",
"15",
"16",
"7:30",
"8:30",
"9:30",
"10:30",
"11:30",
};
ChartValues<double> achievement2 = new ChartValues<double>();
Random random2 = new Random();
for (int i = 0; i < 5; i++)
{
achievement2.Add(random2.Next(60, 100));
achievement2.Add(random2.Next(0, 30));
}
var column2 = new ColumnSeries();
column2.DataLabels = true;
column2.Title = "产量";
column2.Title = "型号统计";
column2.Values = achievement2;
column2.Foreground = Brushes.White;

12
Aucma.Core.Palletiz/ViewModels/PalletizPageViewModel.cs
Unescape Escape View File

@ -1,4 +1,6 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Aucma.Core.Palletiz.Views;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
using System.Linq;
@ -9,7 +11,13 @@ namespace Aucma.Core.Palletiz.ViewModels
{
public partial class PalletizPageViewModel : ObservableObject
{
public PalletizPageViewModel() { }
public PalletizPageViewModel() { }
[RelayCommand]
public void AddPlan(string objId)
{
SplitPlanView plan = new SplitPlanView(objId);
plan.Show();
}
}
}

2
Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs
Unescape Escape View File

@ -62,7 +62,7 @@ namespace Aucma.Core.Palletiz.ViewModels
PlanAmount = item.PlanAmount,
ResidueAmount = item.PlanAmount - item.CompleteAmount,
SpliteResidueAmount = item.PlanAmount - residue,
StartDate = item.BeginTime
//StartDate = item.BeginTime
});
i++;
}

4
Aucma.Core.Palletiz/Views/IndexPageView.xaml
Unescape Escape View File

@ -187,7 +187,7 @@
<RowDefinition Height="9*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0 0 0 1" CornerRadius="0" Margin="1,1,5,5" Background="#1157b9" >
<TextBlock Text="当日小时产量统计" FontSize="15" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="当日小时产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" >
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
@ -218,7 +218,7 @@
<RowDefinition Height="9*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0 0 0 1" CornerRadius="0" Background="#1157b9" Margin="1,1,5,5" >
<TextBlock Text="当日型号产量统计" FontSize="15" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="当日型号产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" >
<lvc:CartesianChart Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Margin="5">

12
Aucma.Core.Palletiz/Views/PalletizPageView.xaml
Unescape Escape View File

@ -46,7 +46,7 @@
</Grid.ColumnDefinitions>
<Border Grid.Row="0" Grid.Column="0"></Border>
<Border Grid.Row="1" Grid.Column="0" >
<TextBlock Text="1" Foreground="White" FontSize="20"/>
<TextBlock Text="1" x:Name="Set1" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="0">
<TextBlock Text="2" Foreground="White" FontSize="20"/>
@ -116,25 +116,25 @@
</Border>
<Border Grid.Row="1" Grid.Column="5" >
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
<Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" CommandParameter="{Binding Text, ElementName=Set1}"/>
<Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding ClearPlanCommand}"/>
</WrapPanel>
</Border>
<Border Grid.Row="2" Grid.Column="1" >
<TextBlock Text="9002006890" Foreground="White" FontSize="20"/>
<TextBlock Text="" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="2" >
<TextBlock Text="SC-439,YZXGWBC元气森林" Foreground="White" FontSize="20"/>
<TextBlock Text="" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="3" >
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="90" Foreground="White" FontSize="20"/>
<TextBlock Text="0" Foreground="White" FontSize="20"/>
<TextBlock Text="°" Foreground="White" FontSize="20"/>
</WrapPanel>
</Border>
<Border Grid.Row="2" Grid.Column="4" >
<TextBlock Text="是" Foreground="White" FontSize="20"/>
<TextBlock Text="否" Foreground="White" FontSize="20"/>
</Border>
<Border Grid.Row="2" Grid.Column="5" >
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">

27
Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml
Unescape Escape View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views"
mc:Ignorable="d" Background="#1152AC"
Title="下达数量" Height="500" Width="700" Name="window"
Title="库存设置" Height="500" Width="700" Name="window"
ResizeMode="NoResize" Topmost="True">
<Border Margin="5" BorderBrush="#0288d1" CornerRadius="10">
@ -30,11 +30,11 @@
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="计划编号" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="SN 码 " FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox x:Name="planCode" FontSize="18" Text="{Binding PlanInfo.PlanCode}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" />
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="工单编号" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="产品编号" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox x:Name="orderCode" FontSize="18" Text="{Binding PlanInfo.OrderCode}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
@ -42,14 +42,19 @@
<TextBox x:Name="materialCode" FontSize="18" Text="{Binding PlanInfo.MaterialName}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="计划数量" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox FontSize="18" Text="{Binding PlanInfo.PlanAmount}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
<TextBlock Text="多货道" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<ComboBox Width="150" Height="30" Margin="10 0 0 0"
Style="{x:Null}" Background="#1152AC" VerticalAlignment="Center" FontSize="15"
SelectedItem="{Binding SelectLocation,Mode=TwoWay}"
SelectedValuePath="SelectedModel"
DisplayMemberPath="TypeName"
SelectedValue="{Binding SelectLocation,Mode=TwoWay}">
<ComboBoxItem Content="是" IsSelected="True"/>
<ComboBoxItem Content="否" />
</ComboBox>
</StackPanel>
<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="完成数量" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox FontSize="18" Text="{Binding PlanInfo.CompleteAmount}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
</Grid>
</Border>
@ -61,7 +66,7 @@
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="下达数量" FontSize="18" Foreground="#FFFFFF" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="转向角度" FontSize="18" Foreground="#FFFFFF" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox x:Name="TransmitAmount" VerticalContentAlignment="Center" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" BorderBrush="White" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
@ -95,7 +100,7 @@
</Border>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="下 达" Command="{Binding AddPlanInfoCommand}" Height="50" Width="140" />
<Button Content="确 定" Command="{Binding AddPlanInfoCommand}" Height="50" Width="140" />
<Button Content="取 消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF9900" Margin="25,0,0,0" Height="50" BorderBrush="#FF9900" Width="140" />
</StackPanel>
</Grid>

2
Aucma.Core.Palletiz/Views/SplitPlanView.xaml
Unescape Escape View File

@ -129,7 +129,7 @@
<RowDefinition Height="9*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Margin="1,1,5,5" >
<TextBlock Text="添加计划" FontSize="25" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="库存设置" FontSize="25" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Margin="1,0,5,5">
<Grid>

58
Aucma.Core.Palletiz/appsettings.json
Unescape Escape View File

@ -62,8 +62,8 @@
// *** 单库操作，把 MutiDBEnabled 设为false ***；
// *** 多库操作，把 MutiDBEnabled 设为true，其他的从库Enabled也为true **；
// 具体配置看视频：https://www.bilibili.com/video/BV1BJ411B7mn?p=6
"MainDB": "Admin.Core", //当前项目的主库，所对应的连接字符串的Enabled必须为true
"MutiDBEnabled": false, //是否开启多库模式
"MainDB": "AUCMA_SCADA", //当前项目的主库，所对应的连接字符串的Enabled必须为true
"MutiDBEnabled": true, //是否开启多库模式
"CQRSEnabled": false, //是否开启读写分离模式，必须是单库模式，且数据库类型一致，比如都是SqlServer
"DBS": [
/*
@ -77,13 +77,21 @@
Kdbndp = 6,//人大金仓
*/
{
"ConnId": "Admin.Core",
"ConnId": "AUCMA_SCADA",
"DBType": 3,
"Enabled": true,
"HitRate": 50,
//"Connection": "Data Source=localhost;Initial Catalog=Hsdb;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
"Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_scada;Password=aucma;",
"ProviderName": "System.Data.SqlClient"
},
{
"ConnId": "AUCMA_MES",
"DBType": 3,
"Enabled": true,
"HitRate": 40,
"Connection": "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=175.27.215.92)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=helowin)));User ID=aucma_mes;Password=aucma;",
"ProviderName": "System.Data.SqlClient"
}
],
"QuartzNetJob": [
@ -97,33 +105,11 @@
"Remark": "执行任务调度系统",
"RunTimes": 3881,
"BeginTime": "2023-04-23 11:08:50.000",
"EndTime": "2324-08-06 16:45:30.000",
"EndTime": "2224-08-06 16:45:30.000",
"TriggerType": 1,
"IntervalSecond": 1,
"CycleRunTimes": 1,
"IsStart": true,
"JobParams": null,
"DelFlag": false,
"CreateBy": "admin",
"CreateTime": "2023-04-23 11:09:22.0000000",
"UpdateBy": "admin",
"UpdateTime": "2023-08-07 16:45:45.0530000"
},
{
"ID": 2,
"Name": "TestTask",
"JobGroup": "DEFAULT",
"Cron": "*/1 * * * * ?",
"AssemblyName": "Admin.Core.Tasks",
"ClassName": "Job_TestTask_Quartz",
"Remark": "执行任务调度系统",
"RunTimes": 3881,
"BeginTime": "2023-04-23 11:08:50.000",
"EndTime": "2324-08-06 16:45:30.000",
"TriggerType": 1,
"IntervalSecond": 1,
"CycleRunTimes": 1,
"IsStart": true,
"IsStart": false,
"JobParams": null,
"DelFlag": false,
"CreateBy": "admin",
@ -132,6 +118,9 @@
"UpdateTime": "2023-08-07 16:45:45.0530000"
}
],
"StoreInfo": {
"StationCode": "1001"
},
"Startup": {
"Cors": {
"PolicyName": "CorsIpAccess", //策略名称
@ -178,10 +167,23 @@
"QuartzNetJob": {
"Enabled": true
},
"Scanner": {//扫码器
"Scanner": { //扫码器
"Enabled": true
},
"Melsec": {
"ConString": "10.10.92.30",
"Port": 6000,
"Enabled": true
}
},
"PLCServer": [
{
"Id": 1,
"EquipName": "分垛库Plc",
"IP": "127.0.0.1",
"Port": 6000
}
],
"IpRateLimiting": {
"EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each
"StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter

2
Aucma.Core.PrintTo/App.xaml
Unescape Escape View File

@ -26,7 +26,7 @@
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#DDFFFFFF" />
<!--字体大小设置-->
<Style TargetType="TextBlock">
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="FontWeight" Value="Bold"/>
</Style>

2
Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -32,7 +32,7 @@ namespace Aucma.Core.PrintTo.ViewModels
PrintIsEnabled = "True";
WeakReferenceMessenger.Default.Register<string>(this, Recive);
Task.WaitAll(LoadData());
//Task.WaitAll(LoadData());
}
#region 加载DataGrid数据

4
Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs
Unescape Escape View File

@ -300,10 +300,10 @@ namespace Aucma.Core.PrintTo.ViewModels
barReport.PrintSettings.Printer = printer; // 设置打印机名称
barReport.PrintSettings.Copies = 1; // 设置打印份数
//barReport.PrintSettings.PageRange = "1-3"; // 设置打印页范围
barReport.SetParameterValue("BoxBarData.Id", barCode);
barReport.SetParameterValue("BoxBarData.Order_No", ProductCode);//订单号
barReport.SetParameterValue("BoxBarData.Order_Material_Name", item.MaterialName);//物料简码
barReport.SetParameterValue("BoxBarData.Order_Material_Name", PrintName);//物料简码
barReport.SetParameterValue("BoxBarData.Bar_Code", barCode);//二维码
//barReport.Prepare();

2
Aucma.Core.PrintTo/Views/IndexPageView.xaml
Unescape Escape View File

@ -185,7 +185,7 @@
<DataGridTextColumn Width="*" Binding="{Binding PlanAmount}" Header="订单数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding ErrorNum}" Header="异常量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PrintLinerAmount}" Header="内胆码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PrintBoxAmount}" Header="U壳码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PrintBoxAmount}" Header="箱壳码&#x0a;已打数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding CompleteAmount}" Header="剩余" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" />
</DataGrid.Columns>
</DataGrid>

Write Preview
Loading…
Cancel
Save