mes报废和tyrp报废修改

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

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