Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

.gitignore

@@ -14,4 +14,5 @@ obj/
 *.db
 *.db-shm
 *.db-wal
-
+/code/src/Shared/*/obj
+/code/src/Shared/*/bin

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@@ -1,4 +1,4 @@
-
+
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\common.props" />
@@ -12,11 +12,11 @@
     <DockerfileContext>..\..\..\..</DockerfileContext>
     <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-<<<<<<< HEAD
+
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-=======
+
-	  <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+
->>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888
+
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -1,4 +1,4 @@
-{
+{
   "App": {
     "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
   },
@@ -7,9 +7,8 @@
   //  "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService1;user id=sa;Password=1q2w!@#;"
   //},
   "ConnectionStrings": {
-    "Default": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
+    "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
-    "SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
+    "SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
-    "Wms": "Server=192.168.0.140;Database=CPAT_WMS_TEST;user id=sa;password=Microsoft2008;"
   },
   "Logging": {
     "LogLevel": {
@@ -121,4 +120,4 @@
 
 
 
-}
+}

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

@@ -4,7 +4,12 @@
   },
   "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;"
+
+
+    
+
+
   },
 
   "Serilog": {
@@ -85,4 +90,4 @@
   }
 
 
-}
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_BA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IBBAC_BA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_CAN_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IBBAC_CAN_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_NOT_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IBBAC_NOT_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_PD_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IBBAC_PD_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_SE_EDI_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IBBAC_SE_EDI_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_BA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IHBPO_BA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_CAN_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IHBPO_CAN_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_NOT_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IHBPO_NOT_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_PD_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IHBPO_PD_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_SE_EDI_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IHBPO_SE_EDI_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_BA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IPUB_BA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_CAN_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IPUB_CAN_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_NOT_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IPUB_NOT_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_PD_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public interface IPUB_PD_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public  class BBAC_BA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class BBAC_CAN_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class BBAC_NOT_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class BBAC_PD_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public  class BBAC_SE_EDI_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class HBPO_BA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class HBPO_CAN_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class HBPO_NOT_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class HBPO_PD_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SE_EDI_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class HBPO_SE_EDI_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public  class PUB_BA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class PUB_CAN_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class PUB_NOT_SA_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ
+{
+    public class PUB_PD_SERVICE
+    {
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/BaseDomainServices/BaseDomainService.cs

@@ -0,0 +1,104 @@
+using SettleAccount.Bases;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Caching;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Domain.Services;
+using Volo.Abp.Guids;
+using Volo.Abp.ObjectMapping;
+using Win.Sfs.SettleAccount.Boms;
+using Win.Sfs.SettleAccount.CommonManagers;
+using Win.Sfs.SettleAccount.Entities.ImportMap;
+using Win.Sfs.SettleAccount.Entities.Materials;
+using Win.Sfs.SettleAccount.FISes;
+using Win.Sfs.SettleAccount.MaterialRelationships;
+
+namespace Win.Sfs.SettleAccount.Bases.DomainServices
+{
+    public  class BaseDomainService:DomainService, ICheck
+    {
+        private readonly ISettleAccountBQEfCoreRepository<Material, Guid> _materialRepository;
+        private readonly ISettleAccountBQEfCoreRepository<MaterialRelationship, Guid> _relationshipRepository;
+        private readonly ISettleAccountBQEfCoreRepository<Bom, Guid> _bomshipRepository;
+
+        public BaseDomainService(
+           IGuidGenerator guidGenerator,
+           IObjectMapper objectMapper,
+           ISettleAccountBQEfCoreRepository<Material, Guid> materialRepository,
+           ISettleAccountBQEfCoreRepository<MaterialRelationship, Guid> relationshipRepository,
+           ISettleAccountBQEfCoreRepository<Bom, Guid> bomshipRepository
+           //IExcelImportAppService excelImportService,
+           //ISnowflakeIdGenerator snowflakeIdGenerator,
+           //ICommonManager commonManager
+        )
+        {
+            _materialRepository = materialRepository;
+            _relationshipRepository = relationshipRepository;
+            _bomshipRepository = bomshipRepository;
+        }
+
+        public async  Task<List<string>> CheckBase<TEntity>(List<TEntity> p_list ,BASE_CONF p_config) where TEntity : ISBASE
+    
+        {
+            List<string> errorList = new List<string>();
+            var partList= p_list.Select(p=>p.LU).Distinct().ToList();
+
+            if (p_config.IsBom == true)
+            {
+                var bomList =await _bomshipRepository.ToListAsync();
+                var query=from itm in partList join itm1 in bomList on itm equals itm1.ParentItemCode 
+                          into temp
+                          from tm in temp.DefaultIfEmpty()
+                          where tm == null
+                          select  itm;
+
+               foreach(var itm1 in query.ToList())
+               {
+                    errorList.Add(itm1);
+               }
+            }
+            if (p_config.IsMaterial == true)
+            {
+                
+                var materialList = await _materialRepository.ToListAsync();
+                var query = from itm in partList
+                            join itm1 in materialList on itm equals itm1.MaterialCode
+                            into temp
+                            from tm in temp.DefaultIfEmpty()
+                            where tm == null
+                            select itm;
+                foreach (var partcode in query.ToList())
+                {
+                    errorList.Add(partcode);
+                }
+            }
+            if (p_config.IsRelationShip == true)
+            {
+                var materialList =await  _relationshipRepository.ToListAsync();
+                var query = from itm in partList
+                            join itm1 in materialList on itm equals itm1.SettleMaterialCode
+                            into temp
+                            from tm in temp.DefaultIfEmpty()
+                            where tm == null
+                            select itm;
+
+                foreach (var partcode in query.ToList())
+                {
+                    errorList.Add(partcode);
+                }
+            }
+            return errorList;
+        }
+
+        
+    }
+    public interface ICheck
+    {
+        Task<List<string>> CheckBase<TEntity>(List<TEntity> p_list, BASE_CONF p_config) where TEntity : ISBASE;
+    }
+
+
+}

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

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
 using Win.Sfs.SettleAccount.Entities.SettleAccountDomain;
 using static System.Runtime.CompilerServices.RuntimeHelpers;
 
-namespace Win.Sfs.SettleAccount.Bases
+namespace SettleAccount.Bases
 {
     /// <summary>
     /// 所有业务单据基类
@@ -29,7 +30,7 @@ namespace Win.Sfs.SettleAccount.Bases
         /// <summary>
         /// 发货数量、结算数量、扣减数量
         /// </summary>
-        public string Qty { set; get; }
+        public decimal Qty { set; get; }
 
     }
     public interface ISA_BASE : ISBASE
@@ -49,7 +50,14 @@ namespace Win.Sfs.SettleAccount.Bases
         /// <summary>
         /// 结算日期
         /// </summary>
-        public string SettleDate { set; get; }
+        public DateTime SettleDate { set; get; }
+
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
+        public string GroupNum { set; get; }
+
+
 
     }
 
@@ -70,11 +78,13 @@ namespace Win.Sfs.SettleAccount.Bases
         /// <summary>
         /// 结算日期
         /// </summary>
-        public string SettleDate { set; get; }
+        public DateTime SettleDate { set; get; }
+       
+        public string InvGroupNum { set; get; }
         /// <summary>
         /// 结算分组号
         /// </summary>
-        public string InvGroupNum { set; get; }
+        public string GroupNum { set; get; }
 
     }
     public interface ISA_NOT_BASE : ISBASE
@@ -99,6 +109,10 @@ namespace Win.Sfs.SettleAccount.Bases
         /// 结算分组号
         /// </summary>
         public string InvGroupNum { set; get; }
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
+        public string GroupNum { set; get; }
 
     }
 
@@ -113,9 +127,42 @@ namespace Win.Sfs.SettleAccount.Bases
         public string WmsBillNum { set; get; }
 
 
+    }
 
