|
|
@@ -16,7 +16,6 @@ using Business.StructuredDB.SaleFcst;
|
|
|
using Business.StructuredDB.WMS;
|
|
|
using Business.SystemJob;
|
|
|
using Business.SystemJobManagement;
|
|
|
-using EFCore.BulkExtensions;
|
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
|
|
using MongoDB.Driver;
|
|
|
@@ -38,8 +37,6 @@ using Volo.Abp.MultiTenancy;
|
|
|
using Volo.Abp.ObjectMapping;
|
|
|
using Volo.Abp.Uow;
|
|
|
using ZstdSharp.Unsafe;
|
|
|
-using static Azure.Core.HttpHeader;
|
|
|
-using static NetTopologySuite.Geometries.Utilities.GeometryMapper;
|
|
|
|
|
|
namespace Business.Replenishment
|
|
|
{
|
|
|
@@ -736,7 +733,7 @@ namespace Business.Replenishment
|
|
|
try
|
|
|
{
|
|
|
var toDelete = _businessDbContext.ReplenishmentAnnualProduction.Where(a => a.Year == input.year && a.factory_id == input.factory_id).ToList();
|
|
|
- await _businessDbContext.BulkDeleteAsync(toDelete);
|
|
|
+ _businessDbContext.RemoveRange(toDelete); await _businessDbContext.SaveChangesAsync();
|
|
|
await _businessDbContext.AddRangeAsync(annualProductionOutlines);
|
|
|
await _businessDbContext.SaveChangesAsync();
|
|
|
//await CalcLongPeriodItemPR(input);
|
|
|
@@ -1852,18 +1849,18 @@ namespace Business.Replenishment
|
|
|
await _mysql_mes_moentry.HardDeleteAsync(deletedEntryList);
|
|
|
var examine_result = _mysql_examine_result.GetListAsync(a => workOrderDelete.Contains(a.morder_no) && a.factory_id == input.factory_id).Result;
|
|
|
List<srm_po_occupy> occupy = await _mysql_srm_po_occupy.GetListAsync(s => workOrderDelete.Contains(s.morder_mo));
|
|
|
- _businessDbContext.BulkDelete(occupy);
|
|
|
+ _businessDbContext.RemoveRange(occupy); _businessDbContext.SaveChanges();
|
|
|
//清理工单占用
|
|
|
List<mes_mooccupy> mooccupy = await _mysql_mes_mooccupy.GetListAsync(s => deletedIds.Contains(s.moo_id.GetValueOrDefault()));
|
|
|
if (mooccupy.Any())
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(mooccupy);
|
|
|
+ _businessDbContext.RemoveRange(mooccupy); _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
//清理掉库存占用
|
|
|
var itemstockoccupy = _mysql_ic_item_stockoccupy.GetListAsync(s => workOrderDelete.Contains(s.morder_mo)).Result;
|
|
|
if (itemstockoccupy.Any())
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(itemstockoccupy);
|
|
|
+ _businessDbContext.RemoveRange(itemstockoccupy); _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
if (examine_result.Any())
|
|
|
{
|
|
|
@@ -3640,18 +3637,18 @@ namespace Business.Replenishment
|
|
|
//await _mysql_mes_moentry.HardDeleteAsync(deletedEntryList);
|
|
|
//var examine_result = _mysql_examine_result.GetListAsync(a => workOrderDelete.Contains(a.morder_no) && a.factory_id == input.factory_id).Result;
|
|
|
//List<srm_po_occupy> occupy = await _mysql_srm_po_occupy.GetListAsync(s => workOrderDelete.Contains(s.morder_mo));
|
|
|
- //_businessDbContext.BulkDelete(occupy);
|
|
|
+ //_businessDbContext.RemoveRange(occupy); _businessDbContext.SaveChanges();
|
|
|
////清理工单占用
|
|
|
//List<mes_mooccupy> mooccupy = await _mysql_mes_mooccupy.GetListAsync(s => deletedIds.Contains(s.moo_id.GetValueOrDefault()));
|
|
|
//if (mooccupy.Any())
|
|
|
//{
|
|
|
- // _businessDbContext.BulkDelete(mooccupy);
|
|
|
+ // _businessDbContext.RemoveRange(mooccupy); _businessDbContext.SaveChanges();
|
|
|
//}
|
|
|
////清理掉库存占用
|
|
|
//var itemstockoccupy = _mysql_ic_item_stockoccupy.GetListAsync(s => workOrderDelete.Contains(s.morder_mo)).Result;
|
|
|
//if (itemstockoccupy.Any())
|
|
|
//{
|
|
|
- // _businessDbContext.BulkDelete(itemstockoccupy);
|
|
|
+ // _businessDbContext.RemoveRange(itemstockoccupy); _businessDbContext.SaveChanges();
|
|
|
//}
|
|
|
//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);
|
|
|
@@ -3805,12 +3802,12 @@ namespace Business.Replenishment
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(delMstlist);
|
|
|
- _businessDbContext.BulkDelete(delDtllist);
|
|
|
- _businessDbContext.BulkDelete(delpolist);
|
|
|
- _businessDbContext.BulkDelete(delpllist);
|
|
|
- _businessDbContext.BulkDelete(delocclist);
|
|
|
- _businessDbContext.BulkDelete(delprlist);
|
|
|
+ _businessDbContext.RemoveRange(delMstlist); _businessDbContext.SaveChanges();
|
|
|
+ _businessDbContext.RemoveRange(delDtllist); _businessDbContext.SaveChanges();
|
|
|
+ _businessDbContext.RemoveRange(delpolist); _businessDbContext.SaveChanges();
|
|
|
+ _businessDbContext.RemoveRange(delpllist); _businessDbContext.SaveChanges();
|
|
|
+ _businessDbContext.RemoveRange(delocclist); _businessDbContext.SaveChanges();
|
|
|
+ _businessDbContext.RemoveRange(delprlist); _businessDbContext.SaveChanges();
|
|
|
await unitOfWork.CompleteAsync();
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
@@ -4053,12 +4050,13 @@ namespace Business.Replenishment
|
|
|
|
|
|
if (deleteList.Count > 0)
|
|
|
{
|
|
|
- await _businessDbContext.BulkDeleteAsync(deleteList);
|
|
|
+ _businessDbContext.RemoveRange(deleteList); await _businessDbContext.SaveChangesAsync();
|
|
|
_workOrdMaster.Delete(workOrdMasterList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.WorkOrd)).ToList());
|
|
|
_workOrdDetail.Delete(workOrdDetailList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.WorkOrd)).ToList());
|
|
|
_workOrdRouting.Delete(workOrdRoutingList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.WorkOrd)).ToList());
|
|
|
- await _businessDbContext.BulkDeleteAsync(mesmorderList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.morder_no)).ToList());
|
|
|
- await _businessDbContext.BulkDeleteAsync(mesmorderEntryList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.moentry_mono)).ToList());
|
|
|
+ _businessDbContext.RemoveRange(mesmorderList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.morder_no)).ToList());
|
|
|
+ _businessDbContext.RemoveRange(mesmorderEntryList.Where(a => deleteList.Select(b => b.ProductionOrder).ToList().Contains(a.moentry_mono)).ToList());
|
|
|
+ await _businessDbContext.SaveChangesAsync();
|
|
|
}
|
|
|
if (updateList.Count > 0)
|
|
|
{
|
|
|
@@ -4113,6 +4111,7 @@ namespace Business.Replenishment
|
|
|
_workOrdRouting.Update(itemRoutingUpdate);
|
|
|
_businessDbContext.UpdateRange(itemMesmorderList);
|
|
|
_businessDbContext.UpdateRange(itemMesmorderEntryList);
|
|
|
+ await _businessDbContext.SaveChangesAsync();
|
|
|
}
|
|
|
|
|
|
//补货
|
|
|
@@ -4900,6 +4899,7 @@ namespace Business.Replenishment
|
|
|
}
|
|
|
_businessDbContext.UpdateRange(works);
|
|
|
_businessDbContext.UpdateRange(weekPlan);
|
|
|
+ _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -5258,26 +5258,26 @@ namespace Business.Replenishment
|
|
|
// }
|
|
|
//}
|
|
|
List<srm_po_occupy> occupy = await _mysql_srm_po_occupy.GetListAsync(s => monolist.Contains(s.morder_mo));
|
|
|
- _businessDbContext.BulkDelete(occupy);
|
|
|
+ _businessDbContext.RemoveRange(occupy); _businessDbContext.SaveChanges();
|
|
|
//if (updatelist.Any())
|
|
|
//{
|
|
|
// _businessDbContext.UpdateRange(updatelist);
|
|
|
//}
|
|
|
//if (dellist.Any())
|
|
|
//{
|
|
|
- // _businessDbContext.BulkDelete(dellist);
|
|
|
+ // _businessDbContext.RemoveRange(dellist); _businessDbContext.SaveChanges();
|
|
|
//}
|
|
|
//清理工单占用
|
|
|
List<mes_mooccupy> mooccupy = await _mysql_mes_mooccupy.GetListAsync(s => Mes_Morders.Select(c => c.Id).Contains(s.moo_id.GetValueOrDefault()));
|
|
|
if (mooccupy.Any())
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(mooccupy);
|
|
|
+ _businessDbContext.RemoveRange(mooccupy); _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
//清理掉库存占用
|
|
|
var itemstockoccupy = _mysql_ic_item_stockoccupy.GetListAsync(s => monolist.Contains(s.morder_mo)).Result;
|
|
|
if (itemstockoccupy.Any())
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(itemstockoccupy);
|
|
|
+ _businessDbContext.RemoveRange(itemstockoccupy); _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
//清理锁定期外的排程数据.
|
|
|
//var periodList = _periodSequenceDet.Select(s => monolist.Contains(s.WorkOrds));
|
|
|
@@ -5943,7 +5943,7 @@ namespace Business.Replenishment
|
|
|
}
|
|
|
if (delWorkOrddetails.Any())
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(delWorkOrddetails);
|
|
|
+ _businessDbContext.RemoveRange(delWorkOrddetails); _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
if (mainWorkOrdDetails.Any())
|
|
|
{
|
|
|
@@ -6295,7 +6295,7 @@ namespace Business.Replenishment
|
|
|
var mysql_mes_mooccupy = _mysql_mes_mooccupy.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.moo_id_billid.Value)).Result;
|
|
|
if (mysql_mes_mooccupy.Count > 0)
|
|
|
{
|
|
|
- await _businessDbContext.BulkDeleteAsync(mysql_mes_mooccupy);
|
|
|
+ _businessDbContext.RemoveRange(mysql_mes_mooccupy); await _businessDbContext.SaveChangesAsync();
|
|
|
}
|
|
|
/*var srm_pr_main = _mysql_srm_pr_main.GetListAsync(x => soentry_id.Select(p => p.Id).Contains(x.sentry_id.GetValueOrDefault())).Result;
|
|
|
if (srm_pr_main.Count > 0)
|
|
|
@@ -6834,7 +6834,7 @@ namespace Business.Replenishment
|
|
|
}
|
|
|
if (deleteList.Any())
|
|
|
{
|
|
|
- _businessDbContext.BulkDelete(deleteList);
|
|
|
+ _businessDbContext.RemoveRange(deleteList); _businessDbContext.SaveChanges();
|
|
|
}
|
|
|
if (addList.Any())
|
|
|
{
|