仓储异步改为同步

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

@@ -157,7 +157,7 @@ namespace Business.Quartz
             if (workOrds.Count() == 0)//定时任务调用时，需要获取工单数据
             {
                 //1、获取需要排产的工单:Status为空且IsActive==1
-                workOrds = _workOrdMaster.Select(p => string.IsNullOrEmpty(p.Status) && p.IsActive).Result;
+                workOrds = _workOrdMaster.Select(p => string.IsNullOrEmpty(p.Status) && p.IsActive);
             }
             if (workOrds.Count() == 0)//没有工单需要排产
             {
@@ -167,19 +167,19 @@ namespace Business.Quartz
             DateTime earlist = workOrds.Min(p => p.OrdDate.GetValueOrDefault()).Date;
             //2、获取数据
             //获取工单工艺路径数据
-            List<WorkOrdRouting> workOrdRoutings = _workOrdRouting.Select(p => workOrds.Select(m => m.WorkOrd).Contains(p.WorkOrd) && p.Domain == "1001" && p.Status != "C" && p.IsActive).Result;
+            List<WorkOrdRouting> workOrdRoutings = _workOrdRouting.Select(p => workOrds.Select(m => m.WorkOrd).Contains(p.WorkOrd) && p.Domain == "1001" && p.Status != "C" && p.IsActive);
             //获取物料对应的生产线信息:物料、工序对应的生产线
-            List<ProdLineDetail> prodLines = _prodLineDetail.Select(p => workOrds.Select(m => m.ItemNum).Contains(p.Part) && p.Domain == "1001" && p.IsActive).Result;
+            List<ProdLineDetail> prodLines = _prodLineDetail.Select(p => workOrds.Select(m => m.ItemNum).Contains(p.Part) && p.Domain == "1001" && p.IsActive);
             //获取生产周期数据
-            List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p=> workOrds.Select(m => m.ItemNum).Contains(p.ItemNum) && p.PlanDate >= earlist && p.Domain == "1001" && p.IsActive).Result;
+            List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p=> workOrds.Select(m => m.ItemNum).Contains(p.ItemNum) && p.PlanDate >= earlist && p.Domain == "1001" && p.IsActive);
             //获取当前日期往后的排产记录数据
-            List<ScheduleResultOpMaster> dbSchedules = _scheduleResultOpMaster.Select(p => workOrds.Select(m => m.ItemNum).Contains(p.ItemNum) && p.WorkDate >= earlist && p.Domain == "1001").Result;
+            List<ScheduleResultOpMaster> dbSchedules = _scheduleResultOpMaster.Select(p => workOrds.Select(m => m.ItemNum).Contains(p.ItemNum) && p.WorkDate >= earlist && p.Domain == "1001");
             //获取工作日历数据
-            calendars = _shopCalendarWorkCtr.Select(p=>p.Domain == "1001" && p.IsActive).Result;
+            calendars = _shopCalendarWorkCtr.Select(p=>p.Domain == "1001" && p.IsActive);
             //获取产线休息记录数据
-            qualityLines = _qualityLineWorkDetail.Select(p => p.Domain == "1001" && p.IsActive).Result;
+            qualityLines = _qualityLineWorkDetail.Select(p => p.Domain == "1001" && p.IsActive);
             //获取节假日记录数据
-            holidays = _holidayMaster.Select(p => p.Domain == "1001" && p.IsActive && p.Dated >= earlist).Result;
+            holidays = _holidayMaster.Select(p => p.Domain == "1001" && p.IsActive && p.Dated >= earlist);
 
             //3、排产
             //排产异常记录
@@ -257,11 +257,11 @@ namespace Business.Quartz
                 //更新工单表
                 item.Status = "r";
             }
-            await _workOrdMaster.Update(workOrds);
             //记录排产数据
-            await _periodSequenceDet.Insert(periodSequenceDtls);
-            await _scheduleResultOpMaster.Insert(scheduleMasters);
-            await _scheduleExceptionMaster.Insert(scheduleExceptions);
+            _workOrdMaster.Update(workOrds);
+            _periodSequenceDet.Insert(periodSequenceDtls);
+            _scheduleResultOpMaster.Insert(scheduleMasters);
+            _scheduleExceptionMaster.Insert(scheduleExceptions);
         }
 
         /// <summary>

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

