|
@@ -1,4 +1,4 @@
|
|
|
-using Amazon.Auth.AccessControlPolicy;
|
|
|
|
|
|
|
+using Amazon.Auth.AccessControlPolicy;
|
|
|
using Amazon.Runtime.Internal;
|
|
using Amazon.Runtime.Internal;
|
|
|
using Amazon.Runtime.Internal.Util;
|
|
using Amazon.Runtime.Internal.Util;
|
|
|
using Business.Core.Enum;
|
|
using Business.Core.Enum;
|
|
@@ -968,12 +968,12 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- await _businessDbContext.BulkUpdateAsync(sentrys);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(sentrys);
|
|
|
/*//批量保存 后期考虑子工单
|
|
/*//批量保存 后期考虑子工单
|
|
|
if (moderlist.Any())
|
|
if (moderlist.Any())
|
|
|
{
|
|
{
|
|
|
await _mes_morder.InsertMany(_CalcBomViewAppService.mordersInsertList);
|
|
await _mes_morder.InsertMany(_CalcBomViewAppService.mordersInsertList);
|
|
|
- _businessDbContext.BulkInsert(moderlist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(moderlist);
|
|
|
if (workOrds.Any())
|
|
if (workOrds.Any())
|
|
|
{
|
|
{
|
|
|
_workOrdMaster.Insert(workOrds);
|
|
_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; });
|
|
_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);
|
|
await MongoHelper<mo_mes_mooccupy>.InsertManyAsync(_CalcBomViewAppService.mooccupyAllInsertList);
|
|
|
/*var moOccupy = ObjectMapper.Map<List<mo_mes_mooccupy>, List<mes_mooccupy>>(_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;
|
|
rtn.mooccupyAllList = _CalcBomViewAppService.mooccupyAllInsertList;
|
|
|
}
|
|
}
|
|
|
if (_CalcBomViewAppService.moentriesInsertList.Any())
|
|
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; });
|
|
_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);
|
|
await MongoHelper<mo_mes_moentry>.InsertManyAsync(_CalcBomViewAppService.moentriesInsertList);
|
|
|
/*var mesmoentrys = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(_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())
|
|
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; });
|
|
_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);
|
|
await MongoHelper<mo_mes_oorder>.InsertManyAsync(_CalcBomViewAppService.orderList);
|
|
|
/*var ooders = ObjectMapper.Map<List<mo_mes_oorder>, List<mes_oorder>>(_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;
|
|
rtn.order_list = _CalcBomViewAppService.orderList;
|
|
|
}
|
|
}
|
|
|
if (_CalcBomViewAppService.newStockOccList.Any())
|
|
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; });
|
|
_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);
|
|
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);
|
|
/*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();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
@@ -1275,9 +1275,9 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
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();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
@@ -1306,7 +1306,7 @@ namespace Business.ResourceExamineManagement
|
|
|
x.pr_ssend_date = tomorrow;
|
|
x.pr_ssend_date = tomorrow;
|
|
|
x.pr_sarrive_date = x.pr_sarrive_date.GetValueOrDefault().AddDays(daysDifference);
|
|
x.pr_sarrive_date = x.pr_sarrive_date.GetValueOrDefault().AddDays(daysDifference);
|
|
|
});
|
|
});
|
|
|
- _businessDbContext.BulkUpdate(formerlylist);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(formerlylist);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
DateTime toTime = DateTime.Now.Date;
|
|
DateTime toTime = DateTime.Now.Date;
|
|
@@ -1465,15 +1465,15 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
|
|
if (insetAllList.Any())
|
|
if (insetAllList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(insetAllList);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(insetAllList);
|
|
|
}
|
|
}
|
|
|
if (updateAllList.Any())
|
|
if (updateAllList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(updateAllList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(updateAllList);
|
|
|
}
|
|
}
|
|
|
if (occupylist.Any())
|
|
if (occupylist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(occupylist);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(occupylist);
|
|
|
}
|
|
}
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
@@ -1541,7 +1541,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
_businessBangDbContext.Database.ExecuteSqlRaw(seqSql);
|
|
_businessBangDbContext.Database.ExecuteSqlRaw(seqSql);
|
|
|
}
|
|
}
|
|
|
- await _businessDbContext.BulkUpdateAsync(prapplyList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(prapplyList);
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
@@ -1670,16 +1670,16 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
if (poaction.poMain.Any())
|
|
if (poaction.poMain.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(alllist);
|
|
|
|
|
- _businessDbContext.BulkInsert(poaction.poMain);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(alllist);
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(poaction.poMain);
|
|
|
}
|
|
}
|
|
|
if (poaction.polist.Any())
|
|
if (poaction.polist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(poaction.polist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(poaction.polist);
|
|
|
}
|
|
}
|
|
|
if (poaction.poOccupiesList.Any())
|
|
if (poaction.poOccupiesList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(poaction.poOccupiesList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(poaction.poOccupiesList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (poaction.poMasterList.Any())
|
|
if (poaction.poMasterList.Any())
|
|
@@ -1793,16 +1793,16 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
if (poaction.poMain.Any())
|
|
if (poaction.poMain.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(prlist);
|
|
|
|
|
- _businessDbContext.BulkInsert(poaction.poMain);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(prlist);
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(poaction.poMain);
|
|
|
}
|
|
}
|
|
|
if (poaction.polist.Any())
|
|
if (poaction.polist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(poaction.polist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(poaction.polist);
|
|
|
}
|
|
}
|
|
|
if (poaction.poOccupiesList.Any())
|
|
if (poaction.poOccupiesList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(poaction.poOccupiesList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(poaction.poOccupiesList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (poaction.poMasterList.Any())
|
|
if (poaction.poMasterList.Any())
|
|
@@ -2021,11 +2021,11 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- await _businessDbContext.BulkUpdateAsync(sentrys);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(sentrys);
|
|
|
//批量保存 后期考虑子工单
|
|
//批量保存 后期考虑子工单
|
|
|
if (moderlist.Any())
|
|
if (moderlist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(moderlist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(moderlist);
|
|
|
if (workOrds.Any())
|
|
if (workOrds.Any())
|
|
|
{
|
|
{
|
|
|
_workOrdMaster.Insert(workOrds);
|
|
_workOrdMaster.Insert(workOrds);
|
|
@@ -2050,38 +2050,38 @@ namespace Business.ResourceExamineManagement
|
|
|
if (WriteMoentry.Any())
|
|
if (WriteMoentry.Any())
|
|
|
{
|
|
{
|
|
|
var mesmoentrys = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(WriteMoentry);
|
|
var mesmoentrys = ObjectMapper.Map<List<mo_mes_moentry>, List<mes_moentry>>(WriteMoentry);
|
|
|
- _businessDbContext.BulkInsert(mesmoentrys);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(mesmoentrys);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if (mooccupyList.Any())
|
|
if (mooccupyList.Any())
|
|
|
{
|
|
{
|
|
|
mooccupyList.ForEach(s => { s.create_time = DateTime.Now; });
|
|
mooccupyList.ForEach(s => { s.create_time = DateTime.Now; });
|
|
|
var moOccupy = ObjectMapper.Map<List<mo_mes_mooccupy>, List<mes_mooccupy>>(mooccupyList);
|
|
var moOccupy = ObjectMapper.Map<List<mo_mes_mooccupy>, List<mes_mooccupy>>(mooccupyList);
|
|
|
- _businessDbContext.BulkInsert(moOccupy);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(moOccupy);
|
|
|
}
|
|
}
|
|
|
if (oorderList.Any())
|
|
if (oorderList.Any())
|
|
|
{
|
|
{
|
|
|
oorderList.ForEach(s => { s.create_time = DateTime.Now; });
|
|
oorderList.ForEach(s => { s.create_time = DateTime.Now; });
|
|
|
var ooders = ObjectMapper.Map<List<mo_mes_oorder>, List<mes_oorder>>(oorderList);
|
|
var ooders = ObjectMapper.Map<List<mo_mes_oorder>, List<mes_oorder>>(oorderList);
|
|
|
- _businessDbContext.BulkInsert(ooders);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(ooders);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (item_stockoccupy.Any())
|
|
if (item_stockoccupy.Any())
|
|
|
{
|
|
{
|
|
|
var sklist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(item_stockoccupy);
|
|
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()); });
|
|
sklist.ForEach(s => { s.create_time = DateTime.Now; s.GenerateNewId(help.NextId()); });
|
|
|
- _businessDbContext.BulkInsert(sklist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(sklist);
|
|
|
}
|
|
}
|
|
|
if (po_occupy.Any())
|
|
if (po_occupy.Any())
|
|
|
{
|
|
{
|
|
|
po_occupy.ForEach(s => { s.mysql_id = help.NextId(); s.create_time = DateTime.Now; });
|
|
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);
|
|
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())
|
|
if (prmainlist.Any())
|
|
|
{
|
|
{
|
|
|
var pr_mainlist = ObjectMapper.Map<List<mo_srm_pr_main>, List<srm_pr_main>>(prmainlist);
|
|
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();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
@@ -3081,7 +3081,7 @@ namespace Business.ResourceExamineManagement
|
|
|
_businessDbContext.BulkDelete(occupy);
|
|
_businessDbContext.BulkDelete(occupy);
|
|
|
/*if (updatelist.Any())
|
|
/*if (updatelist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(updatelist);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(updatelist);
|
|
|
}
|
|
}
|
|
|
if (dellist.Any())
|
|
if (dellist.Any())
|
|
|
{
|
|
{
|
|
@@ -3173,7 +3173,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
}
|
|
}
|
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
|
{
|
|
{
|
|
@@ -3484,7 +3484,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
//按卫亮要求。屏蔽自动下达
|
|
//按卫亮要求。屏蔽自动下达
|
|
|
/*if (workords.Length > 0)
|
|
/*if (workords.Length > 0)
|
|
|
{
|
|
{
|
|
@@ -3544,7 +3544,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
//按卫亮要求。屏蔽自动下达
|
|
//按卫亮要求。屏蔽自动下达
|
|
|
*//*if (workords.Length > 0)
|
|
*//*if (workords.Length > 0)
|
|
|
{
|
|
{
|
|
@@ -3660,7 +3660,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
//按卫亮要求。屏蔽自动下达
|
|
//按卫亮要求。屏蔽自动下达
|
|
|
/*if (workords.Length > 0)
|
|
/*if (workords.Length > 0)
|
|
|
{
|
|
{
|
|
@@ -3716,7 +3716,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
//mo.morder_state = MorderEnum.Xd_state;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
//按卫亮要求。屏蔽自动下达
|
|
//按卫亮要求。屏蔽自动下达
|
|
|
*//*if (workords.Length > 0)
|
|
*//*if (workords.Length > 0)
|
|
|
{
|
|
{
|
|
@@ -3813,7 +3813,7 @@ namespace Business.ResourceExamineManagement
|
|
|
morders[0].morder_state = MorderEnum.Xd_state;
|
|
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;部分备料改为未备料
|
|
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 _mysql_mes_morder.UpdateManyAsync(morders);
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
//复制子工序
|
|
//复制子工序
|
|
|
var insertList = GetCopyOP(morders[0].morder_no, domain);
|
|
var insertList = GetCopyOP(morders[0].morder_no, domain);
|
|
|
if (insertList.Any())
|
|
if (insertList.Any())
|
|
@@ -3841,7 +3841,7 @@ namespace Business.ResourceExamineManagement
|
|
|
morders[0].morder_state = MorderEnum.Xd_state;
|
|
morders[0].morder_state = MorderEnum.Xd_state;
|
|
|
morders[0].MaterialSituation = morders[0].MaterialSituation == MorderEnum.NoCarehouseComplete ? MorderEnum.Part : morders[0].MaterialSituation;
|
|
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);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
//复制子工序
|
|
//复制子工序
|
|
|
var insertList = GetCopyOP(morders[0].morder_no, domain);
|
|
var insertList = GetCopyOP(morders[0].morder_no, domain);
|
|
|
if (insertList.Any())
|
|
if (insertList.Any())
|
|
@@ -4306,7 +4306,7 @@ namespace Business.ResourceExamineManagement
|
|
|
item.need_number = curInfo.need_number;
|
|
item.need_number = curInfo.need_number;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- _businessDbContext.BulkUpdate(workOrds);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(workOrds);
|
|
|
}
|
|
}
|
|
|
List<WorkOrdDetail> mainWorkOrdDetails = new List<WorkOrdDetail>();
|
|
List<WorkOrdDetail> mainWorkOrdDetails = new List<WorkOrdDetail>();
|
|
|
List<WorkOrdRouting> mainWorkOrdRoutings = new List<WorkOrdRouting>();
|
|
List<WorkOrdRouting> mainWorkOrdRoutings = new List<WorkOrdRouting>();
|
|
@@ -4419,7 +4419,8 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (mainWorkOrdDetails.Any())
|
|
if (mainWorkOrdDetails.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(mainWorkOrdDetails);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(mainWorkOrdDetails);
|
|
|
|
|
+ await _businessBangDbContext.SaveChangesAsync();
|
|
|
}
|
|
}
|
|
|
if (workOrdRoutings.Any())
|
|
if (workOrdRoutings.Any())
|
|
|
{
|
|
{
|
|
@@ -4427,7 +4428,8 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (mainWorkOrdRoutings.Any())
|
|
if (mainWorkOrdRoutings.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(mainWorkOrdRoutings);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(mainWorkOrdRoutings);
|
|
|
|
|
+ await _businessBangDbContext.SaveChangesAsync();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -4479,7 +4481,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/*if (_CalcBomViewAppService.mordersInsertList.Any())
|
|
/*if (_CalcBomViewAppService.mordersInsertList.Any())
|
|
|
{
|
|
{
|
|
|
var molist = ObjectMapper.Map<List<mo_mes_morder>, List<mes_morder>>(_CalcBomViewAppService.mordersInsertList);
|
|
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<WorkOrdMaster> workOrdSave = new List<WorkOrdMaster>();
|
|
|
List<WorkOrdRouting> workOrdRoutingSave = new List<WorkOrdRouting>();
|
|
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>());
|
|
CreateWorkOrdDates(molist, _CalcBomViewAppService.moentriesInsertList, routingOps, workOrdSave, workOrdRoutingSave, workOrdDetails, new List<b_examine_result>(), new List<b_bom_child_examine>());
|
|
|
if (workOrdSave.Any())
|
|
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));
|
|
var DBworkOrdList = _workOrdMaster.Select(a => workOrdSave.Count > 0 && a.Domain == workOrdSave[0].Domain && workOrdSave.Select(c => c.WorkOrd).Contains(a.WorkOrd));
|
|
|
if (workOrdRoutingSave.Any())
|
|
if (workOrdRoutingSave.Any())
|
|
@@ -4501,7 +4503,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
|
|
c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
|
|
|
});
|
|
});
|
|
|
- _businessDbContext.BulkInsert(workOrdRoutingSave);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(workOrdRoutingSave);
|
|
|
}
|
|
}
|
|
|
priorityMorderList.AddRange(molist);
|
|
priorityMorderList.AddRange(molist);
|
|
|
}
|
|
}
|
|
@@ -4522,7 +4524,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(mo_Mes_Morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(mo_Mes_Morders);
|
|
|
/*if (workOrdMasters.Any())
|
|
/*if (workOrdMasters.Any())
|
|
|
{
|
|
{
|
|
|
_workOrdMaster.Update(workOrdMasters);
|
|
_workOrdMaster.Update(workOrdMasters);
|
|
@@ -4530,20 +4532,20 @@ namespace Business.ResourceExamineManagement
|
|
|
if (prmainlist.Any())
|
|
if (prmainlist.Any())
|
|
|
{
|
|
{
|
|
|
var pr_mainlist = ObjectMapper.Map<List<mo_srm_pr_main>, List<srm_pr_main>>(prmainlist);
|
|
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())
|
|
if (_CalcBomViewAppService.newStockOccList.Any())
|
|
|
{
|
|
{
|
|
|
var stockoccupylist = ObjectMapper.Map<List<mo_ic_item_stockoccupy>, List<ic_item_stockoccupy>>(_CalcBomViewAppService.newStockOccList);
|
|
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; });
|
|
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())
|
|
if (_CalcBomViewAppService.srm_Po_OccupiesInsert.Any())
|
|
|
{
|
|
{
|
|
|
_CalcBomViewAppService.srm_Po_OccupiesInsert.ForEach(s => { s.company_id = param.company_id; s.factory_id = param.factoryId; });
|
|
_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);
|
|
var srmpooccupyInsert = ObjectMapper.Map<List<mo_srm_po_occupy>, List<srm_po_occupy>>(_CalcBomViewAppService.srm_Po_OccupiesInsert);
|
|
|
srmpooccupyInsert.ForEach(x => { x.GenerateNewId(help.NextId()); });
|
|
srmpooccupyInsert.ForEach(x => { x.GenerateNewId(help.NextId()); });
|
|
|
- _businessDbContext.BulkInsert(srmpooccupyInsert);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(srmpooccupyInsert);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
@@ -4780,7 +4782,7 @@ namespace Business.ResourceExamineManagement
|
|
|
item.need_number = curInfo.need_number;
|
|
item.need_number = curInfo.need_number;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- _businessDbContext.BulkUpdate(workOrds);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(workOrds);
|
|
|
//检查结果写入数据库
|
|
//检查结果写入数据库
|
|
|
await ExamineResultInsertDBAsync(examines);
|
|
await ExamineResultInsertDBAsync(examines);
|
|
|
//清空快照数据
|
|
//清空快照数据
|
|
@@ -5041,22 +5043,30 @@ namespace Business.ResourceExamineManagement
|
|
|
supplierList = GetSupplier(itemIds, param.company_id, param.factoryId);//供应商列表
|
|
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();
|
|
_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();
|
|
_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();
|
|
_CalcBomViewAppService.scm_ShdzbJYs = _businessDbContext.scm_shdzbDto.FromSqlRaw(sql).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
@@ -5193,8 +5203,9 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (addList.Any())
|
|
if (addList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(addList);
|
|
|
|
|
|
|
+ _businessDbContext.AddRange(addList);
|
|
|
}
|
|
}
|
|
|
|
|
+ _businessDbContext.SaveChanges();
|
|
|
}
|
|
}
|
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
|
{
|
|
{
|
|
@@ -5528,9 +5539,13 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (needAddList.Count > 0)
|
|
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>
|
|
/// <summary>
|
|
@@ -5714,7 +5729,7 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (insertOccuyy.Any())
|
|
if (insertOccuyy.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(insertOccuyy);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(insertOccuyy);
|
|
|
}
|
|
}
|
|
|
//快开平台用自增列RecId关联,所以需要插入后再查给明细表赋相应的值
|
|
//快开平台用自增列RecId关联,所以需要插入后再查给明细表赋相应的值
|
|
|
List<string> nbrs = nbrMasterList.Select(a => a.Nbr).ToList();
|
|
List<string> nbrs = nbrMasterList.Select(a => a.Nbr).ToList();
|
|
@@ -5729,11 +5744,11 @@ namespace Business.ResourceExamineManagement
|
|
|
c.ERPfld2 = c.Line.ToString();
|
|
c.ERPfld2 = c.Line.ToString();
|
|
|
});
|
|
});
|
|
|
_nbrDetail.Insert(nbrDetailList);
|
|
_nbrDetail.Insert(nbrDetailList);
|
|
|
- await _businessDbContext.BulkUpdateAsync(weekplan);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(weekplan);
|
|
|
|
|
|
|
|
if (morders != null)
|
|
if (morders != null)
|
|
|
{
|
|
{
|
|
|
- await _businessDbContext.BulkUpdateAsync(morders);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(morders);
|
|
|
}
|
|
}
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
@@ -6157,14 +6172,14 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(new List<ic_substitute> { stt });
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(new List<ic_substitute> { stt });
|
|
|
if (glist.Any())
|
|
if (glist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(glist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(glist);
|
|
|
}
|
|
}
|
|
|
if (dlist.Any())
|
|
if (dlist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(dlist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(dlist);
|
|
|
}
|
|
}
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
@@ -6213,7 +6228,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(new List<ic_substitute> { stt });
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(new List<ic_substitute> { stt });
|
|
|
if (delgList.Any())
|
|
if (delgList.Any())
|
|
|
{
|
|
{
|
|
|
await _mysql_ic_substitute_group.HardDeleteAsync(delgList);
|
|
await _mysql_ic_substitute_group.HardDeleteAsync(delgList);
|
|
@@ -6224,11 +6239,11 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (glist.Any())
|
|
if (glist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(glist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(glist);
|
|
|
}
|
|
}
|
|
|
if (dlist.Any())
|
|
if (dlist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(dlist);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(dlist);
|
|
|
}
|
|
}
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|
|
@@ -6533,7 +6548,7 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- //await _businessDbContext.BulkUpdateAsync(list);
|
|
|
|
|
|
|
+ //_businessDbContext.UpdateRange(list);
|
|
|
_businessDbContext.ic_bom_child.UpdateRange(list);
|
|
_businessDbContext.ic_bom_child.UpdateRange(list);
|
|
|
}
|
|
}
|
|
|
return "ok";
|
|
return "ok";
|
|
@@ -6881,9 +6896,9 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
|
|
if (InsertList.Any())
|
|
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);
|
|
_workOrdMaster.Insert(InsertList);
|
|
|
var DBworkOrdList = _workOrdMaster.Select(a => a.Domain == workOrds[0].Domain && InsertList.Select(c => c.WorkOrd).Contains(a.WorkOrd));
|
|
var DBworkOrdList = _workOrdMaster.Select(a => a.Domain == workOrds[0].Domain && InsertList.Select(c => c.WorkOrd).Contains(a.WorkOrd));
|
|
|
if (routingInsList.Any())
|
|
if (routingInsList.Any())
|
|
@@ -6897,17 +6912,18 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
if (mooccupuUpdList.Any())
|
|
if (mooccupuUpdList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(mooccupuUpdList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(mooccupuUpdList);
|
|
|
}
|
|
}
|
|
|
if (stockUpdList.Any())
|
|
if (stockUpdList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(stockUpdList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(stockUpdList);
|
|
|
}
|
|
}
|
|
|
if (pooccuypUpdList.Any())
|
|
if (pooccuypUpdList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(pooccuypUpdList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(pooccuypUpdList);
|
|
|
}
|
|
}
|
|
|
MRPmorder.AddRange(moIstList);
|
|
MRPmorder.AddRange(moIstList);
|
|
|
|
|
+ _businessBangDbContext.SaveChanges();
|
|
|
if (MRPmorder.Any())
|
|
if (MRPmorder.Any())
|
|
|
{
|
|
{
|
|
|
var rtn = await OrderKittingCheck(MRPmorder, true);
|
|
var rtn = await OrderKittingCheck(MRPmorder, true);
|
|
@@ -7100,15 +7116,15 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
}
|
|
|
/*if (insetList.Any())
|
|
/*if (insetList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(insetList);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(insetList);
|
|
|
}
|
|
}
|
|
|
if (updateList.Any())
|
|
if (updateList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(updateList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(updateList);
|
|
|
}
|
|
}
|
|
|
if (occupyUptList.Any())
|
|
if (occupyUptList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(occupyUptList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(occupyUptList);
|
|
|
}*/
|
|
}*/
|
|
|
if (moList.Any())
|
|
if (moList.Any())
|
|
|
{
|
|
{
|
|
@@ -7151,7 +7167,7 @@ namespace Business.ResourceExamineManagement
|
|
|
ds.update_time = DateTime.Now;
|
|
ds.update_time = DateTime.Now;
|
|
|
ds.remarks = $"{DateTime.Now.ToString()},重新生成交货计划把未发布交货计划软删除";
|
|
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");
|
|
var dsdeletedList = _srm_polist_ds.Select(a => a.isactive == 1 && a.status == "N");
|
|
|
dsdeletedList.ForEach(ds =>
|
|
dsdeletedList.ForEach(ds =>
|
|
@@ -7160,7 +7176,7 @@ namespace Business.ResourceExamineManagement
|
|
|
ds.updatetime = DateTime.Now;
|
|
ds.updatetime = DateTime.Now;
|
|
|
ds.remarks = $"{DateTime.Now.ToString()},重新生成交货计划把未发布交货单禁用";
|
|
ds.remarks = $"{DateTime.Now.ToString()},重新生成交货计划把未发布交货单禁用";
|
|
|
});
|
|
});
|
|
|
- await _businessDbContext.BulkUpdateAsync(dsdeletedList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(dsdeletedList);
|
|
|
using (dataFilter.Disable<ISoftDelete>())
|
|
using (dataFilter.Disable<ISoftDelete>())
|
|
|
{
|
|
{
|
|
|
var historyversionList = _mysql_ic_demandschedule.GetListAsync(a => a.ishistoryversion != "Y").Result;
|
|
var historyversionList = _mysql_ic_demandschedule.GetListAsync(a => a.ishistoryversion != "Y").Result;
|
|
@@ -7169,7 +7185,7 @@ namespace Business.ResourceExamineManagement
|
|
|
a.ishistoryversion = "Y";
|
|
a.ishistoryversion = "Y";
|
|
|
a.historyversionTime = DateTime.Now;
|
|
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";
|
|
return "ok";
|
|
|
}
|
|
}
|
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
@@ -7500,7 +7517,7 @@ namespace Business.ResourceExamineManagement
|
|
|
x.moentry_sys_stime = work.OrdDate;
|
|
x.moentry_sys_stime = work.OrdDate;
|
|
|
x.moentry_sys_etime = work.DueDate;
|
|
x.moentry_sys_etime = work.DueDate;
|
|
|
});
|
|
});
|
|
|
- _businessDbContext.BulkUpdate(molist);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(molist);
|
|
|
}
|
|
}
|
|
|
//再执行工单的MRP,更新工单物料明细
|
|
//再执行工单的MRP,更新工单物料明细
|
|
|
_workOrdMaster.Update(work);
|
|
_workOrdMaster.Update(work);
|
|
@@ -7601,7 +7618,7 @@ namespace Business.ResourceExamineManagement
|
|
|
x.pr_ssend_date = tomorrow;
|
|
x.pr_ssend_date = tomorrow;
|
|
|
x.pr_sarrive_date = x.pr_sarrive_date.GetValueOrDefault().AddDays(daysDifference);
|
|
x.pr_sarrive_date = x.pr_sarrive_date.GetValueOrDefault().AddDays(daysDifference);
|
|
|
});
|
|
});
|
|
|
- _businessDbContext.BulkUpdate(formerlylist);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(formerlylist);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
DateTime toTime = DateTime.Now.Date;
|
|
DateTime toTime = DateTime.Now.Date;
|
|
@@ -7759,15 +7776,15 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
|
|
if (insetAllList.Any())
|
|
if (insetAllList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkInsert(insetAllList);
|
|
|
|
|
|
|
+ await _businessDbContext.AddRangeAsync(insetAllList);
|
|
|
}
|
|
}
|
|
|
if (updateAllList.Any())
|
|
if (updateAllList.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(updateAllList);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(updateAllList);
|
|
|
}
|
|
}
|
|
|
if (occupylist.Any())
|
|
if (occupylist.Any())
|
|
|
{
|
|
{
|
|
|
- _businessDbContext.BulkUpdate(occupylist);
|
|
|
|
|
|
|
+ _businessDbContext.UpdateRange(occupylist);
|
|
|
}
|
|
}
|
|
|
await unitOfWork.CompleteAsync();
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
}
|