Pengxy 3 hónapja
szülő
commit
0c699f652e

+ 7 - 0
MicroServices/Business/.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\Business.Application\\ResourceExamineManagement"
+  ],
+  "PreviewInSolutionExplorer": false
+}

BIN
MicroServices/Business/.vs/slnx.sqlite


+ 73 - 61
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -737,7 +737,8 @@ namespace Business.Replenishment
                 {
                     var toDelete = _businessDbContext.ReplenishmentAnnualProduction.Where(a => a.Year == input.year && a.factory_id == input.factory_id).ToList();
                     await _businessDbContext.BulkDeleteAsync(toDelete);
-                    await _businessDbContext.BulkInsertAsync(annualProductionOutlines);
+                    await _businessDbContext.AddRangeAsync(annualProductionOutlines);
+                    await _businessDbContext.SaveChangesAsync();
                     //await CalcLongPeriodItemPR(input);
                     await CalcROP(input);
                     await SaveProductionMasterPlan(input, annualProductionOutlines);
@@ -958,7 +959,8 @@ namespace Business.Replenishment
                 {
                     var planList = productionMasters.Select(a => a.PlanMonth).ToList();
                     await _productionMasterPlan.DeleteAsync(a => planList.Contains(a.PlanMonth) && a.factory_id == input.factory_id);
-                    await _businessDbContext.BulkInsertAsync(productionMasters);
+                    await _businessDbContext.AddRangeAsync(productionMasters);
+                    await _businessDbContext.SaveChangesAsync();
                     await unitOfWork.CompleteAsync();
                 }
                 catch (Exception e)
@@ -1699,8 +1701,9 @@ namespace Business.Replenishment
                 }
             }
             addList?.ForEach(item => { item.GenerateNewId(help.NextId()); });
-            await _businessDbContext.BulkInsertAsync(addList);
-            await _businessDbContext.BulkUpdateAsync(updateList);
+            await _businessDbContext.AddRangeAsync(addList);
+            _businessDbContext.UpdateRange(updateList);
+            await _businessDbContext.SaveChangesAsync();
             return "OK";
         }
         private List<ReplenishmentSubItemDto> CalcMonthPlanSubItem(List<MonthlyShipmentPlan> planList, List<mo_ic_bom> boms, List<b_bom_pretreatment> pretreatments)
@@ -1952,8 +1955,9 @@ namespace Business.Replenishment
                     }
                 }
             }
-            await _businessDbContext.BulkInsertAsync(addRopList);
-            await _businessDbContext.BulkUpdateAsync(updateRopList);
+            await _businessDbContext.AddRangeAsync(addRopList);
+            _businessDbContext.UpdateRange(updateRopList);
+            await _businessDbContext.SaveChangesAsync();
 
             //更新周生产计划
             //生产线明细表
@@ -3196,8 +3200,9 @@ namespace Business.Replenishment
                 weekPlan[i].OrderNO = OrderNOList[i].NbrResult;
             }
 
-            await _businessDbContext.BulkInsertAsync(moList);
-            await _businessDbContext.BulkInsertAsync(moentryList);
+            await _businessDbContext.AddRangeAsync(moList);
+            await _businessDbContext.AddRangeAsync(moentryList);
+            //await _businessDbContext.SaveChangesAsync();
 
             //批量保存 后期考虑子工单
             List<WorkOrdMaster> workOrdSave = new List<WorkOrdMaster>();
@@ -3211,7 +3216,7 @@ namespace Business.Replenishment
 
             if (workOrdSave.Any())
             {
-                _businessDbContext.BulkInsert(workOrdSave);
+                await _businessDbContext.AddRangeAsync(workOrdSave);
                 //CalcPriority(input.factory_id.ToString());
                 RefreshPriority(null, input.factory_id.ToString());
             }
@@ -3222,7 +3227,7 @@ namespace Business.Replenishment
                 {
                     c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                 });
-                _businessDbContext.BulkInsert(workOrdRoutingSave);
+                await _businessDbContext.AddRangeAsync(workOrdRoutingSave);
             }
             if (workOrdDetails.Any())
             {
@@ -3230,8 +3235,9 @@ namespace Business.Replenishment
                 {
                     c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                 });
-                _businessDbContext.BulkInsert(workOrdDetails);
+                await _businessDbContext.AddRangeAsync(workOrdDetails);
             }
+            await _businessBangDbContext.SaveChangesAsync();
             await PlanOrderResourceCheck(moList.OrderBy(a => a.moentry_sys_stime).ToList(), moentryList, bang_id, "", false, false);
 
             var examine_resultList = _mysql_examine_result.GetListAsync(a => a.bangid == bang_id).Result;
@@ -3268,7 +3274,8 @@ namespace Business.Replenishment
                     }
                 }
             });
-            await _businessDbContext.BulkInsertAsync(weekPlan);
+            await _businessDbContext.AddRangeAsync(weekPlan);
+            await _businessBangDbContext.SaveChangesAsync();
             return "OK";
         }
 
@@ -3577,10 +3584,10 @@ namespace Business.Replenishment
                 moentryList[i].moentry_mono = morder_noList[i].NbrResult;
                 weekplans[i].ProductionOrder = morder_noList[i].NbrResult;
             }
-            await _businessDbContext.BulkInsertAsync(SubWeekPlan);
-            await _businessDbContext.BulkInsertAsync(moList);
-            await _businessDbContext.BulkInsertAsync(moentryList);
-            await _businessDbContext.BulkUpdateAsync(weekplans);
+            await _businessDbContext.AddRangeAsync(SubWeekPlan);
+            await _businessDbContext.AddRangeAsync(moList);
+            await _businessDbContext.AddRangeAsync(moentryList);
+            _businessDbContext.UpdateRange(weekplans);
 
             //批量保存 后期考虑子工单
             List<WorkOrdMaster> workOrdSave = new List<WorkOrdMaster>();
@@ -3594,7 +3601,7 @@ namespace Business.Replenishment
 
             if (workOrdSave.Any())
             {
-                _businessDbContext.BulkInsert(workOrdSave);
+                await _businessDbContext.AddRangeAsync(workOrdSave);
                 //CalcPriority(input.factory_id.ToString());
                 RefreshPriority(null, input.factory_id.ToString());
             }
@@ -3605,7 +3612,7 @@ namespace Business.Replenishment
                 {
                     c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                 });
-                _businessDbContext.BulkInsert(workOrdRoutingSave);
+                await _businessDbContext.AddRangeAsync(workOrdRoutingSave);
             }
             if (workOrdDetails.Any())
             {
@@ -3613,7 +3620,7 @@ namespace Business.Replenishment
                 {
                     c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                 });
-                _businessDbContext.BulkInsert(workOrdDetails);
+                await _businessDbContext.AddRangeAsync(workOrdDetails);
             }
 
             //2024/01/10:卫亮工单需求对齐采购需求,取所有未下达的工单做资源检查(排除年度中间件工单)
@@ -3648,7 +3655,7 @@ namespace Business.Replenishment
             //}
             //await _mysql_bom_child_examine.HardDeleteAsync(a => examine_result.Select(b => b.Id).ToList().Contains(a.examine_id.Value) && a.factory_id == input.factory_id);
             //await _mysql_examine_result.HardDeleteAsync(examine_result);
-
+            await _businessBangDbContext.SaveChangesAsync();
             await PlanOrderResourceCheck(moListCheck.OrderBy(a => a.moentry_sys_stime).ToList(), moEntryListCheck, bang_id, "", false, true);
 
             var examine_resultList = _mysql_examine_result.GetListAsync(a => a.bangid == bang_id).Result;
@@ -3688,7 +3695,8 @@ namespace Business.Replenishment
                 }
             });
 
-            await _businessDbContext.BulkUpdateAsync(weekplanList);
+            _businessDbContext.UpdateRange(weekplanList);
+            await _businessBangDbContext.SaveChangesAsync();
             return "OK";
         }
 
@@ -3869,8 +3877,8 @@ namespace Business.Replenishment
                 });
             }
             _workOrdMaster.Update(workMasters);
-            await _businessDbContext.BulkUpdateAsync(mes_Morders);
-            await _businessDbContext.BulkUpdateAsync(weekPlan);
+            _businessDbContext.UpdateRange(mes_Morders);
+            _businessDbContext.UpdateRange(weekPlan);
             return "OK";
         }
 
@@ -3933,8 +3941,8 @@ namespace Business.Replenishment
             }
 
             _workOrdMaster.Update(workMasters);
