From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 90 +++++++++++++++------------------------------
1 files changed, 30 insertions(+), 60 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..77583d2 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锛�
@@ -137,22 +137,22 @@
public string RedundantField3 { get; set; }
/// <summary>
- /// 鎺掑簭
- /// </summary>
- [ExcelColumn(Name = "鎺掑簭", Width = 25)]
- public int Sort { get; set; }
-
- /// <summary>
/// 澶囨敞
/// </summary>
[ExcelColumn(Name = "澶囨敞", Width = 25)]
public string Remark { get; set; }
/// <summary>
- /// 鏄惁绂佺敤
+ /// 鍒涘缓鏃堕棿
/// </summary>
- [ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)]
- public bool? IsDisabled { get; set; }
+ [ExcelColumn(Name = "鍒涘缓鏃堕棿", Width = 25)]
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ [ExcelColumn(Name = "淇敼鏃堕棿", Width = 25)]
+ public DateTime LastModificationTime { get; set; }
/// <summary>
/// 鍒涘缓浜�
@@ -165,36 +165,6 @@
/// </summary>
[ExcelColumn(Name = "淇敼浜�", Width = 25)]
public string LastModifierName { get; set; }
-
- /// <summary>
- /// 鎵╁睍瀛楁1
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 25)]
- public string ExtraField1 { get; set; }
-
- /// <summary>
- /// 鎵╁睍瀛楁2
- /// </summary>
- [ExcelColumn(Name = "鎵╁睍瀛楁2", Width = 25)]
- public string ExtraField2 { get; set; }
-
- /// <summary>
- /// 鎵╁睍瀛楁3
- /// </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