diff --git a/DOAN.Model/MES/bigscreen/Dto/ProductBigScreenDto.cs b/DOAN.Model/MES/bigscreen/Dto/ProductBigScreenDto.cs index 27549fe..96dfc21 100644 --- a/DOAN.Model/MES/bigscreen/Dto/ProductBigScreenDto.cs +++ b/DOAN.Model/MES/bigscreen/Dto/ProductBigScreenDto.cs @@ -1,37 +1,81 @@ -namespace DOAN.Model.MES.bigscreen.Dto; - -public class ProductBigScreenMoudle01Dto +namespace DOAN.Model.MES.bigscreen.Dto { - /// - /// 当日产量 - /// - public int TodayOutputQuantity { get; set; } + + + public class ProductBigScreenMoudle01Dto + { + /// + /// 当日产量 + /// + public int TodayOutputQuantity { get; set; } - /// - /// 当日工单 - /// - public int TodayWorkOrderQuantity { get; set; } + /// + /// 当日工单 + /// + public int TodayWorkOrderQuantity { get; set; } - /// - /// 当周产量 - /// - public int WeekOutputQuantity { get; set; } + /// + /// 当周产量 + /// + public int WeekOutputQuantity { get; set; } - /// - /// 当周工单 - /// - public int WeekWorkOrderQuantity { get; set; } + /// + /// 当周工单 + /// + public int WeekWorkOrderQuantity { get; set; } - /// - /// 今天异常工单数 - /// - public int TodayExceptionWorkOrderQuantity { get; set; } + /// + /// 今天异常工单数 + /// + public int TodayExceptionWorkOrderQuantity { get; set; } - /// - /// 本周异常工单数 - /// - public int WeekExceptionWorkOrderQuantity { get; set; } -} \ No newline at end of file + /// + /// 本周异常工单数 + /// + public int WeekExceptionWorkOrderQuantity { get; set; } + } + + + + public class ProductBigScreenMoudle02Dto + { + /// + /// 今日班组数 + /// + public int TodayGroupQuantity { get; set; } + + + /// + /// 今日产线数 + /// + public int TodayLineQuantity { get; set; } + + + /// + /// 今天计划数 + /// + public int TodayPlanQuantity { get; set; } + + + /// + /// 今日实际产量数 + /// + public int TodayActionProductionQuantity { get; set; } + + + /// + /// 今日产成品种类数 + /// + public int TodayProductTypeQuantity { get; set; } + + + /// + /// 七日计划变更数 + /// + public int SevenDaysPriorPlanQuantity { get; set; } + } + +} diff --git a/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs b/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs index 0f295fa..16b6629 100644 --- a/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs +++ b/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs @@ -1,3 +1,4 @@ +using DOAN.Model.MES.bigscreen.Dto; using DOAN.Model.mes.echarts; using DOAN.Model.MES.product; @@ -5,7 +6,7 @@ namespace DOAN.Service.MES.bigScreen.IService; public interface IProduct2BigScreenService : IBaseService { - EchartsOptions GetMoudle01(); + ProductBigScreenMoudle02Dto GetMoudle01(); EchartsOptions GetMoudle02(); EchartsOptions GetMoudle03(); EchartsOptions GetMoudle04(); diff --git a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs index c2ba78a..8c65be3 100644 --- a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs +++ b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs @@ -1,3 +1,4 @@ +using DOAN.Model.MES.bigscreen.Dto; using DOAN.Model.mes.echarts; using DOAN.Model.MES.product; using DOAN.Service.MES.bigScreen.IService; @@ -12,11 +13,19 @@ namespace DOAN.Service.MES.bigScreen [AppService(ServiceType = typeof(IProduct2BigScreenService), ServiceLifetime = LifeTime.Transient)] public class Product2BigScreenService : BaseService, IProduct2BigScreenService { - public EchartsOptions GetMoudle01() - { + public ProductBigScreenMoudle02Dto GetMoudle01() + { + ProductBigScreenMoudle02Dto productBigScreen = new ProductBigScreenMoudle02Dto(); - return null; - } + //今日班组 + productBigScreen.TodayGroupQuantity= Context.Queryable().Where(it => it.WorkorderDate == DateTime.Today) + .GroupBy(it => it.GroupCode).Count(); + + + + return productBigScreen; + + } public EchartsOptions GetMoudle02() { diff --git a/DOAN.Service/MES/mm/MmLinesidebarInventoryCheckServcie.cs b/DOAN.Service/MES/mm/MmLinesidebarInventoryCheckServcie.cs index dab7f2b..332bd48 100644 --- a/DOAN.Service/MES/mm/MmLinesidebarInventoryCheckServcie.cs +++ b/DOAN.Service/MES/mm/MmLinesidebarInventoryCheckServcie.cs @@ -74,18 +74,18 @@ namespace DOAN.Service.MES.mm bool result = false; UseTran2(() => { - Context.Updateable().Where(it => ids.Contains(it.Id)) + Context.Updateable().Where(it => ids.Contains(it.Id)) .SetColumns(it => it.IsCorrecting == 1) .ExecuteCommand(); result = Context.Updateable().Where(it => - it.LineCode == SqlFunc.Subqueryable().Where(it => ids.Contains(it.Id)) + it.LineCode == SqlFunc.Subqueryable().Where(it => ids.Contains(it.Id)) .Select(it => it.LineCode)) - .Where(it => it.MaterialCode == SqlFunc.Subqueryable() + .Where(it => it.MaterialCode == SqlFunc.Subqueryable() .Where(it => ids.Contains(it.Id)) .Select(it => it.MaterialCode)) - .SetColumns(it => it.LogicQuantity == SqlFunc.Subqueryable() + .SetColumns(it => it.LogicQuantity == SqlFunc.Subqueryable() .Where(it =>ids.Contains(it.Id)).Select(it => it.ActualQuantity)) .ExecuteCommandHasChange(); });