-            await _businessDbContext.BulkUpdateAsync(mes_Morders);
-            await _businessDbContext.BulkUpdateAsync(weekPlan);
+            _businessDbContext.UpdateRange(mes_Morders);
+            _businessDbContext.UpdateRange(weekPlan);
 
             return "OK";
         }
@@ -4054,7 +4062,7 @@ namespace Business.Replenishment
             }
             if (updateList.Count > 0)
             {
-                await _businessDbContext.BulkUpdateAsync(updateList);
+                _businessDbContext.UpdateRange(updateList);
                 List<WorkOrdMaster> itemUpdate = new List<WorkOrdMaster>();
                 List<WorkOrdDetail> itemDetailUpdate = new List<WorkOrdDetail>();
                 List<WorkOrdRouting> itemRoutingUpdate = new List<WorkOrdRouting>();
@@ -4103,8 +4111,8 @@ namespace Business.Replenishment
                 _workOrdMaster.Update(itemUpdate);
                 _workOrdDetail.Update(itemDetailUpdate);
                 _workOrdRouting.Update(itemRoutingUpdate);
-                await _businessDbContext.BulkUpdateAsync(itemMesmorderList);
-                await _businessDbContext.BulkUpdateAsync(itemMesmorderEntryList);
+                _businessDbContext.UpdateRange(itemMesmorderList);
+                _businessDbContext.UpdateRange(itemMesmorderEntryList);
             }
 
             //补货
@@ -4136,7 +4144,7 @@ namespace Business.Replenishment
             });
             if (weekPlanAdd.Count > 0)
             {
-                await _businessDbContext.BulkInsertAsync(weekPlanAdd);
+                await _businessDbContext.AddRangeAsync(weekPlanAdd);
                 List<WorkOrdMaster> itemUpdate = new List<WorkOrdMaster>();
                 List<WorkOrdDetail> itemDetailUpdate = new List<WorkOrdDetail>();
                 List<WorkOrdRouting> itemRoutingUpdate = new List<WorkOrdRouting>();
@@ -4185,8 +4193,9 @@ namespace Business.Replenishment
                 _workOrdMaster.Update(itemUpdate);
                 _workOrdDetail.Update(itemDetailUpdate);
                 _workOrdRouting.Update(itemRoutingUpdate);
-                await _businessDbContext.BulkUpdateAsync(itemMesmorderList);
-                await _businessDbContext.BulkUpdateAsync(itemMesmorderEntryList);
+                _businessDbContext.UpdateRange(itemMesmorderList);
+                _businessDbContext.UpdateRange(itemMesmorderEntryList);
+                await _businessBangDbContext.SaveChangesAsync();
             }
 
             //DOP运行资源检查每个原材料SKU的可用库存,当可用库存<=修正后ROP时,自动生成月度采购申请(Purchase request,PR46年月日4位流水号)=EOP;可用库存为没有被其他SO和PO占用的(合格原材料库存+在途库存);
@@ -4365,12 +4374,13 @@ namespace Business.Replenishment
                     }
                 }
             });
-            await _businessDbContext.BulkUpdateAsync(prUpdateList);
+            _businessDbContext.UpdateRange(prUpdateList);
             prList.ForEach(a =>
             {
                 a.GenerateNewId(help.NextId());
             });
-            await _businessDbContext.BulkInsertAsync(prList);
+            await _businessDbContext.AddRangeAsync(prList);
+            await _businessBangDbContext.SaveChangesAsync();
             return "OK";
         }
 
@@ -4771,7 +4781,7 @@ namespace Business.Replenishment
                 }
                 works[i].PriorityNo = str.Substring(1);
             }
-            _businessDbContext.BulkUpdate(works);
+            _businessDbContext.UpdateRange(works);
             return works;
         }
 
@@ -4888,8 +4898,8 @@ namespace Business.Replenishment
                 }
                 Priority = Priority + 1.0m;
             }
-            _businessDbContext.BulkUpdate(works);
-            _businessDbContext.BulkUpdate(weekPlan);
+            _businessDbContext.UpdateRange(works);
+            _businessDbContext.UpdateRange(weekPlan);
         }
 
         /// <summary>
@@ -5092,20 +5102,20 @@ namespace Business.Replenishment
                     //{
                     //    try
                     //    {
-                    //_businessDbContext.BulkUpdate(moList);
-                    //_businessDbContext.BulkUpdate(moentryList);
-                    //_businessDbContext.BulkUpdate(workmasterList);
+                    //_businessDbContext.UpdateRange(moList);
+                    //_businessDbContext.UpdateRange(moentryList);
+                    //_businessDbContext.UpdateRange(workmasterList);
                     //if (weekPlan.Any())
                     //{
-                    //    _businessDbContext.BulkUpdate(weekPlan);
+                    //    _businessDbContext.UpdateRange(weekPlan);
                     //}
                     //if (workRoutings.Any())
                     //{
-                    //    _businessDbContext.BulkUpdate(workRoutings);
+                    //    _businessDbContext.UpdateRange(workRoutings);
                     //}
                     //if (workOrddetails.Any())
                     //{
-                    //    _businessDbContext.BulkUpdate(workOrddetails);
+                    //    _businessDbContext.UpdateRange(workOrddetails);
                     //    if (oldqty != newqty)
                     //    {
                     //        var nbrList = _nbrMaster.Select(x => x.Domain == param.factoryId.ToString() && x.WorkOrd == WorkOrd && x.Type == "SM").ToList();
@@ -5126,9 +5136,9 @@ namespace Business.Replenishment
                     //                    x.QtyOrd = itemnum == null ? x.QtyOrd : (itemnum.QtyRequired > x.QtyRec ? itemnum.QtyRequired : x.QtyOrd);
                     //                    x.CurrQtyOpened = itemnum == null ? x.QtyOrd : (itemnum.QtyRequired > x.QtyRec ? itemnum.QtyRequired : x.QtyOrd);
                     //                });
-                    //                _businessDbContext.BulkUpdate(nbrDtlList);
+                    //                _businessDbContext.UpdateRange(nbrDtlList);
                     //            }
-                    //            _businessDbContext.BulkUpdate(nbrList);
+                    //            _businessDbContext.UpdateRange(nbrList);
                     //        }
                     //    }
                     //}
@@ -5251,7 +5261,7 @@ namespace Business.Replenishment
                 _businessDbContext.BulkDelete(occupy);
                 //if (updatelist.Any())
                 //{
-                //    _businessDbContext.BulkUpdate(updatelist);
+                //    _businessDbContext.UpdateRange(updatelist);
                 //}
                 //if (dellist.Any())
                 //{
@@ -5865,7 +5875,7 @@ namespace Business.Replenishment
                 {
                     try
                     {
-                        _businessDbContext.BulkUpdate(mo_Mes_Morders);
+                        _businessDbContext.UpdateRange(mo_Mes_Morders);
                         //长周期都是成品检查,生成的都是中间件工单,不需要写入;周计划包含中间件工单,需要写入
                         //长周期也需要写入,加字段版本区分
                         if (_CalcBomViewAppService.mordersInsertList.Any())
@@ -5873,7 +5883,7 @@ namespace Business.Replenishment
                             var molist = ObjectMapper.Map<List<mo_mes_morder>, List<mes_morder>>(_CalcBomViewAppService.mordersInsertList);
                             var moentrylist = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(_CalcBomViewAppService.moentriesInsertList);
                             molist.ForEach(a => { a.analogcalcversion = analogCalcVersion; });
-                            _businessDbContext.BulkInsert(molist);
+                            await _businessDbContext.AddRangeAsync(molist);
 
                             List<WorkOrdMaster> workOrdSave = new List<WorkOrdMaster>();
                             List<WorkOrdRouting> workOrdRoutingSave = new List<WorkOrdRouting>();
@@ -5886,7 +5896,7 @@ namespace Business.Replenishment
                                 if (workOrdSave.Any())
                                 {
                                     workOrdSave.ForEach(a => { a.AnalogCalcVersion = analogCalcVersion; });
-                                    _businessDbContext.BulkInsert(workOrdSave);
+                                    await _businessDbContext.AddRangeAsync(workOrdSave);
                                     //CalcPriority(input.factoryId.ToString());
                                     RefreshPriority(null, input.factoryId.ToString());
                                 }
@@ -5897,7 +5907,7 @@ namespace Business.Replenishment
                                     {
                                         c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                                     });
-                                    _businessDbContext.BulkInsert(workOrdRoutingSave);
+                                    await _businessDbContext.AddRangeAsync(workOrdRoutingSave);
                                 }
                                 if (workOrdDetails.Any())
                                 {
@@ -5905,31 +5915,31 @@ namespace Business.Replenishment
                                     {
                                         c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                                     });
