From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +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 | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 8e75976..537eac5 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
@@ -19,7 +19,7 @@
/// <summary>
/// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
/// </summary>
- [ExcelColumn(Name = "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", Width = 25)]
+ [ExcelColumn(Name = "鐗╂枡缂栫爜", Width = 25)]
public string MaterialNo { get; set; }
/// <summary>
@@ -31,49 +31,55 @@
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
/// </summary>
- [ExcelColumn(Name = "閲囪喘绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
+ [ExcelColumn(Name = "閲囪喘绫诲瀷", Width = 25)]
public PurchaseTypeEnum PurchaseType { get; set; }
/// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
- [ExcelColumn(Name = "鐗╂枡绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
- public MaterialTypeEnum MaterialType { get; set; }
+ [ExcelColumn(Name = "鐗╂枡绫诲瀷缂栫爜", Width = 25)]
+ public string MaterialTypeCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ [ExcelColumn(Name = "鐗╂枡绫诲瀷", Width = 25)]
+ public string MaterialTypeDesc { get; set; }
/// <summary>
/// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
/// </summary>
- [ExcelColumn(Name = "涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�", Width = 25)]
+ [ExcelColumn(Name = "涓诲崟浣�", Width = 25)]
public string PrimaryUnit { get; set; }
/// <summary>
/// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
/// </summary>
- [ExcelColumn(Name = "瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�", Width = 25)]
+ [ExcelColumn(Name = "瑙勬牸/鏍囧噯", Width = 25)]
public string Standard { get; set; }
/// <summary>
/// 澶栧緞锛堝崟浣嶏細mm锛�
/// </summary>
- [ExcelColumn(Name = "澶栧緞锛堝崟浣嶏細mm锛�", Width = 25)]
+ [ExcelColumn(Name = "澶栧緞", Width = 25)]
public decimal OuterDiameter { get; set; }
/// <summary>
/// 澹佸帤锛堝崟浣嶏細mm锛�
/// </summary>
- [ExcelColumn(Name = "澹佸帤锛堝崟浣嶏細mm锛�", Width = 25)]
+ [ExcelColumn(Name = "澹佸帤", Width = 25)]
public decimal WallThickness { get; set; }
/// <summary>
/// 鏉愯川锛堝锛�304涓嶉攬閽級
/// </summary>
- [ExcelColumn(Name = "鏉愯川锛堝锛�304涓嶉攬閽級", Width = 25)]
+ [ExcelColumn(Name = "鏉愯川", Width = 25)]
public string MaterialQuality { get; set; }
/// <summary>
/// 闀垮害锛堝崟浣嶏細m锛�
/// </summary>
- [ExcelColumn(Name = "闀垮害锛堝崟浣嶏細m锛�", Width = 25)]
+ [ExcelColumn(Name = "闀垮害", Width = 25)]
public decimal Length { get; set; }
/// <summary>
--
Gitblit v1.9.3