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

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs

@@ -48,8 +48,8 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
             if (item.OprType == OprTypeEnum.SplitBox || item.OprType == OprTypeEnum.MergeBox)
             {
                 //设置顶级箱码
-                item.FromTopPackingCode = GetTopPackingCode(query, item.FromPackingCode);
+                item.FromTopPackingCode = CalcuTopPackingCode(query, item.FromPackingCode);
-                item.ToTopPackingCode = GetTopPackingCode(query, item.FromPackingCode); //ToPackingCode
+                item.ToTopPackingCode = CalcuTopPackingCode(query, item.FromPackingCode); //ToPackingCode
                 if (item.FromTopPackingCode.IsNullOrEmpty())
                 {
                     item.FromTopPackingCode = item.FromPackingCode;
@@ -204,7 +204,7 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
     /// <param name="historyQuery">箱码历史</param>
     /// <param name="packingCode">箱码，from to时都传入from</param>
     /// <returns></returns>
-    private static string GetTopPackingCode(IQueryable<SplitPackingRec> historyQuery, string packingCode)
+    private static string CalcuTopPackingCode(IQueryable<SplitPackingRec> historyQuery, string packingCode)
     {
         var qry = historyQuery.Where(itm => itm.OprType == OprTypeEnum.SplitBox || itm.OprType == OprTypeEnum.MergeBox);
         string ret = null;