From 513a2f1a1d3a6178e674fd64eaa8d2c3e3fc9e74 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 1 Aug 2024 10:43:55 +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    | 28 +++++++++++++++++++
 .../InStockRepositories.cs                    |  2 +-
 2 files changed, 29 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 c4ffb2ac..1b2a8316 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -848,6 +848,11 @@
             箱ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockDetails.UnBind">
+            <summary>
+            是否解绑
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockDetails.ErpDetailId">
             <summary>
             对应金蝶的明细ID
@@ -2948,6 +2953,13 @@
             <param name="boxIds"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IInStockRepositories.GetListBy(System.Collections.Generic.List{System.Int32})">
+            <summary>
+            集合：根据boxIDS
+            </summary>
+            <param name="boxIds"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IInStockTaskBoxRepositories">
             <summary>
             箱与任务单绑定（收货）关系表-仓储接口
@@ -3642,6 +3654,14 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.IInStockService.UnBind(System.Collections.Generic.List{System.Int32},System.Boolean)">
+            <summary>
+            解绑-收货的箱子
+            </summary>
+            <param name="boxIds"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.IInStockTaskBoxService">
             <summary>
             任务单的箱收货记录服务
@@ -5308,6 +5328,14 @@
             <param name="sc_erpService"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.InStockService.UnBind(System.Collections.Generic.List{System.Int32},System.Boolean)">
+            <summary>
+            解绑箱子
+            </summary>
+            <param name="boxIds"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.InStockTaskBoxService">
             <summary>
             任务单的箱收货记录服务
diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs
index 1bfad3c8..0ab1e313 100644
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -499,7 +499,7 @@ namespace WMS.Web.Repositories
             return await _context.InStockDetails
                  .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
                 .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
-                .Where(x => boxIds.Contains(x.detail.BoxId) && x.order.Type != InstockType.Purchase).Select(s => s.detail.BoxId).ToListAsync();
+                .Where(x => boxIds.Contains(x.detail.BoxId) && x.order.Type != InstockType.Purchase && (x.detail.UnBind == null || x.detail.UnBind == false)).Select(s => s.detail.BoxId).ToListAsync();
         }
 
         public async Task<List<InStockDetails>> GetListBy(List<int> boxIds)