交货计划改为为历史版本修复

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

@@ -25,7 +25,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Threading.Tasks;
+using Volo.Abp;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
@@ -384,6 +386,7 @@ namespace Business.ResourceExamineManagement
         /// 节假日
         /// </summary>
         public List<HolidayMaster> holidays = new List<HolidayMaster>();
+        public IDataFilter dataFilter { get; set; }
         private readonly IUnitOfWorkManager _unitOfWorkManager;
         #endregion
 
@@ -5806,13 +5809,16 @@ namespace Business.ResourceExamineManagement
                     ds.remarks = $"{DateTime.Now.ToString()},重新生成交货计划把未发布交货单禁用";
                 });
                 await _businessDbContext.BulkUpdateAsync(dsdeletedList);
-                var historyversionList = _mysql_ic_demandschedule.GetListAsync(a => a.ishistoryversion != "Y").Result;
-                historyversionList.ForEach(a =>
+                using(dataFilter.Disable<ISoftDelete>())
                 {
-                    a.ishistoryversion = "Y";
-                    a.historyversionTime = DateTime.Now;
-                });
-                await _businessDbContext.BulkUpdateAsync(historyversionList);
+                    var historyversionList = _mysql_ic_demandschedule.GetListAsync(a => a.ishistoryversion != "Y").Result;
+                    historyversionList.ForEach(a =>
+                    {
+                        a.ishistoryversion = "Y";
+                        a.historyversionTime = DateTime.Now;
+                    });
+                    await _businessDbContext.BulkUpdateAsync(historyversionList);
+                }
 
 
                 var weekday = (int)DateTime.Now.DayOfWeek;