From d97c907a80e404b0f74d6930d96c59aa4d4f66c1 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 16 Mar 2024 10:34:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ClientLogController.cs        | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/WMS.Web.Api/Controllers/ClientLogController.cs

diff --git a/src/WMS.Web.Api/Controllers/ClientLogController.cs b/src/WMS.Web.Api/Controllers/ClientLogController.cs
new file mode 100644
index 00000000..c3b7ea36
--- /dev/null
+++ b/src/WMS.Web.Api/Controllers/ClientLogController.cs
@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using WMS.Web.Core.Internal.Results;
+
+namespace WMS.Web.Api.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class ClientLogController : ControllerBase
+    {
+        private readonly ILogger<ClientLogController> _Logger;
+        public ClientLogController(ILogger<ClientLogController> Logger)
+        {
+            _Logger = Logger;
+        }
+        /// <summary>
+        /// 前端记录日志
+        /// </summary>
+        /// <param name="log"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("Log")]
+        public Task<Result> Log([FromQuery] string log)
+        {
+            _Logger.LogInformation($"前端日志 时间:{DateTime.Now} 内容:{log}");
+            return Task.FromResult(Result.ReSuccess());
+        }
+    }
+}

From ef27bbe57628b08a12e8a425f9dff1d3fe368c30 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 16 Mar 2024 10:36:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/ClientLogController.cs |  3 +++
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml            | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/WMS.Web.Api/Controllers/ClientLogController.cs b/src/WMS.Web.Api/Controllers/ClientLogController.cs
index c3b7ea36..de69a0d5 100644
--- a/src/WMS.Web.Api/Controllers/ClientLogController.cs
+++ b/src/WMS.Web.Api/Controllers/ClientLogController.cs
@@ -9,6 +9,9 @@ using WMS.Web.Core.Internal.Results;
 
 namespace WMS.Web.Api.Controllers
 {
+    /// <summary>
+    /// 前端记录日志
+    /// </summary>
     [Route("api/[controller]")]
     [ApiController]
     public class ClientLogController : ControllerBase
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 73f850d8..b6c7be3c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -89,6 +89,18 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Api.Controllers.ClientLogController">
+            <summary>
+            前端记录日志
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.ClientLogController.Log(System.String)">
+            <summary>
+            前端记录日志
+            </summary>
+            <param name="log"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.FileDownManagerController">
             <summary>
             上传下载中心

From 7c5101fcd2c81eaa1e09bb6487cf7f3dd2a1ef63 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 16 Mar 2024 10:47:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E8=B4=A7=E9=AA=8C=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index 2654efc1..fa5cfb42 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -158,7 +158,7 @@ namespace WMS.Web.Domain.Services
             var subIds = dto.Select(s => s.SubStockId).ToList();
             var subStocks = await _basbicsRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
 
-            var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s=>s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId);
+            var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId);
             foreach (var dt in dto)
             {
                 var subStock = subStocks.FirstOrDefault(f => f.Id == dt.SubStockId);
@@ -257,6 +257,9 @@ namespace WMS.Web.Domain.Services
             _logger.LogInformation($"移箱:{JsonConvert.SerializeObject(dto)} 是否上架:{IsUp} 操作人:{loginInfo.UserInfo.StaffId}");
             //1.下架时 需要验证箱是否在库存里
             var boxIds = dto.Select(s => s.BoxId).ToList();
+            if (boxIds.Distinct().Count() != boxIds.Count())
+                return Result.ReFailure(ResultCodes.BoxOutStockTaskBoxError);
+
             var boxList = await _boxInventoryRepositories.GetList(boxIds);
             if (!IsUp)
             {