更新版本

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json

@@ -4,7 +4,7 @@
   },
   "ConnectionStrings": {
     "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
-    "SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=SettleAccountService;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;",
+    "SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
 
 
     

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs

@@ -7,6 +7,7 @@ namespace SettleAccount.Domain.BQ;
 [Display(Name = "BBAC可结算导入")]
 public class BBAC_CAN_SA:FullAuditedAggregateRoot<Guid>
 {
+
     [Display(Name = "期间")]
     public int Version { get; set; } 
 
@@ -26,6 +27,12 @@ public class BBAC_CAN_SA:FullAuditedAggregateRoot<Guid>
     /// </summary>
     [Display(Name = "明细记录行数")]
     public string InvGroupNum { get; set; } = null!;
+    public BBAC_CAN_SA()
+    {
+   
+    }
+
+
 
     public BBAC_CAN_SA(Guid guid, int version, string billNum, string settleBillNum, string state, string invGroupNum)
     {
@@ -117,6 +124,14 @@ public class BBAC_CAN_SA_DETAIL: SA_CAN_BASE
     //[Display(Name = "发票分组号")]
     //public string InvGroupNum { get; set; } = null!;
 
+    public BBAC_CAN_SA_DETAIL()
+    {
+        
+    }
+
+
+
+
     public BBAC_CAN_SA_DETAIL(Guid guid,string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string category, string isReturn, DateTime settleDate, string groupNum, string invGroupNum)
     {
         Id = guid;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_NOT_SA_DETAIL.cs

@@ -84,6 +84,12 @@ public class BBAC_NOT_SA_DETAIL:SA_NOT_BASE
     //[Display(Name = "结算分组")]
     //public string GroupNum { get; set; } = null!;
 
+
+    public BBAC_NOT_SA_DETAIL()
+    {
+       
+    }
+
     public BBAC_NOT_SA_DETAIL(Guid guid,  string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string category, string isReturn, string invGroupNum, DateTime settleDate, string groupNum)
     {
         Id = guid;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs

@@ -63,4 +63,9 @@ public class BBAC_PD_DETAIL:PD_BASE
         SettleDate = settleDate;
         GroupNum = groupNum;
     }
+
+    public BBAC_PD_DETAIL()
+    {
+        
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SA.cs

@@ -33,6 +33,12 @@ public class BBAC_SA:FullAuditedAggregateRoot<Guid>
         DNBillNum = dNBillNum;
         State = state;
     }
+    public BBAC_SA()
+    {
+       
+    }
+
+
 }
 [Display(Name = "BBAC结算导入明细")]
 
@@ -110,12 +116,12 @@ public class BBAC_SA_DETAIL:SA_BASE
     //[Display(Name = "结算分组")]
     //public string GroupNum { get; set; } = null!;
 
-        //[Display(Name = "发票分组号")]
-        //public string InvGroupNum { get; set; } = null!;
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
 
     public BBAC_SA_DETAIL(Guid p_guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string category, string isReturn, DateTime settleDate, string groupNum, string invGroupNum)
     {
-        Id= p_guid;
+        Id = p_guid;
         KeyCode = keyCode;
         Version = version;
         BillNum = billNum;
@@ -130,4 +136,9 @@ public class BBAC_SA_DETAIL:SA_BASE
         GroupNum = groupNum;
         //InvGroupNum = invGroupNum;
     }
+
+    public BBAC_SA_DETAIL()
+    {
+       
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_DETAIL.cs

@@ -58,4 +58,8 @@ public class BBAC_SE_DETAIL:SE_BASE
         ShippingDate = shippingDate;
         WmsBillNum = wmsBillNum;
     }
+    public BBAC_SE_DETAIL()
+    {
+        
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_EDI.cs

@@ -36,6 +36,8 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot<Guid>
     [Display(Name = "订货时间")]
     public DateTime BeginDate { get; set; }
 
+    public BBAC_SE_EDI()
+    { }
     public BBAC_SE_EDI(Guid guid,  string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate)
     {
         Id = guid;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_REPORT.cs

@@ -59,4 +59,8 @@ public class BBAC_SE_REPORT:FullAuditedAggregateRoot<Guid>
         ShippingDate = shippingDate;
         WmsBillNum = wmsBillNum;
     }
+
+    public BBAC_SE_REPORT()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_SA_REPORT.cs

@@ -75,4 +75,8 @@ public class BBAC_SE_SA_REPORT :FullAuditedAggregateRoot<Guid>
         FixPrice = fixPrice;
         Version = version;
     }
+
+    public BBAC_SE_SA_REPORT()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs

@@ -35,6 +35,10 @@ public class HBPO_CAN_SA :FullAuditedAggregateRoot<Guid>
         State = state;
         InvGroupNum = invGroupNum;
     }
+
+    public HBPO_CAN_SA()
+    {
+    }
 }
 [Display(Name = "HBPO可结算导入明细")]
 
@@ -120,5 +124,10 @@ public class HBPO_CAN_SA_DETAIL:SA_CAN_BASE
         GroupNum = groupNum;
         InvGroupNum = invGroupNum;
     }
