From 0a4fdc2b4d0f5fb7d16fbd0182bef305105e3eae Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 18:44:36 +0800
Subject: [PATCH] 调整库位实体 新增容器 容器类型实体
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainer.cs | 168 +++++++++++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 74 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainer.cs
index fb9735a..a239405 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsContainer.cs
@@ -1,18 +1,23 @@
-锘縰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涓嬪崍6:42:15
+ * @desc : 瀹瑰櫒淇℃伅琛�
+ */
namespace Admin.NET.Core
{
/// <summary>
- /// 鎵樼洏淇℃伅琛�
+ /// 瀹瑰櫒淇℃伅琛�
/// </summary>
[Table("wms_container")]
- [Comment("鎵樼洏淇℃伅琛�")]
- public class WmsContainer : DEntityBase //, IEntityTypeBuilder<WmsContainer>
+ [Comment("瀹瑰櫒淇℃伅琛�")]
+ public class WmsContainer : DEntityBase
{
+
+
/// <summary>
/// 缂栧彿
/// </summary>
@@ -21,130 +26,145 @@
[MaxLength(50)]
public string ContainerCode { get; set; }
- /// <summary>
- /// 绫诲瀷;鏁版嵁瀛楀吀
- /// </summary>
- [Comment("绫诲瀷")]
- [Required]
- public ContainerType ContainerType { get; set; }
/// <summary>
- /// 鎵樼洏鐘舵��;鏁版嵁瀛楀吀
+ /// 鍚嶇О
/// </summary>
- [Comment("鎵樼洏鐘舵��")]
+ [Comment("鍚嶇О")]
[Required]
- public ContainerStatus ContainerStatus { get; set; }
+ [MaxLength(50)]
+ public string ContainerName { get; set; }
+
+
+ /// <summary>
+ /// 绫诲瀷ID
+ /// </summary>
+ [Comment("绫诲瀷ID")]
+ [Required]
+
+ public long ContainerTypeId { get; set; }
+
+
+ /// <summary>
+ /// 绫诲瀷鍚嶇О
+ /// </summary>
+ [Comment("绫诲瀷鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string ContainerTypeName { get; set; }
+
+
+ /// <summary>
+ /// 瀹瑰櫒鍏崇郴ID
+ /// </summary>
+ [Comment("瀹瑰櫒鍏崇郴ID")]
+
+ public long? PackagingId { get; set; }
+
/// <summary>
/// 闀垮害
/// </summary>
[Comment("闀垮害")]
- public decimal SpecLength { get; set; }
+
+ [Column("SpecLength", TypeName = "decimal(10,3)")]
+ public decimal? SpecLength { get; set; }
+
/// <summary>
/// 瀹藉害
/// </summary>
[Comment("瀹藉害")]
- public decimal SpecWidth { get; set; }
+
+ [Column("SpecWidth", TypeName = "decimal(10,3)")]
+ public decimal? SpecWidth { get; set; }
+
/// <summary>
/// 楂樺害
/// </summary>
[Comment("楂樺害")]
- public decimal SpecHeight { get; set; }
+
+ [Column("SpecHeight", TypeName = "decimal(10,3)")]
+ public decimal? SpecHeight { get; set; }
+
/// <summary>
/// 闄愰暱
/// </summary>
[Comment("闄愰暱")]
- public decimal LimitLength { get; set; }
+
+ [Column("LimitLength", TypeName = "decimal(10,3)")]
+ public decimal? LimitLength { get; set; }
+
/// <summary>
/// 闄愬
/// </summary>
[Comment("闄愬")]
- public decimal LimitWidth { get; set; }
+
+ [Column("LimitWidth", TypeName = "decimal(10,3)")]
+ public decimal? LimitWidth { get; set; }
+
/// <summary>
/// 闄愰珮
/// </summary>
[Comment("闄愰珮")]
- public decimal LimitHeight { get; set; }
+
+ [Column("LimitHeight", TypeName = "decimal(10,3)")]
+ public decimal? LimitHeight { get; set; }
+
/// <summary>
/// 杞介噸涓婇檺
/// </summary>
[Comment("杞介噸涓婇檺")]
- public decimal MaxWeight { get; set; }
+
+ [Column("MaxWeight", TypeName = "decimal(10,3)")]
+ public decimal? MaxWeight { get; set; }
+
/// <summary>
- /// 鐖舵墭鐩業d
+ /// 鐖跺鍣ㄥ悕绉�
/// </summary>
- [Comment("鐖舵墭鐩業d")]
- public long ParentContainerId { get; set; }
+ [Comment("鐖跺鍣ㄥ悕绉�")]
+ [MaxLength(255)]
+ public string ParentContainerName { get; set; }
+
/// <summary>
- /// 璧勪骇缂栧彿
+ /// 鐖跺鍣↖d
/// </summary>
- [Comment("璧勪骇缂栧彿")]
- [Required]
- [MaxLength(50)]
- public string AssetNo { get; set; }
+ [Comment("鐖跺鍣↖d")]
+
+ public long? ParentContainerId { get; set; }
+
/// <summary>
- /// 鎵樼洏鍒嗙被
- /// </summary>
- [Comment("鎵樼洏鍒嗙被")]
- [Required]
- public ContainerCategory ContainerCategory { get; set; } = ContainerCategory.TY;
-
- /// <summary>
- /// Erp鍗曞彿
- /// </summary>
- [Comment("Erp鍗曞彿")]
- [Required]
- [MaxLength(50)]
- public string ErpNo { get; set; }
-
- /// <summary>
- /// 鏄惁铏氭嫙;鏁版嵁瀛楀吀
+ /// 鏄惁铏氭嫙
/// </summary>
[Comment("鏄惁铏氭嫙")]
[Required]
- public YesOrNot IsVirtually { get; set; } = YesOrNot.N;
+
+ public int IsVirtually { get; set; }
+
/// <summary>
- /// 鎵�灞炶溅闂�
+ /// 鏄惁绂佺敤
/// </summary>
- [Comment("鎵�灞炶溅闂�")]
+ [Comment("鏄惁绂佺敤")]
[Required]
- public LesWorkShopType WorkShopType { get; set; }
- ///// <summary>
- ///// 缁勮杞﹂棿鐗╂枡鎵樼洏鍏崇郴琛�
- ///// </summary>
- //public ICollection<WmsAssembleMaterialContainer> WmsAssembleMaterialContainer { get; set; }
+ public bool IsDisabled { get; set; }
- ///// <summary>
- ///// 鐗╂枡鎵樼洏鍘嗗彶琛�
- ///// </summary>
- //public ICollection<WmsAssembleHistoryMaterialContainer> WmsAssembleHistoryMaterialContainer { get; set; }
- ///// <summary>
- ///// 鏋勫缓涓�瀵瑰鐨勫叧绯�
- ///// </summary>
- ///// <param name="entityBuilder"></param>
- ///// <param name="dbContext"></param>
- ///// <param name="dbContextLocator"></param>
- //public void Configure(EntityTypeBuilder<WmsContainer> entityBuilder, DbContext dbContext, Type dbContextLocator)
- //{
- // entityBuilder.HasMany(x => x.WmsAssembleMaterialContainer)
- // .WithOne(x => x.WmsContainer)
- // .HasForeignKey(x => x.ContainerId);
- // entityBuilder.HasMany(x => x.WmsAssembleHistoryMaterialContainer)
- // .WithOne(x => x.WmsContainer)
- // .HasForeignKey(x => x.Id).IsRequired(false);
- //}
+
+
+
+
+
+
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3