@@ -2298,7 +2298,7 @@ namespace Business.ResourceExamineManagement
         public async void CreateWorkOrdDates(List<mo_mes_morder> morders)
         {
             //获取工艺路线数据：product_code=物料编码
-            List<RoutingOpDetail> allRoutings = _routingOpDetail.Select(p => morders.Select(m => m.product_code).Contains(p.RoutingCode)).Result;
+            List<RoutingOpDetail> allRoutings = _routingOpDetail.Select(p => morders.Select(m => m.product_code).Contains(p.RoutingCode));
             //获取标准BOM数据
             List<ProductStructureMaster> productStructures = GetProductStructure(morders.Select(p => p.product_code).ToList());
             //工单主表
@@ -2369,12 +2369,12 @@ namespace Business.ResourceExamineManagement
             //await _businessDbContext.BulkInsertAsync(workOrds);
             //await _businessDbContext.BulkInsertAsync(workOrdRoutings);
             //await _businessDbContext.BulkInsertAsync(workOrdDetails);
-            _workOrdMaster.Insert(workOrds);
-            _workOrdRouting.Insert(workOrdRoutings);
-            _workOrdDetail.Insert(workOrdDetails);
+             _workOrdMaster.Insert(workOrds);
+             _workOrdRouting.Insert(workOrdRoutings);
+             _workOrdDetail.Insert(workOrdDetails);
 
             //排产
-            await _productionScheduleAppService.DoProductShcedule(workOrds);
+             _productionScheduleAppService.DoProductShcedule(workOrds);
         }
 
         /// <summary>
