Murphy 2 лет назад
Родитель
Сommit
5510c214ed

+ 4 - 4
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -2353,12 +2353,12 @@ namespace Business.Replenishment
 
             if(deleteList.Count>0)
             {
-               await _replenishmentWeekPlan.DeleteManyAsync(deleteList);
+               await _businessDbContext.BulkDeleteAsync(deleteList);
                _workOrdMaster.Delete(workOrdMasterList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.WorkOrd)).ToList());
                _workOrdDetail.Delete(workOrdDetailList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.WorkOrd)).ToList());
                _workOrdRouting.Delete(workOrdRoutingList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.WorkOrd)).ToList());
-               await _mysql_mes_morder.DeleteManyAsync(mesmorderList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.morder_no)).ToList());
-               await _mysql_mes_moentry.DeleteManyAsync(mesmorderEntryList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.moentry_mono)).ToList());
+               await _businessDbContext.BulkDeleteAsync(mesmorderList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.morder_no)).ToList());
+               await _businessDbContext.BulkDeleteAsync(mesmorderEntryList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.moentry_mono)).ToList());
             }
             if (updateList.Count > 0)
             {
@@ -3588,7 +3588,7 @@ namespace Business.Replenishment
             var mysql_mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.moo_id_billid.Value)).Result;
             if (mysql_mes_mooccupy.Count > 0)
             {
-                await _mysql_mes_mooccupy.DeleteManyAsync(mysql_mes_mooccupy);
+                await _businessDbContext.BulkDeleteAsync(mysql_mes_mooccupy);
             }
             /*var srm_pr_main = _mysql_srm_pr_main.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.sentry_id.GetValueOrDefault())).Result;
             if (srm_pr_main.Count > 0)

+ 15 - 14
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -831,7 +831,7 @@ namespace Business.ResourceExamineManagement
             {
                 try
                 {
-                    await _mysql_crm_seorderentry.UpdateManyAsync(sentrys);
+                    await _businessDbContext.BulkUpdateAsync(sentrys);
                     /*//批量保存 后期考虑子工单
                     if (moderlist.Any())
                     {
@@ -1351,7 +1351,7 @@ namespace Business.ResourceExamineManagement
                         {
                             _businessBangDbContext.Database.ExecuteSqlRaw(seqSql);
                         }
-                        await _mysql_srm_pr_main.UpdateManyAsync(prapplyList);
+                        await _businessDbContext.BulkUpdateAsync(prapplyList);
                         await unitOfWork.CompleteAsync();
                     }
                     catch (Exception e)
