From 4f6831855e51aeca2cebd87b6d62c300522eaafd Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 13 Nov 2023 10:09:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A7=BB=E7=AE=B1?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MoveBoxRecordController.cs | 23 +++++++++++++++---- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 11 +++++++-- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 14 ++--------- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 4 ++-- .../MoveBoxRecord/SaveMoveBoxRecordRequest.cs | 16 +++---------- src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 6 ++++- .../IService/IChangeMoveBoxService.cs | 2 +- .../Mappers/MoveBoxRecordMapper.cs | 2 +- .../Services/ChangeMoveBoxService.cs | 7 +++--- 9 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs index cc0df698..51fcbeca 100644 --- a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs +++ b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs @@ -50,19 +50,34 @@ namespace WMS.Web.Api.Controllers return result; } /// - /// 移箱保存-PDA + /// 移箱下架保存-PDA /// /// /// [HttpPost] - [Route("Save")] - public async Task Save(SaveMoveBoxRecordRequest dto) + [Route("Down_Save")] + public async Task Down_Save(SaveMoveBoxRecordRequest 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 _changeMoveBoxService.MoveBoxSave(dto, loginInfo); + return await _changeMoveBoxService.MoveBoxSave(dto,false, loginInfo); + } + /// + /// 移箱上架保存-PDA + /// + /// + /// + [HttpPost] + [Route("Up_Save")] + public async Task Up_Save(SaveMoveBoxRecordRequest 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 _changeMoveBoxService.MoveBoxSave(dto,true, loginInfo); } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 41905ed7..27d75896 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -213,9 +213,16 @@ - + - 移箱保存-PDA + 移箱下架保存-PDA + + + + + + + 移箱上架保存-PDA diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index e6cbb44e..fd52ca1d 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2710,14 +2710,9 @@ 箱号ID - + - 原仓位ID - - - - - 目标仓位ID + 仓位ID @@ -2725,11 +2720,6 @@ 数量 - - - 类型：1-整箱移货上级，2-整箱移货下级 - - 操作 Id集合 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index e44115fd..75bce319 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -733,7 +733,7 @@ 操作时间 - + 创建 @@ -2625,7 +2625,7 @@ - + 移箱保存 diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs index 55ea7fd2..674bfb59 100644 --- a/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs +++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs @@ -16,24 +16,14 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord [Required(ErrorMessage = "箱号不能为空")] public int BoxId { get; set; } /// - /// 原仓位ID + /// 仓位ID /// - [Required(ErrorMessage = "原仓位不能为空")] - public int SrcSubStockId { get; set; } - /// - /// 目标仓位ID - /// - [Required(ErrorMessage = "目标仓位不能为空")] - public int DestSubStockId { get; set; } + [Required(ErrorMessage = "仓位不能为空")] + public int SubStockId { get; set; } /// /// 数量 /// [Required(ErrorMessage = "数量不能为空")] public decimal Qty { get; set; } - /// - /// 类型：1-整箱移货上级，2-整箱移货下级 - /// - [Required(ErrorMessage = "类型不能为空")] - public int Type { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index 10454ccf..30679fcf 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -65,8 +65,12 @@ namespace WMS.Web.Domain.Entitys /// 创建 /// /// - public void Create(int creatorId) + public void Create(MoveBoxType type, int boxId, int subStockId, int creatorId) { + this.BoxId = boxId; + this.Type = type; + SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值 + DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0 this.CreatorId = creatorId; this.CreateTime = DateTime.Now; } diff --git a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs index db52e99c..0241c94f 100644 --- a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs @@ -19,7 +19,7 @@ namespace WMS.Web.Domain.IService //改箱保存 Task ChangeBoxSave(SaveChangeBoxRecordRequest dto, LoginInDto loginInfo, bool isTransaction=true); //移箱保存 - Task MoveBoxSave(SaveMoveBoxRecordRequest dto, LoginInDto loginInfo); + Task MoveBoxSave(SaveMoveBoxRecordRequest dto,bool IsUp, LoginInDto loginInfo); } } diff --git a/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs b/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs index ebcd5e1d..8b3f44db 100644 --- a/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs +++ b/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs @@ -12,7 +12,7 @@ namespace WMS.Web.Domain.Mappers { public MoveBoxRecordMapper() { - CreateMap(); + //CreateMap(); } } } diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index accb5e9b..c71fd02b 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -109,11 +109,10 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task MoveBoxSave(SaveMoveBoxRecordRequest dto, LoginInDto loginInfo) + public async Task MoveBoxSave(SaveMoveBoxRecordRequest dto, bool IsUp, LoginInDto loginInfo) { - var entity = _mapper.Map(dto); - entity.Create(loginInfo.UserInfo.StaffId); - + var entity = new MoveBoxRecord(); + entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, dto.BoxId, dto.SubStockId, loginInfo.UserInfo.StaffId); //需要填写规格型号 //需要修改库存 From c8acf0d84e620796f7a3af953d18b2fcf03d0dd5 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 13 Nov 2023 10:24:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/SerialNumberService.cs | 25 +++++++++++++------ .../Values/SerialNumberOperateType.cs | 13 +++++++--- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 73adc4c5..3d65c963 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -57,11 +57,11 @@ namespace WMS.Web.Domain.Services List sList = new List(); foreach (var entity in entityList) { - var destBoxId = changeBoxRecords.FirstOrDefault(f => f.SerialNumbers.Contains(entity.SerialNumber)).DestBoxId; + var destBox = changeBoxRecords.FirstOrDefault(f => f.SerialNumbers.Contains(entity.SerialNumber)); //修改序列号和箱绑定关系 - entity.Operate(destBoxId); + entity.Operate(destBox.DestBoxId); - var box = boxList.FirstOrDefault(f=>f.Id==destBoxId); + var box = boxList.FirstOrDefault(f => f.Id == destBox.DestBoxId); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { @@ -72,8 +72,14 @@ namespace WMS.Web.Domain.Services OperateTime = DateTime.Now, OperateType = SerialNumberOperateType.ChangeBox, OperateUser = userName, - Remark = "箱号:" + box.BoxBillNo + Remark = "单号:" + destBox.BillNo + "\r\n" + "箱号:" + box.BoxBillNo }; + //取目标箱子仓位 记录目标箱仓位号 + //if (moveBoxRecord.Type == MoveBoxType.Up) + //{ + //var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId); + //op.Remark += "\r\n" + "仓位:" + srcSubStock; + //} sList.Add(op); } isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); @@ -106,7 +112,7 @@ namespace WMS.Web.Domain.Services var entityList = await _serialNumbersRepositories.GetEntityListByBoxId(moveBoxRecord.BoxId); var box = await _boxRepositories.Get(moveBoxRecord.BoxId); var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId); - + IDbContextTransaction _transaction = null; if (isTransaction) _transaction = _transactionRepositories.GetTransaction(); @@ -126,10 +132,15 @@ namespace WMS.Web.Domain.Services OrgId = box.OrgId, SupplierId = box.SupplierId, OperateTime = DateTime.Now, - OperateType = SerialNumberOperateType.MoveBox, + OperateType = moveBoxRecord.Type == MoveBoxType.Up ? SerialNumberOperateType.MoveBox_Up : SerialNumberOperateType.MoveBox_Down, OperateUser = userName, - Remark = "箱号:" + box.BoxBillNo + Remark = "单号:" + moveBoxRecord.BillNo + "\r\n" + "箱号:" + box.BoxBillNo }; + if (moveBoxRecord.Type == MoveBoxType.Up) + { + var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId); + op.Remark += "\r\n" + "仓位:" + srcSubStock; + } sList.Add(op); } isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); diff --git a/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs b/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs index be3b4231..5198ad40 100644 --- a/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs +++ b/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs @@ -19,14 +19,19 @@ namespace WMS.Web.Domain.Values [EnumRemark("装箱")] CompleteCartonBox = 1, /// - /// 移箱 + /// 移箱上架 /// - [EnumRemark("移箱")] - MoveBox = 2, + [EnumRemark("移箱上架")] + MoveBox_Up = 2, + /// + /// 移箱下架 + /// + [EnumRemark("移箱下架")] + MoveBox_Down = 3, /// /// 改箱 /// [EnumRemark("改箱")] - ChangeBox = 3, + ChangeBox = 4, } }