From d535b20816aeb69d71a777b689a27f38d67dde9b Mon Sep 17 00:00:00 2001
From: liuyunfeng <yunfeng.liu@ccwin-in.com>
Date: Fri, 24 May 2024 09:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=AE=B1=E7=A0=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E6=9C=AA=E6=8B=86?=
 =?UTF-8?q?=E7=AE=B1=EF=BC=8C=E7=AE=B1=E7=A0=81=E6=A0=87=E9=A2=98=E6=98=AF?=
 =?UTF-8?q?=E6=8B=86=E7=AE=B1=E7=AE=B1=E7=A0=81=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SplitPackings/SplitPackingRecManager.cs     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs
index 3e331098e..300f6dba1 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs
@@ -107,10 +107,11 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
     public async Task<List<SplitPackingRec>> GetListByToPackingCode(List<string> toPackingCodeList)
     {
         List<SplitPackingRec> ret = new List<SplitPackingRec>();
+
         List<SplitPackingRec> lst = await _repository.GetListAsync(
             itm => toPackingCodeList.Contains(itm.ToPackingCode)
-            && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
-
+            ).ConfigureAwait(false); //&& itm.OprType == OprTypeEnum.SplitBox
+        //按to箱码分组，取最后一条记录
         foreach (string toCode in toPackingCodeList)
         {
             var obj = lst.Where(itm => itm.ToPackingCode == toCode)
@@ -152,9 +153,10 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
     public async Task<List<SplitPackingRec>> GetListByFromPackingCode(List<string> fromPackingCodeList)
     {
         List<SplitPackingRec> ret = new List<SplitPackingRec>();
+
         List<SplitPackingRec> lst = await _repository.GetListAsync(
             itm => fromPackingCodeList.Contains(itm.FromPackingCode)
-            && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
+            ).ConfigureAwait(false); //&& itm.OprType == OprTypeEnum.SplitBox
 
         foreach (string fromCode in fromPackingCodeList)
         {
@@ -174,11 +176,14 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
     /// <returns></returns>
     public async Task<SplitPackingRec> GetTopPackingCode(string packingCode)
     {
-        SplitPackingRec entity = new SplitPackingRec();
-        SplitPackingRec item = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
-        if (item != null)
+        SplitPackingRec entity = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
+        if (entity == null)
         {
             entity = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.Other).ConfigureAwait(false);
+            if (entity == null)
+            {
+                entity = new SplitPackingRec();
+            }
         }
         return entity;
     }