修改导入 模板

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs

@@ -1,50 +1,34 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-[Display(Name = "叫料申请导入")]
+[Display(Name = "装配叫料申请导入")]
 public class AssembleIssueRequestImportInput : SfsStoreImportInputBase
 {
-    /// <summary>
-    ///     叫料类型
-    /// </summary>
-    [Display(Name = "叫料类型")]
-    public EnumIssueRequestType IssueRequestType { get; set; }
-
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    [Display(Name = "物品代码")]
-    [Required]
-    public string ItemCode { get; set; }
+    #region 目标库位信息
 
     /// <summary>
     /// 目标库位
     /// </summary>
     [Display(Name = "目标库位")]
-    [Required]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 需求数量
     /// </summary>
-    [Display(Name = "调出库区")]
-    [Required]
-    public string FromLocationArea { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    [Required(ErrorMessage = "{0}是必填项")]
+    [Display(Name = "需求数量")]
     public decimal Qty { get; set; }
 
     /// <summary>
-    /// 备注
+    /// 物品代码
     /// </summary>
-    [Display(Name = "备注")]
-    public string Remark { get; set; }
+    [Display(Name = "物品代码")]
+    public string ItemCode { get; set; }
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
@@ -8,43 +9,26 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 [Display(Name = "喷涂叫料申请导入")]
 public class CoatingIssueRequestImportInput : SfsStoreImportInputBase
 {
-    /// <summary>
-    ///     叫料类型
-    /// </summary>
-    [Display(Name = "叫料类型")]
-    public EnumIssueRequestType IssueRequestType { get; set; }
-
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    [Display(Name = "物品代码")]
-    [Required]
-    public string ItemCode { get; set; }
+    #region 目标库位信息
 
     /// <summary>
     /// 目标库位
     /// </summary>
     [Display(Name = "目标库位")]
-    [Required]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 需求数量
     /// </summary>
-    [Display(Name = "调出库区")]
-    [Required]
-    public string FromLocationArea { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    [Required(ErrorMessage = "{0}是必填项")]
+    [Display(Name = "需求数量")]
     public decimal Qty { get; set; }
 
     /// <summary>
-    /// 备注
+    /// 物品代码
     /// </summary>
-    [Display(Name = "备注")]
-    public string Remark { get; set; }
+    [Display(Name = "物品代码")]
+    public string ItemCode { get; set; }
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs

@@ -1,50 +1,34 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-[Display(Name = "叫料申请")]
+[Display(Name = "注塑叫料申请导入")]
 public class InjectionIssueRequestImportInput : SfsStoreImportInputBase
 {
-    /// <summary>
-    ///     叫料类型
-    /// </summary>
-    [Display(Name = "叫料类型")]
-    public EnumIssueRequestType IssueRequestType { get; set; }
-
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    [Display(Name = "物品代码")]
-    [Required]
-    public string ItemCode { get; set; }
+    #region 目标库位信息
 
     /// <summary>
     /// 目标库位
     /// </summary>
     [Display(Name = "目标库位")]
-    [Required]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 需求数量
     /// </summary>
-    [Display(Name = "调出库区")]
-    [Required]
-    public string FromLocationArea { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    [Required(ErrorMessage = "{0}是必填项")]
+    [Display(Name = "需求数量")]
     public decimal Qty { get; set; }
 
     /// <summary>
-    /// 备注
+    /// 物品代码
     /// </summary>
-    [Display(Name = "备注")]
-    public string Remark { get; set; }
+    [Display(Name = "物品代码")]
+    public string ItemCode { get; set; }
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs

@@ -7,14 +7,9 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-[Display(Name = "Kitting叫料申请")]
+[Display(Name = "Kitting叫料申请导入")]
 public class KittingIssueRequestImportInput : SfsStoreImportInputBase
 {
-    [Display(Name = "序号")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    [Key]
-    public string Number { get; set; }
-
     #region 目标库位信息
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs

@@ -1,50 +1,34 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-[Display(Name = "叫料申请")]
+[Display(Name = "备料叫料申请导入")]
 public class SparePartIssueRequestImportInput : SfsStoreImportInputBase
 {
-    /// <summary>
-    ///     叫料类型
-    /// </summary>
-    [Display(Name = "叫料类型")]
-    public EnumIssueRequestType IssueRequestType { get; set; }
-
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    [Display(Name = "物品代码")]
-    [Required]
-    public string ItemCode { get; set; }
+    #region 目标库位信息
 
     /// <summary>
     /// 目标库位
     /// </summary>
     [Display(Name = "目标库位")]
-    [Required]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 需求数量
     /// </summary>
-    [Display(Name = "调出库区")]
-    [Required]
-    public string FromLocationArea { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    [Required(ErrorMessage = "{0}是必填项")]
+    [Display(Name = "需求数量")]
     public decimal Qty { get; set; }
 
     /// <summary>
-    /// 备注
+    /// 物品代码
     /// </summary>
-    [Display(Name = "备注")]
-    public string Remark { get; set; }
+    [Display(Name = "物品代码")]
+    public string ItemCode { get; set; }
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
@@ -69,13 +70,22 @@ public class PurchaseReceiptRequestAppService :
     public virtual async Task<PurchaseReceiptRequestDetailDTO> GetDetailByItemAndPackingAsync(string itemCode,
         string packingCode)
     {
-        var entity = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == packingCode), true).ConfigureAwait(false)).FirstOrDefault();
+        var entitysList = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == packingCode), true).ConfigureAwait(false))
 
-        var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == packingCode);
+        if (entitysList != null && entitysList.Any())
+        {
+            var entity = entitysList.FirstOrDefault();
 
-        var dto = ObjectMapper.Map<PurchaseReceiptRequestDetail, PurchaseReceiptRequestDetailDTO>(detail);
+            var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == packingCode);
 
-        return dto;
+            var dto = ObjectMapper.Map<PurchaseReceiptRequestDetail, PurchaseReceiptRequestDetailDTO>(detail);
+
+            return dto;
+        }
+        else
+        {
+            throw new UserFriendlyException("未在到货通知中找到该箱码信息");
+        }
     }
 
     #endregion