H平台代码增加字段

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs

@@ -69,5 +69,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs

@@ -68,6 +68,26 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs

@@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs

@@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs

@@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BT_Car/BT_Car_PlatformAppService.cs

@@ -28,7 +28,7 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
     /// <summary>
     /// 一汽轿车平台导入
     /// </summary>
-    //[Authorize(SettleAccountPermissions.HQ_MPlatform.Default)]
+    //[Authorize(SettleAccountPermissions.BT_Carlatform.Default)]
     //[AllowAnonymous]
     [Route("api/settleaccount/BT_Carlatform")]
     public class BT_Car_PlatformAppService : SettleAccountApplicationBase<BT_Car_Platform>, IBT_Car_PlatformAppService

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

@@ -3030,6 +3030,11 @@
              <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,6 +86,7 @@ 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
 {
@@ -235,11 +236,38 @@ 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平台导入
         /// </summary>

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

@@ -67,11 +67,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         /// </summary>
         [Display(Name = "物料凭证号")]
         public string MaterialVoucherNo { get; set; }
-        ///// <summary>
+       
-        /////验收单号
-        ///// </summary>
-        //[Display(Name = "验收单号")]
-        //public string AcceptanceNo { get; set; }
         /// <summary>
         ///会计年度
         /// </summary>
@@ -124,24 +120,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         [Display(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [Display(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 数量
+        /// 数量
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "数量")]
+        [Display(Name = "数量")]
-        //public decimal Qty { set; get; }
+        public decimal Qty { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 单价
+        /// 单价
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "单价")]
+        [Display(Name = "单价")]
-        //public decimal Price { set; get; }
+        public decimal Price { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 金额
+        /// 金额
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "金额")]
+        [Display(Name = "金额")]
-        //public decimal Amt { set; get; }
+        public decimal Amt { set; get; }
 
 
         /// <summary>

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

@@ -72,6 +72,7 @@ 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
 {
@@ -319,9 +320,11 @@ namespace Win.Sfs.SettleAccount
             builder.ConfigureHQM(options);
             builder.ConfigureHQMVersion(options);
 
-            //一汽轿车
+            //派格一汽轿车
             builder.ConfigureBTCar(options);
             builder.ConfigureBTCarVersion(options);
+
+
             builder.ConfigureWmsJitOutPutDetail(options);
             builder.ConfigureWmsJitOutPutVersion(options);
             builder.ConfigureWmsJitOutPutDetail(options);
@@ -336,6 +339,55 @@ namespace Win.Sfs.SettleAccount
 
         #region PG-派格
 
+
+        /// <summary>
+        /// 一汽轿车平台验收结算明细-导入
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options"></param>
+        private static void ConfigureHQCar(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<HQ_Car_Platform>(b =>
+            {
+
+                b.ToTable($"{options.TablePrefix}_HQ_Car_Platform", options.Schema);
+
+                b.ConfigureByConvention();
+                b.Property(x => x.HQCarKanBan).HasMaxLength(150);//看板号（一汽轿车没有看板号）
+                b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
+                b.Property(x => x.Factory).HasMaxLength(50);
+                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
+                b.Property(x => x.ExternalKanbanNumber).HasMaxLength(50);
+                b.Property(x => x.KanbanNumber).HasMaxLength(150);//看板编号
+                b.Property(x => x.Period).HasMaxLength(50);
+                b.Property(x => x.Year).HasMaxLength(50);
+                b.Property(x => x.Version).HasMaxLength(50);
+                b.Property(x => x.Supplier).HasMaxLength(50);
+                b.Property(x => x.StorageLocation).HasMaxLength(50);
+                b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
+                //创建组合索引
+                b.HasIndex(x => new { x.Version, x.KanbanNumber, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+
+            });
+        }
+
+        private static void ConfigureHQCarVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<HQ_Car_PlatformVersion>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_HQ_Car_PlatformVersion", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
+            });
+
+        }
+
         /// <summary>
         /// 红旗工厂F平台验收结算明细-导入
         /// </summary>
@@ -398,7 +450,7 @@ namespace Win.Sfs.SettleAccount
                 b.ToTable($"{options.TablePrefix}_BT_Car_Platform", options.Schema);
 
                 b.ConfigureByConvention();
-                b.Property(x => x.BTCarKanBan).IsRequired().HasMaxLength(150);//必填项
+                b.Property(x => x.BTCarKanBan).HasMaxLength(150);//一汽轿车没有看板号，为空
                 b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
                 b.Property(x => x.Factory).HasMaxLength(50);
                 b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -416,6 +468,22 @@ namespace Win.Sfs.SettleAccount
             });
         }
 
+        private static void ConfigureBTCarVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<BT_Car_PlatformVersion>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_BT_Car_PlatformVersion", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
+                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
+            });
+
+        }
+
         /// <summary>
         /// 准时化出库明细
         /// </summary>
@@ -445,22 +513,6 @@ namespace Win.Sfs.SettleAccount
 
 
 
-        private static void ConfigureBTCarVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SparePartVersion>(b =>
-            {
-                //b.ToTable($"{options.TablePrefix}_BT_Car_PlatformVersion", options.Schema);
-                //b.ConfigureByConvention();
-                //b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
         /// <summary>
         /// 红旗工厂M平台验收结算明细-导入
         /// </summary>
@@ -535,6 +587,8 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.Supplier).HasMaxLength(50);
                 b.Property(x => x.StorageLocation).HasMaxLength(50);
                 b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
+                b.Property(x => x.AcceptanceNo).HasMaxLength(50);
+
                 //创建组合索引
                 b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
 

vue/src/router/modules/hq_menu.js

@@ -14,7 +14,7 @@ const hqMenudataRouter = {
     },
     children: [
         {
-            path: '/import-h-data',
+            path: '/H',
             name: 'import-h-data',//命名路由-二级
             component: () => import('@/views/ux/vw/dataInput/hq_h'),
             redirect: 'ux/vw/dataInput/hq_h',
@@ -47,7 +47,7 @@ const hqMenudataRouter = {
             ]
         },
         {
-            path: '/export-m-data',
+            path: '/M',
             component: () => import('@/views/ux/vw/dataInput/hq_m'),
             name: 'export-m-data',//命名路由
             redirect: '/ux/vw/dataInput/hq_m',
@@ -81,7 +81,7 @@ const hqMenudataRouter = {
             ]
         },
         {
-            path: '/export-f-data',
+            path: '/F',
             component: () => import('@/views/ux/vw/dataInput/hq_f'),
             name: 'export-f-data',//命名路由
             redirect: '/ux/vw/dataInput/hq_f',