From 14c18c3ce10b10ead4392498829560068b946415 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Thu, 19 Oct 2023 09:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=B4=A7=E7=BA=B8?=
 =?UTF-8?q?=E6=AF=94=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskShippingOrderCompareService.cs        | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs
index 9a851b62..28701492 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs
@@ -182,7 +182,8 @@ namespace Myshipping.Application
                                 isComplete = true;
                             }
 
-                            if (yardStatInfo.ExistsCtnNo < yardStatInfo.ContaNum)
+                            //判断 有箱号的条数跟总计箱数量不一致 认为是反场前比对
+                            if ((yardStatInfo.ExistsCtnNo < yardStatInfo.ContaNum))
                                 isBefore = true;
                         }
                         
@@ -208,10 +209,29 @@ namespace Myshipping.Application
                             }
                             else
                             {
+                                bool isBeforeEqual = false;
+                                var checkList = compareResult.extra.ShowDetailList.Where(b => 
+                                     (b.PCode == null || b.PCode == "") && b.IsDisplay &&
+                                     (b.FieldCode.ToUpper() != "PKGS" && b.FieldCode.ToUpper() != "KGS" && b.FieldCode.ToUpper() != "CBM"))
+                                    .ToList();
+
+                                if (!checkList.Any(t => t.IsDiff))
+                                {
+                                    isBeforeEqual = true;
+                                }
+
                                 if (isBefore)
                                 {
-                                    orderInfo.LstShipOrderCompareRlt = "BEFORE_DIFF";
-                                    orderInfo.LstShipOrderCompareRltName = "返场前比对有差异";
+                                    if (isBeforeEqual)
+                                    {
+                                        orderInfo.LstShipOrderCompareRlt = "BEFORE_EQUAL";
+                                        orderInfo.LstShipOrderCompareRltName = "返场前比对正常";
+                                    }
+                                    else
+                                    {
+                                        orderInfo.LstShipOrderCompareRlt = "BEFORE_DIFF";
+                                        orderInfo.LstShipOrderCompareRltName = "返场前比对有差异";
+                                    }
                                 }
                                 else
                                 {