资源检查调整

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -325,6 +325,36 @@ namespace Business.ResourceExamineManagement
         /// 产能检查
         /// </summary>
         private readonly ProductExamineAppService _productExamineAppService;
+
+        /// <summary>
+        /// 生产线明细表
+        /// </summary>
+        public List<ProdLineDetail> prodLines = new List<ProdLineDetail>();
+
+        /// <summary>
+        /// 标准工艺路径表
+        /// </summary>
+        public List<RoutingOpDetail> routingOps = new List<RoutingOpDetail>();
+
+        /// <summary>
+        /// 排产记录表
+        /// </summary>
+        public List<PeriodSequenceDet> periodSequences = new List<PeriodSequenceDet>();
+
+        /// <summary>
+        /// 工作日历
+        /// </summary>
+        public List<ShopCalendarWorkCtr> calendarWorks = new List<ShopCalendarWorkCtr>();
+
+        /// <summary>
+        /// 休息时间段
+        /// </summary>
+        public List<QualityLineWorkDetail> qualityLineWorks = new List<QualityLineWorkDetail>();
+
+        /// <summary>
+        /// 节假日
+        /// </summary>
+        public List<HolidayMaster> holidays = new List<HolidayMaster>();
         #endregion
 
         #region 构造函数
@@ -1916,16 +1946,16 @@ namespace Business.ResourceExamineManagement
             //产品物料编码
             List<string> itemnums = pretreatments.Where(p => p.level == 1).Select(p => p.item_number).Distinct().ToList();
             //产线明细
-            List<ProdLineDetail> prodLines = _prodLineDetail.Select(p=> itemnums.Contains(p.Part)).ToList();
-            //标注工序
-            List<RoutingOpDetail> routingOps = _routingOpDetail.Select(p => itemnums.Contains(p.RoutingCode)).ToList();
+            prodLines = _prodLineDetail.Select(p=> itemnums.Contains(p.Part)).ToList();
+            //标准工序
+            routingOps = _routingOpDetail.Select(p => itemnums.Contains(p.RoutingCode)).ToList();
             List<string> lines = prodLines.Select(p=>p.Line).Distinct().ToList();
             //工作日历
-            List<ShopCalendarWorkCtr> calendarWorks = _shopCalendarWorkCtr.Select(p=>lines.Contains(p.ProdLine)).ToList();
+            calendarWorks = _shopCalendarWorkCtr.Select(p=>lines.Contains(p.ProdLine)).ToList();
             //休息日
-            List<QualityLineWorkDetail> qualityLineWorks = _qualityLineWorkDetail.Select(p => lines.Contains(p.ProdLine)).ToList();
+            qualityLineWorks = _qualityLineWorkDetail.Select(p => lines.Contains(p.ProdLine)).ToList();
             //节假日
-            List<HolidayMaster> holidays = _holidayMaster.Select(p => p.Dated >= DateTime.Now.Date);
+            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
@@ -2529,6 +2559,13 @@ namespace Business.ResourceExamineManagement
             List<string> itemNums = sentrys.Select(p=>p.item_number).Distinct().ToList();
             DateTime eralist = kittingTimes.Min(p => p.kitting_time).Date;
             List<PeriodSequenceDet> periodSequences = _periodSequenceDet.Select(p => itemNums.Contains(p.ItemNum) && p.PlanDate >= eralist).ToList();
+
+            //资源检查添加产线工序等数据
+            _productExamineAppService.prodLines = prodLines;
+            _productExamineAppService.routingOps = routingOps;
+            _productExamineAppService.calendarWorks = calendarWorks;
+            _productExamineAppService.qualityLineWorks = qualityLineWorks;
+            _productExamineAppService.holidays = holidays;
             _productExamineAppService.periodSequences = periodSequences;
             if (sentrys.Count() == 0)
             {