+
+    public HBPO_CAN_SA_DETAIL()
+    {
+    }
 }
 
+

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_NOT_SA_DETAIL.cs

@@ -94,6 +94,9 @@ public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE
     //[Display(Name = "发票分组号")]
     //public string InvGroupNum { get; set; } = null!;
 
+
+
+
     public HBPO_NOT_SA_DETAIL(Guid guid ,string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum)
     {
         Id = guid;
@@ -109,4 +112,8 @@ public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE
         GroupNum = groupNum;
         InvGroupNum = invGroupNum;
     }
+
+    public HBPO_NOT_SA_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD_DETAIL.cs

@@ -62,4 +62,8 @@ public class HBPO_PD_DETAIL :PD_BASE
         SettleDate = settleDate;
         GroupNum = groupNum;
     }
+
+    public HBPO_PD_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs

@@ -38,6 +38,10 @@ public class HBPO_SA :FullAuditedAggregateRoot<Guid>
         State = state;
         RecordCount = recordCount;
     }
+
+    public HBPO_SA()
+    {
+    }
 }
 
 [Display(Name = "HBPO结算导入明细")]
@@ -108,6 +112,7 @@ public class HBPO_SA_DETAIL :SA_BASE
     [Display(Name = "发票分组号")]
     public string InvGroupNum { get; set; } = null!;
 
+
     public HBPO_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum)
     {
         this.Id= guid;
@@ -123,4 +128,8 @@ public class HBPO_SA_DETAIL :SA_BASE
         GroupNum = groupNum;
         InvGroupNum = invGroupNum;
     }
+
+    public HBPO_SA_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_DETAIL.cs

@@ -57,4 +57,8 @@ public class HBPO_SE_DETAIL :SE_BASE
         ShippingDate = shippingDate;
         WmsBillNum = wmsBillNum;
     }
+
+    public HBPO_SE_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_EDI.cs

@@ -49,4 +49,8 @@ public class HBPO_SE_EDI :FullAuditedAggregateRoot<Guid>
         Qty = qty;
         BeginDate = beginDate;
     }
+
+    public HBPO_SE_EDI()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_REPORT.cs

@@ -58,4 +58,8 @@ public class HBPO_SE_REPORT :FullAuditedAggregateRoot<Guid>
         ShippingDate = shippingDate;
         WmsBillNum = wmsBillNum;
     }
+
+    public HBPO_SE_REPORT()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_SA_REPORT.cs

@@ -99,4 +99,8 @@ public class HBPO_SE_SA_REPORT :RE_BASE
         FixPrice = fixPrice;
         Version = version;
     }
+
+    public HBPO_SE_SA_REPORT()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs

@@ -41,6 +41,10 @@ public class INVOICE_GRP : FullAuditedAggregateRoot<Guid>
         FileName = fileName;
         BusinessType = businessType;
     }
+
+    public INVOICE_GRP()
+    {
+    }
 }
 
 //[ShangWuShenHeGroup]

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_MAP_GROUP.cs

@@ -40,4 +40,8 @@ public class INVOICE_MAP_GROUP : FullAuditedAggregateRoot<Guid>
         Extend1 = extend1;
         Extend2 = extend2;
     }
+
+    public INVOICE_MAP_GROUP()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs

@@ -40,4 +40,8 @@ public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot<Guid>
         Extend1 = extend1;
         Extend2 = extend2;
     }
+
+    public INVOICE_NOT_SETTLE()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_WAIT_DETAIL.cs

@@ -62,4 +62,8 @@ public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot<Guid>
         Extend3 = extend3;
         Extend4 = extend4;
     }
+
+    public INVOICE_WAIT_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/JIT_SE_SA_REPORT.cs

@@ -101,4 +101,8 @@ public class JIT_SE_SA_REPORT :RE_BASE
         FixPrice = fixPrice;
         Version = version;
     }
+
+    public JIT_SE_SA_REPORT()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/M_PD_DETAIL.cs

@@ -45,5 +45,25 @@ public class M_PD_DETAIL : FullAuditedAggregateRoot<Guid>
     [Display(Name = "结算分组")]
     public string GroupNum { get; set; } = null!;
 
