From 8b44cb74674aca62fd8bbad51480754d47050abc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 13:26:51 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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/Implements/WmsMaterialAppService.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/Implements/WmsMaterialAppService.cs"
index 51058cb..74a0476 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/Implements/WmsMaterialAppService.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/Implements/WmsMaterialAppService.cs"
@@ -144,7 +144,12 @@
input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
updateObj.MaterialCode = input.MaterialCode;
+ updateObj.IsValid = input.IsValid;
+ updateObj.IsSelfMade = input.IsSelfMade;
+ updateObj.Num = input.Num;
+ updateObj.SelfNum = input.SelfNum;
updateObj.MaterialName = input.MaterialName;
+ updateObj.NullLength = input.NullLength;
updateObj.PurchaseType = input.PurchaseType;
updateObj.MaterialType = input.MaterialType;
updateObj.PrimaryUnit = input.PrimaryUnit;
@@ -161,11 +166,6 @@
updateObj.RedundantField3 = input.RedundantField3;
updateObj.Remark = input.Remark;
updateObj.IsDisabled = input.IsDisabled;
- updateObj.CreatorName = input.CreatorName;
- updateObj.LastModifierName = input.LastModifierName;
- updateObj.ExtraField1 = input.ExtraField1;
- updateObj.ExtraField2 = input.ExtraField2;
- updateObj.ExtraField3 = input.ExtraField3;
await wmsMaterialRepository.UpdateAsync(updateObj);
@@ -322,7 +322,12 @@
var wmsMaterialUpdateDto = new WmsMaterialUpdateDto
{
MaterialCode = impItem.MaterialCode,
+IsValid = impItem.IsValid,
+IsSelfMade = impItem.IsSelfMade,
+Num = impItem.Num,
+SelfNum = impItem.SelfNum,
MaterialName = impItem.MaterialName,
+NullLength = impItem.NullLength,
PurchaseType = impItem.PurchaseType,
MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
@@ -339,11 +344,6 @@
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
};
@@ -354,7 +354,12 @@
var wmsMaterialCreateDto = new WmsMaterialCreateDto
{
MaterialCode = impItem.MaterialCode,
+IsValid = impItem.IsValid,
+IsSelfMade = impItem.IsSelfMade,
+Num = impItem.Num,
+SelfNum = impItem.SelfNum,
MaterialName = impItem.MaterialName,
+NullLength = impItem.NullLength,
PurchaseType = impItem.PurchaseType,
MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
@@ -371,11 +376,6 @@
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
};
@@ -443,7 +443,7 @@
["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "鐗╂枡鍩虹淇℃伅琛ㄥ垪琛�" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = "鐗╂枡淇℃伅";
return (sheets, fileName);
}
@@ -456,6 +456,8 @@
{
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.MaterialCode, "鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�", 64);
+ Check.NotNull(input.IsValid, "鏄惁鏈夋晥鐗╂枡");
+ Check.NotNull(input.Num, "鏁伴噺");
Check.NotNullOrWhiteSpace(input.MaterialName, "鐗╂枡鍚嶇О", 128);
Check.NotNull(input.PurchaseType, "閲囪喘绫诲瀷锛堟灇涓惧�硷級");
Check.NotNull(input.MaterialType, "鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
--
Gitblit v1.9.3