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

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

@@ -4417,8 +4417,8 @@ namespace Business.Replenishment
                 long factoryid=Convert.ToInt64(factory_id);
                 long companyid=Convert.ToInt64(company_id);
                 var weekPlan=_replenishmentWeekPlan.FindAsync(a => a.Id == id && a.tenant_id == tenantid && a.factory_id == factoryid && a.company_id == companyid).Result;
-                var isExistSamePriority= _replenishmentWeekPlan.FindAsync(a => a.Id != id && a.Week == weekPlan.Week && a.Priority == newpriority).Result;
-                if(isExistSamePriority!=null)
+                var isExistSamePriority = _replenishmentWeekPlan.GetListAsync(a => a.Id != id && a.Week == weekPlan.Week && a.Priority == newpriority).Result;
+                if(isExistSamePriority.Any())
                     return "优先级重复，请重新调整。";
 
                 weekPlan.Priority= newpriority;