修改完工收货赋值

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs

@@ -12,6 +12,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent;
 
@@ -96,25 +97,41 @@ public class MesOutConverter : IIncomingConverter
                     wmsProductReceiptNoteDetail.LocationCode = loc[0].Code;
                     wmsProductReceiptNoteDetail.LocationArea = loc[0].AreaCode;
                     wmsProductReceiptNoteDetail.LocationGroup = loc[0].LocationGroupCode;
-                }
+                    wmsProductReceiptNoteDetail.LocationErpCode = loc[0].ErpLocationCode;
+
+                    wmsProductReceiptNoteDetail.HandledToLocationCode = loc[0].Code;
+                    wmsProductReceiptNoteDetail.HandledToLocationArea = loc[0].AreaCode;
+                    wmsProductReceiptNoteDetail.HandledToLocationGroup = loc[0].LocationGroupCode;
+                    wmsProductReceiptNoteDetail.HandledToLocationErpCode = loc[0].ErpLocationCode;
 
+                    wmsProductReceiptNoteDetail.RecommendToLocationCode = loc[0].Code;
+                    wmsProductReceiptNoteDetail.RecommendToLocationArea = loc[0].AreaCode;
+                    wmsProductReceiptNoteDetail.RecommendToLocationGroup = loc[0].LocationGroupCode;
+                    wmsProductReceiptNoteDetail.RecommendToLocationErpCode = loc[0].ErpLocationCode;
+                }
 
                 var item = await _itemBasicAppService.GetByCodeAsync(wmsProductReceiptNoteDetail.ItemCode).ConfigureAwait(false);
-                    if (item != null)
+                if (item != null)
-                    {
+                {
                     wmsProductReceiptNoteDetail.ItemName = !string.IsNullOrEmpty(item.Name) ? item.Name : "";
                     wmsProductReceiptNoteDetail.ItemDesc1 = !string.IsNullOrEmpty(item.Desc1) ? item.Desc1 : "";
                     wmsProductReceiptNoteDetail.ItemDesc2 = !string.IsNullOrEmpty(item.Desc2) ? item.Desc2 : "";
                     wmsProductReceiptNoteDetail.Uom = !string.IsNullOrEmpty(item.BasicUom) ? item.BasicUom : "";
-                    }
+
-                    else
+                    wmsProductReceiptNoteDetail.ProduceDate = incomingFromExternal.EffectiveDate;
-                    {
+                    wmsProductReceiptNoteDetail.ArriveDate = incomingFromExternal.EffectiveDate;
+                    wmsProductReceiptNoteDetail.ExpireDate = wmsProductReceiptNoteDetail.ProduceDate.AddDays(item.GetValidateDays());
+
+                }
+                else
+                {
+                    //todo 这里不应该做完工 没有零件
                     wmsProductReceiptNoteDetail.ItemName = "";
                     wmsProductReceiptNoteDetail.ItemDesc1 = "";
                     wmsProductReceiptNoteDetail.ItemDesc2 = "";
                     wmsProductReceiptNoteDetail.Uom = "";
-                    }
+                }
-                    wmsProductReceiptNote.Details.Add(wmsProductReceiptNoteDetail);
+                wmsProductReceiptNote.Details.Add(wmsProductReceiptNoteDetail);
             }
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsProductReceiptNote);
             incomingToWmsList.Add(incomingToWms);