From b5fd86f270951e2cfbc9889d10c606f7ef2f553c Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 14 Jun 2024 10:59:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E4=BD=9C=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 274420 -> 274420 bytes src/WMS.Web.Api/Controllers/TestController.cs | 4 ++-- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 10 +++++++++ src/WMS.Web.Domain/Entitys/InstockTask.cs | 13 +++++++++++ src/WMS.Web.Domain/Entitys/OutStockTask.cs | 21 ++++++++++++++++++ .../Services/InStockTaskService.cs | 15 +++++++++++-- .../Services/OutStockTaskService.cs | 15 +++++++++++-- 7 files changed, 72 insertions(+), 6 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index c636cfb08b52a7949e8e6cc4924850577f73bf02..99a822427c2ce4953c54992125a570801c2c902c 100644 GIT binary patch delta 29425 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 TestHJ() - {// - var b= await _boxService.Sync(null); + { + //var b= await _boxService.Sync(null); //var list = await _outStockTaskRepositories.GetEntityList(new List { 14321 }); //await _outStockRepositories.GetEntityListBySerialNumbers(new List() { "131VU-32C5A" }); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 3d31cb23..b22a842f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1046,6 +1046,11 @@ 作废 + + + 反作废 + + 创建订单号 @@ -1914,6 +1919,11 @@ 作废 + + + 反作废 + + 合并 diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index 5cf95dd4..9a745305 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -127,6 +127,19 @@ namespace WMS.Web.Domain.Entitys } + /// + /// 反作废 + /// + public void NoRepeal(int repealerId, List detailsIds) + { + this.RepealerId = 0; + this.RepealTime = null; + //明细行作废 + this.Details.Where(x => detailsIds.Contains(x.Id)).ToList().ForEach(x => { x.IsRepeal = false; }); + + this.ChangeInstockStatus();//重新计算单据的状态 + } + /// /// 创建订单号 diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 7f765cdd..1384008f 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -207,6 +207,27 @@ namespace WMS.Web.Domain.Entitys GenerateStatus(); } /// + /// 反作废 + /// + public void NoRepeal(int creatorId, List ids) + { + this.OperatorId = 0; + this.OperateTime = null; + foreach (var d in this.Details.Where(w => ids.Contains(w.Id))) + { + d.IsRepeal = false; + } + + var details = this.Details.Where(w => w.IsRepeal != true).ToList(); + + if (details.Where(w => w.RealityQty <= 0).Count() == details.Count()) + this.Status = OutStockStatus.Wait; + else if (details.Where(w => w.RealityQty >= w.AccruedQty).Count() == details.Count()) + this.Status = OutStockStatus.Already; + else + this.Status = OutStockStatus.Part; + } + /// /// 合并 /// /// diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 84ab2ffa..02493b6a 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -672,9 +672,20 @@ namespace WMS.Web.Domain.Services /// /// /// - public Task NoRepeal(OperateRequest dto, LoginInDto loginInfo) + public async Task NoRepeal(OperateRequest dto, LoginInDto loginInfo) { - throw new NotImplementedException(); + var list = await _inStockTaskRepositories.GetListByDetailIds(dto.Ids); + foreach (var entity in list) + { + var det_ids = entity.Details.Select(s => s.Id).ToList(); + var change_ids = det_ids.Intersect(dto.Ids).ToList(); + //作废 + entity.NoRepeal(loginInfo.UserInfo.StaffId, change_ids); + } + var isSuccess = await _inStockTaskRepositories.UpdateRange(list, true); + 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 275c9b14..1521cb18 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -98,9 +98,20 @@ namespace WMS.Web.Domain.Services /// /// /// - public Task NoRepeal(OperateRequest dto, LoginInDto loginInfo) + public async Task NoRepeal(OperateRequest dto, LoginInDto loginInfo) { - throw new NotImplementedException(); + var list = await _outStockTaskRepositories.GetEntityListByDetailIds(dto.Ids); + foreach (var entity in list) + { + List e_ids = entity.Details.Select(s => s.Id).ToList(); + var j_ids = e_ids.Intersect(dto.Ids).ToList(); + //反作废 + entity.NoRepeal(loginInfo.UserInfo.StaffId, j_ids); + } + var isSuccess = await _outStockTaskRepositories.EditEntityList(list, true); + if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + + return Result.ReSuccess(); } /// /// 出库任务合并