Browse Source

Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

dev_DY_CC
周红军 1 year ago
parent
commit
bc82c537e2
  1. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/ChassisPermissions.cs
  2. 0
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs
  3. 0
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IChassisAppService.cs
  4. 0
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs
  5. 0
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs
  6. 21
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/ChassisOperationSequencePermissions.cs
  7. 48
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs
  8. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs
  9. 48
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs
  10. 51
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs
  11. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs
  12. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs
  13. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs
  14. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs
  15. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs
  16. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs
  17. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs
  18. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs
  19. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs
  20. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs
  21. 24
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs
  22. 87
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs
  23. 19
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAutoMapperProfile.cs
  24. 26
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs
  25. 14
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs
  26. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs
  27. 13
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs
  28. 49
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs
  29. 23
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequenceManager.cs
  30. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceManager.cs
  31. 10
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceRepository.cs
  32. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs
  33. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs
  34. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs
  35. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs
  36. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs
  37. 31
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs
  38. 18
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceEfCoreRepository.cs
  39. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs
  40. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.Designer.cs
  41. 34
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.cs
  42. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.Designer.cs
  43. 34
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.cs
  44. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.Designer.cs
  45. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.Designer.cs
  46. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412061448_transferLibV2.Designer.cs
  47. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs
  48. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs
  49. 20
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs
  50. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs
  51. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs
  52. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs
  53. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs
  54. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs
  55. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
  56. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs
  57. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs
  58. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs
  59. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/EquipmentRecordPermissions.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/ChassisPermissions.cs

@ -1,4 +1,5 @@
using Volo.Abp.Authorization.Permissions; using Volo.Abp.Authorization.Permissions;
using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;

0
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/EquipmentRecordDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs

0
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IEquipmentRecordAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IChassisAppService.cs

0
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs

0
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs

21
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/ChassisOperationSequencePermissions.cs

@ -0,0 +1,21 @@
using Volo.Abp.Authorization.Permissions;
using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public static class ChassisOperationSequencePermissions
{
public const string Default = StorePermissions.GroupName + "." + nameof(ChassisOperationSequence);
public const string Create = Default + "." + StorePermissions.CreateStr;
public const string Update = Default + "." + StorePermissions.UpdateStr;
public const string Delete = Default + "." + StorePermissions.DeleteStr;
public static void AddChassisOperationSequencePermission(this PermissionGroupDefinition permissionGroup)
{
var purchaseOrderPermission =
permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ChassisOperationSequence)));
purchaseOrderPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
purchaseOrderPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
purchaseOrderPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
}
}

48
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs

@ -0,0 +1,48 @@
using System;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Application.Contracts;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisOperationSequenceDTO : SfsBasicDTOBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisOperationSequenceNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs

@ -0,0 +1,12 @@
using Win_in.Sfs.Shared.Application.Contracts;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public interface IChassisOperationSequenceAppService
:
ISfsStoreMasterAppServiceBase<ChassisOperationSequenceDTO, SfsStoreRequestInputBase, ChassisOperationSequenceEditInput, ChassisOperationSequenceDTO,
SfsStoreRequestInputBase>,
ISfsCheckStatusAppService
, ISfsUpsertAppService<ChassisOperationSequenceEditInput>
{
}

48
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs

@ -0,0 +1,48 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisOperationSequenceEditInput
: SfsStoreCreateOrUpdateInputBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisOperationSequenceNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

51
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs

@ -0,0 +1,51 @@
using System;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Application.Contracts.ExportAndImport;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisOperationSequenceImportInput : SfsStoreImportInputBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisOperationSequenceNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs

@ -22,7 +22,7 @@ public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateIn
[Display(Name = "要货单号")] [Display(Name = "要货单号")]
[Required(ErrorMessage = "{0}是必填项")] [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string AssembleRequestNumber { get; set; } public string AssembleIssueRequestsNumber { get; set; }
/// <summary> /// <summary>
/// 叫料请求类型 /// 叫料请求类型

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs

@ -27,7 +27,7 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
storeGroup.AddPutawayNotePermission(); storeGroup.AddPutawayNotePermission();
storeGroup.AddMaterialRequestPermission(); storeGroup.AddMaterialRequestPermission();
storeGroup.AddInjectionRequestPermission(); storeGroup.AddInjectionRequestPermission();
storeGroup.AddAssembleRequestPermission(); storeGroup.AddAssembleIssueRequestsPermission();
storeGroup.AddThirdLocationRequestPermission(); storeGroup.AddThirdLocationRequestPermission();
storeGroup.AddContainerRequestPermission(); storeGroup.AddContainerRequestPermission();
storeGroup.AddIssueNotePermission(); storeGroup.AddIssueNotePermission();

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs

@ -3,25 +3,25 @@ using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public static class AssembleRequestPermissions public static class AssembleIssueRequestsPermissions
{ {
public const string Default = StorePermissions.GroupName + "." + nameof(AssembleRequest); public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueRequests);
public const string Create = Default + "." + StorePermissions.CreateStr; public const string Create = Default + "." + StorePermissions.CreateStr;
public const string Update = Default + "." + StorePermissions.UpdateStr; public const string Update = Default + "." + StorePermissions.UpdateStr;
public const string Delete = Default + "." + StorePermissions.DeleteStr; public const string Delete = Default + "." + StorePermissions.DeleteStr;
//自动叫料申请 //自动叫料申请
public const string AutoAssembleRequest = StorePermissions.GroupName + "." + nameof(AutoAssembleRequest); public const string AutoAssembleIssueRequests = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueRequests);
public static void AddAssembleRequestPermission(this PermissionGroupDefinition permissionGroup) public static void AddAssembleIssueRequestsPermission(this PermissionGroupDefinition permissionGroup)
{ {
var AssembleRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleRequest))); var AssembleIssueRequestsPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueRequests)));
AssembleRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); AssembleIssueRequestsPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
AssembleRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); AssembleIssueRequestsPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
AssembleRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); AssembleIssueRequestsPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
permissionGroup.AddPermission(AutoAssembleRequest, StorePermissionDefinitionProvider.L(nameof(AutoAssembleRequest))); permissionGroup.AddPermission(AutoAssembleIssueRequests, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueRequests)));
} }
} }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs

