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/WmsControlRuleDetailOutput.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs
index 667c7c1..4a0476d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs
@@ -9,49 +9,54 @@
public class WmsControlRuleDetailOutput
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- public long ControlRuleId { get; set; }
+ public string RuleCode { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒欏悕绉�
+ /// </summary>
+ public string RuleName { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
/// </summary>
- public decimal MaxImumqty { get; set; }
+ public decimal? MaxImumqty { get; set; }
/// <summary>
/// 鏈�浣庡簱瀛�
/// </summary>
- public decimal MinImumqty { get; set; }
+ public decimal? MinImumqty { get; set; }
/// <summary>
/// 瀹夊叏搴撳瓨
/// </summary>
- public decimal SafeImumqty { get; set; }
+ public decimal? SafeImumqty { get; set; }
/// <summary>
/// 鏈�灏忓簱榫�
/// </summary>
- public decimal MinStorageAge { get; set; }
+ public decimal? MinStorageAge { get; set; }
/// <summary>
/// 鏈�澶у簱榫�
/// </summary>
- public decimal MaxStorageAge { get; set; }
+ public decimal? MaxStorageAge { get; set; }
/// <summary>
/// 鏄惁鍏嶆
/// </summary>
- public bool IsNotChek { get; set; }
+ public bool? IsNotChek { get; set; }
/// <summary>
/// 淇濊川鏈熷ぉ鏁�
/// </summary>
- public decimal ShelfLifeDays { get; set; }
+ public decimal? ShelfLifeDays { get; set; }
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
- public bool IsDisabled { get; set; }
+ public bool? IsDisabled { get; set; }
/// <summary>
/// Id涓婚敭
--
Gitblit v1.9.3