-   
+    public M_PD_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string groupNum)
+    {
+        Id = guid;
+        KeyCode = keyCode;
+        Version = version;
+        BillNum = billNum;
+        LU = lU;
+        RELU = rELU;
+        PN = pN;
+        REPN = rEPN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        InvGroupNum = invGroupNum;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+    }
+
+    public M_PD_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs

@@ -39,6 +39,10 @@ public class PUB_CAN_SA :FullAuditedAggregateRoot<Guid>
         BusinessType = businessType;
         InvGroupNum = invGroupNum;
     }
+
+    public PUB_CAN_SA()
+    {
+    }
 }
 [Display(Name = "PUB可结算导入明细")]
 public class PUB_CAN_SA_DETAIL : SA_CAN_BASE
@@ -128,4 +132,8 @@ public class PUB_CAN_SA_DETAIL : SA_CAN_BASE
         BusinessType = businessType;
         GroupNum = groupNum;
     }
+
+    public PUB_CAN_SA_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs

@@ -86,4 +86,8 @@ public class PUB_NOT_SA_DETAIL : SA_NOT_BASE
         BusinessType = businessType;
         GroupNum = groupNum;
     }
+
+    public PUB_NOT_SA_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD_DETAIL.cs

@@ -71,4 +71,8 @@ public class PUB_PD_DETAIL :PD_BASE
         SettleDate = settleDate;
         GroupNum = groupNum;
     }
+
+    public PUB_PD_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs

@@ -25,6 +25,10 @@ public class PUB_SA : FullAuditedAggregateRoot<Guid>
         BillNum = billNum;
         State = state;
     }
+
+    public PUB_SA()
+    {
+    }
 }
 [Display(Name = "公用结算导入明细")]
 public class PUB_SA_DETAIL:SA_BASE
@@ -118,4 +122,8 @@ public class PUB_SA_DETAIL:SA_BASE
         Extend3 = extend3;
         GroupNum = groupNum;
     }
+
+    public PUB_SA_DETAIL()
+    {
+    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs

@@ -64,4 +64,8 @@ public class PUB_SE_DETAIL :SE_BASE
         ShippingDate = shippingDate;
         WmsBillNum = wmsBillNum;
     }
+
+    public PUB_SE_DETAIL()
+    {
+    }
 }

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

@@ -65,7 +65,7 @@ namespace Win.Sfs.SettleAccount
             );
 
 
-            #region 派格结算
+            #region 北汽结算
 
 
 
@@ -133,7 +133,7 @@ namespace Win.Sfs.SettleAccount
             //有条码
             //builder.ConfigureWmsDetailWithCodeReport(options);
 
-            builder.ConfigureErrorBill(options);
+            //builder.ConfigureErrorBill(options);
 
             #endregion
 
@@ -141,152 +141,17 @@ namespace Win.Sfs.SettleAccount
 
 
 
-        #region 红旗M平台、一汽轿车
+     
 
 
+        #region 北汽
 
 
-        /// <summary>
-        /// M平台出库详表
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureErrorBill(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<ErrorBill>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_ErrorBill", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.CustomerMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.CustomerMaterialCode, x.BillNum });
-            });
-
-        }
-        #endregion
-
-
-        #region PG-派格
 
+      
 
 
-        private static void ConfigureWmsDetailReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsDetailReport>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_WmsDetailReport", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(50);//必填项
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(100);
-                b.Property(x => x.Client).IsRequired().HasMaxLength(50);
-                b.Property(x => x.ClientCode).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(150);
-
-                b.Property(x => x.MaterialGroup).HasMaxLength(50);
-                b.Property(x => x.MaterialGroupCode).HasMaxLength(50);
-                b.Property(x => x.SaleCode).HasMaxLength(50);
-                b.Property(x => x.SettleCode).HasMaxLength(50);
-                //创建组合索引
-
-
-            });
-        }
-        private static void ConfigureWmsDetailDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsDetailDiffReport>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_WmsDetailDiffReport", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(50);//必填项
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(100);
-                b.Property(x => x.Client).IsRequired().HasMaxLength(50);
-
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(150);
-
-                b.Property(x => x.MaterialGroup).HasMaxLength(50);
-                b.Property(x => x.MaterialGroupCode).HasMaxLength(50);
-
-                //创建组合索引
-
-
-            });
-        }
-
-        private static void ConfigureWmsDetailCancelReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsDetailCancelReport>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_WmsDetailCancelReport", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(50);//必填项
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(100);
-                b.Property(x => x.Client).IsRequired().HasMaxLength(50);
-
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(150);
-
-                b.Property(x => x.MaterialGroup).HasMaxLength(50);
-                b.Property(x => x.MaterialGroupCode).HasMaxLength(50);
-
-                //创建组合索引
-
-
-            });
-        }
-
-
-
-        /// <summary>
-        /// 有条码
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsDetailWithCodeReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsDetailWithCodeReport>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_WmsDetailWithCodeReport", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(50);//必填项
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(100);
-                b.Property(x => x.Client).IsRequired().HasMaxLength(50);
-
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(150);
-
-                b.Property(x => x.MaterialGroup).HasMaxLength(50);
-                b.Property(x => x.EstimateType).HasMaxLength(50);
-
-                //创建组合索引
-
-
-            });
-        }
-
-
+      
 
         /// <summary>
         /// 一汽轿车平台验收结算明细-导入