-                                    _businessDbContext.BulkInsert(workOrdDetails);
+                                    await _businessDbContext.AddRangeAsync(workOrdDetails);
                                 }
                             }
                         }
                         if (_CalcBomViewAppService.moentriesInsertList.Any() && string.IsNullOrEmpty(analogCalcVersion))
                         {
                             var moentrylist = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(_CalcBomViewAppService.moentriesInsertList);
-                            _businessDbContext.BulkInsert(moentrylist);
+                            await _businessDbContext.AddRangeAsync(moentrylist);
                         }
                         if (pr_mainlist.Any())
                         {
-                            _businessDbContext.BulkInsert(pr_mainlist);
+                            await _businessDbContext.AddRangeAsync(pr_mainlist);
                         }
                         if (_CalcBomViewAppService.newStockOccList.Any())
                         {
                             var stockoccupylist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(_CalcBomViewAppService.newStockOccList);
                             stockoccupylist.ForEach(s => { s.GenerateNewId(help.NextId()); s.create_time = DateTime.Now; s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
-                            _businessDbContext.BulkInsert(stockoccupylist);
+                            await _businessDbContext.AddRangeAsync(stockoccupylist);
                         }
                         if (_CalcBomViewAppService.srm_Po_OccupiesInsert.Any())
                         {
                             _CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.company_id = param.company_id; s.factory_id = param.factoryId; });
                             var srmpooccupyInsert = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(_CalcBomViewAppService.srm_Po_OccupiesInsert);
                             srmpooccupyInsert.ForEach(x => { x.GenerateNewId(help.NextId()); });
-                            _businessDbContext.BulkInsert(srmpooccupyInsert);
+                            await _businessDbContext.AddRangeAsync(srmpooccupyInsert);
                         }
                         if (delWorkOrddetails.Any())
                         {
@@ -5937,17 +5947,17 @@ namespace Business.Replenishment
                         }
                         if (mainWorkOrdDetails.Any())
                         {
-                            _businessDbContext.BulkInsert(mainWorkOrdDetails);
+                            await _businessDbContext.AddRangeAsync(mainWorkOrdDetails);
                         }
                         if (IsWeekPlan)
                         {
                             if (addPrList.Any())
                             {
-                                _businessDbContext.BulkInsert(addPrList);
+                                await _businessDbContext.AddRangeAsync(addPrList);
                             }
                             if (updatPrList.Any())
                             {
-                                _businessDbContext.BulkUpdate(updatPrList);
+                                _businessDbContext.UpdateRange(updatPrList);
                             }
                             if (deletePrList.Any())
                             {
@@ -6828,8 +6838,9 @@ namespace Business.Replenishment
                 }
                 if (addList.Any())
                 {
-                    _businessDbContext.BulkInsert(addList);
+                    _businessDbContext.AddRange(addList);
                 }
+                _businessDbContext.SaveChanges();
             }
             catch (Exception e)
             {
@@ -7479,9 +7490,10 @@ namespace Business.Replenishment
             }
             if (needAddList.Count > 0)
             {
-                _businessDbContext.BulkInsert(needAddList);
+                await _businessDbContext.AddRangeAsync(needAddList);
             }
-            _businessDbContext.BulkUpdate(needupdList);
+            _businessDbContext.UpdateRange(needupdList);
+            await _businessBangDbContext.SaveChangesAsync();
         }
 
         public async Task<string> DeleteWeekPlan(long weekplanid, string productorder, long factory_id)
@@ -8020,7 +8032,7 @@ namespace Business.Replenishment
                     //插入Pr
                     if (prInserts.Any())
                     {
-                        _businessDbContext.BulkInsert(prInserts);
+                        await _businessDbContext.AddRangeAsync(prInserts);
                     }
                     //插入异常记录
                     if (exceptions.Any())

+ 109 - 92
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1,4 +1,4 @@
-using Amazon.Auth.AccessControlPolicy;
+using Amazon.Auth.AccessControlPolicy;
 using Amazon.Runtime.Internal;
 using Amazon.Runtime.Internal.Util;
 using Business.Core.Enum;
@@ -968,12 +968,12 @@ namespace Business.ResourceExamineManagement
             {
                 try
                 {
-                    await _businessDbContext.BulkUpdateAsync(sentrys);
+                    _businessDbContext.UpdateRange(sentrys);
                     /*//批量保存 后期考虑子工单
                     if (moderlist.Any())
                     {
                         await _mes_morder.InsertMany(_CalcBomViewAppService.mordersInsertList);
-                        _businessDbContext.BulkInsert(moderlist);
+                        await _businessDbContext.AddRangeAsync(moderlist);
                         if (workOrds.Any())
                         {
                             _workOrdMaster.Insert(workOrds);
@@ -1000,7 +1000,7 @@ namespace Business.ResourceExamineManagement
                         _CalcBomViewAppService.mooccupyAllInsertList.ForEach(s => { s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
                         await MongoHelper<mo_mes_mooccupy>.InsertManyAsync(_CalcBomViewAppService.mooccupyAllInsertList);
                         /*var moOccupy = ObjectMapper.Map<List<mo_mes_mooccupy>, List<mes_mooccupy>>(_CalcBomViewAppService.mooccupyAllInsertList);
-                        _businessDbContext.BulkInsert(moOccupy);*/
+                        await _businessDbContext.AddRangeAsync(moOccupy);*/
                         rtn.mooccupyAllList = _CalcBomViewAppService.mooccupyAllInsertList;
                     }
                     if (_CalcBomViewAppService.moentriesInsertList.Any())
@@ -1008,14 +1008,14 @@ namespace Business.ResourceExamineManagement
                         _CalcBomViewAppService.moentriesInsertList.ForEach(s => { s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
                         await MongoHelper<mo_mes_moentry>.InsertManyAsync(_CalcBomViewAppService.moentriesInsertList);
                         /*var mesmoentrys = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(_CalcBomViewAppService.moentriesInsertList);
-                        _businessDbContext.BulkInsert(mesmoentrys);*/
+                        await _businessDbContext.AddRangeAsync(mesmoentrys);*/
                     }
                     if (_CalcBomViewAppService.orderList.Any())
                     {
                         _CalcBomViewAppService.orderList.ForEach(s => { s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
                         await MongoHelper<mo_mes_oorder>.InsertManyAsync(_CalcBomViewAppService.orderList);
                         /*var ooders = ObjectMapper.Map<List<mo_mes_oorder>, List<mes_oorder>>(_CalcBomViewAppService.orderList);
-                        _businessDbContext.BulkInsert(ooders);*/
+                        await _businessDbContext.AddRangeAsync(ooders);*/
                         rtn.order_list = _CalcBomViewAppService.orderList;
                     }
                     if (_CalcBomViewAppService.newStockOccList.Any())
@@ -1028,7 +1028,7 @@ namespace Business.ResourceExamineManagement
                         _CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.GenerateNewId(help.NextId()); s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
                         await MongoHelper<mo_srm_po_occupy>.InsertManyAsync(_CalcBomViewAppService.srm_Po_OccupiesInsert);
                         /*var poOccupies = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(_CalcBomViewAppService.srm_Po_OccupiesInsert);
-                        _businessDbContext.BulkInsert(poOccupies);*/
+                        await _businessDbContext.AddRangeAsync(poOccupies);*/
                     }
                     await unitOfWork.CompleteAsync();
                 }
@@ -1275,9 +1275,9 @@ namespace Business.ResourceExamineManagement
             {
                 try
                 {
-                    _businessDbContext.BulkUpdate(prlist);
-                    _businessDbContext.BulkInsert(new List<srm_pr_main> { srm_Pr });
-                    _businessDbContext.BulkUpdate(occupylist);
+                    _businessDbContext.UpdateRange(prlist);
+                    await _businessDbContext.AddRangeAsync(new List<srm_pr_main> { srm_Pr });
+                    _businessDbContext.UpdateRange(occupylist);
                     await unitOfWork.CompleteAsync();
                 }
                 catch (Exception e)
@@ -1306,7 +1306,7 @@ namespace Business.ResourceExamineManagement
                         x.pr_ssend_date = tomorrow;
                         x.pr_sarrive_date = x.pr_sarrive_date.GetValueOrDefault().AddDays(daysDifference);
                     });
-                    _businessDbContext.BulkUpdate(formerlylist);
+                    _businessDbContext.UpdateRange(formerlylist);
                 }
 
                 DateTime toTime = DateTime.Now.Date;
