更新版本

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; }
 
     /// <summary>
     /// ERP料号
@@ -38,7 +38,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     /// </summary>
     [Display(Name = "调出库位")]
     [Required(ErrorMessage = "调出库位不能为空")]
-    public string LocationCode { get; set; }
+    public string LocationErpCode { get; set; }
 
     /// <summary>
     /// 专案
@@ -59,13 +59,13 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    /// <summary>
-    /// 箱码
-    /// </summary>
-    [Display(Name = "箱码")]
-    [ImporterHeader(IsIgnore = true)]
-    [ExporterHeader(IsIgnore = true)]
-    public string PackingCode { get; set; }
+    ///// <summary>
+    ///// 箱码
+    ///// </summary>
+    //[Display(Name = "箱码")]
+    //[ImporterHeader(IsIgnore = true)]
+    //[ExporterHeader(IsIgnore = true)]
+    //public string PackingCode { get; set; }
 
     /// <summary>
     /// 仓库代码
@@ -87,4 +87,95 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     [Display(Name = "说明")]
     [Required(ErrorMessage = "说明不能为空")]
     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; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

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<ValidationResult> 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<LocationDTO> CheckLocationAsync(string locationCode, List<ValidationResult> validationRresult)
-    {
-        var location = await LocationAclService.GetByCodeAsync(locationCode).ConfigureAwait(false);
-        if (location == null)
-        {
-            validationRresult.Add(new ValidationResult($"调出库位{locationCode}不存在", new string[] { "调出库位" }));
-        }
-        return location;
-    }
+    //protected async Task<LocationDTO> CheckLocationAsync(string locationCode, List<ValidationResult> 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<ValidationResult> validationRresult)
     {

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<string>{ locationCode }).ConfigureAwait(false);
         if (location == null||location.Count==0)
         {
-            validationRresult.Add("调入储位", $"调入库位{locationCode}不存在");
+            validationRresult.Add("调出储位", $"调入出位{locationCode}不存在");
         }
     }