Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

# Conflicts:
#	MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -218,7 +218,7 @@ namespace Business.ResourceExamineManagement
             //获取非标准产线人员配置
             prodLineDetailRunCrews = _prodLineDetailRunCrew.Select(x => prodLines.Select(p => p.RecID).Contains(x.ProdLineDetailRecID) && x.IsActive && x.Domain == domain).ToList();
             //获取加班设置
-            resourceOccupancyTimes = _resourceOccupancyTime.Select(x => prodLines.Select(p => p.Line).Contains(x.Resource) && x.IsActive && x.Domain == domain).ToList();
+            List<ResourceOccupancyTime> resourceOccupancyTimes = _resourceOccupancyTime.Select(x => prodLines.Select(p => p.Line).Contains(x.Resource) && x.IsActive && x.Domain == domain && x.StartTime.Value > DateTime.Now).ToList();
             //获取生产周期数据
             List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p => lines.Contains(p.Line) && p.PlanDate >= earlist && p.Domain == domain && p.IsActive);
             //获取当前日期往后的排产记录数据

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/DOP/BusinessDbContext.cs

@@ -1,5 +1,6 @@
 using Business.Domain;
 using Business.StructuredDB.MES;
+using Business.StructuredDB.Production;
 using Business.StructuredDB.WMS;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
@@ -36,6 +37,10 @@ namespace Business.EntityFrameworkCore
         public DbSet<mes_morder> mes_morder { get; set; }
         public DbSet<mes_oorder> mes_oorder { get; set; }
         public DbSet<mes_stockoccupy> mes_stockoccupy { get; set; }
+
+        public DbSet<ProdLineDetailRunCrew> ProdLineDetailRunCrew { get; set; }
+        public DbSet<ResourceOccupancyTime> ResourceOccupancyTime { get; set; }
+
         #endregion
 
         #region Sale