Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@@ -3030,11 +3030,6 @@
              <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
              <returns></returns>
         </member>
-        <member name="M:Win.Sfs.SettleAccount.SettleAccountApplicationAutoMapperProfile.CreateMapHQ_Car_Platform">
-            <summary>
-            一汽轿车平台导入
-            </summary>
-        </member>
         <member name="M:Win.Sfs.SettleAccount.SettleAccountApplicationAutoMapperProfile.CreateMapHQ_F_Platform">
             <summary>
             红旗F平台导入

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -86,7 +86,6 @@ using Win.Sfs.SettleAccount.Entities.WMSSparePart;
 using Win.Sfs.SettleAccount.Entities.HQ_H;
 using Win.Sfs.SettleAccount.Entities.HQ_M;
 using Win.Sfs.SettleAccount.Entities.HQ_F;
-using Win.Sfs.SettleAccount.Entities.HQ_Car;
 
 namespace Win.Sfs.SettleAccount
 {
@@ -236,37 +235,11 @@ namespace Win.Sfs.SettleAccount
             CreateMapHQ_F_Platform();
             CreateMapHQ_F_PlatformVersion();
 
-            //一汽轿车
-            CreateMapHQ_Car_Platform();
-            CreateMapHQ_Car_PlatformVersion();
-
             #endregion
         }
 
         #region PG-派格映射
 
-        /// <summary>
-        /// 一汽轿车平台导入
-        /// </summary>
-        private void CreateMapHQ_Car_Platform()
-
-        {
-            CreateMap<HQ_Car_Platform, HQ_Car_PlatformDto>().ReverseMap();
-            CreateMap<HQ_Car_Platform, HQ_Car_PlatformRequestDto>().ReverseMap();
-            CreateMap<HQ_Car_Platform, HQ_Car_PlatformImportDto>().ReverseMap();
-            CreateMap<HQ_Car_Platform, HQ_Car_PlatformExportDto>().ReverseMap();
-            CreateMap<HQ_Car_Platform, HQ_Car_PlatformExportDto>().ReverseMap();
-        }
-
-        private void CreateMapHQ_Car_PlatformVersion()
-
-        {
-            CreateMap<HQ_Car_PlatformVersion, HQ_Car_PlatformVersionDto>().ReverseMap();
-            CreateMap<HQ_Car_PlatformVersion, HQ_Car_PlatformVersionCreateDto>();
-            CreateMap<HQ_Car_PlatformVersion, HQ_Car_PlatformVersionUpdateDto>();
-            CreateMap<HQ_Car_PlatformVersionCreateDto, HQ_Car_PlatformVersion>();
-            CreateMap<HQ_Car_PlatformVersionUpdateDto, HQ_Car_PlatformVersion>();
-        }
 
         /// <summary>
         /// 红旗F平台导入

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs

@@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         public HQ_H_Platform(Guid Id,string materialVoucherNo,string externalKanbanNumber,
             string kanbanNumber, string year,string factory,DateTime acceptanceDate,
             string period, string version,string kanBan,string supplier,string storageLocation,string storageLocationDesc,
-            string materialCode) : base(Id)
+            string materialCode,string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id)
         {
             MaterialVoucherNo = materialVoucherNo;
             KanbanNumber = kanbanNumber;
@@ -39,8 +39,13 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
             Supplier = supplier;
             StorageLocation = storageLocation;
             StorageLocationDesc = storageLocationDesc;
+            AcceptanceNo = acceptanceNo;
+            Qty = qty;
+            Price = price;
+            Amt = amt;
         }
 
+
         //验收单号	外部单号	物料凭证号	物料凭证日期	物料凭证记账日期	看板编号	外部看板编号	物料号	物料描述	数量	单价	金额
         //工厂	备注	创建者	创建时间	修改人	修改时间	公司	验收单号	外部单号	发票号	会计年度	金额	计划员	存储地点	
         //存储地点描述	状态	验收单日期	供应商	录入人	录入人描述	看板号

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -72,7 +72,6 @@ using Win.Sfs.SettleAccount.Entities.HQ_M;
 using Win.Sfs.SettleAccount.Entities.BT_Car;
 using Win.Sfs.SettleAccount.Entities.WMS;
 using Win.Sfs.SettleAccount.Entities.HQ_F;
-using Win.Sfs.SettleAccount.Entities.HQ_Car;
 
 
 namespace Win.Sfs.SettleAccount