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 | 52 ++++++++++++++--------------------------------------
1 files changed, 14 insertions(+), 38 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 2d97a0b..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"
@@ -145,15 +145,15 @@
updateObj.MaterialCode = input.MaterialCode;
updateObj.IsValid = input.IsValid;
- updateObj.MaterialName = input.MaterialName;
updateObj.IsSelfMade = input.IsSelfMade;
- updateObj.PurchaseType = input.PurchaseType;
updateObj.Num = input.Num;
- updateObj.MaterialType = input.MaterialType;
updateObj.SelfNum = input.SelfNum;
+ updateObj.MaterialName = input.MaterialName;
+ updateObj.NullLength = input.NullLength;
+ updateObj.PurchaseType = input.PurchaseType;
+ updateObj.MaterialType = input.MaterialType;
updateObj.PrimaryUnit = input.PrimaryUnit;
updateObj.Standard = input.Standard;
- updateObj.NullLength = input.NullLength;
updateObj.OuterDiameter = input.OuterDiameter;
updateObj.WallThickness = input.WallThickness;
updateObj.MaterialQuality = input.MaterialQuality;
@@ -165,14 +165,6 @@
updateObj.RedundantField2 = input.RedundantField2;
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;
- updateObj.OperationRemark = input.OperationRemark;
- updateObj.DeleteRemark = input.DeleteRemark;
await wmsMaterialRepository.UpdateAsync(updateObj);
@@ -330,15 +322,15 @@
{
MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
-MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
-PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
-MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
+MaterialName = impItem.MaterialName,
+NullLength = impItem.NullLength,
+PurchaseType = impItem.PurchaseType,
+MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
-NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -350,14 +342,6 @@
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
-OperationRemark = impItem.OperationRemark,
-DeleteRemark = impItem.DeleteRemark,
};
@@ -369,15 +353,15 @@
{
MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
-MaterialName = impItem.MaterialName,
IsSelfMade = impItem.IsSelfMade,
-PurchaseType = impItem.PurchaseType,
Num = impItem.Num,
-MaterialType = impItem.MaterialType,
SelfNum = impItem.SelfNum,
+MaterialName = impItem.MaterialName,
+NullLength = impItem.NullLength,
+PurchaseType = impItem.PurchaseType,
+MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
Standard = impItem.Standard,
-NullLength = impItem.NullLength,
OuterDiameter = impItem.OuterDiameter,
WallThickness = impItem.WallThickness,
MaterialQuality = impItem.MaterialQuality,
@@ -389,14 +373,6 @@
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
-IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
-OperationRemark = impItem.OperationRemark,
-DeleteRemark = impItem.DeleteRemark,
};
@@ -464,7 +440,7 @@
["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "鐗╂枡鍩虹淇℃伅琛ㄥ垪琛�" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial妯＄増";
+ var fileName = "鐗╂枡淇℃伅";
return (sheets, fileName);
}
@@ -478,9 +454,9 @@
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.Num, "鏄惁鏈夋晥鐗╂枡");
Check.NotNull(input.MaterialType, "鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
Check.NotNull(input.OuterDiameter, "澶栧緞锛堝崟浣嶏細mm锛�");
Check.NotNull(input.WallThickness, "澹佸帤锛堝崟浣嶏細mm锛�");
--
Gitblit v1.9.3