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

更新版本

dev_DY_CC
赵新宇 7 months ago
parent
3037787691
commit
35f2b88733
2 changed files with 50 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
  2. 16
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs

85
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
View File

@ -98,52 +98,47 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
/// <param name="file"></param> /// <param name="file"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>
[HttpPost("import-dongyang")] //[HttpPost("import-dongyang")]
public async Task<IActionResult> ImportDYAsync([FromForm] SfsImportRequestInput requestInput, [Required] IFormFile file) //public async Task<IActionResult> ImportDYAsync([FromForm] SfsImportRequestInput requestInput, [Required] IFormFile file)
{ //{
// try
// {
// using var ms = new MemoryStream();
// await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false);
// var inputFileBytes = ms.GetAllBytes();
// var importList = _excelService.Import<UnplannedIssueRequestImportDto>(inputFileBytes).ToList();
// await CreateByDYOAsync(importList).ConfigureAwait(false);
// List<UnplannedIssueRequestImportDto> errorsList = new List<UnplannedIssueRequestImportDto>();
// foreach (var itm in importList)
// {
// if (string.IsNullOrEmpty(itm.CaseCode)
// || string.IsNullOrEmpty(itm.ItemCode)
// || itm.Qty == 0
// || string.IsNullOrEmpty(itm.ProjCapacityCode)
// || string.IsNullOrEmpty(itm.FromLocationErpCode)
try // )
{ // {
// itm.Explain = "此项错误";
// errorsList.Add(itm);
// }
// }
using var ms = new MemoryStream(); // if (errorsList.Count > 0)
await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false); // {
var inputFileBytes = ms.GetAllBytes(); // var fileContent = _excelService.Export(errorsList);
var importList = _excelService.Import<UnplannedIssueRequestImportDto>(inputFileBytes).ToList(); // return new TestResult(fileContent.FileContents, ExportImportService.ContentType) { FileDownloadName =fileContent.FileDownloadName };
await CreateByDYOAsync(importList, EnumUnplannedIssueType.IMPORT).ConfigureAwait(false); // }
// var fileContent1 = _excelService.Export(importList);
List<UnplannedIssueRequestImportDto> errorsList = new List<UnplannedIssueRequestImportDto>(); // return new JsonResult(new { Code = 200, FileDownloadName = fileContent1.FileDownloadName });
// }
foreach (var itm in importList) // catch (Exception e)
{ // {
if (string.IsNullOrEmpty(itm.CaseCode) // throw new UserFriendlyException(e.Message);
|| string.IsNullOrEmpty(itm.ItemCode) // }
|| itm.Qty == 0 //}
|| string.IsNullOrEmpty(itm.ProjCapacityCode)
|| string.IsNullOrEmpty(itm.FromLocationErpCode)
)
{
itm.Explain = "此项错误";
errorsList.Add(itm);
}
}
if (errorsList.Count > 0)
{
var fileContent = _excelService.Export(errorsList);
return new TestResult(fileContent.FileContents, ExportImportService.ContentType) { FileDownloadName =fileContent.FileDownloadName };
}
var fileContent1 = _excelService.Export(importList);
return new JsonResult(new { Code = 200, FileDownloadName = fileContent1.FileDownloadName });
}
catch (Exception e)
{
throw new UserFriendlyException(e.Message);
}
}
@ -191,7 +186,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
UnplannedIssueRequestDTO request = new UnplannedIssueRequestDTO(); UnplannedIssueRequestDTO request = new UnplannedIssueRequestDTO();
try try
{ {
return await CreateByDYOAsync(p_list, EnumUnplannedIssueType.OA, true).ConfigureAwait(false); return await CreateByDYOAsync(p_list, true).ConfigureAwait(false);
} }
catch (Exception e) catch (Exception e)
{ {
@ -205,7 +200,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
protected async Task<UnplannedIssueRequestDTO> CreateByDYOAsync(List<UnplannedIssueRequestImportDto> p_list, EnumUnplannedIssueType type, bool isAutoSubmit=false) protected async Task<UnplannedIssueRequestDTO> CreateByDYOAsync(List<UnplannedIssueRequestImportDto> p_list, bool isAutoSubmit=false)
{ {
UnplannedIssueRequest request = new UnplannedIssueRequest(); UnplannedIssueRequest request = new UnplannedIssueRequest();
if (p_list.Count == 0) if (p_list.Count == 0)
@ -214,7 +209,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
} }
var first = p_list.FirstOrDefault(); var first = p_list.FirstOrDefault();
request.UnplannedIssueType = type;
request.SetId(GuidGenerator.Create()); request.SetId(GuidGenerator.Create());
request.AutoCompleteJob = false; request.AutoCompleteJob = false;
request.AutoSubmit = isAutoSubmit; request.AutoSubmit = isAutoSubmit;

16
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs
View File

@ -95,20 +95,20 @@ public class UnplannedIssueRequestEventHandler
} }
else else
{ {
if (entity.UnplannedIssueType == EnumUnplannedIssueType.OA || entity.UnplannedIssueType == EnumUnplannedIssueType.IMPORT) //if (entity.UnplannedIssueType == EnumUnplannedIssueType.OA || entity.UnplannedIssueType == EnumUnplannedIssueType.IMPORT)
{ //{
//var job = await BuildUnplannedIssueJobCreateInputAsync(entity).ConfigureAwait(false); //var job = await BuildUnplannedIssueJobCreateInputAsync(entity).ConfigureAwait(false);
var request= new UnplannedIssueRequest(); var request= new UnplannedIssueRequest();
request.InjectFrom(entity); request.InjectFrom(entity);
await _unplannedIssueJobApp.CreateByRecommendAsync(request).ConfigureAwait(false); await _unplannedIssueJobApp.CreateByRecommendAsync(request).ConfigureAwait(false);
} //}
else //else
{ //{
var job = await BuildUnplannedIssueJobCreateInputAsync(entity).ConfigureAwait(false); // var job = await BuildUnplannedIssueJobCreateInputAsync(entity).ConfigureAwait(false);
await _unplannedIssueJobApp.CreateAsync(job).ConfigureAwait(false); // await _unplannedIssueJobApp.CreateAsync(job).ConfigureAwait(false);
} //}
} }
} }

Write Preview
Loading…
Cancel
Save