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

更新版本

dev_DY_CC
赵新宇 7 months ago
parent
35f2b88733
commit
49b5b26b52
3 changed files with 114 additions and 162 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. 75
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs
  2. 199
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
  3. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs

75
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs
View File

@ -39,9 +39,10 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
[Display(Name = "调出库位")]
[Required(ErrorMessage = "调出库位不能为空")]
public string FromErpLocationCode { get; set; }
/// <summary>
/// 专案
/// </summary>
@ -91,77 +92,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
public string Explain { get; set; }
///// <summary>
///// 部门代码
///// </summary>
//[Display(Name = "部门代码")]
//public string DeptCode { get; set; }
///// <summary>
///// 部门名称
///// </summary>
//[Display(Name = "部门名称")]
//public string DeptName { get; set; }
///// <summary>
///// 料号
///// </summary>
//[Display(Name = "料号")]
//[Required(ErrorMessage = "{0}是必填项")]
//public string ItemCode { get; set; }
///// <summary>
///// 数量
///// </summary>
//[Display(Name = "数量")]
//[Required(ErrorMessage = "{0}是必填项")]
//public decimal Qty { get; set; }
///// <summary>
///// 单位
///// </summary>
//[Display(Name = "单位")]
//public string Uom { get; set; }
///// <summary>
///// 调出库位
///// </summary>
//[Display(Name = "调出库位")]
//[Required(ErrorMessage = "{0}是必填项")]
//public string LocationErpCode { get; set; }
///// <summary>
///// 专案
///// </summary>
//[Display(Name = "专案")]
//[Required(ErrorMessage = "{0}是必填项")]
//public string CaseCode { get; set; }
///// <summary>
///// 项目分类
///// </summary>
//[Display(Name = "项目分类")]
//[Required(ErrorMessage = "{0}是必填项")]
//public string ProjCapacityCode { get; set; }
///// <summary>
///// 次交易码
///// </summary>
//[Display(Name = "次交易码")]
//[Required(ErrorMessage = "{0}是必填项")]
//public string OnceBusiCode { get; set; }
///// <summary>
///// 说明
///// </summary>
//[Display(Name = "说明")]
//public string Explain { get; set; }

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