@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class AssembleRequestDTO : SfsStoreRequestDTOBase<AssembleRequestDetailDTO>, IHasNumber public class AssembleIssueRequestsDTO : SfsStoreRequestDTOBase<AssembleIssueRequestsDetailDTO>, IHasNumber
{ {
/// <summary> /// <summary>
/// 叫料类型 /// 叫料类型

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs

@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class AssembleRequestDetailDTO : SfsStoreDetailWithQtyDTOBase public class AssembleIssueRequestsDetailDTO : SfsStoreDetailWithQtyDTOBase
{ {
/// <summary> /// <summary>
/// 已发数量 /// 已发数量

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs

@ -5,9 +5,9 @@ using Volo.Abp.Application.Dtos;
namespace Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public interface IAssembleRequestAppService public interface IAssembleIssueRequestsAppService
: ISfsStoreRequestMasterAppServiceBase<AssembleRequestDTO, SfsStoreRequestInputBase, AssembleRequestEditInput, AssembleRequestDetailDTO, SfsStoreRequestInputBase> : ISfsStoreRequestMasterAppServiceBase<AssembleIssueRequestsDTO, SfsStoreRequestInputBase, AssembleIssueRequestsEditInput, AssembleIssueRequestsDetailDTO, SfsStoreRequestInputBase>
{ {
Task<AssembleRequestDTO> CreateAndHandleAsync(AssembleRequestEditInput input); Task<AssembleIssueRequestsDTO> CreateAndHandleAsync(AssembleIssueRequestsEditInput input);
} }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.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;
public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase public class AssembleIssueRequestsDetailInput : SfsStoreDetailWithQtyInputBase
{ {
#region 目标库位信息 #region 目标库位信息

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.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;
public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase public class AssembleIssueRequestsEditInput : SfsStoreRequestCreateOrUpdateInputBase
{ {
#region Base #region Base

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.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;
[Display(Name = "叫料申请")] [Display(Name = "叫料申请")]
public class AssembleRequestImportInput : SfsStoreImportInputBase public class AssembleIssueRequestsImportInput : SfsStoreImportInputBase
{ {
/// <summary> /// <summary>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs

@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Application;
[Authorize] [Authorize]
[Route($"{StoreConsts.RootPath}Chassis")] [Route($"{StoreConsts.RootPath}Chassis")]
public class ChassisAppService public class ChassisAppService
: SfsStoreAppServiceBase<Domain.Chassis, ChassisDTO, SfsStoreRequestInputBase, ChassisEditInput, : SfsStoreAppServiceBase<Chassis, ChassisDTO, SfsStoreRequestInputBase, ChassisEditInput,
ExchangeDataImportInput> ExchangeDataImportInput>
, IChassisAppService , IChassisAppService

24
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs

@ -15,29 +15,5 @@ public partial class StoreApplicationAutoMapperProfile : Profile
{ {
CreateMap<Domain.Chassis, ChassisDTO>() CreateMap<Domain.Chassis, ChassisDTO>()
.ReverseMap(); .ReverseMap();
// CreateMap<ExchangeDataCreateInput, ExchangeData>()
// .IgnoreAuditedObjectProperties()
// .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id)
// ;
// CreateMap<ExchangeDataUpdateInput, ExchangeData>()
// .IgnoreAuditedObjectProperties()
// .Ignore(x => x.Id) ;
// ;
// CreateMap<ExchangeDataImportInput, ExchangeData>()
// .IgnoreAuditedObjectProperties()
// .Ignore(x => x.TenantId)
// //.Ignore(x => x.Remark)
// .Ignore(x => x.ExtraProperties)
// .Ignore(x => x.ConcurrencyStamp)
// ;
// CreateMap<ExchangeData, ExchangeDataImportInput>()
// .Ignore(x => x.ReportStatus)
// .Ignore(x => x.ReportReason)
// ;
// CreateMap<ExchangeData, ExchangeDataExportDTO>()
//;
} }
} }

87
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs

@ -0,0 +1,87 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.ObjectMapping;
using Win_in.Sfs.Basedata.Equipments.DTOs;
using Win_in.Sfs.Shared.Application;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.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.Shared;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Application;
[Authorize]
[Route($"{StoreConsts.RootPath}ChassisOperationSequence")]
public class ChassisOperationSequenceAppService
: SfsStoreAppServiceBase<Domain.ChassisOperationSequence, ChassisOperationSequenceDTO, SfsStoreRequestInputBase, ChassisOperationSequenceEditInput,
ExchangeDataImportInput>
, IChassisOperationSequenceAppService
{
private new readonly IChassisOperationSequenceRepository _repository;
private readonly IChassisOperationSequenceManager _manager;
public ChassisOperationSequenceAppService(
IChassisOperationSequenceRepository repository, IChassisOperationSequenceManager manager
):base(repository)
{
base.CreatePolicyName = ChassisOperationSequencePermissions.Create;
base.UpdatePolicyName = ChassisOperationSequencePermissions.Update;
base.DeletePolicyName = ChassisOperationSequencePermissions.Delete;
_repository = repository;
_manager = manager;
}
#region 无用
[NonAction]
public Task<ChassisOperationSequenceDTO> GetDetailAsync(Guid id, Guid detailId)
{
throw new NotImplementedException();
}
[NonAction]
public Task<List<ChassisOperationSequenceDTO>> GetDetailListAsync(Guid id, SfsStoreRequestInputBase requestInput)
{
throw new NotImplementedException();
}
[NonAction]
public Task AddDetailListAsync(Guid id, List<ChassisOperationSequenceDTO> list)
{
throw new NotImplementedException();
}
[NonAction]
public Task UpdateDetailAsync(Guid id, Guid detailId, ChassisOperationSequenceDTO updateDTO)
{
throw new NotImplementedException();
}
[NonAction]
public Task CheckStatusAsync(string number)
{
throw new NotImplementedException();
}
[NonAction]
public Task UpsertAsync(ChassisOperationSequenceEditInput input)
{
throw new NotImplementedException();
}
#endregion
}

19
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAutoMapperProfile.cs

@ -0,0 +1,19 @@
using AutoMapper;
using Volo.Abp.AutoMapper;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Basedata.Domain;
using Win_in.Sfs.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Application;
public partial class StoreApplicationAutoMapperProfile : Profile
{
private void ChassisOperationSequenceAutoMapperProfile()
{
CreateMap<Domain.ChassisOperationSequence, ChassisOperationSequenceDTO>()
.ReverseMap();
}
}

26
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs

@ -31,12 +31,12 @@ namespace Win_in.Sfs.Wms.Store.Application;
/// </summary> /// </summary>
[Authorize] [Authorize]
[Route($"{StoreConsts.RootPath}assemble-request")] [Route($"{StoreConsts.RootPath}assemble-request")]
public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleRequest, AssembleRequestDTO, public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase<AssembleIssueRequests, AssembleIssueRequestsDTO,
SfsStoreRequestInputBase, AssembleRequestEditInput, AssembleRequestDetail, AssembleRequestDetailDTO, SfsStoreRequestInputBase, AssembleIssueRequestsEditInput, AssembleIssueRequestsDetail, AssembleIssueRequestsDetailDTO,
SfsStoreRequestInputBase, AssembleRequestImportInput>, SfsStoreRequestInputBase, AssembleIssueRequestsImportInput>,
IAssembleRequestAppService IAssembleIssueRequestsAppService
{ {
private readonly IAssembleRequestManager _assembleRequestManager; private readonly IAssembleIssueRequestsManager _assembleRequestManager;
private readonly IItemStoreRelationAppService _itemStoreRelationApp; private readonly IItemStoreRelationAppService _itemStoreRelationApp;
private readonly IAreaAppService _areaApp; private readonly IAreaAppService _areaApp;
private readonly ILocationAppService _locationAppService; private readonly ILocationAppService _locationAppService;
@ -70,7 +70,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
#region 东阳V2 #region 东阳V2
public override async Task<AssembleRequestDTO> HandleAsync(Guid id) public override async Task<AssembleIssueRequestsDTO> HandleAsync(Guid id)
{ {
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);
return null; return null;
@ -117,7 +117,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
var result = await _assembleRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false); var result = await _assembleRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
var dto = ObjectMapper.Map<AssembleRequest, AssembleRequestDTO>(result); var dto = ObjectMapper.Map<AssembleIssueRequests, AssembleIssueRequestsDTO>(result);
return dto; return dto;
} }
@ -139,7 +139,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
} }
[HttpPost("create-and-handle")] [HttpPost("create-and-handle")]
public async Task<AssembleRequestDTO> CreateAndHandleAsync(AssembleRequestEditInput input) public async Task<AssembleIssueRequestsDTO> CreateAndHandleAsync(AssembleIssueRequestsEditInput input)
{ {
var assembleRequestDto = await CreateAsync(input).ConfigureAwait(false); var assembleRequestDto = await CreateAsync(input).ConfigureAwait(false);
@ -157,8 +157,8 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
/// </summary> /// </summary>
/// <param name="dictionary"></param> /// <param name="dictionary"></param>
/// <returns></returns> /// <returns></returns>
protected override async Task<Dictionary<AssembleRequest, EntityState>> ImportProcessingEntityAsync( protected override async Task<Dictionary<AssembleIssueRequests, EntityState>> ImportProcessingEntityAsync(
Dictionary<AssembleRequest, EntityState> dictionary) Dictionary<AssembleIssueRequests, EntityState> dictionary)
{ {
var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key); var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
@ -200,7 +200,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
/// <param name="model"></param> /// <param name="model"></param>
/// <param name="validationRresult"></param> /// <param name="validationRresult"></param>
/// <returns></returns> /// <returns></returns>
protected override async Task ValidateImportModelAsync(AssembleRequestImportInput model, protected override async Task ValidateImportModelAsync(AssembleIssueRequestsImportInput model,
List<ValidationResult> validationRresult) List<ValidationResult> validationRresult)
{ {
_ = new Dictionary<string, string>(); _ = new Dictionary<string, string>();
@ -214,7 +214,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
#region 校验 #region 校验
protected override async Task<bool> ValidateImportEntities(Dictionary<AssembleRequest, EntityState> dict) protected override async Task<bool> ValidateImportEntities(Dictionary<AssembleIssueRequests, EntityState> dict)
{ {
foreach (var entity in dict.Keys) foreach (var entity in dict.Keys)
{ {
@ -243,7 +243,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase<AssembleR
} }
} }
protected async Task CheckStoreRelationAsync(AssembleRequestImportInput importInput, protected async Task CheckStoreRelationAsync(AssembleIssueRequestsImportInput importInput,
List<ValidationResult> validationRresult) List<ValidationResult> validationRresult)
{ {
var itemStoreRelation = await _itemStoreRelationApp var itemStoreRelation = await _itemStoreRelationApp

14
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs

@ -8,22 +8,22 @@ namespace Win_in.Sfs.Wms.Store.Application;
public partial class StoreApplicationAutoMapperProfile : Profile public partial class StoreApplicationAutoMapperProfile : Profile
{ {
private void AssembleRequestAutoMapperProfile() private void AssembleIssueRequestsAutoMapperProfile()
{ {
CreateMap<AssembleRequest, AssembleRequestDTO>() CreateMap<AssembleIssueRequests, AssembleIssueRequestsDTO>()
.ReverseMap(); .ReverseMap();
CreateMap<AssembleRequestDetail, AssembleRequestDetailDTO>() CreateMap<AssembleIssueRequestsDetail, AssembleIssueRequestsDetailDTO>()
.ReverseMap(); .ReverseMap();
CreateMap<AssembleRequestDetailInput, AssembleRequestDetail>() CreateMap<AssembleIssueRequestsDetailInput, AssembleIssueRequestsDetail>()
.IgnoreAuditedObjectProperties() .IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID) .Ignore(x => x.MasterID)
.Ignore(x => x.TenantId) .Ignore(x => x.TenantId)
.Ignore(x => x.Number) .Ignore(x => x.Number)
.Ignore(x => x.Id); .Ignore(x => x.Id);
CreateMap<AssembleRequestImportInput, AssembleRequest>() CreateMap<AssembleIssueRequestsImportInput, AssembleIssueRequests>()
.IgnoreAuditedObjectProperties() .IgnoreAuditedObjectProperties()
.ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString())) .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString()))
.Ignore(x => x.UseOnTheWayLocation) .Ignore(x => x.UseOnTheWayLocation)
@ -37,7 +37,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.ActiveDate) .Ignore(x => x.ActiveDate)
.Ignore(x => x.Remark); .Ignore(x => x.Remark);
CreateMap<AssembleRequestImportInput, AssembleRequestDetail>() CreateMap<AssembleIssueRequestsImportInput, AssembleIssueRequestsDetail>()
.IgnoreAuditedObjectProperties() .IgnoreAuditedObjectProperties()
.ForMember(x => x.Status, y => y.MapFrom(t => EnumStatus.Open)) .ForMember(x => x.Status, y => y.MapFrom(t => EnumStatus.Open))
.Ignore(x => x.ToLocationErpCode) .Ignore(x => x.ToLocationErpCode)
@ -58,7 +58,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.Number) .Ignore(x => x.Number)
.Ignore(x => x.Id) .Ignore(x => x.Id)
.Ignore(x => x.Remark); .Ignore(x => x.Remark);
CreateMap<AssembleRequestEditInput, AssembleRequest>() CreateMap<AssembleIssueRequestsEditInput, AssembleIssueRequests>()
.IgnoreAuditedObjectProperties() .IgnoreAuditedObjectProperties()
.Ignore(x => x.RequestStatus) .Ignore(x => x.RequestStatus)
.Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id); .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id);

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs

@ -15,7 +15,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
ItemTransformRequestAutoMapperProfile(); ItemTransformRequestAutoMapperProfile();
MaterialRequestAutoMapperProfile(); MaterialRequestAutoMapperProfile();
InjectionRequestAutoMapperProfile(); InjectionRequestAutoMapperProfile();
AssembleRequestAutoMapperProfile(); AssembleIssueRequestsAutoMapperProfile();
ThirdLocationRequestAutoMapperProfile(); ThirdLocationRequestAutoMapperProfile();
ProductionReturnRequestAutoMapperProfile(); ProductionReturnRequestAutoMapperProfile();
ProductReceiptRequestAutoMapperProfile(); ProductReceiptRequestAutoMapperProfile();

13
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs

@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Chassis;
public class ChassisDetail: SfsStoreDetailEntityBase
{
}

49
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs

@ -0,0 +1,49 @@
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary>
/// 底盘信息
/// </summary>
[Display(Name = "底盘信息")]
public class ChassisOperationSequence : SfsAggregateRootBase
{
/// <summary>
/// Wms编号
/// </summary>
[Display(Name = "Wms编号")]
public string Number { get; set; }
/// <summary>
/// 底盘号
/// </summary>
[Display(Name = "底盘号")]
public string ChassisOperationSequenceNumber { get; set; }
/// <summary>
/// 描述
/// </summary>
[Display(Name = "描述")]
public string Description { get; set; }
/// <summary>
/// 底盘生产时间
/// </summary>
[Display(Name = "底盘生产时间")]
public DateTime ProduceDateTime { get; set; }
/// <summary>
/// 接收接口时间
/// </summary>
[Display(Name = "接收接口时间")]
public DateTime ReceiveInterfaceDateTime { get; set; }
/// <summary>
/// 执行位置排序列
/// </summary>
[Display(Name = "执行位置排序列")]
public long SortNumber { get; set; }
}

23
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequenceManager.cs

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Volo.Abp.Domain.Services;
namespace Win_in.Sfs.Wms.Store.Domain;
public class ChassisOperationSequenceManager : DomainService, IChassisOperationSequenceManager
{
private readonly IChassisOperationSequenceRepository _repository;
public ChassisOperationSequenceManager(
IChassisOperationSequenceRepository repository
)
{
_repository = repository;
}
public Task ImportDataAsync(List<ChassisOperationSequence> entities, List<ChassisOperationSequence> deleteEntities = null)
{
throw new NotImplementedException();
}
}

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceManager.cs

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Win_in.Sfs.Basedata.Equipments.DTOs;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Domain;
public interface IChassisOperationSequenceManager : IBulkImportService<ChassisOperationSequence>
{
}

10
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceRepository.cs

@ -0,0 +1,10 @@
using System.Threading.Tasks;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.Domain;
public interface IChassisOperationSequenceRepository : ISfsStoreRepositoryBase<ChassisOperationSequence>, ISfsBulkRepositoryBase<ChassisOperationSequence>
{
}

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs

@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary> /// <summary>
/// 装配叫料申请 /// 装配叫料申请
/// </summary> /// </summary>
public class AssembleRequest : SfsStoreRequestAggregateRootBase<AssembleRequestDetail> public class AssembleIssueRequests : SfsStoreRequestAggregateRootBase<AssembleIssueRequestsDetail>
{ {
/// <summary> /// <summary>
/// 叫料类型 /// 叫料类型
@ -25,5 +25,5 @@ public class AssembleRequest : SfsStoreRequestAggregateRootBase<AssembleRequestD
/// 明细列表 /// 明细列表
/// </summary> /// </summary>
[IgnoreUpdate] [IgnoreUpdate]
public override List<AssembleRequestDetail> Details { get; set; } = new List<AssembleRequestDetail>(); public override List<AssembleIssueRequestsDetail> Details { get; set; } = new List<AssembleIssueRequestsDetail>();
} }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs

@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Domain;
/// <summary> /// <summary>
/// 装配叫料申请明细 /// 装配叫料申请明细
/// </summary> /// </summary>
public class AssembleRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation public class AssembleIssueRequestsDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
{ {
#region 目标库位信息 #region 目标库位信息

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs

@ -9,15 +9,15 @@ using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
public class AssembleRequestManager public class AssembleIssueRequestsManager
: SfsStoreRequestManagerBase<AssembleRequest, AssembleRequestDetail> : SfsStoreRequestManagerBase<AssembleIssueRequests, AssembleIssueRequestsDetail>
, IAssembleRequestManager , IAssembleIssueRequestsManager
{ {
private readonly IAssembleRequestRepository _repository; private readonly IAssembleIssueRequestsRepository _repository;
public AssembleRequestManager( public AssembleIssueRequestsManager(
IAssembleRequestRepository repository IAssembleIssueRequestsRepository repository
) : base(repository) ) : base(repository)
{ {
@ -36,12 +36,12 @@ public class AssembleRequestManager
/// <returns></returns> /// <returns></returns>
public virtual async Task<AssembleRequest> CreateByNumberAsync(AssembleRequest entity) public virtual async Task<AssembleRequest> CreateByNumberAsync(AssembleRequest entity)
{ {
var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number; var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleIssueRequests), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
entity.SetIdAndNumberWithDetails(GuidGenerator, number); entity.SetIdAndNumberWithDetails(GuidGenerator, number);
entity.Submit(); entity.Submit();
entity.Agree(); entity.Agree();
entity.RequestStatus = EnumRequestStatus.Partial; entity.RequestStatus = EnumRequestStatus.Partial;
await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<AssembleRequest>(entity), false) await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<AssembleIssueRequests>(entity), false)
.ConfigureAwait(false); .ConfigureAwait(false);
await _repository.InsertAsync(entity).ConfigureAwait(false); await _repository.InsertAsync(entity).ConfigureAwait(false);
return entity; return entity;
@ -63,7 +63,7 @@ public class AssembleRequestManager
/// <summary> /// <summary>
/// 执行导入 /// 执行导入
/// </summary> /// </summary>
public virtual async Task ImportDataAsync(List<AssembleRequest> mergeEntities, List<AssembleRequest> deleteEntities = null) public virtual async Task ImportDataAsync(List<AssembleIssueRequests> mergeEntities, List<AssembleIssueRequests> deleteEntities = null)
{ {
if (deleteEntities != null && deleteEntities.Count > 0) if (deleteEntities != null && deleteEntities.Count > 0)
{ {

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs

@ -4,8 +4,8 @@ namespace Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Shared.Domain; using Win_in.Sfs.Shared.Domain;
public interface IAssembleRequestManager : ISfsStoreRequestManager<AssembleRequest, AssembleRequestDetail>, public interface IAssembleIssueRequestsManager : ISfsStoreRequestManager<AssembleIssueRequests, AssembleIssueRequestsDetail>,
IBulkImportService<AssembleRequest> IBulkImportService<AssembleIssueRequests>
{ {
Task CompleteAsync(string number); Task CompleteAsync(string number);

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs

@ -2,8 +2,8 @@ using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Domain;
public interface IAssembleRequestRepository : ISfsStoreRepositoryBase<AssembleRequest>, public interface IAssembleIssueRequestsRepository : ISfsStoreRepositoryBase<AssembleIssueRequests>,
ISfsBulkRepositoryBase<AssembleRequest> ISfsBulkRepositoryBase<AssembleIssueRequests>
{ {
} }

31
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs

@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.Modeling;
using Win_in.Sfs.Shared.Domain.Shared;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
public static class ChassisOperationSequenceDbContextModelCreatingExtensions
{
public static void ConfigureChassisOperationSequence(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
{
builder.Entity<Domain.ChassisOperationSequence>(b =>
{
//Configure table & schema name
b.ToTable(options.TablePrefix + nameof(ChassisOperationSequence), options.Schema);
//Configure ABP properties
b.ConfigureByConvention();
//Configure Sfs base properties
b.ConfigureSfsStoreBase();
b.Property(q => q.SortNumber).IsRequired();
b.Property(q => q.ChassisOperationSequenceNumber).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired();
b.Property(q => q.Number).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired();
b.HasIndex(q => q.ChassisOperationSequenceNumber).IsUnique();
b.HasIndex(q => q.SortNumber).IsUnique();
b.HasIndex(q => q.Number).IsUnique();
});
}
}

18
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceEfCoreRepository.cs

@ -0,0 +1,18 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Equipments;
namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
public class ChassisOperationSequenceEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, Domain.ChassisOperationSequence>, IChassisOperationSequenceRepository, ISfsBulkRepositoryBase<Domain.ChassisOperationSequence>
{
public ChassisOperationSequenceEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
{
}
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs

@ -22,7 +22,7 @@ public interface IStoreDbContext : IEfCoreDbContext
public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; } public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; }
public DbSet<MaterialRequest> MaterialRequests { get; } public DbSet<MaterialRequest> MaterialRequests { get; }
public DbSet<InjectionRequest> InjectionRequests { get; } public DbSet<InjectionRequest> InjectionRequests { get; }
public DbSet<AssembleRequest> AssembleRequests { get; } public DbSet<AssembleIssueRequests> AssembleIssueRequests { get; }
public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; } public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; }
public DbSet<ContainerRequest> ContainerRequests { get; } public DbSet<ContainerRequest> ContainerRequests { get; }
public DbSet<DeliverRequest> DeliverRequests { get; } public DbSet<DeliverRequest> DeliverRequests { get; }

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -26388,9 +26388,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -27199,7 +27199,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

34
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.cs

@ -47,7 +47,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RequestType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), RequestType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
AssembleRequestNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), AssembleIssueRequestsNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Workshop = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), Workshop = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false), UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
@ -111,7 +111,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Store_AssembleRequest", name: "Store_AssembleIssueRequests",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
@ -138,7 +138,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_Store_AssembleRequest", x => x.Id); table.PrimaryKey("PK_Store_AssembleIssueRequests", x => x.Id);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
@ -331,7 +331,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Store_AssembleRequestDetail", name: "Store_AssembleIssueRequestsDetail",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
@ -367,11 +367,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_Store_AssembleRequestDetail", x => x.Id); table.PrimaryKey("PK_Store_AssembleIssueRequestsDetail", x => x.Id);
table.ForeignKey( table.ForeignKey(
name: "FK_Store_AssembleRequestDetail_Store_AssembleRequest_MasterID", name: "FK_Store_AssembleIssueRequestsDetail_Store_AssembleIssueRequests_MasterID",
column: x => x.MasterID, column: x => x.MasterID,
principalTable: "Store_AssembleRequest", principalTable: "Store_AssembleIssueRequests",
principalColumn: "Id", principalColumn: "Id",
onDelete: ReferentialAction.Cascade); onDelete: ReferentialAction.Cascade);
}); });
@ -466,24 +466,24 @@ namespace Win_in.Sfs.Wms.Store.Migrations
filter: "[FromPackingCode] IS NOT NULL"); filter: "[FromPackingCode] IS NOT NULL");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequest_Number", name: "IX_Store_AssembleIssueRequests_Number",
table: "Store_AssembleRequest", table: "Store_AssembleIssueRequests",
column: "Number", column: "Number",
unique: true); unique: true);
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequestDetail_ItemCode", name: "IX_Store_AssembleIssueRequestsDetail_ItemCode",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
column: "ItemCode"); column: "ItemCode");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequestDetail_MasterID", name: "IX_Store_AssembleIssueRequestsDetail_MasterID",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
column: "MasterID"); column: "MasterID");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequestDetail_Number_ItemCode_ToLocationCode", name: "IX_Store_AssembleIssueRequestsDetail_Number_ItemCode_ToLocationCode",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
columns: new[] { "Number", "ItemCode", "ToLocationCode" }, columns: new[] { "Number", "ItemCode", "ToLocationCode" },
unique: true); unique: true);
@ -515,7 +515,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
name: "Store_AssembleNoteDetail"); name: "Store_AssembleNoteDetail");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Store_AssembleRequestDetail"); name: "Store_AssembleIssueRequestsDetail");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Store_MesNoteDetail"); name: "Store_MesNoteDetail");
@ -527,7 +527,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
name: "Store_AssembleNote"); name: "Store_AssembleNote");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Store_AssembleRequest"); name: "Store_AssembleIssueRequests");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Store_MesNote"); name: "Store_MesNote");

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -26128,9 +26128,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -26930,7 +26930,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

