From 63608d7eeb5eee1c90d193bf36a3b6684ee148cf Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 11 Apr 2024 16:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml         | 5 +++++
 src/WMS.Web.Domain/Entitys/SerialNumbers.cs        | 9 +++++++++
 src/WMS.Web.Domain/Services/SerialNumberService.cs | 4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index c4d4b592..d70c4aed 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2190,6 +2190,11 @@
             <param name="type"></param>
             <param name="boxId"></param>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.ChangeBox(System.Boolean)">
+            <summary>
+            改箱
+            </summary>
+        </member>
         <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.TakeStock(System.Int32)">
             <summary>
             盘点
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
index 915c6b76..a5dabe38 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
@@ -183,6 +183,15 @@ namespace WMS.Web.Domain.Entitys
                 this.IsDelete = true;
         }
         /// <summary>
+        /// 改箱
+        /// </summary>
+        public void ChangeBox(bool IsDestBoxInventory)
+        {
+            //（状态为非冻结且激活）改到未上架的箱子内，对应序列号需要修改状态为冻结且激活
+            if (IsActivate == true && IsDelete != true && IsDestBoxInventory == false)
+                this.IsDelete = true;
+        }
+        /// <summary>
         /// 盘点
         /// </summary>
         public void TakeStock(int boxId)
diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs
index 102fbaf4..73b59b6e 100644
--- a/src/WMS.Web.Domain/Services/SerialNumberService.cs
+++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs
@@ -54,6 +54,7 @@ namespace WMS.Web.Domain.Services
             var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
             var boxIds = changeBoxRecords.Select(s => s.DestBoxId).ToList();
             var boxList = await _boxRepositories.GetEntityList(boxIds);
+            var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
             var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
             IDbContextTransaction _transaction = null;
             if (isTransaction)
@@ -67,7 +68,8 @@ namespace WMS.Web.Domain.Services
                 var box = boxList.FirstOrDefault(f => f.Id == destBox.DestBoxId);
                 //修改序列号和箱绑定关系
                 entity.Bind(destBox.DestBoxId, box.CompleteCartonTime);
-
+                var boxInventory = boxInventorys.FirstOrDefault(f => f.BoxId == destBox.DestBoxId);
+                entity.ChangeBox(boxInventory == null ? false : true);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()