From 18b40a4c79f9bf6af2d58a9d4809b3b303970b4c Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Sat, 6 May 2023 09:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=B8=8A=E4=BB=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=88=AA=E8=87=B3?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=85=A5=E6=9C=AA=E6=9F=A5=E5=88=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5=E7=BB=99TYRP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Outgoing/PutawayNoteConverter.cs          | 19 ++++++++++++++++++-
 .../Outgoing/ScontrolWriter.cs                |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs
index 8e98d56a8..2864cc7a4 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs
@@ -17,16 +17,19 @@ public class PutawayNoteConverter : IOutgoingConverter
     private readonly IOutgoingFromWmsManager _outgoingFromWmsManager;
     private readonly IOutgoingToExternalManager _outgoingToExternalManager;
     private readonly IObjectMapper _objectMapper;
+    private readonly IPurchaseOrderAppService _purchaseOrderAppService;
 
     public PutawayNoteConverter(
         IOutgoingFromWmsManager outgoingFromWmsManager
         , IOutgoingToExternalManager outgoingToExternalManager
         , IObjectMapper objectMapper
+      ,IPurchaseOrderAppService purchaseOrderAppService
     )
     {
         _outgoingFromWmsManager = outgoingFromWmsManager;
         _outgoingToExternalManager = outgoingToExternalManager;
         _objectMapper = objectMapper;
+        _purchaseOrderAppService = purchaseOrderAppService;
     }
     public virtual async Task<List<OutgoingToExternal>> ConvertAsync()
     {
@@ -78,6 +81,20 @@ public class PutawayNoteConverter : IOutgoingConverter
                 var exchangeReceiptDetail = _objectMapper.Map<PutawayNoteDetailDTO, PutawayNoteDetailExchangeDto>(detail);
                 outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
                 var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w);
+                try
+                {
+                    //通过采购订单号查询采购订单要求到货日期
+                    var order = await _purchaseOrderAppService.GetByNumberAsync(putawayNoteDetail.scmsend_orderno).ConfigureAwait(false);
+                    if (order != null)
+                    {
+                        putawayNoteDetail.scmsend_delv_date = order.DueDate.ToString("yyyyMMdd");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    outgoingDetailToExternal.SetError(EnumExchangeDataErrorCode.Exception, ex.InnerException==null?ex.Message: ex.InnerException.Message, ex.ToString());
+                }
+
                 outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail);
                 outgoingToExternalList.Add(outgoingDetailToExternal);
             }
@@ -115,7 +132,7 @@ public class PutawayNoteConverter : IOutgoingConverter
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
     private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
-    {
+    {      
         var ret = new Scmsend()
         {
             scmsend_type = billtype,
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs
index d843ae8c3..ea7815a5c 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs
@@ -27,7 +27,7 @@ public class ScontrolWriter : IWriter
     public virtual async Task WriteAsync(List<OutgoingToExternal> outgoingDataList)
     {
 
-        var groups = outgoingDataList.GroupBy(r => r.SourceDataGroupCode);
+        var groups = outgoingDataList.Where(r=>r.Status!=EnumExchangeDataStatus.Error).GroupBy(r => r.SourceDataGroupCode);
         foreach (var group in groups)
         {
             var dataInterfaceList = new List<Scontrol>();