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 6b74291e..e862b2ea 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 @@ -74,6 +74,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// 零件号 /// public string LU { get; set; } + + + /// + /// 物料描述 + /// + public string MaterialDesc { get; set; } + + /// /// 生产号 /// @@ -124,6 +132,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [ExporterHeader(DisplayName = "LU")] public string LU { get; set; } + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc { get; set; } + + + [ExporterHeader(DisplayName = "生产码")] public string PN { get; set; } public string KeyCode { get; set; } 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 825c4afc..ee84a141 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 @@ -99,6 +99,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public string InvGroupNum { get; set; } [ExporterHeader(DisplayName = "LU")] public string LU { get; set; } + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc { get; set; } + [ExporterHeader(DisplayName = "生产码")] public string PN { get; set; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_PD_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_PD_DTO.cs new file mode 100644 index 00000000..645dba67 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_PD_DTO.cs @@ -0,0 +1,262 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Application.Dtos; +using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.Shared.Filter; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + namespace SettleAccount.Domain.BQ + { + public class BBAC_PD_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 InvGroupNum { get; set; } + /// + ///地点 + /// + [Display(Name = "地点")] + public string Site { get; set; } + + } + public class BBAC_PD_EXPORT + { + /// + ///期间 + /// + [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 InvGroupNum { get; set; } + /// + ///地点 + /// + [ExporterHeader(DisplayName = "地点")] + public string Site { get; set; } + + } + public class BBAC_PD_REQ_DTO : RequestInputBase + { + [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 InvGroupNum { get; set; } + [Display(Name = "地点")] + public string Site { get; set; } + + } + public class BBAC_PD_DETAIL_DTO : EntityDto + { + + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 发票分组号 + /// + public string BillNum { get; set; } + /// + /// 数量 + /// + public decimal Qty { get; set; } + /// + /// 价格 + /// + public decimal Price { get; set; } + /// + /// 发票分组号 + /// + public string InvGroupNum { get; set; } + /// + /// 下线日期 + /// + public DateTime SettleDate { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + /// + /// 零件LU + /// + public string LU { get; set; } + /// + /// 生产码 + /// + public string PN { get; set; } + + /// + /// 替换零件号 + /// + public string RELU { get; set; } + /// + /// 替换生产码 + /// + public string REPN { get; set; } + /// + /// 键值 + /// + public string KeyCode { get; set; } + /// + /// 扩展字段1 + /// + public string Extend1 { get; set; } + /// + /// 扩展字段2 + /// + public string Extend2 { get; set; } + /// + /// 扩展字段3 + /// + public string Extend3 { get; set; } + /// + /// 扩展字段4 + /// + public string Extend4 { get; set; } + + } + public class BBAC_PD_DETAIL_EXP_DTO + + { + + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + + /// + /// 版本 + /// + [ExporterHeader(DisplayName = "期间")] + public int Version { get; set; } + /// + /// 发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { get; set; } + /// + /// 价格 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + /// + /// 发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + /// + /// 下线日期 + /// + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + /// + /// 结算分组号 + /// + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + /// + /// 零件LU + /// + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + /// + /// 生产码 + /// + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + + /// + /// 替换零件号 + /// + [ExporterHeader(DisplayName = "替换LU")] + public string RELU { get; set; } + /// + /// 替换生产码 + /// + [ExporterHeader(DisplayName = "替换生产码")] + public string REPN { get; set; } + /// + /// 键值 + /// + + //public string KeyCode { get; set; } + ///// + ///// 扩展字段1 + ///// + //public string Extend1 { get; set; } + ///// + ///// 扩展字段2 + ///// + //public string Extend2 { get; set; } + ///// + ///// 扩展字段3 + ///// + //public string Extend3 { get; set; } + ///// + ///// 扩展字段4 + ///// + //public string Extend4 { get; set; } + + } + public class BBAC_PD_DETAIL_REQ_DTO : RequestInputBase + { + /// + /// 发票分组号 + /// + public string BillNum { get; set; } + + + } + } + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs index c19c58f1..86f8863a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs @@ -33,6 +33,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// [Display(Name = "零件号")] public string LU { get; set; } + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc { get; set; } + /// /// 生产号 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs index 5a8ee0e7..a7b7c0ff 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_EDI_DTO.cs @@ -34,6 +34,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "生产码")] public string PN { get; set; } + + + /// /// 日顺序号 /// 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 index c5586aba..fd9dfab7 100644 --- 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 @@ -74,6 +74,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// 零件号 /// public string LU { get; set; } + + + public string MaterialDesc { get; set; } + + /// /// 生产号 /// @@ -124,6 +129,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [ExporterHeader(DisplayName = "LU")] public string LU { get; set; } + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc { get; set; } + + [ExporterHeader(DisplayName = "生产码")] public string PN { get; set; } public string KeyCode { get; set; } 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 index 3c85479d..4f281843 100644 --- 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 @@ -48,6 +48,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// public string LU { get; set; } /// + /// 物料描述 + /// + public string MaterialDesc { get; set; } + /// /// 生产号 /// public string PN { get; set; } @@ -97,6 +101,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [ExporterHeader(DisplayName = "LU")] public string LU { get; set; } + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc { get; set; } + [ExporterHeader(DisplayName = "生产码")] public string PN { get; set; } public string KeyCode { get; set; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_PD_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_PD_DTO.cs new file mode 100644 index 00000000..31760284 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_PD_DTO.cs @@ -0,0 +1,263 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Application.Dtos; +using Win.Sfs.SettleAccount.Bases; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + public class HBPO_PD_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 InvGroupNum { get; set; } + /// + ///地点 + /// + [Display(Name = "地点")] + public string Site { get; set; } + + } + public class HBPO_PD_EXPORT + { + /// + ///期间 + /// + [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 InvGroupNum { get; set; } + /// + ///地点 + /// + [ExporterHeader(DisplayName = "地点")] + public string Site { get; set; } + + } + public class HBPO_PD_REQ_DTO : RequestInputBase + { + [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 InvGroupNum { get; set; } + [Display(Name = "地点")] + public string Site { get; set; } + + } + public class HBPO_PD_DETAIL_DTO : EntityDto + { + + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 发票分组号 + /// + public string BillNum { get; set; } + /// + /// 数量 + /// + public decimal Qty { get; set; } + /// + /// 价格 + /// + public decimal Price { get; set; } + /// + /// 发票分组号 + /// + public string InvGroupNum { get; set; } + /// + /// 下线日期 + /// + public DateTime SettleDate { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + /// + /// 零件LU + /// + public string LU { get; set; } + + /// + /// 物料描述 + /// + public string MaterialDesc { get; set; } + + /// + /// 生产码 + /// + public string PN { get; set; } + + /// + /// 替换零件号 + /// + public string RELU { get; set; } + /// + /// 替换生产码 + /// + public string REPN { get; set; } + /// + /// 键值 + /// + public string KeyCode { get; set; } + /// + /// 扩展字段1 + /// + public string Extend1 { get; set; } + /// + /// 扩展字段2 + /// + public string Extend2 { get; set; } + /// + /// 扩展字段3 + /// + public string Extend3 { get; set; } + /// + /// 扩展字段4 + /// + public string Extend4 { get; set; } + + } + public class HBPO_PD_DETAIL_EXP_DTO + + { + + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + /// + /// 版本 + /// + [ExporterHeader(DisplayName = "期间")] + public int Version { get; set; } + /// + /// 发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { get; set; } + /// + /// 价格 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + /// + /// 发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + /// + /// 下线日期 + /// + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + /// + /// 结算分组号 + /// + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + /// + /// 零件LU + /// + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + [ExporterHeader(DisplayName = "物料描述")] + public string MaterialDesc{ get; set; } + /// + /// 生产码 + /// + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + + /// + /// 替换零件号 + /// + [ExporterHeader(DisplayName = "替换LU")] + public string RELU { get; set; } + /// + /// 替换生产码 + /// + [ExporterHeader(DisplayName = "替换生产码")] + public string REPN { get; set; } + /// + /// 键值 + /// + + //public string KeyCode { get; set; } + ///// + ///// 扩展字段1 + ///// + //public string Extend1 { get; set; } + ///// + ///// 扩展字段2 + ///// + //public string Extend2 { get; set; } + ///// + ///// 扩展字段3 + ///// + //public string Extend3 { get; set; } + ///// + ///// 扩展字段4 + ///// + //public string Extend4 { get; set; } + + } + public class HBPO_PD_DETAIL_REQ_DTO : RequestInputBase + { + /// + /// 发票分组号 + /// + public string BillNum { get; set; } + + + } + +} 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 6d7a28e4..7082510c 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 @@ -94,7 +94,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public string InvGroupNum { get; set; } [Display(Name = "发票分组号")] public string LU { get; set; } - [Display(Name = "发货单号、交付识别号")] + [Display(Name = "")] public string PN { get; set; } [Display(Name = "键值")] public string KeyCode { get; set; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_PD_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_PD_DTO.cs new file mode 100644 index 00000000..cc1fb606 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_PD_DTO.cs @@ -0,0 +1,264 @@ +using Magicodes.ExporterAndImporter.Core; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Application.Dtos; +using Win.Sfs.SettleAccount.Bases; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +{ + public class PUB_PD_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 InvGroupNum { get; set; } + /// + ///地点 + /// + [Display(Name = "地点")] + public string Site { get; set; } + [Display(Name = "业务类型")] + public EnumBusinessType BusinessType { get; set; } + + } + public class PUB_PD_EXPORT + { + /// + ///期间 + /// + [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 InvGroupNum { get; set; } + /// + ///地点 + /// + [ExporterHeader(DisplayName = "地点")] + public string Site { get; set; } + + } + public class PUB_PD_REQ_DTO : RequestInputBase + { + [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 InvGroupNum { get; set; } + [Display(Name = "地点")] + public string Site { get; set; } + + [Display(Name = "业务类型")] + public EnumBusinessType BusinessType { get; set; } + } + public class PUB_PD_DETAIL_DTO : EntityDto + { + + /// + ///工厂地点 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } + /// + /// 版本 + /// + public int Version { get; set; } + /// + /// 发票分组号 + /// + public string BillNum { get; set; } + /// + /// 数量 + /// + public decimal Qty { get; set; } + /// + /// 价格 + /// + public decimal Price { get; set; } + /// + /// 发票分组号 + /// + public string InvGroupNum { get; set; } + /// + /// 下线日期 + /// + public DateTime SettleDate { get; set; } + /// + /// 结算分组号 + /// + public string GroupNum { get; set; } + /// + /// 零件LU + /// + public string LU { get; set; } + /// + /// 生产码 + /// + public string PN { get; set; } + + /// + /// 替换零件号 + /// + public string RELU { get; set; } + /// + /// 替换生产码 + /// + public string REPN { get; set; } + /// + /// 键值 + /// + public string KeyCode { get; set; } + /// + /// 扩展字段1 + /// + public string Extend1 { get; set; } + /// + /// 扩展字段2 + /// + public string Extend2 { get; set; } + /// + /// 扩展字段3 + /// + public string Extend3 { get; set; } + /// + /// 扩展字段4 + /// + public string Extend4 { get; set; } + + } + + + + public class PUB_PD_DETAIL_EXP_DTO + + { + + /// + ///工厂地点 + /// + [ExporterHeader(DisplayName = "工厂地点")] + public string Site { get; set; } + + /// + /// 版本 + /// + [ExporterHeader(DisplayName = "期间")] + public int Version { get; set; } + /// + /// 发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string BillNum { get; set; } + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { get; set; } + /// + /// 价格 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { get; set; } + /// + /// 发票分组号 + /// + [ExporterHeader(DisplayName = "发票分组号")] + public string InvGroupNum { get; set; } + /// + /// 下线日期 + /// + [ExporterHeader(DisplayName = "下线日期")] + public DateTime SettleDate { get; set; } + /// + /// 结算分组号 + /// + [ExporterHeader(DisplayName = "结算分组号")] + public string GroupNum { get; set; } + /// + /// 零件LU + /// + [ExporterHeader(DisplayName = "LU")] + public string LU { get; set; } + /// + /// 生产码 + /// + [ExporterHeader(DisplayName = "生产码")] + public string PN { get; set; } + + /// + /// 替换零件号 + /// + [ExporterHeader(DisplayName = "替换LU")] + public string RELU { get; set; } + /// + /// 替换生产码 + /// + [ExporterHeader(DisplayName = "替换生产码")] + public string REPN { get; set; } + /// + /// 键值 + /// + + //public string KeyCode { get; set; } + ///// + ///// 扩展字段1 + ///// + //public string Extend1 { get; set; } + ///// + ///// 扩展字段2 + ///// + //public string Extend2 { get; set; } + ///// + ///// 扩展字段3 + ///// + //public string Extend3 { get; set; } + ///// + ///// 扩展字段4 + ///// + //public string Extend4 { get; set; } + + } + + public class PUB_PD_DETAIL_REQ_DTO : RequestInputBase + { + /// + /// 发票分组号 + /// + public string BillNum { get; set; } + + + } + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index f16999ea..fd2b86dc 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -85,10 +85,8 @@ namespace Win.Sfs.SettleAccount.Bases { IExporter _csv = new CsvExporter(); IExporter _excel = new ExcelExporter(); - var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true); var dtoDetails = ObjectMapper.Map, List>(entities); - var classDisplayName = typeof(INVOICE_GRP_DTO).GetCustomAttribute()?.Name ?? typeof(INVOICE_GRP_DTO).Name; string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx"; byte[] result = null; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index 86112931..aaf8b1d7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -1,12 +1,137 @@ -using System; +using AutoMapper; +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Csv; +using Magicodes.ExporterAndImporter.Excel; +using Microsoft.AspNetCore.Mvc; +using SettleAccount.Bases; +using Shouldly; +using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Volo.Abp.Domain.Entities; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.Constant; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Bases { - internal class PD_SERVICE + public class PD_SERVICE : ApplicationService + where TEntity : PD_BASE_MAIN + where TEntityDetail : PD_BASE + where TEntityDto : class, IEntityDto, new() + where TEntityDetailDto : class, IEntityDto, new() + where TRequestMainInput : RequestInputBase + where TRequestDetailInput : RequestInputBase + where TEntityDetailExportDto : class, new() { + + private readonly INormalEfCoreRepository _repository; + private readonly INormalEfCoreRepository _detailRepository; + private readonly IExcelImportAppService _excelImportService; + + protected PD_SERVICE( + INormalEfCoreRepository repository, + IExcelImportAppService excelImportService, + INormalEfCoreRepository detailRepository + + ) + { + _excelImportService = excelImportService; + _repository = repository; + _detailRepository = detailRepository; + + + } + + [HttpPost] + //[Route("detailquery")] + public virtual async Task> DetailQueryAsync(TRequestDetailInput input) + { + + var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); + var totalCount = await _detailRepository.GetCountByFilterAsync(input.Filters); + var dtos = ObjectMapper.Map, List>(entitys); + return new PagedResultDto(totalCount, dtos); + + } + [HttpPost] + //[Route("export")] + public virtual async Task ExportAsync(TRequestDetailInput input) + { + IExporter _csv = new CsvExporter(); + IExporter _excel = new ExcelExporter(); + + var entities = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true); + var dtoDetails = ObjectMapper.Map, List>(entities); + + var classDisplayName = typeof(TEntityDetailExportDto).GetCustomAttribute()?.Name ?? typeof(TEntityDetailExportDto).Name; + string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx"; + byte[] result = null; + + switch (input.FileType) + { + case 0: + result = await _csv.ExportAsByteArray(dtoDetails); + break; + case 1: + result = await _excel.ExportAsByteArray(dtoDetails); + break; + } + result.ShouldNotBeNull(); + + //保存导出文件到服务器存成二进制 + await _excelImportService.SaveBlobAsync( + new SaveExcelImportInputDto + { + Name = _fileName, + Content = result + } + ); + return _fileName; + } + [HttpPost] + //[Route("generateinvoice")] + public virtual async Task ApprovalPassed(TRequestMainInput input) + { + return ApplicationConsts.SuccessStr; + } + [HttpPost] + //[Route("mainquery")] + public virtual async Task> MainQueryAsync(TRequestMainInput input) + { + var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); + var totalCount = await _repository.GetCountByFilterAsync(input.Filters); + var dtos = ObjectMapper.Map, List>(entitys); + return new PagedResultDto(totalCount, dtos); + } + + [HttpPost] + public virtual async Task RejectAsync(TRequestMainInput input) + { + return ApplicationConsts.SuccessStr; + + } + + + + + + + + + + + + + + + } } 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 5b6d9166..85c8058b 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,17 +1,27 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components; +using SettleAccount.Domain.BQ; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp.Application.Services; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ; +using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] [Route("api/settleaccount/bbac_pd_service")] - public class BBAC_PD_SERVICE : ApplicationService + public class BBAC_PD_SERVICE : PD_SERVICE { + protected BBAC_PD_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository) + { + } } } 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 244c4203..5541dd50 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,17 +1,28 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components; +using SettleAccount.Domain.BQ; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp.Application.Services; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ; +using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] [Route("api/settleaccount/hbpo_pd_service")] - public class HBPO_PD_SERVICE : ApplicationService + public class HBPO_PD_SERVICE : PD_SERVICE { + protected HBPO_PD_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository) + { + } } } 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 6a6fbae8..990278ea 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,17 +1,28 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components; +using SettleAccount.Domain.BQ; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp.Application.Services; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ; +using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { [AllowAnonymous] [Route("api/settleaccount/pub_pd_service")] - public class PUB_PD_SERVICE : ApplicationService + public class PUB_PD_SERVICE : PD_SERVICE { + protected PUB_PD_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository) + { + } } }