diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 3bcbb831..2068eb1a 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/OutStockController.cs b/src/WMS.Web.Api/Controllers/OutStockController.cs index 15a41af3..7c03339f 100644 --- a/src/WMS.Web.Api/Controllers/OutStockController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockController.cs @@ -131,5 +131,21 @@ namespace WMS.Web.Api.Controllers //return await _outStockService.Sync(dto, loginInfo); return Task.FromResult(Result.ReSuccess()); } + + /// + /// 修改出库箱信息 + /// + /// + /// + [HttpPost] + [Route("EditBoxInfo")] + public async Task EditBoxInfo(List dto) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + return await _outStockService.EditBoxInfo(dto, loginInfo); + } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 3dc39c57..9b7a6940 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -478,6 +478,13 @@ + + + 修改出库箱信息 + + + + 出库计划单 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index f000040e..ab41b3c9 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -5039,6 +5039,41 @@ 出库时间 + + + 箱长 + + + + + 箱宽 + + + + + 箱高 + + + + + 箱重 + + + + + 序号 + + + + + 出库单Id + + + + + 出库单对应箱明细Id + + 出库任务单详情 @@ -5299,6 +5334,41 @@ 序列号 + + + 修改出库箱信息 + + + + + 箱长 + + + + + 箱宽 + + + + + 箱高 + + + + + 箱重 + + + + + 出库单Id + + + + + 出库单对应箱明细Id + + 出库单详情 @@ -5519,6 +5589,26 @@ 序列号集 + + + 箱长 + + + + + 箱宽 + + + + + 箱高 + + + + + 箱重 + + 组织Id(所有列表页都需要 全局) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 18545ba5..5a0243a8 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1739,6 +1739,18 @@ 生成单据号 + + + 修改箱信息 + + + + + + + + + 对应金蝶的明细 @@ -1774,6 +1786,36 @@ 出库数量 + + + 箱长 + + + + + 箱宽 + + + + + 箱高 + + + + + 箱重 + + + + + 修改人 + + + + + 修改时间 + + wms出库单明细 @@ -3821,6 +3863,13 @@ 出库服务 + + + 修改出库箱信息 + + + + 上传文件 @@ -5583,6 +5632,15 @@ + + + 修改出库箱信息 + + + + + + 出库任务 diff --git a/src/WMS.Web.Core/Dto/OutStock/EditBoxInfoRequest.cs b/src/WMS.Web.Core/Dto/OutStock/EditBoxInfoRequest.cs new file mode 100644 index 00000000..486d3f5c --- /dev/null +++ b/src/WMS.Web.Core/Dto/OutStock/EditBoxInfoRequest.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.OutStock +{ + /// + /// 修改出库箱信息 + /// + public class EditBoxInfoRequest + { + /// + /// 箱长 + /// + public decimal? BoxLength { get; set; } = null; + /// + /// 箱宽 + /// + public decimal? BoxWide { get; set; } = null; + /// + /// 箱高 + /// + public decimal? BoxHigh { get; set; } = null; + /// + /// 箱重 + /// + public decimal? BoxWeight { get; set; } = null; + /// + /// 出库单Id + /// + public int OutStockId { get; set; } = 0; + /// + /// 出库单对应箱明细Id + /// + public int OutStockBoxDetailsId { get; set; } = 0; + } +} diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs index d1b25385..c27ec8f4 100644 --- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs +++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs @@ -51,5 +51,21 @@ namespace WMS.Web.Core.Dto.OutStock /// 序列号集 /// public List SerialNumbers { get; set; } = new List(); + /// + /// 箱长 + /// + public decimal? BoxLength { get; set; } = null; + /// + /// 箱宽 + /// + public decimal? BoxWide { get; set; } = null; + /// + /// 箱高 + /// + public decimal? BoxHigh { get; set; } = null; + /// + /// 箱重 + /// + public decimal? BoxWeight { get; set; } = null; } } diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs index 14477997..886a70da 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs @@ -57,5 +57,33 @@ namespace WMS.Web.Core.Dto.OutStockTask /// 出库时间 /// public string CreateTime { get; set; } + /// + /// 箱长 + /// + public decimal? BoxLength { get; set; } = null; + /// + /// 箱宽 + /// + public decimal? BoxWide { get; set; } = null; + /// + /// 箱高 + /// + public decimal? BoxHigh { get; set; } = null; + /// + /// 箱重 + /// + public decimal? BoxWeight { get; set; } = null; + /// + /// 序号 + /// + public int IndexNumber { get; set; } = 0; + /// + /// 出库单Id + /// + public int OutStockId { get; set; } = 0; + /// + /// 出库单对应箱明细Id + /// + public int OutStockBoxDetailsId { get; set; } = 0; } } diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index c6b6ffab..802ec112 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -1,9 +1,11 @@ -using System; + +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using WMS.Web.Core; +using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Values; namespace WMS.Web.Domain.Entitys @@ -207,5 +209,31 @@ namespace WMS.Web.Domain.Entitys } this.BillNo = "CK" + idStr; } + /// + /// 修改箱信息 + /// + /// + /// + /// + /// + /// + /// + /// + public Result EditBoxInfo(int boxDetailsId, decimal? boxLength, decimal? boxWide, decimal? boxHigh, decimal? boxWeight, int userId) + { + var boxDetail = this.Details.SelectMany(s => s.BoxsDetails).FirstOrDefault(f => f.Id == boxDetailsId); + if (boxDetail == null) return Result.ReFailure(ResultCodes.NoDateError); + if (boxDetail.BoxLength != boxLength || boxDetail.BoxWide != boxWide || + boxDetail.BoxHigh != boxHigh || boxDetail.BoxWeight != boxWeight) + { + boxDetail.BoxLength = boxLength; + boxDetail.BoxWide = boxWide; + boxDetail.BoxHigh = boxHigh; + boxDetail.BoxWeight = boxWeight; + boxDetail.UpdateId = userId; + boxDetail.UpdateDate = DateTime.Now; + } + return Result.ReSuccess(); + } } } diff --git a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs index 7090c6f2..b257c377 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs @@ -49,5 +49,35 @@ namespace WMS.Web.Domain.Entitys /// [Column("Qty")] public decimal Qty { get; set; } + /// + /// 箱长 + /// + [Column("BoxLength")] + public decimal? BoxLength { get; set; } = null; + /// + /// 箱宽 + /// + [Column("BoxWide")] + public decimal? BoxWide { get; set; } = null; + /// + /// 箱高 + /// + [Column("BoxHigh")] + public decimal? BoxHigh { get; set; } = null; + /// + /// 箱重 + /// + [Column("BoxWeight")] + public decimal? BoxWeight { get; set; } = null; + /// + /// 修改人 + /// + [Column("UpdateId")] + public int? UpdateId { get; set; } + /// + /// 修改时间 + /// + [Column("UpdateDate")] + public DateTime? UpdateDate { get; set; } = null; } } diff --git a/src/WMS.Web.Domain/IService/IOutStockService.cs b/src/WMS.Web.Domain/IService/IOutStockService.cs index 73389d95..696b03c8 100644 --- a/src/WMS.Web.Domain/IService/IOutStockService.cs +++ b/src/WMS.Web.Domain/IService/IOutStockService.cs @@ -19,6 +19,11 @@ namespace WMS.Web.Domain.IService Task Save(SaveOutStockRequest dto, LoginInDto loginInfo); // 同步金蝶 Task Sync(OperateRequest dto, LoginInDto loginInfo, bool isRepeatSync = true); - + /// + /// 修改出库箱信息 + /// + /// + /// + Task EditBoxInfo(List dto, LoginInDto loginInfo); } } diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index c9b0b6a2..507b935c 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -359,5 +359,27 @@ namespace WMS.Web.Domain.Services _logger.LogInformation($"同步金蝶成功"); return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First()); } + /// + /// 修改出库箱信息 + /// + /// + /// + /// + /// + public async Task EditBoxInfo(List dto, LoginInDto loginInfo) + { + var ids = dto.Select(s => s.OutStockId).ToList(); + var entityList = await _outStockRepositories.GetEntityList(ids); + foreach (var d in dto) + { + var entity = entityList.FirstOrDefault(f => f.Id == d.OutStockId); + if (entity == null) return Result.ReFailure(ResultCodes.NoDateError); + var res = entity.EditBoxInfo(d.OutStockBoxDetailsId, d.BoxLength, d.BoxWide, d.BoxHigh, d.BoxWeight, loginInfo.UserInfo.StaffId); + if (!res.IsSuccess) return res; + } + var isSuccess = await _outStockRepositories.EditEntityList(entityList); + if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + return Result.ReSuccess(); + } } } diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index afed4fe6..77383ad9 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -574,6 +574,12 @@ namespace WMS.Web.Domain.Services OutStockTaskInfoDetailsResponse infoDetail = new OutStockTaskInfoDetailsResponse() { BoxBillNo = boxList.FirstOrDefault(f => f.Id == b.BoxId)?.BoxBillNo ?? "", + OutStockId= outStock.Id, + OutStockBoxDetailsId=b.Id, + BoxLength =b.BoxHigh, + BoxWide=b.BoxWide, + BoxHigh=b.BoxHigh, + BoxWeight=b.BoxWeight, Qty = b.Qty, SerialNumbers = string.Join(",", b.SerialNumbers), SerialNumberList = b.SerialNumbers, @@ -589,6 +595,10 @@ namespace WMS.Web.Domain.Services }; response.Details.Add(infoDetail); } + //排序和加序号值 + response.Details = response.Details.OrderByDescending(s => s.Specifications) + .ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList(); + response.Details.ForEach(f => f.IndexNumber = response.Details.IndexOf(f) + 1); return Result.ReSuccess(response); }