|
|
@@ -1916,7 +1916,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//休息日
|
|
|
List<QualityLineWorkDetail> qualityLineWorks = _qualityLineWorkDetail.Select(p => lines.Contains(p.ProdLine)).ToList();
|
|
|
//节假日
|
|
|
- List<HolidayMaster> holidays = _holidayMaster.Select(p => p.Dated.GetValueOrDefault().Year == DateTime.Now.Year);
|
|
|
+ List<HolidayMaster> holidays = _holidayMaster.Select(p => p.Dated >= DateTime.Now.Date);
|
|
|
|
|
|
//主工单
|
|
|
List<mo_mes_morder> mo_Mes_Morders = _mes_morder.GetManyByCondition(x => boms.Select(p => p.bom_number).Contains(x.bom_number) && (x.morder_state != MorderEnum.Accomplish_state || x.morder_state != MorderEnum.Close_state
|
