Browse Source

去掉判断,去掉申请审批流程

dev_DY_CC
赵新宇 6 months ago
parent
commit
bcb2293d3e
  1. 33
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
  2. 12
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs

33
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

@ -89,11 +89,10 @@ public class UnplannedIssueJobAppService
{ {
List<BalanceDTO> useBalancesOut = new EditableList<BalanceDTO>(); List<BalanceDTO> useBalancesOut = new EditableList<BalanceDTO>();
var jobs = await BuildUnplannedIssueJobAsync(requestDto, useBalancesOut).ConfigureAwait(false); var jobs = await BuildUnplannedIssueJobAsync(requestDto, useBalancesOut).ConfigureAwait(false);
if (useBalancesOut.Count == 0) //if (useBalancesOut.Count == 0)
{ //{
throw new UserFriendlyException($"请求单号{requestDto.Number},无推荐库位请检查是否又库存!"); // throw new UserFriendlyException($"请求单号{requestDto.Number},无推荐库位请检查是否又库存!");
} //}
await _unplannedIssueJobManager.AddManyAsync(jobs).ConfigureAwait(false); await _unplannedIssueJobManager.AddManyAsync(jobs).ConfigureAwait(false);
//await _repository.InsertManyAsync(jobs.ToList()).ConfigureAwait(false); //await _repository.InsertManyAsync(jobs.ToList()).ConfigureAwait(false);
var first = jobs.FirstOrDefault(); var first = jobs.FirstOrDefault();
@ -141,30 +140,16 @@ public class UnplannedIssueJobAppService
dto.InjectFrom(item); dto.InjectFrom(item);
dto.Qty = availableToDeduct; dto.Qty = availableToDeduct;
balanceDTOs.Add(dto); balanceDTOs.Add(dto);
if (enumLocationType == EnumLocationType.RAW) if (enumLocationType == EnumLocationType.RAW)
{ {
undto.InjectFrom(item); undto.InjectFrom(item);
unbalanceDTOs.Add(dto); unbalanceDTOs.Add(dto);
} }
else else
{ {
undto.InjectFrom(item); undto.InjectFrom(item);
undto.Qty = availableToDeduct; undto.Qty = availableToDeduct;
unbalanceDTOs.Add(dto); unbalanceDTOs.Add(dto);
} }
} }
@ -628,6 +613,16 @@ public class UnplannedIssueJobAppService
} }
[HttpPost("handle/{id}")] [HttpPost("handle/{id}")]
public override async Task<UnplannedIssueJobDTO> CompleteAsync(Guid id, UnplannedIssueJobDTO dto) public override async Task<UnplannedIssueJobDTO> CompleteAsync(Guid id, UnplannedIssueJobDTO dto)

12
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs

@ -260,8 +260,8 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
request.SetId(GuidGenerator.Create()); request.SetId(GuidGenerator.Create());
request.AutoCompleteJob = false; request.AutoCompleteJob = false;
request.AutoSubmit = isAutoSubmit; request.AutoSubmit = isAutoSubmit;
request.AutoAgree = false; request.AutoAgree = true;
request.AutoHandle = false; request.AutoHandle = true;
request.DirectCreateNote = false; request.DirectCreateNote = false;
request.DeptCode = first.DeptCode; request.DeptCode = first.DeptCode;
request.DeptName = first.DeptName; request.DeptName = first.DeptName;
@ -435,11 +435,15 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
// $"或{EnumUnplannedReceiptType.Raw.GetDisplayName()}】"); // $"或{EnumUnplannedReceiptType.Raw.GetDisplayName()}】");
//} //}
unplannedReceiptRequest.AutoCompleteJob = false; unplannedReceiptRequest.AutoCompleteJob = false;
unplannedReceiptRequest.AutoSubmit = true; unplannedReceiptRequest.AutoSubmit = true;
unplannedReceiptRequest.AutoAgree = false; unplannedReceiptRequest.AutoAgree = false;
unplannedReceiptRequest.AutoHandle = false; unplannedReceiptRequest.AutoHandle = true;
unplannedReceiptRequest.DirectCreateNote = false; unplannedReceiptRequest.DirectCreateNote = false;
unplannedReceiptRequest.BuildDate = DateTime.Now; unplannedReceiptRequest.BuildDate = DateTime.Now;
await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false); await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
@ -579,7 +583,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
entity.AutoCompleteJob = false; entity.AutoCompleteJob = false;
entity.AutoSubmit = true; entity.AutoSubmit = true;
entity.AutoAgree = false; entity.AutoAgree = true;
entity.AutoHandle = false; entity.AutoHandle = false;
entity.DirectCreateNote = false; entity.DirectCreateNote = false;

Loading…
Cancel
Save