diff --git a/src/WMS.Web.Api/Controllers/ClientLogController.cs b/src/WMS.Web.Api/Controllers/ClientLogController.cs index de69a0d5..edda7bcc 100644 --- a/src/WMS.Web.Api/Controllers/ClientLogController.cs +++ b/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()); } + + /// + /// 前端记录日志(数组) + /// + /// + /// + [HttpPost] + [Route("Logs")] + public Task Logs(List dto) + { + _Logger.LogInformation($"前端日志(数组) 时间:{DateTime.Now} 内容:{JsonConvert.SerializeObject(dto)}"); + return Task.FromResult(Result.ReSuccess()); + } + } + /// + /// 消息数组 + /// + [Serializable] + public class LogRequest + { + /// + /// 消息内容数组 + /// + public List logs { get; set; } = new List(); } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index b6c7be3c..58d9c22f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -101,6 +101,23 @@ + + + 前端记录日志(数组) + + + + + + + 消息数组 + + + + + 消息内容数组 + + 上传下载中心 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 66f21286..f1113b5a 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -481,9 +481,14 @@ 原箱仓位 - + + + 原箱仓库 + + + - 目标箱的仓库或重新上架选择仓位对应的仓库 + 原箱组织编码 @@ -491,6 +496,11 @@ 目标箱仓位或重新上架选择仓位 + + + 目标箱的仓库或重新上架选择仓位对应的仓库 + + 目标箱组织编码 diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index 6c59fd4f..41d4a1c6 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -49,32 +49,33 @@ namespace WMS.Web.Domain.Entitys /// [Column("DestBoxId")] public int DestBoxId { get; set; } - ///// - ///// 原箱仓位 - ///// - //[Column("SrcSubStockId")] - //public int SrcSubStockId { get; set; } /// /// 原箱仓位 /// [Column("SrcSubStockCode")] public string SrcSubStockCode { get; set; } /// - /// 目标箱的仓库或重新上架选择仓位对应的仓库 + /// 原箱仓库 + /// + [Column("SrcStockCode")] + public string SrcStockCode { get; set; } + /// + /// 原箱组织编码 /// - [Column("DestStockCode")] - public string DestStockCode { get; set; } - ///// - ///// 目标箱仓位或重新上架选择仓位 - ///// - //[Column("DestSubStockId")] - //public int DestSubStockId { get; set; } + [Column("SrcBoxOrgCode")] + public string SrcBoxOrgCode { get; set; } + /// /// 目标箱仓位或重新上架选择仓位 /// [Column("DestSubStockCode")] public string DestSubStockCode { get; set; } /// + /// 目标箱的仓库或重新上架选择仓位对应的仓库 + /// + [Column("DestStockCode")] + public string DestStockCode { get; set; } + /// /// 目标箱组织编码 /// [Column("DestBoxOrgCode")] diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index 092ba4db..1ac8a2bc 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/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; diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index c64ee64c..80c4301a 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1085,6 +1085,7 @@ namespace WMS.Web.Domain.Services.Public /// private async Task BillQueryForMaterialByNumber(string number) { + if (string.IsNullOrEmpty(number)) return null; //2.先登录金蝶-拿到token var token_result = await this.Init(); if (!token_result.IsSuccess) diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 295a901f..b33205b0 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/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), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode), + 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 diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index f56a5882..e5eba78a 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/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), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.moveBox.SrcSubStockCode + s.moveBox.StockCode + s.moveBox.OrgCode), + 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), diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 8d8e40f5..1b868234 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/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,