归档方法优化

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs

@@ -45,7 +45,7 @@ public class CustomerConverter : IIncomingConverter
         var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false);
         //归档
-        await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
 
     }
     private async Task<List<IncomingToWms>> BuildIncomingToWmsOfPurchaseOrderAsync(List<IncomingFromExternal> incomingDataList)

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs

@@ -41,7 +41,7 @@ IIncomingFromExternalManager incomingFromExternalManager)
         var materialRequestList = await BuildIncomingToWmsOfDepartmentRequestAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false);
         //归档
-        await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
     private async Task<List<IncomingToWms>> BuildIncomingToWmsOfDepartmentRequestAsync(List<IncomingFromExternal> incomingDataList)

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs

@@ -41,7 +41,7 @@ public class InterfaceCalendarConverter : IIncomingConverter
         var materialRequestList = await BuildIncomingToWmsOfInterfaceCalendarRequestAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false);
         //归档
-        await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
     private async Task<List<IncomingToWms>> BuildIncomingToWmsOfInterfaceCalendarRequestAsync(List<IncomingFromExternal> incomingDataList)

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs

@@ -109,23 +109,43 @@ public class ItemBasicReader : IReader
 
     private static ItemBasicExchangeDto BuildItemBasicToExchangeDto(mes_product product)
     {
+        string type = "";
+        switch (product.mes_product_code)
+        {
+            case "10C01":
+                type = "成品";
+                break;
+            case "10C02":
+                type = "成品";
+                break;
+            case "10C03":
+                type = "物料";
+                break;
+            case "10C04":
+                type = "半成品";
+                break;
+            default:
+                type = "无";
+                break;
+        }
+
         var itemBasicRequest = new ItemBasicExchangeDto()
         {
             Code = product.mes_product_part,
-            Name = product.mes_product_desc,
+            Name = product.mes_product_part_ser,
             Desc1 = product.mes_product_desc,
-            // Desc2=product.mes_product_fih_factory,
+            //Desc2=product.mes_product_fih_factory,//目前没有这个字段
             Status = product.mes_product_active == "Y" ? EnumItemStatus.Active : EnumItemStatus.Disable,
 
             #region 制造类别
             //其中100404 托外-不带原料 、 10405 托外-带原料、10407客户提供料件没有对应字段
-            CanMake = product.mes_product_mfg == "10401" ? false : true,       //10401 自制
+            CanMake = product.mes_product_mfg == "10401" ? true : false,       //10401 自制
-            CanBuy = product.mes_product_mfg == "10403" ? false : true,         //10403 采购
+            CanBuy = product.mes_product_mfg == "10403" ? true : false,         //10403 采购
-            CanOutsourcing = product.mes_product_mfg == "10402" ? false : true,//10402 外包
+            CanOutsourcing = product.mes_product_mfg == "10402" ? true : false,//10402 外包
-            IsRecycled = product.mes_product_mfg == "10406" ? false : true,    //10406 回收
+            IsRecycled = product.mes_product_mfg == "10406" ? true : false,    //10406 回收  
             #endregion
 
-            Type = product.mes_product_code,//10C01成品、10C02原料、10C03物料、10C04半成品
+            Type = type,//10C01成品、10C02原料、10C03物料、10C04半成品
             Configuration = product.mes_product_spec,
             BasicUom = product.mes_product_unit,
             AbcClass = "",

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs

@@ -43,7 +43,7 @@ public class SupplierConverter : IIncomingConverter
         var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false);
         //归档
-        await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
     private async Task<List<IncomingToWms>> BuildIncomingToWmsOfPurchaseOrderAsync(List<IncomingFromExternal> incomingDataList)
     {

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs

@@ -39,7 +39,7 @@ public class UserConverter : IIncomingConverter
         var materialRequestList = await BuildIncomingToWmsOfIdentityUserRequestAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false);
         //归档
-        await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
     private async Task<List<IncomingToWms>> BuildIncomingToWmsOfIdentityUserRequestAsync(List<IncomingFromExternal> incomingDataList)

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@@ -661,6 +661,11 @@
             回收件
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic.ItemBasicExchangeDto.ManageType">
+            <summary>
+            管理类型
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.SupplierCode">
             <summary>
             供应商编号