34
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.cs

@ -43,7 +43,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RequestType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), RequestType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), ProdLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
AssembleRequestNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), AssembleIssueRequestsNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Workshop = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), Workshop = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false), UseOnTheWayLocation = table.Column<bool>(type: "bit", nullable: false),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
@ -107,7 +107,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Store_AssembleRequest", name: "Store_AssembleIssueRequests",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
@ -134,7 +134,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_Store_AssembleRequest", x => x.Id); table.PrimaryKey("PK_Store_AssembleIssueRequests", x => x.Id);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
@ -302,7 +302,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Store_AssembleRequestDetail", name: "Store_AssembleIssueRequestsDetail",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
@ -338,11 +338,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_Store_AssembleRequestDetail", x => x.Id); table.PrimaryKey("PK_Store_AssembleIssueRequestsDetail", x => x.Id);
table.ForeignKey( table.ForeignKey(
name: "FK_Store_AssembleRequestDetail_Store_AssembleRequest_MasterID", name: "FK_Store_AssembleIssueRequestsDetail_Store_AssembleIssueRequests_MasterID",
column: x => x.MasterID, column: x => x.MasterID,
principalTable: "Store_AssembleRequest", principalTable: "Store_AssembleIssueRequests",
principalColumn: "Id", principalColumn: "Id",
onDelete: ReferentialAction.Cascade); onDelete: ReferentialAction.Cascade);
}); });
@ -382,24 +382,24 @@ namespace Win_in.Sfs.Wms.Store.Migrations
filter: "[FromPackingCode] IS NOT NULL"); filter: "[FromPackingCode] IS NOT NULL");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequest_Number", name: "IX_Store_AssembleIssueRequests_Number",
table: "Store_AssembleRequest", table: "Store_AssembleIssueRequests",
column: "Number", column: "Number",
unique: true); unique: true);
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequestDetail_ItemCode", name: "IX_Store_AssembleIssueRequestsDetail_ItemCode",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
column: "ItemCode"); column: "ItemCode");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequestDetail_MasterID", name: "IX_Store_AssembleIssueRequestsDetail_MasterID",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
column: "MasterID"); column: "MasterID");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Store_AssembleRequestDetail_Number_ItemCode_ToLocationCode", name: "IX_Store_AssembleIssueRequestsDetail_Number_ItemCode_ToLocationCode",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
columns: new[] { "Number", "ItemCode", "ToLocationCode" }, columns: new[] { "Number", "ItemCode", "ToLocationCode" },
unique: true); unique: true);
} }
@ -413,7 +413,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
name: "Store_AssembleNoteDetail"); name: "Store_AssembleNoteDetail");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Store_AssembleRequestDetail"); name: "Store_AssembleIssueRequestsDetail");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Job_AssembleJob"); name: "Job_AssembleJob");
@ -422,7 +422,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
name: "Store_AssembleNote"); name: "Store_AssembleNote");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Store_AssembleRequest"); name: "Store_AssembleIssueRequests");
migrationBuilder.DropColumn( migrationBuilder.DropColumn(
name: "JobNumber", name: "JobNumber",

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -28245,9 +28245,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -29110,7 +29110,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -28333,9 +28333,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -29198,7 +29198,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412061448_transferLibV2.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -28423,9 +28423,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -29288,7 +29288,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -28798,9 +28798,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -29663,7 +29663,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs

@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -924,10 +924,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1064,7 +1064,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -29006,9 +29006,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -29880,7 +29880,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

20
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs

@ -35,19 +35,19 @@ namespace Win_in.Sfs.Wms.Store.Migrations
migrationBuilder.DropColumn( migrationBuilder.DropColumn(
name: "ExpiredTime", name: "ExpiredTime",
table: "Store_AssembleRequestDetail"); table: "Store_AssembleIssueRequestsDetail");
migrationBuilder.DropColumn( migrationBuilder.DropColumn(
name: "FromLocationArea", name: "FromLocationArea",
table: "Store_AssembleRequestDetail"); table: "Store_AssembleIssueRequestsDetail");
migrationBuilder.DropColumn( migrationBuilder.DropColumn(
name: "WorkStation", name: "WorkStation",
table: "Store_AssembleRequestDetail"); table: "Store_AssembleIssueRequestsDetail");
migrationBuilder.DropColumn( migrationBuilder.DropColumn(
name: "ProdLine", name: "ProdLine",
table: "Store_AssembleRequest"); table: "Store_AssembleIssueRequests");
migrationBuilder.AddColumn<decimal>( migrationBuilder.AddColumn<decimal>(
name: "BoxQty", name: "BoxQty",
@ -58,7 +58,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
migrationBuilder.AddColumn<decimal>( migrationBuilder.AddColumn<decimal>(
name: "BoxQty", name: "BoxQty",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
type: "decimal(18,6)", type: "decimal(18,6)",
nullable: false, nullable: false,
defaultValue: 0m); defaultValue: 0m);
@ -177,7 +177,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
migrationBuilder.DropColumn( migrationBuilder.DropColumn(
name: "BoxQty", name: "BoxQty",
table: "Store_AssembleRequestDetail"); table: "Store_AssembleIssueRequestsDetail");
migrationBuilder.AddColumn<DateTime>( migrationBuilder.AddColumn<DateTime>(
name: "ExpiredTime", name: "ExpiredTime",
@ -222,27 +222,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations
migrationBuilder.AddColumn<DateTime>( migrationBuilder.AddColumn<DateTime>(
name: "ExpiredTime", name: "ExpiredTime",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
type: "datetime2", type: "datetime2",
nullable: false, nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
migrationBuilder.AddColumn<string>( migrationBuilder.AddColumn<string>(
name: "FromLocationArea", name: "FromLocationArea",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
type: "nvarchar(max)", type: "nvarchar(max)",
nullable: true); nullable: true);
migrationBuilder.AddColumn<string>( migrationBuilder.AddColumn<string>(
name: "WorkStation", name: "WorkStation",
table: "Store_AssembleRequestDetail", table: "Store_AssembleIssueRequestsDetail",
type: "nvarchar(64)", type: "nvarchar(64)",
maxLength: 64, maxLength: 64,
nullable: true); nullable: true);
migrationBuilder.AddColumn<string>( migrationBuilder.AddColumn<string>(
name: "ProdLine", name: "ProdLine",
table: "Store_AssembleRequest", table: "Store_AssembleIssueRequests",
type: "nvarchar(64)", type: "nvarchar(64)",
maxLength: 64, maxLength: 64,
nullable: true); nullable: true);

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

@ -39,7 +39,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AssembleRequestNumber") b.Property<string>("AssembleIssueRequestsNumber")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
@ -838,7 +838,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.ToTable("Store_AssembleNoteDetail", (string)null); b.ToTable("Store_AssembleNoteDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -922,10 +922,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number") b.HasIndex("Number")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequest", (string)null); b.ToTable("Store_AssembleIssueRequests", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1062,7 +1062,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.HasIndex("Number", "ItemCode", "ToLocationCode") b.HasIndex("Number", "ItemCode", "ToLocationCode")
.IsUnique(); .IsUnique();
b.ToTable("Store_AssembleRequestDetail", (string)null); b.ToTable("Store_AssembleIssueRequestsDetail", (string)null);
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b =>
@ -29004,9 +29004,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b =>
{ {
b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null)
.WithMany("Details") .WithMany("Details")
.HasForeignKey("MasterID") .HasForeignKey("MasterID")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
@ -29878,7 +29878,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations
b.Navigation("Details"); b.Navigation("Details");
}); });
modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b =>
{ {
b.Navigation("Details"); b.Navigation("Details");
}); });

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs

@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
public static class AssembleRequestDbContextModelCreatingExtensions public static class AssembleIssueRequestsDbContextModelCreatingExtensions
{ {
public static void ConfigureAssembleRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) public static void ConfigureAssembleIssueRequests(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
{ {
builder.Entity<AssembleRequest>(b => builder.Entity<AssembleIssueRequests>(b =>
{ {
//Configure table & schema name //Configure table & schema name
b.ToTable(options.TablePrefix + nameof(AssembleRequest), options.Schema); b.ToTable(options.TablePrefix + nameof(AssembleIssueRequests), options.Schema);
//Configure ABP properties //Configure ABP properties
b.ConfigureByConvention(); b.ConfigureByConvention();
//Configure Sfs base properties //Configure Sfs base properties
@ -29,10 +29,10 @@ public static class AssembleRequestDbContextModelCreatingExtensions
b.HasIndex(q => new { q.Number }).IsUnique(); b.HasIndex(q => new { q.Number }).IsUnique();
}); });
builder.Entity<AssembleRequestDetail>(b => builder.Entity<AssembleIssueRequestsDetail>(b =>
{ {
//Configure table & schema name //Configure table & schema name
b.ToTable(options.TablePrefix + nameof(AssembleRequestDetail), options.Schema); b.ToTable(options.TablePrefix + nameof(AssembleIssueRequestsDetail), options.Schema);
//Configure ABP properties //Configure ABP properties
b.ConfigureByConvention(); b.ConfigureByConvention();
//Configure Sfs base properties //Configure Sfs base properties

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs

@ -3,9 +3,9 @@ using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
public class AssembleRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, AssembleRequest>, IAssembleRequestRepository public class AssembleIssueRequestsEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, AssembleIssueRequests>, IAssembleIssueRequestsRepository
{ {
public AssembleRequestEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider) public AssembleIssueRequestsEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
{ {
} }
} }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs

@ -22,7 +22,7 @@ public class StoreDbContext : AbpDbContext<StoreDbContext>, IStoreDbContext
public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; set; } public DbSet<ProductReceiptRequest> ProductReceiptRequests { get; set; }
public DbSet<MaterialRequest> MaterialRequests { get; set; } public DbSet<MaterialRequest> MaterialRequests { get; set; }
public DbSet<InjectionRequest> InjectionRequests { get; set; } public DbSet<InjectionRequest> InjectionRequests { get; set; }
public DbSet<AssembleRequest> AssembleRequests { get; set; } public DbSet<AssembleIssueRequests> AssembleIssueRequests { get; set; }
public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; set; } public DbSet<ThirdLocationRequest> ThirdLocationRequests { get; set; }
public DbSet<ContainerRequest> ContainerRequests { get; set; } public DbSet<ContainerRequest> ContainerRequests { get; set; }
public DbSet<DeliverRequest> DeliverRequests { get; set; } public DbSet<DeliverRequest> DeliverRequests { get; set; }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs

@ -48,7 +48,7 @@ public static class StoreDbContextModelCreatingExtensions
builder.ConfigurePurchaseReceiptRequest(options); builder.ConfigurePurchaseReceiptRequest(options);
builder.ConfigureMaterialRequest(options); builder.ConfigureMaterialRequest(options);
builder.ConfigureInjectionRequest(options); builder.ConfigureInjectionRequest(options);
builder.ConfigureAssembleRequest(options); builder.ConfigureAssembleIssueRequests(options);
builder.ConfigureThirdLocationRequest(options); builder.ConfigureThirdLocationRequest(options);
builder.ConfigureDeliverRequest(options); builder.ConfigureDeliverRequest(options);
builder.ConfigureContainerRequest(options); builder.ConfigureContainerRequest(options);

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@ -61,7 +61,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
context.Services.AddTransient<IPurchaseReceiptRequestRepository, PurchaseReceiptRequestEfCoreRepository>(); context.Services.AddTransient<IPurchaseReceiptRequestRepository, PurchaseReceiptRequestEfCoreRepository>();
context.Services.AddTransient<IMaterialRequestRepository, MaterialRequestEfCoreRepository>(); context.Services.AddTransient<IMaterialRequestRepository, MaterialRequestEfCoreRepository>();
context.Services.AddTransient<IInjectionRequestRepository, InjectionRequestEfCoreRepository>(); context.Services.AddTransient<IInjectionRequestRepository, InjectionRequestEfCoreRepository>();
context.Services.AddTransient<IAssembleRequestRepository, AssembleRequestEfCoreRepository>(); context.Services.AddTransient<IAssembleIssueRequestsRepository, AssembleIssueRequestsEfCoreRepository>();
context.Services.AddTransient<IThirdLocationRequestRepository, ThirdLocationRequestEfCoreRepository>(); context.Services.AddTransient<IThirdLocationRequestRepository, ThirdLocationRequestEfCoreRepository>();
context.Services.AddTransient<IDeliverRequestRepository, DeliverRequestEfCoreRepository>(); context.Services.AddTransient<IDeliverRequestRepository, DeliverRequestEfCoreRepository>();
context.Services.AddTransient<IContainerRequestRepository, ContainerRequestEfCoreRepository>(); context.Services.AddTransient<IContainerRequestRepository, ContainerRequestEfCoreRepository>();
@ -209,7 +209,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule
orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
options.Entity<InjectionRequest>(orderOptions => options.Entity<InjectionRequest>(orderOptions =>
orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
options.Entity<AssembleRequest>(orderOptions => options.Entity<AssembleIssueRequests>(orderOptions =>
orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
options.Entity<ThirdLocationRequest>(orderOptions => options.Entity<ThirdLocationRequest>(orderOptions =>
orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs

@ -15,7 +15,7 @@ public partial class StoreEventAutoMapperProfile : Profile
CreateMap<AssembleJob, AssembleNote>() CreateMap<AssembleJob, AssembleNote>()
.ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number))
.ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber)) .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleIssueRequestsNumber))
.ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now)) .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now))
.ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName)) .ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName))
.Ignore(x => x.Confirmed) .Ignore(x => x.Confirmed)
@ -26,7 +26,7 @@ public partial class StoreEventAutoMapperProfile : Profile
; ;
CreateMap<AssembleJob, AssembleNoteEditInput>() CreateMap<AssembleJob, AssembleNoteEditInput>()
.ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber)) .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleIssueRequestsNumber))
.Ignore(x => x.Confirmed) .Ignore(x => x.Confirmed)
.Ignore(x => x.JobNumber) .Ignore(x => x.JobNumber)
.Ignore(x => x.ActiveDate) .Ignore(x => x.ActiveDate)

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs

