From 25750ab29ce4e243f4e4e17a796167f3a0f0697b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 16:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs | 120 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 49 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs
index bc65b10..d12e65a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainers/WmsContainer.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;
@@ -10,66 +11,98 @@
public class WmsContainer : FullAuditedAggregateRoot<Guid>
{
/// <summary>
- /// Initializes a new instance of the <see cref="WmsContainer"/> class.
+ /// ID
/// </summary>
- protected WmsContainer()
- {
- }
+ public Guid Id { get; set; }
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ public string ContainerNo { get; set; }
/// <summary>
- /// Initializes a new instance of the <see cref="WmsContainer"/> class.
+ /// 鎵樼洏绫诲瀷
/// </summary>
- /// <param name="id">The identifier.</param>
- /// <param name="code">The code.</param>
- /// <param name="name">The name.</param>
- /// <param name="sort">The sort.</param>
- /// <param name="remark">The remark.</param>
- public WmsContainer(Guid id, string code, string name, int sort = 0, string remark = null) : base(id)
- {
- Code = Check.NotNullOrWhiteSpace(code, "缂栧彿", WmsContainerConsts.MaxCodeLength);
- Name = Check.NotNullOrWhiteSpace(name, "鍚嶇О", WmsContainerConsts.MaxNameLength);
- Sort = sort;
- Remark = Check.Length(remark, "澶囨敞", WmsContainerConsts.MaxRemarkLength);
- }
+ public ContainerTypeEnum ContainerType { get; set; }
/// <summary>
- /// 缂栧彿
+ /// 鎵樼洏鐘舵��
/// </summary>
- public virtual string Code { get; protected set; }
+ public ContainerStatusEnum ContainerStatus { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 闀垮害
/// </summary>
- public virtual string Name { get; protected set; }
+ public decimal? SpecLength { get; set; }
+
+ /// <summary>
+ /// 瀹藉害
+ /// </summary>
+ public decimal? SpecWidth { get; set; }
+
+ /// <summary>
+ /// 楂樺害
+ /// </summary>
+ public decimal? SpecHeight { get; set; }
+
+ /// <summary>
+ /// 闄愰暱
+ /// </summary>
+ public decimal? LimitLength { get; set; }
+
+ /// <summary>
+ /// 闄愬
+ /// </summary>
+ public decimal? LimitWidth { get; set; }
+
+ /// <summary>
+ /// 闄愰珮
+ /// </summary>
+ public decimal? LimitHeight { get; set; }
+
+ /// <summary>
+ /// 杞介噸涓婇檺
+ /// </summary>
+ public decimal? MaxWeight { get; set; }
+
+ /// <summary>
+ /// 寮傚父鏁伴噺
+ /// </summary>
+ public int? ExceptionNumber { get; set; }
+
+ /// <summary>
+ ///鐗╂枡鏁伴噺
+ /// </summary>
+ public int? MaterialNumber { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField1 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField2 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField3 { get; set; }
/// <summary>
/// 鎺掑簭
/// </summary>
- public virtual int Sort { get; protected set; }
+ public virtual int Sort { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
- public virtual string Remark { get; protected set; }
+ public virtual string Remark { get; set; }
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
- public virtual bool? IsDisabled { get; protected set; }
-
- /// <summary>
- /// Updates the specified code.
- /// </summary>
- /// <param name="code">The code.</param>
- /// <param name="name">The name.</param>
- /// <param name="remark">The remark.</param>
- public virtual void Update(string code, string name, string remark = null, bool? isDisabled = null)
- {
- Code = Check.NotNullOrWhiteSpace(code, "缂栧彿", WmsContainerConsts.MaxCodeLength);
- Name = Check.NotNullOrWhiteSpace(name, "鍚嶇О", WmsContainerConsts.MaxNameLength);
- Remark = Check.Length(remark, "澶囨敞", WmsContainerConsts.MaxRemarkLength);
- IsDisabled = isDisabled ?? IsDisabled;
- }
+ public virtual bool? IsDisabled { get; set; }
/// <summary>
/// Adjusts the sort.
@@ -80,16 +113,5 @@
Sort = sort;
}
- /// <summary>
- /// Clones the specified create.
- /// </summary>
- /// <param name="create">The create.</param>
- /// <param name="name">The name.</param>
- /// <param name="i">The i.</param>
- /// <returns></returns>
- public WmsContainer Clone(Guid create, string name, int i)
- {
- return new WmsContainer(create, Code, name, i, Remark);
- }
}
}
--
Gitblit v1.9.3