From d92fc6eff943cf892dfef5aad41163a96ac18558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 14 Nov 2024 17:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTOs/CustomerProductionReturnNoteDTO.cs   |  7 +++++
 .../DTOs/CustomerReturnNoteDTO.cs             |  4 +++
 .../CustomerProductionReturnNoteAppService.cs | 30 ++++++++++++++++++-
 ...erProductionReturnNoteAutoMapperProfile.cs |  1 +
 .../CustomerProductionReturnNote.cs           |  6 ++--
 .../CustomerReturnNotes/CustomerReturnNote.cs |  2 ++
 .../CustomerReturnNoteEventHandler.cs         |  2 ++
 7 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerProductionReturnNotes/DTOs/CustomerProductionReturnNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerProductionReturnNotes/DTOs/CustomerProductionReturnNoteDTO.cs
index eccb90065..6b01b54cb 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerProductionReturnNotes/DTOs/CustomerProductionReturnNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerProductionReturnNotes/DTOs/CustomerProductionReturnNoteDTO.cs
@@ -23,6 +23,13 @@ public class CustomerProductionReturnNoteDTO : SfsStoreDTOBase<CustomerProductio
     public string CustomerCode { get; set; }
 
 
+    /// <summary>
+    ///客户编码
+    /// </summary>
+    [Display(Name = "客户名称")]
+    public string CustomerName { get; set; }
+
+
     /// <summary>
     /// 退料单号
     /// </summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerReturnNotes/DTOs/CustomerReturnNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerReturnNotes/DTOs/CustomerReturnNoteDTO.cs
index 7aa584af3..822c43223 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerReturnNotes/DTOs/CustomerReturnNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CustomerReturnNotes/DTOs/CustomerReturnNoteDTO.cs
@@ -29,4 +29,8 @@ public class CustomerReturnNoteDTO : SfsStoreDTOBase<CustomerReturnNoteDetailDTO
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string Customer { get; set; }
 
+
+
+
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs
index 9cf037964..a7f472f05 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Omu.ValueInjecter;
 using Volo.Abp;
+using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Basedata.Application;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -29,13 +30,16 @@ public class CustomerProductionReturnNoteAppService :
 
     private readonly ICustomerItemAppService _customerItemAppService;
 
+    private readonly ICustomerAppService _customerAppService;
+
     private readonly ISalePriceSheetAppService _salePriceSheetAppService;
 
     public CustomerProductionReturnNoteAppService(
         ICustomerProductionReturnNoteRepository repository
         , ICustomerProductionReturnNoteManager CustomerProductionReturnNoteManager
         , ICustomerItemAppService customerItemAppService,
-        ISalePriceSheetAppService salePriceSheetAppService
+        ISalePriceSheetAppService salePriceSheetAppService,
+        ICustomerAppService customerAppService
     ) : base(repository)
     {
 
@@ -45,6 +49,7 @@ public class CustomerProductionReturnNoteAppService :
         _salePriceSheetAppService = salePriceSheetAppService;
 
         _CustomerProductionReturnNoteManager = CustomerProductionReturnNoteManager;
+        _customerAppService = customerAppService;
     }
 
     /// <summary>
@@ -58,6 +63,25 @@ public class CustomerProductionReturnNoteAppService :
     {
        var entity = ObjectMapper.Map<CustomerProductionReturnNoteEditInput, CustomerProductionReturnNote>(input);
 
+       var customerlist= await _customerAppService.GetByCodesWithPostAsync(new List<string>() { entity.CustomerCode }).ConfigureAwait(false);
+
+        if (customerlist.Count > 0)
+        {
+            entity.CustomerName = customerlist.FirstOrDefault().Name;
+        }
+        else
+        {
+            throw new UserFriendlyException($"未{entity.CustomerCode}查到客户信息!");
+        }
+
+
+             /// <summary>
+             /// 客户名称
+             /// </summary>
+    
+
+
+
        var parts= input.Details.Select(itm => itm.ItemCode).Distinct();
 
        //var ls=await IsExistCustomerItemPrice(parts.ToList(),input.CustomerCode).ConfigureAwait(false);
@@ -154,5 +178,9 @@ public class CustomerProductionReturnNoteAppService :
 
 
 
+    
+
+
+
 
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAutoMapperProfile.cs
index d8a6ef92b..6649e3e53 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAutoMapperProfile.cs
@@ -28,6 +28,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .Ignore(x => x.Number)
             .Ignore(x => x.Id)
             .Ignore(x=>x.Remark)
+            .Ignore(x=>x.CustomerName)
             .Ignore(x=>x.ExtraProperties)
         ;
     }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNote.cs
index 19dc19e07..6cf1d6585 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNote.cs
@@ -26,8 +26,10 @@ public class CustomerProductionReturnNote : SfsStoreAggregateRootBase<CustomerPr
     /// </summary>
     public string CustomerCode { get; set; }
 
-
-
+    /// <summary>
+    /// 客户名称
+    /// </summary>
+    public string CustomerName { get; set; }
     /// <summary>
     /// 退料时间
     /// </summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerReturnNotes/CustomerReturnNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerReturnNotes/CustomerReturnNote.cs
index d32dcb5f9..b0fc04a0e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerReturnNotes/CustomerReturnNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CustomerReturnNotes/CustomerReturnNote.cs
@@ -23,6 +23,8 @@ public class CustomerReturnNote : SfsStoreAggregateRootBase<CustomerReturnNoteDe
     /// </summary>
     public string Customer { get; set; }
 
+
+
     /// <summary>
     /// 明细列表
     /// </summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CustomerReturnNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CustomerReturnNoteEventHandler.cs
index f06e1acc3..c266edda6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CustomerReturnNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CustomerReturnNoteEventHandler.cs
@@ -63,6 +63,8 @@ public class CustomerReturnNoteEventHandler
             transferLog.Worker = customerReturnNote.Worker;
             transferLog.DocNumber = customerReturnNote.Number;
             transferLog.JobNumber = customerReturnNote.JobNumber;
+          
+
 
             transferLogCreateInputs.Add(transferLog);
         }