@@ -2386,7 +2386,7 @@ namespace Business.ResourceExamineManagement
         {
             List<ProductStructureMaster> rtnStructures = new List<ProductStructureMaster>();
             //根据itemNum获取bom数据
-            var productStructures = _productStructureMaster.Select(p => itenNums.Contains(p.ParentItem) && p.Domain == "1001" && p.IsActive).Result;
+            var productStructures = _productStructureMaster.Select(p => itenNums.Contains(p.ParentItem) && p.Domain == "1001" && p.IsActive);
             //添加非虚拟件
             rtnStructures.AddRange(productStructures.Where(p => p.StructureType.ToUpper() != "X").ToList());
             foreach (var item in itenNums)
@@ -2412,7 +2412,7 @@ namespace Business.ResourceExamineManagement
         public void RecursionProductStructure(string parentItem, List<ProductStructureMaster> structures, List<ProductStructureMaster> rtnStructures)
         {
             //获取虚拟件的子物料
-            var chdStructures = _productStructureMaster.Select(p => structures.Select(m => m.ComponentItem).Contains(p.ParentItem) && p.Domain == "1001" && p.IsActive).Result;
+            var chdStructures = _productStructureMaster.Select(p => structures.Select(m => m.ComponentItem).Contains(p.ParentItem) && p.Domain == "1001" && p.IsActive);
             //非虚拟件
             var notPhantoms = chdStructures.Where(p => p.StructureType.ToUpper() != "X").ToList();
             //存在非虚拟件
@@ -2437,14 +2437,14 @@ namespace Business.ResourceExamineManagement
         public void AutoCreatePickBill(List<string> workOrds)
         {
             //获取生产周期数据
-            List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds) && p.Domain == "1001" && p.IsActive).Result;
+            List<PeriodSequenceDet> dbPeriodSequences = _periodSequenceDet.Select(p => workOrds.Contains(p.WorkOrds) && p.Domain == "1001" && p.IsActive);
             List<LineMaster> lineMasters = new List<LineMaster>();
             List<string> lines = new List<string>();//产线列表，用于获取领料单对应产线线边仓
             List<NbrDetail> nNbrDetail = new List<NbrDetail>();//需要生成领料单列表
             if (dbPeriodSequences.Any())
             {
                 lines = dbPeriodSequences.Select(a => a.Line).Distinct().ToList();
-                lineMasters = _lineMaster.Select(p => lines.Contains(p.Line) && p.Domain == "1001" && p.IsActive).Result;
+                lineMasters = _lineMaster.Select(p => lines.Contains(p.Line) && p.Domain == "1001" && p.IsActive);
                 foreach (var item in dbPeriodSequences)
                 {
                     nNbrDetail.Add(new NbrDetail

MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/ISqlRepository.cs

@@ -10,22 +10,22 @@ namespace Business.EntityFrameworkCore.SqlRepositories
 {
     public interface ISqlRepository<T> where T : class, new()
     {
-        Task<int> Insert(T entity);
-        Task<int> Insert(List<T> entitylist);
-        Task<int> Update(T entity);
-        Task<int> Update(List<T> entitylist);
+        int Insert(T entity);
+        int Insert(List<T> entitylist);
+        int Update(T entity);
+        int Update(List<T> entitylist);
 
-        Task<int> Update(Expression<Func<T, bool>> whereLambda, Expression<Func<T, T>> entity);
+        int Update(Expression<Func<T, bool>> whereLambda, Expression<Func<T, T>> entity);
 
-        Task<int> Delete(Expression<Func<T, bool>> whereLambda);
+        int Delete(Expression<Func<T, bool>> whereLambda);
 
-        Task<bool> IsExist(Expression<Func<T, bool>> whereLambda);
+        bool IsExist(Expression<Func<T, bool>> whereLambda);
 
-        Task<List<T>> Select();
+        List<T> Select();
 
-        Task<List<T>> Select(Expression<Func<T, bool>> whereLambda);
+        List<T> Select(Expression<Func<T, bool>> whereLambda);
 
-        Task<Tuple<List<T>, int>> Select<S>(int pageSize, int pageIndex, Expression<Func<T, bool>> whereLambda, Expression<Func<T, S>> orderByLambda, bool isAsc);
+        Tuple<List<T>, int> Select<S>(int pageSize, int pageIndex, Expression<Func<T, bool>> whereLambda, Expression<Func<T, S>> orderByLambda, bool isAsc);
 
         DataSet SelectDataBaseBySql(string sql, string tableName);
     }

MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/SqlRepository.cs

@@ -24,75 +24,75 @@ namespace Business.EntityFrameworkCore.SqlRepositories
         {
             _dbContext = dbContext;
         }
-        public  async Task<int> Insert(T entity)
+        public  int Insert(T entity)
         {
             _dbContext.Set<T>().Add(entity);
-            return await _dbContext.SaveChangesAsync();
+            return  _dbContext.SaveChanges();
         }
 
-        public async Task<int> Insert(List<T> entitylist)
+        public int Insert(List<T> entitylist)
         {
-            _dbContext.Set<T>().AddRange(entitylist);
-            return await _dbContext.SaveChangesAsync();
+             _dbContext.Set<T>().AddRange(entitylist);
+            return  _dbContext.SaveChanges();
         }
 
-        public async Task<int> Update(T entity)
+        public  int Update(T entity)
         {
             _dbContext.Set<T>().Update(entity);
-           return await _dbContext.SaveChangesAsync();
+           return _dbContext.SaveChanges();
         }
-        public async Task<int> Update(List<T> entitylist)
+        public  int Update(List<T> entitylist)
         {
             _dbContext.Set<T>().UpdateRange(entitylist);
-           return await _dbContext.SaveChangesAsync();
+           return  _dbContext.SaveChanges();
         }
 
-        public  async Task<int> Update(Expression<Func<T, bool>> whereLambda, Expression<Func<T, T>> entity)
+        public int Update(Expression<Func<T, bool>> whereLambda, Expression<Func<T, T>> entity)
         {
             _dbContext.Set<T>().Where(whereLambda).BatchUpdate(entity);
-            return await _dbContext.SaveChangesAsync();
+            return  _dbContext.SaveChanges();
         }
 
-        public  async Task<int> Delete(Expression<Func<T, bool>> whereLambda)
+        public  int Delete(Expression<Func<T, bool>> whereLambda)
         {
             _dbContext.Set<T>().Where(whereLambda).BatchDelete();
-            return await _dbContext.SaveChangesAsync();
+            return  _dbContext.SaveChanges();
         }
 
-        public  async Task<bool> IsExist(Expression<Func<T, bool>> whereLambda)
+        public  bool IsExist(Expression<Func<T, bool>> whereLambda)
         {
-            return await _dbContext.Set<T>().AnyAsync(whereLambda);
+            return  _dbContext.Set<T>().Any(whereLambda);
         }
 
-        public  async Task<List<T>> Select()
+        public  List<T> Select()
         {
-            return await _dbContext.Set<T>().ToListAsync();
+            return  _dbContext.Set<T>().ToList();
         }
 
-        public  async Task<List<T>> Select(Expression<Func<T, bool>> whereLambda)
+        public  List<T> Select(Expression<Func<T, bool>> whereLambda)
         {
-            return await _dbContext.Set<T>().Where(whereLambda).ToListAsync();
+            return _dbContext.Set<T>().Where(whereLambda).ToList();
         }
 
-        public  async Task<Tuple<List<T>, int>> Select<S>(int pageSize, int pageIndex, Expression<Func<T, bool>> whereLambda, Expression<Func<T, S>> orderByLambda, bool isAsc)
+        public Tuple<List<T>, int> Select<S>(int pageSize, int pageIndex, Expression<Func<T, bool>> whereLambda, Expression<Func<T, S>> orderByLambda, bool isAsc)
         {
             var total = _dbContext.Set<T>().Where(whereLambda).Count();
 
             if (isAsc)
             {
-                var entities = await _dbContext.Set<T>().Where(whereLambda)
+                var entities =  _dbContext.Set<T>().Where(whereLambda)
                                       .OrderBy<T, S>(orderByLambda)
                                       .Skip(pageSize * (pageIndex - 1))
-                                      .Take(pageSize).ToListAsync();
+                                      .Take(pageSize).ToList();
 
                 return  new Tuple<List<T>, int>(entities, total);
             }
             else
             {
-                var entities =await _dbContext.Set<T>().Where(whereLambda)
+                var entities = _dbContext.Set<T>().Where(whereLambda)
                                       .OrderByDescending<T, S>(orderByLambda)
                                       .Skip(pageSize * (pageIndex - 1))
-                                      .Take(pageSize).ToListAsync();
+                                      .Take(pageSize).ToList();
 
                 return new Tuple<List<T>, int>(entities, total);
             }