RIZO/BeizeValveBackend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
qianhao.xu 2024-12-23 14:00:01 +08:00
parent 54e920680d
commit efae96b039
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
View File

@ -58,8 +58,8 @@ namespace DOAN.Admin.WebApi.Controllers
[ActionPermissionFilter(Permission = "proreportwork:list")] [ActionPermissionFilter(Permission = "proreportwork:list")]
public IActionResult QueryProReportwork([FromBody] ProReportworkQueryDto parm) public IActionResult QueryProReportwork([FromBody] ProReportworkQueryDto parm)
{ {
parm.JobDate[0] = DOANConvertDate.ConvertLocalDate(parm.JobDate[0]); parm.JobDateTime[0] = DOANConvertDate.ConvertLocalDate(parm.JobDateTime[0]);
parm.JobDate[1] = DOANConvertDate.ConvertLocalDate(parm.JobDate[1]); parm.JobDateTime[1] = DOANConvertDate.ConvertLocalDate(parm.JobDateTime[1]);
var response = _ProReportworkService.GetList(parm); var response = _ProReportworkService.GetList(parm);
return SUCCESS(response); return SUCCESS(response);
} }

4
DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
View File

@ -8,13 +8,13 @@ namespace DOAN.Model.BZFM.Dto
{ {
public string Workorder { get; set; } public string Workorder { get; set; }
public string RouteId { get; set; } public int RouteId { get; set; }
public int ProcessId { get; set; } public int ProcessId { get; set; }
public string Worker { get; set; } public string Worker { get; set; }
public DateTime[] JobDate { get; set; } = new DateTime[2]; public DateTime[] JobDateTime { get; set; } = new DateTime[2];
} }
/// <summary> /// <summary>

2
DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
View File

@ -53,7 +53,7 @@ public class ProReportWorkDetialDto
/// 作业日期 /// 作业日期
/// </summary> /// </summary>
public DateTime? JobDate { get; set; } public DateTime? JobDateTime { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注

10
DOAN.Service/MES/Product/ProReportworkService.cs
View File

@ -15,12 +15,12 @@ namespace DOAN.Service.MES.product;
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)] [AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
{ {
List<BaseWorkRoute> GetRoute() public List<BaseWorkRoute> GetRoute()
{ {
return Context.Queryable<BaseWorkRoute>().ToList(); return Context.Queryable<BaseWorkRoute>().ToList();
} }
List<BaseWorkProcesses> GetProcessByRoute(int route_id) public List<BaseWorkProcesses> GetProcessByRoute(int route_id)
{ {
return Context.Queryable<BaseRelWorkRouteProcesses>() return Context.Queryable<BaseRelWorkRouteProcesses>()
.LeftJoin<BaseWorkProcesses>((rel,pro)=>rel.FkWorkProcesses==pro.Id) .LeftJoin<BaseWorkProcesses>((rel,pro)=>rel.FkWorkProcesses==pro.Id)
@ -96,10 +96,10 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
var predicate = Expressionable.Create<ProReportwork01>() var predicate = Expressionable.Create<ProReportwork01>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder)) .AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker)) .AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
.AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode == parm.RouteCode) .AndIF(parm.RouteId>0, it => it.RouteId == parm.RouteId)
.AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId) .AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
.AndIF(parm.JobDate != null && parm.JobDate[0] > DateTime.MinValue, it => it.JobDate >= parm.JobDate[0]) .AndIF(parm.JobDateTime != null && parm.JobDateTime[0] > DateTime.MinValue, it => it.JobDateTime >= parm.JobDateTime[0])
.AndIF(parm.JobDate != null && parm.JobDate[1] > DateTime.MinValue, it => it.JobDate <= parm.JobDate[1].AddDays(1)) .AndIF(parm.JobDateTime != null && parm.JobDateTime[1] > DateTime.MinValue, it => it.JobDateTime <= parm.JobDateTime[1].AddDays(1))
; ;
return predicate; return predicate;

2
DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
View File

@ -40,7 +40,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
digital.ProductionPlanQuantity = Context.Queryable<ProWorkorder>().Where(it => it.WorkorderDate == DateTime.Today).Sum(it=>it.PlanNum??0); digital.ProductionPlanQuantity = Context.Queryable<ProWorkorder>().Where(it => it.WorkorderDate == DateTime.Today).Sum(it=>it.PlanNum??0);
digital.ProductionFinishQuantity = Context.Queryable<ProReportwork01>().Where(it => it.JobDate >= DateTime.Today && it.JobDate < DateTime.Today.AddDays(1)) digital.ProductionFinishQuantity = Context.Queryable<ProReportwork01>().Where(it => it.JobDateTime >= DateTime.Today && it.JobDateTime < DateTime.Today.AddDays(1))
.Where(it => it.ProcessId == 90).Sum(it => it.FinishNum??0); .Where(it => it.ProcessId == 90).Sum(it => it.FinishNum??0);

16
DOAN.Service/Mobile/ReportFlowService.cs
View File