@@ -1789,7 +1789,7 @@ namespace Business.ResourceExamineManagement
             {
                 try
                 {
-                    await _mysql_crm_seorderentry.UpdateManyAsync(sentrys);
+                    await _businessDbContext.BulkUpdateAsync(sentrys);
                     //批量保存 后期考虑子工单
                     if (moderlist.Any())
                     {
@@ -1974,7 +1974,7 @@ namespace Business.ResourceExamineManagement
             var mysql_mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.moo_id_billid.Value)).Result;
             if (mysql_mes_mooccupy.Count > 0)
             {
-                await _mysql_mes_mooccupy.DeleteManyAsync(mysql_mes_mooccupy);
+                await _businessDbContext.BulkDeleteAsync(mysql_mes_mooccupy);
             }
             /*var srm_pr_main = _mysql_srm_pr_main.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.sentry_id.GetValueOrDefault())).Result;
             if (srm_pr_main.Count > 0)
@@ -2711,7 +2711,7 @@ namespace Business.ResourceExamineManagement
                 {
                     try
                     {
-                        await _mysql_mes_morder.UpdateManyAsync(morders);
+                        await _businessDbContext.BulkUpdateAsync(morders);
                     }
                     catch (Exception e)
                     {
@@ -2972,7 +2972,7 @@ namespace Business.ResourceExamineManagement
                             //mo.morder_state = MorderEnum.Xd_state;
                         }
                     }
-                    await _mysql_mes_morder.UpdateManyAsync(morders);
+                    await _businessDbContext.BulkUpdateAsync(morders);
                     if (workords.Length > 0)
                     {
                         workords = workords.Substring(1, workords.Length - 1);
@@ -3032,7 +3032,8 @@ namespace Business.ResourceExamineManagement
                             }
                             morders[0].morder_state = MorderEnum.Xd_state;
                             morders[0].MaterialSituation = morders[0].MaterialSituation == MorderEnum.NoCarehouseComplete ? MorderEnum.Part : morders[0].MaterialSituation;
-                            await _mysql_mes_morder.UpdateManyAsync(morders);
+                            //await _mysql_mes_morder.UpdateManyAsync(morders);
+                            await _businessDbContext.BulkUpdateAsync(morders);
                             //复制子工序
                             var insertList = GetCopyOP(morders[0].morder_no, domain);
                             if (insertList.Any())
@@ -4252,11 +4253,11 @@ namespace Business.ResourceExamineManagement
                             c.NbrRecID = DBnbrList.Where(a => a.Nbr == c.Nbr).First().RecID;
                         });
                         _nbrDetail.Insert(nbrDetailList);
-                        await _replenishmentWeekPlan.UpdateManyAsync(weekplan);
+                        await _businessDbContext.BulkUpdateAsync(weekplan);
 
                         if (morders != null)
                         {
-                            await _mysql_mes_morder.UpdateManyAsync(morders);
+                            await _businessDbContext.BulkUpdateAsync(morders);
                         }
                         _workOrdMaster.Update(workOrdMasters);
                         _workOrdRouting.Update(workOrdRoutings);
@@ -4575,7 +4576,7 @@ namespace Business.ResourceExamineManagement
                     var moSubstitute = _ic_substitute.GetListAsync(s => s.substitute_code == dto.scode).Result;
                     if (moSubstitute.Any())
                     {
-                        await _ic_substitute.DeleteManyAsync(moSubstitute);
+                        await MongoHelper<mo_ic_substitute>.DeleteManyAsync(s => s.substitute_code == dto.scode);
                     }
                     var moSubtitutes = ObjectMapper.Map<List<ic_substitute>, List<mo_ic_substitute>>(list);
                     moSubtitutes.ForEach(s => s.GenerateNewId(help.NextId()));
@@ -4602,7 +4603,7 @@ namespace Business.ResourceExamineManagement
                         var moSuballDtl = _ic_substitute_group_detail.GetListAsync(s => s.substitute_code == dto.scode).Result;
                         if (moSuballDtl.Any())
                         {
-                            await _ic_substitute_group_detail.DeleteManyAsync(moSuballDtl);
+                            await MongoHelper<mo_ic_substitute_group_detail>.DeleteManyAsync(s => s.substitute_code == dto.scode);
                         }
                         var moSubAllDtls = ObjectMapper.Map<List<ic_substitute_group_detail>, List<mo_ic_substitute_group_detail>>(subAllDtls);
                         moSubAllDtls.ForEach(s => s.GenerateNewId(help.NextId()));
@@ -4936,7 +4937,7 @@ namespace Business.ResourceExamineManagement
                         }
                     }
                 }
-                await _mysql_ic_bom_child.UpdateManyAsync(list);
+                await _businessDbContext.BulkUpdateAsync(list);
             }
             return "ok";
         }
@@ -4951,7 +4952,7 @@ namespace Business.ResourceExamineManagement
                 var moBomChild = _ic_bom_child.GetListAsync(s => s.bom_id == dto.id && s.company_id == dto.company_id && s.factory_id == dto.factory_id).Result;
                 if (moBomChild.Any())
                 {
-                    await _ic_bom_child.DeleteManyAsync(moBomChild);
+                    await MongoHelper<mo_ic_bom_child>.DeleteManyAsync(s => s.bom_id == dto.id && s.company_id == dto.company_id && s.factory_id == dto.factory_id);
                 }
                 //同步物料BOM明细数据
                 if (list.Count > 0)
@@ -4967,7 +4968,7 @@ namespace Business.ResourceExamineManagement
                     var refBomList = _mysql_b_bom_pretreatment.GetListAsync(s => refList.Select(c => c.sourceid).Contains(s.sourceid)).Result;
                     if (refBomList.Any())
                     {
-                        await _mysql_b_bom_pretreatment.DeleteManyAsync(refBomList);
+                        await _businessDbContext.BulkDeleteAsync(refBomList);
                     }
                     var boms = _ic_bom.GetListAsync(s => refList.Select(c => c.sourceid).Contains(s.Id)).Result;
                     if (boms.Any()) {