From c0a742b04cc423d25c95515a24a0db95deec4653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 17 Oct 2024 16:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnplannedIssueRequestImportInput.cs | 113 ++++++++++++++++-- ...lannedIssueRequestForDongyangAppService.cs | 29 +++-- ...nnedReceiptRequestForDongyangAppService.cs | 2 +- 3 files changed, 120 insertions(+), 24 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs index cba9dc85f..f4edec33c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs @@ -9,9 +9,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase , IHasQty { - [Display(Name = "领料类别", Order = 0)] - [Required(ErrorMessage = "领料类别不能为空")] - public EnumUnplannedIssueType UnplannedIssueType { get; set; } + //[Display(Name = "领料类别", Order = 0)] + //[Required(ErrorMessage = "领料类别不能为空")] + //public EnumUnplannedIssueType UnplannedIssueType { get; set; } /// /// ERP料号 @@ -38,7 +38,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase /// [Display(Name = "调出库位")] [Required(ErrorMessage = "调出库位不能为空")] - public string LocationCode { get; set; } + public string LocationErpCode { get; set; } /// /// 专案 @@ -59,13 +59,13 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase [Display(Name = "次交易码")] public string OnceBusiCode { get; set; } - /// - /// 箱码 - /// - [Display(Name = "箱码")] - [ImporterHeader(IsIgnore = true)] - [ExporterHeader(IsIgnore = true)] - public string PackingCode { get; set; } + ///// + ///// 箱码 + ///// + //[Display(Name = "箱码")] + //[ImporterHeader(IsIgnore = true)] + //[ExporterHeader(IsIgnore = true)] + //public string PackingCode { get; set; } /// /// 仓库代码 @@ -87,4 +87,95 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase [Display(Name = "说明")] [Required(ErrorMessage = "说明不能为空")] public string Explain { get; set; } + + + + + ///// + ///// 部门代码 + ///// + //[Display(Name = "部门代码")] + //public string DeptCode { get; set; } + + ///// + ///// 部门名称 + ///// + //[Display(Name = "部门名称")] + //public string DeptName { get; set; } + + ///// + ///// 料号 + ///// + //[Display(Name = "料号")] + //[Required(ErrorMessage = "{0}是必填项")] + //public string ItemCode { get; set; } + + + + + + ///// + ///// 数量 + ///// + //[Display(Name = "数量")] + //[Required(ErrorMessage = "{0}是必填项")] + //public decimal Qty { get; set; } + + ///// + ///// 单位 + ///// + //[Display(Name = "单位")] + //public string Uom { get; set; } + + + + ///// + ///// 调出库位 + ///// + //[Display(Name = "调出库位")] + //[Required(ErrorMessage = "{0}是必填项")] + //public string LocationErpCode { get; set; } + ///// + ///// 专案 + ///// + //[Display(Name = "专案")] + //[Required(ErrorMessage = "{0}是必填项")] + //public string CaseCode { get; set; } + ///// + ///// 项目分类 + ///// + //[Display(Name = "项目分类")] + //[Required(ErrorMessage = "{0}是必填项")] + //public string ProjCapacityCode { get; set; } + + ///// + ///// 次交易码 + ///// + //[Display(Name = "次交易码")] + //[Required(ErrorMessage = "{0}是必填项")] + //public string OnceBusiCode { get; set; } + ///// + ///// 说明 + ///// + //[Display(Name = "说明")] + //public string Explain { get; set; } + + + + + + + + + + + + + + + + + + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index aa33cba67..bbd300034 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs @@ -96,6 +96,11 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA try { + + + + + using var ms = new MemoryStream(); await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false); var inputFileBytes = ms.GetAllBytes(); @@ -506,11 +511,11 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA var balance = await BalanceAclService.GetByItemLocationAndPackingAsync( string.Empty, importInput.ItemCode, - importInput.LocationCode).ConfigureAwait(false); + importInput.LocationErpCode).ConfigureAwait(false); if (balance == null) { - validationRresult.Add(new ValidationResult($"ERP料号{importInput.ItemCode}在库位{importInput.LocationCode}没有库存记录", new string[] { "库存余额" })); + validationRresult.Add(new ValidationResult($"ERP料号{importInput.ItemCode}在库位{importInput.LocationErpCode}没有库存记录", new string[] { "库存余额" })); } else { @@ -558,7 +563,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA protected override async Task ValidateImportModelAsync(UnplannedIssueRequestImportInput model, List validationRresult) { _ = await CheckItemBasicAsync(model, validationRresult).ConfigureAwait(false); - _ = await CheckLocationAsync(model.LocationCode, validationRresult).ConfigureAwait(false); + //_ = await CheckLocationAsync(model.LocationErpCode, validationRresult).ConfigureAwait(false); await CheckOnceBusiCodeAsync(model, validationRresult).ConfigureAwait(false);//次交易码 //await CheckCaseCodeAsync(model, validationRresult).ConfigureAwait(false);//专案代码 @@ -581,15 +586,15 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA return item; } - protected async Task CheckLocationAsync(string locationCode, List validationRresult) - { - var location = await LocationAclService.GetByCodeAsync(locationCode).ConfigureAwait(false); - if (location == null) - { - validationRresult.Add(new ValidationResult($"调出库位{locationCode}不存在", new string[] { "调出库位" })); - } - return location; - } + //protected async Task CheckLocationAsync(string locationCode, List validationRresult) + //{ + // var location = await LocationAclService.GetByCodeAsync(locationCode).ConfigureAwait(false); + // if (location == null) + // { + // validationRresult.Add(new ValidationResult($"调出库位{locationCode}不存在", new string[] { "调出库位" })); + // } + // return location; + //} protected async Task CheckOnceBusiCodeAsync(UnplannedIssueRequestImportInput importInput, List validationRresult) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs index fd318bf3b..507deafca 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs @@ -291,7 +291,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ var location = await _locationAppService.GetListByErpLocationCodes(new List{ locationCode }).ConfigureAwait(false); if (location == null||location.Count==0) { - validationRresult.Add("调入储位", $"调入库位{locationCode}不存在"); + validationRresult.Add("调出储位", $"调入出位{locationCode}不存在"); } }