@ -9,10 +9,10 @@ namespace Win_in.Sfs.Wms.Store.Event;
public partial class StoreEventAutoMapperProfile : Profile public partial class StoreEventAutoMapperProfile : Profile
{ {
private void AssembleRequestAutoMapperProfile() private void AssembleIssueRequestsAutoMapperProfile()
{ {
CreateMap<AssembleRequest, AssembleJobEditInput>() CreateMap<AssembleIssueRequests, AssembleJobEditInput>()
.ForMember(x => x.AssembleRequestNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.AssembleIssueRequestsNumber, y => y.MapFrom(d => d.Number))
.ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type)) .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type))
.Ignore(x => x.WarehouseCode) .Ignore(x => x.WarehouseCode)
.Ignore(x => x.UpStreamJobNumber) .Ignore(x => x.UpStreamJobNumber)

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs

@ -17,7 +17,7 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest; namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest;
public class AssembleRequestEventHandler public class AssembleIssueRequestsEventHandler
: StoreEventHandlerBase : StoreEventHandlerBase
, ILocalEventHandler<SfsHandledEntityEventData<AssembleRequest>> , ILocalEventHandler<SfsHandledEntityEventData<AssembleRequest>>
, ILocalEventHandler<SfsAbortedEntityEventData<AssembleRequest>> , ILocalEventHandler<SfsAbortedEntityEventData<AssembleRequest>>
@ -47,7 +47,7 @@ public class AssembleRequestEventHandler
/// 创建后 /// 创建后
/// </summary> /// </summary>
/// <param name="eventData">Event data</param> /// <param name="eventData">Event data</param>
public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleRequest> eventData) public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<AssembleIssueRequests> eventData)
{ {
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);
} }
@ -56,7 +56,7 @@ public class AssembleRequestEventHandler
/// 批量创建后 /// 批量创建后
/// </summary> /// </summary>
/// <param name="eventData">Event data</param> /// <param name="eventData">Event data</param>
public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<AssembleRequest>> eventData) public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<AssembleIssueRequests>> eventData)
{ {
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);
} }
@ -66,7 +66,7 @@ public class AssembleRequestEventHandler
/// </summary> /// </summary>
/// <param name="eventData"></param> /// <param name="eventData"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task HandleEventAsync(SfsHandledEntityEventData<AssembleRequest> eventData) public virtual async Task HandleEventAsync(SfsHandledEntityEventData<AssembleIssueRequests> eventData)
{ {
var entity = eventData.Entity; var entity = eventData.Entity;
@ -93,7 +93,7 @@ public class AssembleRequestEventHandler
/// </summary> /// </summary>
/// <param name="eventData"></param> /// <param name="eventData"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<AssembleRequest> eventData) public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<AssembleIssueRequests> eventData)
{ {
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);
} }
@ -103,10 +103,10 @@ public class AssembleRequestEventHandler
/// </summary> /// </summary>
/// <param name="eventData"></param> /// <param name="eventData"></param>
/// <returns></returns> /// <returns></returns>
public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<AssembleRequest> eventData) public virtual async Task HandleEventAsync(SfsCompletedEntityEventData<AssembleIssueRequests> eventData)
{ {
_ = eventData.Entity; _ = eventData.Entity;
// await _assembleJobAppService.CompleteByAssembleRequestAsync(entity.Number); // await _assembleJobAppService.CompleteByAssembleIssueRequestsAsync(entity.Number);
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);
} }
@ -205,7 +205,7 @@ public class AssembleRequestEventHandler
LocationDTO fromLocation) LocationDTO fromLocation)
{ {
AssembleJobEditInput job; AssembleJobEditInput job;
job = ObjectMapper.Map<AssembleRequest, AssembleJobEditInput>(assembleRequest); job = ObjectMapper.Map<AssembleIssueRequests, AssembleJobEditInput>(assembleRequest);
job.JobType = EnumJobType.IssueJob; job.JobType = EnumJobType.IssueJob;
job.JobStatus = EnumJobStatus.Open; job.JobStatus = EnumJobStatus.Open;
job.WorkGroupCode = fromLocation.WorkGroupCode; job.WorkGroupCode = fromLocation.WorkGroupCode;

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs

@ -77,7 +77,7 @@ public partial class StoreEventAutoMapperProfile : Profile
JisProductReceiptNoteAutoMapperProfile(); JisProductReceiptNoteAutoMapperProfile();
MaterialRequestAutoMapperProfile(); MaterialRequestAutoMapperProfile();
InjectionRequestAutoMapperProfile(); InjectionRequestAutoMapperProfile();
AssembleRequestAutoMapperProfile(); AssembleIssueRequestsAutoMapperProfile();
ThirdLocationRequestAutoMapperProfile(); ThirdLocationRequestAutoMapperProfile();
ProductionReturnRequestAutoMapperProfile(); ProductionReturnRequestAutoMapperProfile();
ProductionReturnNoteAutoMapperProfile(); ProductionReturnNoteAutoMapperProfile();

Loading…
Cancel
Save