接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs

@@ -36,7 +36,7 @@ public class ProductReader : IReader
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
     {
         //获取上次同步的最大Eos更新时间
-        var maxTimeString = await _incomingFromExternalManager.GetDataByMaxEffectiveDate(EnumIncomingDataType.ItemPack.ToString()).ConfigureAwait(false);
+          var maxTimeString = await _incomingFromExternalManager.GetDataByMaxEffectiveDate(EnumIncomingDataType.ItemPack.ToString()).ConfigureAwait(false);
         //从EOS读取待处理Product
         var toBeProcessedProducts = await _productManager.GetToBeProcessedListAsync(maxTimeString).ConfigureAwait(false);
         if (!toBeProcessedProducts.Any())

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

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Guids;
 using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Basedata.Application;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.DataExchange.Domain;
@@ -23,6 +24,7 @@ public class ItemBasicReader : IReader
     private readonly ILogger<ItemBasicReader> _logger;
     private readonly IGuidGenerator _guidGenerator;
     private readonly IItemBasicAppService _itemBasicAppService;
+    private readonly IItemPackAppService _itemPackAppService;
     private readonly IObjectMapper _objectMapper;
     public ItemBasicReader(
         IProductManager productManager
@@ -31,7 +33,7 @@ public class ItemBasicReader : IReader
         , ILogger<ItemBasicReader> logger
         , IItemBasicAppService itemBasicAppService
           , IObjectMapper objectMapper
-        )
+         , IItemPackAppService itemPackAppService)
     {
         _guidGenerator = guidGenerator;
         _productManager = productManager;
@@ -39,6 +41,7 @@ public class ItemBasicReader : IReader
         _logger = logger;
         _itemBasicAppService = itemBasicAppService;
         _objectMapper = objectMapper;
+        _itemPackAppService = itemPackAppService;
     }
 
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
@@ -53,7 +56,7 @@ public class ItemBasicReader : IReader
         List<ItemBasicExchangeDto> eosToItemBasicExchangeDtos = new List<ItemBasicExchangeDto>();
         foreach (var toBeProcessedPart in toBeProcessedParts)
         {
-            var itemBasic = BuildItemBasicToExchangeDto(toBeProcessedPart);
+            var itemBasic =await BuildItemBasicToExchangeDto(toBeProcessedPart).ConfigureAwait(false);
             eosToItemBasicExchangeDtos.Add(itemBasic);
         }
         //和wms和eos数据进行比较，获取需要处理得数据
@@ -107,8 +110,17 @@ public class ItemBasicReader : IReader
         return incomingData;
     }
 
-    private static ItemBasicExchangeDto BuildItemBasicToExchangeDto(mes_product product)
+    private async Task<ItemBasicExchangeDto> BuildItemBasicToExchangeDto(mes_product product)
     {
+        decimal packqty = 1;
+        try
+        {
+            var itempack = await _itemPackAppService.GetListByItemCodeAsync(product.mes_product_part).ConfigureAwait(false);
+            if (itempack.Count > 0) packqty = itempack[0].Qty;
+        }
+        catch (Exception)
+        {
+        }
         string type = "";
         switch (product.mes_product_code)
         {
@@ -149,6 +161,7 @@ public class ItemBasicReader : IReader
             Configuration = product.mes_product_spec,
             BasicUom = product.mes_product_unit,
             AbcClass = "",
+            StdPackQty = packqty,
         };
         return itemBasicRequest;
     }

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

@@ -47,7 +47,7 @@ public class CountAdjustNoteConverter : IOutgoingConverter
            
                 var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false);
                 var departmentCode = department == null ? "" : department.Code;
