From 8de2c8761c55ad80c81d63a31b1a94a421df14c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 11 Jul 2023 11:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs | 221 +++++++++++++++ .../Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs | 147 ++++++++++ .../Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs | 219 +++++++++++++++ .../Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs | 147 ++++++++++ .../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs | 253 ++++++++++++++++++ .../Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs | 202 ++++++++++++++ .../Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs | 169 ++++++++++++ .../Entities/BQ/IBBAC_BA_SERVICE.cs | 10 + .../Entities/BQ/IBBAC_CAN_SA_SERVICE.cs | 12 +- .../Entities/BQ/IBBAC_NOT_SA_SERVICE.cs | 6 + .../Entities/BQ/IBBAC_PD_SERVICE.cs | 17 ++ .../Entities/BQ/IHBPO_CAN_SA_SERVICE.cs | 6 + .../Entities/BQ/IHBPO_NOT_SA_SERVICE.cs | 5 + .../SettleAccount.Application.csproj | 2 +- 14 files changed, 1414 insertions(+), 2 deletions(-) create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs 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 new file mode 100644 index 00000000..adb53808 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs @@ -0,0 +1,221 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + public class BBAC_CAN_SA_DTO : EntityDto + { + /// + ///期间 + /// + [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 string InvGroupNum { get; set; } + } + public class BBAC_CAN_SA_DETAIL_DTO : EntityDto + { + /// + ///关联结算单号 + /// + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 单价 + /// + public decimal Price { get; set; } + /// + /// 结算单号（发票分组号） + /// + public string BillNum { get; set; } + /// + /// 结算日期 + /// + public DateTime SettleDate { get; set; } + /// + ///发票组号 + /// + public string InvGroupNum { get; set; } + /// + /// 零件号 + /// + public string LU { get; set; } + /// + /// 生产号 + /// + public string PN { get; set; } + /// + /// 结算数量 + /// + public decimal Qty { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + + } + public class BBAC_CAN_SA_DETAIL_EXP_DTO + { + + /// + ///关联结算单号 + /// + [ExporterHeader(DisplayName = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [ExporterHeader(DisplayName = "业务类别")] + public string Category { get; set; } + /// + ///是否退货 + /// + [ExporterHeader(DisplayName = "是否退货")] + public string IsReturn { get; set; } + [ExporterHeader(DisplayName = "是否退货")] + public int Version { get; set; } + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + public string KeyCode { get; set; } + [ExporterHeader(DisplayName = "结算数量")] + public decimal Qty { get; set; } + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + + } + //public class BBAC_CAN_SA_EXP_DTO + + // { + + // /// + // ///期间 + // /// + // [ExporterHeader(DisplayName = "期间")] + // public int Version { get; set; } + // /// + // ///结算单据 + // /// + // [ExporterHeader(DisplayName = "结算单据")] + // public string BillNum { get; set; } + // /// + // ///关联结算单号 + // /// + // [ExporterHeader(DisplayName = "关联结算单号")] + // public string SettleBillNum { get; set; } + // /// + // ///状态 + // /// + // [ExporterHeader(DisplayName = "状态")] + // public string State { get; set; } + // /// + // ///明细记录行数 + // /// + // [ExporterHeader(DisplayName = "明细记录行数")] + // public string InvGroupNum { get; set; } + // public bool IsDeleted { get; set; } + // public DateTime? DeletionTime { get; set; } + // public DateTime? LastModificationTime { get; set; } + // public DateTime CreationTime { get; set; } + // 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; } + } + + 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 = "是否退货")] + //public string IsReturn { get; set; } + [Display(Name = "版本号")] + public int Version { get; set; } + //[Display(Name = "单价")] + //public decimal Price { get; set; } + [Display(Name = "发票分组号")] + /// + /// + /// + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "LU")] + public string LU { get; set; } + [Display(Name = "生产码")] + public string PN { get; set; } + //[Display(Name = "键值")] + //public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + public virtual List Filters { get; set; } = new List(); + } + + + +} 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 new file mode 100644 index 00000000..2d44a112 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs @@ -0,0 +1,147 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + + public class BBAC_NOT_SA_DETAIL_DTO : EntityDto + { + /// + ///关联结算单号 + /// + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 单价 + /// + public decimal Price { get; set; } + /// + /// 结算单号（发票分组号） + /// + public string BillNum { get; set; } + /// + /// 结算日期 + /// + public DateTime SettleDate { get; set; } + /// + ///发票组号 + /// + public string InvGroupNum { get; set; } + /// + /// 零件号 + /// + public string LU { get; set; } + /// + /// 生产号 + /// + public string PN { get; set; } + /// + /// 结算数量 + /// + public decimal Qty { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + + } + public class BBAC_NOT_SA_DETAIL_EXP_DTO + { + + /// + ///关联结算单号 + /// + [ExporterHeader(DisplayName = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [ExporterHeader(DisplayName = "业务类别")] + public string Category { get; set; } + /// + ///是否退货 + /// + [ExporterHeader(DisplayName = "是否退货")] + public string IsReturn { get; set; } + [ExporterHeader(DisplayName = "是否退货")] + public int Version { get; set; } + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + public string KeyCode { get; set; } + [ExporterHeader(DisplayName = "结算数量")] + public decimal Qty { get; set; } + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + + } + public class BBAC_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto + { + + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + + //[Display(Name = "业务类别")] + //public string Category { get; set; } + //[Display(Name = "是否退货")] + //public string IsReturn { get; set; } + [Display(Name = "版本号")] + public int Version { get; set; } + //[Display(Name = "单价")] + //public decimal Price { get; set; } + [Display(Name = "发票分组号")] + /// + /// + /// + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "LU")] + public string LU { get; set; } + [Display(Name = "生产码")] + public string PN { get; set; } + //[Display(Name = "键值")] + //public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + public virtual List Filters { get; set; } = new List(); + } + + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs new file mode 100644 index 00000000..947b926c --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs @@ -0,0 +1,219 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + public class HBPO_CAN_SA_DTO : EntityDto + { + /// + ///期间 + /// + [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 string InvGroupNum { get; set; } + } + public class HBPO_CAN_SA_DETAIL_DTO : EntityDto + { + + + + + + + + + + + + /// + ///关联结算单号 + /// + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 单价 + /// + public decimal Price { get; set; } + /// + /// 结算单号（发票分组号） + /// + public string BillNum { get; set; } + /// + /// 结算日期 + /// + public DateTime SettleDate { get; set; } + /// + ///发票组号 + /// + public string InvGroupNum { get; set; } + /// + /// 零件号 + /// + public string LU { get; set; } + /// + /// 生产号 + /// + public string PN { get; set; } + /// + /// 结算数量 + /// + public decimal Qty { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + + + + + + + + + + + + + + + + + + + + + + + } + public class HBPO_CAN_SA_DETAIL_EXP_DTO + { + + /// + ///关联结算单号 + /// + [ExporterHeader(DisplayName = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + //[ExporterHeader(DisplayName = "业务类别")] + //public string Category { get; set; } + /// + ///是否退货 + /// + //[ExporterHeader(DisplayName = "是否退货")] + //public string IsReturn { get; set; } + [ExporterHeader(DisplayName = "是否退货")] + public int Version { get; set; } + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + public string KeyCode { get; set; } + [ExporterHeader(DisplayName = "结算数量")] + public decimal Qty { get; set; } + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + + } + + public class HBPO_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; } + } + + public class HBPO_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto + { + + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + + //[Display(Name = "业务类别")] + //public string Category { get; set; } + //[Display(Name = "是否退货")] + //public string IsReturn { get; set; } + [Display(Name = "版本号")] + public int Version { get; set; } + //[Display(Name = "单价")] + //public decimal Price { get; set; } + [Display(Name = "发票分组号")] + /// + /// + /// + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "LU")] + public string LU { get; set; } + [Display(Name = "生产码")] + public string PN { get; set; } + //[Display(Name = "键值")] + //public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + public virtual List Filters { get; set; } = new List(); + } + + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs new file mode 100644 index 00000000..a9e699a0 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs @@ -0,0 +1,147 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + + public class HBPO_NOT_SA_DETAIL_DTO : EntityDto + { + /// + ///关联结算单号 + /// + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 单价 + /// + public decimal Price { get; set; } + /// + /// 结算单号（发票分组号） + /// + public string BillNum { get; set; } + /// + /// 结算日期 + /// + public DateTime SettleDate { get; set; } + /// + ///发票组号 + /// + public string InvGroupNum { get; set; } + /// + /// 零件号 + /// + public string LU { get; set; } + /// + /// 生产号 + /// + public string PN { get; set; } + /// + /// 结算数量 + /// + public decimal Qty { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + + } + public class HBPO_NOT_SA_DETAIL_EXP_DTO + { + + /// + ///关联结算单号 + /// + [ExporterHeader(DisplayName = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + //[ExporterHeader(DisplayName = "业务类别")] + //public string Category { get; set; } + /// + ///是否退货 + /// + //[ExporterHeader(DisplayName = "是否退货")] + //public string IsReturn { get; set; } + [ExporterHeader(DisplayName = "期间")] + public int Version { get; set; } + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + public string KeyCode { get; set; } + [ExporterHeader(DisplayName = "结算数量")] + public decimal Qty { get; set; } + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + + } + public class HBPO_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto + { + + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + + //[Display(Name = "业务类别")] + //public string Category { get; set; } + //[Display(Name = "是否退货")] + //public string IsReturn { get; set; } + [Display(Name = "版本号")] + public int Version { get; set; } + //[Display(Name = "单价")] + //public decimal Price { get; set; } + [Display(Name = "发票分组号")] + /// + /// + /// + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "LU")] + public string LU { get; set; } + [Display(Name = "生产码")] + public string PN { get; set; } + //[Display(Name = "键值")] + //public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + public virtual List Filters { get; set; } = new List(); + } + + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs new file mode 100644 index 00000000..88450e5c --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs @@ -0,0 +1,253 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + + + + public class INVOICE_GRP_DTO : EntityDto + + { + [Display(Name = "期间")] + public int Version { set; get; } + + /// + ///实际纸质发票号 + /// + [Display(Name = "实际纸质发票号")] + public string RealnvBillNum { get; set; } + /// + ///系统生成发票号 + /// + [Display(Name = "系统生成发票号")] + public string InvbillNum { get; set; } + /// + ///未税金额 + /// + [Display(Name = "未税金额")] + public decimal Amt { get; set; } + /// + ///税后金额 + /// + [Display(Name = "税后金额")] + public decimal TaxAmt { get; set; } + /// + ///发票分组号 + /// + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + /// + ///开票Excel文件 + /// + [Display(Name = "开票Excel文件")] + public string FileName { get; set; } + /// + ///业务类别 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } + + } + + + + public class INVOICE_GRP_EXPORT_DTO + + { + + /// + ///实际纸质发票号 + /// + [ExporterHeader(DisplayName = "实际纸质发票号")] + public string RealnvBillNum { get; set; } + /// + ///系统生成发票号 + /// + [ExporterHeader(DisplayName = "系统生成发票号")] + public string InvbillNum { get; set; } + /// + ///未税金额 + /// + [ExporterHeader(DisplayName = "未税金额")] + public decimal Amt { get; set; } + /// + ///税后金额 + /// + [ExporterHeader(DisplayName = "税后金额")] + public decimal TaxAmt { get; set; } + /// + ///发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + /// + ///开票Excel文件 + /// + [ExporterHeader(DisplayName = "开票Excel文件")] + public string FileName { get; set; } + /// + ///业务类别 + /// + [ExporterHeader(DisplayName = "业务类别")] + public string BusinessType { get; set; } + + } + + public class INVOICE_GRP_IMP_DTO + { + + /// + ///实际纸质发票号 + /// + [ImporterHeader(Name = "实际纸质发票号")] + public string RealnvBillNum { get; set; } + /// + ///系统生成发票号 + /// + [ImporterHeader(Name = "系统生成发票号")] + public string InvbillNum { get; set; } + + + } + + + + + + + + + + + public class INVOICE_GRP_REQ_DTO : PagedAndSortedResultRequestDto + + { + + [Display(Name = "实际纸质发票号")] + public string RealnvBillNum { get; set; } + [Display(Name = "系统生成发票号")] + public decimal TaxAmt { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + + + public virtual List Filters { get; set; } = new List(); + } + + + + + namespace SettleAccount.Domain.BQ + { + public class INVOICE_WAIT_DETAIL_DTO : EntityDto + + { + + /// + ///期间 + /// + [Display(Name = "期间")] + public int Version { get; set; } + /// + ///发票号 + /// + [Display(Name = "发票号")] + public string InvbillNum { get; set; } + /// + ///发票分组号 + /// + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + /// + ///零件号 + /// + [Display(Name = "零件号")] + public string LU { get; set; } + /// + ///单价 + /// + [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 BussiessType { get; set; } + /// + ///扩展字段1 + /// + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } + /// + ///扩展字段2 + /// + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } + /// + ///扩展字段3 + /// + [Display(Name = "扩展字段3")] + public string Extend3 { get; set; } + /// + ///扩展字段4 + /// + [Display(Name = "扩展字段4")] + public string Extend4 { get; set; } + + } + public class INVOICE_WAIT_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto + { + [Display(Name = "发票号")] + public string InvbillNum { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "零件号")] + public string LU { get; set; } + public virtual List Filters { get; set; } = new List(); + } + + + + + } + + + + + + + + + + + + + + + + + + + +} + + + 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 new file mode 100644 index 00000000..4760b496 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs @@ -0,0 +1,202 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + namespace SettleAccount.Domain.BQ + { + public class PUB_CAN_SA_DTO : EntityDto + { + /// + ///期间 + /// + [Display(Name = "期间")] + public int Version { get; set; } + /// + ///关联结算单号 + /// + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///结算单据 + /// + [Display(Name = "结算单据")] + public string BillNum { get; set; } + /// + ///状态 + /// + [Display(Name = "状态")] + public int State { get; set; } + /// + ///业务分类 + /// + [Display(Name = "业务分类")] + public string BusinessType { get; set; } + /// + ///明细记录行数 + /// + [Display(Name = "明细记录行数")] + public string InvGroupNum { get; set; } + + } + public class PUB_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto + + { + + [Display(Name = "期间")] + public int Version { get; set; } + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + [Display(Name = "发票分组号")] + public string BillNum { get; set; } + [Display(Name = "状态")] + public int State { get; set; } + [Display(Name = "业务分类")] + public string BusinessType { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + + public virtual List Filters { get; set; } = new List(); + } + public class PUB_CAN_SA_DETAIL_DTO : EntityDto + { + + /// + ///关联结算单号 + /// + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } + [Display(Name ="期间")] + public int Version { get; set; } + [Display(Name = "价格")] + public decimal Price { get; set; } + [Display(Name = "发票分组号")] + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "发票分组号")] + public string LU { get; set; } + [Display(Name = "发货单号、交付识别号")] + public string PN { get; set; } + [Display(Name = "键值")] + public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + + } + + + + public class PUB_CAN_SA_DETAIL_EXP_DTO + { + + [ExporterHeader(DisplayName = "期间")] + public int Version { get; set; } + /// + ///关联结算单号 + /// + [ExporterHeader(DisplayName = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [ExporterHeader(DisplayName = "业务类别")] + public string BusinessType { get; set; } + + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + [ExporterHeader(DisplayName = "发货单号、交付单号")] + public string PN { get; set; } + + [ExporterHeader(DisplayName = "结算数量")] + public decimal Qty { get; set; } + + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + + } + + + + + + + + public class PUB_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto + + { + + /// + ///关联结算单号 + /// + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } + + [Display(Name = "发票分组号")] + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "LU")] + public string LU { get; set; } + [Display(Name = "发货单号、交付单号")] + public string PN { get; set; } + + public virtual List Filters { get; set; } = new List(); + + } + + + + } + +} + + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs new file mode 100644 index 00000000..5a6fd758 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs @@ -0,0 +1,169 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + public class PUB_NOT_SA_DETAIL_DTO : EntityDto + { + + /// + ///关联结算单号 + /// + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } + [Display(Name = "期间")] + public int Version { get; set; } + [Display(Name = "价格")] + public decimal Price { get; set; } + [Display(Name = "发票分组号")] + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "发票分组号")] + public string LU { get; set; } + [Display(Name = "发货单号、交付识别号")] + public string PN { get; set; } + [Display(Name = "键值")] + public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + + /// + ///扩展1 + /// + [Display(Name = "扩展1")] + public string Extend1 { get; set; } + /// + ///扩展2 + /// + [Display(Name = "扩展2")] + public string Extend2 { get; set; } + /// + ///扩展3 + /// + [Display(Name = "扩展3")] + public string Extend3 { get; set; } + /// + ///业务分类 + /// + + + } + + + + public class PUB_NOT_SA_DETAIL_EXP_DTO + + { + /// + ///关联结算单号 + /// + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + ///业务类别 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } + [Display(Name = "期间")] + public int Version { get; set; } + [Display(Name = "价格")] + public decimal Price { get; set; } + [Display(Name = "发票分组号")] + public string BillNum { get; set; } + [Display(Name = "下线日期")] + public DateTime SettleDate { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } + [Display(Name = "发票分组号")] + public string LU { get; set; } + [Display(Name = "发货单号、交付识别号")] + public string PN { get; set; } + [Display(Name = "键值")] + public string KeyCode { get; set; } + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + [Display(Name = "结算分组号")] + public string GroupNum { get; set; } + /// + ///扩展1 + /// + [ExporterHeader(DisplayName = "扩展1")] + public string Extend1 { get; set; } + /// + ///扩展2 + /// + [ExporterHeader(DisplayName = "扩展2")] + public string Extend2 { get; set; } + /// + ///扩展3 + /// + [ExporterHeader(DisplayName = "扩展3")] + public string Extend3 { get; set; } + + + } + + + + + + + + public class PUB_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto + + { + + [Display(Name = "工厂地点")] + public string Site { get; set; } + + [Display(Name = "业务分类")] + public string BusinessType { get; set; } + + public int Version { get; set; } + public string SettleBillNum { get; set; } + + public string InvGroupNum { get; set; } + public string LU { get; set; } + public string PN { get; set; } + + public string GroupNum { get; set; } + + public virtual List Filters { get; set; } = new List(); + } + +} + + + + + + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_BA_SERVICE.cs index de1f5cdc..6550ba4e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_BA_SERVICE.cs @@ -3,10 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win.Sfs.SettleAccount.Boms; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { public interface IBBAC_BA_SERVICE { + + + + + + + } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_CAN_SA_SERVICE.cs index 73f239d0..11fc8be3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_CAN_SA_SERVICE.cs @@ -3,10 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.DependencyInjection; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos; namespace Win.Sfs.SettleAccount.Entities.BQ { - public interface IBBAC_CAN_SA_SERVICE + public interface IBBAC_CAN_SA_SERVICE:ITransientDependency { + Task GenerateInvoice(BBAC_CAN_SA_REQ_DTO input); + Task> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input); + Task> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input); + Task ExportAsync(BBAC_CAN_SA_REQ_DTO input); + + + } } 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 328bbb2c..288fed55 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 @@ -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 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); + } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_PD_SERVICE.cs index 3dae6105..a2eb34a6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_PD_SERVICE.cs @@ -3,10 +3,27 @@ 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 IBBAC_PD_SERVICE { + + + //Task GenerateInvoice(BBAC_CAN_SA_REQ_DTO input); + //Task> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input); + //Task> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input); + + //Task RejectAsync(BBAC_CAN_SA_REQ_DTO input); + + //Task ExportAsync(BBAC_CAN_SA_REQ_DTO input); + + + + + + } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_CAN_SA_SERVICE.cs index 48ccdb82..a5de7ba5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_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 IHBPO_CAN_SA_SERVICE { + Task GenerateInvoice(HBPO_CAN_SA_REQ_DTO input); + Task> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input); + Task> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input); + Task ExportAsync(HBPO_CAN_SA_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 19bf3edd..0ace972e 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 @@ -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 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); } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj index 13de6698..db34af2d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj @@ -1,4 +1,4 @@ - +