From 27d8caaa4934effc078af33185efecf4977b0abc Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Tue, 6 Aug 2024 15:13:30 +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

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 275060 -> 275060 bytes
 src/WMS.Web.Api/Controllers/TestController.cs |   3 +++
 .../Infrastructure/IInStockRepositories.cs    |   2 +-
 src/WMS.Web.Domain/Services/InStockService.cs |   7 +++++--
 .../InStockRepositories.cs                    |  14 +++++++++-----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 360253209bbdfbd3a83ca00fdf5c4f7b3fe065c9..3e87cec1f2a8a975731c3cb09ea6d4603fb3daa2 100644
GIT binary patch
delta 4367
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
OeWz}T7Ja9B{qFzc<d<Rq

delta 3757
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

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index cb35eef8..9aa805ae 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -88,6 +88,9 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
+          //  List<int> boxIds = new List<int>();
+          //  boxIds.Add(5324);
+          //var b=  await _inStockService.UnBind(boxIds, true);
             //var b= await _boxService.Sync(null);
             //var list = await _outStockTaskRepositories.GetEntityList(new List<int> { 14321 });
 
diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
index bc297b81..f65f15eb 100644
--- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
@@ -134,6 +134,6 @@ namespace WMS.Web.Domain.Infrastructure
         /// </summary>
         /// <param name="boxIds"></param>
         /// <returns></returns>
-        Task<List<InStockDetails>> GetListBy(List<int> boxIds);
+        Task<List<InStock>> GetListBy(List<int> boxIds);
     }
 }
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index de3b4c12..ba280431 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using Npoi.Mapper;
 using StackExchange.Redis;
 using System;
 using System.Collections.Concurrent;
@@ -1135,8 +1136,10 @@ namespace WMS.Web.Domain.Services
             var list = await _inStockRepositories.GetListBy(t_boxIds);
 
             //解绑
-            list.ForEach(x => { x.UnBind = true; });
-
+            list.SelectMany(s => s.Details)
+                .Where(w => t_boxIds.Contains(w.BoxId))
+                .ForEach(f => f.UnBind = true);
+            
             if (list.Count != 0)
             {
                 var isSuccess = await _inStockRepositories.UpdateRange(list, isTransaction);
diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs
index 0ab1e313..5eba7399 100644
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
+using Org.BouncyCastle.Crypto;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -113,7 +114,7 @@ namespace WMS.Web.Repositories
         /// <returns></returns>
         public async Task<(object obj, int total)> GetListField(InStockQueryRequest dto, int companyId)
         {
-            var res= await GetPagedList(dto, companyId);
+            var res = await GetPagedList(dto, companyId);
             return (res.list, res.total);
         }
 
@@ -502,12 +503,15 @@ namespace WMS.Web.Repositories
                 .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)
+        public async Task<List<InStock>> GetListBy(List<int> boxIds)
         {
-            var entitys = await _context.InStockDetails.AsNoTracking()
-                .Where(x => boxIds.Contains(x.BoxId) && (x.UnBind == null || x.UnBind == false))
+            var res = await _context.Instock
+                .Include(s => s.Details)
+                .Include(s => s.ErpDetails)
+                .Where(f => f.Details.Where(w => boxIds.Contains(w.BoxId)).Count() > 0)
                 .ToListAsync();
-            return entitys;
+
+            return res.Clone();
         }
     }
 }