Browse Source

Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

dev_DY_CC
lvzb 11 months ago
parent
commit
a38a35a775
  1. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ThirdLocationNotes/ThirdLocationNoteDbContextModelCreatingExtensions.cs
  2. 13
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/ThirdLocationNotes/ThirdLocationNoteDbContextModelCreatingExtensions.cs

@ -56,8 +56,8 @@ public static class ThirdLocationNoteDbContextModelCreatingExtensions
//Relations //Relations
//Indexes //Indexes
b.HasIndex(q => new { q.Number, q.FromPackingCode, q.FromLocationCode, q.ToLocationCode }).IsUnique(); //b.HasIndex(q => new { q.Number, q.ItemCode, q.FromLocationCode, q.ToLocationCode }).IsUnique();
b.HasIndex(q => new { q.FromPackingCode }); b.HasIndex(q => new { q.Number });
}); });
} }
} }

13
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ThirdLocationNoteEventHandler.cs

@ -55,17 +55,18 @@ public class ThirdLocationNoteEventHandler
if(requestEntities.Count>0 && entity.Details.Count>0) if(requestEntities.Count>0 && entity.Details.Count>0)
{ {
bool isDone = false; bool isDone = false;
var requestDetail = requestEntities[0].Details.FirstOrDefault(p => p.ItemCode == entity.Details[0].ItemCode); foreach(var item in requestEntities[0].Details)
if(requestDetail != null)
{ {
requestDetail.ReceivedQty += entity.Details[0].HandledQty; var noteDetail = entity.Details.FirstOrDefault(p => p.ItemCode == item.ItemCode);
if(requestDetail.IssuedQty == requestDetail.ReceivedQty) if(noteDetail != null)
{ {
isDone = true; item.ReceivedQty += noteDetail.HandledQty;
} }
} }
foreach(var item in requestEntities[0].Details.FindAll(p=>p.ItemCode!= entity.Details[0].ItemCode)) foreach(var item in requestEntities[0].Details)
{ {
if(item.IssuedQty == item.ReceivedQty) if(item.IssuedQty == item.ReceivedQty)
{ {

Loading…
Cancel
Save