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

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -3279,7 +3279,7 @@ namespace Business.Replenishment
                 mes_Morder.company_id = input.company_id;
                 mes_Morder.org_id = input.org_id;
                 mes_Morder.product_code = item.ItemNumber;
-                mes_Morder.product_name = item.ItemNumber;
+                mes_Morder.product_name = items.Find(a => a.ItemNum == item.ItemNumber).Descr;
                 mes_Morder.morder_date = DateTime.Now.Date.AddDays(1);
                 mes_Morder.moentry_prd = null;
                 mes_Morder.moentry_prdname = null;
@@ -3321,6 +3321,7 @@ namespace Business.Replenishment
             }
             await _businessDbContext.BulkInsertAsync(moList);
             await _businessDbContext.BulkInsertAsync(moentryList);
+            await _businessDbContext.BulkUpdateAsync(weekplans);
 
             //批量保存 后期考虑子工单
             List<WorkOrdMaster> workOrdSave = new List<WorkOrdMaster>();

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

@@ -26,7 +26,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;
@@ -385,6 +387,7 @@ namespace Business.ResourceExamineManagement
         /// 节假日
         /// </summary>
         public List<HolidayMaster> holidays = new List<HolidayMaster>();
+        public IDataFilter dataFilter { get; set; }
         private readonly IUnitOfWorkManager _unitOfWorkManager;
         #endregion
 
@@ -5834,13 +5837,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;