@ -57,7 +57,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
result = Context.Updateable<ProReportwork01>().Where(it => it.Workorder == workorder && it.ProcessId == processId) result = Context.Updateable<ProReportwork01>().Where(it => it.Workorder == workorder && it.ProcessId == processId)
.SetColumns(it => it.FinishNum == finish_num) .SetColumns(it => it.FinishNum == finish_num)
.SetColumns(it => it.Worker == Worker) .SetColumns(it => it.Worker == Worker)
.SetColumns(it => it.JobDate == DateTime.Now) .SetColumns(it => it.JobDateTime == DateTime.Now)
.SetColumns(it => it.RouteId == 32) .SetColumns(it => it.RouteId == 32)
.SetColumns(it => it.UpdatedBy == Worker) .SetColumns(it => it.UpdatedBy == Worker)
.SetColumns(it => it.UpdatedTime == DateTime.Now) .SetColumns(it => it.UpdatedTime == DateTime.Now)
@ -76,7 +76,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
proReportwork01.FinishNum = finish_num; proReportwork01.FinishNum = finish_num;
proReportwork01.RouteId = 32; proReportwork01.RouteId = 32;
proReportwork01.Worker = Worker; proReportwork01.Worker = Worker;
proReportwork01.JobDate = DateTime.Now; proReportwork01.JobDateTime = DateTime.Now;
proReportwork01.CreatedBy = Worker; proReportwork01.CreatedBy = Worker;
proReportwork01.CreatedTime = DateTime.Now; proReportwork01.CreatedTime = DateTime.Now;
result = Context.Insertable(proReportwork01).ExecuteCommand(); result = Context.Insertable(proReportwork01).ExecuteCommand();
@ -102,7 +102,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
.SetColumns(it => it.BadNum == bad_num) .SetColumns(it => it.BadNum == bad_num)
.SetColumns(it => it.Worker == Worker) .SetColumns(it => it.Worker == Worker)
.SetColumns(it => it.RouteId == 32) .SetColumns(it => it.RouteId == 32)
.SetColumns(it => it.JobDate == DateTime.Now) .SetColumns(it => it.JobDateTime == DateTime.Now)
.SetColumns(it => it.UpdatedBy == Worker) .SetColumns(it => it.UpdatedBy == Worker)
.SetColumns(it => it.UpdatedTime == DateTime.Now) .SetColumns(it => it.UpdatedTime == DateTime.Now)
.ExecuteCommand(); .ExecuteCommand();
@ -118,7 +118,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
proReportwork01.BadNum = bad_num; proReportwork01.BadNum = bad_num;
proReportwork01.Worker = Worker; proReportwork01.Worker = Worker;
proReportwork01.RouteId = 32; proReportwork01.RouteId = 32;
proReportwork01.JobDate = DateTime.Now; proReportwork01.JobDateTime = DateTime.Now;
proReportwork01.CreatedBy = Worker; proReportwork01.CreatedBy = Worker;
proReportwork01.CreatedTime = DateTime.Now; proReportwork01.CreatedTime = DateTime.Now;
result = Context.Insertable(proReportwork01).ExecuteCommand(); result = Context.Insertable(proReportwork01).ExecuteCommand();
@ -151,7 +151,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
.SetColumns(it => it.RouteId == 32) .SetColumns(it => it.RouteId == 32)
.SetColumns(it => it.BadNum == bad_num) .SetColumns(it => it.BadNum == bad_num)
.SetColumns(it => it.Worker == Worker) .SetColumns(it => it.Worker == Worker)
.SetColumns(it => it.JobDate == DateTime.Now) .SetColumns(it => it.JobDateTime == DateTime.Now)
.SetColumns(it => it.UpdatedBy == Worker) .SetColumns(it => it.UpdatedBy == Worker)
.SetColumns(it => it.UpdatedTime == DateTime.Now) .SetColumns(it => it.UpdatedTime == DateTime.Now)
.ExecuteCommand(); .ExecuteCommand();
@ -170,7 +170,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
proReportwork01.BadNum = bad_num; proReportwork01.BadNum = bad_num;
proReportwork01.Worker = Worker; proReportwork01.Worker = Worker;
proReportwork01.RouteId = 32; proReportwork01.RouteId = 32;
proReportwork01.JobDate = DateTime.Now; proReportwork01.JobDateTime = DateTime.Now;
proReportwork01.CreatedBy = Worker; proReportwork01.CreatedBy = Worker;
proReportwork01.CreatedTime = DateTime.Now; proReportwork01.CreatedTime = DateTime.Now;
result = Context.Insertable(proReportwork01).ExecuteCommand(); result = Context.Insertable(proReportwork01).ExecuteCommand();
@ -203,7 +203,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
return Context.Queryable<ProReportwork01>() return Context.Queryable<ProReportwork01>()
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id) .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
.Where((rw, wp) => rw.Worker == Name && rw.JobDate >= DateTime.Today && rw.JobDate < DateTime.Today.AddDays(1)) .Where((rw, wp) => rw.Worker == Name && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
.OrderBy(rw => rw.ProcessId) .OrderBy(rw => rw.ProcessId)
.Select((rw, wp) => new ProReportWorkDetialDto() .Select((rw, wp) => new ProReportWorkDetialDto()
{ {
@ -229,7 +229,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
{ {
return Context.Queryable<ProReportwork01>() return Context.Queryable<ProReportwork01>()
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id) .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
.Where((rw, wp) => rw.ProcessId == processId && rw.JobDate >= DateTime.Today && rw.JobDate < DateTime.Today.AddDays(1)) .Where((rw, wp) => rw.ProcessId == processId && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
.OrderBy(rw => rw.ProcessId) .OrderBy(rw => rw.ProcessId)
.Select((rw, wp) => new ProReportWorkDetialDto() .Select((rw, wp) => new ProReportWorkDetialDto()
{ {