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

编辑排班

Browse Source
This commit is contained in:
chenlin 2026-02-03 09:32:47 +08:00
parent 8b0730186f
commit b645edc07b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
View File

@ -74,7 +74,7 @@ namespace DOAN.Admin.WebApi.Controllers
/// 更新排班
/// </summary>
/// <returns></returns>
[HttpPut]
[HttpPost("update_group_schedule")]
// [ActionPermissionFilter(Permission = "business:groupschedule:edit")]
[Log(Title = "排班", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateGroupSchedule([FromBody] GroupScheduleDto parm)
@ -126,12 +126,10 @@ namespace DOAN.Admin.WebApi.Controllers
if (parm.ScheduleDate == DateTime.MinValue)
{
return SUCCESS(null);
}
;
};
parm.ScheduleDate = parm.ScheduleDate.Date;
var modal = parm.Adapt<GroupSchedule>().ToCreate(HttpContext);
var response = _GroupScheduleService.AddGroupSchedule(modal);
return SUCCESS(response);

4
DOAN.Service/MES/report/ReportService.cs
View File

@ -204,7 +204,7 @@ namespace DOAN.Service.MES.report
var productionCompletionList = workDetailList.Where(wd => wd.WorkOrder == t.WorkOrder).ToList();
//var hours = (t.EndTime - t.StartTime).Value.TotalHours;
var planNum = t.Beat == 0 ? 0 : 3600 / t.Beat;
for (int i = 9; i < 24; i++)
for (int i = 8; i < 24; i++)
{
var productionCompletionModel = productionCompletionList.Where(t => t.TimePeriod.Hour == i).FirstOrDefault();
t.List.Add(new PlanModel
@ -214,7 +214,7 @@ namespace DOAN.Service.MES.report
CompletionNum = productionCompletionModel?.Count ?? 0,
});
}
for (int i = 0; i < 9; i++)
for (int i = 0; i < 8; i++)
{
var productionCompletionModel = productionCompletionList.Where(t => t.TimePeriod.Hour == i).FirstOrDefault();
t.List.Add(new PlanModel