From c755f1fce97d09044f294a478e4b2d75dd931362 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 10:58:13 +0800
Subject: [PATCH] 新增物料客户关系实体、自定义新增物料基础信息接口、入参
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 27 +++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingInput.cs | 14 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/WmsContainerPackagingService.cs | 26 ++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs | 104 +++++++++++---------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainerPackaging.cs | 83 ++++++++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 18 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingOutput.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs | 6
9 files changed, 205 insertions(+), 77 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingInput.cs
index e969b70..2339e48 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingInput.cs
@@ -6,7 +6,7 @@
{
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄦ煡璇㈠弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄦ煡璇㈠弬鏁�
/// </summary>
public class WmsContainerPackagingSearch : PageInputBase
{
@@ -63,7 +63,7 @@
}
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class WmsContainerPackagingSearchNonPage : PageInputNonPageBase
{
@@ -120,7 +120,7 @@
}
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄨ緭鍏ュ弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄨ緭鍏ュ弬鏁�
/// </summary>
public class WmsContainerPackagingInput
{
@@ -163,21 +163,21 @@
}
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄦ柊澧炲弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄦ柊澧炲弬鏁�
/// </summary>
public class AddWmsContainerPackagingInput : WmsContainerPackagingInput
{
}
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄥ垹闄ゅ弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄥ垹闄ゅ弬鏁�
/// </summary>
public class DeleteWmsContainerPackagingInput : BaseId
{
}
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄦ洿鏂板弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄦ洿鏂板弬鏁�
/// </summary>
public class UpdateWmsContainerPackagingInput : WmsContainerPackagingInput
{
@@ -190,7 +190,7 @@
}
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄨ幏鍙栧崟涓弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄨ幏鍙栧崟涓弬鏁�
/// </summary>
public class QueryeWmsContainerPackagingInput : BaseId
{
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingOutput.cs
index e46ff7a..b52ee08 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/Dto/WmsContainerPackagingOutput.cs
@@ -4,7 +4,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄨ緭鍑哄弬鏁�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄨ緭鍑哄弬鏁�
/// </summary>
public class WmsContainerPackagingOutput
{
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/WmsContainerPackagingService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/WmsContainerPackagingService.cs
index 75de536..b4ceca0 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/WmsContainerPackagingService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainerPackaging/WmsContainerPackagingService.cs
@@ -16,7 +16,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛ㄦ湇鍔�
+ /// 瀹瑰櫒鍏崇郴鍩虹琛ㄦ湇鍔�
/// </summary>
[ApiDescriptionSettings("WmsBase", Name = "WmsContainerPackaging", Order = 100)]
[Route("api")]
@@ -42,7 +42,7 @@
}
/// <summary>
- /// 鍒嗛〉鏌ヨ鍖呰鍏崇郴鍩虹琛�
+ /// 鍒嗛〉鏌ヨ瀹瑰櫒鍏崇郴鍩虹琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -67,10 +67,10 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇㈠寘瑁呭叧绯诲熀纭�琛ㄥ垪琛�
+ /// 涓嶅垎椤垫煡璇㈠鍣ㄥ叧绯诲熀纭�琛ㄥ垪琛�
/// </summary>
- /// <param name="input">鍖呰鍏崇郴鍩虹琛ㄦ煡璇㈠弬鏁�</param>
- /// <returns>(鍖呰鍏崇郴鍩虹琛�)瀹炰緥鍒楄〃</returns>
+ /// <param name="input">瀹瑰櫒鍏崇郴鍩虹琛ㄦ煡璇㈠弬鏁�</param>
+ /// <returns>(瀹瑰櫒鍏崇郴鍩虹琛�)瀹炰緥鍒楄〃</returns>
[HttpGet("WmsContainerPackaging/listNonPage")]
public async Task<List<WmsContainerPackagingOutput>> ListNonPageAsync([FromQuery] WmsContainerPackagingSearchNonPage input)
{
@@ -102,7 +102,7 @@
}
/// <summary>
- /// 鑾峰彇鍖呰鍏崇郴鍩虹琛�
+ /// 鑾峰彇瀹瑰櫒鍏崇郴鍩虹琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -113,7 +113,7 @@
}
/// <summary>
- /// 鑾峰彇鍖呰鍏崇郴鍩虹琛ㄥ垪琛�
+ /// 鑾峰彇瀹瑰櫒鍏崇郴鍩虹琛ㄥ垪琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -126,7 +126,7 @@
#region 澧炪�佸垹銆佹敼
/// <summary>
- /// 澧炲姞鍖呰鍏崇郴鍩虹琛�
+ /// 澧炲姞瀹瑰櫒鍏崇郴鍩虹琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -144,7 +144,7 @@
}
/// <summary>
- /// 鍒犻櫎鍖呰鍏崇郴鍩虹琛�
+ /// 鍒犻櫎瀹瑰櫒鍏崇郴鍩虹琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -157,7 +157,7 @@
}
/// <summary>
- /// 鏇存柊鍖呰鍏崇郴鍩虹琛�
+ /// 鏇存柊瀹瑰櫒鍏崇郴鍩虹琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -182,7 +182,7 @@
#region 瀵煎叆
/// <summary>
- /// Excel妯℃澘瀵煎叆鍖呰鍏崇郴鍩虹琛ㄥ姛鑳�
+ /// Excel妯℃澘瀵煎叆瀹瑰櫒鍏崇郴鍩虹琛ㄥ姛鑳�
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -378,7 +378,7 @@
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇鍖呰鍏崇郴鍩虹琛ㄧ殑Excel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇瀹瑰櫒鍏崇郴鍩虹琛ㄧ殑Excel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -386,7 +386,7 @@
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\WmsContainerPackaging{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鍖呰鍏崇郴鍩虹琛�).xlsx", Encoding.GetEncoding("UTF-8"));
+ var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(瀹瑰櫒鍏崇郴鍩虹琛�).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 71d1f55..3d673a4 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -417,4 +417,31 @@
{
}
+
+ /// <summary>
+ /// 鏂板鐗╂枡涓氬姟淇℃伅瀹炰綋鍏ュ弬--鍖呭惈鐗╂枡銆佺墿鏂欏鎴峰叧绯汇�佹帶鍒跺睘鎬с�佹浛浠ｅ搧
+ /// </summary>
+ public class AddWmsMaterialInfoInput
+ {
+ /// <summary>
+ /// 鐗╂枡鍩虹淇℃伅
+ /// </summary>
+ public WmsMaterialInput MaterialInput { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒橧D
+ /// </summary>
+ public long ControlRuleld { get; set; }
+
+ /// <summary>
+ /// 鏇夸唬鍝�
+ /// </summary>
+ public List<WmsSubstituteGood> SubstituteGoodList { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瀹㈡埛鍏崇郴琛�
+ /// </summary>
+ public List<WmsMaterialCustomer> MaterialCustomerList { get; set; }
+ }
+
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs
index e9edf4a..7b873a7 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/IWmsMaterialService.cs
@@ -13,7 +13,7 @@
Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input);
Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input);
- Task Add(AddWmsMaterialInput input);
+ Task Add(AddWmsMaterialInfoInput input);
Task Update(UpdateWmsMaterialInput input);
Task Delete(DeleteWmsMaterialInput input);
Task<int> ImportExcelAsync(IFormFile file);
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index bc3e25c..ce56c81 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -166,9 +166,10 @@
public async Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input)
{
return await _wmsMaterialRep.DetachedEntities.ProjectToType<WmsMaterialOutput>().ToListAsync();
- }
+ }
#region 澧炪�佸垹銆佹敼
+
/// <summary>
/// 澧炲姞鐗╂枡淇℃伅琛�
@@ -176,10 +177,19 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("WmsMaterial/add")]
- public async Task Add(AddWmsMaterialInput input)
+ public async Task Add(AddWmsMaterialInfoInput input)
{
- var wmsMaterial = input.Adapt<WmsMaterial>();
- //楠岃瘉
+
+
+ //鐗╂枡淇℃伅
+ var wmsMaterial = input.MaterialInput.Adapt<WmsMaterial>();
+ //鎺у埗瑙勫垯淇℃伅
+ var controlRuleld = input.ControlRuleld;
+ //鐗╂枡瀹㈡埛鍏宠仈淇℃伅
+ var materialCustomerList = input.MaterialCustomerList.Adapt<WmsMaterialCustomer>();
+ //鏇夸唬鍝佷俊鎭�
+ var substituteGoodList = input.SubstituteGoodList.Adapt<WmsSubstituteGood>();
+ //楠岃瘉
await CheckExisit(wmsMaterial);
wmsMaterial.CreatedUserId = wmsMaterial.UpdatedUserId = SysHelper.GetUserId();
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainerPackaging.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainerPackaging.cs
new file mode 100644
index 0000000..9f54f5c
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainerPackaging.cs
@@ -0,0 +1,83 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍4:29:28
+ * @desc : 瀹瑰櫒鍏崇郴鍩虹琛�
+ */
+namespace Admin.NET.Core
+{
+ /// <summary>
+ /// 瀹瑰櫒鍏崇郴鍩虹琛�
+ /// </summary>
+ [Table("wms_container_packaging")]
+ [Comment("瀹瑰櫒鍏崇郴鍩虹琛�")]
+ public class WmsContainerPackaging : DEntityBase
+ {
+
+
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷ID
+ /// </summary>
+ [Comment("瀹瑰櫒绫诲瀷ID")]
+ [Required]
+
+ public long ContainerTypeId { get; set; }
+
+
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷鍚嶇О
+ /// </summary>
+ [Comment("瀹瑰櫒绫诲瀷鍚嶇О")]
+ [Required]
+ [MaxLength(255)]
+ public string ContainerTypeName { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷ID
+ /// </summary>
+ [Comment("鐗╂枡绫诲瀷ID")]
+ [Required]
+
+ public long MaterialTypeId { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷缂栧彿
+ /// </summary>
+ [Comment("鐗╂枡绫诲瀷缂栧彿")]
+ [Required]
+ [MaxLength(255)]
+ public string MaterialTypeCode { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ [Comment("鐗╂枡绫诲瀷鍚嶇О")]
+ [Required]
+ [MaxLength(255)]
+ public string MaterialTypeName { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡瀹瑰櫒瀹归噺
+ /// </summary>
+ [Comment("鐗╂枡瀹瑰櫒瀹归噺")]
+
+ [Column("BoxQty", TypeName = "decimal(10,3)")]
+ public decimal? BoxQty { get; set; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
index 558cc86..461e0ba 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
@@ -4,72 +4,80 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍4:29:28
- * @desc : 鍖呰鍏崇郴鍩虹琛�
+ * @date : 2024/4/24涓婂崍10:48:23
+ * @desc : 鐗╂枡瀹㈡埛鍏宠仈琛�
*/
namespace Admin.NET.Core
{
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛�
+ /// 鐗╂枡瀹㈡埛鍏宠仈琛�
/// </summary>
- [Table("wms_container_packaging")]
- [Comment("鍖呰鍏崇郴鍩虹琛�")]
- public class WmsContainerPackaging : DEntityBase
+ [Table("wms_material_customer")]
+ [Comment("鐗╂枡瀹㈡埛鍏宠仈琛�")]
+ public class WmsMaterialCustomer : DEntityBase
{
/// <summary>
- /// 瀹瑰櫒绫诲瀷ID
+ /// 鐗╂枡ID
/// </summary>
- [Comment("瀹瑰櫒绫诲瀷ID")]
+ [Comment("鐗╂枡ID")]
[Required]
- public long ContainerTypeId { get; set; }
+ public long MaterialId { get; set; }
/// <summary>
- /// 瀹瑰櫒绫诲瀷鍚嶇О
+ /// 鐗╂枡缂栧彿
/// </summary>
- [Comment("瀹瑰櫒绫诲瀷鍚嶇О")]
+ [Comment("鐗╂枡缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialCode { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [Comment("鐗╂枡鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛ID
+ /// </summary>
+ [Comment("瀹㈡埛ID")]
+ [Required]
+
+ public long CustId { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [Comment("瀹㈡埛缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string CustCode { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛鑻辨枃鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛鑻辨枃鍚嶇О")]
+ [MaxLength(255)]
+ public string CustEnglishName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛涓枃鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛涓枃鍚嶇О")]
[Required]
[MaxLength(255)]
- public string ContainerTypeName { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡绫诲瀷ID
- /// </summary>
- [Comment("鐗╂枡绫诲瀷ID")]
- [Required]
-
- public long MaterialTypeId { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡绫诲瀷缂栧彿
- /// </summary>
- [Comment("鐗╂枡绫诲瀷缂栧彿")]
- [Required]
- [MaxLength(255)]
- public string MaterialTypeCode { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡绫诲瀷鍚嶇О
- /// </summary>
- [Comment("鐗╂枡绫诲瀷鍚嶇О")]
- [Required]
- [MaxLength(255)]
- public string MaterialTypeName { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡瀹瑰櫒瀹归噺
- /// </summary>
- [Comment("鐗╂枡瀹瑰櫒瀹归噺")]
-
- [Column("BoxQty", TypeName = "decimal(10,3)")]
- public decimal? BoxQty { get; set; }
+ public string CustChinaName { get; set; }
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs
index 7ffd97b..3f73207 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsMaterialEnum.cs
@@ -50,15 +50,15 @@
BIAOZHUANCHANPIN = 4,
/// <summary>
- /// 鍖呰鏉愭枡
+ /// 瀹瑰櫒鏉愭枡
/// </summary>
- [Description("鍖呰鏉愭枡")]
+ [Description("瀹瑰櫒鏉愭枡")]
BAOZHUANGCAILIAO = 5,
/// <summary>
/// 杈呭姪鏉愭枡
/// </summary>
- [Description("鍖呰鏉愭枡")]
+ [Description("瀹瑰櫒鏉愭枡")]
FUZHUCAILIAO = 6,
/// <summary>
--
Gitblit v1.9.3