更新接口

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs

@@ -47,8 +47,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// <summary>
         ///工厂地点
         /// </summary>
-        
-        public string Site { get; set; }       
+
+        public string Site { get; set; }
         /// <summary>
         /// 版本
         /// </summary>
@@ -130,7 +130,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public decimal Qty { get; set; }
         [ExporterHeader(DisplayName = "结算分组号")]
         public string GroupNum { get; set; }
-        
+
     }
     //public class BBAC_CAN_SA_EXP_DTO
 
@@ -168,23 +168,23 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     //        public string ConcurrencyStamp { get; set; }
     //    }
     public class BBAC_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
-        {
-            [Display(Name = "期间")]
-            public int Version { get; set; }
-            [Display(Name = "结算单据")]
-            public string BillNum { get; set; }
-            [Display(Name = "关联结算单号")]
-            public string SettleBillNum { get; set; }
-            [Display(Name = "状态")]
-            public string State { get; set; }
-        }
+    {
+        [Display(Name = "期间")]
+        public int Version { get; set; }
+        [Display(Name = "结算单据")]
+        public string BillNum { get; set; }
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        [Display(Name = "状态")]
+        public string State { get; set; }
+    }
 
     public class BBAC_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
     {
 
         [Display(Name = "关联结算单号")]
         public string SettleBillNum { get; set; }
-        
+
         //[Display(Name = "业务类别")]
         //public string Category { get; set; }
         //[Display(Name = "是否退货")]

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs

@@ -83,6 +83,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [ExporterHeader(DisplayName = "是否退货")]
         public string IsReturn { get; set; }
+        /// <summary>
+        /// 是否退货
+        /// </summary>
         [ExporterHeader(DisplayName = "是否退货")]
         public int Version { get; set; }
         [ExporterHeader(DisplayName = "单价")]

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs

@@ -10,8 +10,7 @@ using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 {
-    namespace SettleAccount.Domain.BQ
-    {
+    
         public class PUB_CAN_SA_DTO : EntityDto<Guid>
         {
             /// <summary>
@@ -195,7 +194,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
     }
 
-}
+
 
 
 

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

@@ -10,9 +10,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IBBAC_NOT_SA_SERVICE
     {
-        Task<bool> GenerateSettlementOrder(BBAC_CAN_SA_DETAIL_REQ_DTO input);
-        Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input);
-        Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input);
+        Task<bool> GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input);
+        Task<PagedResultDto<BBAC_NOT_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input);
 
     }
 }

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

@@ -10,8 +10,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IHBPO_NOT_SA_SERVICE
     {
-        Task<bool> GenerateSettlementOrder(BBAC_CAN_SA_DETAIL_REQ_DTO input);
-        Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input);
-        Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input);
+        Task<bool> GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input);
+        Task<PagedResultDto<HBPO_NOT_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input);
     }
 }

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

@@ -3,10 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IPUB_CAN_SA_SERVICE
     {
+        Task<bool> GenerateInvoice(PUB_CAN_SA_REQ_DTO input);
+        Task<PagedResultDto<PUB_CAN_SA_DTO>> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input);
+        Task<PagedResultDto<PUB_CAN_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(PUB_CAN_SA_REQ_DTO input);
     }
 }

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

@@ -3,10 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IPUB_NOT_SA_SERVICE
     {
+        Task<bool> GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input);
+        Task<PagedResultDto<PUB_NOT_SA_DETAIL_DTO>> DetailQueryAsync(PUB_NOT_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(PUB_NOT_SA_DETAIL_REQ_DTO input);
     }
 }

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

@@ -1,12 +1,20 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public  class BBAC_BA_SERVICE
+    /// <summary>
+    /// 
+    /// </summary>
+    [AllowAnonymous]
+    [Route("api/settleaccount/bbac_ba_service")]
+    public  class BBAC_BA_SERVICE: ApplicationService
     {
     }
 }

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

