From 1eb08ced0ef966804e96c9b792bba45ca6eb6601 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs
index edc5546..c32a470 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs
@@ -11,9 +11,14 @@
public class WmsControlRuleDetailSearch : PageInputBase
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- public virtual long? ControlRuleId { get; set; }
+ public virtual string RuleCode { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒欏悕绉�
+ /// </summary>
+ public virtual string RuleName { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
@@ -83,9 +88,14 @@
public class WmsControlRuleDetailSearchNonPage : PageInputNonPageBase
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- public virtual long? ControlRuleId { get; set; }
+ public virtual string RuleCode { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒欏悕绉�
+ /// </summary>
+ public virtual string RuleName { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
@@ -155,58 +165,50 @@
public class WmsControlRuleDetailInput
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欏悕绉�
/// </summary>
- [Required(ErrorMessage = "鎺у埗灞炴�ц鍒橧D涓嶈兘涓虹┖")]
- public virtual long ControlRuleId { get; set; }
+ [Required(ErrorMessage = "鎺у埗灞炴�ц鍒欏悕绉颁笉鑳戒负绌�")]
+ public virtual string RuleName { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
/// </summary>
- [Required(ErrorMessage = "鏈�楂樺簱瀛樹笉鑳戒负绌�")]
- public virtual decimal MaxImumqty { get; set; }
+ public virtual decimal? MaxImumqty { get; set; }
/// <summary>
/// 鏈�浣庡簱瀛�
/// </summary>
- [Required(ErrorMessage = "鏈�浣庡簱瀛樹笉鑳戒负绌�")]
- public virtual decimal MinImumqty { get; set; }
+ public virtual decimal? MinImumqty { get; set; }
/// <summary>
/// 瀹夊叏搴撳瓨
/// </summary>
- [Required(ErrorMessage = "瀹夊叏搴撳瓨涓嶈兘涓虹┖")]
- public virtual decimal SafeImumqty { get; set; }
+ public virtual decimal? SafeImumqty { get; set; }
/// <summary>
/// 鏈�灏忓簱榫�
/// </summary>
- [Required(ErrorMessage = "鏈�灏忓簱榫勪笉鑳戒负绌�")]
- public virtual decimal MinStorageAge { get; set; }
+ public virtual decimal? MinStorageAge { get; set; }
/// <summary>
/// 鏈�澶у簱榫�
/// </summary>
- [Required(ErrorMessage = "鏈�澶у簱榫勪笉鑳戒负绌�")]
- public virtual decimal MaxStorageAge { get; set; }
+ public virtual decimal? MaxStorageAge { get; set; }
/// <summary>
/// 鏄惁鍏嶆
/// </summary>
- [Required(ErrorMessage = "鏄惁鍏嶆涓嶈兘涓虹┖")]
- public virtual bool IsNotChek { get; set; }
+ public virtual bool? IsNotChek { get; set; }
/// <summary>
/// 淇濊川鏈熷ぉ鏁�
/// </summary>
- [Required(ErrorMessage = "淇濊川鏈熷ぉ鏁颁笉鑳戒负绌�")]
- public virtual decimal ShelfLifeDays { get; set; }
+ public virtual decimal? ShelfLifeDays { get; set; }
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
- [Required(ErrorMessage = "鏄惁绂佺敤涓嶈兘涓虹┖")]
- public virtual bool IsDisabled { get; set; }
+ public virtual bool? IsDisabled { get; set; }
}
--
Gitblit v1.9.3