From fff741d4569f3f328630814efabde891b0239e3f Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Mon, 31 Jul 2023 17:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Materials/MaterialDtoBase.cs     | 38 +++++++------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs
index b5805da9..04b7d24b 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs
@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
 using Win.Sfs.Shared;
 using Win.Sfs.Shared.Constant;
 using Win.Sfs.Shared.DtoBase;
@@ -276,37 +277,24 @@ namespace Win.Sfs.SettleAccount.Entities.Materials
         
     }
 
-    public class MaterialDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class MaterialDto : AuditedEntityDto<Guid>
     {
         /// <summary>
-        ///工厂
-        /// </summary>
-        public virtual string Factory { set; get; }
-        /// <summary>
-        /// 物料编码
-        /// </summary>
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        ///物料描述
-        /// </summary>
-        public virtual string MaterialDesc
-        {
-            set; get;
-        }
-        /// <summary>
-        /// 基础单位
-        /// </summary>
-        public virtual string Unit { set; get; }
-        /// <summary>
-        /// 估价类
+        /// 厂内物料号
         /// </summary>
-        public virtual string EstimateType { set; get; }
+        [ExporterHeader(DisplayName = "厂内物料号")]
+        public string MaterialCode { set; get; }
+
         /// <summary>
-        /// 估价类描述
+        /// 厂内物料描述
         /// </summary>
-        public virtual string EstimateTypeDesc { set; get; }
-        public Guid BranchId { get; set ; }
+        [ExporterHeader(DisplayName = "厂内物料描述")]
+        public string MaterialDesc { set; get; }
     }
+
     [ImportProject(Name = SettleAccountModuleName.Material)]
     public class MaterialImportDto 
     {