RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
qianhao.xu 2024-11-18 14:22:59 +08:00
parent 886cb52f0a
commit d0b523f2d0
4 changed files with 91 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
DOAN.Model/MES/bigscreen/Dto/ProductBigScreenDto.cs
View File

@ -1,37 +1,81 @@
namespace DOAN.Model.MES.bigscreen.Dto;
public class ProductBigScreenMoudle01Dto
namespace DOAN.Model.MES.bigscreen.Dto
{
/// <summary>
/// 当日产量
/// </summary>
public int TodayOutputQuantity { get; set; }
public class ProductBigScreenMoudle01Dto
{
/// <summary>
/// 当日产量
/// </summary>
public int TodayOutputQuantity { get; set; }
/// <summary>
/// 当日工单
/// </summary>
public int TodayWorkOrderQuantity { get; set; }
/// <summary>
/// 当日工单
/// </summary>
public int TodayWorkOrderQuantity { get; set; }
/// <summary>
/// 当周产量
/// </summary>
public int WeekOutputQuantity { get; set; }
/// <summary>
/// 当周产量
/// </summary>
public int WeekOutputQuantity { get; set; }
/// <summary>
/// 当周工单
/// </summary>
public int WeekWorkOrderQuantity { get; set; }
/// <summary>
/// 当周工单
/// </summary>
public int WeekWorkOrderQuantity { get; set; }
/// <summary>
/// 今天异常工单数
/// </summary>
public int TodayExceptionWorkOrderQuantity { get; set; }
/// <summary>
/// 今天异常工单数
/// </summary>
public int TodayExceptionWorkOrderQuantity { get; set; }
/// <summary>
/// 本周异常工单数
/// </summary>
public int WeekExceptionWorkOrderQuantity { get; set; }
}
/// <summary>
/// 本周异常工单数
/// </summary>
public int WeekExceptionWorkOrderQuantity { get; set; }
}
public class ProductBigScreenMoudle02Dto
{
/// <summary>
/// 今日班组数
/// </summary>
public int TodayGroupQuantity { get; set; }
/// <summary>
/// 今日产线数
/// </summary>
public int TodayLineQuantity { get; set; }
/// <summary>
/// 今天计划数
/// </summary>
public int TodayPlanQuantity { get; set; }
/// <summary>
/// 今日实际产量数
/// </summary>
public int TodayActionProductionQuantity { get; set; }
/// <summary>
/// 今日产成品种类数
/// </summary>
public int TodayProductTypeQuantity { get; set; }
/// <summary>
/// 七日计划变更数
/// </summary>
public int SevenDaysPriorPlanQuantity { get; set; }
}
}

3
DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs
View File

@ -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<ProWorkorder>
{
EchartsOptions GetMoudle01();
ProductBigScreenMoudle02Dto GetMoudle01();
EchartsOptions GetMoudle02();
EchartsOptions GetMoudle03();
EchartsOptions GetMoudle04();

17
DOAN.Service/MES/bigScreen/Product2BigScreenService.cs
View File

@ -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<ProWorkorder>, IProduct2BigScreenService
{
public EchartsOptions GetMoudle01()
{
public ProductBigScreenMoudle02Dto GetMoudle01()
{
ProductBigScreenMoudle02Dto productBigScreen = new ProductBigScreenMoudle02Dto();
return null;
}
//今日班组
productBigScreen.TodayGroupQuantity= Context.Queryable<ProWorkorder>().Where(it => it.WorkorderDate == DateTime.Today)
.GroupBy(it => it.GroupCode).Count();
return productBigScreen;
}
public EchartsOptions GetMoudle02()
{

8
DOAN.Service/MES/mm/MmLinesidebarInventoryCheckServcie.cs
View File

@ -74,18 +74,18 @@ namespace DOAN.Service.MES.mm
bool result = false;
UseTran2(() =>
{
Context.Updateable<MmInventoryCheckLogDto>().Where(it => ids.Contains(it.Id))
Context.Updateable<MmInventoryCheckLog>().Where(it => ids.Contains(it.Id))
.SetColumns(it => it.IsCorrecting == 1)
.ExecuteCommand();
result = Context.Updateable<MmLinesidebarInventory>().Where(it =>
it.LineCode == SqlFunc.Subqueryable<MmInventoryCheckLogDto>().Where(it => ids.Contains(it.Id))
it.LineCode == SqlFunc.Subqueryable<MmInventoryCheckLog>().Where(it => ids.Contains(it.Id))
.Select(it => it.LineCode))
.Where(it => it.MaterialCode == SqlFunc.Subqueryable<MmInventoryCheckLogDto>()
.Where(it => it.MaterialCode == SqlFunc.Subqueryable<MmInventoryCheckLog>()
.Where(it => ids.Contains(it.Id))
.Select(it => it.MaterialCode))
.SetColumns(it => it.LogicQuantity == SqlFunc.Subqueryable<MmInventoryCheckLogDto>()
.SetColumns(it => it.LogicQuantity == SqlFunc.Subqueryable<MmInventoryCheckLog>()
.Where(it =>ids.Contains(it.Id)).Select(it => it.ActualQuantity))
.ExecuteCommandHasChange();
});