zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
lvzb 1 year ago
parent
7c4e07b350 3cbcaec3fe
commit
3cb7255d7c
3 changed files with 24 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestAutoMapperProfile.cs
  2. 21
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
  3. 11
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestAutoMapperProfile.cs
View File

@ -61,5 +61,11 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.Status)
.Ignore(x => x.Number)
;
CreateMap<UnplannedReceiptRequestEditInput, UnplannedReceiptRequest>();
CreateMap<UnplannedReceiptRequestDetailInput, UnplannedReceiptRequestDetail>();
}
}

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

@ -17,6 +17,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
using Win_in.Sfs.Wms.Inventory.Application.Contracts;
using Win_in.Sfs.Wms.Store.Application.Contracts;
using Win_in.Sfs.Wms.Store.Domain;
using Win_in.Sfs.Wms.Store.Domain.Acl.Dict;
namespace Win_in.Sfs.Wms.Store.Application;
@ -27,14 +28,15 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
private readonly ILocationAppService _locationAppService;
private readonly IUnplannedReceiptRequestManager _unplannedReceiptRequestManager;
private readonly IBalanceAppService _balanceAppService;
private new readonly IDictAclService DictAclService;
public UnplannedReceiptRequestForDongyangAppService(IUnplannedReceiptRequestRepository repository,
IUnplannedReceiptRequestManager unplannedReceiptRequestManager,
IDepartmentAppService departmentApp,
//LocationManager locationManager,
ILocationAppService locationAppService,
IBalanceAppService balanceAppService
IBalanceAppService balanceAppService,
IDictAclService dictAclService
) : base(repository, unplannedReceiptRequestManager)
{
_unplannedReceiptRequestManager = unplannedReceiptRequestManager;
@ -42,6 +44,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
//_locationManager = locationManager;
_locationAppService = locationAppService;
_balanceAppService = balanceAppService;
DictAclService = dictAclService;
}
/// <summary>
/// OA创建计划外入库申请
@ -58,17 +61,17 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
await SetDetailPropertiesAsync(item).ConfigureAwait(false);
}
entity.AutoCompleteJob = true;
entity.AutoCompleteJob = false; //任务到记录
entity.AutoSubmit = true;
entity.AutoAgree = true;
entity.AutoHandle = true;
if (entity.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
{
entity.DirectCreateNote = false;
entity.DirectCreateNote = true; //线边直接生成记录
}
else
{
entity.DirectCreateNote = true;
entity.DirectCreateNote = false; //原料先生成任务、再生成记录
}
await _unplannedReceiptRequestManager.CreateAsync(entity).ConfigureAwait(false);
@ -319,7 +322,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
{
if (!string.IsNullOrEmpty(importInput.CaseCode))
{
var dict = await DictAclService.GetByCodeAsync(nameof(importInput.CaseCode)).ConfigureAwait(false);
var dict = await base.DictAclService.GetByCodeAsync(nameof(importInput.CaseCode)).ConfigureAwait(false);
Check.NotNull(dict, "字典编码", $"字典编码{nameof(importInput.CaseCode)}不存在");
if (dict == null)
@ -395,7 +398,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
{
if (!string.IsNullOrEmpty(importInput.OnceBusiCode))
{
var dict = await DictAclService.GetByCodeAsync(nameof(importInput.OnceBusiCode)).ConfigureAwait(false);
var dict = await base.DictAclService.GetByCodeAsync(nameof(importInput.OnceBusiCode)).ConfigureAwait(false);
if (dict == null)
{
validationRresult.Add("字典编码", $"字典编码{nameof(importInput.OnceBusiCode)}不存在");
@ -416,7 +419,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
protected virtual async Task CheckProjCapacityCodeAsync(UnplannedReceiptRequestImportInput importInput, List<ValidationResult> validationRresult)
{
var dict = await DictAclService.GetByCodeAsync(nameof(importInput.ProjCapacityCode)).ConfigureAwait(false);
var dict = await base.DictAclService.GetByCodeAsync(nameof(importInput.ProjCapacityCode)).ConfigureAwait(false);
if (dict == null)
{
validationRresult.Add("字典编码", $"字典编码{nameof(importInput.ProjCapacityCode)}不存在");
@ -448,7 +451,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
{
if (!string.IsNullOrEmpty(detail.CaseCode))
{
var dict = await DictAclService.GetByCodeAsync(nameof(detail.CaseCode)).ConfigureAwait(false);
var dict = await base.DictAclService.GetByCodeAsync(nameof(detail.CaseCode)).ConfigureAwait(false);
if (dict == null)
{

11
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs
View File

@ -34,11 +34,11 @@ public class UnplannedReceiptRequestEventHandler
/// <param name="eventData">Event data</param>
public async Task HandleEventAsync(SfsCreatedEntityEventData<UnplannedReceiptRequest> eventData)
{
var entity = eventData.Entity;
if (entity.AutoSubmit)
{
await _unplannedReceiptRequestManager.SubmitAsync(entity).ConfigureAwait(false);
}
//var entity = eventData.Entity;
//if (entity.AutoSubmit)
//{
// await _unplannedReceiptRequestManager.SubmitAsync(entity).ConfigureAwait(false);
//}
}
/// <summary>
@ -112,6 +112,7 @@ public class UnplannedReceiptRequestEventHandler
detail.ExtraProperties = inputDetail.ExtraProperties;
createInput.Details.Add(detail);
}
createInput.WarehouseCode = createInput.Details[0].RecommendToWarehouseCode;
return createInput;

Write Preview
Loading…
Cancel
Save