diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 90160ab3..fb3bc1a7 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -491,16 +491,6 @@ 完成时间 - - - 条码下线信息记录 - - - - - 主键标识 - - SAP BOM 信息 @@ -1231,6 +1221,16 @@ 计划任务执行编号 + + + 条码下线信息记录 + + + + + 主键标识 + + 灌注告警 @@ -1816,6 +1816,41 @@ 是否标识 + + + 钣金每日生产记录表 + + + + + 主键-guid + + + + + 计划编码 + + + + + 产品编码 + + + + + 产品名称 + + + + + 生产类型;0--前板，1--后板 + + + + + 生产新时间 + + 用户信息 diff --git a/Admin.Core.IRepository/IRepository_New/ISMProductionCompletionRecordRepository.cs b/Admin.Core.IRepository/IRepository_New/ISMProductionCompletionRecordRepository.cs new file mode 100644 index 00000000..924d1083 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/ISMProductionCompletionRecordRepository.cs @@ -0,0 +1,11 @@ +using Admin.Core.Model; + +namespace Admin.Core.IRepository +{ + /// + /// ISMProductionCompletionRecordRepository + /// + public interface ISMProductionCompletionRecordRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/ISMProductionCompletionRecordServices.cs b/Admin.Core.IService/IService_New/ISMProductionCompletionRecordServices.cs new file mode 100644 index 00000000..801efcd6 --- /dev/null +++ b/Admin.Core.IService/IService_New/ISMProductionCompletionRecordServices.cs @@ -0,0 +1,15 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// ISMProductionCompletionRecordServices + /// + public interface ISMProductionCompletionRecordServices : IBaseServices + { + + } +} \ No newline at end of file diff --git a/Admin.Core.Model/Model_New/OffLineInfo.cs b/Admin.Core.Model/Model_New/OffLineInfo.cs index 64a9a4ca..99faa707 100644 --- a/Admin.Core.Model/Model_New/OffLineInfo.cs +++ b/Admin.Core.Model/Model_New/OffLineInfo.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Admin.Core.Model.Model_New +namespace Admin.Core.Model { /// /// 条码下线信息记录 diff --git a/Admin.Core.Model/Model_New/SMProductionCompletionRecord.cs b/Admin.Core.Model/Model_New/SMProductionCompletionRecord.cs new file mode 100644 index 00000000..69c4b549 --- /dev/null +++ b/Admin.Core.Model/Model_New/SMProductionCompletionRecord.cs @@ -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 +{ + /// + /// 钣金每日生产记录表 + /// + [SugarTable("SM_PRODUCTIONCOMPLETIONRECORD", "AUCMA_SCADA")] + public class SMProductionCompletionRecord + { + /// + /// 主键-guid + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true)] + public string ObjId { get; set; } + + /// + /// 计划编码 + /// + [SugarColumn(ColumnName = "SM_PLANID")] + public string SmPlanid { get; set; } + + /// + /// 产品编码 + /// + [SugarColumn(ColumnName = "SM_PRODUCTCODE")] + public string SmProductcode { get; set; } + + /// + /// 产品名称 + /// + [SugarColumn(ColumnName = "SM_PRODUCTNAME")] + public string SmProductname { get; set; } + + /// + /// 生产类型;0--前板，1--后板 + /// + [SugarColumn(ColumnName = "SM_PRODUCTIONTYPE")] + public int SmProductiontype { get; set; } + + /// + /// 生产新时间 + /// + [SugarColumn(ColumnName = "SM_PRODUCTIVETIME")] + public DateTime SmProductivetime { get; set; } + } +} diff --git a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs index aeea537c..791ea1ed 100644 --- a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs @@ -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 { /// /// BaseBomInfoRepository diff --git a/Admin.Core.Repository/Repository_New/BaseMaterialInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseMaterialInfoRepository.cs index 4efee93c..c094c8e0 100644 --- a/Admin.Core.Repository/Repository_New/BaseMaterialInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseMaterialInfoRepository.cs @@ -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 { /// /// OrderBomInfoRepository diff --git a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs index ba71b62f..9753798a 100644 --- a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs @@ -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 { /// /// BaseOrderInfoRepository diff --git a/Admin.Core.Repository/Repository_New/BaseQualityInspectionItemInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseQualityInspectionItemInfoRepository.cs index f88c8bcd..75b3e361 100644 --- a/Admin.Core.Repository/Repository_New/BaseQualityInspectionItemInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseQualityInspectionItemInfoRepository.cs @@ -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 { /// /// OrderBomInfoRepository diff --git a/Admin.Core.Repository/Repository_New/BaseSpaceDetailRepository.cs b/Admin.Core.Repository/Repository_New/BaseSpaceDetailRepository.cs index 8189f686..38cea75b 100644 --- a/Admin.Core.Repository/Repository_New/BaseSpaceDetailRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseSpaceDetailRepository.cs @@ -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 { /// /// BaseSpaceDetailRepository diff --git a/Admin.Core.Repository/Repository_New/BaseSpaceInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseSpaceInfoRepository.cs index 213106fd..253d7eed 100644 --- a/Admin.Core.Repository/Repository_New/BaseSpaceInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseSpaceInfoRepository.cs @@ -4,7 +4,7 @@ using Admin.Core.Repository; using System.Collections.Generic; using System.Threading.Tasks; -namespace Admin.Core.IRepository +namespace Admin.Core.Repository { /// /// BaseSpaceInfoRepository diff --git a/Admin.Core.Repository/Repository_New/BaseStoreInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseStoreInfoRepository.cs index 2ebb7bb0..c113571f 100644 --- a/Admin.Core.Repository/Repository_New/BaseStoreInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseStoreInfoRepository.cs @@ -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 { /// /// BaseStoreInfoRepository diff --git a/Admin.Core.Repository/Repository_New/CodeBindingRecordRepository.cs b/Admin.Core.Repository/Repository_New/CodeBindingRecordRepository.cs index 2f96359f..02863f9a 100644 --- a/Admin.Core.Repository/Repository_New/CodeBindingRecordRepository.cs +++ b/Admin.Core.Repository/Repository_New/CodeBindingRecordRepository.cs @@ -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 { diff --git a/Admin.Core.Repository/Repository_New/MaterialCompletionRepository.cs b/Admin.Core.Repository/Repository_New/MaterialCompletionRepository.cs index 9eafadf0..5b32c640 100644 --- a/Admin.Core.Repository/Repository_New/MaterialCompletionRepository.cs +++ b/Admin.Core.Repository/Repository_New/MaterialCompletionRepository.cs @@ -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 { /// /// MaterialCompletionRepository diff --git a/Admin.Core.Repository/Repository_New/OffLineInfoRepository.cs b/Admin.Core.Repository/Repository_New/OffLineInfoRepository.cs index 574d8780..2986a99d 100644 --- a/Admin.Core.Repository/Repository_New/OffLineInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/OffLineInfoRepository.cs @@ -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 { diff --git a/Admin.Core.Repository/Repository_New/PrintBarCodeRepository.cs b/Admin.Core.Repository/Repository_New/PrintBarCodeRepository.cs index 9bf267d5..ef9f2301 100644 --- a/Admin.Core.Repository/Repository_New/PrintBarCodeRepository.cs +++ b/Admin.Core.Repository/Repository_New/PrintBarCodeRepository.cs @@ -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 { /// /// IPrintBarCodeRepository diff --git a/Admin.Core.Repository/Repository_New/PrintOrderInfoRepository.cs b/Admin.Core.Repository/Repository_New/PrintOrderInfoRepository.cs index cf6d4b31..1d5998bb 100644 --- a/Admin.Core.Repository/Repository_New/PrintOrderInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/PrintOrderInfoRepository.cs @@ -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 { /// /// PrintOrderInfoRepository diff --git a/Admin.Core.Repository/Repository_New/ProductOrderInfoRepository.cs b/Admin.Core.Repository/Repository_New/ProductOrderInfoRepository.cs index 44a3c5e6..1fc129cd 100644 --- a/Admin.Core.Repository/Repository_New/ProductOrderInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/ProductOrderInfoRepository.cs @@ -1,7 +1,7 @@ using Admin.Core.Model; -using Admin.Core.Repository; +using Admin.Core.IRepository; -namespace Admin.Core.IRepository +namespace Admin.Core.Repository { /// /// ProductOrderInfoRepository diff --git a/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs b/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs index ed42b1f3..ef6b5617 100644 --- a/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/ProductPlanInfoRepository.cs @@ -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 { /// /// ProductPlanInfoRepository diff --git a/Admin.Core.Repository/Repository_New/RealTaskInfoRepository.cs b/Admin.Core.Repository/Repository_New/RealTaskInfoRepository.cs index d61a0c7a..c23d5cf8 100644 --- a/Admin.Core.Repository/Repository_New/RealTaskInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/RealTaskInfoRepository.cs @@ -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 { /// /// RealTaskInfoRepository diff --git a/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs b/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs index 72c8e6b2..5f8c2670 100644 --- a/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs +++ b/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs @@ -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 { /// /// RecordInstoreRepository diff --git a/Admin.Core.Repository/Repository_New/RecordOutStoreRepository.cs b/Admin.Core.Repository/Repository_New/RecordOutStoreRepository.cs index e3915c84..b139bfd0 100644 --- a/Admin.Core.Repository/Repository_New/RecordOutStoreRepository.cs +++ b/Admin.Core.Repository/Repository_New/RecordOutStoreRepository.cs @@ -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 { /// /// RecordOutStoreRepository diff --git a/Admin.Core.Repository/Repository_New/SMProductionCompletionRecordRepository.cs b/Admin.Core.Repository/Repository_New/SMProductionCompletionRecordRepository.cs new file mode 100644 index 00000000..91863713 --- /dev/null +++ b/Admin.Core.Repository/Repository_New/SMProductionCompletionRecordRepository.cs @@ -0,0 +1,15 @@ +using Admin.Core.Model; +using Admin.Core.IRepository; + +namespace Admin.Core.Repository +{ + /// + /// SMProductionCompletionRecordRepository + /// + public class SMProductionCompletionRecordRepository : BaseRepository, ISMProductionCompletionRecordRepository + { + public SMProductionCompletionRecordRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/Admin.Core.Repository/Repository_New/SmRecordRepository.cs b/Admin.Core.Repository/Repository_New/SmRecordRepository.cs index 70e36ae9..f02abab3 100644 --- a/Admin.Core.Repository/Repository_New/SmRecordRepository.cs +++ b/Admin.Core.Repository/Repository_New/SmRecordRepository.cs @@ -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 { /// /// SmRecordRepository diff --git a/Admin.Core.Repository/Repository_New/SmTaskExecutionRepository.cs b/Admin.Core.Repository/Repository_New/SmTaskExecutionRepository.cs index ced70123..012370b3 100644 --- a/Admin.Core.Repository/Repository_New/SmTaskExecutionRepository.cs +++ b/Admin.Core.Repository/Repository_New/SmTaskExecutionRepository.cs @@ -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 { /// - /// ISmTaskExecutionRepository + /// SmTaskExecutionRepository /// public class SmTaskExecutionRepository : BaseRepository, ISmTaskExecutionRepository { diff --git a/Admin.Core.Service/Service_New/SMProductionCompletionRecordServices.cs b/Admin.Core.Service/Service_New/SMProductionCompletionRecordServices.cs new file mode 100644 index 00000000..67aa6d25 --- /dev/null +++ b/Admin.Core.Service/Service_New/SMProductionCompletionRecordServices.cs @@ -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, ISMProductionCompletionRecordServices + { + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseBomInfoServices)); + private readonly IBaseRepository _dal; + public SMProductionCompletionRecordServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + + } +} \ No newline at end of file diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs index ee803a85..a18b3b30 100644 --- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs @@ -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(); 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(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; diff --git a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml index 41e79bbb..99850776 100644 --- a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml +++ b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml @@ -67,7 +67,7 @@ - + @@ -300,7 +300,7 @@ - + diff --git a/Aucma.Core.SheetMetal/Views/SplitPlanView.xaml b/Aucma.Core.SheetMetal/Views/SplitPlanView.xaml index 361055c9..8a7dddfc 100644 --- a/Aucma.Core.SheetMetal/Views/SplitPlanView.xaml +++ b/Aucma.Core.SheetMetal/Views/SplitPlanView.xaml @@ -152,7 +152,7 @@ - + @@ -176,30 +176,39 @@ - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +