个更新版本

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@@ -58,6 +58,7 @@ namespace SettleAccount.Bases
         public string GroupNum { set; get; }
 
 
+
     }
 
     public interface ISA_CAN_BASE : ISBASE
@@ -128,7 +129,7 @@ namespace SettleAccount.Bases
 
     }
 
-    public class RE_BASE : IRE_BASE
+    public class RE_BASE :FullAuditedAggregateRoot<Guid>, IRE_BASE
     {
         /// 发货时间 
         /// </summary>
@@ -153,6 +154,9 @@ namespace SettleAccount.Bases
         /// 
         /// </summary>
         public string KeyCode { get; set ; }
+
+      
+      
     }
 
 
@@ -221,6 +225,12 @@ namespace SettleAccount.Bases
         /// </summary>
         public bool IsBom { set; get; }
 
+        public BASE_CONF(bool isRelationShip, bool isMaterial, bool isBom)
+        {
+            IsRelationShip = isRelationShip;
+            IsMaterial = isMaterial;
+            IsBom = isBom;
+        }
     }
 
     public class SA_BASE : FullAuditedAggregateRoot<Guid>, ISA_BASE
@@ -261,6 +271,19 @@ namespace SettleAccount.Bases
         /// 結算分組號
         /// </summary>
         public string GroupNum { get ; set ; }
+
+        //public SA_BASE(int version, decimal price, string billNum, DateTime settleDate, string lU, string pN, string keyCode, decimal qty, string groupNum)
+        //{
+        //    Version = version;
+        //    Price = price;
+        //    BillNum = billNum;
+        //    SettleDate = settleDate;
+        //    LU = lU;
+        //    PN = pN;
+        //    KeyCode = keyCode;
+        //    Qty = qty;
+        //    GroupNum = groupNum;
+        //}
     }
 
     public class SA_CAN_BASE : FullAuditedAggregateRoot<Guid>, ISA_CAN_BASE
@@ -305,6 +328,20 @@ namespace SettleAccount.Bases
         /// 結算分組號
         /// </summary>
         public string GroupNum { get; set; }
+
+        //public SA_CAN_BASE(int version, decimal price, string billNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum)
+        //{
+        //    Version = version;
+        //    Price = price;
+        //    BillNum = billNum;
+        //    SettleDate = settleDate;
+        //    InvGroupNum = invGroupNum;
+        //    LU = lU;
+        //    PN = pN;
+        //    KeyCode = keyCode;
+        //    Qty = qty;
+        //    GroupNum = groupNum;
+        //}
     }
     public class SA_NOT_BASE : FullAuditedAggregateRoot<Guid>, ISA_NOT_BASE
     {
@@ -348,6 +385,20 @@ namespace SettleAccount.Bases
         /// 結算分組號
         /// </summary>
         public string GroupNum { get; set; }
+
+        //public SA_NOT_BASE(decimal price, int version, string settleBillNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum)
+        //{
+        //    Price = price;
+        //    Version = version;
+        //    SettleBillNum = settleBillNum;
+        //    SettleDate = settleDate;
+        //    InvGroupNum = invGroupNum;
+        //    LU = lU;
+        //    PN = pN;
+        //    KeyCode = keyCode;
+        //    Qty = qty;
+        //    GroupNum = groupNum;
+        //}
     }
 
 

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

@@ -84,8 +84,10 @@ public class BBAC_NOT_SA_DETAIL:SA_NOT_BASE
     //[Display(Name = "结算分组")]
     //public string GroupNum { get; set; } = null!;
 
-    public BBAC_NOT_SA_DETAIL(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)
+    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;
+
         KeyCode = keyCode;
         Version = version;
         SettleBillNum = settleBillNum;

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

@@ -25,8 +25,9 @@ public class BBAC_SA:FullAuditedAggregateRoot<Guid>
     [Display(Name = "状态")]
     public string State { get; set; } = null!;
 
-    public BBAC_SA(int version, string billNum, string dNBillNum, string state)
+    public BBAC_SA(Guid guid, int version, string billNum, string dNBillNum, string state)
     {
+        Id = guid;
         Version = version;
         BillNum = billNum;
         DNBillNum = dNBillNum;
@@ -112,8 +113,9 @@ public class BBAC_SA_DETAIL:SA_BASE
         //[Display(Name = "发票分组号")]
         //public string InvGroupNum { get; set; } = null!;
 
-    public BBAC_SA_DETAIL(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)
+    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;
         KeyCode = keyCode;
         Version = version;
         BillNum = billNum;

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

@@ -43,8 +43,9 @@ public class BBAC_SE_DETAIL:SE_BASE
     //[Display(Name = "Wms发货单号")]
     //public string WmsBillNum { get; set; } = null!;
 
-    public BBAC_SE_DETAIL(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
+    public BBAC_SE_DETAIL(Guid guid,   string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
+        Id= guid;
         KeyCode = keyCode;
         Version = version;
         LU = lU;

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

@@ -36,8 +36,10 @@ public class BBAC_SE_EDI:FullAuditedAggregateRoot<Guid>
     [Display(Name = "订货时间")]
     public DateTime BeginDate { get; set; }
 
-    public BBAC_SE_EDI(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate)
+    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;
+
         KeyCode = keyCode;
         Version = version;
         LU = lU;

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

@@ -42,8 +42,10 @@ public class BBAC_SE_REPORT:FullAuditedAggregateRoot<Guid>
     [Display(Name = "Wms发货单号")]
     public string WmsBillNum { get; set; } = null!;
 
-    public BBAC_SE_REPORT(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, decimal eDIQty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
+    public BBAC_SE_REPORT(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, decimal eDIQty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
+        Id = guid;
+
         KeyCode = keyCode;
         Version = version;
         LU = lU;

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

@@ -1,11 +1,10 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-
-
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace SettleAccount.Domain.BQ;
 [Display(Name = "BBAC发运数据与结算数据对比实体")]
-public class BBAC_SE_SA_REPORT 
+public class BBAC_SE_SA_REPORT :FullAuditedAggregateRoot<Guid>
 {
 
     [Display(Name = "LU+ASN单号")]
@@ -53,8 +52,9 @@ public class BBAC_SE_SA_REPORT
     [Display(Name = "期间")]
     public int Version { get; set; }
 
-    public BBAC_SE_SA_REPORT(string keyCode, string category, string wmsBillNum, DateTime shippingDate, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, string lU, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version)
+    public BBAC_SE_SA_REPORT(Guid guid,  string keyCode, string category, string wmsBillNum, DateTime shippingDate, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, string lU, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version)
     {
+        Id = guid;
         KeyCode = keyCode;
         Category = category;
         WmsBillNum = wmsBillNum;

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

@@ -1,9 +1,11 @@
 using SettleAccount.Bases;
 using System;
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
 namespace SettleAccount.Domain.BQ;
 [Display(Name = "HBPO可结算导入")]
-public class HBPO_CAN_SA 
+public class HBPO_CAN_SA :FullAuditedAggregateRoot<Guid>
 {
     [Display(Name = "期间")]
     public int Version { get; set; } 
@@ -25,7 +27,7 @@ public class HBPO_CAN_SA
     [Display(Name = "明细记录行数")]
     public string InvGroupNum { get; set; } = null!;
 
-    public HBPO_CAN_SA(int version, string settleBillNum, string billNum, string state, string invGroupNum)
+    public HBPO_CAN_SA(Guid guid, int version, string settleBillNum, string billNum, string state, string invGroupNum)
     {
         Version = version;
         SettleBillNum = settleBillNum;
@@ -102,9 +104,9 @@ public class HBPO_CAN_SA_DETAIL:SA_CAN_BASE
     //[Display(Name = "发票分组号")]
     //public string InvGroupNum { get; set; } = null!;
 
-    public HBPO_CAN_SA_DETAIL(Guid id ,string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum)
+    public HBPO_CAN_SA_DETAIL(Guid guid ,string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum)
     {
-        Id = id;
+        Id = guid;
         KeyCode = keyCode;
         Version = version;
         BillNum = billNum;

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

@@ -94,8 +94,9 @@ public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE
     //[Display(Name = "发票分组号")]
     //public string InvGroupNum { get; set; } = null!;
 
-    public HBPO_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum)
+    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;
         KeyCode = keyCode;
         Version = version;
         SettleBillNum = settleBillNum;

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

@@ -45,8 +45,9 @@ public class HBPO_PD_DETAIL :PD_BASE
     //[Display(Name = "结算分组")]
     //public string GroupNum { get; set; } = null!;
 
-    public HBPO_PD_DETAIL(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)
+    public HBPO_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;

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

@@ -29,8 +29,9 @@ public class HBPO_SA :FullAuditedAggregateRoot<Guid>
     [Display(Name = "明细记录行数")]
     public string RecordCount { get; set; } = null!;
 
-    public HBPO_SA(int version, string billNum, string dNBillNum, string state, string recordCount)
+    public HBPO_SA(Guid guid,  int version, string billNum, string dNBillNum, string state, string recordCount)
     {
+        this.Id= guid;
         Version = version;
         BillNum = billNum;
         DNBillNum = dNBillNum;
@@ -107,8 +108,9 @@ public class HBPO_SA_DETAIL :SA_BASE
     [Display(Name = "发票分组号")]
     public string InvGroupNum { get; set; } = null!;
 
-    public HBPO_SA_DETAIL(string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, DateTime settleDate, string groupNum, string invGroupNum)
+    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;
         KeyCode = keyCode;
         Version = version;
         BillNum = billNum;

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

@@ -42,8 +42,9 @@ public class HBPO_SE_DETAIL :SE_BASE
     //[Display(Name = "Wms发货单号")]
     //public string WmsBillNum { get; set; } = null!;
 
-    public HBPO_SE_DETAIL(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
+    public HBPO_SE_DETAIL(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
+        this.Id = guid;
         KeyCode = keyCode;
         Version = version;
         LU = lU;

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

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

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

@@ -42,8 +42,9 @@ public class HBPO_SE_REPORT :FullAuditedAggregateRoot<Guid>
     [Display(Name = "Wms发货单号")]
     public string WmsBillNum { get; set; } = null!;
 
-    public HBPO_SE_REPORT(string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, decimal eDIQty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
+    public HBPO_SE_REPORT(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, decimal eDIQty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
+        Id = guid;
         KeyCode = keyCode;
         Version = version;
         LU = lU;

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

@@ -79,8 +79,9 @@ public class HBPO_SE_SA_REPORT :RE_BASE
     [Display(Name = "期间")]
     public int Version { get; set; }
 
-    public HBPO_SE_SA_REPORT(string keyCode, string category, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version)
+    public HBPO_SE_SA_REPORT(Guid guid, string keyCode, string category, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version)
     {
+        Id = guid;
         KeyCode = keyCode;
         Category = category;
       

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

@@ -30,8 +30,9 @@ public class INVOICE_GRP : FullAuditedAggregateRoot<Guid>
     [Display(Name = "业务类别")]
     public string BusinessType { get; set; } = null!;
 
-    public INVOICE_GRP(string realnvBillNum, string invbillNum, decimal amt, decimal taxAmt, string invGroupNum, string fileName, string businessType)
+    public INVOICE_GRP(Guid guid, string realnvBillNum, string invbillNum, decimal amt, decimal taxAmt, string invGroupNum, string fileName, string businessType)
     {
+        Id= guid;
         RealnvBillNum = realnvBillNum;
         InvbillNum = invbillNum;
         Amt = amt;

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

@@ -29,5 +29,15 @@ public class INVOICE_MAP_GROUP : FullAuditedAggregateRoot<Guid>
     [Display(Name = "扩展字段2")]
     public string Extend2 { get; set; } = null!;
 
-    
+    public INVOICE_MAP_GROUP(Guid guid,  int version, string invbillNum, string invGroupNum, string settleGroupNum, decimal amt, string extend1, string extend2)
+    {
+        Id = guid;
+        Version = version;
+        InvbillNum = invbillNum;
+        InvGroupNum = invGroupNum;
+        SettleGroupNum = settleGroupNum;
+        Amt = amt;
+        Extend1 = extend1;
+        Extend2 = extend2;
+    }
 }

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

@@ -29,8 +29,9 @@ public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot<Guid>
     [Display(Name = "扩展字段2")]
     public string Extend2 { get; set; } = null!;
 
-    public INVOICE_NOT_SETTLE(int version, string invGroupNum, string settleGroupNum, string lU, string lU1, string extend1, string extend2)
+    public INVOICE_NOT_SETTLE(Guid guid, int version, string invGroupNum, string settleGroupNum, string lU, string lU1, string extend1, string extend2)
     {
+        Id = guid;
         Version = version;
         InvGroupNum = invGroupNum;
         SettleGroupNum = settleGroupNum;

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

@@ -46,8 +46,9 @@ public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot<Guid>
     [Display(Name = "扩展字段4")]
     public string Extend4 { get; set; } = null!;
 
-    public INVOICE_WAIT_DETAIL(int version, string invbillNum, string invGroupNum, string lU, decimal pRICE, decimal qty, decimal amt, string bussiessType, string extend1, string extend2, string extend3, string extend4)
+    public INVOICE_WAIT_DETAIL(Guid guid, int version, string invbillNum, string invGroupNum, string lU, decimal pRICE, decimal qty, decimal amt, string bussiessType, string extend1, string extend2, string extend3, string extend4)
     {
+        Id = guid;
         Version = version;
         InvbillNum = invbillNum;
         InvGroupNum = invGroupNum;

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

@@ -1,14 +1,14 @@
-using System;
+using SettleAccount.Bases;
+using System;
 using System.ComponentModel.DataAnnotations;
-
-
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace SettleAccount.Domain.BQ;
 [Display(Name = "JIT发运数据与结算数据对比实体")]
-public class JIT_SE_SA_REPORT 
+public class JIT_SE_SA_REPORT :RE_BASE
 {
-    [Display(Name = "LU+ASN单号")]
-    public string KeyCode { get; set; } = null!;
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
 
     /// <summary>
     /// 有结算无发货（无EDI数据)
@@ -24,14 +24,14 @@ public class JIT_SE_SA_REPORT
     [Display(Name = "类别")]
     public string Category { get; set; } = null!;
 
-    [Display(Name = "Wms发货单号")]
-    public string WmsBillNum { get; set; } = null!;
+    //[Display(Name = "Wms发货单号")]
+    //public string WmsBillNum { get; set; } = null!;
 
-    [Display(Name = "发货时间")]
-    public DateTime ShippingDate { get; set; }
+    //[Display(Name = "发货时间")]
+    //public DateTime ShippingDate { get; set; }
 
-    [Display(Name = "生产码")]
-    public string PN { get; set; } = null!;
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
 
     [Display(Name = "日顺序号")]
     public string SeqNumber { get; set; } = null!;
@@ -45,8 +45,8 @@ public class JIT_SE_SA_REPORT
     [Display(Name = "物料描述")]
     public string MaterialDes { get; set; } = null!;
 
-    [Display(Name = "零件号")]
-    public string LU { get; set; } = null!;
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
 
     /// <summary>
     /// 结算数据中的过账日期
@@ -78,8 +78,9 @@ public class JIT_SE_SA_REPORT
     [Display(Name = "期间")]
     public int Version { get; set; }
 
-    public JIT_SE_SA_REPORT(string keyCode, string category, string wmsBillNum, DateTime shippingDate, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, string lU, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version)
+    public JIT_SE_SA_REPORT(Guid guid , string keyCode, string category, string wmsBillNum, DateTime shippingDate, string pN, string seqNumber, string pJISSeqNumber, string materialNumber, string materialDes, string lU, DateTime customerOfflineTime, string assemblyCode, string injectionCode, decimal sEQty, decimal wMSQty, decimal eDIQty, string mateType, decimal fixPrice, int version)
     {
+        Id = guid;
         KeyCode = keyCode;
         Category = category;
         WmsBillNum = wmsBillNum;

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

@@ -1,445 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-
-
-namespace SettleAccount.Domain.BQ;
-
-[Display(Name = "物料主数据")]
-public class Material
-{
-}
-
-//[Order(8)]
-//[SystemManagement]
-//[Display(Name = "客户零件关系")]
-//public class Class2 : BaseEntity
-//{
-//}
-
-//[Order(9)]
-//[SystemManagement]
-//[Display(Name = "客户端替换件关系")]
-//public class Class3 : BaseEntity
-//{
-//}
-
-//[Order(10)]
-//[SystemManagement]
-//[Display(Name = "寄售库出库总成替换关系")]
-//public class Class4 : BaseEntity
-//{
-//}
-
-//[Order(11)]
-//[SystemManagement]
-//[Display(Name = "期间设置")]
-//public class Class5 : BaseEntity
-//{
-//}
-
-//[Order(12)]
-//[SystemManagement]
-//[Display(Name = "销售价格单")]
-//public class TB_PRICE_LIST : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[Display(Name = "EDI业务")]
-//public class EdiAttribute : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//[Edi]
-//[Display(Name = "EDI和HBPO核对")]
-//public class Class7 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[Edi]
-//[Display(Name = "EDI和BBAC核对")]
-//public class Class8 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[Display(Name = "JIS业务")]
-//public class JISModule : BaseModule
-//{
-//}
-
-//[Order(1)]
-//[Module<JISModule>]
-//[Display(Name = "数据输入")]
-//public class JISDataInputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(2)]
-//[Module<JISModule>]
-//[Display(Name = "数据输出")]
-//public class JISDataOutputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//
-//[Display(Name = "HBPO结算导入")]
-//public class Class9 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//
-//[Display(Name = "BBAC结算导入")]
-//public class Class10 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//
-//[Display(Name = "HBPO发运数据")]
-//public class Class11 : BaseEntity
-//{
-//}
-
-//[Order(4)]
-//
-//[Display(Name = "BBAC发运数据")]
-//public class Class12 : BaseEntity
-//{
-//}
-
-//[Order(1)]
-//[JISDataOutput]
-//[Display(Name = "HBPO结算核对明细输出")]
-//public class Class13 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[JISDataOutput]
-//[Display(Name = "BBAC结算核对明细输出")]
-//public class Class14 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//[JISDataOutput]
-//[Display(Name = "HBPO无法出库明细与汇总输出")]
-//public class Class15 : BaseEntity
-//{
-//}
-
-//[Order(4)]
-//[JISDataOutput]
-//[Display(Name = "BBAC无法出库明细与汇总输出")]
-//public class Class16 : BaseEntity
-//{
-//}
-
-//[Order(5)]
-//[JISDataOutput]
-//[Display(Name = "HBPO结算发货明细与汇总")]
-//public class Class17 : BaseEntity
-//{
-//}
-
-//[Order(6)]
-//[JISDataOutput]
-//[Display(Name = "BBAC结算发货明细与汇总")]
-//public class Class18 : BaseEntity
-//{
-//}
-
-/////
-
-//[Order(3)]
-//[Display(Name = "JIT业务")]
-//public class JITModule : BaseModule
-//{
-//}
-
-//[Order(1)]
-//[Module<JITModule>]
-//[Display(Name = "数据输入")]
-//public class JITDataInputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(2)]
-//[Module<JITModule>]
-//[Display(Name = "数据输出")]
-//public class JITDataOutputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//[JITDataInput]
-//[Display(Name = "JIT件结算导入")]
-//public class Class19 : BaseEntity
-//{
-//}
-//IResource
-//[Order(2)]
-//[JITDataInput]
-//[Display(Name = "JIT发运数据查询")]
-//public class Class20 : BaseEntity
-//{
-//}
-
-//[Order(1)]
-//[JITDataOutput]
-//[Display(Name = "JIT件结算核对明细输出")]
-//public class Class21 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[JITDataOutput]
-//[Display(Name = "JIT件寄售库不能出库明细与汇总")]
-//public class Class22 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//[JITDataOutput]
-//[Display(Name = "JIT件结算发货明细与汇总")]
-//public class Class23 : BaseEntity
-//{
-//}
-
-/////
-
-//[Order(4)]
-//[Display(Name = "备件业务")]
-//public class BeiJianModule : BaseModule
-//{
-//}
-
-//[Order(1)]
-//[Module<BeiJianModule>]
-//[Display(Name = "数据输入")]
-//public class BeiJianDataInputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(2)]
-//[Module<BeiJianModule>]
-//[Display(Name = "数据输出")]
-//public class BeiJianDataOutputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//[BeiJianDataInput]
-//[Display(Name = "备件结算导入")]
-//public class Class24 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[BeiJianDataInput]
-//[Display(Name = "备件发运数据查询")]
-//public class Class25 : BaseEntity
-//{
-//}
-
-//[Order(1)]
-//[BeiJianDataOutput]
-//[Display(Name = "备件结算核对明细输出")]
-//public class Class26 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[BeiJianDataOutput]
-//[Display(Name = "备件寄售库不能出库明细与汇总输出")]
-//public class Class27 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//[BeiJianDataOutput]
-//[Display(Name = "备件有结算有发货明细与汇总输出")]
-//public class Class28 : BaseEntity
-//{
-//}
-
-//[Order(4)]
-//[BeiJianDataOutput]
-//[Display(Name = "备件有结算无发货明细与汇总输出")]
-//public class Class29 : BaseEntity
-//{
-//}
-
-/////
-
-//[Order(5)]
-//[Display(Name = "备件业务")]
-//public class MaiDanJianModule : BaseModule
-//{
-//}
-
-//[Order(1)]
-//[Module<MaiDanJianModule>]
-//[Display(Name = "数据输入")]
-//public class MaiDanJianDataInputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(2)]
-//[Module<MaiDanJianModule>]
-//[Display(Name = "数据输出")]
-//public class MaiDanJianDataOutputAttribute : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//
-//[Display(Name = "印度件结算导入")]
-//public class Class30 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//
-//[Display(Name = "印度件发运数据查询")]
-//public class Class31 : BaseEntity
-//{
-//}
-
-//[Order(1)]
-//[MaiDanJianDataOutput]
-//[Display(Name = "印度件结算核对明细输出")]
-//public class Class32 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[MaiDanJianDataOutput]
-//[Display(Name = "印度件寄售库不能出库明细与汇总输出")]
-//public class Class33 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//[MaiDanJianDataOutput]
-//[Display(Name = "印度件有结算有发货明细与汇总输出")]
-//public class Class34 : BaseEntity
-//{
-//}
-
-//[Order(4)]
-//[MaiDanJianDataOutput]
-//[Display(Name = "印度件有结算无发货明细与汇总输出")]
-//public class Class35 : BaseEntity
-//{
-//}
-
-//////
-//[Order(6)]
-//[Display(Name = "出库单")]
-//public class ChuKuDanGroup : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//[ChuKuDanGroup]
-//[Display(Name = "HBPO-JIS出库单")]
-//public class Class36 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[ChuKuDanGroup]
-//[Display(Name = "BBAC-JIS出库单")]
-//public class Class37 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//[ChuKuDanGroup]
-//[Display(Name = "JIT件件出库单")]
-//public class Class38 : BaseEntity
-//{
-//}
-
-//[Order(4)]
-//[ChuKuDanGroup]
-//[Display(Name = "备件出库单")]
-//public class Class39 : BaseEntity
-//{
-//}
-
-//[Order(5)]
-//[ChuKuDanGroup]
-//[Display(Name = "印度件出库单")]
-//public class Class40 : BaseEntity
-//{
-//}
-
-//[Order(6)]
-//[ChuKuDanGroup]
-//[Display(Name = "不能出库记录出库业务")]
-//public class Class41 : BaseEntity
-//{
-//}
-
-//////
-//[Order(7)]
-//[Display(Name = "商务审核")]
-//public class ShangWuShenHeGroup : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//[ShangWuShenHeGroup]
-//[Display(Name = "HBPO-JIS 商务待开票")]
-//public class Class42 : BaseEntity
-//{
-//}
-
-//[Order(2)]
-//[ShangWuShenHeGroup]
-//[Display(Name = "BBAC-JIS商务待开票")]
-//public class Class43 : BaseEntity
-//{
-//}
-
-//[Order(3)]
-//[ShangWuShenHeGroup]
-//[Display(Name = "JIT件商务发票待开票")]
-//public class Class44 : BaseEntity
-//{
-//}
-
-//[Order(4)]
-//[ShangWuShenHeGroup]
-//[Display(Name = "备件商务发票待开票")]
-//public class Class45 : BaseEntity
-//{
-//}
-
-//[Order(5)]
-//[ShangWuShenHeGroup]
-//[Display(Name = "印度件商务发票待开票")]
-//public class Class46 : BaseEntity
-//{
-//}
-
-//////
-//[Order(7)]
-//[Display(Name = "财务审核")]
-//public class CaiWuShenHeGroup : GroupAttribute
-//{
-//}
-
-//[Order(1)]
-//[CaiWuShenHeGroup]
-//[Display(Name = " BBAC-JIS财务管理审核")]
-//public class Class47 : BaseEntity
-//{
-//}

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

@@ -1,11 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-
-
-namespace SettleAccount.Domain.BQ;
-
-
-[Display(Name = "客户零件关系")]
-public class MaterialRelationship 
-{
-}

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

@@ -109,8 +109,8 @@ public class PUB_CAN_SA_DETAIL : SA_CAN_BASE
     /// <summary>
     /// 对应字段DeliveryNode
     /// </summary>
-    [Display(Name = "结算分组")]
-    public string GroupNum { get; set; } = null!;
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
 
     public PUB_CAN_SA_DETAIL(string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string businessType, string groupNum)
     {

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

@@ -1,9 +1,6 @@
 using SettleAccount.Bases;
 using System;
 using System.ComponentModel.DataAnnotations;
-
-
-
 namespace SettleAccount.Domain.BQ;
 
 [Display(Name = "PUB不可结算导入明细")]

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

@@ -53,8 +53,9 @@ public class PUB_PD_DETAIL :PD_BASE
     //[Display(Name = "结算分组")]
     //public string GroupNum { get; set; } = null!;
 
-    public PUB_PD_DETAIL(string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string businessType, string invGroupNum, DateTime settleDate, string groupNum)
+    public PUB_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 businessType, string invGroupNum, DateTime settleDate, string groupNum)
     {
+        Id = guid;
         KeyCode = keyCode;
         Version = version;
         BillNum = billNum;

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

@@ -19,7 +19,7 @@ public class PUB_SA : FullAuditedAggregateRoot<Guid>
     [Display(Name = "状态")]
     public string State { get; set; } = null!;
 
-    public PUB_SA(int version, string billNum, string state)
+    public PUB_SA(Guid guid,  int version, string billNum, string state)
     {
         Version = version;
         BillNum = billNum;
@@ -100,8 +100,9 @@ public class PUB_SA_DETAIL:SA_BASE
     //[Display(Name = "结算分组")]
     //public string GroupNum { get; set; } = null!;
 
-    public PUB_SA_DETAIL(string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string extend1, string extend2, string extend3, string groupNum)
+    public PUB_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string extend1, string extend2, string extend3, string groupNum)
     {
+        Id=guid;
         KeyCode = keyCode;
         Version = version;
         BillNum = billNum;

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

@@ -48,8 +48,9 @@ public class PUB_SE_DETAIL :SE_BASE
     //[Display(Name = "Wms发货单号")]
     //public string WmsBillNum { get; set; } = null!;
 
-    public PUB_SE_DETAIL(string keyCode, int version, string lU, string pN, decimal qty, string extend1, string extend2, string extend3, string businessType, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
+    public PUB_SE_DETAIL(Guid guid,  string keyCode, int version, string lU, string pN, decimal qty, string extend1, string extend2, string extend3, string businessType, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
+        Id=guid;
         KeyCode = keyCode;
         Version = version;
         LU = lU;

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

@@ -1,36 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-
-
-namespace SettleAccount.Domain.BQ;
-
-
-[Display(Name = "备件价格表")]
-
-public class TB_PRICE_BJ 
-{
-    /// <summary>
-    /// 取值字段【零件号】
-    /// </summary>
-    [Display(Name = "零件号")]
-    public string LU { get; set; } = null!;
-
-    /// <summary>
-    /// 取值字段【零件价格】
-    /// </summary>
-    [Display(Name = "价格")]
-    public decimal Price { get; set; }
-
-    /// <summary>
-    /// 取值字段【客户编码】
-    /// </summary>
-    [Display(Name = "客户编码")]
-    public string ClientCode { get; set; } = null!;
-
-    public TB_PRICE_BJ(string lU, decimal price, string clientCode)
-    {
-        LU = lU;
-        Price = price;
-        ClientCode = clientCode;
-    }
-}

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

@@ -1,52 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-
-
-namespace SettleAccount.Domain.BQ;
-
-[Display(Name = "销售价格单")]
-public class TB_PRICE_LIST
-{
-    /// <summary>
-    /// 取值字段Part No.
-    /// </summary>
-    [Display(Name = "零件号")]
-    public string LU { get; set; } = null!;
-
-    /// <summary>
-    /// 取值字段Total Price
-    /// </summary>
-    [Display(Name = "价格")]
-    public decimal Price { get; set; }
-
-    /// <summary>
-    /// 取值字段Valid From
-    /// </summary>
-    [Display(Name = "开始时间")]
-    public DateTime BeginTime { get; set; }
-
-    /// <summary>
-    /// 取值字段Valid To
-    /// </summary>
-    [Display(Name = "结束时间")]
-    public DateTime EndTime { get; set; }
-
-    /// <summary>
-    /// 取值字段Plant取值字段1040=BBAC奔驰亦庄，1046=BBAC奔驰顺义，104T=HBPO
-    /// </summary>
-    [Display(Name = "客户编码")]
-    public string ClientCode { get; set; } = null!;
-    [Display(Name = "业务列别")]
-    public string BusinessType { get; set; } = null!;
-
-    public TB_PRICE_LIST(string lU, decimal price, DateTime beginTime, DateTime endTime, string clientCode, string businessType)
-    {
-        LU = lU;
-        Price = price;
-        BeginTime = beginTime;
-        EndTime = endTime;
-        ClientCode = clientCode;
-        BusinessType = businessType;
-    }
-}

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

@@ -44,6 +44,7 @@ using Win.Sfs.SettleAccount.Entities.SecMatch;
 
 using Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts;
 using Win.Sfs.SettleAccount.Errors;
+using SettleAccount.Domain.BQ;
 
 namespace Win.Sfs.SettleAccount
 {
@@ -122,7 +123,7 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.CustomerMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
 
                 b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.CustomerMaterialCode,x.BillNum });
+                b.HasIndex(x => new { x.CustomerMaterialCode, x.BillNum });
             });
 
         }
@@ -152,7 +153,7 @@ namespace Win.Sfs.SettleAccount
 
                 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.SaleCode).HasMaxLength(50);
                 b.Property(x => x.SettleCode).HasMaxLength(50);
                 //创建组合索引
 
@@ -447,15 +448,88 @@ namespace Win.Sfs.SettleAccount
 
         }
 
+        private static void ConfigureBBAC_CAN_SA(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<BBAC_CAN_SA>(b =>
+            {
+
+                b.ToTable($"{options.TablePrefix}_BBAC_CAN_SA", options.Schema);
+
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).HasMaxLength(50);
+                b.Property(x => x.SettleBillNum).HasMaxLength(50);
+                b.Property(x => x.State).HasMaxLength(50);
+                b.Property(x => x.InvGroupNum).HasMaxLength(50);
+                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
+            });
+
+        }
+
+        private static void ConfigureBBAC_CAN_SA_DETAIL(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<BBAC_CAN_SA_DETAIL>(b =>
+            {
+
+                b.ToTable($"{options.TablePrefix}_BBAC_CAN_SA_DETAIL", options.Schema);
+
+                b.ConfigureByConvention();
+                b.Property(x => x.SettleBillNum).HasMaxLength(50);
+                b.Property(x => x.Site).HasMaxLength(50);
+                b.Property(x => x.Category).HasMaxLength(50);
+                b.Property(x => x.IsReturn).HasMaxLength(50);
+                b.Property(x => x.BillNum).HasMaxLength(50);
+                b.Property(x => x.InvGroupNum).HasMaxLength(50);
+                b.Property(x => x.LU).HasMaxLength(50);
+                b.Property(x => x.PN).HasMaxLength(50);
+                b.Property(x => x.KeyCode).HasMaxLength(50);
+                b.Property(x => x.GroupNum).HasMaxLength(50);
+                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
+            });
+        }
+        private static void ConfigureBBAC_PD_DETAIL(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<BBAC_PD_DETAIL>(b =>
+            {
+
+                b.ToTable($"{options.TablePrefix}_BBAC_PD_DETAIL", options.Schema);
+
+                b.ConfigureByConvention();
+                b.Property(x => x.Site).HasMaxLength(50);
+                b.Property(x => x.BillNum).HasMaxLength(50);
+                b.Property(x => x.InvGroupNum).HasMaxLength(50);
+                b.Property(x => x.GroupNum).HasMaxLength(50);
+                b.Property(x => x.LU).HasMaxLength(50);
+                b.Property(x => x.PN).HasMaxLength(50);
+                b.Property(x => x.RELU).HasMaxLength(50);
+                b.Property(x => x.REPN).HasMaxLength(50);
+                b.Property(x => x.KeyCode).HasMaxLength(50);
+                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
+            });
         }
 
 
 
 
-        #endregion
 
     }
 
 
 
 
+    #endregion
+    #region 红旗
+
+
+
+
+
+    #endregion
+
+}
+
+
+
+