删除排产异常记录表，换成log日志记录

MicroServices/Business/Business.Application/Quartz/ProductionScheduleAppService.cs

@@ -13,6 +13,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
+using Volo.Abp.MultiTenancy;
 
 namespace Business.Quartz
 {
@@ -67,11 +68,6 @@ namespace Business.Quartz
         /// </summary>
         private ISqlRepository<ShopCalendarWorkCtr> _shopCalendarWorkCtr;
 
-        /// <summary>
-        /// 排产异常记录表
-        /// </summary>
-        private ISqlRepository<ScheduleExceptionMaster> _scheduleExceptionMaster;
-
         /// <summary>
         /// 产线休息时间记录表
         /// </summary>
@@ -87,6 +83,8 @@ namespace Business.Quartz
         /// </summary>
         SnowFlake help = new SnowFlake();
 
+        private readonly ICurrentTenant _currentTenant;
+
         /// <summary>
         /// 工作日历数据
         /// </summary>
@@ -118,9 +116,9 @@ namespace Business.Quartz
             ISqlRepository<ScheduleResultOpMaster> scheduleResultOpMaster,
             ISqlRepository<InvMaster> invMaster,
             ISqlRepository<ShopCalendarWorkCtr> shopCalendarWorkCtr,
-            ISqlRepository<ScheduleExceptionMaster> scheduleExceptionMaster,
             ISqlRepository<QualityLineWorkDetail> qualityLineWorkDetail,
-            ISqlRepository<HolidayMaster> holidayMaster
+            ISqlRepository<HolidayMaster> holidayMaster,
+            ICurrentTenant currentTenant
             )
         { 
             _itemMaster= itemMaster;
@@ -132,9 +130,9 @@ namespace Business.Quartz
             _scheduleResultOpMaster= scheduleResultOpMaster;
             _invMaster= invMaster;
             _shopCalendarWorkCtr= shopCalendarWorkCtr;
-            _scheduleExceptionMaster= scheduleExceptionMaster;
             _qualityLineWorkDetail= qualityLineWorkDetail;
             _holidayMaster = holidayMaster;
+            _currentTenant= currentTenant;
         }
         #endregion
 
@@ -182,8 +180,6 @@ namespace Business.Quartz
             holidays = _holidayMaster.Select(p => p.Domain == "1001" && p.IsActive && p.Dated >= earlist);
 
             //3、排产
-            //排产异常记录
-            List<ScheduleExceptionMaster> scheduleExceptions = new List<ScheduleExceptionMaster>();
             //生产周期
             List<PeriodSequenceDet> periodSequenceDtls = new List<PeriodSequenceDet>();
             //排产记录表
@@ -202,28 +198,14 @@ namespace Business.Quartz
                 if (routingDtos.Count() == 0)//没有维护主工序
                 {
                     //记录排产异常原因
-                    scheduleExceptions.Add(new ScheduleExceptionMaster
-                    {
-                        RecID = help.NextId(),
-                        Domain = "1001",
-                        WorkOrd = item.WorkOrd,
-                        Remark = "工单的工序数据维护错误",
-                        CreatTime = DateTime.Now
-                    });
+                    new NLogHelper("ProductionScheduleAppService").WriteLog("DoProductShcedule", "工单<"+ item.WorkOrd + ">的工序数据维护错误", _currentTenant.Id.ToString());
                     continue;
                 }
                 //校验每层级工序是否都维护了产线
                 if (routingDtos.Exists(p=> string.IsNullOrEmpty(p.Line)))
                 {
                     //记录排产异常原因
-                    scheduleExceptions.Add(new ScheduleExceptionMaster
-                    {
-                        RecID = help.NextId(),
-                        Domain = "1001",
-                        WorkOrd = item.WorkOrd,
-                        Remark = "工单的产线数据维护错误",
-                        CreatTime = DateTime.Now
-                    });
+                    new NLogHelper("ProductionScheduleAppService").WriteLog("DoProductShcedule", "工单<" + item.WorkOrd + ">的产线数据维护错误", _currentTenant.Id.ToString());
                     continue;
                 }
                 //校验每个层级是否维护了工作日历
@@ -240,14 +222,7 @@ namespace Business.Quartz
                 if (flag)
                 {
                     //记录排产异常原因
-                    scheduleExceptions.Add(new ScheduleExceptionMaster
-                    {
-                        RecID = help.NextId(),
-                        Domain = "1001",
-                        WorkOrd = item.WorkOrd,
-                        Remark = "工单产线的工作日历数据维护错误",
-                        CreatTime = DateTime.Now
-                    });
+                    new NLogHelper("ProductionScheduleAppService").WriteLog("DoProductShcedule", "工单<" + item.WorkOrd + ">的产线工作日历数据维护错误", _currentTenant.Id.ToString());
                     continue;
                 }
 
@@ -261,7 +236,6 @@ namespace Business.Quartz
             _workOrdMaster.Update(workOrds);
             _periodSequenceDet.Insert(periodSequenceDtls);
             _scheduleResultOpMaster.Insert(scheduleMasters);
-            _scheduleExceptionMaster.Insert(scheduleExceptions);
         }
 
         /// <summary>

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

@@ -117,11 +117,6 @@ namespace Business.EntityFrameworkCore
         /// </summary>
         public DbSet<ShopCalendarWorkCtr> ShopCalendarWorkCtr { get; set; }
 
-        /// <summary>
-        /// 排产异常记录表
-        /// </summary>
-        public DbSet<ScheduleExceptionMaster> ScheduleExceptionMaster { get; set; }
-
         /// <summary>
         /// 产线休息时间记录表
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/ScheduleExceptionMaster.cs

@@ -1,48 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Business.Model.Production
-{
-    /// <summary>
-    /// 排产异常记录表
-    /// </summary>
-    [Comment("排产异常记录表")]
-    public class ScheduleExceptionMaster
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Comment("主键")]
-        [Key]
-        public long RecID { get; set; }
-
-        /// <summary>
-        /// 域名
-        /// </summary>
-        [Comment("域名")]
-        public string Domain { get; set; }
-
-        /// <summary>
-        /// 工单
-        /// </summary>
-        [Comment("工单")]
-        public string WorkOrd { get; set; }
-
-        /// <summary>
-        /// 异常原因
-        /// </summary>
-        [Comment("异常原因")]
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [Comment("创建时间")]
-        public DateTime CreatTime { get; set; }
-    }
-}