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-16 10:08:51 +08:00
parent f6cf046da7
commit 98823bd6e8
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
View File

@ -77,7 +77,7 @@ public class WorkOrderProgressController : BaseController
return SUCCESS(response); return SUCCESS(response);
} }
//TODO 获取不同状态的工单 (PDA用) //TODO 获取不同状态的工单 (PDA用) (废弃)
//TODO 根据班组，日期 //TODO 根据班组，日期
[HttpGet("get_workorder_status_list")] [HttpGet("get_workorder_status_list")]
public IActionResult GetWorkOrderStatusList(string group_code,int status, DateTime handleDate) public IActionResult GetWorkOrderStatusList(string group_code,int status, DateTime handleDate)

24
DOAN.Service/MES/product/ProReportworkService.cs
View File

@ -134,9 +134,27 @@ namespace DOAN.Service.MES.product
return Context.Queryable<ProWorkorder>() return Context.Queryable<ProWorkorder>()
.LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder) .LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
.Where((w, r) => w.WorkorderDate == handleDate) .Where((w, r) => w.WorkorderDate == handleDate)
.Select((w, r) => r) .Select((w, r) => new ProReportworkDto()
.ToList() {
.Adapt<List<ProReportworkDto>>(); Id = r.Id,
ProductionCode=w.ProductionCode,
ProductionName=w.ProductionName,
Specification=w.Specification,
QualifiedNumber = r.QualifiedNumber,
UnqualifiedNumber = r.UnqualifiedNumber,
ReworkNumber = r.ReworkNumber,
ScrapNumber=r.ScrapNumber,
Remark=r.Remark,
Difference = r.QualifiedNumber-r.FinishedNum??0,
FkWorkorder =w.Workorder,
GroupCode = w.GroupCode,
LineCode = w.LineCode,
DispatchNum=w.DeliveryNum??0,
Priority = w.Priority,
Status = w.Status,
Beat = w.Beat
}).ToList();
} }

2
DOAN.Tasks/TaskScheduler/Job_MovSlow_Execute.cs
View File

@ -45,7 +45,7 @@ namespace DOAN.Tasks.TaskScheduler
throw new CustomException($"任务{trigger?.JobName}呆滞品任务调度请求执行失败，任务不存在"); throw new CustomException($"任务{trigger?.JobName}呆滞品任务调度请求执行失败，任务不存在");
} }
bool result = MmSlowMoveMaterialService.GenerateShopFloorSluggishProducts(DateTime.Today, "任务调度"); bool result = MmSlowMoveMaterialService.GenerateShopFloorSluggishProducts(DateTime.Today.AddDays(-1), "任务调度");
logger.Info($"（job）任务【{info.Name}】设备管理调度请求执行结果=" + result); logger.Info($"（job）任务【{info.Name}】设备管理调度请求执行结果=" + result);
} }