@@ -1,12 +1,46 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class BBAC_CAN_SA_SERVICE
+
+
+    [AllowAnonymous]
+    [Route("api/settleaccount/bbac_can_sa_service")]
+    public class BBAC_CAN_SA_SERVICE : ApplicationService, IBBAC_CAN_SA_SERVICE
     {
+        [HttpPost]
+        [Route("detailquery")]
+        public Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("export")]
+        public Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("generateinvoice")]
+        public Task<bool> GenerateInvoice(BBAC_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("mainquery")]
+        public Task<PagedResultDto<BBAC_CAN_SA_DTO>> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,12 +1,38 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class BBAC_NOT_SA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/bbac_not_sa_service")]
+    public class BBAC_NOT_SA_SERVICE : ApplicationService, IBBAC_NOT_SA_SERVICE
     {
+        [HttpPost]
+        [Route("detailquery")]
+        public Task<PagedResultDto<BBAC_NOT_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("export")]
+        public Task<string> ExportAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("generatesettlementorder")]
+        public Task<bool> GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class BBAC_PD_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/bbac_pd_service")]
+    public class BBAC_PD_SERVICE : ApplicationService
     {
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public  class BBAC_SE_EDI_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/bbac_se_edi_service")]
+    public  class BBAC_SE_EDI_SERVICE : ApplicationService
     {
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class HBPO_BA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/hbpo_ba_service")]
+    public class HBPO_BA_SERVICE : ApplicationService
     {
     }
 }

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

@@ -1,12 +1,44 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class HBPO_CAN_SA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/hbpo_can_sa_service")]
+    public class HBPO_CAN_SA_SERVICE : ApplicationService, IHBPO_CAN_SA_SERVICE
     {
+        [HttpPost]
+        [Route("detailquery")]
+        public Task<PagedResultDto<HBPO_CAN_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("export")]
+        public Task<string> ExportAsync(HBPO_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("generateinvoice")]
+        public Task<bool> GenerateInvoice(HBPO_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("mainquery")]
+        public Task<PagedResultDto<HBPO_CAN_SA_DTO>> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,12 +1,38 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class HBPO_NOT_SA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/hbpo_not_sa_service")]
+    public class HBPO_NOT_SA_SERVICE : ApplicationService, IHBPO_NOT_SA_SERVICE
     {
+        [HttpPost]
+        [Route("detailquery")]
+        public Task<PagedResultDto<HBPO_NOT_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("export")]
+        public Task<string> ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input )
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("generatesettlementorder")]
+        public Task<bool> GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class HBPO_PD_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/hbpo_pd_service")]
+    public class HBPO_PD_SERVICE : ApplicationService
     {
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class HBPO_SE_EDI_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/hbpo_se_edi_service")]
+    public class HBPO_SE_EDI_SERVICE : ApplicationService
     {
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public  class PUB_BA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/pub_ba_service")]
+    public  class PUB_BA_SERVICE : ApplicationService
     {
     }
 }

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

@@ -1,12 +1,44 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class PUB_CAN_SA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/pub_can_sa_service")]
+    public class PUB_CAN_SA_SERVICE : ApplicationService, IPUB_CAN_SA_SERVICE
     {
+        [HttpPost]
+        [Route("detailquery")]
+        public Task<PagedResultDto<PUB_CAN_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("export")]
+        public Task<string> ExportAsync(PUB_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("generateInvoice")]
+        public Task<bool> GenerateInvoice(PUB_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("mainquery")]
+        public Task<PagedResultDto<PUB_CAN_SA_DTO>> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,12 +1,38 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class PUB_NOT_SA_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/pub_not_sa_service")]
+    public class PUB_NOT_SA_SERVICE : ApplicationService, IPUB_NOT_SA_SERVICE
     {
+        [HttpPost]
+        [Route("detailquery")]
+        public Task<PagedResultDto<PUB_NOT_SA_DETAIL_DTO>> DetailQueryAsync(PUB_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("export")]
+        public Task<string> ExportAsync(PUB_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
+        [HttpPost]
+        [Route("generatesettlementorder")]
+        public Task<bool> GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,12 +1,17 @@
-using System;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public class PUB_PD_SERVICE
+    [AllowAnonymous]
+    [Route("api/settleaccount/pub_pd_service")]
+    public class PUB_PD_SERVICE : ApplicationService
     {
     }
 }

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

@@ -133,6 +133,14 @@ namespace Win.Sfs.SettleAccount
             #endregion
 
         }
+        #region 北汽
+
+
+
+        #endregion
+
+
+
 
         #region 派格出库单
 
@@ -719,4 +727,4 @@ namespace Win.Sfs.SettleAccount
         }
         #endregion
     }
