From 3933f3629ec6282e5f070923f04bbf2c1add6687 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 30 4月 2025 13:58:19 +0800
Subject: [PATCH] 物料基础表导入导出增删改查
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
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 1fbe564..b3032ee 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -1,8 +1,9 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.Shared;
+using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -60,10 +61,9 @@
var maxSort = await _wmsmaterialRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmsmaterial = new WmsMaterial
- {
- };
+ var wmsmaterial = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
+ wmsmaterial.Sort = sort;
input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);
await _wmsmaterialRepository.InsertAsync(wmsmaterial);
@@ -91,7 +91,18 @@
wmsmaterial.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);
- wmsmaterial.MaterialCode = input.MaterialCode;
+ wmsmaterial.MaterialName = input.MaterialName;
+ wmsmaterial.PurchaseType = input.PurchaseType;
+ wmsmaterial.MaterialType = input.MaterialType;
+ wmsmaterial.PrimaryUnit = input.PrimaryUnit;
+ wmsmaterial.Standard = input.Standard;
+ wmsmaterial.OuterDiameter = input.OuterDiameter;
+ wmsmaterial.WallThickness = input.WallThickness;
+ wmsmaterial.MaterialQuality = input.MaterialQuality;
+ wmsmaterial.Length = input.Length;
+ wmsmaterial.IsMainBranch = input.IsMainBranch;
+ wmsmaterial.Factory = input.Factory;
+ wmsmaterial.Certification = input.Certification;
await _wmsmaterialRepository.UpdateAsync(wmsmaterial);
@@ -226,6 +237,17 @@
{
MaterialCode = wmsmaterial.MaterialCode,
MaterialName = wmsmaterial.MaterialName,
+ PurchaseType = wmsmaterial.PurchaseType,
+ MaterialType = wmsmaterial.MaterialType,
+ PrimaryUnit = wmsmaterial.PrimaryUnit,
+ Standard = wmsmaterial.Standard,
+ OuterDiameter = wmsmaterial.OuterDiameter,
+ WallThickness = wmsmaterial.WallThickness,
+ MaterialQuality = wmsmaterial.MaterialQuality,
+ Length = wmsmaterial.Length,
+ IsMainBranch = wmsmaterial.IsMainBranch,
+ Factory = wmsmaterial.Factory,
+ Certification = wmsmaterial.Certification,
Remark = wmsmaterial.Remark,
};
@@ -237,6 +259,17 @@
{
MaterialCode = wmsmaterial.MaterialCode,
MaterialName = wmsmaterial.MaterialName,
+ PurchaseType = wmsmaterial.PurchaseType,
+ MaterialType = wmsmaterial.MaterialType,
+ PrimaryUnit = wmsmaterial.PrimaryUnit,
+ Standard = wmsmaterial.Standard,
+ OuterDiameter = wmsmaterial.OuterDiameter,
+ WallThickness = wmsmaterial.WallThickness,
+ MaterialQuality = wmsmaterial.MaterialQuality,
+ Length = wmsmaterial.Length,
+ IsMainBranch = wmsmaterial.IsMainBranch,
+ Factory = wmsmaterial.Factory,
+ Certification = wmsmaterial.Certification,
Remark = wmsmaterial.Remark,
};
@@ -290,10 +323,10 @@
var sheets = new Dictionary<string, object>
{
- ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "WmsMaterial鍒楄〃" : result.Count == 1 ? result.First()?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = result.Count > 1 ? "WmsMaterial鍒楄〃" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
return (sheets, fileName);
}
--
Gitblit v1.9.3