@@ -1465,15 +1465,15 @@ namespace Business.ResourceExamineManagement
 
                         if (insetAllList.Any())
                         {
-                            _businessDbContext.BulkInsert(insetAllList);
+                            await _businessDbContext.AddRangeAsync(insetAllList);
                         }
                         if (updateAllList.Any())
                         {
-                            _businessDbContext.BulkUpdate(updateAllList);
+                            _businessDbContext.UpdateRange(updateAllList);
                         }
                         if (occupylist.Any())
                         {
-                            _businessDbContext.BulkUpdate(occupylist);
+                            _businessDbContext.UpdateRange(occupylist);
                         }
                         await unitOfWork.CompleteAsync();
                     }
@@ -1541,7 +1541,7 @@ namespace Business.ResourceExamineManagement
                         {
                             _businessBangDbContext.Database.ExecuteSqlRaw(seqSql);
                         }
-                        await _businessDbContext.BulkUpdateAsync(prapplyList);
+                        _businessDbContext.UpdateRange(prapplyList);
                         await unitOfWork.CompleteAsync();
                     }
                     catch (Exception e)
@@ -1670,16 +1670,16 @@ namespace Business.ResourceExamineManagement
                     {
                         if (poaction.poMain.Any())
                         {
-                            _businessDbContext.BulkUpdate(alllist);
-                            _businessDbContext.BulkInsert(poaction.poMain);
+                            _businessDbContext.UpdateRange(alllist);
+                            await _businessDbContext.AddRangeAsync(poaction.poMain);
                         }
                         if (poaction.polist.Any())
                         {
-                            _businessDbContext.BulkInsert(poaction.polist);
+                            await _businessDbContext.AddRangeAsync(poaction.polist);
                         }
                         if (poaction.poOccupiesList.Any())
                         {
-                            _businessDbContext.BulkUpdate(poaction.poOccupiesList);
+                            _businessDbContext.UpdateRange(poaction.poOccupiesList);
                         }
 
                         if (poaction.poMasterList.Any())
@@ -1793,16 +1793,16 @@ namespace Business.ResourceExamineManagement
                 {
                     if (poaction.poMain.Any())
                     {
-                        _businessDbContext.BulkUpdate(prlist);
-                        _businessDbContext.BulkInsert(poaction.poMain);
+                        _businessDbContext.UpdateRange(prlist);
+                        await _businessDbContext.AddRangeAsync(poaction.poMain);
                     }
                     if (poaction.polist.Any())
                     {
-                        _businessDbContext.BulkInsert(poaction.polist);
+                        await _businessDbContext.AddRangeAsync(poaction.polist);
                     }
                     if (poaction.poOccupiesList.Any())
                     {
-                        _businessDbContext.BulkUpdate(poaction.poOccupiesList);
+                        _businessDbContext.UpdateRange(poaction.poOccupiesList);
                     }
 
                     if (poaction.poMasterList.Any())
@@ -2021,11 +2021,11 @@ namespace Business.ResourceExamineManagement
             {
                 try
                 {
-                    await _businessDbContext.BulkUpdateAsync(sentrys);
+                    _businessDbContext.UpdateRange(sentrys);
                     //批量保存 后期考虑子工单
                     if (moderlist.Any())
                     {
-                        _businessDbContext.BulkInsert(moderlist);
+                        await _businessDbContext.AddRangeAsync(moderlist);
                         if (workOrds.Any())
                         {
                             _workOrdMaster.Insert(workOrds);
@@ -2050,38 +2050,38 @@ namespace Business.ResourceExamineManagement
                         if (WriteMoentry.Any())
                         {
                             var mesmoentrys = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(WriteMoentry);
-                            _businessDbContext.BulkInsert(mesmoentrys);
+                            await _businessDbContext.AddRangeAsync(mesmoentrys);
                         }
                     }
                     if (mooccupyList.Any())
                     {
                         mooccupyList.ForEach(s => { s.create_time = DateTime.Now; });
                         var moOccupy = ObjectMapper.Map<List<mo_mes_mooccupy>, List<mes_mooccupy>>(mooccupyList);
-                        _businessDbContext.BulkInsert(moOccupy);
+                        await _businessDbContext.AddRangeAsync(moOccupy);
                     }
                     if (oorderList.Any())
                     {
                         oorderList.ForEach(s => { s.create_time = DateTime.Now; });
                         var ooders = ObjectMapper.Map<List<mo_mes_oorder>, List<mes_oorder>>(oorderList);
-                        _businessDbContext.BulkInsert(ooders);
+                        await _businessDbContext.AddRangeAsync(ooders);
                     }
 
                     if (item_stockoccupy.Any())
                     {
                         var sklist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(item_stockoccupy);
                         sklist.ForEach(s => { s.create_time = DateTime.Now; s.GenerateNewId(help.NextId()); });
-                        _businessDbContext.BulkInsert(sklist);
+                        await _businessDbContext.AddRangeAsync(sklist);
                     }
                     if (po_occupy.Any())
                     {
                         po_occupy.ForEach(s => { s.mysql_id = help.NextId(); s.create_time = DateTime.Now; });
                         var poOccupies = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(po_occupy);
-                        _businessDbContext.BulkInsert(poOccupies);
+                        await _businessDbContext.AddRangeAsync(poOccupies);
                     }
                     if (prmainlist.Any())
                     {
                         var pr_mainlist = ObjectMapper.Map<List<mo_srm_pr_main>, List<srm_pr_main>>(prmainlist);
-                        _businessDbContext.BulkInsert(pr_mainlist);
+                        await _businessDbContext.AddRangeAsync(pr_mainlist);
                     }
                     await unitOfWork.CompleteAsync();
                 }
@@ -3081,7 +3081,7 @@ namespace Business.ResourceExamineManagement
                 _businessDbContext.BulkDelete(occupy);
                 /*if (updatelist.Any())
                 {
-                    _businessDbContext.BulkUpdate(updatelist);
+                    _businessDbContext.UpdateRange(updatelist);
                 }
                 if (dellist.Any())
                 {
@@ -3173,7 +3173,7 @@ namespace Business.ResourceExamineManagement
                 {
                     try
                     {
-                        await _businessDbContext.BulkUpdateAsync(morders);
+                        _businessDbContext.UpdateRange(morders);
                     }
                     catch (Exception e)
                     {
@@ -3484,7 +3484,7 @@ namespace Business.ResourceExamineManagement
                         //mo.morder_state = MorderEnum.Xd_state;
                     }
                 }
-                await _businessDbContext.BulkUpdateAsync(morders);
+                _businessDbContext.UpdateRange(morders);
                 //按卫亮要求。屏蔽自动下达
                 /*if (workords.Length > 0)
                 {
@@ -3544,7 +3544,7 @@ namespace Business.ResourceExamineManagement
                             //mo.morder_state = MorderEnum.Xd_state;
                         }
                     }
-                    await _businessDbContext.BulkUpdateAsync(morders);
+                    _businessDbContext.UpdateRange(morders);
                     //按卫亮要求。屏蔽自动下达
                     *//*if (workords.Length > 0)
                     {
@@ -3660,7 +3660,7 @@ namespace Business.ResourceExamineManagement
                         //mo.morder_state = MorderEnum.Xd_state;
                     }
                 }
-                await _businessDbContext.BulkUpdateAsync(morders);
+                _businessDbContext.UpdateRange(morders);
                 //按卫亮要求。屏蔽自动下达
                 /*if (workords.Length > 0)
                 {
@@ -3716,7 +3716,7 @@ namespace Business.ResourceExamineManagement
                             //mo.morder_state = MorderEnum.Xd_state;
                         }
                     }
-                    await _businessDbContext.BulkUpdateAsync(morders);
+                    _businessDbContext.UpdateRange(morders);
                     //按卫亮要求。屏蔽自动下达
                     *//*if (workords.Length > 0)
                     {
@@ -3813,7 +3813,7 @@ namespace Business.ResourceExamineManagement
                         morders[0].morder_state = MorderEnum.Xd_state;
                         morders[0].MaterialSituation = morders[0].MaterialSituation == MorderEnum.NoCarehouseComplete ? MorderEnum.Begin : morders[0].MaterialSituation; //MorderEnum.Part : morders[0].MaterialSituation;部分备料改为未备料
                         //await _mysql_mes_morder.UpdateManyAsync(morders);
-                        await _businessDbContext.BulkUpdateAsync(morders);
+                        _businessDbContext.UpdateRange(morders);
                         //复制子工序
                         var insertList = GetCopyOP(morders[0].morder_no, domain);
                         if (insertList.Any())
@@ -3841,7 +3841,7 @@ 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 _businessDbContext.BulkUpdateAsync(morders);
+                            _businessDbContext.UpdateRange(morders);
                             //复制子工序
                             var insertList = GetCopyOP(morders[0].morder_no, domain);
                             if (insertList.Any())
@@ -4306,7 +4306,7 @@ namespace Business.ResourceExamineManagement
                         item.need_number = curInfo.need_number;
                     }
                 }
-                _businessDbContext.BulkUpdate(workOrds);
+                _businessDbContext.UpdateRange(workOrds);
             }
             List<WorkOrdDetail> mainWorkOrdDetails = new List<WorkOrdDetail>();
             List<WorkOrdRouting> mainWorkOrdRoutings = new List<WorkOrdRouting>();
@@ -4419,7 +4419,8 @@ namespace Business.ResourceExamineManagement
                     }
                     if (mainWorkOrdDetails.Any())
                     {
-                        _businessDbContext.BulkInsert(mainWorkOrdDetails);
+                        await _businessDbContext.AddRangeAsync(mainWorkOrdDetails);
+                        await _businessBangDbContext.SaveChangesAsync();
                     }
                     if (workOrdRoutings.Any())
                     {
@@ -4427,7 +4428,8 @@ namespace Business.ResourceExamineManagement
                     }
                     if (mainWorkOrdRoutings.Any())
                     {
-                        _businessDbContext.BulkInsert(mainWorkOrdRoutings);
+                        await _businessDbContext.AddRangeAsync(mainWorkOrdRoutings);
+                        await _businessBangDbContext.SaveChangesAsync();
                     }
                 }
             }
@@ -4479,7 +4481,7 @@ namespace Business.ResourceExamineManagement
                 /*if (_CalcBomViewAppService.mordersInsertList.Any())
                 {
                     var molist = ObjectMapper.Map<List<mo_mes_morder>, List<mes_morder>>(_CalcBomViewAppService.mordersInsertList);
-                    _businessDbContext.BulkInsert(molist);
+                    await _businessDbContext.AddRangeAsync(molist);
 
                     List<WorkOrdMaster> workOrdSave = new List<WorkOrdMaster>();
                     List<WorkOrdRouting> workOrdRoutingSave = new List<WorkOrdRouting>();
@@ -4491,7 +4493,7 @@ namespace Business.ResourceExamineManagement
                         CreateWorkOrdDates(molist, _CalcBomViewAppService.moentriesInsertList, routingOps, workOrdSave, workOrdRoutingSave, workOrdDetails, new List<b_examine_result>(), new List<b_bom_child_examine>());
                         if (workOrdSave.Any())
                         {
-                            _businessDbContext.BulkInsert(workOrdSave);
+                            await _businessDbContext.AddRangeAsync(workOrdSave);
                         }
                         var DBworkOrdList = _workOrdMaster.Select(a => workOrdSave.Count > 0 && a.Domain == workOrdSave[0].Domain && workOrdSave.Select(c => c.WorkOrd).Contains(a.WorkOrd));
                         if (workOrdRoutingSave.Any())
@@ -4501,7 +4503,7 @@ namespace Business.ResourceExamineManagement
                             {
                                 c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
                             });
-                            _businessDbContext.BulkInsert(workOrdRoutingSave);
+                            await _businessDbContext.AddRangeAsync(workOrdRoutingSave);
                         }
                         priorityMorderList.AddRange(molist);
                     }
@@ -4522,7 +4524,7 @@ namespace Business.ResourceExamineManagement
                 {
                     try
                     {
-                        _businessDbContext.BulkUpdate(mo_Mes_Morders);
+                        _businessDbContext.UpdateRange(mo_Mes_Morders);
                         /*if (workOrdMasters.Any())
                         {
                             _workOrdMaster.Update(workOrdMasters);
@@ -4530,20 +4532,20 @@ namespace Business.ResourceExamineManagement
                         if (prmainlist.Any())
                         {
                             var pr_mainlist = ObjectMapper.Map<List<mo_srm_pr_main>, List<srm_pr_main>>(prmainlist);
-                            _businessDbContext.BulkInsert(pr_mainlist);
+                            await _businessDbContext.AddRangeAsync(pr_mainlist);
                         }
                         if (_CalcBomViewAppService.newStockOccList.Any())
                         {
                             var stockoccupylist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(_CalcBomViewAppService.newStockOccList);
                             stockoccupylist.ForEach(s => { s.GenerateNewId(help.NextId()); s.create_time = DateTime.Now; s.tenant_id = param.company_id.GetValueOrDefault(); s.company_id = param.company_id; s.factory_id = param.factoryId; });
-                            _businessDbContext.BulkInsert(stockoccupylist);
+                            await _businessDbContext.AddRangeAsync(stockoccupylist);
                         }
                         if (_CalcBomViewAppService.srm_Po_OccupiesInsert.Any())
                         {
                             _CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.company_id = param.company_id; s.factory_id = param.factoryId; });
                             var srmpooccupyInsert = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(_CalcBomViewAppService.srm_Po_OccupiesInsert);
                             srmpooccupyInsert.ForEach(x => { x.GenerateNewId(help.NextId()); });
-                            _businessDbContext.BulkInsert(srmpooccupyInsert);
+                            await _businessDbContext.AddRangeAsync(srmpooccupyInsert);
                         }
 
                         await unitOfWork.CompleteAsync();
@@ -4780,7 +4782,7 @@ namespace Business.ResourceExamineManagement
                     item.need_number = curInfo.need_number;
                 }
             }
-            _businessDbContext.BulkUpdate(workOrds);
+            _businessDbContext.UpdateRange(workOrds);
             //检查结果写入数据库
             await ExamineResultInsertDBAsync(examines);
             //清空快照数据
@@ -5041,22 +5043,30 @@ namespace Business.ResourceExamineManagement
             supplierList = GetSupplier(itemIds, param.company_id, param.factoryId);//供应商列表
 
             //交期回复
-            var sql = $"select b.id as polist_id,b.po_id,a.id,a.wlbm,a.cgdd,a.ddhh,iif(a.jhdsl>c.QtyOrded,c.QtyOrded,a.jhdsl) as jhdsl,TRY_CONVERT(DATE,jqhf, 23) as jqhf,a.flag,a.gysdm,b.pr_purchase_id " +
-                $"from (select wlbm,cgdd,ddhh,flag,gysdm,sum(cast(isnull(jhdsl,0) as decimal(18,8))) as jhdsl,max(TRY_CONVERT(DATE,jqhf, 23)) as jqhf,max(id) as id from scm_jhjh_jq where flag =0 or (flag=2 and DATEDIFF(DAY, isnull(TRY_CONVERT(DATE,jqhf, 23),GETDATE()), GETDATE())>=1 )  group by wlbm,cgdd,ddhh,flag,gysdm) a " +
-                $"inner join srm_po_list b on a.cgdd=b.po_billno and a.ddhh=b.polist_row inner join PurOrdDetail c on b.po_billno=c.PurOrd and b.polist_row=c.Line where c.status!='C' and c.QtyOrded>c.RctQty";
+            var sql = $"SELECT b.id AS polist_id,b.po_id,a.id,a.wlbm,a.cgdd,a.ddhh,IF(a.jhdsl > c.QtyOrded, c.QtyOrded, a.jhdsl) AS jhdsl, DATE(a.jqhf) AS jqhf,a.flag,a.gysdm,b.pr_purchase_id " +
+                $"FROM (SELECT wlbm,cgdd,ddhh,flag,gysdm,SUM(CAST(IFNULL(jhdsl, 0) AS DECIMAL(18,8))) AS jhdsl,MAX(DATE(jqhf)) AS jqhf, MAX(id) AS id  " +
+                $"FROM scm_jhjh_jq WHERE flag = 0  OR (flag = 2 AND DATEDIFF(CURDATE(), IFNULL(DATE(jqhf), CURDATE())) >= 1) GROUP BY wlbm, cgdd, ddhh, flag, gysdm) a " +
+                $"INNER JOIN srm_po_list b ON a.cgdd = b.po_billno AND a.ddhh = b.polist_row " +
+                $"INNER JOIN PurOrdDetail c ON b.po_billno = c.PurOrd AND b.polist_row = c.Line " +
+                $"WHERE c.status != 'C' AND c.QtyOrded > c.RctQty ";
             _CalcBomViewAppService.scm_Jhjh_Jqs = _businessDbContext.scm_jhjh_jqDto.FromSqlRaw(sql).ToList();
             //送货单子表所有未完成的数据,并且排除检验中数量
-            sql = $"select  b.id,[po_billline],[jhdbh],isnull([shzt],'待收') shzt,[jhdhh] ,b.sh_material_code,b.sh_material_name,b.po_bill,b.sh_delivery_quantity-isnull(m.qty,0) as sh_delivery_quantity,a.sh_purchase_num,c.id as sh_purchase_id,CONVERT(DATE,a.jhshrq,23) jhshrq,CONVERT(DATE,a.yjdhrq,23) yjdhrq,d.id as polist_id " +
-            $"from scm_shd a INNER join scm_shdzb b on a.id=b.glid INNER join srm_po_list d on b.sh_material_code=d.ItemNum and b.po_bill=d.po_billno and b.po_billline=d.polist_row and d.state=1 left join srm_po_main e on d.po_id=e.id " +
-            $"left join srm_supplier c on a.sh_purchase_num=c.supplier_no left join (select PurOrd,PurLine,ShipperNbr,ShipperLine,sum(qty) as qty from MissedPrint where Status = 'I' GROUP BY PurOrd,PurLine,ShipperNbr,ShipperLine) m on b.po_bill=m.PurOrd AND b.po_billline=m.PurLine and m.ShipperNbr=a.shddh and m.ShipperLine=b.hh " +
-            $"where jhdbh!='' and e.state<>'3' and isnull([shzt],'待收')!='完成' and (isnull(m.qty,0)=0 or isnull(m.qty,0)<b.sh_delivery_quantity) ";
+            sql = $"SELECT b.id,po_billline,jhdbh,IFNULL(a.shzt, '待收') AS shzt,jhdhh, b.sh_material_code, b.sh_material_name, b.po_bill, b.sh_delivery_quantity - IFNULL(m.qty, 0) AS sh_delivery_quantity,a.sh_purchase_num,c.id AS sh_purchase_id,DATE(a.jhshrq) AS jhshrq,DATE(a.yjdhrq) AS yjdhrq, d.id AS polist_id " +
+                $"FROM scm_shd a INNER JOIN scm_shdzb b ON a.id = b.glid " +
+                $"INNER JOIN srm_po_list d ON b.sh_material_code = d.ItemNum AND b.po_bill = d.po_billno AND b.po_billline = d.polist_row AND d.state = 1 " +
+                $"LEFT JOIN srm_po_main e ON d.po_id = e.id " +
+                $"LEFT JOIN srm_supplier c ON a.sh_purchase_num = c.supplier_no " +
+                $"LEFT JOIN (SELECT  PurOrd, PurLine, ShipperNbr,ShipperLine, SUM(qty) AS qty FROM MissedPrint  WHERE Status = 'I' GROUP BY PurOrd, PurLine, ShipperNbr, ShipperLine) m " +
+                $"ON b.po_bill = m.PurOrd AND b.po_billline = m.PurLine AND m.ShipperNbr = a.shddh  AND m.ShipperLine = b.hh WHERE jhdbh != '' AND e.state <> '3' AND IFNULL(a.shzt, '待收') != '完成' AND (IFNULL(m.qty, 0) = 0 OR IFNULL(m.qty, 0) < b.sh_delivery_quantity)";
             _CalcBomViewAppService.scm_Shdzbs = _businessDbContext.scm_shdzbDto.FromSqlRaw(sql).ToList();
 
             //送货单子表所有待检验数据
-            sql = $"select  b.id,[po_billline],[jhdbh],isnull([shzt],'待收') shzt,[jhdhh] ,b.sh_material_code,b.sh_material_name,b.po_bill,isnull(m.qty,0) as sh_delivery_quantity,a.sh_purchase_num,c.id as sh_purchase_id,CONVERT(DATE,a.jhshrq,23) jhshrq,CONVERT(DATE,a.yjdhrq,23) yjdhrq,d.id as polist_id " +
-                $"from scm_shd a INNER join scm_shdzb b on a.id=b.glid INNER join srm_po_list d on b.sh_material_code=d.ItemNum and b.po_bill=d.po_billno and b.po_billline=d.polist_row and d.state=1 left join srm_po_main e on d.po_id=e.id left join srm_supplier c on a.sh_purchase_num=c.supplier_no " +
-                $"left join (select PurOrd,PurLine,ShipperNbr,ShipperLine,sum(qty) as qty from MissedPrint where Status = 'I' GROUP BY PurOrd,PurLine,ShipperNbr,ShipperLine) m on b.po_bill=m.PurOrd AND b.po_billline=m.PurLine and m.ShipperNbr=a.shddh and m.ShipperLine=b.hh " +
-                $"where jhdbh!='' and isnull(m.qty,0)>=b.sh_delivery_quantity and isnull(m.qty,0)<>0 and e.state<>'3'";
+            sql = $"SELECT b.id,po_billline,jhdbh, IFNULL(a.shzt, '待收') AS shzt,jhdhh, b.sh_material_code, b.sh_material_name, b.po_bill,IFNULL(m.qty, 0) AS sh_delivery_quantity, a.sh_purchase_num,c.id AS sh_purchase_id, DATE(a.jhshrq) AS jhshrq, DATE(a.yjdhrq) AS yjdhrq,d.id AS polist_id FROM scm_shd a INNER JOIN scm_shdzb b ON a.id = b.glid " +
+                $"INNER JOIN srm_po_list d ON b.sh_material_code = d.ItemNum AND b.po_bill = d.po_billno AND b.po_billline = d.polist_row AND d.state = 1 " +
+                $"LEFT JOIN srm_po_main e ON d.po_id = e.id " +
+                $"LEFT JOIN srm_supplier c ON a.sh_purchase_num = c.supplier_no " +
+                $"LEFT JOIN (SELECT PurOrd, PurLine, ShipperNbr, ShipperLine, SUM(qty) AS qty  FROM MissedPrint WHERE Status = 'I' GROUP BY PurOrd, PurLine, ShipperNbr, ShipperLine) m ON b.po_bill = m.PurOrd  AND b.po_billline = m.PurLine  AND m.ShipperNbr = a.shddh  AND m.ShipperLine = b.hh " +
+                $"WHERE jhdbh != '' AND IFNULL(m.qty, 0) >= b.sh_delivery_quantity AND IFNULL(m.qty, 0) <> 0 AND e.state <> '3'";
             _CalcBomViewAppService.scm_ShdzbJYs = _businessDbContext.scm_shdzbDto.FromSqlRaw(sql).ToList();
 
             
@@ -5193,8 +5203,9 @@ namespace Business.ResourceExamineManagement
                 }
                 if (addList.Any())
                 {
-                    _businessDbContext.BulkInsert(addList);
+                    _businessDbContext.AddRange(addList);
                 }
+                _businessDbContext.SaveChanges();
             }
             catch (Exception e)
             {
@@ -5528,9 +5539,13 @@ namespace Business.ResourceExamineManagement
             }
             if (needAddList.Count > 0)
             {
-                _businessDbContext.BulkInsert(needAddList);
+                await _businessDbContext.AddRangeAsync(needAddList);
+            }
+            if (needupdList.Count > 0)
+            {
+                _businessDbContext.UpdateRange(needupdList);
             }
-            _businessDbContext.BulkUpdate(needupdList);
+            await _businessDbContext.SaveChangesAsync();
         }
 
         /// <summary>
@@ -5714,7 +5729,7 @@ namespace Business.ResourceExamineManagement
                         }
                         if (insertOccuyy.Any())
                         {
-                            _businessDbContext.BulkInsert(insertOccuyy);
+                            await _businessDbContext.AddRangeAsync(insertOccuyy);
                         }
                         //快开平台用自增列RecId关联,所以需要插入后再查给明细表赋相应的值
                         List<string> nbrs = nbrMasterList.Select(a => a.Nbr).ToList();
@@ -5729,11 +5744,11 @@ namespace Business.ResourceExamineManagement
                             c.ERPfld2 = c.Line.ToString();
                         });
                         _nbrDetail.Insert(nbrDetailList);
-                        await _businessDbContext.BulkUpdateAsync(weekplan);
+                        _businessDbContext.UpdateRange(weekplan);
 
                         if (morders != null)
                         {
-                            await _businessDbContext.BulkUpdateAsync(morders);
+                            _businessDbContext.UpdateRange(morders);
                         }
                         await unitOfWork.CompleteAsync();
                     }
@@ -6157,14 +6172,14 @@ namespace Business.ResourceExamineManagement
                 {
                     try
                     {
-                        _businessDbContext.BulkInsert(new List<ic_substitute> { stt });
+                        await _businessDbContext.AddRangeAsync(new List<ic_substitute> { stt });
                         if (glist.Any())
                         {
-                            _businessDbContext.BulkInsert(glist);
+                            await _businessDbContext.AddRangeAsync(glist);
                         }
                         if (dlist.Any())
                         {
-                            _businessDbContext.BulkInsert(dlist);
+                            await _businessDbContext.AddRangeAsync(dlist);
                         }
                         await unitOfWork.CompleteAsync();
                     }
@@ -6213,7 +6228,7 @@ namespace Business.ResourceExamineManagement
                     {
                         try
                         {
-                            _businessDbContext.BulkUpdate(new List<ic_substitute> { stt });
+                            _businessDbContext.UpdateRange(new List<ic_substitute> { stt });
                             if (delgList.Any())
                             {
                                 await _mysql_ic_substitute_group.HardDeleteAsync(delgList);
@@ -6224,11 +6239,11 @@ namespace Business.ResourceExamineManagement
                             }
                             if (glist.Any())
                             {
-                                _businessDbContext.BulkInsert(glist);
+                                await _businessDbContext.AddRangeAsync(glist);
                             }
                             if (dlist.Any())
                             {
-                                _businessDbContext.BulkInsert(dlist);
+                                await _businessDbContext.AddRangeAsync(dlist);
                             }
                             await unitOfWork.CompleteAsync();
                         }
@@ -6533,7 +6548,7 @@ namespace Business.ResourceExamineManagement
                         }
                     }
                 }
-                //await _businessDbContext.BulkUpdateAsync(list);
+                //_businessDbContext.UpdateRange(list);
                 _businessDbContext.ic_bom_child.UpdateRange(list);
             }
             return "ok";
@@ -6881,9 +6896,9 @@ namespace Business.ResourceExamineManagement
 
                 if (InsertList.Any())
                 {
-                    _businessDbContext.BulkInsert(moIstList);
-                    _businessDbContext.BulkInsert(meIstList);
-                    _businessDbContext.BulkUpdate(UpdateList);
+                    await _businessDbContext.AddRangeAsync(moIstList);
+                    await _businessDbContext.AddRangeAsync(meIstList);
+                    _businessDbContext.UpdateRange(UpdateList);
                     _workOrdMaster.Insert(InsertList);
                     var DBworkOrdList = _workOrdMaster.Select(a => a.Domain == workOrds[0].Domain && InsertList.Select(c => c.WorkOrd).Contains(a.WorkOrd));
                     if (routingInsList.Any())
@@ -6897,17 +6912,18 @@ namespace Business.ResourceExamineManagement
                 }
                 if (mooccupuUpdList.Any())
                 {
-                    _businessDbContext.BulkUpdate(mooccupuUpdList);
+                    _businessDbContext.UpdateRange(mooccupuUpdList);
                 }
                 if (stockUpdList.Any())
                 {
-                    _businessDbContext.BulkUpdate(stockUpdList);
+                    _businessDbContext.UpdateRange(stockUpdList);
                 }
                 if (pooccuypUpdList.Any())
                 {
-                    _businessDbContext.BulkUpdate(pooccuypUpdList);
+                    _businessDbContext.UpdateRange(pooccuypUpdList);
                 }
                 MRPmorder.AddRange(moIstList);
+                _businessBangDbContext.SaveChanges();
                 if (MRPmorder.Any())
                 {
                     var rtn = await OrderKittingCheck(MRPmorder, true);
@@ -7100,15 +7116,15 @@ namespace Business.ResourceExamineManagement
                     }
                     /*if (insetList.Any())
                     {
-                        _businessDbContext.BulkInsert(insetList);
+                        await _businessDbContext.AddRangeAsync(insetList);
                     }
                     if (updateList.Any())
                     {
-                        _businessDbContext.BulkUpdate(updateList);
+                        _businessDbContext.UpdateRange(updateList);
                     }
                     if (occupyUptList.Any())
                     {
-                        _businessDbContext.BulkUpdate(occupyUptList);
+                        _businessDbContext.UpdateRange(occupyUptList);
                     }*/
                     if (moList.Any())
                     {
@@ -7151,7 +7167,7 @@ namespace Business.ResourceExamineManagement
                     ds.update_time = DateTime.Now;
                     ds.remarks = $"{DateTime.Now.ToString()},重新生成交货计划把未发布交货计划软删除";
                 });
-                await _businessDbContext.BulkUpdateAsync(demanddeletedList);
+                _businessDbContext.UpdateRange(demanddeletedList);
 
                 var dsdeletedList = _srm_polist_ds.Select(a => a.isactive == 1 && a.status == "N");
                 dsdeletedList.ForEach(ds =>
@@ -7160,7 +7176,7 @@ namespace Business.ResourceExamineManagement
                     ds.updatetime = DateTime.Now;
                     ds.remarks = $"{DateTime.Now.ToString()},重新生成交货计划把未发布交货单禁用";
                 });
-                await _businessDbContext.BulkUpdateAsync(dsdeletedList);
+                _businessDbContext.UpdateRange(dsdeletedList);
                 using (dataFilter.Disable<ISoftDelete>())
                 {
                     var historyversionList = _mysql_ic_demandschedule.GetListAsync(a => a.ishistoryversion != "Y").Result;
@@ -7169,7 +7185,7 @@ namespace Business.ResourceExamineManagement
                         a.ishistoryversion = "Y";
                         a.historyversionTime = DateTime.Now;
                     });
-                    await _businessDbContext.BulkUpdateAsync(historyversionList);
+                    _businessDbContext.UpdateRange(historyversionList);
                 }
 
 
