一．功能优化：

1.人工叫料—发料，物料数量可以修改，数量小于等于库存即可。（已解决）
2.人工叫料，部分完成，待库存补充后，点击执行，不生成发料任务：现功能修改，研发正在开发
二：功能缺陷：
1.储位内移库、储位间调拨和客户储位调拨在系统部署后首次操作提示事务类型缺失，等待几分钟后功能恢复正常，测试跟踪中（基础数据缓存）
2.事务类型编辑，报错（已解决）
3.非生产领料、非生产退料、专案代码、项目代码没有带出 (已解决)
4.采购退货汇总表，生产退料汇总表无数据(已解决)
5.盘点记录，盘点调整申请，盘点调整记录，导出只导出主表，没有明细 （原所有导出都没有 明细，已解决）
6.回收料收货报错 （已解决）

be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs

@@ -159,8 +159,12 @@ public abstract class SfsCrudWithDetailsAppServiceBase<TEntity, TEntityDto, TReq
         var entities = await _repository.GetPagedListAsync(expression, input.SkipCount, input.MaxResultCount,
                 input.Sorting, true).ConfigureAwait(false);
         var list = ObjectMapper.Map<List<TEntity>, List<TEntityDto>>(entities);
-        var hasDetails = typeof(TEntity) is SfsMasterAggregateRootBase<TDetail> detailEntity;
-        return ExportImportService.Export(list, detailsProptyName: hasDetails ? nameof(detailEntity.Details) : null);
+
+        //var hasDetails = typeof(TEntity) is SfsMasterAggregateRootBase<TDetail> detailEntity;
+        var tt = typeof(TEntity).GetBaseClasses(typeof(SfsMasterAggregateRootBase<TDetail>));
+        var hasDetails = tt.Length > 0 ? true : false;
+
+        return ExportImportService.Export(list,detailsProptyName: hasDetails ? nameof(TDetail) : null);
     }
 
     /// <summary>

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

@@ -10,4 +10,22 @@ public class UnplannedIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
 }

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

@@ -11,6 +11,24 @@ public class UnplannedIssueJobDetailInput : SfsJobRecommendFromDetailInputBase,
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
 
+    //// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs

@@ -1,6 +1,38 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Data;
+
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class UnplannedReceiptJobDetailDTO : SfsJobRecommendToDetailDTOBase
 {
+    /// <summary>
+    /// 原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
 
+    /// <summary>
+    /// 扩展属性
+    /// </summary>
+    [Display(Name = "扩展属性")]
+    public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 }

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

@@ -11,6 +11,24 @@ public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase,
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -17,4 +17,22 @@ public class UnplannedIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithLotPac
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
 }

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

@@ -13,6 +13,24 @@ public class UnplannedIssueNoteDetailInput : SfsStoreRecommendFromDetailWithLotP
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -16,4 +16,22 @@ public class UnplannedReceiptNoteDetailDTO : SfsStoreRecommendToDetailWithLotPac
     /// </summary>
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
+
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
 }

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

@@ -11,6 +11,24 @@ public class UnplannedReceiptNoteDetailInput : SfsStoreRecommendToDetailWithLotP
     [Display(Name = "原因代码")]
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -12,4 +12,22 @@ public class UnplannedIssueRequestDetailDTO
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; } = new ExtraPropertyDictionary();
+
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
 }

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

@@ -10,4 +10,22 @@ public class UnplannedIssueRequestDetailInput : SfsStoreDetailWithLotPackingQtyL
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
 }

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

@@ -7,6 +7,30 @@ public class UnplannedReceiptRequestDetailDTO
     : SfsStoreDetailWithLotPackingQtyLocationStatusDTOBase
     , IHasExtraProperties
 {
+    /// <summary>
+    /// 原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -5,6 +5,24 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public class UnplannedReceiptRequestDetailInput : SfsStoreDetailWithLotPackingQtyLocationInputBase, IHasExtraProperties
 {
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
@@ -9,6 +10,24 @@ public class UnplannedIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHas
     /// </summary>
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
@@ -10,6 +11,24 @@ public class UnplannedReceiptJobDetail : SfsJobRecommendToDetailEntityBase, IHas
     /// </summary>
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
@@ -9,6 +10,24 @@ public class UnplannedIssueNoteDetail : SfsStoreRecommendFromDetailWithLotPackin
     /// </summary>
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
@@ -9,6 +10,24 @@ public class UnplannedReceiptNoteDetail : SfsStoreRecommendToDetailWithLotPackin
     /// </summary>
     public string ReasonCode { get; set; }
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
@@ -8,6 +9,24 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 public class UnplannedIssueRequestDetail : SfsStoreDetailWithLotPackingQtyLocationStatusEntityBase
     , IHasExtraProperties
 {
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

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

@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
@@ -7,6 +8,29 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 /// </summary>
 public class UnplannedReceiptRequestDetail : SfsStoreDetailWithLotPackingQtyLocationStatusEntityBase, IHasExtraProperties
 {
+    /// <summary>
+    /// 原因代码
+    /// </summary>
+    public string ReasonCode { get; set; }
+
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    /// 项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    /// 次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
     /// <summary>
     /// 扩展属性
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ProductionReturnJobEventHandler.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -59,6 +60,7 @@ public class ProductionReturnJobEventHandler :
     {
         var input = ObjectMapper.Map<ProductionReturnJob, ProductionReturnNoteEditInput>(entity);
 
+        input.ReturnTime=DateTime.Now;
         input.Details = new List<ProductionReturnNoteDetailInput>();
 
         foreach (var detail in entity.Details.Where(detail => detail.HandledQty != 0))