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

添加钣金每日生产记录

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 442f47db9f
commit acd5d38216
29 changed files with 233 additions and 100 deletions
Show Stats Download Patch File Download Diff File

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

@ -491,16 +491,6 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OffLineInfo">
<summary>
条码下线信息记录
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OffLineInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
@ -1231,6 +1221,16 @@
计划任务执行编号
</summary>
</member>
<member name="T:Admin.Core.Model.OffLineInfo">
<summary>
条码下线信息记录
</summary>
</member>
<member name="P:Admin.Core.Model.OffLineInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="T:Admin.Core.Model.Perfusion_Alarm">
<summary>
灌注告警
@ -1816,6 +1816,41 @@
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.SMProductionCompletionRecord">
<summary>
钣金每日生产记录表
</summary>
</member>
<member name="P:Admin.Core.Model.SMProductionCompletionRecord.ObjId">
<summary>
主键-guid
</summary>
</member>
<member name="P:Admin.Core.Model.SMProductionCompletionRecord.SmPlanid">
<summary>
计划编码
</summary>
</member>
<member name="P:Admin.Core.Model.SMProductionCompletionRecord.SmProductcode">
<summary>
产品编码
</summary>
</member>
<member name="P:Admin.Core.Model.SMProductionCompletionRecord.SmProductname">
<summary>
产品名称
</summary>
</member>
<member name="P:Admin.Core.Model.SMProductionCompletionRecord.SmProductiontype">
<summary>
生产类型;0--前板，1--后板
</summary>
</member>
<member name="P:Admin.Core.Model.SMProductionCompletionRecord.SmProductivetime">
<summary>
生产新时间
</summary>
</member>
<member name="T:Admin.Core.Model.SysUserInfo">
<summary>
用户信息

11
Admin.Core.IRepository/IRepository_New/ISMProductionCompletionRecordRepository.cs
Unescape Escape View File

@ -0,0 +1,11 @@
using Admin.Core.Model;
namespace Admin.Core.IRepository
{
/// <summary>
/// ISMProductionCompletionRecordRepository
/// </summary>
public interface ISMProductionCompletionRecordRepository : IBaseRepository<SMProductionCompletionRecord>
{
}
}

15
Admin.Core.IService/IService_New/ISMProductionCompletionRecordServices.cs
Unescape Escape View File

@ -0,0 +1,15 @@
using Admin.Core.IService;
using Admin.Core.Model;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Admin.Core.IService
{
/// <summary>
/// ISMProductionCompletionRecordServices
/// </summary>
public interface ISMProductionCompletionRecordServices : IBaseServices<SMProductionCompletionRecord>
{
}
}

2
Admin.Core.Model/Model_New/OffLineInfo.cs
Unescape Escape View File

