From db55a671a547c0877ed6ceb9e1b4a7046c407d7a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 23 4月 2024 14:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs | 232 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 132 insertions(+), 100 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
index 6cc53d6..3fe526a 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
@@ -1,9 +1,12 @@
-锘縰sing Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+锘縰sing Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍1:36:22
+ * @desc : 鐗╂枡淇℃伅琛�
+ */
namespace Admin.NET.Core
{
/// <summary>
@@ -11,8 +14,10 @@
/// </summary>
[Table("wms_material")]
[Comment("鐗╂枡淇℃伅琛�")]
- public class WmsMaterial : DEntityBase, IEntityTypeBuilder<WmsMaterial>
+ public class WmsMaterial : DEntityBase
{
+
+
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
@@ -21,154 +26,181 @@
[MaxLength(50)]
public string MaterialName { get; set; }
+
/// <summary>
/// 鐗╂枡缂栧彿
/// </summary>
[Comment("鐗╂枡缂栧彿")]
[Required]
[MaxLength(50)]
- public string MaterialNo { get; set; }
+ public string MaterialCode { get; set; }
+
/// <summary>
- /// 鐗╂枡鎵规
+ /// ERP缂栧彿
/// </summary>
- [Comment("鐗╂枡鎵规")]
+ [Comment("ERP缂栧彿")]
+ [MaxLength(255)]
+ public string ErpCode { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ [Comment("鐗╂枡绫诲瀷鍚嶇О")]
+ [Required]
[MaxLength(50)]
- public string MaterialBatch { get; set; }
+ public string MaterialTypeName { get; set; }
+
/// <summary>
- /// 鐗╂枡绫诲埆;鏁版嵁瀛楀吀
+ /// 鐗╂枡绫诲瀷鎻忚堪
/// </summary>
- [Comment("鐗╂枡绫诲埆")]
- public MaterialType MaterialType { get; set; }
+ [Comment("鐗╂枡绫诲瀷鎻忚堪")]
+ [MaxLength(255)]
+ public string MaterialTypeDescr { get; set; }
+
/// <summary>
- /// 鐗╂枡妫�楠�
+ /// 鐗╂枡绫诲瀷
/// </summary>
- [Comment("鐗╂枡妫�楠�")]
- public MaterialInspection InspectionMethod { get; set; }
+ [Comment("鐗╂枡绫诲瀷")]
+ [Required]
+
+ public int MaterialType { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡缁�
+ /// </summary>
+ [Comment("鐗╂枡缁�")]
+ [MaxLength(50)]
+ public string MaterialGroup { get; set; }
+
+
+ /// <summary>
+ /// ABC鍒嗙被鍚嶇О
+ /// </summary>
+ [Comment("ABC鍒嗙被鍚嶇О")]
+ [MaxLength(50)]
+ public string ABCClassName { get; set; }
+
+
+ /// <summary>
+ /// ABC鍒嗙被
+ /// </summary>
+ [Comment("ABC鍒嗙被")]
+
+ public int? ABCClass { get; set; }
+
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
[Comment("鐗╂枡瑙勬牸")]
- [MaxLength(50)]
+ [MaxLength(255)]
public string MaterialSpec { get; set; }
- /// <summary>
- /// 鐗╂枡瀵嗗害
- /// </summary>
- [Comment("鐗╂枡瀵嗗害")]
- [MaxLength(50)]
- public string MaterialDensity { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
+ /// 榛樿鍏ュ簱搴撲綅
/// </summary>
- [Comment("鐗╂枡鍗曚綅")]
+ [Comment("榛樿鍏ュ簱搴撲綅")]
+ [MaxLength(50)]
+ public string InPlaceCode { get; set; }
+
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ [Comment("搴撳瓨鍗曚綅")]
+ [Required]
[MaxLength(50)]
public string MaterialUnit { get; set; }
- /// <summary>
- /// 搴撳尯Ids
- /// </summary>
- [Comment("搴撳尯Ids")]
- public string AreaIds { get; set; }
/// <summary>
- /// 搴撳尯鍙傛暟
+ /// 閲囪喘鍗曚綅
/// </summary>
- [Comment("搴撳尯鍙傛暟")]
- public string AreaNameParameter { get; set; }
+ [Comment("閲囪喘鍗曚綅")]
+ [Required]
+ [MaxLength(50)]
+ public string POUnit { get; set; }
+
/// <summary>
- /// 宸ヤ綔鍖篒ds
+ /// 棰滆壊
/// </summary>
- [Comment("宸ヤ綔鍖篒ds")]
- public string StationIds { get; set; }
+ [Comment("棰滆壊")]
+ [MaxLength(50)]
+ public string Color { get; set; }
+
/// <summary>
- /// 宸ヤ綔鍖哄弬鏁�
+ /// 閲嶉噺
/// </summary>
- [Comment("宸ヤ綔鍖哄弬鏁�")]
- public string StationNameParameter { get; set; }
+ [Comment("閲嶉噺")]
+ [MaxLength(50)]
+ public string Weight { get; set; }
+
/// <summary>
- /// 宸ユ
+ /// 鏍囧寘鏁伴噺
/// </summary>
- //[Comment("宸ユ")]
- //[Required]
- //public LesWorkshopSection LesWorkshopSection { get; set; }
+ [Comment("鏍囧寘鏁伴噺")]
- //1215
+ [Column("SNP", TypeName = "decimal(10,3)")]
+ public decimal? SNP { get; set; }
+
+
+ /// <summary>
+ /// 鎹㈢畻鐜�
+ /// </summary>
+ [Comment("鎹㈢畻鐜�")]
+
+ [Column("TranslateRate", TypeName = "decimal(10,3)")]
+ public decimal? TranslateRate { get; set; }
+
+
+ /// <summary>
+ /// 鎵规灞炴�ц鍒�
+ /// </summary>
+ [Comment("鎵规灞炴�ц鍒�")]
+
+ public long? BatchRuleId { get; set; }
+
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒�
+ /// </summary>
+ [Comment("鎺у埗灞炴�ц鍒�")]
+
+ public long? ControlRuleId { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
+
/// <summary>
/// 鎻忚堪
/// </summary>
[Comment("鎻忚堪")]
-
- [MaxLength(500)]
- public string Description { get; set; }
-
- /// <summary>
- /// 瀹夊叏瀛橀噺
- /// </summary>
- [Comment("瀹夊叏瀛橀噺")]
-
- public decimal Safeqty { get; set; }
-
- /// <summary>
- /// 鏈�澶у瓨閲�
- /// </summary>
- [Comment("鏈�澶у瓨閲�")]
-
- public decimal MaxImumqty { get; set; }
-
- /// <summary>
- /// 鏈�灏忓簱榫�
- /// </summary>
- [Comment("鏈�灏忓簱榫�")]
-
- public decimal MinstorageAge { get; set; }
-
- /// <summary>
- /// 鏈�澶у簱榫�
- /// </summary>
- [Comment("鏈�澶у簱榫�")]
-
- public decimal MaxstorageAge { get; set; }
-
-
+ [MaxLength(255)]
+ public string MaterialDesc { get; set; }
- /// <summary>
- /// 鐗╂枡鎵樼洏鍏崇郴琛�
- /// </summary>
- public ICollection<WmsMaterialContainer> WmsFoamingMaterialContainer { get; set; }
- /// <summary>
- /// 鐗╂枡鎵樼洏鍘嗗彶琛�
- /// </summary>
- public ICollection<WmsHistoryMaterialContainer> WmsFoamingHistoryMaterialContainer { get; set; }
- /// <summary>
- /// 鏋勫缓涓�瀵瑰鐨勫叧绯�
- /// </summary>
- /// <param name="entityBuilder"></param>
- /// <param name="dbContext"></param>
- /// <param name="dbContextLocator"></param>
- public void Configure(EntityTypeBuilder<WmsMaterial> entityBuilder, DbContext dbContext, Type dbContextLocator)
- {
- entityBuilder.HasMany(x => x.WmsFoamingMaterialContainer)
- .WithOne(x => x.WmsMaterial)
- .HasForeignKey(x => x.MaterialId).IsRequired(false);
- entityBuilder.HasMany(x => x.WmsFoamingHistoryMaterialContainer)
- .WithOne(x => x.WmsMaterial)
- .HasForeignKey(x => x.MaterialId).IsRequired(false);
- }
+
+
}
-}
-
+}
\ No newline at end of file
--
Gitblit v1.9.3