Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Api/Controllers/ClientLogController.cs

@@ -0,0 +1,37 @@
+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
+{
+    /// <summary>
+    /// 前端记录日志
+    /// </summary>
+    [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());
+        }
+    }
+}

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>
             上传下载中心

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)
             {