@@ -7440,7 +7456,8 @@ namespace Business.ResourceExamineManagement
                         }
                     }
                 }
-                await _businessDbContext.BulkInsertAsync(ds);
+                await _businessDbContext.AddRangeAsync(ds);
+                await _businessBangDbContext.SaveChangesAsync();
                 return "ok";
             }
             catch (Exception e)
@@ -7500,7 +7517,7 @@ namespace Business.ResourceExamineManagement
                         x.moentry_sys_stime = work.OrdDate;
                         x.moentry_sys_etime = work.DueDate;
                     });
-                    _businessDbContext.BulkUpdate(molist);
+                    _businessDbContext.UpdateRange(molist);
                 }
                 //再执行工单的MRP,更新工单物料明细
                 _workOrdMaster.Update(work);
@@ -7601,7 +7618,7 @@ namespace Business.ResourceExamineManagement
                         x.pr_ssend_date = tomorrow;
                         x.pr_sarrive_date = x.pr_sarrive_date.GetValueOrDefault().AddDays(daysDifference);
                     });
-                    _businessDbContext.BulkUpdate(formerlylist);
+                    _businessDbContext.UpdateRange(formerlylist);
                 }
 
                 DateTime toTime = DateTime.Now.Date;
@@ -7759,15 +7776,15 @@ namespace Business.ResourceExamineManagement
 
                         if (insetAllList.Any())
                         {
-                            _businessDbContext.BulkInsert(insetAllList);
+                            await _businessDbContext.AddRangeAsync(insetAllList);
                         }
                         if (updateAllList.Any())
                         {
-                            _businessDbContext.BulkUpdate(updateAllList);
+                            _businessDbContext.UpdateRange(updateAllList);
                         }
                         if (occupylist.Any())
                         {
-                            _businessDbContext.BulkUpdate(occupylist);
+                            _businessDbContext.UpdateRange(occupylist);
                         }
                        await unitOfWork.CompleteAsync();
                     }