@ -84,7 +84,6 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
entity.AutoAgree = true;
entity.AutoHandle = true;
entity.DirectCreateNote = false;
await _unplannedIssueRequestManager.CreateAsync(entity).ConfigureAwait(false);
@ -116,7 +115,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
// || itm.Qty == 0
// || string.IsNullOrEmpty(itm.ProjCapacityCode)
// || string.IsNullOrEmpty(itm.FromLocationErpCode)
// )
// {
// itm.Explain = "此项错误";
@ -127,11 +126,56 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
// if (errorsList.Count > 0)
// {
// var fileContent = _excelService.Export(errorsList);
// return new TestResult(fileContent.FileContents, ExportImportService.ContentType) { FileDownloadName =fileContent.FileDownloadName };
// 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);
// }
//}
//[HttpPost("import")]
//[Consumes("multipart/form-data")]
////[UnitOfWork]
//public override async Task<IActionResult> ImportAsync([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<UnplannedIssueRequestImportInput>(inputFileBytes).ToList();
// await CreateByDYOAsync(importList).ConfigureAwait(false);
// List<UnplannedIssueRequestImportInput> errorsList = new List<UnplannedIssueRequestImportInput>();
// foreach (var itm in importList)
// {
// if (string.IsNullOrEmpty(itm.CaseCode)
// || string.IsNullOrEmpty(itm.ItemCode)
// || itm.Qty == 0
// || string.IsNullOrEmpty(itm.ProjCapacityCode)
// || string.IsNullOrEmpty(itm.FromErpLocationCode)
// )
// {
// 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)
@ -141,7 +185,10 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
//}
@ -199,8 +246,59 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
protected async Task<UnplannedIssueRequestDTO> CreateByDYOAsync(List<UnplannedIssueRequestImportDto> p_list, bool isAutoSubmit = false)
{
UnplannedIssueRequest request = new UnplannedIssueRequest();
if (p_list.Count == 0)
{
throw new UserFriendlyException("导入内容为空请填写!");
}
protected async Task<UnplannedIssueRequestDTO> CreateByDYOAsync(List<UnplannedIssueRequestImportDto> p_list, bool isAutoSubmit=false)
var first = p_list.FirstOrDefault();
request.SetId(GuidGenerator.Create());
request.AutoCompleteJob = false;
request.AutoSubmit = isAutoSubmit;
request.AutoAgree = false;
request.AutoHandle = false;
request.DirectCreateNote = false;
request.DeptCode = first.DeptCode;
request.DeptName = first.DeptName;
request.BuildDate = DateTime.Now;
request.OANumber = first.OANumber;
await SetEntityPropertiesAsync(request).ConfigureAwait(false);
List<UnplannedIssueRequestDetail> detailList = new List<UnplannedIssueRequestDetail>();
foreach (var itm in p_list)
{
var detail = new UnplannedIssueRequestDetail();
detail.ItemCode = itm.ItemCode;
detail.Qty = itm.Qty;
detail.LocationErpCode = itm.FromLocationErpCode;
detail.LocationCode = "Random";
detail.WarehouseCode = "Random";
detail.LocationGroup = "Random";
detail.LocationArea = "Random";
detail.CaseCode = first.CaseCode;
detail.ProjCapacityCode = first.ProjCapacityCode;
detail.OnceBusiCode = first.OnceBusiCode;
detail.Explain = first.Explain;
await SetDetailPropertiesAsync(detail).ConfigureAwait(false);
detailList.Add(detail);
}
request.Details = detailList;
await _unplannedIssueRequestManager.CreateAsync(request).ConfigureAwait(false);
var dto = ObjectMapper.Map<UnplannedIssueRequest, UnplannedIssueRequestDTO>(request);
return dto;
}
protected async Task<UnplannedIssueRequestDTO> CreateByDYOAsync(List<UnplannedIssueRequestImportInput> p_list, bool isAutoSubmit=false)
{
UnplannedIssueRequest request = new UnplannedIssueRequest();
if (p_list.Count == 0)
@ -216,10 +314,9 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
request.AutoAgree = false;
request.AutoHandle = false;
request.DirectCreateNote = false;
request.DeptCode = first.DeptCode;
request.DeptName = first.DeptName;
request.BuildDate= DateTime.Now;
request.OANumber=first.OANumber;
await SetEntityPropertiesAsync(request).ConfigureAwait(false);
List<UnplannedIssueRequestDetail> detailList = new List<UnplannedIssueRequestDetail>();
@ -229,7 +326,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
detail.ItemCode = itm.ItemCode;
detail.Qty = itm.Qty;
detail.LocationErpCode = itm.FromLocationErpCode;
detail.LocationErpCode = itm.FromErpLocationCode;
detail.LocationCode = "Random";
detail.WarehouseCode ="Random";
detail.LocationGroup ="Random";
@ -238,9 +335,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
detail.ProjCapacityCode = first.ProjCapacityCode;
detail.OnceBusiCode = first.OnceBusiCode;
detail.Explain = first.Explain;
await SetDetailPropertiesAsync(detail).ConfigureAwait(false);
detailList.Add(detail);
}
@ -312,22 +407,15 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
// $"或{EnumUnplannedReceiptType.Raw.GetDisplayName()}】");
//}
//unplannedReceiptRequest.UnplannedIssueType = type;
unplannedReceiptRequest.SetId(GuidGenerator.Create());
unplannedReceiptRequest.AutoCompleteJob = false;
unplannedReceiptRequest.AutoSubmit = true;
unplannedReceiptRequest.AutoAgree = false;
unplannedReceiptRequest.AutoHandle = false;
unplannedReceiptRequest.DirectCreateNote = false;
unplannedReceiptRequest.BuildDate = DateTime.Now;
await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
await SetEntityPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
foreach (var detail in unplannedReceiptRequest.Details)
{
detail.LocationErpCode = unplannedReceiptRequest.FromErpLocationCode;
@ -406,74 +494,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
detail.LocationArea = location.AreaCode;
detail.LocationCode = location.Code;
}
//string packingcode = string.Empty;
//if(type!= EnumUnplannedIssueType.Wip)
//{
// packingcode = detail.PackingCode;
//}
//var balance = await _balanceAppService.GetByItemLocationAndPackingAsync(
// packingcode,
// detail.ItemCode,
// detail.LocationCode).ConfigureAwait(false);
//if (balance != null)
//{
// detail.SupplierBatch = balance.SupplierBatch;
// detail.ArriveDate = balance.ArriveDate;
// detail.ProduceDate = balance.ProduceDate;
// detail.ExpireDate = balance.ExpireDate;
// detail.Lot = balance.Lot;
// detail.ContainerCode = balance.ContainerCode;
// detail.PackingCode = balance.PackingCode;
// detail.Qty = detail.Qty;
// detail.Status = balance.Status;
//}
//if (!string.IsNullOrEmpty(detail))
//{
// var dict = await DictAppService.GetByCodeAsync(nameof(input.OnceBusiCode)).ConfigureAwait(false);
// if (dict.Items != null && dict.Items.Count > 0)
// {
// var item = dict.Items.FirstOrDefault(t => t.Code == input.OnceBusiCode);
// Check.NotNull(item, "次交易码", "次交易码不存在");
// detail.SetProperty("OnceBusiCode", item.Code);
// detail.SetProperty("OnceBusiName", item.Name);
// }
//}
//if (!string.IsNullOrEmpty(input.CaseCode))
//{
// var dict = await DictAppService.GetByCodeAsync(nameof(input.CaseCode)).ConfigureAwait(false);
// if (dict.Items != null && dict.Items.Count > 0)
// {
// var item = dict.Items.FirstOrDefault(t => t.Code == input.CaseCode);
// Check.NotNull(item, "专案代码", "专案代码不存在");
// detail.SetProperty("CaseCode", item.Code);
// detail.SetProperty("CaseName", item.Name);
// }
//}
//if (!string.IsNullOrEmpty(input.ProjCapacityCode))
//{
// var dict = await DictAppService.GetByCodeAsync(nameof(input.ProjCapacityCode)).ConfigureAwait(false);
// if (dict.Items != null && dict.Items.Count > 0)
// {
// var item = dict.Items.FirstOrDefault(t => t.Code == input.ProjCapacityCode);
// Check.NotNull(item, "项目分类代码", "项目分类代码不存在");
// detail.SetProperty("ProjCapacityCode", item.Code);
// detail.SetProperty("ProjCapacityName", item.Name);
// }
//}
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs
View File

@ -45,7 +45,7 @@ public class UnplannedIssueRequest : SfsStoreRequestAggregateRootBase<UnplannedI
public string OANumber { get; set; }
/// <summary>
/// 储位
/// </summary>

Write Preview
Loading…
Cancel
Save