@@ -340,81 +205,81 @@ namespace Win.Sfs.SettleAccount
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureUnHQSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
+        //private static void ConfigureUnHQSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        //{
 
-            builder.Entity<UnHQSettleAccount>(b =>
-            {
+        //    builder.Entity<UnHQSettleAccount>(b =>
+        //    {
 
-                b.ToTable($"{options.TablePrefix}_UnHQSettleAccount", options.Schema);
+        //        b.ToTable($"{options.TablePrefix}_UnHQSettleAccount", options.Schema);
 
-                b.ConfigureByConvention();
-                //b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
-                b.Property(x => x.HQHKanBan).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.Property(x => x.AcceptanceNo).HasMaxLength(50);
+        //        b.ConfigureByConvention();
+        //        //b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+        //        b.Property(x => x.HQHKanBan).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.Property(x => x.AcceptanceNo).HasMaxLength(50);
 
-                //创建组合索引
-                //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+        //        //创建组合索引
+        //        //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
 
-            });
-        }
+        //    });
+        //}
 
         /// <summary>
         /// 红旗主机场-未结明细-版本
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureUnHQSettleAccountVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
+        //private static void ConfigureUnHQSettleAccountVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        //{
 
-            builder.Entity<UnHQSettleAccountVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_UnHQSettleAccountVersion", 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);
-            });
+        //    builder.Entity<UnHQSettleAccountVersion>(b =>
+        //    {
+        //        b.ToTable($"{options.TablePrefix}_UnHQSettleAccountVersion", 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>
         /// 大众发票汇总导入
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureInvoice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
+        //private static void ConfigureInvoice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        //{
 
-            builder.Entity<Invoice>(b =>
-            {
+        //    builder.Entity<Invoice>(b =>
+        //    {
 
-                b.ToTable($"{options.TablePrefix}_Invoice", options.Schema);
+        //        b.ToTable($"{options.TablePrefix}_Invoice", options.Schema);
 
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.Remark).HasMaxLength(1000);
+        //        b.ConfigureByConvention();
+        //        b.Property(x => x.Year).HasMaxLength(50);
+        //        b.Property(x => x.Period).HasMaxLength(50);
+        //        b.Property(x => x.Version).HasMaxLength(50);
+        //        b.Property(x => x.Factory).HasMaxLength(50);
+        //        b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空
+        //        b.Property(x => x.MaterialDesc).HasMaxLength(50);
+        //        b.Property(x => x.Remark).HasMaxLength(1000);
 
-            });
-        }
+        //    });
+        //}
         /// <summary>
         /// 大众发票汇总导入-版本
         /// </summary>
@@ -443,31 +308,31 @@ namespace Win.Sfs.SettleAccount
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_Settle", options.Schema);
-                b.ConfigureByConvention();
+        //private static void ConfigureSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        //{
+        //    builder.Entity<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(b =>
+        //    {
+        //        b.ToTable($"{options.TablePrefix}_Settle", options.Schema);
+        //        b.ConfigureByConvention();
 
-                b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
 
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-                b.Property(x => x.Model).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SettlementID).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.state });
-                b.HasIndex(x => new { x.Version, x.ChassisNumber, x.MaterialCode, x.KENNCode });
-            });
-        }
+        //        b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.Qty).IsRequired();
+        //        b.Property(x => x.Model).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.SettlementID).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+        //        //b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+        //        b.Property(x => x.Enabled);
+        //        b.HasIndex(x => new { x.state });
+        //        b.HasIndex(x => new { x.Version, x.ChassisNumber, x.MaterialCode, x.KENNCode });
+        //    });
+        //}
         /// <summary>
         /// 大众准时化结算明细导入-版本
         /// </summary>
@@ -1205,13 +1070,7 @@ namespace Win.Sfs.SettleAccount
 
 
     #endregion
-    #region 红旗
-
-
-
-
-
-    #endregion
+  
 
 }