Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-06-04 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -136,7 +136,7 @@
        wmsmaterial.Factory = input.Factory;
        wmsmaterial.MaterialModel = input.MaterialModel;
        wmsmaterial.Certification = input.Certification;

        wmsmaterial.MaterialTypeDesc = input.MaterialTypeDesc;
        await _wmsmaterialRepository.UpdateAsync(wmsmaterial);

        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
@@ -272,6 +272,7 @@
                        MaterialName = wmsmaterial.MaterialName,
                        PurchaseType = wmsmaterial.PurchaseType,
                        MaterialTypeCode = wmsmaterial.MaterialTypeCode,
                        MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
                        PrimaryUnit = wmsmaterial.PrimaryUnit,
                        Standard = wmsmaterial.Standard,
                        OuterDiameter = wmsmaterial.OuterDiameter,
@@ -281,6 +282,7 @@
                        IsMainBranch = wmsmaterial.IsMainBranch,
                        Factory = wmsmaterial.Factory,
                        Certification = wmsmaterial.Certification,
                        MaterialModel = wmsmaterial.MaterialModel,
                        Remark = wmsmaterial.Remark,
                    };

@@ -294,6 +296,7 @@
                        MaterialName = wmsmaterial.MaterialName,
                        PurchaseType = wmsmaterial.PurchaseType,
                        MaterialTypeCode = wmsmaterial.MaterialTypeCode,
                        MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
                        PrimaryUnit = wmsmaterial.PrimaryUnit,
                        Standard = wmsmaterial.Standard,
                        OuterDiameter = wmsmaterial.OuterDiameter,
@@ -301,6 +304,7 @@
                        MaterialQuality = wmsmaterial.MaterialQuality,
                        Length = wmsmaterial.Length,
                        IsMainBranch = wmsmaterial.IsMainBranch,
                        MaterialModel = wmsmaterial.MaterialModel,
                        Factory = wmsmaterial.Factory,
                        Certification = wmsmaterial.Certification,
                        Remark = wmsmaterial.Remark,