-}
+}

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

@@ -90,10 +90,99 @@ namespace Win.Sfs.SettleAccount.Bases.DomainServices
                     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 async Task<List<string>> CheckBase<TEntity>(List<string> p_list, BASE_CONF p_config)
+        //{
+        //    //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);
+        //    //    }
+        //    //}
+        //    //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
     {

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

@@ -225,6 +225,11 @@ namespace SettleAccount.Bases
         /// </summary>
         public bool IsBom { set; get; }
 
+        public bool IsPriceList { set; get; }
+
+        
+
+
         public BASE_CONF(bool isRelationShip, bool isMaterial, bool isBom)
         {
             IsRelationShip = isRelationShip;
@@ -417,9 +422,6 @@ namespace SettleAccount.Bases
         /// </summary>
         public string WmsBillNum { set; get; }
        
-
-
-
         /// <summary>
         /// 零件號
         /// </summary>
@@ -447,19 +449,51 @@ namespace SettleAccount.Bases
     }
     public class PD_BASE : FullAuditedAggregateRoot<Guid>, ISBASE
     {
-
+        /// <summary>
+        /// 期间
+        /// </summary>
         public int Version { set; get; }
+        /// <summary>
+        /// 结算单号
+        /// </summary>
         public string BillNum { set; get; }
+        /// <summary>
+        /// 待出库数量
+        /// </summary>
         public decimal Qty { set; get; }
+        /// <summary>
+        /// 单价
+        /// </summary>
         public decimal Price { set; get; }
+        /// <summary>
+        /// 发票分组号
+        /// </summary>
         public string InvGroupNum { set; get; }
+        /// <summary>
+        /// 下线日期
+        /// </summary>
         public DateTime SettleDate { set; get; }
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
         public string GroupNum { set; get; }
+        /// <summary>
+        /// LU(零件号)
+        /// </summary>
         public string LU { get ; set; }
+        /// <summary>
+        /// 生产号、发货单号、交付单号等
+        /// </summary>
         public string PN { get ; set; }
+        /// <summary>
+        /// 替换LU
+        /// </summary>
 
         public string RELU { get; set; }
         public string REPN { get; set; }
+        /// <summary>
+        /// 键值字段
+        /// </summary>
         public string KeyCode { get; set; }
 
         

code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = 
-build_property.ProjectDir = E:\我的工作\B_BJBQJS\BJBQJS\code\src\Shared\Win.Abp.Snowflakes\
+build_property.ProjectDir = C:\Users\Administrator\Source\Repos\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\

code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Sfs.Shared
-build_property.ProjectDir = E:\我的工作\B_BJBQJS\BJBQJS\code\src\Shared\Win.Sfs.Shared\
+build_property.ProjectDir = C:\Users\Administrator\Source\Repos\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\

code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Utils
-build_property.ProjectDir = E:\我的工作\B_BJBQJS\BJBQJS\code\src\Shared\Win.Utils\
+build_property.ProjectDir = C:\Users\Administrator\Source\Repos\BeiJinSettleAccount\code\src\Shared\Win.Utils\