+    public class RE_BASE :FullAuditedAggregateRoot<Guid>, IRE_BASE
+    {
+        /// 发货时间 
+        /// </summary>
+        public DateTime ShippingDate { set; get; }
+        /// <summary>
+        /// 发运单号
+        /// </summary>
+        public string WmsBillNum { set; get; }
+        /// <summary>
+        /// 扣減數據量
+        /// </summary>
+        public decimal Qty { set; get; }
+        /// <summary>
+        /// 零件號
+        /// </summary>
+        public string LU { get; set ; }
+        /// <summary>
+        /// 發貨單號、
+        /// </summary>
+        public string PN { get; set ; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string KeyCode { get; set ; }
 
+      
+      
     }
+
+
+
+
+
     public interface ISE_BASE : ISBASE
     {
        /// <summary>
@@ -134,12 +181,29 @@ namespace Win.Sfs.SettleAccount.Bases
     }
     public interface IPD_BASE : ISBASE
     {
-        public string Version { set; get; }
+        /// <summary>
+        /// 期間
+        /// </summary>
+        public int Version { set; get; }
+        /// <summary>
+        /// 結算單號
+        /// </summary>
         public string BillNum { set; get; }
-        public string Qty { set; get; }
+        /// <summary>
+        /// 單價
+        /// </summary>
         public string Price { set; get; }
+        /// <summary>
+        /// 發票分組號
+        /// </summary>
         public string InvGroupNum { set; get; }
+        /// <summary>
+        /// 結算日期
+        /// </summary>
         public string SettleDate { set; get; }
+        /// <summary>
+        /// 結算分組號
+        /// </summary>
         public string GroupNum { set; get; }
                       
     }
@@ -161,6 +225,244 @@ namespace Win.Sfs.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
+    {
+        /// <summary>
+        /// 期间
+        /// </summary>
+        public int Version { set; get; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+        /// <summary>
+        /// 结算单
+        /// </summary>
+        public string BillNum { set; get; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { set; get; }
+        /// <summary>
+        /// 零件號
+        /// </summary>
+        public string LU { get ; set ; }
+        /// <summary>
+        /// 生產號
+        /// </summary>
+        public string PN { get; set ; }
+        /// <summary>
+        /// 組合鍵值（LU+PN）
+        /// </summary>
+        public string KeyCode { get ; set ; }
+        /// <summary>
+        /// 數量
+        /// </summary>
+        public decimal Qty { get ; set ; }
+        /// <summary>
+        /// 結算分組號
+        /// </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
+    {
+        /// <summary>
+        /// 期间
+        /// </summary>
+        public int Version { set; get; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+        /// <summary>
+        /// 可出库结算单
+        /// </summary>
+        public string BillNum { set; get; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { set; get; }
+        /// <summary>
+        /// 發票分組號
+        /// </summary>
+        public string InvGroupNum { set; get; }
+        /// <summary>
+        /// 零件號
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生產號
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 組合鍵值（LU+PN）
+        /// </summary>
+        public string KeyCode { get; set; }
+        /// <summary>
+        /// 數量
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 結算分組號
+        /// </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
+    {
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+        /// <summary>
+        /// 期间
+        /// </summary>
+        public int Version { set; get; }
+        /// <summary>
+        /// 原结算单号
+        /// </summary>
+        public string SettleBillNum { set; get; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { set; get; }
+        /// <summary>
+        /// 發票分组号
+        /// </summary>
+        public string InvGroupNum { set; get; }
+        /// <summary>
+        /// 零件號
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生產號
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 組合鍵值（LU+PN）
+        /// </summary>
+        public string KeyCode { get; set; }
+        /// <summary>
+        /// 數量
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 結算分組號
+        /// </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;
+        //}
+    }
+
+
+    public class SE_BASE : FullAuditedAggregateRoot<Guid>, ISE_BASE
+    {
+        /// <summary>
+        /// 期间
+        /// </summary>
+        public int Version { set; get; }
+        /// <summary>
+        /// 发货时间 
+        /// </summary>
+        public DateTime ShippingDate { set; get; }
+        /// <summary>
+        /// 发运单号
+        /// </summary>
+        public string WmsBillNum { set; get; }
+       
+
+
+
+        /// <summary>
+        /// 零件號
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生產號
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 組合鍵值（LU+PN）
+        /// </summary>
+        public string KeyCode { get; set; }
+        /// <summary>
+        /// 數量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+
+
+
+
+
+
+
+    }
+    public class PD_BASE : FullAuditedAggregateRoot<Guid>, ISBASE
+    {
+
+        public int Version { set; get; }
+        public string BillNum { set; get; }
+        public decimal Qty { set; get; }
+        public decimal Price { set; get; }
+        public string InvGroupNum { set; get; }
+        public DateTime SettleDate { set; get; }
+        public string GroupNum { set; get; }
+        public string LU { get ; set; }
+        public string PN { get ; set; }
+
+        public string RELU { get; set; }
+        public string REPN { get; set; }
+        public string KeyCode { get; set; }
+
+        
     }
 
 

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

@@ -0,0 +1,153 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "BBAC可结算导入")]
+public class BBAC_CAN_SA:FullAuditedAggregateRoot<Guid>
+{
+
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "结算单据")]
+    public string BillNum { get; set; } = null!;
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
+
+    /// <summary>
+    /// 明细记录行数
+    /// </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)
+    {
+        Id = guid;
+        Version = version;
+        BillNum = billNum;
+        SettleBillNum = settleBillNum;
+        State = state;
+        InvGroupNum = invGroupNum;
+    }
+}
+
+[Display(Name = "BBAC可结算导入明细")]
+public class BBAC_CAN_SA_DETAIL: SA_CAN_BASE
+{
+    ///// <summary>
+    ///// 对应字段（Material+ExternalCalNumber）
+    ///// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; }
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+    ///// <summary>
+    ///// 对应字段Material
+    ///// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段ExternalCalNumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 选择工厂导入
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 匹配价格表对应区间对应地点带出
+    /// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    /// <summary>
+    /// ExternalCallNumber包含（R0）为买单件   1为JIS 2.为买单件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string Category { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段MovementType，996正常，997为退货
+    /// </summary>
+    [Display(Name = "是否退货")]
+    public string IsReturn { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段PostingDate
+    /// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 对应字段Reference
+    /// </summary>
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    //[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;
+        KeyCode = keyCode;
+        Version = version;
+        BillNum = billNum;
+        SettleBillNum = settleBillNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        Category = category;
+        IsReturn = isReturn;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+        InvGroupNum = invGroupNum;
+    }
+}

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

@@ -0,0 +1,111 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+namespace SettleAccount.Domain.BQ;
+
+
+[Display(Name = "BBAC不可结算导入明细")]
+public class BBAC_NOT_SA_DETAIL:SA_NOT_BASE
+{ 
+    ///// <summary>
+    ///// 对应字段（Material+ExternalCalNumber）
+    ///// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string SettleBillNum { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段Material
+    ///// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段ExternalCalNumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 选择工厂导入
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    ///// <summary>
+    ///// 匹配价格表对应区间对应地点带出
+    ///// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    /// <summary>
+    /// ExternalCallNumber包含（R0）为买单件   1为JIS 2.为买单件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string Category { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段MovementType，996正常，997为退货
+    /// </summary>
+    [Display(Name = "是否退货")]
+    public string IsReturn { get; set; } = null!;
+
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段PostingDate
+    ///// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 对应字段Reference
+    /// </summary>
+    //[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;
+
+        KeyCode = keyCode;
+        Version = version;
+        SettleBillNum = settleBillNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        Category = category;
+        IsReturn = isReturn;
+        InvGroupNum = invGroupNum;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+    }
+}

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

@@ -0,0 +1,71 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "BBAC待扣减实体")]
+public class BBAC_PD_DETAIL:PD_BASE
+{
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
+
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    //[Display(Name = "替换零件号")]
+    //public string RELU { get; set; } = null!;
+
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    //[Display(Name = "替换生产号")]
+    //public string REPN { get; set; } = null!;
+
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    public BBAC_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 BBAC_PD_DETAIL()
+    {
+        
+    }
+}

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

@@ -0,0 +1,144 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+
+
+[Display(Name = "BBAC结算导入")]
+public class BBAC_SA:FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; }
+
+    [Display(Name = "结算单据")]
+ 
+    public string BillNum { get; set; } = null!;
+
+    [Display(Name = "出库单号")]
+    public string DNBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
+
+    public BBAC_SA(Guid guid, int version, string billNum, string dNBillNum, string state)
+    {
+        Id = guid;
+        Version = version;
+        BillNum = billNum;
+        DNBillNum = dNBillNum;
+        State = state;
+    }
+    public BBAC_SA()
+    {
+       
+    }
+
+
+}
+[Display(Name = "BBAC结算导入明细")]
+
+public class BBAC_SA_DETAIL:SA_BASE
+{
+    /// <summary>
+    /// 对应字段（Material+ExternalCalNumber）
+    /// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Material
+    /// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 选择工厂导入
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    ///// <summary>
+    ///// 匹配价格表对应区间对应地点带出
+    ///// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    /// <summary>
+    /// ExternalCallNumber包含（R0）为买单件   1为JIS 2.为买单件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string Category { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段MovementType，996正常，997为退货
+    /// </summary>
+    [Display(Name = "是否退货")]
+    public string IsReturn { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段PostingDate
+    /// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    ///// <summary>
+    ///// 对应字段Reference
+    ///// </summary>
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { 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;
+        KeyCode = keyCode;
+        Version = version;
+        BillNum = billNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        Category = category;
+        IsReturn = isReturn;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+        //InvGroupNum = invGroupNum;
+    }
+
+    public BBAC_SA_DETAIL()
+    {
+       
+    }
+}

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

@@ -0,0 +1,65 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "BBAC发运单")]
+public class BBAC_SE_DETAIL:SE_BASE
+{
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    //[Display(Name = "发货数量")]
+    //public decimal Qty { get; set; }
+
+    [Display(Name = "订单时间")]
+    public DateTime BeginDate { get; set; }
+
+    //[Display(Name = "发货时间")]
+    //public DateTime ShippingDate { get; set; }
+
+    //[Display(Name = "Wms发货单号")]
+    //public string WmsBillNum { get; set; } = null!;
+
+    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;
+        PN = pN;
+        SeqNumber = seqNumber;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        Qty = qty;
+        BeginDate = beginDate;
+        ShippingDate = shippingDate;
+        WmsBillNum = wmsBillNum;
+    }
+    public BBAC_SE_DETAIL()
+    {
+        
+    }
+}

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

@@ -0,0 +1,55 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "BBAC的EDI数据")]
+public class BBAC_SE_EDI:FullAuditedAggregateRoot<Guid>
+{ 
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    [Display(Name = "EDI数量")]
+    public decimal Qty { get; set; }
+
+    [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;
+
+        KeyCode = keyCode;
+        Version = version;
+        LU = lU;
+        PN = pN;
+        SeqNumber = seqNumber;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        Qty = qty;
+        BeginDate = beginDate;
+    }
+}

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

@@ -0,0 +1,66 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "BBAC发运数据和EDI对比实体")]
+public class BBAC_SE_REPORT:FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    [Display(Name = "发货数量")]
+    public decimal Qty { get; set; }
+
+    [Display(Name = "EDI数量")]
+    public decimal EDIQty { get; set; }
+
+    [Display(Name = "订单时间")]
+    public DateTime BeginDate { get; set; }
+
+    [Display(Name = "发货时间")]
+    public DateTime ShippingDate { get; set; }
+
+    [Display(Name = "Wms发货单号")]
+    public string WmsBillNum { get; set; } = null!;
+
+    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;
+        PN = pN;
+        SeqNumber = seqNumber;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        Qty = qty;
+        EDIQty = eDIQty;
+        BeginDate = beginDate;
+        ShippingDate = shippingDate;
+        WmsBillNum = wmsBillNum;
+    }
+
+    public BBAC_SE_REPORT()
+    {
+    }
+}

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

@@ -0,0 +1,82 @@
+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 :FullAuditedAggregateRoot<Guid>
+{
+
+    [Display(Name = "LU+ASN单号")]
+    public string KeyCode { get; set; } = null!;
+  
+    /// </summary>
+    [Display(Name = "类别")]
+    public string Category { get; set; } = null!;
+
+    [Display(Name = "Wms发货单号")]
+    public string WmsBillNum { get; set; } = null!;
+    [Display(Name = "发货时间")]
+    public DateTime ShippingDate { get; set; }
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+    [Display(Name = "PJIS日顺序号")]
+    public string PJISSeqNumber { get; set; } = null!;
+    [Display(Name = "物料号")]
+    public string MaterialNumber { get; set; } = null!;
+    [Display(Name = "物料描述")]
+    public string MaterialDes { get; set; } = null!;
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+    /// <summary>
+    /// 结算数据中的过账日期
+    /// </summary>
+    [Display(Name = "客户下线时间")]
+    public DateTime CustomerOfflineTime { get; set; }
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+    [Display(Name = "结算数量")]
+    public decimal SEQty { get; set; }
+    [Display(Name = "发货数量")]
+    public decimal WMSQty { get; set; }
+    [Display(Name = "EDI数量")]
+    public decimal EDIQty { get; set; }
+    [Display(Name = "匹配类型")]
+    public string MateType { get; set; } = null!;
+    [Display(Name = "定价")]
+    public decimal FixPrice { get; set; }
+    [Display(Name = "期间")]
+    public int Version { get; set; }
+
+    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;
+        ShippingDate = shippingDate;
+        PN = pN;
+        SeqNumber = seqNumber;
+        PJISSeqNumber = pJISSeqNumber;
+        MaterialNumber = materialNumber;
+        MaterialDes = materialDes;
+        LU = lU;
+        CustomerOfflineTime = customerOfflineTime;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        SEQty = sEQty;
+        WMSQty = wMSQty;
+        EDIQty = eDIQty;
+        MateType = mateType;
+        FixPrice = fixPrice;
+        Version = version;
+    }
+
+    public BBAC_SE_SA_REPORT()
+    {
+    }
+}

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

@@ -0,0 +1,133 @@
+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 :FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+    [Display(Name = "结算单据")]
+ 
+    public string BillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
+
+    /// <summary>
+    /// 明细记录行数
+    /// </summary>
+    [Display(Name = "明细记录行数")]
+    public string InvGroupNum { get; set; } = null!;
+
+    public HBPO_CAN_SA(Guid guid, int version, string settleBillNum, string billNum, string state, string invGroupNum)
+    {
+        Version = version;
+        SettleBillNum = settleBillNum;
+        BillNum = billNum;
+        State = state;
+        InvGroupNum = invGroupNum;
+    }
+
+    public HBPO_CAN_SA()
+    {
+    }
+}
+[Display(Name = "HBPO可结算导入明细")]
+
+public class HBPO_CAN_SA_DETAIL:SA_CAN_BASE
+{
+    ///// <summary>
+    ///// 对应字段（PartNumber+ProductioNumber）
+    ///// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; }
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+    /// <summary>
+    /// 对应字段PartNumber
+    /// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段productionlumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段filename 区分 cn1、cn5
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段Qty
+    ///// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    ///// <summary>
+    ///// 匹配价格表对应区间带出
+    ///// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    ///// <summary>
+    ///// 对应字段ReceiveDate
+    ///// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 对应字段DeliveryNode
+    /// </summary>
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+
+    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 = guid;
+        KeyCode = keyCode;
+        Version = version;
+        BillNum = billNum;
+        SettleBillNum = settleBillNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+        InvGroupNum = invGroupNum;
+    }
+
+    public HBPO_CAN_SA_DETAIL()
+    {
+    }
+}
+
+

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

@@ -0,0 +1,119 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+//
+//[Display(Name = "HBPO不可结算导入")]
+//public class HBPO_NOT_SA: BaseEntity
+//{
+//    [Display(Name = "期间")]
+//    public int Version { get; set; } 
+
+//    [Display(Name = "结算单据")]
+//    [OneToMany<HBPO_NOT_SA_DETAIL>]
+//    public string BillNum { get; set; } = null!;
+
+//    [Display(Name = "出库单号")]
+//    public string DNBillNum { get; set; } = null!;
+
+//    /// <summary>
+//    /// 1、新建 2、已有出库3、已有扣减寄售库
+//    /// </summary>
+//    [Display(Name = "状态")]
+//    public string State { get; set; } = null!;
+
+//    /// <summary>
+//    /// 明细记录行数
+//    /// </summary>
+//    [Display(Name = "明细记录行数")]
+//    public string RecordCount { get; set; } = null!;
+//}
+[Display(Name = "HBPO不可结算导入明细")]
+public class HBPO_NOT_SA_DETAIL :SA_NOT_BASE
+{
+    ///// <summary>
+    ///// 对应字段（PartNumber+ProductioNumber）
+    ///// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "结算单号")]
+    //public string SettleBillNum { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段PartNumber
+    ///// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段productionlumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段filename 区分 cn1、cn5
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Qty
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 匹配价格表对应区间带出
+    /// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    /// <summary>
+    /// 对应字段ReceiveDate
+    /// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    ///// <summary>
+    ///// 对应字段DeliveryNode
+    ///// </summary>
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    //[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;
+        KeyCode = keyCode;
+        Version = version;
+        SettleBillNum = settleBillNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+        InvGroupNum = invGroupNum;
+    }
+
+    public HBPO_NOT_SA_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,69 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "HBPO待扣减实体")]
+public class HBPO_PD_DETAIL :PD_BASE
+{
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
+
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    //[Display(Name = "替换零件号")]
+    //public string RELU { get; set; } = null!;
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    //[Display(Name = "替换生产号")]
+    //public string REPN { get; set; } = null!;
+    //[Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    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;
+        LU = lU;
+        RELU = rELU;
+        PN = pN;
+        REPN = rEPN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        InvGroupNum = invGroupNum;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+    }
+
+    public HBPO_PD_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,135 @@
+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_SA :FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "结算单据")]
+   
+    public string BillNum { get; set; } = null!;
+
+    [Display(Name = "出库单号")]
+    public string DNBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
+
+    /// <summary>
+    /// 明细记录行数
+    /// </summary>
+    [Display(Name = "明细记录行数")]
+    public string RecordCount { get; set; } = null!;
+
+    public HBPO_SA(Guid guid,  int version, string billNum, string dNBillNum, string state, string recordCount)
+    {
+        this.Id= guid;
+        Version = version;
+        BillNum = billNum;
+        DNBillNum = dNBillNum;
+        State = state;
+        RecordCount = recordCount;
+    }
+
+    public HBPO_SA()
+    {
+    }
+}
+
+[Display(Name = "HBPO结算导入明细")]
+
+public class HBPO_SA_DETAIL :SA_BASE
+
+{
+    ///// <summary>
+    ///// 对应字段（PartNumber+ProductioNumber）
+    ///// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段PartNumber
+    ///// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段productionlumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段filename 区分 cn1、cn5
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Qty
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    ///// <summary>
+    ///// 匹配价格表对应区间带出
+    ///// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    ///// <summary>
+    ///// 对应字段ReceiveDate
+    ///// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    ///// <summary>
+    ///// 对应字段DeliveryNode
+    ///// </summary>
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    [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;
+        KeyCode = keyCode;
+        Version = version;
+        BillNum = billNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+        InvGroupNum = invGroupNum;
+    }
+
+    public HBPO_SA_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,64 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "HBPO发运数据")]
+public class HBPO_SE_DETAIL :SE_BASE
+{
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    //[Display(Name = "发货数量")]
+    //public decimal Qty { get; set; }
+
+    [Display(Name = "订单时间")]
+    public DateTime BeginDate { get; set; }
+
+    //[Display(Name = "发货时间")]
+    //public DateTime ShippingDate { get; set; }
+
+    //[Display(Name = "Wms发货单号")]
+    //public string WmsBillNum { get; set; } = null!;
+
+    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;
+        PN = pN;
+        SeqNumber = seqNumber;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        Qty = qty;
+        BeginDate = beginDate;
+        ShippingDate = shippingDate;
+        WmsBillNum = wmsBillNum;
+    }
+
+    public HBPO_SE_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,56 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "HBPO的EDI数据")]
+public class HBPO_SE_EDI :FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    [Display(Name = "EDI数量")]
+    public decimal Qty { get; set; }
+
+    [Display(Name = "订货时间")]
+    public DateTime BeginDate { get; set; }
+
+    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;
+        PN = pN;
+        SeqNumber = seqNumber;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        Qty = qty;
+        BeginDate = beginDate;
+    }
+
+    public HBPO_SE_EDI()
+    {
+    }
+}

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

@@ -0,0 +1,65 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "HBPO发运数据和EDI对比实体")]
+public class HBPO_SE_REPORT :FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    [Display(Name = "发货数量")]
+    public decimal Qty { get; set; }
+
+    [Display(Name = "EDI数量")]
+    public decimal EDIQty { get; set; }
+
+    [Display(Name = "订单时间")]
+    public DateTime BeginDate { get; set; }
+
+    [Display(Name = "发货时间")]
+    public DateTime ShippingDate { get; set; }
+
+    [Display(Name = "Wms发货单号")]
+    public string WmsBillNum { get; set; } = null!;
+
+    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;
+        PN = pN;
+        SeqNumber = seqNumber;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        Qty = qty;
+        EDIQty = eDIQty;
+        BeginDate = beginDate;
+        ShippingDate = shippingDate;
+        WmsBillNum = wmsBillNum;
+    }
+
+    public HBPO_SE_REPORT()
+    {
+    }
+}

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

@@ -0,0 +1,106 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "HBPO发运数据与结算数据对比实体")]
+public class HBPO_SE_SA_REPORT :RE_BASE
+{
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
+
+    /// <summary>
+    /// 有结算无发货（无EDI数据)
+    ///有结算无发货（有EDI数据)
+    ///有结算有发货（无EDI数据)
+    ///有结算有发货（无价格信息)
+    ///有结算有发货（有EDI数据)
+    ///无结算有发货（有EDI数据)
+    ///无结算有发货（无EDI数据)
+    ///有结算有发货（有EDI数据)
+    ///有结算有发货（WMS多发）
+    /// </summary>
+    [Display(Name = "类别")]
+    public string Category { get; set; } = null!;
+
+    //[Display(Name = "Wms发货单号")]
+    //public string WmsBillNum { get; set; } = null!;
+
+    //[Display(Name = "发货时间")]
+    //public DateTime ShippingDate { get; set; }
+
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "PJIS日顺序号")]
+    public string PJISSeqNumber { get; set; } = null!;
+
+    [Display(Name = "物料号")]
+    public string MaterialNumber { get; set; } = null!;
+
+    [Display(Name = "物料描述")]
+    public string MaterialDes { get; set; } = null!;
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 结算数据中的过账日期
+    /// </summary>
+    [Display(Name = "客户下线时间")]
+    public DateTime CustomerOfflineTime { get; set; }
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    [Display(Name = "结算数量")]
+    public decimal SEQty { get; set; }
+
+    [Display(Name = "发货数量")]
+    public decimal WMSQty { get; set; }
+
+    [Display(Name = "EDI数量")]
+    public decimal EDIQty { get; set; }
+
+    [Display(Name = "匹配类型")]
+    public string MateType { get; set; } = null!;
+
+    [Display(Name = "定价")]
+    public decimal FixPrice { get; set; }
+
+    [Display(Name = "期间")]
+    public int Version { get; set; }
+
+    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;
+      
+        SeqNumber = seqNumber;
+        PJISSeqNumber = pJISSeqNumber;
+        MaterialNumber = materialNumber;
+        MaterialDes = materialDes;
+        CustomerOfflineTime = customerOfflineTime;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        SEQty = sEQty;
+        WMSQty = wMSQty;
+        EDIQty = eDIQty;
+        MateType = mateType;
+        FixPrice = fixPrice;
+        Version = version;
+    }
+
+    public HBPO_SE_SA_REPORT()
+    {
+    }
+}

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

@@ -0,0 +1,107 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "发票分组")]
+public class INVOICE_GRP : FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "实际纸质发票号")]
+    public string RealnvBillNum { get; set; } = null!;
+
+    [Display(Name = "系统生成发票号")]
+    public string InvbillNum { get; set; } = null!;
+
+    [Display(Name = "未税金额")]
+    public decimal Amt { get; set; }
+
+    [Display(Name = "税后金额")]
+    public decimal TaxAmt { get; set; }
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    [Display(Name = "开票Excel文件")]
+    public string FileName { get; set; } = null!;
+
+    /// <summary>
+    /// 1-HBPO 2-BBAC(和买单件一起开票,扣减库存时要注意分开) 3-JIT 4-备件、5-印度件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string BusinessType { get; set; } = null!;
+
+    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;
+        TaxAmt = taxAmt;
+        InvGroupNum = invGroupNum;
+        FileName = fileName;
+        BusinessType = businessType;
+    }
+
+    public INVOICE_GRP()
+    {
+    }
+}
+
+//[ShangWuShenHeGroup]
+//[Hidden]
+//[Display(Name = "财务管理审核明细")]
+//public class INVOICE_DETAIL : BaseEntity
+//{
+//    [Display(Name = "零件号")]
+//    public string LU { get; set; } = null!;
+
+//    [Display(Name = "单价")]
+//    public decimal PRICE { get; set; }
+
+//    [Display(Name = "数量")]
+//    public decimal Qty { get; set; }
+
+//    [Display(Name = "金额")]
+//    public decimal Amt { get; set; }
+
+//    [Display(Name = "发票号")]
+//    public string InvbillNum { get; set; } = null!;
+//    [Display(Name = "发票分组号")]
+//    public string InvGroupNum { get; set; } = null!;
+//[ShangWuShenHeGroup]
+//[Display(Name = "待开票明细")]
+//public class INVOICE_WAIT_DETAIL : BaseEntity
+//{
+//    [Display(Name = "发票号")]
+//    public string InvbillNum { get; set; } = null!;
+
+//    [Display(Name = "零件号")]
+//    public string LU { get; set; } = null!;
+
+//    [Display(Name = "单价")]
+//    public decimal PRICE { get; set; }
+
+//    [Display(Name = "数量")]
+//    public decimal Qty { get; set; }
+
+//    [Display(Name = "金额")]
+//    public decimal Amt { get; set; }
+
+//    [Display(Name = "扩展字段1")]
+//    public string Extend1 { get; set; } = null!;
+
+//    [Display(Name = "扩展字段2")]
+//    public string Extend2 { get; set; } = null!;
+
+//    [Display(Name = "扩展字段3")]
+//    public string Extend3 { get; set; } = null!;
+
+//    [Display(Name = "扩展字段4")]
+//    public string Extend4 { get; set; } = null!;
+//    [Display(Name = "期间")]
+//    public int Version { get; set; } 
+//    [Display(Name = "发票分组号")]
+//    public string InvGroupNum { get; set; } = null!;
+//    [Display(Name = "业务分类")]
+//    public string BussiessType { get; set; } = null!;
+//}

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

@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "发票和结算分组对应关系")]
+
+public class INVOICE_MAP_GROUP : FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "发票号")]
+    public string InvbillNum { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    [Display(Name = "结算分组号")]
+    public string SettleGroupNum { get; set; } = null!;
+
+    [Display(Name = "金额")]
+    public decimal Amt { get; set; }
+
+    [Display(Name = "扩展字段1")]
+    public string Extend1 { get; set; } = null!;
+
+    [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;
+    }
+
+    public INVOICE_MAP_GROUP()
+    {
+    }
+}

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

@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "不可结算零件号")]
+
+public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    [Display(Name = "结算分组号")]
+    public string SettleGroupNum { get; set; } = null!;
+
+    [Display(Name = "可结算零件号")]
+    public string LU { get; set; } = null!;
+
+    [Display(Name = "不可结算零件号")]
+    public string LU1 { get; set; } = null!;
+
+    [Display(Name = "扩展字段1")]
+    public string Extend1 { get; set; } = null!;
+
+    [Display(Name = "扩展字段2")]
+    public string Extend2 { get; set; } = null!;
+
+    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;
+        LU = lU;
+        LU1 = lU1;
+        Extend1 = extend1;
+        Extend2 = extend2;
+    }
+
+    public INVOICE_NOT_SETTLE()
+    {
+    }
+}

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

