diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs index 3fbfb0cc..b074b93e 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs @@ -94,7 +94,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro /// - /// 下达生产指令 + /// 下达开始领料指令 /// /// 工单ID /// diff --git a/ZR.Service/mes/pro/ProWorkorderService.cs b/ZR.Service/mes/pro/ProWorkorderService.cs index 86162dad..4640788a 100644 --- a/ZR.Service/mes/pro/ProWorkorderService.cs +++ b/ZR.Service/mes/pro/ProWorkorderService.cs @@ -26,7 +26,8 @@ namespace ZR.Service.mes.pro .AndIF(year > 0, it => it.Year == year) .AndIF(week > 0, it => it.Week == week) .AndIF(date > 0, it => it.Date == date) - .And(it => it.Wrokerorder_status.Equals(isSchedule)) + .AndIF(isSchedule==0,it => it.Wrokerorder_status.Equals(isSchedule)) + .AndIF(isSchedule>=1,it => it.Wrokerorder_status>=1) .ToExpression(); int totalCount = 0; @@ -78,7 +79,7 @@ namespace ZR.Service.mes.pro public int ReleaseProduction(string id) { return Context.Updateable() - .SetColumns(it => it.Wrokerorder_status == 1) + .SetColumns(it => it.Wrokerorder_status == 2) .Where(it => it.Id.Equals(id)) .ExecuteCommand(); }