From c7d815053a36c336a7f2bef29e540b5448005cf8 Mon Sep 17 00:00:00 2001
From: "mingliang.tang" <mingliang.tang@ccwin-in.com>
Date: Thu, 25 May 2023 13:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/BackFluConverter.cs              |  1 +
 .../Outgoing/UnplannedIssueNoteConverter.cs   | 25 +++----------------
 ...Wms.DataExchange.Application.Contracts.xml |  5 ++++
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
index 602b3f018..b498e5fe3 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
@@ -84,6 +84,7 @@ public class BackFluConverter : IIncomingConverter
                 wmsBack.ItemName = "";
                 wmsBack.Uom = "";
             }
+            wmsBack.Worker = "WMS";
             wmsBack.PackingCode = "jiekou";
             wmsBack.LocationCode = "jiekou";
             wmsBack.LocationArea = "jiekou";
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
index a85ad87fe..0f55e3a69 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs
@@ -2,13 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Presentation;
-using Microsoft.AspNetCore.Identity;
-using Nito.AsyncEx;
-using Volo.Abp.Identity;
 using Volo.Abp.ObjectMapping;
-using Volo.Abp.Users;
 using Win_in.Sfs.Auth.Application.Contracts;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp;
@@ -25,21 +19,18 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
     private readonly IOutgoingToExternalManager _outgoingToExternalManager;
     private readonly IDepartmentAppService _departmentAppService;
     private readonly IObjectMapper _objectMapper;
-    private readonly IIdentityUserAppService identityUserAppService;
 
     public UnplannedIssueNoteConverter(
         IOutgoingFromWmsManager outgoingFromWmsManager
         , IOutgoingToExternalManager outgoingToExternalManager
           , IDepartmentAppService departmentAppService
         , IObjectMapper objectMapper
-,
-IIdentityUserAppService identityUserAppService)
+    )
     {
         _outgoingFromWmsManager = outgoingFromWmsManager;
         _outgoingToExternalManager = outgoingToExternalManager;
         _departmentAppService = departmentAppService;
         _objectMapper = objectMapper;
-        this.identityUserAppService = identityUserAppService;
     }
 
     /// <summary>
@@ -58,15 +49,6 @@ IIdentityUserAppService identityUserAppService)
             var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(wmsReceipt);
             var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
             var departmentCode = department == null ? "" : department.Code;
-            if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid))
-            {
-                var user = await identityUserAppService.GetAsync(guid).ConfigureAwait(false);
-                if(user != null)
-                {
-                    exchangeReceipt.Worker = user.UserName;
-                }
-            }
-
             var purchaseOrder = BuildDataInterface(exchangeReceipt);
             var outgoingToExternal = new OutgoingToExternal()
             {
@@ -124,8 +106,9 @@ IIdentityUserAppService identityUserAppService)
     /// </summary>
     /// <param name="exchangeOrder"></param>
     /// <returns></returns>
-    private  Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder)
-    {   
+    private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder)
+    {
+
         var ret = new Wmsoutm()
         {
             wmsoutm_nbr = exchangeOrder.Number,
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
index 35fdcdbee..55c669b1b 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
@@ -1631,6 +1631,11 @@
             操作员
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteExchangeDto.CreatorId">
+            <summary>
+            创建人id
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteExchangeDto.ActiveDate">
             <summary>
             生效日期