From 849c42688d737eabd2e22fe0b6b18a0d771e755e Mon Sep 17 00:00:00 2001 From: mahao Date: Mon, 31 Jul 2023 08:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs | 309 +++++++++--------- .../Entities/BQ/PUB_SE_DETAIL_SERVICE.cs | 8 +- 2 files changed, 162 insertions(+), 155 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs index 6ab86ecd..ed2f83be 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs @@ -1,160 +1,165 @@ -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 Magicodes.ExporterAndImporter.Core; using Volo.Abp.Application.Dtos; -namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos +namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos; + +/// +/// PUB发运数据 +/// +public class PUB_SE_DETAIL_DTO : EntityDto { /// - /// PUB发运数据 - /// - public class PUB_SE_DETAIL_DTO : EntityDto - { - /// - /// 期间 - /// - [Display(Name = "期间")] - public int Version { set; get; } - - /// - /// 发货时间 - /// - [Display(Name = "发货时间")] - public DateTime ShippingDate { set; get; } - - /// - /// 发运单号 - /// - [Display(Name = "发运单号")] - public string WmsBillNum { set; get; } - - /// - /// 零件号 - /// - [Display(Name = "零件号")] - public string LU { get; set; } - - /// - /// 生产号 - /// - [Display(Name = "生产号")] - public string PN { get; set; } - - /// - /// 组合键值（LU+PN） - /// - [Display(Name = "组合键值（LU+PN）")] - public string KeyCode { get; set; } - - /// - /// 数量 - /// - [Display(Name = "数量")] - public decimal Qty { get; set; } - - /// - /// 日顺序号 - /// - [Display(Name = "日顺序号")] - public string SeqNumber { get; set; } - - /// - /// 小总成号 - /// - [Display(Name = "小总成号")] - public string AssemblyCode { get; set; } - - /// - /// 注塑码 - /// - [Display(Name = "注塑码")] - public string InjectionCode { get; set; } - - /// - /// 订单时间 - /// - [Display(Name = "订单时间")] - public DateTime BeginDate { get; set; } - } - - /// - /// 导出 - /// - public class PUB_SE_DETAIL_EXPORT_DTO - { - /// - /// 期间 - /// - [ExporterHeader(DisplayName = "日顺序号")] - public int Version { set; get; } - - /// - /// 发货时间 - /// - [ExporterHeader(DisplayName = "日顺序号")] - public DateTime ShippingDate { set; get; } - - /// - /// 发运单号 - /// - [ExporterHeader(DisplayName = "日顺序号")] - public string WmsBillNum { set; get; } - - /// - /// 零件号 - /// - [ExporterHeader(DisplayName = "日顺序号")] - public string LU { get; set; } - - /// - /// 生产号 - /// - [ExporterHeader(DisplayName = "日顺序号")] - public string PN { get; set; } - - /// - /// 组合键值（LU+PN） - /// - [ExporterHeader(DisplayName = "日顺序号")] - public string KeyCode { get; set; } - - /// - /// 数量 - /// - [ExporterHeader(DisplayName = "日顺序号")] - public decimal Qty { get; set; } - - /// - /// 日顺序号 - /// - [Display(Name = "日顺序号")] - [ExporterHeader(DisplayName = "日顺序号")] - public string SeqNumber { get; set; } - - /// - /// 小总成号 - /// - [Display(Name = "小总成号")] - [ExporterHeader(DisplayName = "小总成号")] - public string AssemblyCode { get; set; } - - /// - /// 注塑码 - /// - [Display(Name = "注塑码")] - [ExporterHeader(DisplayName = "注塑码")] - public string InjectionCode { get; set; } - - /// - /// 订单时间 - /// - [Display(Name = "订单时间")] - [ExporterHeader(DisplayName = "订单时间")] - public DateTime BeginDate { get; set; } - } + /// 期间 + /// + [Display(Name = "期间")] + public int Version { set; get; } + + /// + /// 发货时间 + /// + [Display(Name = "发货时间")] + public DateTime ShippingDate { set; get; } + + /// + /// 发运单号 + /// + [Display(Name = "发运单号")] + public string WmsBillNum { set; get; } + + /// + /// 零件号 + /// + [Display(Name = "零件号")] + public string LU { get; set; } + + /// + /// 生产号 + /// + [Display(Name = "生产号")] + public string PN { get; set; } + + /// + /// 组合键值（LU+PN） + /// + [Display(Name = "组合键值（LU+PN）")] + public string KeyCode { get; set; } + + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { get; set; } + + /// + /// 日顺序号 + /// + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } + + /// + /// 小总成号 + /// + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } + + /// + /// 注塑码 + /// + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } + /// + /// 订单时间 + /// + [Display(Name = "订单时间")] + public DateTime BeginDate { get; set; } +} + +/// +/// 查询 +/// +public class PUB_SE_DETAIL_RequestDto : RequestDto +{ + /// + /// 业务类别 + /// + public EnumBusinessType BusinessType { get; set; } +} + +/// +/// 导出 +/// +public class PUB_SE_DETAIL_EXPORT_DTO +{ + /// + /// 期间 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public int Version { set; get; } + + /// + /// 发货时间 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public DateTime ShippingDate { set; get; } + + /// + /// 发运单号 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string WmsBillNum { set; get; } + + /// + /// 零件号 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string LU { get; set; } + + /// + /// 生产号 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string PN { get; set; } + + /// + /// 组合键值（LU+PN） + /// + [ExporterHeader(DisplayName = "日顺序号")] + public string KeyCode { get; set; } + + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "日顺序号")] + public decimal Qty { get; set; } + + /// + /// 日顺序号 + /// + [Display(Name = "日顺序号")] + [ExporterHeader(DisplayName = "日顺序号")] + public string SeqNumber { get; set; } + + /// + /// 小总成号 + /// + [Display(Name = "小总成号")] + [ExporterHeader(DisplayName = "小总成号")] + public string AssemblyCode { get; set; } + + /// + /// 注塑码 + /// + [Display(Name = "注塑码")] + [ExporterHeader(DisplayName = "注塑码")] + public string InjectionCode { get; set; } + + /// + /// 订单时间 + /// + [Display(Name = "订单时间")] + [ExporterHeader(DisplayName = "订单时间")] + public DateTime BeginDate { get; set; } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs index 17344159..e5c9f289 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; using Shouldly; @@ -10,6 +10,7 @@ using Volo.Abp.Application.Services; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.Shared.Filter; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { @@ -64,8 +65,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// 获取列表 /// [HttpPost] - public async Task> GetListAsync(RequestDto input) + public async Task> GetListAsync(PUB_SE_DETAIL_RequestDto input) { + input.Filters.Add(new FilterCondition("BusinessType", input.BusinessType.ToString(), EnumFilterAction.Equal, EnumFilterLogic.And)); var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); var totalCount = await _repository.GetCountByFilterAsync(input.Filters); var dtos = ObjectMapper.Map, List>(entities); @@ -74,4 +76,4 @@ namespace Win.Sfs.SettleAccount.Entities.BQ #endregion } -} \ No newline at end of file +}