diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs
index 27fb71914..50abcc97c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs
+++ b/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
{
- ///
- /// 叫料类型
- ///
- [Display(Name = "叫料类型")]
- public EnumIssueRequestType IssueRequestType { get; set; }
-
- ///
- /// 物品代码
- ///
- [Display(Name = "物品代码")]
- [Required]
- public string ItemCode { get; set; }
+ #region 目标库位信息
///
/// 目标库位
///
[Display(Name = "目标库位")]
- [Required]
+ [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ToLocationCode { get; set; }
///
- /// 来源库区
+ /// 需求数量
///
- [Display(Name = "调出库区")]
- [Required]
- public string FromLocationArea { get; set; }
-
- ///
- /// 数量
- ///
- [Display(Name = "数量")]
- [Required(ErrorMessage = "{0}是必填项")]
+ [Display(Name = "需求数量")]
public decimal Qty { get; set; }
///
- /// 备注
+ /// 物品代码
///
- [Display(Name = "备注")]
- public string Remark { get; set; }
+ [Display(Name = "物品代码")]
+ public string ItemCode { get; set; }
+
+ #endregion
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs
index e96fc3f72..70281dc16 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs
+++ b/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
{
- ///
- /// 叫料类型
- ///
- [Display(Name = "叫料类型")]
- public EnumIssueRequestType IssueRequestType { get; set; }
-
- ///
- /// 物品代码
- ///
- [Display(Name = "物品代码")]
- [Required]
- public string ItemCode { get; set; }
+ #region 目标库位信息
///
/// 目标库位
///
[Display(Name = "目标库位")]
- [Required]
+ [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ToLocationCode { get; set; }
///
- /// 来源库区
+ /// 需求数量
///
- [Display(Name = "调出库区")]
- [Required]
- public string FromLocationArea { get; set; }
-
- ///
- /// 数量
- ///
- [Display(Name = "数量")]
- [Required(ErrorMessage = "{0}是必填项")]
+ [Display(Name = "需求数量")]
public decimal Qty { get; set; }
///
- /// 备注
+ /// 物品代码
///
- [Display(Name = "备注")]
- public string Remark { get; set; }
+ [Display(Name = "物品代码")]
+ public string ItemCode { get; set; }
+
+ #endregion
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs
index f1258f55d..70f4e3d0b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs
+++ b/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
{
- ///
- /// 叫料类型
- ///
- [Display(Name = "叫料类型")]
- public EnumIssueRequestType IssueRequestType { get; set; }
-
- ///
- /// 物品代码
- ///
- [Display(Name = "物品代码")]
- [Required]
- public string ItemCode { get; set; }
+ #region 目标库位信息
///
/// 目标库位
///
[Display(Name = "目标库位")]
- [Required]
+ [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ToLocationCode { get; set; }
///
- /// 来源库区
+ /// 需求数量
///
- [Display(Name = "调出库区")]
- [Required]
- public string FromLocationArea { get; set; }
-
- ///
- /// 数量
- ///
- [Display(Name = "数量")]
- [Required(ErrorMessage = "{0}是必填项")]
+ [Display(Name = "需求数量")]
public decimal Qty { get; set; }
///
- /// 备注
+ /// 物品代码
///
- [Display(Name = "备注")]
- public string Remark { get; set; }
+ [Display(Name = "物品代码")]
+ public string ItemCode { get; set; }
+
+ #endregion
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs
index 18d0f0447..38cfc2917 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs
+++ b/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 目标库位信息
///
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs
index 032cd4ac7..e7c0003e9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs
+++ b/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
{
- ///
- /// 叫料类型
- ///
- [Display(Name = "叫料类型")]
- public EnumIssueRequestType IssueRequestType { get; set; }
-
- ///
- /// 物品代码
- ///
- [Display(Name = "物品代码")]
- [Required]
- public string ItemCode { get; set; }
+ #region 目标库位信息
///
/// 目标库位
///
[Display(Name = "目标库位")]
- [Required]
+ [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ToLocationCode { get; set; }
///
- /// 来源库区
+ /// 需求数量
///
- [Display(Name = "调出库区")]
- [Required]
- public string FromLocationArea { get; set; }
-
- ///
- /// 数量
- ///
- [Display(Name = "数量")]
- [Required(ErrorMessage = "{0}是必填项")]
+ [Display(Name = "需求数量")]
public decimal Qty { get; set; }
///
- /// 备注
+ /// 物品代码
///
- [Display(Name = "备注")]
- public string Remark { get; set; }
+ [Display(Name = "物品代码")]
+ public string ItemCode { get; set; }
+
+ #endregion
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs
index f146614c1..6cc8f4055 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReceiptRequests/PurchaseReceiptRequestAppService.cs
+++ b/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 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(detail);
+ var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == packingCode);
- return dto;
+ var dto = ObjectMapper.Map(detail);
+
+ return dto;
+ }
+ else
+ {
+ throw new UserFriendlyException("未在到货通知中找到该箱码信息");
+ }
}
#endregion