-                var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.LocationErpCode }).Select(p => new CountAdjustNoteDetailExchangeDto { CountQty = p.Sum(itm => itm.CountQty), InventoryQty = p.Sum(itm => itm.InventoryQty), ItemCode = p.Key.ItemCode, LocationErpCode = p.Key.LocationErpCode, ReasonCode = String.Join("、", p.Select(x => x.ReasonCode).ToArray()) });
+                var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.LocationErpCode }).Select(p => new CountAdjustNoteDetailExchangeDto { CountQty = p.Sum(itm => itm.CountQty), InventoryQty = p.Sum(itm => itm.InventoryQty), ItemCode = p.Key.ItemCode, LocationErpCode = p.Key.LocationErpCode });
                 var detal = details.ToList();
                 foreach (var detail in detal)
                 {

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

@@ -114,7 +114,7 @@ public class DeliverNoteConverter : IOutgoingConverter
             wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(0, 6) : exchangeOrder.Worker,
             wmsoutm_dept = "",
             wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
-            wmsoutm_cust = exchangeOrder.Customer,
+            wmsoutm_cust = exchangeOrder.Customer ?? "",
             wmsoutm_shm_nbr = "",
             wmsoutm_cust_loc = "",
             wmsoutm_stock_stat = "",
@@ -139,7 +139,7 @@ public class DeliverNoteConverter : IOutgoingConverter
         {
             wmsoutd_nbr = exchangeOrder.Number,
             wmsoutd_part = exchangeDetailOrder.ItemCode,
-            wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode,
+            wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode ?? "",
             wmsoutd_qty = exchangeDetailOrder.Qty,
             wmsoutd_bcm_code = "",
             wmsoutd_projt_id = "",

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

@@ -132,8 +132,8 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
             wmsoutm_shm_nbr = "",
             wmsoutm_cust_loc = "",
             wmsoutm_stock_stat = "",
-            wmsoutm_open_part = exchangeOrder.ItemCode,
-            wmsoutm_open_loc = exchangeOrder.LocationErpCode,
+            wmsoutm_open_part = exchangeOrderDetail.ItemCode,
+            wmsoutm_open_loc = exchangeOrderDetail.LocationErpCode,
             wmsoutm_open_hours = 1,//无法取到转移工时 目前默认为1
             wmsoutm_tyrp_k = "",
             wmsoutm_id = 0,//明细中最大scmsend_id

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

@@ -144,7 +144,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
         {
             wmsoutd_nbr = exchangeOrder.Number,
             wmsoutd_part = exchangeDetailOrder.ItemCode,
-            wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode,
+            wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "",
             wmsoutd_qty = exchangeDetailOrder.Qty,
             wmsoutd_bcm_code = "",//有问题
             wmsoutd_projt_id = "",//有问题

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

@@ -144,7 +144,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter
         {
             wmsoutd_nbr = exchangeOrder.Number,
             wmsoutd_part = exchangeDetailOrder.ItemCode,
-            wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode,
+            wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "",
             wmsoutd_qty = exchangeDetailOrder.Qty,
             wmsoutd_bcm_code = "",//有问题
             wmsoutd_projt_id = "",//有问题

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsExtensions.cs

@@ -88,7 +88,9 @@ public static class IncomingToWmsExtensions
     {
         var itemPack = JsonSerializer.Deserialize<ItemPackEditInput>(incomingConverted.DataContent);
         var itemPackAppService = workerContext.ServiceProvider.GetRequiredService<IItemPackAppService>();
+        var itemBasicAppService = workerContext.ServiceProvider.GetRequiredService<IItemBasicAppService>();
         await itemPackAppService.UpsertAsync(itemPack).ConfigureAwait(false);
+        await itemBasicAppService.UpsertStdPackQtyAsync(itemPack.ItemCode, itemPack.Qty).ConfigureAwait(false);
     }
 
     public static async Task HandleCustomersAsync(this IncomingToWms incomingConverted, PeriodicBackgroundWorkerContext workerContext)

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs

@@ -39,6 +39,14 @@ public class ItemBasicExchangeDto
     [Required(ErrorMessage = "{0}是必填项")]
     public bool CanBuy { get; set; }
 
+
+    /// <summary>
+    /// 标包数
+    /// </summary>
+    [Display(Name = "标包数")]
+    public decimal StdPackQty { get; set; }
+
+
     /// <summary>
     /// 外包件
     /// </summary>

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote;
 
@@ -14,6 +15,14 @@ public class ProductRecycleNoteDetailExchangeDto
     [Display(Name = "物品代码")]
     public string ItemCode { get; set; }
 
+
+    /// <summary>
+    /// 库位组
+    /// </summary>
+    [Display(Name = "Erp库位")]
+
+    public string LocationErpCode { get; set; }
+
     /// <summary>
     /// 排序批次
     /// </summary>

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs

@@ -22,6 +22,11 @@ public class UnplannedIssueNoteDetailExchangeDto
     [Display(Name = "来源ERP库位")]
     public string FromLocationErpCode { get; set; }
     /// <summary>
+    /// 库位组
+    /// </summary>
+    [Display(Name = "Erp库位")]
+    public string LocationErpCode { get; set; }
+    /// <summary>
     /// 数量
     /// </summary>
     [Display(Name = "数量")]

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 
 namespace Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote;
@@ -22,6 +23,11 @@ public class UnplannedReceiptNoteDetailExchangeDto
     [Display(Name = "来源ERP库位")]
     public string FromLocationErpCode { get; set; }
     /// <summary>
+    /// 库位组
+    /// </summary>
+    [Display(Name = "Erp库位")]
+    public string LocationErpCode { get; set; }
+    /// <summary>
     /// 数量
     /// </summary>
     [Display(Name = "数量")]

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

@@ -651,6 +651,11 @@
             代码
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic.ItemBasicExchangeDto.StdPackQty">
+            <summary>
+            标包数
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic.ItemBasicExchangeDto.CanOutsourcing">
             <summary>
             外包件

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedIncomingFromExternal/IArchivedIncomingFromExternalRepository.cs

@@ -5,4 +5,5 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain;
 
 public interface IArchivedIncomingFromExternalRepository : ISfsRepositoryBase<ArchivedIncomingFromExternal>, ISfsBulkRepositoryBase<ArchivedIncomingFromExternal>
 {
+
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/IncomingFromExternal/IncomingFromExternalManager.cs

@@ -44,7 +44,7 @@ public class IncomingFromExternalManager : DomainService, IIncomingFromExternalM
     public virtual async Task<string> GetDataByMaxEffectiveDate(string dataType)
     {
         string maxTime = "";
-        var list = await _repository.GetListAsync(r => r.DataType == dataType).ConfigureAwait(false);
+        var list = await _historyRepository.GetListAsync(r => r.DataType == dataType).ConfigureAwait(false);
         if (list.Count != 0)
         {
             maxTime = list.Select(r => r.EffectiveDate).Max().ToString(CultureInfo.InvariantCulture);