@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "待开票明细")]
+public class INVOICE_WAIT_DETAIL :FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "发票号")]
+    public string InvbillNum { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    [Display(Name = "单价")]
+    public decimal PRICE { get; set; }
+
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    [Display(Name = "金额")]
+    public decimal Amt { get; set; }
+
+    /// <summary>
+    /// 1、BBAC-JIS 2、HBPO-JIS 3、JIT 4、备件 5、印度件
+    /// </summary>
+    [Display(Name = "业务分类")]
+    public string BussiessType { get; set; } = null!;
+
+    [Display(Name = "扩展字段1")]
+    public string Extend1 { get; set; } = null!;
+
+    [Display(Name = "扩展字段2")]
+    public string Extend2 { get; set; } = null!;
+
+    [Display(Name = "扩展字段3")]
+    public string Extend3 { get; set; } = null!;
+
+    [Display(Name = "扩展字段4")]
+    public string Extend4 { get; set; } = null!;
+
+    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;
+        LU = lU;
+        PRICE = pRICE;
+        Qty = qty;
+        Amt = amt;
+        BussiessType = bussiessType;
+        Extend1 = extend1;
+        Extend2 = extend2;
+        Extend3 = extend3;
+        Extend4 = extend4;
+    }
+
+    public INVOICE_WAIT_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,108 @@
+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 :RE_BASE
+{
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
+
+    /// <summary>
+    /// 有结算无发货（无EDI数据)
+    ///有结算无发货（有EDI数据)
+    ///有结算有发货（无EDI数据)
+    ///有结算有发货（无价格信息)
+    ///有结算有发货（有EDI数据)
+    ///无结算有发货（有EDI数据)
+    ///无结算有发货（无EDI数据)
+    ///有结算有发货（有EDI数据)
+    ///有结算有发货（WMS多发）
+    /// </summary>
+    [Display(Name = "类别")]
+    public string Category { get; set; } = null!;
+
+    //[Display(Name = "Wms发货单号")]
+    //public string WmsBillNum { get; set; } = null!;
+
+    //[Display(Name = "发货时间")]
+    //public DateTime ShippingDate { get; set; }
+
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; } = null!;
+
+    [Display(Name = "PJIS日顺序号")]
+    public string PJISSeqNumber { get; set; } = null!;
+
+    [Display(Name = "物料号")]
+    public string MaterialNumber { get; set; } = null!;
+
+    [Display(Name = "物料描述")]
+    public string MaterialDes { get; set; } = null!;
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 结算数据中的过账日期
+    /// </summary>
+    [Display(Name = "客户下线时间")]
+    public DateTime CustomerOfflineTime { get; set; }
+
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; } = null!;
+
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; } = null!;
+
+    [Display(Name = "结算数量")]
+    public decimal SEQty { get; set; }
+
+    [Display(Name = "发货数量")]
+    public decimal WMSQty { get; set; }
+
+    [Display(Name = "EDI数量")]
+    public decimal EDIQty { get; set; }
+
+    [Display(Name = "匹配类型")]
+    public string MateType { get; set; } = null!;
+
+    [Display(Name = "定价")]
+    public decimal FixPrice { get; set; }
+
+    [Display(Name = "期间")]
+    public int Version { get; set; }
+
+    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;
+        ShippingDate = shippingDate;
+        PN = pN;
+        SeqNumber = seqNumber;
+        PJISSeqNumber = pJISSeqNumber;
+        MaterialNumber = materialNumber;
+        MaterialDes = materialDes;
+        LU = lU;
+        CustomerOfflineTime = customerOfflineTime;
+        AssemblyCode = assemblyCode;
+        InjectionCode = injectionCode;
+        SEQty = sEQty;
+        WMSQty = wMSQty;
+        EDIQty = eDIQty;
+        MateType = mateType;
+        FixPrice = fixPrice;
+        Version = version;
+    }
+
+    public JIT_SE_SA_REPORT()
+    {
+    }
+}

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

