From 5da6757283166b5653f42272728625f134aa90c6 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Thu, 29 May 2025 16:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E7=9A=84=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 279122 -> 279122 bytes
 .../SerialNumbersRepositories.cs              |  16 ++++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index b2c375e3e3d270d144e6ea53d36219fe19668efc..fa1f49aa262e3c564499aad8b9b022028701f57f 100644
GIT binary patch
delta 3087
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
J%uAFq@m~tZsa600

delta 3284
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
C4;5bk

diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 1b279245..bb85812f 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -317,17 +317,25 @@ namespace WMS.Web.Repositories
             if (entity.boxInventory != null)
                 response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
             response.IsTwo = entity.serial.IsTwo;
-            if (entity.serial.TwoSerialNumber != null)
+            if (entity.serial.IsTwo > 1)
             {
-                response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber, "").Replace(",", "");
-                response.IsNotCount = entity.serial.IsNotCount;
+                if (entity.serial.TwoSerialNumber != null)
+                {
+                    response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber, "").Replace(",", "");
+                    response.IsNotCount = entity.serial.IsNotCount;
+                }
+                else
+                {
+                    response.TwoSerialNumber = "";
+                    response.IsNotCount = "0";
+                }
             }
             else
             {
                 response.TwoSerialNumber = "";
                 response.IsNotCount = "0";
             }
-            response.IsNotCount = entity.serial.IsNotCount;
+                response.IsNotCount = entity.serial.IsNotCount;
 
             return response;
         }