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

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

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -33,5 +34,29 @@ namespace WMS.Web.Api.Controllers
             _Logger.LogInformation($"前端日志 时间:{DateTime.Now} 内容:{log}");
             return Task.FromResult(Result.ReSuccess());
         }
+
+        /// <summary>
+        /// 前端记录日志(数组)
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Logs")]
+        public Task<Result> Logs(List<LogRequest> dto)
+        {
+            _Logger.LogInformation($"前端日志(数组) 时间:{DateTime.Now} 内容:{JsonConvert.SerializeObject(dto)}");
+            return Task.FromResult(Result.ReSuccess());
+        }
+    }
+    /// <summary>
+    /// 消息数组
+    /// </summary>
+    [Serializable]
+    public class LogRequest
+    {
+        /// <summary>
+        /// 消息内容数组
+        /// </summary>
+        public List<string> logs { get; set; } = new List<string>();
     }
 }

src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml

@@ -101,6 +101,23 @@
             <param name="log"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.ClientLogController.Logs(System.Collections.Generic.List{WMS.Web.Api.Controllers.LogRequest})">
+            <summary>
+            前端记录日志(数组)
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="T:WMS.Web.Api.Controllers.LogRequest">
+            <summary>
+            消息数组
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Api.Controllers.LogRequest.logs">
+            <summary>
+            消息内容数组
+            </summary>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.FileDownManagerController">
             <summary>
             上传下载中心

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -481,9 +481,14 @@
              原箱仓位
             </summary> 
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestStockCode">
+        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcStockCode">
+             <summary>
+             原箱仓库
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcBoxOrgCode">
             <summary>
-            目标箱的仓库或重新上架选择仓位对应的仓库
+            原箱组织编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestSubStockCode">
@@ -491,6 +496,11 @@
              目标箱仓位或重新上架选择仓位
             </summary> 
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestStockCode">
+            <summary>
+            目标箱的仓库或重新上架选择仓位对应的仓库
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestBoxOrgCode">
             <summary>
             目标箱组织编码

src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs

@@ -49,32 +49,33 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         [Column("DestBoxId")]
         public int DestBoxId { get; set; }
-        ///// <summary>
-        ///// 原箱仓位
-        /////</summary> 
-        //[Column("SrcSubStockId")]
-        //public int SrcSubStockId { get; set; }
         /// <summary>
         /// 原箱仓位
         ///</summary> 
         [Column("SrcSubStockCode")]
         public string SrcSubStockCode { get; set; }
         /// <summary>
-        /// 目标箱的仓库或重新上架选择仓位对应的仓库
+        /// 原箱仓库
+        ///</summary> 
+        [Column("SrcStockCode")]
+        public string SrcStockCode { get; set; }
+        /// <summary>
+        /// 原箱组织编码
         /// </summary>
-        [Column("DestStockCode")]
+        [Column("SrcBoxOrgCode")]
-        public string DestStockCode { get; set; }
+        public string SrcBoxOrgCode { get; set; }
-        ///// <summary>
+       
-        ///// 目标箱仓位或重新上架选择仓位
-        /////</summary> 
-        //[Column("DestSubStockId")]
-        //public int DestSubStockId { get; set; }
         /// <summary>
         /// 目标箱仓位或重新上架选择仓位
         ///</summary> 
         [Column("DestSubStockCode")]
         public string DestSubStockCode { get; set; }
         /// <summary>
+        /// 目标箱的仓库或重新上架选择仓位对应的仓库
+        /// </summary>
+        [Column("DestStockCode")]
+        public string DestStockCode { get; set; }
+        /// <summary>
         /// 目标箱组织编码
         /// </summary>
         [Column("DestBoxOrgCode")]

src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs

@@ -169,7 +169,12 @@ namespace WMS.Web.Domain.Services
                     ChangeBoxRecord entity = new ChangeBoxRecord();
                     entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId);
                     //entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
-                    entity.SrcSubStockCode = subStock_s?.Code ?? "";//原乡仓位需要去拉一下库存获取
+                    if (subStock_s != null)
+                    {
+                        entity.SrcSubStockCode = subStock_s.Code;//原乡仓位需要去拉一下库存获取
+                        entity.SrcBoxOrgCode = subStock_s.ErpOrgCode;
+                        entity.SrcStockCode = subStock_s.StockCode;
+                    }
                     if (subStock != null)
                     {
                         //entity.DestSubStockId = dt.SubStockId;

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -1085,6 +1085,7 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         private async Task<ErpMaterialDto> BillQueryForMaterialByNumber(string number)
         {
+            if (string.IsNullOrEmpty(number)) return null;
             //2.先登录金蝶-拿到token
             var token_result = await this.Init();
             if (!token_result.IsSuccess)

src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs

@@ -172,8 +172,8 @@ namespace WMS.Web.Repositories
                 DestBox = s.destBox.BoxBillNo,
                 Qty=s.changeBox.Qty,
                 DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
-                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode),
+                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode),
-                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode),
+                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.DestSubStockCode + s.changeBox.DestStockCode + s.changeBox.DestBoxOrgCode),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),
                 CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
                 #endregion

src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs

@@ -181,8 +181,8 @@ namespace WMS.Web.Repositories
                 #region dto组装
                 BillNo = s.moveBox.BillNo,
                 Box = s.box.BoxBillNo,
-                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode),
+                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.moveBox.SrcSubStockCode + s.moveBox.StockCode + s.moveBox.OrgCode),
-                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode),
+                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.moveBox.DestSubStockCode + s.moveBox.StockCode + s.moveBox.OrgCode),
                 Qty = s.moveBox.Qty,
                 Type = s.moveBox.Type.GetRemark(),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId),

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -259,7 +259,7 @@ namespace WMS.Web.Repositories
                 BillNo = s.order.BillNo,
                 Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
                 Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
-                SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockCode),
+                SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.detail.SubStockCode + s.detail.StockCode + s.detail.OrgCode),
                 Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode),
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
                 MaterialNumber = s.detail.MaterialNumber,