@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "买单件待扣减实体")]
+public class M_PD_DETAIL : FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "LU+ASN单号")]
+    public string KeyCode { get; set; } = null!;
+
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "结算单号")]
+    public string BillNum { get; set; } = null!;
+
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    [Display(Name = "替换零件号")]
+    public string RELU { get; set; } = null!;
+
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    [Display(Name = "替换生产号")]
+    public string REPN { get; set; } = null!;
+
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    [Display(Name = "结算数量")]
+    public decimal Qty { get; set; }
+
+    [Display(Name = "单价")]
+    public decimal Price { get; set; }
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    [Display(Name = "结算日期（收货日期)")]
+    public DateTime SettleDate { get; set; }
+
+    [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

@@ -0,0 +1,139 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "PUB可结算导入")]
+public class PUB_CAN_SA :FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+
+    [Display(Name = "结算单据")]
+    public string BillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public int State { get; set; }  
+    /// <summary>
+    /// 1、JIT 2、买单件  3、备件 3、印度件
+    /// </summary>
+    [Display(Name = "业务分类")]
+    public string BusinessType { get; set; } = null!;
+
+    [Display(Name = "明细记录行数")]
+    public string InvGroupNum { get; set; } = null!;
+
+    public PUB_CAN_SA(int version, string settleBillNum, string billNum, int state, string businessType, string invGroupNum)
+    {
+        Version = version;
+        SettleBillNum = settleBillNum;
+        BillNum = billNum;
+        State = state;
+        BusinessType = businessType;
+        InvGroupNum = invGroupNum;
+    }
+
+    public PUB_CAN_SA()
+    {
+    }
+}
+[Display(Name = "PUB可结算导入明细")]
+public class PUB_CAN_SA_DETAIL : SA_CAN_BASE
+{
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段PartNumber
+    /// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段productionlumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段filename 区分 cn1、cn5
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Qty
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    ///// <summary>
+    ///// 匹配价格表对应区间带出
+    ///// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段ReceiveDate
+    ///// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 1、JIT 2、买单件  3、备件 3、印度件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string BusinessType { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段DeliveryNode
+    /// </summary>
+    //[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)
+    {
+        KeyCode = keyCode;
+        Version = version;
+        BillNum = billNum;
+        SettleBillNum = settleBillNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        InvGroupNum = invGroupNum;
+        SettleDate = settleDate;
+        BusinessType = businessType;
+        GroupNum = groupNum;
+    }
+
+    public PUB_CAN_SA_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,93 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "PUB不可结算导入明细")]
+public class PUB_NOT_SA_DETAIL : SA_NOT_BASE
+{
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 期间
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string SettleBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Material
+    /// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段ExternalCalNumber
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 选择工厂导入
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    [Display(Name = "扩展1")]
+    public string Extend1 { get; set; } = null!;
+
+    [Display(Name = "扩展2")]
+    public string Extend2 { get; set; } = null!;
+
+    [Display(Name = "扩展3")]
+    public string Extend3 { get; set; } = null!;
+
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+    /// <summary>
+    /// 对应字段PostingDate
+    /// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+    [Display(Name = "业务分类")]
+    public string BusinessType { get; set; } = null!;
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    public PUB_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, string extend1, string extend2, string extend3, decimal price, string invGroupNum, DateTime settleDate, string businessType, string groupNum)
+    {
+        KeyCode = keyCode;
+        Version = version;
+        SettleBillNum = settleBillNum;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Extend1 = extend1;
+        Extend2 = extend2;
+        Extend3 = extend3;
+        Price = price;
+        InvGroupNum = invGroupNum;
+        SettleDate = settleDate;
+        BusinessType = businessType;
+        GroupNum = groupNum;
+    }
+
+    public PUB_NOT_SA_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,78 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "PUB待扣减实体")]
+public class PUB_PD_DETAIL :PD_BASE
+{
+    //[Display(Name = "LU+ASN单号")]
+    //public string KeyCode { get; set; } = null!;
+
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    //[Display(Name = "替换零件号")]
+    //public string RELU { get; set; } = null!;
+
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    //[Display(Name = "替换生产号")]
+    //public string REPN { get; set; } = null!;
+
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+    /// <summary>
+    /// 1、JIT 2、买单件  3、备件 3、印度件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string BusinessType { get; set; } = null!;
+
+    //[Display(Name = "发票分组号")]
+    //public string InvGroupNum { get; set; } = null!;
+
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    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;
+        LU = lU;
+        RELU = rELU;
+        PN = pN;
+        REPN = rEPN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+        BusinessType = businessType;
+        InvGroupNum = invGroupNum;
+        SettleDate = settleDate;
+        GroupNum = groupNum;
+    }
+
+    public PUB_PD_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,129 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "公用结算导入主表")]
+public class PUB_SA : FullAuditedAggregateRoot<Guid>
+{
+    [Display(Name = "期间")]
+    public int Version { get; set; } 
+
+    [Display(Name = "结算单据")]
+    public string BillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
+
+    public PUB_SA(Guid guid,  int version, string billNum, string state)
+    {
+        Version = version;
+        BillNum = billNum;
+        State = state;
+    }
+
+    public PUB_SA()
+    {
+    }
+}
+[Display(Name = "公用结算导入明细")]
+public class PUB_SA_DETAIL:SA_BASE
+{
+    ///// <summary>
+    ///// 对应字段（Material+External Delivery ID）
+    ///// </summary>
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    ///// <summary>
+    ///// 版本号
+    ///// </summary>
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    ///// <summary>
+    ///// 结算单号
+    ///// </summary>
+    //[Display(Name = "结算单号")]
+    //public string BillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Material
+    /// </summary>
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    ///// <summary>
+    ///// 取值字段External Delivery ID
+    ///// </summary>
+    //[Display(Name = "生产码")]
+    //public string PN { get; set; } = null!;
+
+    /// <summary>
+    ///
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    //[Display(Name = "结算数量")]
+    //public decimal Qty { get; set; }
+
+    ///// <summary>
+    ///// 匹配价格表对应区间对应地点带出
+    ///// </summary>
+    //[Display(Name = "单价")]
+    //public decimal Price { get; set; }
+
+   
+
+    ///// <summary>
+    ///// 对应字段PostingDate
+    ///// </summary>
+    //[Display(Name = "结算日期（收货日期)")]
+    //public DateTime SettleDate { get; set; }
+
+    [Display(Name = "扩展字段1")]
+    public string Extend1 { get; set; } = null!;
+
+    [Display(Name = "扩展字段2")]
+    public string Extend2 { get; set; } = null!;
+
+    [Display(Name = "扩展字段3")]
+    public string Extend3 { get; set; } = null!;
+
+    ///// <summary>
+    ///// 对应字段Reference
+    ///// </summary>
+    //[Display(Name = "结算分组")]
+    //public string GroupNum { get; set; } = null!;
+
+    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;
+        LU = lU;
+        PN = pN;
+        Site = site;
+        Qty = qty;
+        Price = price;
+     
+        SettleDate = settleDate;
+        Extend1 = extend1;
+        Extend2 = extend2;
+        Extend3 = extend3;
+        GroupNum = groupNum;
+    }
+
+    public PUB_SA_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,71 @@
+using SettleAccount.Bases;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+
+
+namespace SettleAccount.Domain.BQ;
+[Display(Name = "PUB发运数据")]
+public class PUB_SE_DETAIL :SE_BASE
+{
+    //[Display(Name = "LU+生产码")]
+    //public string KeyCode { get; set; } = null!;
+
+    //[Display(Name = "期间")]
+    //public int Version { get; set; } 
+
+    //[Display(Name = "零件号")]
+    //public string LU { get; set; } = null!;
+
+    //[Display(Name = "ASN单号")]
+    //public string PN { get; set; } = null!;
+
+    //[Display(Name = "发货数量")]
+    //public decimal Qty { get; set; }
+
+    [Display(Name = "扩展1")]
+    public string Extend1 { get; set; } = null!;
+
+    [Display(Name = "扩展2")]
+    public string Extend2 { get; set; } = null!;
+
+    [Display(Name = "扩展3")]
+    public string Extend3 { get; set; } = null!;
+
+    /// <summary>
+    /// 1、JIT 2、买单件  3、备件 3、印度件
+    /// </summary>
+    [Display(Name = "业务分类")]
+    public string BusinessType { get; set; } = null!;
+
+    [Display(Name = "订单时间")]
+    public DateTime BeginDate { get; set; }
+
+    //[Display(Name = "发货时间")]
+    //public DateTime ShippingDate { get; set; }
+
+    //[Display(Name = "Wms发货单号")]
+    //public string WmsBillNum { get; set; } = null!;
+
+    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;
+        PN = pN;
+        Qty = qty;
+        Extend1 = extend1;
+        Extend2 = extend2;
+        Extend3 = extend3;
+        BusinessType = businessType;
+        BeginDate = beginDate;
+        ShippingDate = shippingDate;
+        WmsBillNum = wmsBillNum;
+    }
+
+    public PUB_SE_DETAIL()
+    {
+    }
+}

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

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+
+[Display(Name = "采购价格单")]
+
+public class PURCHASE_PRICE 
+{
+}

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

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+
+
+
+namespace SettleAccount.Domain.BQ;
+
+
+[Display(Name = "客户替换件关系")]
+public class TB_RePartsRelationship
+{
+    /// <summary>
+    /// 取值字段【零件号】
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string LU { set; get; } = null!;
+
+    /// <summary>
+    /// 取值字段【替换零件号】
+    /// </summary>
+    [Display(Name = "替换零件号")]
+    public string RepLU { set; get; } = null!;
+
+    [Display(Name = "客户编码")]
+    public string ClientCode { set; get; } = null!;
+    [Display(Name = "业务类型")]
+    public string BusinessType { set; get; } = null!;
+
+    public TB_RePartsRelationship(string lU, string repLU, string clientCode, string businessType)
+    {
+        LU = lU;
+        RepLU = repLU;
+        ClientCode = clientCode;
+        BusinessType = businessType;
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Domain/ISettleAccountBranchEfCoreRepository.cs

@@ -11,10 +11,8 @@ using System.Data.Common;
 using System.Data;
 
 using System.Data.SqlClient;
-
+using System.Threading;
-
+using Win.Sfs.Shared.Filter;
-
-
 
 namespace Win.Sfs.SettleAccount
 {
@@ -29,7 +27,52 @@ namespace Win.Sfs.SettleAccount
 
 
 
-        DbCommand CreateCommand(string commandText, CommandType commandType, params DbParameter[] parameters);
+ 
-    } 
+    }
+
+    public interface ISettleAccountBQEfCoreRepository<TEntity, TKey>
+        : IWinEfCoreRepository<TEntity, TKey>
+        , ITransientDependency
+        where TEntity : class, IEntity<TKey>
      
-}
+    {
+        Task<string> GetPropertyValueAsync(Func<Task<TEntity>> factory, string propertyName);
+
+        Task<string> GetPropertyValueAsync(Func<Task<TEntity>> factory, IEnumerable<string> propertyNames, char separator);
+        Task<List<TEntity>> GetAllAsync(
+      
+         bool includeDetails = false,
+         CancellationToken cancellationToken = default);
+
+        Task<long> GetCountAsync(
+        
+            CancellationToken cancellationToken = default);
+
+        Task<long> GetCountByFilterAsync(
+        
+            List<FilterCondition> filters,
+            CancellationToken cancellationToken = default);
+
+
+        Task<List<TEntity>> GetListByFilterAsync(
+           
+            List<FilterCondition> filters,
+            string sorting = null,
+            int maxResultCount = int.MaxValue,
+            int skipCount = 0,
+            bool includeDetails = false,
+            CancellationToken cancellationToken = default);
+
+
+
+    }
+
+
+
+
+
+
+
+
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountBQEfCoreRepository.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.EntityFrameworkCore;
+using Win.Sfs.Shared;
+using Win.Sfs.Shared.DomainBase;
+using Win.Sfs.Shared.Filter;
+using Win.Sfs.Shared.RepositoryBase;
+
+namespace Win.Sfs.SettleAccount.Repository
+{
+    public class SettleAccountBQEfCoreRepository<TEntity, TKey> :
+                    SettleAccountEfCoreRepository<TEntity, TKey>,
+                    ISettleAccountBQEfCoreRepository<TEntity, TKey>,
+                    ITransientDependency
+        where TEntity : class, IBranch<TKey>, IEntity<TKey>
+    {
+
+        private readonly IDbContextProvider<SettleAccountDbContext> _dbContextProvider;
+
+
+
+        public SettleAccountBQEfCoreRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) :
+            base(dbContextProvider)
+        {
+
+            _dbContextProvider = dbContextProvider;
+
+        }
+        public SettleAccountBQEfCoreRepository() : base(null)
+        {
+
+        }
+
+        public  DbCommand CreateCommand(string commandText, CommandType commandType, params DbParameter[] parameters)
+        {
+            var command = DbContext.Database.GetDbConnection().CreateCommand();
+
+            command.CommandText = commandText;
+            command.CommandType = commandType;
+            command.Transaction = DbContext.Database.CurrentTransaction?.GetDbTransaction();
+
+            foreach (var parameter in parameters)
+            {
+                command.Parameters.Add(parameter);
+            }
+
+            return command;
+        }
+
+        public  async Task EnsureConnectionOpenAsync(CancellationToken cancellationToken = default)
+        {
+            var connection = DbContext.Database.GetDbConnection();
+
+            if (connection.State != ConnectionState.Open)
+            {
+                await connection.OpenAsync(cancellationToken);
+            }
+        }
+        public virtual async Task<List<TEntity>> GetAllAsync( bool includeDetails = false,
+            CancellationToken cancellationToken = default)
+        {
+            var query = includeDetails ? this.WithDetails() : this.GetQueryable();
+
+            //query = query.Where(p => p.BranchId.Equals(branchId));
+
+            return await query.ToListAsync(cancellationToken: cancellationToken);
+        }
+
+        public virtual async Task<long> GetCountAsync(CancellationToken cancellationToken = default)
+        {
+            return await this.GetQueryable()
+                //.Where(p => p.BranchId.Equals(branchId))
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+
+        }
+
+        public virtual async Task<long> GetCountByFilterAsync( List<FilterCondition> filters,
+            CancellationToken cancellationToken = default)
+        {
+            return await this.GetQueryable()
+                //.Where(p => p.BranchId.Equals(branchId))
+                .WhereIf(filters?.Count != 0, filters.ToLambda<TEntity>())
+                .LongCountAsync(GetCancellationToken(cancellationToken));
+        }
+
+        public virtual async Task<List<TEntity>> GetListByFilterAsync( List<FilterCondition> filters,
+            string sorting = null,
+            int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false,
+            CancellationToken cancellationToken = default)
+        {
+            var query = includeDetails ? this.WithDetails() : this.GetQueryable();
+          //  query = query.Where(p => p.BranchId.Equals(branchId));
+            var entities = query.WhereIf(filters?.Count != 0, filters.ToLambda<TEntity>());
+            //2021-07-02 设置sorting首字母大小，因设置了驼峰规则，不匹配“ var memberProp = typeof(T).GetProperty(propertyName);”反射
+            if(!string.IsNullOrEmpty(sorting))
+            {
+                sorting = sorting.Substring(0, 1).ToUpper() + sorting.Substring(1);
+            }
+            entities = GetSortingQueryable(entities, sorting);
+            return await entities.PageBy(skipCount, maxResultCount)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+
+
+        } 
+
+    }
+
+
+}

code/src/SmartFactorySuite.sln

@@ -1,10 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-<<<<<<< HEAD
-VisualStudioVersion = 17.5.33516.290
-=======
 VisualStudioVersion = 17.6.33815.320
->>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gateways", "Gateways", "{593B8559-1521-4E54-A7DF-7F58E5F6EA86}"
 EndProject
