From 1a8e03b4dc856164ea1c049d8e394f9fa1c68539 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Thu, 16 Nov 2023 13:42:13 +0800
Subject: [PATCH 1/4] 111

---
 .vs/WMS2.0新/v17/.suo                          | Bin 0 -> 12288 bytes
 .../Outgoing/ScrapNoteConVerter.cs              |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .vs/WMS2.0新/v17/.suo

diff --git a/.vs/WMS2.0新/v17/.suo b/.vs/WMS2.0新/v17/.suo
new file mode 100644
index 0000000000000000000000000000000000000000..422f79b088653a4002ed2d1e78a413fde608a90a
GIT binary patch
literal 12288
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
HQv&}2sLxgY

literal 0
HcmV?d00001

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
index e47c1fd74..997807a4f 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
@@ -34,7 +34,10 @@ IOutgoingFromWmsManager outgoingFromWmsManager
         _departmentAppService = departmentAppService;
         _objectMapper = objectMapper;
     }
-
+    /// <summary>
+    /// 转换
+    /// </summary>
+    /// <returns></returns>
     public virtual async Task<List<OutgoingToExternal>> ConvertAsync()
     {
         var outgoingToExternalList = new List<OutgoingToExternal>();

From d4c44ec3da6a924843b1d38b09d8b4ee85169faa Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Thu, 16 Nov 2023 13:44:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?mes=E6=8A=A5=E5=BA=9F=E5=92=8Ctyrp=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/ScrapReader.cs                   |  8 ++++-
 .../Outgoing/ScrapNoteConVerter.cs            | 36 ++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
index a497d4102..ed7373851 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs
@@ -93,11 +93,17 @@ public class ScrapReader : IReader
 
     private static ScrapNoteExchangeDto BuildScrapNoteOrderExchangeMes(Scrap scrap)
     {
+        string type = EnumTransSubType.Scrap_WIP.ToString();
+        if (scrap.mesout_asd_type == "4004")
+        {
+            type = EnumTransSubType.Scrap_Manual.ToString();
+        }
+
         var crap = new ScrapNoteExchangeDto()
         {
             Worker = scrap.mesout_asd_user,
             ActiveDate = DateTime.ParseExact(scrap.Mesout_asd_date, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture),
-            Type = EnumTransSubType.Scrap_WIP.ToString()
+            Type = type
         };
         var crapDetail = new ScrapNoteDetailExchangeDto()
         {
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
index 997807a4f..8ff6d8625 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs
@@ -34,10 +34,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager
         _departmentAppService = departmentAppService;
         _objectMapper = objectMapper;
     }
-    /// <summary>
-    /// 转换
-    /// </summary>
-    /// <returns></returns>
+
     public virtual async Task<List<OutgoingToExternal>> ConvertAsync()
     {
         var outgoingToExternalList = new List<OutgoingToExternal>();
@@ -54,7 +51,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager
                 {
                     DataType = outgoingFromWms.DataType,
                     DataAction = outgoingFromWms.DataAction,
-                    SerialNumber=tyrpNumber,
+                    SerialNumber = tyrpNumber,
                     SourceSystem = EnumSystemType.WMS.ToString(),
                     SourceDataId = detail.Id.ToString(),
                     SourceDataGroupCode = wmsCountAdjust.Number,
@@ -83,21 +80,28 @@ IOutgoingFromWmsManager outgoingFromWmsManager
     {
         var detail = exchangeScrap.Detail;
         string asdtype = "";
-        if (exchangeScrap.Type== EnumTransSubType.CountAdjust_WIP.ToString())
-        {
-            asdtype = "4042";
-        }
-        else if (exchangeScrap.Type == EnumTransSubType.CountAdjust_Warehouse.ToString())
+        if (exchangeScrap.Type == EnumTransSubType.CountAdjust_WIP.ToString() && detail.FromLocationErpCode.ToLower() == "tv")
         {
             asdtype = "4004";
         }
-        else if (exchangeScrap.Type == EnumTransSubType.Scrap_Manual.ToString())
+        else
         {
-            asdtype = "4004";
-        }
-        else if (exchangeScrap.Type == EnumTransSubType.Scrap_WIP.ToString())
-        {
-            asdtype = "4042";
+            if (exchangeScrap.Type == EnumTransSubType.CountAdjust_WIP.ToString())
+            {
+                asdtype = "4042";
+            }
+            else if (exchangeScrap.Type == EnumTransSubType.CountAdjust_Warehouse.ToString())
+            {
+                asdtype = "4004";
+            }
+            else if (exchangeScrap.Type == EnumTransSubType.Scrap_Manual.ToString())
+            {
+                asdtype = "4004";
+            }
+            else if (exchangeScrap.Type == EnumTransSubType.Scrap_WIP.ToString())
+            {
+                asdtype = "4042";
+            }
         }
         var counta = new CountAdjust()
         {

From aea9e08f572b8dd643a34fb94b3ad1c7c369c744 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Thu, 16 Nov 2023 15:14:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=8C=89tyrpnumber=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutgoingFromWms/OutgoingFromWmsEfCoreRepository.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/OutgoingFromWms/OutgoingFromWmsEfCoreRepository.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/OutgoingFromWms/OutgoingFromWmsEfCoreRepository.cs
index 956f58270..e37c0e407 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/OutgoingFromWms/OutgoingFromWmsEfCoreRepository.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore/OutgoingFromWms/OutgoingFromWmsEfCoreRepository.cs
@@ -36,7 +36,7 @@ public class OutgoingFromWmsEfCoreRepository : SfsEfCoreRepositoryBase<DataExcha
             .Where(p => p.Status == EnumExchangeDataStatus.Unread
             && p.DestinationSystem == toSystemType.ToString()
                         && p.DataType == dataType.ToString())
-            .OrderBy(p => p.CreationTime)
+            .OrderBy(p => p.TyrpNumber)
             .ToListAsync().ConfigureAwait(false);
         return entities;
     }

From b2ffe14ae52a57760600f99522b52e58987b85da Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 17 Nov 2023 09:49:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?mes=E5=9B=9E=E5=86=B2=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=8C=89=E5=BA=93=E4=BD=8D=E5=92=8C=E9=9B=B6=E4=BB=B6=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/BackFluReader.cs                                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
index ab8f9ad0d..b59128c91 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
@@ -77,8 +77,8 @@ public class BackFluReader : IReader
             DataType = EnumIncomingDataType.BackFlush.ToString(),
             DataAction = EnumExchangeDataAction.Add,
             SourceSystem = EnumSystemType.MES.ToString(),
-            SourceDataId = backflu.scmout_type,
-            SourceDataGroupCode = backflu.scmout_nbr,
+            SourceDataId = backflu.scmout_nbr,
+            SourceDataGroupCode = backflu.scmout_loc,
             SourceDataDetailCode = backflu.scmout_part,
             SourceDataContent = JsonSerializer.Serialize(backflu),
             WriteTime = DateTime.Now,