修改非生产领退料导入方法

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<UnplannedIssueRequestDetail> newDetails = new List<UnplannedIssueRequestDetail>();
@@ -291,19 +287,22 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
     /// <returns></returns>
     private async Task SetEntityPropertiesAsync(UnplannedIssueRequest entity)
     {
-        //var userName = CurrentUser.GetUserName();
+        var userName = CurrentUser.GetUserName();
-
+        if (userName != null)
-        //var department = await _departmentAppService.GetByUsernameAsync(userName).ConfigureAwait(false);
+        {
+            var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false);
 
-        //if (department != null)
+            if (department != null)
-        //{
+            {
-        //    entity.DeptCode = department.Code;
+                entity.DeptCode = department.Code;
-        //    entity.DeptName = department.Name;
+                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);
     }

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;
         }