@@ -69,11 +65,10 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi.Client", "Modules\BaseService\BaseService.HttpApi.Client\BaseService.HttpApi.Client.csproj", "{1913786D-E64D-48E4-98A7-42C3BCA9C282}"
 EndProject
 <<<<<<< HEAD
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{C94F578D-C331-4A9D-B001-93DAECB51447}"
 =======
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{C94F578D-C331-4A9D-B001-93DAECB51447}"
->>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888
 EndProject
+>>>>>>> a6caef3ae6ef92cf26cf92097f5fdc9ceb1053fe
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -165,16 +160,12 @@ Global
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.Build.0 = Release|Any CPU
 <<<<<<< HEAD
+=======
 		{C94F578D-C331-4A9D-B001-93DAECB51447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C94F578D-C331-4A9D-B001-93DAECB51447}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C94F578D-C331-4A9D-B001-93DAECB51447}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C94F578D-C331-4A9D-B001-93DAECB51447}.Release|Any CPU.Build.0 = Release|Any CPU
-=======
+>>>>>>> a6caef3ae6ef92cf26cf92097f5fdc9ceb1053fe
-		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.Build.0 = Release|Any CPU
->>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -206,10 +197,9 @@ Global
 		{65DEB438-557B-4268-8EC6-25A9A2ED6FE1} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1}
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1}
 <<<<<<< HEAD
-		{C94F578D-C331-4A9D-B001-93DAECB51447} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27}
 =======
-		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27}
+		{C94F578D-C331-4A9D-B001-93DAECB51447} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27}
->>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888
+>>>>>>> a6caef3ae6ef92cf26cf92097f5fdc9ceb1053fe
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CAAF5A4A-B83D-4CCD-BF50-58035AD87837}

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs

@@ -0,0 +1,48 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class BBAC_CAN_SAController : GenericController<BBAC_CAN_SA, BBAC_CAN_SA, BBAC_CAN_SA, BBAC_CAN_SA, BBAC_CAN_SA, BBAC_CAN_SA>
+{
+    public BBAC_CAN_SAController(ILogger<BBAC_CAN_SA> logger, IRepository<BBAC_CAN_SA> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] BBAC_CAN_SA model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<BBAC_CAN_SA, BBAC_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [Multiple, Display(Name = "生成发票数据")]
+    public IActionResult? GenerateInvoice()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SA_DETAILController.cs

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class BBAC_CAN_SA_DETAILController : GenericController<BBAC_CAN_SA_DETAIL, BBAC_CAN_SA_DETAIL, BBAC_CAN_SA_DETAIL, BBAC_CAN_SA_DETAIL, BBAC_CAN_SA_DETAIL, BBAC_CAN_SA_DETAIL>
+{
+    public BBAC_CAN_SA_DETAILController(ILogger<BBAC_CAN_SA_DETAIL> logger, IRepository<BBAC_CAN_SA_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] BBAC_CAN_SA_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<BBAC_CAN_SA_DETAIL, BBAC_CAN_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_NOT_SA_DETAILController.cs

@@ -0,0 +1,48 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class BBAC_NOT_SA_DETAILController : GenericController<BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL>
+{
+    public BBAC_NOT_SA_DETAILController(ILogger<BBAC_NOT_SA_DETAIL> logger, IRepository<BBAC_NOT_SA_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] BBAC_NOT_SA_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [Multiple, Display(Name = "生成可结算单")]
+    public IActionResult? GenerateSettlementOrder()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs

@@ -0,0 +1,47 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class BBAC_PD_DETAILController : GenericController<BBAC_PD_DETAIL, BBAC_PD_DETAIL, BBAC_PD_DETAIL, BBAC_PD_DETAIL, BBAC_PD_DETAIL, BBAC_PD_DETAIL>
+{
+    public BBAC_PD_DETAILController(ILogger<BBAC_PD_DETAIL> logger, IRepository<BBAC_PD_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] BBAC_PD_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [HttpPost, Display(Name = "审核通过"), Multiple]
+    public IActionResult? ApprovalPassed()
+    {
+        return null;
+    }
+
+    [HttpPost, Display(Name = "退回"), Multiple]
+    public IActionResult? Reject()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs

@@ -23,9 +23,9 @@ public class BBAC_SAController : GenericController<BBAC_SA, BBAC_SA, BBAC_SA, BB
     }
 
     [NonAction]
-    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
-        return base.Import(importexcelfile);
+        return base.Import(file);
     }
 
     [NonAction]

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SA_DETAILController.cs

@@ -1,4 +1,3 @@
-
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
 
@@ -15,9 +16,9 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
     }
 
     [NonAction]
-    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
-        return base.Import(importexcelfile);
+        return base.Import(file);
     }
 
     [NonAction]
@@ -31,4 +32,14 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
     {
         return base.Create(model);
     }
+
+    /// <summary>
+    /// 未确定
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost, Display(Name = "同步"), Multiple]
+    public IActionResult? Synchronous()
+    {
+        return null;
+    }
 }

docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs → docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_EDIController.cs

@@ -8,16 +8,16 @@ using WTA.Shared.Data;
 
 namespace WTA.Application.Identity.Controllers;
 
-public class IN_SE_DETAILController : GenericController<IN_SE_DETAIL, IN_SE_DETAIL, IN_SE_DETAIL, IN_SE_DETAIL, IN_SE_DETAIL, IN_SE_DETAIL>
+public class BBAC_SE_EDIController : GenericController<BBAC_SE_EDI, BBAC_SE_EDI, BBAC_SE_EDI, BBAC_SE_EDI, BBAC_SE_EDI, BBAC_SE_EDI>
 {
-    public IN_SE_DETAILController(ILogger<IN_SE_DETAIL> logger, IRepository<IN_SE_DETAIL> repository) : base(logger, repository)
+    public BBAC_SE_EDIController(ILogger<BBAC_SE_EDI> logger, IRepository<BBAC_SE_EDI> repository) : base(logger, repository)
     {
     }
 
     [NonAction]
-    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
+    public override IActionResult Create([FromBody] BBAC_SE_EDI model)
     {
-        return base.Import(importexcelfile);
+        return base.Create(model);
     }
 
     [NonAction]
@@ -27,8 +27,8 @@ public class IN_SE_DETAILController : GenericController<IN_SE_DETAIL, IN_SE_DETA
     }
 
     [NonAction]
-    public override IActionResult Create([FromBody] IN_SE_DETAIL model)
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
-        return base.Create(model);
+        return base.Import(file, partial, replace);
     }
 }

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs

@@ -0,0 +1,60 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class BBAC_SE_REPORTController : GenericController<BBAC_SE_REPORT, BBAC_SE_REPORT, BBAC_SE_REPORT, BBAC_SE_REPORT, BBAC_SE_REPORT, BBAC_SE_REPORT>
+{
+    public BBAC_SE_REPORTController(ILogger<BBAC_SE_REPORT> logger, IRepository<BBAC_SE_REPORT> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] BBAC_SE_REPORT model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<BBAC_SE_REPORT, BBAC_SE_REPORT> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [NonAction]
+    public override IActionResult Update([FromBody] BBAC_SE_REPORT model)
+    {
+        return base.Update(model);
+    }
+
+    [HttpPost, Display(Name = "生成比对"), Multiple]
+    public IActionResult? ExportEDIJob()
+    {
+        return null;
+    }
+
+    [HttpPost, Display(Name = "下载")]
+    public IActionResult? DownloadAsync()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_JIT_SE_SA_REPORTController.cs

@@ -0,0 +1,57 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_JIT_SE_SA_REPORTController : BaseController, IResourceService<BJ_JIT_SE_SA_REPORT>
+{
+    private readonly GenericController<JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT> _genericController;
+
+    public BJ_JIT_SE_SA_REPORTController(GenericController<JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT, JIT_SE_SA_REPORT> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<JIT_SE_SA_REPORT, JIT_SE_SA_REPORT> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")]
+    public virtual IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return this._genericController.Delete(guids);
+    }
+
+    [HttpPost, Display(Name = "下载")]
+    public virtual IActionResult? DownloadAsync()
+    {
+        return null;
+    }
+
+    [HttpPost, Display(Name = "生成对比"), Multiple]
+    public virtual IActionResult? Comparison()
+    {
+        return null;
+    }
+}
+
+[Order(2)]
+[Display(Name = "发运与结算二次比对")]
+[BJDataComparisonGroup]
+public class BJ_JIT_SE_SA_REPORT : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SAController.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_CAN_SAController : BaseController, IResourceService<BJ_PUB_CAN_SA>
+{
+    private readonly GenericController<PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA> _genericController;
+
+    public BJ_PUB_CAN_SAController(GenericController<PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA, PUB_CAN_SA> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_CAN_SA, PUB_CAN_SA> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Display(Name = "生成发票数据")]
+    public virtual IActionResult? GenerateInvoice()
+    {
+        return null;
+    }
+}
+
+[Order(1)]
+[BJSettlementInvoicingGroup]
+[Display(Name = "可结算单")]
+public class BJ_PUB_CAN_SA : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SA_DETAILController.cs

@@ -0,0 +1,39 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_CAN_SA_DETAILController : BaseController, IResourceService<BJ_PUB_CAN_SA_DETAIL>
+{
+    private readonly GenericController<PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL> _genericController;
+
+    public BJ_PUB_CAN_SA_DETAILController(GenericController<PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_CAN_SA_DETAIL, PUB_CAN_SA_DETAIL> model)
+    {
+        return this._genericController.Index(model);
+    }
+}
+
+[Hidden]
+[Display(Name = "可结算单明细")]
+[BJSettlementInvoicingGroup]
+public class BJ_PUB_CAN_SA_DETAIL : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_NOT_SA_DETAILController : BaseController, IResourceService<BJ_PUB_NOT_SA_DETAIL>
+{
+    private readonly GenericController<PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL> _genericController;
+
+    public BJ_PUB_NOT_SA_DETAILController(GenericController<PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Display(Name = "生成可结算单")]
+    public virtual IActionResult? GenerateSettlementOrder()
+    {
+        return null;
+    }
+}
+
+[Order(2)]
+[Display(Name = "不可结算单")]
+[BJSettlementInvoicingGroup]
+public class BJ_PUB_NOT_SA_DETAIL : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs

@@ -0,0 +1,50 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_PD_DETAILController : BaseController, IResourceService<BJ_PUB_PD_DETAIL>
+{
+    private readonly GenericController<PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL> _genericController;
+
+    public BJ_PUB_PD_DETAILController(GenericController<PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL, PUB_PD_DETAIL> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_PD_DETAIL, PUB_PD_DETAIL> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_PD_DETAIL, PUB_PD_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
+    [HttpPost, Multiple, Display(Name = "审核通过")]
+    public virtual IActionResult? ApprovalPassed()
+    {
+        return null;
+    }
+}
+
+[Order(4)]
+[Display(Name = "寄售库库存扣减审批")]
+[BJSettlementInvoicingGroup]
+public class BJ_PUB_PD_DETAIL : IResource
+{ }

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SAController.cs

@@ -0,0 +1,60 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_SAController : BaseController, IResourceService<BJ_PUB_SA>
+{
+    private readonly GenericController<PUB_SA, PUB_SA, PUB_SA, PUB_SA, PUB_SA, PUB_SA> _genericController;
+
+    public BJ_PUB_SAController(GenericController<PUB_SA, PUB_SA, PUB_SA, PUB_SA, PUB_SA, PUB_SA> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_SA, PUB_SA> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")]
+    public virtual IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return this._genericController.Delete(guids);
+    }
+
+    [HttpGet, AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")]
+    public virtual IActionResult Import()
+    {
+        return this._genericController.Import();
+    }
+
+    [Consumes("multipart/form-data")]
+    [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")]
+    public virtual IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return this._genericController.Import(file, partial, replace);
+    }
+}
+
+[Order(1)]
+[BJDataInputGroup]
+[Display(Name = "结算数据")]
+public class BJ_PUB_SA : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SA_DETAILController.cs

@@ -0,0 +1,46 @@
+using System.ComponentModel.DataAnnotations;
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_SA_DETAILController : BaseController, IResourceService<BJ_PUB_SA_DETAIL>
+{
+    private readonly GenericController<PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL> _genericController;
+
+    public BJ_PUB_SA_DETAILController(GenericController<PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL, PUB_SA_DETAIL> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_SA_DETAIL, PUB_SA_DETAIL> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_SA_DETAIL, PUB_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+}
+
+[Hidden]
+[Display(Name = "结算数据明细")]
+[BJDataInputGroup]
+public class BJ_PUB_SA_DETAIL : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs

@@ -0,0 +1,52 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Application.Identity.Entities.SystemManagement.Group;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using RouteAttribute = Microsoft.AspNetCore.Mvc.RouteAttribute;
+
+namespace WTA.Application.Identity.Controllers;
+
+[Route("api/{culture=zh}/[controller]/[action]")]
+public class BJ_PUB_SE_DETAILController : BaseController, IResourceService<BJ_PUB_SE_DETAIL>
+{
+    private readonly GenericController<PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL> _genericController;
+
+    public BJ_PUB_SE_DETAILController(GenericController<PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL, PUB_SE_DETAIL> genericController)
+    {
+        this._genericController = genericController;
+    }
+
+    [HttpGet]
+    public virtual IActionResult Index()
+    {
+        return this._genericController.Index();
+    }
+
+    [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")]
+    public virtual IActionResult Index([FromBody] PaginationModel<PUB_SE_DETAIL, PUB_SE_DETAIL> model)
+    {
+        return this._genericController.Index(model);
+    }
+
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_SE_DETAIL, PUB_SE_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
+    [HttpPost, Multiple, Display(Name = "同步")]
+    public virtual IActionResult? Synchronous()
+    {
+        return null;
+    }
+}
+
+[Order(2)]
+[BJDataInputGroup]
+[Display(Name = "发运数据")]
+public class BJ_PUB_SE_DETAIL : IResource
+{
+}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs → docs/demo/src/WTA.Application/Identity/Controllers/BOMController.cs

@@ -8,16 +8,16 @@ using WTA.Shared.Data;
 
 namespace WTA.Application.Identity.Controllers;
 
-public class BJ_SE_DETAILController : GenericController<BJ_SE_DETAIL, BJ_SE_DETAIL, BJ_SE_DETAIL, BJ_SE_DETAIL, BJ_SE_DETAIL, BJ_SE_DETAIL>
+public class BOMController : GenericController<BOM, BOM, BOM, BOM, BOM, BOM>
 {
-    public BJ_SE_DETAILController(ILogger<BJ_SE_DETAIL> logger, IRepository<BJ_SE_DETAIL> repository) : base(logger, repository)
+    public BOMController(ILogger<BOM> logger, IRepository<BOM> repository) : base(logger, repository)
     {
     }
 
     [NonAction]
-    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    public override IActionResult Create([FromBody] BOM model)
     {
-        return base.Import(file);
+        return base.Create(model);
     }
 
     [NonAction]
@@ -27,8 +27,8 @@ public class BJ_SE_DETAILController : GenericController<BJ_SE_DETAIL, BJ_SE_DETA
     }
 
     [NonAction]
-    public override IActionResult Create([FromBody] BJ_SE_DETAIL model)
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
-        return base.Create(model);
+        return base.Import(file, partial, replace);
     }
 }

docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs

@@ -0,0 +1,34 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class CentralizedControlController : GenericController<CentralizedControl, CentralizedControl, CentralizedControl, CentralizedControl, CentralizedControl, CentralizedControl>
+{
+    public CentralizedControlController(ILogger<CentralizedControl> logger, IRepository<CentralizedControl> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] CentralizedControl model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SAController.cs

@@ -0,0 +1,48 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class HBPO_CAN_SAController : GenericController<HBPO_CAN_SA, HBPO_CAN_SA, HBPO_CAN_SA, HBPO_CAN_SA, HBPO_CAN_SA, HBPO_CAN_SA>
+{
+    public HBPO_CAN_SAController(ILogger<HBPO_CAN_SA> logger, IRepository<HBPO_CAN_SA> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] HBPO_CAN_SA model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<HBPO_CAN_SA, HBPO_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [Multiple, Display(Name = "生成发票数据")]
+    public IActionResult? GenerateInvoice()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SA_DETAILController.cs

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class HBPO_CAN_SA_DETAILController : GenericController<HBPO_CAN_SA_DETAIL, HBPO_CAN_SA_DETAIL, HBPO_CAN_SA_DETAIL, HBPO_CAN_SA_DETAIL, HBPO_CAN_SA_DETAIL, HBPO_CAN_SA_DETAIL>
+{
+    public HBPO_CAN_SA_DETAILController(ILogger<HBPO_CAN_SA_DETAIL> logger, IRepository<HBPO_CAN_SA_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] HBPO_CAN_SA_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<HBPO_CAN_SA_DETAIL, HBPO_CAN_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs

@@ -0,0 +1,48 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class HBPO_NOT_SA_DETAILController : GenericController<HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL>
+{
+    public HBPO_NOT_SA_DETAILController(ILogger<HBPO_NOT_SA_DETAIL> logger, IRepository<HBPO_NOT_SA_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] HBPO_NOT_SA_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [Multiple, Display(Name = "生成可结算单")]
+    public IActionResult? GenerateSettlementOrder()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_PD_DETAILController.cs

@@ -0,0 +1,47 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Attributes;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class HBPO_PD_DETAILController : GenericController<HBPO_PD_DETAIL, HBPO_PD_DETAIL, HBPO_PD_DETAIL, HBPO_PD_DETAIL, HBPO_PD_DETAIL, HBPO_PD_DETAIL>
+{
+    public HBPO_PD_DETAILController(ILogger<HBPO_PD_DETAIL> logger, IRepository<HBPO_PD_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] HBPO_PD_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [Display(Name = "审核通过"), Multiple, HttpPost]
+    public IActionResult? ApprovalPassed()
+    {
+        return null;
+    }
+
+    [Display(Name = "退回"), Multiple, HttpPost]
+    public IActionResult? Reject()
+    {
+        return null;
+    }
+}

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs

@@ -29,9 +29,9 @@ public class HBPO_SAController : GenericController<HBPO_SA, HBPO_SA, HBPO_SA, HB
     }
 
     [NonAction]
-    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
-        return base.Import(importexcelfile);
+        return base.Import(file);
     }
 
     [NonAction]

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SA_DETAILController.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
 
@@ -31,4 +32,14 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
     {
         return base.Create(model);
     }
+
+    /// <summary>
+    /// 未确定
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost, Display(Name = "同步"), Multiple]
+    public IActionResult? Synchronous()
+    {
+        return null;
+    }
 }