+ 1 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/SerialNumberAppService.cs

@@ -53,7 +53,7 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         public List<GetNbr> GetBillNo(string domain, string NbrType, int Increment, string UserNo, int IsDopCall)
         {
-            string sql = string.Format("exec pr_SFM_GetOrdNbr @Domain='{0}',@NbrType='{1}', @Increment ={2}, @UserNo='{3}',@IsDopCall={4}", domain, NbrType, Increment, UserNo, IsDopCall);
+            string sql = string.Format("CALL pr_SFM_GetOrdNbr('{0}', '{1}', {2}, '{3}', {4}, @NbrResult);", domain, NbrType, Increment, UserNo, IsDopCall);
             var getnbr = _businessDbContext.GetNbr.FromSqlRaw(sql).ToList();
             return getnbr;
         }

+ 29 - 20
MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -414,7 +414,8 @@ namespace Business.SystemJobManagement
                         ItemsAdd.Add(customer);
                     }
                 }
-                _businessDbContext.BulkInsert(ItemsAdd);
+                _businessDbContext.AddRange(ItemsAdd);
+                _businessDbContext.SaveChanges();
             }
         }
 
@@ -478,8 +479,9 @@ namespace Business.SystemJobManagement
                         ItemsUpd.Add(supp);
                     }
                 }