@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model.Model_New
namespace Admin.Core.Model
{
/// <summary>
/// 条码下线信息记录

52
Admin.Core.Model/Model_New/SMProductionCompletionRecord.cs
Unescape Escape View File

@ -0,0 +1,52 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model
{
/// <summary>
/// 钣金每日生产记录表
/// </summary>
[SugarTable("SM_PRODUCTIONCOMPLETIONRECORD", "AUCMA_SCADA")]
public class SMProductionCompletionRecord
{
/// <summary>
/// 主键-guid
/// </summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true)]
public string ObjId { get; set; }
/// <summary>
/// 计划编码
/// </summary>
[SugarColumn(ColumnName = "SM_PLANID")]
public string SmPlanid { get; set; }
/// <summary>
/// 产品编码
/// </summary>
[SugarColumn(ColumnName = "SM_PRODUCTCODE")]
public string SmProductcode { get; set; }
/// <summary>
/// 产品名称
/// </summary>
[SugarColumn(ColumnName = "SM_PRODUCTNAME")]
public string SmProductname { get; set; }
/// <summary>
/// 生产类型;0--前板，1--后板
/// </summary>
[SugarColumn(ColumnName = "SM_PRODUCTIONTYPE")]
public int SmProductiontype { get; set; }
/// <summary>
/// 生产新时间
/// </summary>
[SugarColumn(ColumnName = "SM_PRODUCTIVETIME")]
public DateTime SmProductivetime { get; set; }
}
}

7
Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs
Unescape Escape View File

@ -1,8 +1,7 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
using Admin.Core.Model;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// BaseBomInfoRepository

7
Admin.Core.Repository/Repository_New/BaseMaterialInfoRepository.cs
Unescape Escape View File

@ -1,8 +1,7 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
using Admin.Core.Model;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// OrderBomInfoRepository

4
Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// BaseOrderInfoRepository

4
Admin.Core.Repository/Repository_New/BaseQualityInspectionItemInfoRepository.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// OrderBomInfoRepository

4
Admin.Core.Repository/Repository_New/BaseSpaceDetailRepository.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// BaseSpaceDetailRepository

2
Admin.Core.Repository/Repository_New/BaseSpaceInfoRepository.cs
Unescape Escape View File

@ -4,7 +4,7 @@ using Admin.Core.Repository;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// BaseSpaceInfoRepository

4
Admin.Core.Repository/Repository_New/BaseStoreInfoRepository.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// BaseStoreInfoRepository

2
Admin.Core.Repository/Repository_New/CodeBindingRecordRepository.cs
Unescape Escape View File

@ -1,6 +1,5 @@
using Admin.Core.IRepository;
using Admin.Core.Model;
using Admin.Core.Model.ViewModels;
using SqlSugar;
using System;
using System.Collections.Generic;
@ -8,7 +7,6 @@ using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static ICSharpCode.SharpZipLib.Zip.ZipEntryFactory;
namespace Admin.Core.Repository
{

4
Admin.Core.Repository/Repository_New/MaterialCompletionRepository.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// MaterialCompletionRepository

10
Admin.Core.Repository/Repository_New/OffLineInfoRepository.cs
Unescape Escape View File

@ -1,15 +1,5 @@
using Admin.Core.IRepository;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static ICSharpCode.SharpZipLib.Zip.ZipEntryFactory;
namespace Admin.Core.Repository
{

4
Admin.Core.Repository/Repository_New/PrintBarCodeRepository.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// IPrintBarCodeRepository

4
Admin.Core.Repository/Repository_New/PrintOrderInfoRepository.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// PrintOrderInfoRepository

4
Admin.Core.Repository/Repository_New/ProductOrderInfoRepository.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using Admin.Core.Model;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// ProductOrderInfoRepository

4
Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs
Unescape Escape View File

@ -1,12 +1,12 @@
using Admin.Core.Model;
using Admin.Core.Repository;
using Admin.Core.IRepository;
using Microsoft.IdentityModel.Logging;
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// ProductPlanInfoRepository

4
Admin.Core.Repository/Repository_New/RealTaskInfoRepository.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using Admin.Core.Model;
using Admin.Core.Repository;
using Admin.Core.IRepository;
using System.Threading.Tasks;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// RealTaskInfoRepository

4
Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs
Unescape Escape View File

@ -1,10 +1,10 @@
using Admin.Core.Model;
using Admin.Core.Repository;
using Admin.Core.IRepository;
using log4net;
using System;
using System.Threading.Tasks;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// RecordInstoreRepository

4
Admin.Core.Repository/Repository_New/RecordOutStoreRepository.cs
Unescape Escape View File

@ -1,10 +1,10 @@
using Admin.Core.Model;
using Admin.Core.Repository;
using Admin.Core.IRepository;
using log4net;
using System;
using System.Threading.Tasks;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// RecordOutStoreRepository

15
Admin.Core.Repository/Repository_New/SMProductionCompletionRecordRepository.cs
Unescape Escape View File

@ -0,0 +1,15 @@
using Admin.Core.Model;
using Admin.Core.IRepository;
namespace Admin.Core.Repository
{
/// <summary>
/// SMProductionCompletionRecordRepository
/// </summary>
public class SMProductionCompletionRecordRepository : BaseRepository<SMProductionCompletionRecord>, ISMProductionCompletionRecordRepository
{
public SMProductionCompletionRecordRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

4
Admin.Core.Repository/Repository_New/SmRecordRepository.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// SmRecordRepository

6
Admin.Core.Repository/Repository_New/SmTaskExecutionRepository.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
using Admin.Core.IRepository;
namespace Admin.Core.IRepository
namespace Admin.Core.Repository
{
/// <summary>
/// ISmTaskExecutionRepository
/// SmTaskExecutionRepository
/// </summary>
public class SmTaskExecutionRepository : BaseRepository<SmTaskExecution>, ISmTaskExecutionRepository
{

19
Admin.Core.Service/Service_New/SMProductionCompletionRecordServices.cs
Unescape Escape View File

@ -0,0 +1,19 @@
using Admin.Core.IRepository;
using Admin.Core.IService;
using Admin.Core.Model;
using log4net;
namespace Admin.Core.Service
{
public class SMProductionCompletionRecordServices : BaseServices<SMProductionCompletionRecord>, ISMProductionCompletionRecordServices
{
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseBomInfoServices));
private readonly IBaseRepository<SMProductionCompletionRecord> _dal;
public SMProductionCompletionRecordServices(IBaseRepository<SMProductionCompletionRecord> dal)
{
this._dal = dal;
base.BaseDal = dal;
}
}
}

19
Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -11,7 +11,6 @@ using System.Threading.Tasks;
using Admin.Core.IService;
using Microsoft.Extensions.DependencyInjection;
using Aucma.Core.SheetMetal.Common;
using Admin.Core.Model.Model_New;
using Admin.Core.Tasks;
using CommunityToolkit.Mvvm.Messaging;
using LiveCharts;
@ -20,9 +19,6 @@ using Admin.Core.Model;
using System.Windows.Media;
using log4net;
using Admin.Core.Common;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using System.Drawing.Drawing2D;
using System.ComponentModel;
/*
* 首页信息
*
@ -49,17 +45,11 @@ namespace Aucma.Core.SheetMetal.ViewModels
{
_taskExecutionPlanInfoServices = App.ServiceProvider.GetService<IExecutePlanInfoServices>();
StationName = Appsettings.app("StoreInfo", "StationName");
Job_SheetMetalTask_Quartz.SmEverDayDelegateEvent += InitEveryDayMethod;
Job_SheetMetalTask_Quartz.SmShowDelegateEvent += UpdatePlanSHow;//计划内容展示
//Job_SheetMetalTask_Quartz.SmEverDayDelegateEvent += InitEveryDayMethod;
//Job_SheetMetalTask_Quartz.SmShowDelegateEvent += UpdatePlanSHow;//计划内容展示
WeakReferenceMessenger.Default.Register<string>(this, Recive);
Task.Run(async () =>
{
await LoadData();
await InitExecMethod();
});
Task.WaitAll(LoadData(), InitExecMethod());
InitEveryDayMethod();
foreach (var item in list)
@ -144,7 +134,8 @@ namespace Aucma.Core.SheetMetal.ViewModels
#region 加载DataGrid数据
private async Task LoadData()
{
var list = await _taskExecutionPlanInfoServices.QueryAsync(d => d.ProductLineCode.Contains("1001"));
string productLineCode = Appsettings.app("StoreInfo", "ProductLineCode");
var list = await _taskExecutionPlanInfoServices.QueryAsync(d => d.ProductLineCode.Contains(productLineCode));
var execList = list.OrderBy(d => d.ExecuteOrder);
int i = 1;
string planType = string.Empty;

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

@ -67,7 +67,7 @@
<Setter Property="Foreground" Value="White"/>
</Trigger>
<DataTrigger Binding="{Binding ExecuteStatus}" Value="2">
<Setter Property="Background" Value="#4285DE" />
<Setter Property="Background" Value="Green" />
</DataTrigger>
</Style.Triggers>
</Style>
@ -300,7 +300,7 @@
<DataGrid.Columns >
<DataGridTextColumn Binding="{Binding ID}" Header="主键" Width="auto" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Hidden" />
<DataGridTextColumn Binding="{Binding No}" x:Name="No" Header="编号" Width="0.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding TaskCode}" Header="计划编号" Width="1.2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding TaskCode}" Header="计划编号" Width="1.3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料型号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding TaskAmount}" Header="计划" Width="0.6*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="完成" Width="0.6*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>

55
Aucma.Core.SheetMetal/Views/SplitPlanView.xaml
Unescape Escape View File

@ -152,7 +152,7 @@
<Border Grid.Row="1" Grid.Column="1" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="0.6*"/>
<RowDefinition Height="9*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Margin="1,1,5,5" >
@ -176,30 +176,39 @@
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.25*"/>
<RowDefinition Height="0.25*"/>
<RowDefinition Height="0.8*"/>
<RowDefinition Height="0.4*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0 0 0 1">
<WrapPanel VerticalAlignment="Center" Margin="10 0">
<TextBlock Text="快捷查询" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="18"/>
<ItemsControl ItemsSource="{Binding Configurations}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<RadioButton
Content="{Binding}"
Command="{Binding DataContext.RadioButtonCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}"
GroupName="MaterialTypeRadioButton"
Margin="20,10" FontSize="15" Foreground="#FFFFFF"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</WrapPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.15*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" VerticalAlignment="Center" Margin="10 0 0 0">
<TextBlock Text="快捷查询" VerticalAlignment="Center" Foreground="#FFFFFF" FontSize="18" />
</StackPanel>
<WrapPanel Grid.Column="1" VerticalAlignment="Center" Margin="0 5">
<ItemsControl ItemsSource="{Binding Configurations}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<RadioButton
Content="{Binding}"
Command="{Binding DataContext.RadioButtonCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}"
GroupName="MaterialTypeRadioButton"
Margin="25,0" FontSize="12" Foreground="#FFFFFF"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</WrapPanel>
</Grid>
</Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0">
<WrapPanel Grid.Row="1" VerticalAlignment="Center" Margin="10 0">

Write Preview
Loading…
Cancel
Save