Browse Source

冲突对比无误,后提交

dev_DY_CC
刘云峰 1 year ago
parent
commit
f629cddc85
  1. 28
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDTO.cs
  2. 30
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDetailDTO.cs
  3. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobCheckInput.cs
  4. 30
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobDetailInput.cs
  5. 31
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobEditInput.cs
  6. 27
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDTO.cs
  7. 27
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDetailDTO.cs
  8. 20
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/ITransferLibCallback.cs
  9. 27
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteDetailInput.cs
  10. 29
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteEditInput.cs
  11. 30
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteImportInput.cs
  12. 28
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/DTOs/TransferRequestDTO.cs
  13. 29
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/DTOs/TransferRequestDetailDTO.cs
  14. 28
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestDetailInput.cs
  15. 29
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestEditInput.cs
  16. 31
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs
  17. 60
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs
  18. 27
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJob.cs
  19. 25
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobDetail.cs
  20. 29
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNote.cs
  21. 23
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs
  22. 28
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequest.cs
  23. 24
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestDetail.cs
  24. 26267
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.Designer.cs
  25. 263
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.cs
  26. 72
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs
  27. 33
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/TransferLibRequestAutoMapperProfile.cs
  28. 21
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs

28
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDTO.cs

@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 非生产领料任务 /// 非生产领料任务 //??TransferLib实体
/// </summary> /// </summary>
[Display(Name = "非生产领料任务")] [Display(Name = "非生产领料任务")]
public class TransferLibJobDTO : SfsJobDTOBase<TransferLibJobDetailDTO>, IHasNumber public class TransferLibJobDTO : SfsJobDTOBase<TransferLibJobDetailDTO>, IHasNumber
@ -47,4 +47,30 @@ public class TransferLibJobDTO : SfsJobDTOBase<TransferLibJobDetailDTO>, IHasNum
[Display(Name = "确认时间")] [Display(Name = "确认时间")]
public DateTime? ConfirmTime { get; set; } public DateTime? ConfirmTime { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

30
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDetailDTO.cs

@ -3,7 +3,9 @@ using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibJobDetailDTO : SfsStoreDetailWithFromToDTOBase public class TransferLibJobDetailDTO : SfsStoreDetailWithFromToDTOBase
{ {
/// <summary> /// <summary>
@ -22,4 +24,30 @@ public class TransferLibJobDetailDTO : SfsStoreDetailWithFromToDTOBase
/// </summary> /// </summary>
public EnumJobStatus JobStatus { get; set; } public EnumJobStatus JobStatus { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobCheckInput.cs

@ -1,5 +1,7 @@
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibJobCheckInput : SfsJobCheckInputBase public class TransferLibJobCheckInput : SfsJobCheckInputBase
{ {

30
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobDetailInput.cs

@ -5,7 +5,9 @@ using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibJobDetailInput : SfsStoreDetailWithFromToInputBase public class TransferLibJobDetailInput : SfsStoreDetailWithFromToInputBase
{ {
/// <summary> /// <summary>
@ -26,4 +28,30 @@ public class TransferLibJobDetailInput : SfsStoreDetailWithFromToInputBase
/// </summary> /// </summary>
public EnumJobStatus JobStatus { get; set; } public EnumJobStatus JobStatus { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

31
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobEditInput.cs

@ -6,7 +6,9 @@ using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<TransferLibJobDetailInput> public class TransferLibJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<TransferLibJobDetailInput>
{ {
#region Base #region Base
@ -59,4 +61,31 @@ public class TransferLibJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreat
public string UpStreamJobNumber { get; set; } public string UpStreamJobNumber { get; set; }
public EnumJobType JobType { get; set; } public EnumJobType JobType { get; set; }
public bool IsAutoComplete { get; set; } public bool IsAutoComplete { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

27
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDTO.cs

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 库存转移记录-实体DTO /// 库存转移记录-实体DTO //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibNoteDTO : SfsStoreDTOBase<TransferLibNoteDetailDTO>, IHasNumber public class TransferLibNoteDTO : SfsStoreDTOBase<TransferLibNoteDetailDTO>, IHasNumber
{ {
@ -43,5 +43,30 @@ public class TransferLibNoteDTO : SfsStoreDTOBase<TransferLibNoteDetailDTO>, IHa
/// </summary> /// </summary>
[Display(Name = "确认时间")] [Display(Name = "确认时间")]
public DateTime? ConfirmTime { get; set; } public DateTime? ConfirmTime { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

27
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDetailDTO.cs

@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 库存转移记录-明细表 /// 库存转移记录-明细表 //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibNoteDetailDTO : SfsStoreDetailWithFromToDTOBase public class TransferLibNoteDetailDTO : SfsStoreDetailWithFromToDTOBase
{ {
@ -24,5 +24,30 @@ public class TransferLibNoteDetailDTO : SfsStoreDetailWithFromToDTOBase
/// 执行任务状态 /// 执行任务状态
/// </summary> /// </summary>
public EnumJobStatus JobStatus { get; set; } public EnumJobStatus JobStatus { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

20
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/ITransferLibCallback.cs

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Win_in.Sfs.Wms.Store.Notes;
public interface ITransferLibCallback
{
Tuple<bool?, string> DoTransferLibCallback(string businessType, string requestNum, string jobNum);
}
public class TestTransferLibCallback : ITransferLibCallback
{
public Tuple<bool?, string> DoTransferLibCallback(string businessType, string requestNum, string jobNum)
{
return Tuple.Create<bool?, string>(true, "调用新移库回调方法成功!");
}
}

27
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteDetailInput.cs

@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 库存转移记录-明细表 /// 库存转移记录-明细表 //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibNoteDetailInput : SfsStoreDetailWithFromToInputBase public class TransferLibNoteDetailInput : SfsStoreDetailWithFromToInputBase
{ {
@ -27,6 +27,31 @@ public class TransferLibNoteDetailInput : SfsStoreDetailWithFromToInputBase
/// </summary> /// </summary>
public EnumJobStatus JobStatus { get; set; } public EnumJobStatus JobStatus { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

29
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteEditInput.cs

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 新增和更新基础DTO /// 新增和更新基础DTO //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibNoteEditInput : SfsStoreCreateOrUpdateInputBase, IHasNumber public class TransferLibNoteEditInput : SfsStoreCreateOrUpdateInputBase, IHasNumber
{ {
@ -52,4 +52,31 @@ public class TransferLibNoteEditInput : SfsStoreCreateOrUpdateInputBase, IHasNum
[Display(Name = "详情")] [Display(Name = "详情")]
public List<TransferLibNoteDetailInput> Details { get; set; } = new List<TransferLibNoteDetailInput>(); public List<TransferLibNoteDetailInput> Details { get; set; } = new List<TransferLibNoteDetailInput>();
public string Number { get; set; } public string Number { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

30
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteImportInput.cs

@ -5,7 +5,9 @@ using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibNoteImportInput : SfsStoreImportInputBase public class TransferLibNoteImportInput : SfsStoreImportInputBase
{ {
/// <summary> /// <summary>
@ -82,4 +84,30 @@ public class TransferLibNoteImportInput : SfsStoreImportInputBase
[Required(ErrorMessage = "{0}是必填项")] [Required(ErrorMessage = "{0}是必填项")]
public EnumInventoryStatus Status { get; set; } public EnumInventoryStatus Status { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

28
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/DTOs/TransferRequestDTO.cs

@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 库存转移记录-实体DTO /// 库存转移记录-实体DTO //??TransferLib实体
/// </summary> /// </summary>
public class TransferRequestDTO : SfsStoreRequestDTOBase<TransferRequestDetailDTO>, IHasNumber public class TransferRequestDTO : SfsStoreRequestDTOBase<TransferRequestDetailDTO>, IHasNumber
{ {
@ -20,4 +20,30 @@ public class TransferRequestDTO : SfsStoreRequestDTOBase<TransferRequestDetailDT
[Display(Name = "使用中间库")] [Display(Name = "使用中间库")]
public bool UseOnTheWayLocation { get; set; } public bool UseOnTheWayLocation { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

29
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/DTOs/TransferRequestDetailDTO.cs

@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 库存转移记录-明细表 /// 库存转移记录-明细表 //??TransferLib实体
/// </summary> /// </summary>
public class TransferRequestDetailDTO : SfsStoreDetailWithFromToDTOBase public class TransferRequestDetailDTO : SfsStoreDetailWithFromToDTOBase
{ {
@ -13,4 +13,31 @@ public class TransferRequestDetailDTO : SfsStoreDetailWithFromToDTOBase
/// </summary> /// </summary>
[Display(Name = "原因")] [Display(Name = "原因")]
public string Reason { get; set; } public string Reason { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

28
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestDetailInput.cs

@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 库存转移记录-明细表 /// 库存转移记录-明细表 //??TransferLib实体
/// </summary> /// </summary>
public class TransferRequestDetailInput : SfsStoreDetailWithFromToInputBase public class TransferRequestDetailInput : SfsStoreDetailWithFromToInputBase
{ {
@ -15,4 +15,30 @@ public class TransferRequestDetailInput : SfsStoreDetailWithFromToInputBase
[StringLength(SfsEfCorePropertyConst.RemarkLength, ErrorMessage = "{0}最多输入{1}个字符")] [StringLength(SfsEfCorePropertyConst.RemarkLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Reason { get; set; } public string Reason { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

29
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestEditInput.cs

@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary> /// <summary>
/// 新增和更新基础DTO /// 新增和更新基础DTO //??TransferLib实体
/// </summary> /// </summary>
public class TransferRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase public class TransferRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
{ {
@ -37,4 +37,31 @@ public class TransferRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
[Display(Name = "明细列表")] [Display(Name = "明细列表")]
public List<TransferRequestDetailInput> Details { get; set; } public List<TransferRequestDetailInput> Details { get; set; }
#endregion #endregion
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

31
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs

@ -3,7 +3,9 @@ using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferRequestImportInput : SfsStoreImportInputBase public class TransferRequestImportInput : SfsStoreImportInputBase
{ {
@ -72,4 +74,31 @@ public class TransferRequestImportInput : SfsStoreImportInputBase
[Display(Name = "状态")] [Display(Name = "状态")]
[Required(ErrorMessage = "{0}是必填项")] [Required(ErrorMessage = "{0}是必填项")]
public EnumInventoryStatus Status { get; set; } public EnumInventoryStatus Status { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

60
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs

@ -1,8 +1,13 @@
using System;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp;
using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Domain.Shared; using Win_in.Sfs.Wms.Store.Domain.Shared;
using Win_in.Sfs.Wms.Store.Notes;
namespace Win_in.Sfs.Wms.Store.Application; namespace Win_in.Sfs.Wms.Store.Application;
@ -18,4 +23,59 @@ public class TransferLibJobAppService
) : base(repository, TransferLibJobManager) ) : base(repository, TransferLibJobManager)
{ {
} }
/// <summary>
/// 新移库完成任务
/// </summary>
/// <param name="id"></param>
/// <param name="dto"></param>
/// <returns></returns>
public override async Task<TransferLibJobDTO> CompleteAsync(Guid id, TransferLibJobDTO dto)
{
string methodPrefix = "TransferLibJobAppService.CompleteAsync - ";
if (dto.CallServerName.IsNullOrEmpty())
{
throw new UserFriendlyException($"{methodPrefix}CallServerName 不能为空");
}
if (dto.CallBusinessType.IsNullOrEmpty())
{
throw new UserFriendlyException($"{methodPrefix}CallBusinessType 不能为空");
}
if (dto.CallRequestNumber.IsNullOrEmpty())
{
throw new UserFriendlyException($"{methodPrefix}CallRequestNumber 不能为空");
}
if (dto.CallJobNumber.IsNullOrEmpty())
{
throw new UserFriendlyException($"{methodPrefix}CallJobNumber 不能为空");
}
var ret = await base.CompleteAsync(id, dto).ConfigureAwait(false);
if (ret != null)
{
var assembly = Assembly.GetExecutingAssembly();
var ty = assembly.GetType(dto.CallServerName);
if (ty == null)
{
throw new UserFriendlyException($"{methodPrefix}没有找到类型为{dto.CallServerName}的对象");
}
var instance = Activator.CreateInstance(ty, dto.CallBusinessType, dto.CallRequestNumber, dto.CallJobNumber);
if (instance == null)
{
throw new UserFriendlyException($"{methodPrefix}类型为{dto.CallServerName}的对象创建失败");
}
ITransferLibCallback transferLibCallback = (ITransferLibCallback)instance;
if (transferLibCallback == null)
{
throw new UserFriendlyException($"{methodPrefix}类型为{dto.CallServerName}的对象没有实现ITransferLibCallback接口");
}
Tuple<bool?, string> callbackRet = transferLibCallback.DoTransferLibCallback(dto.CallServerName, dto.CallRequestNumber, dto.CallJobNumber);
if (callbackRet != null && callbackRet.Item1 == false)
{
throw new UserFriendlyException($"{methodPrefix}执行回调服务{dto.CallServerName}出错,返回错误信息:{callbackRet.Item2}");
}
}
return ret;
}
} }

27
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJob.cs

@ -9,7 +9,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary> /// <summary>
/// 计划外出库任务 /// 计划外出库任务 //??TransferLib实体
/// </summary> /// </summary>
[Display(Name = "计划外出库任务")] [Display(Name = "计划外出库任务")]
public class TransferLibJob : SfsJobAggregateRootBase<TransferLibJobDetail> public class TransferLibJob : SfsJobAggregateRootBase<TransferLibJobDetail>
@ -57,5 +57,30 @@ public class TransferLibJob : SfsJobAggregateRootBase<TransferLibJobDetail>
/// </summary> /// </summary>
[IgnoreUpdate] [IgnoreUpdate]
public override List<TransferLibJobDetail> Details { get; set; } = new List<TransferLibJobDetail>(); public override List<TransferLibJobDetail> Details { get; set; } = new List<TransferLibJobDetail>();
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

25
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobDetail.cs

@ -4,7 +4,9 @@ using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibJobDetail : SfsStoreDetailWithFromToEntityBase public class TransferLibJobDetail : SfsStoreDetailWithFromToEntityBase
{ {
/// <summary> /// <summary>
@ -21,5 +23,26 @@ public class TransferLibJobDetail : SfsStoreDetailWithFromToEntityBase
/// 执行任务状态 /// 执行任务状态
/// </summary> /// </summary>
public EnumJobStatus JobStatus { get; set; } public EnumJobStatus JobStatus { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
public string CallJobNumber { get; set; }
#endregion
} }

29
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNote.cs

@ -7,7 +7,7 @@ using Win_in.Sfs.Shared.Domain.Entities;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary> /// <summary>
/// 调拨转移记录 /// 调拨转移记录 //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibNote : SfsStoreAggregateRootBase<TransferLibNoteDetail>, IHasJobNumber public class TransferLibNote : SfsStoreAggregateRootBase<TransferLibNoteDetail>, IHasJobNumber
{ {
@ -72,4 +72,31 @@ public class TransferLibNote : SfsStoreAggregateRootBase<TransferLibNoteDetail>,
} }
} }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

23
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs

@ -3,7 +3,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary> /// <summary>
/// 库存转移记录-明细表 /// 库存转移记录-明细表 //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibNoteDetail : SfsStoreDetailWithFromToEntityBase public class TransferLibNoteDetail : SfsStoreDetailWithFromToEntityBase
{ {
@ -22,5 +22,26 @@ public class TransferLibNoteDetail : SfsStoreDetailWithFromToEntityBase
/// 执行任务状态 /// 执行任务状态
/// </summary> /// </summary>
public EnumJobStatus JobStatus { get; set; } public EnumJobStatus JobStatus { get; set; }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
public string CallJobNumber { get; set; }
#endregion
} }

28
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequest.cs

@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Entities;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary> /// <summary>
/// 调拨申请 /// 调拨申请 //??TransferLib实体
/// </summary> /// </summary>
public class TransferLibRequest : SfsStoreRequestAggregateRootBase<TransferLibRequestDetail> public class TransferLibRequest : SfsStoreRequestAggregateRootBase<TransferLibRequestDetail>
{ {
@ -28,4 +28,30 @@ public class TransferLibRequest : SfsStoreRequestAggregateRootBase<TransferLibRe
[IgnoreUpdate] [IgnoreUpdate]
public override List<TransferLibRequestDetail> Details { get; set; } = new List<TransferLibRequestDetail>(); public override List<TransferLibRequestDetail> Details { get; set; } = new List<TransferLibRequestDetail>();
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
[Display(Name = "回调服务名称")]
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
[Display(Name = "回调业务类型")]
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
[Display(Name = "传入申请单号")]
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
[Display(Name = "传入任务单号")]
public string CallJobNumber { get; set; }
#endregion
} }

24
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestDetail.cs

@ -2,7 +2,9 @@ using System.Text.Json;
using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary>
/// //??TransferLib实体
/// </summary>
public class TransferLibRequestDetail : SfsStoreDetailWithFromToEntityBase public class TransferLibRequestDetail : SfsStoreDetailWithFromToEntityBase
{ {
@ -20,5 +22,25 @@ public class TransferLibRequestDetail : SfsStoreDetailWithFromToEntityBase
{ {
return JsonSerializer.Serialize(this); return JsonSerializer.Serialize(this);
} }
#region 回调服务相关
/// <summary>
/// 回调服务名称
/// </summary>
public string CallServerName { get; set; }
/// <summary>
/// 回调业务类型
/// </summary>
public string CallBusinessType { get; set; }
/// <summary>
/// 调用者传入申请单号
/// </summary>
public string CallRequestNumber { get; set; }
/// <summary>
/// 调用者传入任务单号
/// </summary>
public string CallJobNumber { get; set; }
#endregion
} }

26267
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.Designer.cs

File diff suppressed because it is too large

263
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.cs

@ -0,0 +1,263 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Win_in.Sfs.Wms.Store.Migrations
{
public partial class transferLib2 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "CallBusinessType",
table: "Store_TransferLibRequestDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallJobNumber",
table: "Store_TransferLibRequestDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallRequestNumber",
table: "Store_TransferLibRequestDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallServerName",
table: "Store_TransferLibRequestDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallBusinessType",
table: "Store_TransferLibRequest",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallJobNumber",
table: "Store_TransferLibRequest",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallRequestNumber",
table: "Store_TransferLibRequest",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallServerName",
table: "Store_TransferLibRequest",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallBusinessType",
table: "Store_TransferLibNoteDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallJobNumber",
table: "Store_TransferLibNoteDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallRequestNumber",
table: "Store_TransferLibNoteDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallServerName",
table: "Store_TransferLibNoteDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallBusinessType",
table: "Store_TransferLibNote",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallJobNumber",
table: "Store_TransferLibNote",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallRequestNumber",
table: "Store_TransferLibNote",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallServerName",
table: "Store_TransferLibNote",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallBusinessType",
table: "Job_TransferLibJobDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallJobNumber",
table: "Job_TransferLibJobDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallRequestNumber",
table: "Job_TransferLibJobDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallServerName",
table: "Job_TransferLibJobDetail",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallBusinessType",
table: "Job_TransferLibJob",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallJobNumber",
table: "Job_TransferLibJob",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallRequestNumber",
table: "Job_TransferLibJob",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CallServerName",
table: "Job_TransferLibJob",
type: "nvarchar(max)",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CallBusinessType",
table: "Store_TransferLibRequestDetail");
migrationBuilder.DropColumn(
name: "CallJobNumber",
table: "Store_TransferLibRequestDetail");
migrationBuilder.DropColumn(
name: "CallRequestNumber",
table: "Store_TransferLibRequestDetail");
migrationBuilder.DropColumn(
name: "CallServerName",
table: "Store_TransferLibRequestDetail");
migrationBuilder.DropColumn(
name: "CallBusinessType",
table: "Store_TransferLibRequest");
migrationBuilder.DropColumn(
name: "CallJobNumber",
table: "Store_TransferLibRequest");
migrationBuilder.DropColumn(
name: "CallRequestNumber",
table: "Store_TransferLibRequest");
migrationBuilder.DropColumn(
name: "CallServerName",
table: "Store_TransferLibRequest");
migrationBuilder.DropColumn(
name: "CallBusinessType",
table: "Store_TransferLibNoteDetail");
migrationBuilder.DropColumn(
name: "CallJobNumber",
table: "Store_TransferLibNoteDetail");
migrationBuilder.DropColumn(
name: "CallRequestNumber",
table: "Store_TransferLibNoteDetail");
migrationBuilder.DropColumn(
name: "CallServerName",
table: "Store_TransferLibNoteDetail");
migrationBuilder.DropColumn(
name: "CallBusinessType",
table: "Store_TransferLibNote");
migrationBuilder.DropColumn(
name: "CallJobNumber",
table: "Store_TransferLibNote");
migrationBuilder.DropColumn(
name: "CallRequestNumber",
table: "Store_TransferLibNote");
migrationBuilder.DropColumn(
name: "CallServerName",
table: "Store_TransferLibNote");
migrationBuilder.DropColumn(
name: "CallBusinessType",
table: "Job_TransferLibJobDetail");
migrationBuilder.DropColumn(
name: "CallJobNumber",
table: "Job_TransferLibJobDetail");
migrationBuilder.DropColumn(
name: "CallRequestNumber",
table: "Job_TransferLibJobDetail");
migrationBuilder.DropColumn(
name: "CallServerName",
table: "Job_TransferLibJobDetail");
migrationBuilder.DropColumn(
name: "CallBusinessType",
table: "Job_TransferLibJob");
migrationBuilder.DropColumn(
name: "CallJobNumber",
table: "Job_TransferLibJob");
migrationBuilder.DropColumn(
name: "CallRequestNumber",
table: "Job_TransferLibJob");
migrationBuilder.DropColumn(
name: "CallServerName",
table: "Job_TransferLibJob");
migrationBuilder.DropColumn(
name: "Confirmed",
table: "Job_TransferLibJob");
}
}
}

72
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@ -19492,6 +19492,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("CallBusinessType")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallJobNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallRequestNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallServerName")
.HasColumnType("nvarchar(max)");
b.Property<DateTime?>("CompleteTime") b.Property<DateTime?>("CompleteTime")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -19620,6 +19632,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<DateTime>("ArriveDate") b.Property<DateTime>("ArriveDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("CallBusinessType")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallJobNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallRequestNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallServerName")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2") .HasColumnType("datetime2")
.HasColumnName("CreationTime"); .HasColumnName("CreationTime");
@ -19801,6 +19825,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<DateTime>("ActiveDate") b.Property<DateTime>("ActiveDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("CallBusinessType")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallJobNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallRequestNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallServerName")
.HasColumnType("nvarchar(max)");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasMaxLength(40) .HasMaxLength(40)
@ -19883,6 +19919,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<DateTime>("ArriveDate") b.Property<DateTime>("ArriveDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("CallBusinessType")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallJobNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallRequestNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallServerName")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2") .HasColumnType("datetime2")
.HasColumnName("CreationTime"); .HasColumnName("CreationTime");
@ -20088,6 +20136,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<bool>("AutoSubmit") b.Property<bool>("AutoSubmit")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<string>("CallBusinessType")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallJobNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallRequestNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallServerName")
.HasColumnType("nvarchar(max)");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken() .IsConcurrencyToken()
.HasMaxLength(40) .HasMaxLength(40)
@ -20163,6 +20223,18 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Property<DateTime>("ArriveDate") b.Property<DateTime>("ArriveDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("CallBusinessType")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallJobNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallRequestNumber")
.HasColumnType("nvarchar(max)");
b.Property<string>("CallServerName")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime") b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2") .HasColumnType("datetime2")
.HasColumnName("CreationTime"); .HasColumnName("CreationTime");

33
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/TransferLibRequestAutoMapperProfile.cs

@ -1,5 +1,6 @@
using AutoMapper; using AutoMapper;
using Volo.Abp.AutoMapper; using Volo.Abp.AutoMapper;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Event; namespace Win_in.Sfs.Wms.Store.Event;
@ -20,5 +21,37 @@ public partial class StoreEventAutoMapperProfile : Profile
CreateMap<TransferLibRequestDetail, TransferLibNoteDetail>() CreateMap<TransferLibRequestDetail, TransferLibNoteDetail>()
.Ignore(x => x.OnTheWayLocationCode); .Ignore(x => x.OnTheWayLocationCode);
CreateMap<TransferLibRequest, TransferLibJob>()
.IgnoreAuditedObjectProperties()
.ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.Number))
.ForMember(x => x.Confirmed, y => y.MapFrom(d => !d.UseOnTheWayLocation))
.Ignore(x => x.ConfirmTime)
.Ignore(x => x.JobNumber)
.Ignore(x => x.Number)
.Ignore(x => x.Id)
.Ignore(x => x.WarehouseCode)
.Ignore(x => x.Details)
.Ignore(x => x.IsAutoComplete)
.Ignore(x => x.JobType)
.Ignore(x => x.JobDescription)
.Ignore(x => x.JobStatus)
.Ignore(x => x.WorkGroupCode)
.Ignore(x => x.Priority)
.Ignore(x => x.PriorityIncrement)
.Ignore(x => x.AcceptUserId)
.Ignore(x => x.AcceptUserName)
.Ignore(x => x.AcceptTime)
.Ignore(x => x.CompleteUserId)
.Ignore(x => x.CompleteUserName)
.Ignore(x => x.CompleteTime)
.Ignore(x => x.UpStreamJobNumber)
.BeforeMap((notice, input) => input.JobType = EnumJobType.Transfer)
.BeforeMap((notice, input) => input.JobStatus = EnumJobStatus.Open)
.BeforeMap((notice, input) => input.IsAutoComplete = false)
;
CreateMap<TransferLibRequestDetail, TransferLibJobDetail>()
.Ignore(x => x.OnTheWayLocationCode)
;
} }
} }

21
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/TransferLibRequestEventHandler.cs

@ -26,14 +26,17 @@ public class TransferLibRequestEventHandler
private readonly ITransferLibNoteManager _transferLibNoteManager; private readonly ITransferLibNoteManager _transferLibNoteManager;
private readonly ILocationAppService _locationAppService; private readonly ILocationAppService _locationAppService;
private readonly ITransferLibRequestManager _transferLibRequestManager; private readonly ITransferLibRequestManager _transferLibRequestManager;
private readonly ITransferLibJobManager _transferLibJobManager;
protected ILocalEventBus LocalEventBus => LazyServiceProvider.LazyGetRequiredService<ILocalEventBus>(); protected ILocalEventBus LocalEventBus => LazyServiceProvider.LazyGetRequiredService<ILocalEventBus>();
public TransferLibRequestEventHandler( public TransferLibRequestEventHandler(
ITransferLibNoteManager transferLibNoteManager, ILocationAppService locationAppService, ITransferLibRequestManager transferLibRequestManager) ITransferLibNoteManager transferLibNoteManager, ILocationAppService locationAppService, ITransferLibRequestManager transferLibRequestManager, ITransferLibJobManager transferLibJobManager)
{ {
_transferLibNoteManager = transferLibNoteManager; _transferLibNoteManager = transferLibNoteManager;
_locationAppService = locationAppService; _locationAppService = locationAppService;
_transferLibRequestManager = transferLibRequestManager; _transferLibRequestManager = transferLibRequestManager;
_transferLibJobManager = transferLibJobManager;
} }
@ -65,6 +68,22 @@ public class TransferLibRequestEventHandler
await _transferLibNoteManager.CreateAsync(input).ConfigureAwait(false); await _transferLibNoteManager.CreateAsync(input).ConfigureAwait(false);
} }
else
{
var input = ObjectMapper.Map<TransferLibRequest, TransferLibJob>(entity);
//获取在途库
var locationDto = await _locationAppService.GetFirstByTypeAsync(EnumLocationType.TRANSPORT)
.ConfigureAwait(false);
//var transferOnTheWayLocation =
// await SettingManager.GetOrNullGlobalAsync(StoreSettings.Common.TransferOnTheWayLocation)
// .ConfigureAwait(false);
input.Details.ForEach(p => { p.OnTheWayLocationCode = locationDto.Code; });
await _transferLibJobManager.AddAsync(input).ConfigureAwait(false);
}
switch (enumTransSubType) switch (enumTransSubType)
{ {

Loading…
Cancel
Save