Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

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,

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()
         {

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs

@@ -51,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,
@@ -80,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()
         {

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