From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 54 ++++++++++++++++++------------------------------------
1 files changed, 18 insertions(+), 36 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 bc35cf1..90560f4 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;
@@ -159,18 +164,7 @@
updateObj.RedundantField1 = input.RedundantField1;
updateObj.RedundantField2 = input.RedundantField2;
updateObj.RedundantField3 = input.RedundantField3;
- updateObj.CreatorName = input.CreatorName;
- updateObj.LastModifierName = input.LastModifierName;
updateObj.Remark = input.Remark;
- updateObj.IsDisabled = input.IsDisabled;
- updateObj.ExtraField1 = input.ExtraField1;
- updateObj.ExtraField2 = input.ExtraField2;
- updateObj.ExtraField3 = input.ExtraField3;
- updateObj.IsSelfMade = input.IsSelfMade;
- updateObj.IsValid = input.IsValid;
- updateObj.NullLength = input.NullLength;
- updateObj.Num = input.Num;
- updateObj.SelfNum = input.SelfNum;
await wmsMaterialRepository.UpdateAsync(updateObj);
@@ -327,7 +321,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,
@@ -342,18 +341,7 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
-IsSelfMade = impItem.IsSelfMade,
-IsValid = impItem.IsValid,
-NullLength = impItem.NullLength,
-Num = impItem.Num,
-SelfNum = impItem.SelfNum,
};
@@ -364,7 +352,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,
@@ -379,18 +372,7 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
-IsSelfMade = impItem.IsSelfMade,
-IsValid = impItem.IsValid,
-NullLength = impItem.NullLength,
-Num = impItem.Num,
-SelfNum = impItem.SelfNum,
};
@@ -458,7 +440,7 @@
["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "鐗╂枡鍩虹淇℃伅琛ㄥ垪琛�" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = "鐗╂枡淇℃伅";
return (sheets, fileName);
}
@@ -471,6 +453,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, "鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
@@ -478,8 +462,6 @@
Check.NotNull(input.WallThickness, "澹佸帤锛堝崟浣嶏細mm锛�");
Check.NotNull(input.Length, "闀垮害锛堝崟浣嶏細m锛�");
Check.NotNull(input.IsMainBranch, "鏄惁涓轰富鏀");
- Check.NotNull(input.IsValid, "鏄惁鏈夋晥鐗╂枡");
- Check.NotNull(input.Num, "鏄惁鏈夋晥鐗╂枡");
return Task.CompletedTask;
}
--
Gitblit v1.9.3