-                _businessDbContext.BulkInsert(ItemsAdd);
+                _businessDbContext.AddRange(ItemsAdd);
                 _businessDbContext.srm_supplier.UpdateRange(ItemsUpd);
+                _businessDbContext.SaveChanges();
             }
         }
 
@@ -589,10 +591,11 @@ namespace Business.SystemJobManagement
                             }
                         }
                     }
-                    _businessDbContext.BulkInsert(ItemsAdd);
-                    _businessDbContext.BulkUpdate(ItemsUpdate);
-                    _businessDbContext.BulkInsert(seAdd);
-                    _businessDbContext.BulkUpdate(seUpdate);
+                    _businessDbContext.AddRange(ItemsAdd);
+                    _businessDbContext.UpdateRange(ItemsUpdate);
+                    _businessDbContext.AddRange(seAdd);
+                    _businessDbContext.UpdateRange(seUpdate);
+                    _businessDbContext.SaveChanges();
                 }
             }
             catch (Exception ex)
@@ -650,8 +653,9 @@ namespace Business.SystemJobManagement
                         SItemsUpdate.Add(sal);
                     }
                 }
-                _businessDbContext.BulkUpdate(CItemsUpdate);
-                _businessDbContext.BulkUpdate(SItemsUpdate);
+                _businessDbContext.UpdateRange(CItemsUpdate);
+                _businessDbContext.UpdateRange(SItemsUpdate);
+                _businessDbContext.SaveChanges();
 
             }
             catch (Exception ex)
