From f892002a22d5cc1f09d764c20b812d81a519135a Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 09 5月 2025 10:00:39 +0800 Subject: [PATCH] 优化查询列表 --- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 72 ++++++++++++++++------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" index 05c5269..92b76ef 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" @@ -23,16 +23,34 @@ public bool IsValid { get; set; } /// <summary> + /// 鏄惁鑷骇 + /// </summary> + [ExcelColumn(Name = "鏄惁鑷骇", Width = 25)] + public bool? IsSelfMade { get; set; } + + /// <summary> + /// 鏁伴噺 + /// </summary> + [ExcelColumn(Name = "鏁伴噺", Width = 25)] + public int Num { get; set; } + + /// <summary> + /// 鑷湁鏁伴噺 + /// </summary> + [ExcelColumn(Name = "鑷湁鏁伴噺", Width = 25)] + public int? SelfNum { get; set; } + + /// <summary> /// 鐗╂枡鍚嶇О /// </summary> [ExcelColumn(Name = "鐗╂枡鍚嶇О", Width = 25)] public string MaterialName { get; set; } /// <summary> - /// 鏁伴噺 + /// 鍙┖闀垮害 /// </summary> - [ExcelColumn(Name = "鏁伴噺", Width = 25)] - public bool? IsSelfMade { get; set; } + [ExcelColumn(Name = "鍙┖闀垮害", Width = 25)] + public decimal? NullLength { get; set; } /// <summary> /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級 @@ -41,22 +59,10 @@ public PurchaseTypeEnum PurchaseType { get; set; } /// <summary> - /// 鏄惁鏈夋晥鐗╂枡 - /// </summary> - [ExcelColumn(Name = "鏄惁鏈夋晥鐗╂枡", Width = 25)] - public int Num { get; set; } - - /// <summary> /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級 /// </summary> [ExcelColumn(Name = "鐗╂枡绫诲瀷锛堟灇涓惧�硷級", Width = 25)] public MaterialTypeEnum MaterialType { get; set; } - - /// <summary> - /// 鑷湁鏁伴噺 - /// </summary> - [ExcelColumn(Name = "鑷湁鏁伴噺", Width = 25)] - public int? SelfNum { get; set; } /// <summary> /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛� @@ -69,12 +75,6 @@ /// </summary> [ExcelColumn(Name = "瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�", Width = 25)] public string Standard { get; set; } - - /// <summary> - /// - /// </summary> - [ExcelColumn(Name = "", Width = 25)] - public decimal? NullLength { get; set; } /// <summary> /// 澶栧緞锛堝崟浣嶏細mm锛� @@ -155,16 +155,22 @@ public bool? IsDisabled { get; set; } /// <summary> - /// 鍒涘缓浜� + /// 鍒犻櫎鏃堕棿 /// </summary> - [ExcelColumn(Name = "鍒涘缓浜�", Width = 25)] - public string CreatorName { get; set; } + [ExcelColumn(Name = "鍒犻櫎鏃堕棿", Width = 25)] + public DateTime DeletionTime { get; set; } /// <summary> - /// 淇敼浜� + /// 鎿嶄綔澶囨敞 /// </summary> - [ExcelColumn(Name = "淇敼浜�", Width = 25)] - public string LastModifierName { get; set; } + [ExcelColumn(Name = "鎿嶄綔澶囨敞", Width = 25)] + public string OperationRemark { get; set; } + + /// <summary> + /// 鍒犻櫎澶囨敞 + /// </summary> + [ExcelColumn(Name = "鍒犻櫎澶囨敞", Width = 25)] + public string DeleteRemark { get; set; } /// <summary> /// 鎵╁睍瀛楁1 @@ -183,18 +189,6 @@ /// </summary> [ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 25)] public string ExtraField3 { get; set; } - - /// <summary> - /// 鎿嶄綔澶囨敞 - /// </summary> - [ExcelColumn(Name = "鎿嶄綔澶囨敞", Width = 25)] - public string OperationRemark { get; set; } - - /// <summary> - /// 鍒犻櫎澶囨敞 - /// </summary> - [ExcelColumn(Name = "鍒犻櫎澶囨敞", Width = 25)] - public string DeleteRemark { get; set; } -- Gitblit v1.9.3