From a44d4ac81a863fb3b93e1c8ad8526ef754c24615 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期三, 18 十二月 2024 09:08:01 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs | 83 +++++++++++++++++++++++++++++++++-------- 1 files changed, 66 insertions(+), 17 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs" index cdcad93..dc8bd94 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs" @@ -8,50 +8,99 @@ namespace WIDESEA_DTO.ERP { - [ModelValidate] - public class ErpOutOrder - { - /// <summary> - /// - /// </summary> - public string From { get; set; } - /// <summary> - /// - /// </summary> - public string DateTime { get; set; } - /// <summary> - /// - /// </summary> - [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true)] - public ErpOutOrderDTO Content { get; set; } - } + /// <summary> + /// 鍑哄簱鍗� + /// </summary> [ModelValidate] public class ErpOutOrderDTO { + /// <summary> + /// 鎿嶄綔绫诲瀷<br/> + /// 1锛氭柊澧�<br/> + /// 2锛氫慨鏀�<br/> + /// 3锛氬垹闄�(鍒犻櫎鍙鏄庣粏琛屽彿鍜岄鏂欏崟鍙�) + /// </summary> + [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })] public int Way { get; set; } + /// <summary> + /// 鏄庣粏琛屽彿 + /// </summary> + [PropertyValidate("鏄庣粏琛屽彿", NotNullAndEmpty = true)] public string RowNo { get; set; } + /// <summary> + /// 棰嗘枡璁㈠崟鍙� + /// </summary> + [PropertyValidate("棰嗘枡璁㈠崟鍙�", NotNullAndEmpty = true)] public string OrderNo { get; set; } + /// <summary> + /// 浠撳簱缂栧彿 + /// </summary> + [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)] public string WaId { get; set; } + /// <summary> + /// 璁㈠崟绫诲瀷<br/> + /// 1锛氭爣鍑嗙敓浜ч鏂�<br/> + /// 2锛氭爣鍑嗛儴闂ㄩ鏂�<br/> + /// 3锛氱爺鍙戦」鐩鏂�<br/> + /// 4锛氱墿鏂欓�佹鍑轰粨<br/> + /// 5锛氱墿鏂欒皟鍑�<br/> + /// 6锛氱淮淇彂鏂�<br/> + /// 7锛氶攢鍞锤鏄�<br/> + /// 8锛氶��璐х鐞� + /// </summary> + [PropertyValidate("璁㈠崟绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3, 4, 5, 6, 7, 8 })] public int OType { get; set; } + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)] public string MCode { get; set; } + /// <summary> + /// 鐗╂枡鎵规 + /// </summary> + [PropertyValidate("鐗╂枡鎵规")] public string MLot { get; set; } + /// <summary> + /// 鏁伴噺 + /// </summary> + [PropertyValidate("鏁伴噺", NotNullAndEmpty = true, MinValue = 0, IsContainMinValue = false)] public float Qty { get; set; } + /// <summary> + /// 鍗曚綅 + /// </summary> + [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)] public string Unit { get; set; } + /// <summary> + /// 涓嬪崟鏃ユ湡 + /// </summary> + [PropertyValidate("涓嬪崟鏃ユ湡", NotNullAndEmpty = true)] public string OrderData { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [PropertyValidate("澶囨敞")] public string Node { get; set; } + /// <summary> + /// 閮ㄩ棬缂栧彿 + /// </summary> + [PropertyValidate("閮ㄩ棬缂栧彿")] public string DepartmentCode { get; set; } + /// <summary> + /// 閮ㄩ棬鍚嶇О + /// </summary> + [PropertyValidate("閮ㄩ棬鍚嶇О")] public string DepartmentName { get; set; } } } -- Gitblit v1.9.3