代码合并

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs

@@ -29,6 +29,12 @@ public class UnplannedIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order =0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs

@@ -36,6 +36,12 @@ public class UnplannedIssueJobDetailInput : SfsJobRecommendFromDetailInputBase,
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs

@@ -36,6 +36,12 @@ public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase,
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs

@@ -36,6 +36,12 @@ public class UnplannedIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithLotPac
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs

@@ -38,6 +38,12 @@ public class UnplannedIssueNoteDetailInput : SfsStoreRecommendFromDetailWithLotP
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs

@@ -36,6 +36,12 @@ public class UnplannedReceiptNoteDetailDTO : SfsStoreRecommendToDetailWithLotPac
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs

@@ -36,6 +36,12 @@ public class UnplannedReceiptNoteDetailInput : SfsStoreRecommendToDetailWithLotP
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs

@@ -11,6 +11,12 @@ public class UnplannedReceiptNoteImportInput : SfsStoreImportInputBase
     [Display(Name = "计划外入库请求单号")]
     public string UnplannedReceiptRequestNumber { get; set; }
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs

@@ -32,6 +32,12 @@ public class UnplannedIssueRequestDetailDTO
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs

@@ -30,6 +30,12 @@ public class UnplannedIssueRequestDetailInput : SfsStoreDetailWithLotPackingQtyL
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs

@@ -9,6 +9,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
 , IHasQty
 {
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
     /// <summary>
     /// 物品代码
     /// </summary>
@@ -75,9 +78,12 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     /// <summary>
     /// 说明
     /// </summary>
-    [Display(Name = "说明")]
+    //[Display(Name = "说明2")]
-    public string Remark { get; set; }
+    //public string Remark { get; set; }
 
-    [Display(Name = "领料类别")]
+    /// <summary>
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs

@@ -38,6 +38,12 @@ public class UnplannedReceiptRequestDetailDTO
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; }
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs

@@ -30,6 +30,12 @@ public class UnplannedReceiptRequestDetailInput : SfsStoreDetailWithLotPackingQt
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs

@@ -9,6 +9,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
 , IHasQty
 {
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
     /// <summary>
     /// 物料号
     /// </summary>
@@ -75,9 +78,12 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
     /// <summary>
     /// 说明
     /// </summary>
-    [Display(Name = "说明")]
+    //[Display(Name = "说明2")]
-    public string Remark { get; set; }
+    //public string Remark { get; set; }
 
-    [Display(Name = "退料类别")]
+    /// <summary>
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs

@@ -30,13 +30,13 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
     public UnplannedReceiptRequestForDongyangAppService(IUnplannedReceiptRequestRepository repository,
         IUnplannedReceiptRequestManager unplannedReceiptRequestManager,
         IDepartmentAppService departmentApp,
-        LocationManager locationManager,
+        //LocationManager locationManager,
         ILocationAppService locationAppService
         ) : base(repository, unplannedReceiptRequestManager)
     {
         _unplannedReceiptRequestManager = unplannedReceiptRequestManager;
         _departmentApp = departmentApp;
-        _locationManager = locationManager;
+        //_locationManager = locationManager;
         _locationAppService = locationAppService;
     }
 
@@ -191,7 +191,8 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
     private async Task SetEntityPropertiesAsync(UnplannedReceiptRequest entity)
     {
         var userName = CurrentUser.GetUserName();
-
+        if (userName != null)
+        {
             var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false);
 
             if (department != null)
@@ -201,6 +202,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
             }
 
             entity.Worker = userName;
+        }
 
         entity.BuildDate = DateTime.Now;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs

@@ -34,6 +34,12 @@ public class UnplannedIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHas
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs

@@ -35,6 +35,13 @@ public class UnplannedReceiptJobDetail : SfsJobRecommendToDetailEntityBase, IHas
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order =0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs

@@ -34,6 +34,12 @@ public class UnplannedIssueNoteDetail : SfsStoreRecommendFromDetailWithLotPackin
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order = 0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs

@@ -34,6 +34,12 @@ public class UnplannedReceiptNoteDetail : SfsStoreRecommendToDetailWithLotPackin
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order = 0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs

@@ -33,7 +33,13 @@ public class UnplannedIssueRequestDetail : SfsStoreDetailWithLotPackingQtyLocati
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别")]
+    [Display(Name = "领料类别", Order =0)]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs

@@ -37,7 +37,13 @@ public class UnplannedReceiptRequestDetail : SfsStoreDetailWithLotPackingQtyLoca
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
+    [Display(Name = "退料类别", Order =0)]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs

@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Volo.Abp.EventBus;
+using Volo.Abp.ObjectMapping;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -32,12 +34,25 @@ public class ProductReceiptNoteEventHandler
 
     protected override async Task AddExchangeDataAsync(List<ProductReceiptNote> entities)
     {
-        var dtos = ObjectMapper.Map<List<ProductReceiptNote>, List<ProductReceiptNoteDTO>>(entities);        
+        var result = new List<ProductReceiptNoteDTO>();
-        foreach (var detail in dtos.SelectMany(dto => dto.Details))
+
+        foreach (var entity in entities)
+        {
+            foreach (var detail in entity.Details)
+            {
+                var dto = ObjectMapper.Map<ProductReceiptNote, ProductReceiptNoteDTO>(entity);
+                var detailDto = ObjectMapper.Map<ProductReceiptNoteDetail, ProductReceiptNoteDetailDTO>(detail);
+                dto.Details = new EditableList<ProductReceiptNoteDetailDTO>{ detailDto };
+                result.Add(dto);
+            }
+        }
+
+        foreach (var detail in result.SelectMany(dto => dto.Details))
         {
             await detail.TrySetLocationAsync(LocationAclService, detail.LocationCode).ConfigureAwait(false);
         }
-        var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false);
+
+        var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, result).ConfigureAwait(false);
         await AddManyAsync(exchangeData).ConfigureAwait(false);
     }