@@ -1018,9 +1022,10 @@ namespace Business.SystemJobManagement
                     }
                 }
             }
-            _businessDbContext.BulkInsert(ItemsAdd);
-            _businessDbContext.BulkInsert(stockAdd);
+            _businessDbContext.AddRange(ItemsAdd);
+            _businessDbContext.AddRange(stockAdd);
             _businessDbContext.ic_item.UpdateRange(ItemsUpd);
+            _businessDbContext.SaveChanges();
         }
 
         public void SyncBom()
@@ -1172,10 +1177,11 @@ namespace Business.SystemJobManagement
                         }
                     }
                 }
-                _businessDbContext.BulkInsert(ItemsAdd);
-                _businessDbContext.BulkInsert(childItemsAdd);
+                _businessDbContext.AddRange(ItemsAdd);
+                _businessDbContext.AddRange(childItemsAdd);
                 _businessDbContext.ic_bom_child.UpdateRange(childItemsUpd);
                 _mysql_ic_bom_child.HardDeleteAsync(childItemsDel);
+                _businessDbContext.SaveChanges();
             }
         }
 
@@ -1289,8 +1295,9 @@ namespace Business.SystemJobManagement
                         }
                     }
                 }
-                await _businessDbContext.BulkUpdateAsync(updateList);
-                await _businessDbContext.BulkUpdateAsync(updateMoentryList);
+                _businessDbContext.UpdateRange(updateList);
+                _businessDbContext.UpdateRange(updateMoentryList);
+                await _businessDbContext.SaveChangesAsync();
             }
             catch (Exception e)
             {
@@ -1463,24 +1470,25 @@ namespace Business.SystemJobManagement
                 }
                 if (addPo.Any())
                 {
-                    await _businessDbContext.BulkInsertAsync(addPo);
+                    await _businessDbContext.AddRangeAsync(addPo);
                 }
                 if (updatePo.Any())
                 {
-                    await _businessDbContext.BulkUpdateAsync(updatePo);
+                    _businessDbContext.UpdateRange(updatePo);
                 }
                 if (addPolist.Any())
                 {
-                    await _businessDbContext.BulkInsertAsync(addPolist);
+                    await _businessDbContext.AddRangeAsync(addPolist);
                 }
                 if (occList.Any())
                 {
-                    await _businessDbContext.BulkUpdateAsync(occList);
+                    _businessDbContext.UpdateRange(occList);
                 }
                 if (updatePolist.Any())
                 {
-                    await _businessDbContext.BulkUpdateAsync(updatePolist);
+                    _businessDbContext.UpdateRange(updatePolist);
                 }
+                await _businessDbContext.SaveChangesAsync();
             }
             catch (Exception ex)
             {
@@ -1595,7 +1603,8 @@ namespace Business.SystemJobManagement
                 }
                 if (updtelist.Any())
                 {
-                    _businessDbContext.BulkUpdate(updtelist);
+                    _businessDbContext.UpdateRange(updtelist);
+                    await _businessDbContext.SaveChangesAsync();
                 }
                 if (dellist.Any())
                 {

+ 1 - 0
MicroServices/Business/Business.Host/Business.Host.csproj

@@ -17,6 +17,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.3" />
+    <PackageReference Include="MySqlConnector" Version="2.5.0" />
     <PackageReference Include="NLog" Version="5.1.3" />
     <PackageReference Include="NLog.Database" Version="5.1.2" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.2" />

+ 7 - 7
MicroServices/Business/Business.Host/nlog.config

@@ -19,10 +19,10 @@
             archiveFileName="/Logs/nlog-${shortdate}.{#}.log" archiveAboveSize="10485760"
             layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
 		<!--把日志输出到数据库 -->
-		<!--<target xsi:type="Database" name="database" dbProvider="MySqlConnector.MySqlConnection, MySqlConnector" connectionString="${configsetting:item=ConnectionStrings.DOPLog}">
+		<target xsi:type="Database" name="database" dbProvider="MySqlConnector.MySqlConnection, MySqlConnector" connectionString="${configsetting:item=ConnectionStrings.DOPLog}">
 			<install-command ignoreFailures="true">
 				<text>
-					--><!-- NOTE: call LogManager.Configuration.Install(new InstallationContext()); to execute this query. --><!--
+					<!-- NOTE: call LogManager.Configuration.Install(new InstallationContext()); to execute this query. -->
 					CREATE TABLE IF NOT EXISTS `Sys_Log${date:format=yyyyMM}`(
 					`id` bigint NOT NULL AUTO_INCREMENT,
 					`createtime` datetime NOT NULL,
@@ -51,12 +51,12 @@
 			<parameter name="@UserId" layout="${aspnet-user-claim:userId}" allowDbNull="true" />
 			<parameter name="@Url" layout="${aspnet-request-url}" allowDbNull="true" />
 			<parameter name="@IP" layout="${aspnet-request-ip}" allowDbNull="true" />
-            <parameter name="@TenantId" layout="${event-context:item=TenantId}" allowDbNull="true" />
-		</target>-->
-		<target xsi:type="Database" name="database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="${configsetting:item=ConnectionStrings.DOPLog}">
+			<parameter name="@TenantId" layout="${event-context:item=TenantId}" allowDbNull="true" />
+		</target>
+		<!--<target xsi:type="Database" name="database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="${configsetting:item=ConnectionStrings.DOPLog}">
 			<install-command ignoreFailures="true">
 				<text>
-					<!-- NOTE: call LogManager.Configuration.Install(new InstallationContext()); to execute this query. -->
+					--><!-- NOTE: call LogManager.Configuration.Install(new InstallationContext()); to execute this query. --><!--
 					if not exists (select * from sysobjects where id = object_id('dbo.Sys_Log${date:format=yyyyMM}')
 					and OBJECTPROPERTY(id, 'IsUserTable') = 1)
 					create table dbo.Sys_Log${date:format=yyyyMM}
@@ -89,7 +89,7 @@
 			<parameter name="@Url" layout="${aspnet-request-url}" allowDbNull="true" />
 			<parameter name="@IP" layout="${aspnet-request-ip}" allowDbNull="true" />
 			<parameter name="@TenantId" layout="${event-context:item=TenantId}" allowDbNull="true" />
-		</target>
+		</target>-->
 	</targets>
 
 	<!-- 日志输出规则 -->

+ 24 - 0
MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -4690,3 +4690,27 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-12-26T10:49:05.6702782+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-12-26T10:49:05.6742437+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-12-26T10:49:05.675789+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:27:16.4621115+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:27:16.5038379+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:27:16.5067682+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:27:16.5084573+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:27:16.5141781+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-12-26T11:27:16.5164414+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:46:10.9336927+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:46:10.970178+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:46:10.9739698+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:46:10.9760072+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-12-26T11:46:10.9809741+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-12-26T11:46:10.9827837+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:11:17.2991665+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:11:17.3372561+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:11:17.3401913+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:11:17.3423539+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:11:17.3468443+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-12-26T15:11:17.348966+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:35:11.7646274+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:35:11.7993081+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:35:11.801964+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:35:11.8036027+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-12-26T15:35:11.808755+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-12-26T15:35:11.8111864+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}