From 856cdf5c19fcc21255ef06335747040711fce530 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 14 5月 2025 15:14:56 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 283 +++++++++++++++++++++++++++-----------------------------
1 files changed, 135 insertions(+), 148 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs
index 3c21342..8e75976 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs
@@ -1,162 +1,149 @@
using MiniExcelLibs.Attributes;
using System.ComponentModel.DataAnnotations;
+using System;
using System.ComponentModel;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
+/// <summary>
+/// 鐗╂枡鍩虹淇℃伅瀵煎嚭妯″瀷
+/// </summary>
+public class WmsMaterialExportModel
{
+ /// <summary>
+ /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+ /// </summary>
+ //[ExcelColumn(Name = "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", Width = 25)]
+ //public string MaterialCode { get; set; }
/// <summary>
- /// WmsMaterial瀵煎嚭妯″瀷
+ /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
/// </summary>
- public class MaterialExportModel
+ [ExcelColumn(Name = "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", Width = 25)]
+ public string MaterialNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [ExcelColumn(Name = "鐗╂枡鍚嶇О", Width = 25)]
+ public string MaterialName { get; set; }
+
+ /// <summary>
+ /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ [ExcelColumn(Name = "閲囪喘绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
+ public PurchaseTypeEnum PurchaseType { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ [ExcelColumn(Name = "鐗╂枡绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
+ public MaterialTypeEnum MaterialType { get; set; }
+
+ /// <summary>
+ /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
+ /// </summary>
+ [ExcelColumn(Name = "涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�", Width = 25)]
+ public string PrimaryUnit { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
+ /// </summary>
+ [ExcelColumn(Name = "瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�", Width = 25)]
+ public string Standard { get; set; }
+
+ /// <summary>
+ /// 澶栧緞锛堝崟浣嶏細mm锛�
+ /// </summary>
+ [ExcelColumn(Name = "澶栧緞锛堝崟浣嶏細mm锛�", Width = 25)]
+ public decimal OuterDiameter { get; set; }
+
+ /// <summary>
+ /// 澹佸帤锛堝崟浣嶏細mm锛�
+ /// </summary>
+ [ExcelColumn(Name = "澹佸帤锛堝崟浣嶏細mm锛�", Width = 25)]
+ public decimal WallThickness { get; set; }
+
+ /// <summary>
+ /// 鏉愯川锛堝锛�304涓嶉攬閽級
+ /// </summary>
+ [ExcelColumn(Name = "鏉愯川锛堝锛�304涓嶉攬閽級", Width = 25)]
+ public string MaterialQuality { get; set; }
+
+ /// <summary>
+ /// 闀垮害锛堝崟浣嶏細m锛�
+ /// </summary>
+ [ExcelColumn(Name = "闀垮害锛堝崟浣嶏細m锛�", Width = 25)]
+ public decimal Length { get; set; }
+
+ /// <summary>
+ /// 鏄惁涓轰富鏀
+ /// </summary>
+ [ExcelColumn(Name = "鏄惁涓轰富鏀", Width = 25)]
+ public YesNoEnum IsMainBranch { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇宸ュ巶
+ /// </summary>
+ [ExcelColumn(Name = "鐢熶骇宸ュ巶", Width = 25)]
+ public string Factory { get; set; }
+
+ /// <summary>
+ /// 璇佷功缂栧彿
+ /// </summary>
+ [ExcelColumn(Name = "璇佷功缂栧彿", Width = 25)]
+ public string Certification { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ [ExcelColumn(Name = "鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��", Width = 25)]
+ public string RedundantField1 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ [ExcelColumn(Name = "鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��", Width = 25)]
+ public string RedundantField2 { get; set; }
+
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ [ExcelColumn(Name = "鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��", Width = 25)]
+ public string RedundantField3 { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [ExcelColumn(Name = "澶囨敞", Width = 25)]
+ public string Remark { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [ExcelColumn(Name = "", Width = 25)]
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [ExcelColumn(Name = "", Width = 25)]
+ public DateTime LastModificationTime { get; set; }
+
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ [ExcelColumn(Name = "鍨嬪彿", Width = 25)]
+ public string MaterialModel { get; set; }
+
+ public Dictionary<string, object> GetExportData()
{
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- /// <example>MAT-2023-001</example>
- [ExcelColumn(Name = "鐗╂枡缂栫爜", Width = 25)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- /// <example>304涓嶉攬閽㈢</example>
- [ExcelColumn(Name = "鐗╂枡鍚嶇О", Width = 25)]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 閲囪喘绫诲瀷
- /// </summary>
- /// <remarks>
- /// 0:鏍囧噯閲囪喘 1:绱ф�ラ噰璐� 2:鍗忚閲囪喘
- /// </remarks>
- /// <example>0</example>
- [ExcelColumn(Name = "閲囪喘绫诲瀷", Width = 25)]
- public PurchaseTypeEnum PurchaseType { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- /// <remarks>
- /// 1:鍘熸潗鏂� 2:鍗婃垚鍝� 3:鎴愬搧
- /// </remarks>
- /// <example>1</example>
- [ExcelColumn(Name = "鐗╂枡绫诲瀷", Width = 25)]
- public MaterialTypeEnum MaterialType { get; set; }
-
- /// <summary>
- /// 涓昏閲忓崟浣�
- /// </summary>
- /// <example>kg</example>
- [ExcelColumn(Name = "涓诲崟浣�", Width = 25)]
- public string PrimaryUnit { get; set; }
-
- /// <summary>
- /// 瑙勬牸/鎶�鏈爣鍑�
- /// </summary>
- /// <example>GB/T 8163-2018</example>
- [ExcelColumn(Name = "瑙勬牸/鏍囧噯", Width = 25)]
- public string Standard { get; set; }
-
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細姣背锛�
- /// </summary>
- /// <example>50.5</example>
- [ExcelColumn(Name = "澶栧緞(mm)", Width = 25)]
- public decimal OuterDiameter { get; set; }
-
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細姣背锛�
- /// </summary>
- /// <example>2.5</example>
- [ExcelColumn(Name = "澹佸帤(mm)", Width = 25)]
- public decimal WallThickness { get; set; }
-
- /// <summary>
- /// 鏉愯川璇存槑
- /// </summary>
- /// <example>304涓嶉攬閽�</example>
- [ExcelColumn(Name = "鏉愯川", Width = 25)]
- public string MaterialQuality { get; set; }
-
- /// <summary>
- /// 鍨嬪彿
- /// </summary>
- [ExcelColumn(Name = "鍨嬪彿", Width = 25)]
- public string MaterialModel { get; set; }
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細绫筹級
- /// </summary>
- /// <example>6.0</example>
- [ExcelColumn(Name = "闀垮害(m)", Width = 25)]
- public decimal Length { get; set; }
-
- /// <summary>
- /// 鏄惁涓绘敮绠℃爣璇�
- /// </summary>
- /// <example>true</example>
- [ExcelColumn(Name = "鏄惁涓绘敮绠�", Width = 25)]
- [Description("鏄�/鍚�")]
- public YesNoEnum IsMainBranch { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ巶鍚嶇О
- /// </summary>
- /// <example>涓婃捣绗竴宸ュ巶</example>
- [ExcelColumn(Name = "鐢熶骇宸ュ巶", Width = 25)]
- public string Factory { get; set; }
-
- /// <summary>
- /// 璁よ瘉璇佷功缂栧彿
- /// </summary>
- /// <example>CER-2023-001</example>
- [ExcelColumn(Name = "璇佷功缂栧彿", Width = 25)]
- public string Certification { get; set; }
-
- /// <summary>
- /// 棰勭暀鎵╁睍瀛楁1
- /// </summary>
- /// <remarks>
- /// 鍙敤浜庝复鏃跺瓨鍌ㄤ緵搴斿晢缂栫爜绛夋墿灞曚俊鎭�
- /// </remarks>
- [ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 25)]
- public string RedundantField1 { get; set; }
-
- /// <summary>
- /// 棰勭暀鎵╁睍瀛楁2
- /// </summary>
- /// <remarks>
- /// 鍙敤浜庝复鏃跺瓨鍌ㄦ壒娆″彿绛夋墿灞曚俊鎭�
- /// </remarks>
- [ExcelColumn(Name = "鎵╁睍瀛楁2", Width = 25)]
- public string RedundantField2 { get; set; }
-
- /// <summary>
- /// 棰勭暀鎵╁睍瀛楁3
- /// </summary>
- /// <remarks>
- /// 鍙敤浜庝复鏃跺瓨鍌ㄨ嚜瀹氫箟鍒嗙被绛夋墿灞曚俊鎭�
- /// </remarks>
- [ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 25)]
- public string RedundantField3 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExcelColumn(Name = "澶囨敞",Width = 25)]
- public string Remark { get; set; }
-
- public Dictionary<string, object> GetExportData()
+ var exportData = new Dictionary<string, object>();
+ foreach (var property in this.GetType().GetProperties())
{
- var exportData = new Dictionary<string, object>();
- foreach (var property in this.GetType().GetProperties())
- {
- exportData.Add(property.Name, property.GetValue(this));
- }
-
- return exportData;
+ exportData.Add(property.Name, property.GetValue(this));
}
+
+ return exportData;
}
}
-
--
Gitblit v1.9.3