From 04b51a04e38d815de2abcfe992e330c469517d5e Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 25 Dec 2023 16:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E9=80=80=E6=96=99=E5=AF=BC=E5=85=A5=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lannedIssueRequestForDongyangAppService.cs | 33 +++++++++---------- ...nnedReceiptRequestForDongyangAppService.cs | 7 ++-- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index 0ed3c65d4..3cd37ad65 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.Data; +using Volo.Abp.Users; using Win_in.Sfs.Auth.Application.Contracts; using Win_in.Sfs.Basedata.Application.Contracts; using Win_in.Sfs.Shared.Domain; @@ -24,21 +25,19 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA private readonly IDepartmentAppService _departmentApp; private readonly IUnplannedIssueRequestManager _unplannedIssueRequestManager; private readonly IBalanceAppService _balanceAppService; - private readonly IDepartmentAppService _departmentAppService; private readonly ILocationAppService _locationAppService; private readonly ITransactionTypeAclService _transactionTypeAclService; public UnplannedIssueRequestForDongyangAppService(IUnplannedIssueRequestRepository repository, IUnplannedIssueRequestManager unplannedIssueRequestManager, - IDepartmentAppService departmentApp, IBalanceAppService balanceAppService, IDepartmentAppService departmentAppService, ILocationAppService locationAppService, + IDepartmentAppService departmentApp, IBalanceAppService balanceAppService, ILocationAppService locationAppService, ITransactionTypeAclService transactionTypeAclService ) : base(repository, unplannedIssueRequestManager) { _unplannedIssueRequestManager = unplannedIssueRequestManager; _departmentApp = departmentApp; _balanceAppService = balanceAppService; - _departmentAppService = departmentAppService; _locationAppService = locationAppService; _transactionTypeAclService = transactionTypeAclService; } @@ -84,15 +83,12 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA foreach (var unplannedIssueRequest in addList) { - if(unplannedIssueRequest.UnplannedIssueType != EnumUnplannedIssueType.Wip|| unplannedIssueRequest.UnplannedIssueType != EnumUnplannedIssueType.Raw) + if(unplannedIssueRequest.UnplannedIssueType != EnumUnplannedIssueType.Wip&& unplannedIssueRequest.UnplannedIssueType != EnumUnplannedIssueType.Raw) { throw new UserFriendlyException($"【{unplannedIssueRequest.UnplannedIssueType}】领料类型，" + $"不是{EnumUnplannedIssueType.Wip.GetDisplayName()}" + $"或{EnumUnplannedIssueType.Raw.GetDisplayName()}】"); } - unplannedIssueRequest.Worker = CurrentUser.GetUserName(); - unplannedIssueRequest.CreatorId = CurrentUser.Id; - await SetRequestAutoPropertiesAsync(unplannedIssueRequest).ConfigureAwait(false); await SetEntityPropertiesAsync(unplannedIssueRequest).ConfigureAwait(false); List newDetails = new List(); @@ -291,19 +287,22 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA /// private async Task SetEntityPropertiesAsync(UnplannedIssueRequest entity) { - //var userName = CurrentUser.GetUserName(); - - //var department = await _departmentAppService.GetByUsernameAsync(userName).ConfigureAwait(false); + var userName = CurrentUser.GetUserName(); + if (userName != null) + { + var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false); - //if (department != null) - //{ - // entity.DeptCode = department.Code; - // entity.DeptName = department.Name; - //} + if (department != null) + { + entity.DeptCode = department.Code; + entity.DeptName = department.Name; + } - //entity.Worker = userName; + entity.Worker = userName; + entity.CreatorId = CurrentUser.Id; + } - //entity.BuildDate = DateTime.Now; + entity.BuildDate = DateTime.Now; await SetRequestAutoPropertiesAsync(entity).ConfigureAwait(false); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs index 15acdd862..dfdaa344f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs @@ -89,15 +89,12 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ foreach (var unplannedReceiptRequest in addList) { - if (unplannedReceiptRequest.UnplannedReceiptType != EnumUnplannedReceiptType.Wip || unplannedReceiptRequest.UnplannedReceiptType != EnumUnplannedReceiptType.Raw) + if (unplannedReceiptRequest.UnplannedReceiptType != EnumUnplannedReceiptType.Wip && unplannedReceiptRequest.UnplannedReceiptType != EnumUnplannedReceiptType.Raw) { throw new UserFriendlyException($"【{unplannedReceiptRequest.UnplannedReceiptType}】退料料类型，" + $"不是{EnumUnplannedReceiptType.Wip.GetDisplayName()}" + $"或{EnumUnplannedReceiptType.Raw.GetDisplayName()}】"); } - unplannedReceiptRequest.Worker = CurrentUser.GetUserName(); - unplannedReceiptRequest.CreatorId = CurrentUser.Id; - await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false); await SetEntityPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false); @@ -251,7 +248,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ entity.DeptCode = department.Code; entity.DeptName = department.Name; } - + entity.CreatorId = CurrentUser.Id; entity.Worker = userName; }