diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs index adb53808..b14adec0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs +++ b/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 /// ///工厂地点 /// - - public string Site { get; set; } + + public string Site { get; set; } /// /// 版本 /// @@ -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 = "是否退货")] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs index 2d44a112..eacf57a5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs +++ b/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 /// [ExporterHeader(DisplayName = "是否退货")] public string IsReturn { get; set; } + /// + /// 是否退货 + /// [ExporterHeader(DisplayName = "是否退货")] public int Version { get; set; } [ExporterHeader(DisplayName = "单价")] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs index 4760b496..8ceb3ca7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs +++ b/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 { /// @@ -195,7 +194,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos } -} + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_NOT_SA_SERVICE.cs index 288fed55..d8cae972 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_NOT_SA_SERVICE.cs +++ b/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 GenerateSettlementOrder(BBAC_CAN_SA_DETAIL_REQ_DTO input); - Task> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input); - Task ExportAsync(BBAC_CAN_SA_REQ_DTO input); + Task GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input); + Task> DetailQueryAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input); + Task ExportAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input); } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_NOT_SA_SERVICE.cs index 0ace972e..973f3927 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_NOT_SA_SERVICE.cs +++ b/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 GenerateSettlementOrder(BBAC_CAN_SA_DETAIL_REQ_DTO input); - Task> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input); - Task ExportAsync(BBAC_CAN_SA_REQ_DTO input); + Task GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input); + Task> DetailQueryAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input); + Task ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input); } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_CAN_SA_SERVICE.cs index 72a72dd6..6c50ad2a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_CAN_SA_SERVICE.cs +++ b/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 GenerateInvoice(PUB_CAN_SA_REQ_DTO input); + Task> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input); + Task> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input); + Task ExportAsync(PUB_CAN_SA_REQ_DTO input); } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_NOT_SA_SERVICE.cs index 8c8b7a8f..1f284a5f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IPUB_NOT_SA_SERVICE.cs +++ b/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 GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input); + Task> DetailQueryAsync(PUB_NOT_SA_DETAIL_REQ_DTO input); + Task ExportAsync(PUB_NOT_SA_DETAIL_REQ_DTO input); } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 95a940fc..078bee13 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/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 + /// + /// + /// + [AllowAnonymous] + [Route("api/settleaccount/bbac_ba_service")] + public class BBAC_BA_SERVICE: ApplicationService { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index ea181708..2a0067ea 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/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> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("export")] + public Task ExportAsync(BBAC_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("generateinvoice")] + public Task GenerateInvoice(BBAC_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("mainquery")] + public Task> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs index 0b318fcd..408cd05c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs +++ b/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> DetailQueryAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("export")] + public Task ExportAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("generatesettlementorder")] + public Task GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs index c23eac77..5b6d9166 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs index 493e64f8..83228735 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs index a2c0ab9c..5b7f88c5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index da978c2e..7ab07784 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/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> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("export")] + public Task ExportAsync(HBPO_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("generateinvoice")] + public Task GenerateInvoice(HBPO_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("mainquery")] + public Task> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs index 5c11e96b..ff069c91 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs +++ b/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> DetailQueryAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("export")] + public Task ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input ) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("generatesettlementorder")] + public Task GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs index 9cf17f99..244c4203 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SE_EDI_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SE_EDI_SERVICE.cs index 9fbb1201..0c8729f4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SE_EDI_SERVICE.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index ff4f41a0..5915724f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index 513d81c7..a8e0edd5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/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> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("export")] + public Task ExportAsync(PUB_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("generateInvoice")] + public Task GenerateInvoice(PUB_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("mainquery")] + public Task> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input) + { + throw new NotImplementedException(); + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs index f5c9516a..70713ae3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs +++ b/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> DetailQueryAsync(PUB_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("export")] + public Task ExportAsync(PUB_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } + [HttpPost] + [Route("generatesettlementorder")] + public Task GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input) + { + throw new NotImplementedException(); + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs index 867ab18c..6a6fbae8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs +++ b/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 { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs index c314a15f..a511a92a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs +++ b/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 } -} \ No newline at end of file +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/BaseDomainServices/BaseDomainService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/BaseDomainServices/BaseDomainService.cs index f2c00079..da45f7f7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/BaseDomainServices/BaseDomainService.cs +++ b/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> CheckBase(List p_list, BASE_CONF p_config) + //{ + // //List errorList = new List(); + // //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 { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs index 587c3f7d..f4eaf225 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs @@ -225,6 +225,11 @@ namespace SettleAccount.Bases /// 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 /// public string WmsBillNum { set; get; } - - - /// /// 零件號 /// @@ -447,19 +449,51 @@ namespace SettleAccount.Bases } public class PD_BASE : FullAuditedAggregateRoot, 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; } + /// + /// LU(零件号) + /// public string LU { get ; set; } + /// + /// 生产号、发货单号、交付单号等 + /// public string PN { get ; set; } + /// + /// 替换LU + /// public string RELU { get; set; } public string REPN { get; set; } + /// + /// 键值字段 + /// public string KeyCode { get; set; } diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig index 03284655..82b3f0c8 100644 --- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig +++ b/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\ diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache index 44e83457..8ca5d527 100644 Binary files a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache and b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig index c8bb5fd3..492ab950 100644 --- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig +++ b/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\ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache index 821eee60..bdc5dc36 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache differ diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache index b510c64e..865fa6c7 100644 Binary files a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig index e7302fb5..ce1cbcf0 100644 --- a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig +++ b/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\ diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache index 179e82eb..611246ea 100644 Binary files a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache and b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache differ