From 8dbe04f7807d7a4540910552a3db7d7d9008c488 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 14:30:50 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 2 ++
HIAWms/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj | 2 +-
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 18 +++++++++---------
4 files changed, 12 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 1d56406..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,13 +31,13 @@
/// <summary>
/// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
/// </summary>
- [ExcelColumn(Name = "閲囪喘绫诲瀷锛堟灇涓惧�硷級", Width = 25)]
+ [ExcelColumn(Name = "閲囪喘绫诲瀷", Width = 25)]
public PurchaseTypeEnum PurchaseType { get; set; }
/// <summary>
/// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
/// </summary>
- [ExcelColumn(Name = "鐗╂枡绫诲瀷", Width = 25)]
+ [ExcelColumn(Name = "鐗╂枡绫诲瀷缂栫爜", Width = 25)]
public string MaterialTypeCode { get; set; }
/// <summary>
@@ -49,37 +49,37 @@
/// <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>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
index 926d105..3648d2d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -282,6 +282,7 @@
IsMainBranch = wmsmaterial.IsMainBranch,
Factory = wmsmaterial.Factory,
Certification = wmsmaterial.Certification,
+ MaterialModel = wmsmaterial.MaterialModel,
Remark = wmsmaterial.Remark,
};
@@ -303,6 +304,7 @@
MaterialQuality = wmsmaterial.MaterialQuality,
Length = wmsmaterial.Length,
IsMainBranch = wmsmaterial.IsMainBranch,
+ MaterialModel = wmsmaterial.MaterialModel,
Factory = wmsmaterial.Factory,
Certification = wmsmaterial.Certification,
Remark = wmsmaterial.Remark,
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj b/HIAWms/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj
index 62071aa..68e1b1f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/CMS.Plugin.HIAWms.csproj
@@ -11,7 +11,7 @@
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
- <CMSRootPath>E:\syc_cms\CMS Editor</CMSRootPath>
+ <CMSRootPath>D:\syc\CMS Editor</CMSRootPath>
<OutputPath>$(CMSRootPath)\plugins\cms.plugin.hiawms</OutputPath>
</PropertyGroup>
diff --git "a/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 6de1ef8..207196a 100644
--- "a/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3