zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复盘点描述和新增任务号、计划单号不正确问题

交付给东阳的源代码
周红军 2 weeks ago
parent
3cbe9b1e39
commit
c30fcb0b1d
1 changed files with 22 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs

38
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJobManager.cs
View File

@ -310,24 +310,27 @@ public class CountJobManager : SfsJobManagerBase<CountJob, CountJobDetail>, ICou
//var oldDepDetail = entity.DepDetails.FirstOrDefault(r => r.ItemCode == depDetail.ItemCode && r.PackingCode == depDetail.PackingCode && r.LocationCode == depDetail.LocationCode && r.InventoryStage == entity.InventoryStage && r.Lot == depDetail.Lot);
var oldDepDetail = entity.DepDetails.FirstOrDefault(r => r.Id == new Guid(depDetail.Id.ToString()));
if (depDetail.IsDelete)
{
countCount = -oldDepDetail.CountQty;
entity.DepDetails.Remove(oldDepDetail);
//移除的扫描记录盘点数量与计划中盘点数量一致，移除计划中的物料
var planDB = await _planRepository.FindAsync(r => r.Number == input.CountPlanNumber).ConfigureAwait(false);
if (planDB != null)
{
if(oldDepDetail != null)
{
var planDetailDB = planDB.Details.FirstOrDefault(r => r.ItemCode == depDetail.ItemCode && r.PackingCode == depDetail.PackingCode && r.LocationCode == depDetail.LocationCode && r.Lot == depDetail.Lot && r.Status == depDetail.Status);
if (planDetailDB != null)
countCount = -oldDepDetail.CountQty;
entity.DepDetails.Remove(oldDepDetail);
//移除的扫描记录盘点数量与计划中盘点数量一致，移除计划中的物料
var planDB = await _planRepository.FindAsync(r => r.Number == input.CountPlanNumber).ConfigureAwait(false);
if (planDB != null)
{
if(planDetailDB.FinalCountQty == oldDepDetail.CountQty)
var planDetailDB = planDB.Details.FirstOrDefault(r => r.ItemCode == depDetail.ItemCode && r.PackingCode == depDetail.PackingCode && r.LocationCode == depDetail.LocationCode && r.Lot == depDetail.Lot && r.Status == depDetail.Status);
if (planDetailDB != null)
{
planDB.Details.Remove(planDetailDB);
await _planRepository.UpdateAsync(planDB).ConfigureAwait(false);
if (planDetailDB.FinalCountQty == oldDepDetail.CountQty)
{
planDB.Details.Remove(planDetailDB);
await _planRepository.UpdateAsync(planDB).ConfigureAwait(false);
}
}
}
}
}
}
else
{
@ -335,6 +338,7 @@ public class CountJobManager : SfsJobManagerBase<CountJob, CountJobDetail>, ICou
{
countCount = depDetail.CountQty - oldDepDetail.CountQty;
oldDepDetail.CountQty = depDetail.CountQty;
oldDepDetail.CountDescription = depDetail.CountDescription;
}
else
{
@ -358,14 +362,16 @@ public class CountJobManager : SfsJobManagerBase<CountJob, CountJobDetail>, ICou
jobDetail.ProduceDate = DateTime.Now;
jobDetail.ExpireDate = DateTime.Parse("9999-12-31 23:59:59.9999999");
jobDetail.InventoryQty = 0;
var detailNumber = await GetNumber().ConfigureAwait(false);
jobDetail.SetIdAndNumber(GuidGenerator, entity.Id, detailNumber);
//var detailNumber = await GetNumber().ConfigureAwait(false);
jobDetail.CountPlanNumber = input.CountPlanNumber;
jobDetail.SetIdAndNumber(GuidGenerator, entity.Id, depDetail.Number);
jobDetail.CountLabel = GuidGenerator.Create().ToString();
entity.Details.Add(jobDetail);
}
else
{
await entity.SetDetail(detail.Id, detail.SupplierBatch, detail.ArriveDate, detail.ProduceDate, detail.ExpireDate, detail.LocationCode, countCount, detail.CountTime, detail.CountOperator, detail.CountDescription)
await entity.SetDetail(detail.Id, detail.SupplierBatch, detail.ArriveDate, detail.ProduceDate, detail.ExpireDate, detail.LocationCode, countCount, detail.CountTime, detail.CountOperator, depDetail.CountDescription)
.ConfigureAwait(false);
}
}

Write Preview
Loading…
Cancel
Save