From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
index 1abf8d9..509c22f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
@@ -14,9 +14,9 @@
public class TestToolOutModel
{
/// <summary>
- /// 娴嬫灦缂栫爜
+ /// 娴嬭瘯鏋舵壒娆″彿
/// </summary>
- [PropertyValidate("娴嬫灦缂栫爜", NotNullAndEmpty = true)]
+ [PropertyValidate("娴嬭瘯鏋舵壒娆″彿", NotNullAndEmpty = true)]
public string ToolCode { get; set; }
/// <summary>
/// 鐩爣鍦板潃鐮�
@@ -29,17 +29,17 @@
/// 娴嬭瘯鏋舵姤搴熸ā鍨�
/// </summary>
[ModelValidate]
- public class TestToolScrapModel
+ public class TestToolScrap
{
/// <summary>
- /// 娴嬫灦缂栫爜
+ /// 娴嬭瘯鏋舵壒娆″彿
/// </summary>
- [PropertyValidate("娴嬫灦缂栫爜", NotNullAndEmpty = true)]
+ [PropertyValidate("娴嬭瘯鏋舵壒娆″彿", NotNullAndEmpty = true)]
public string ToolCode { get; set; }
}
/// <summary>
- /// 娴嬭瘯鏋堕��搴撴ā鍨�
+ /// 娴嬭瘯鏋堕��搴�
/// </summary>
[ModelValidate]
public class TestToolBackModel
@@ -51,9 +51,24 @@
public string SourceAddressCode { get; set; }
/// <summary>
- /// 娴嬭瘯鏋剁紪鐮�
+ /// 娴嬭瘯鏋舵壒娆″彿
/// </summary>
- [PropertyValidate("娴嬭瘯鏋剁紪鐮�", NotNullAndEmpty = true)]
+ [PropertyValidate("娴嬭瘯鏋舵壒娆″彿", NotNullAndEmpty = true)]
public string TestToolCode { get; set; }
}
+ /// <summary>
+ ///娴嬭瘯鏋跺悓姝�
+ /// </summary>
+ public class TestToolSynInfo
+ {
+ /// <summary>
+ /// 娴嬭瘯鏋舵壒娆″彿
+ /// </summary>
+ public string ToolCode { get; set; }
+ /// <summary>
+ /// 鍒濆瀵垮懡
+ /// </summary>
+ public int Life { get; set; }
+
+ }
}
--
Gitblit v1.9.3