发运数据

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;
+
+/// <summary>
+/// PUB发运数据
+/// </summary>
+public class PUB_SE_DETAIL_DTO : EntityDto<Guid>
 {
     /// <summary>
-    /// PUB发运数据
-    /// </summary>
-    public class PUB_SE_DETAIL_DTO : EntityDto<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [Display(Name = "发货时间")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [Display(Name = "发运单号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "生产号")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [Display(Name = "组合键值（LU+PN）")]
-        public string KeyCode { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
-
-    /// <summary>
-    /// 导出
-    /// </summary>
-    public class PUB_SE_DETAIL_EXPORT_DTO
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string KeyCode { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        [ExporterHeader(DisplayName = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        [ExporterHeader(DisplayName = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        [ExporterHeader(DisplayName = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    public int Version { set; get; }
+
+    /// <summary>
+    /// 发货时间 
+    /// </summary>
+    [Display(Name = "发货时间")]
+    public DateTime ShippingDate { set; get; }
+
+    /// <summary>
+    /// 发运单号
+    /// </summary>
+    [Display(Name = "发运单号")]
+    public string WmsBillNum { set; get; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "生产号")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 组合键值（LU+PN）
+    /// </summary>
+    [Display(Name = "组合键值（LU+PN）")]
+    public string KeyCode { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 日顺序号
+    /// </summary>
+    [Display(Name = "日顺序号")]
+    public string SeqNumber { get; set; }
+
+    /// <summary>
+    /// 小总成号
+    /// </summary>
+    [Display(Name = "小总成号")]
+    public string AssemblyCode { get; set; }
+
+    /// <summary>
+    /// 注塑码
+    /// </summary>
+    [Display(Name = "注塑码")]
+    public string InjectionCode { get; set; }
 
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    [Display(Name = "订单时间")]
+    public DateTime BeginDate { get; set; }
+}
+
+/// <summary>
+/// 查询
+/// </summary>
+public class PUB_SE_DETAIL_RequestDto : RequestDto
+{
+    /// <summary>
+    /// 业务类别
+    /// </summary>
+    public EnumBusinessType BusinessType { get; set; }
+}
+
+/// <summary>
+/// 导出
+/// </summary>
+public class PUB_SE_DETAIL_EXPORT_DTO
+{
+    /// <summary>
+    /// 期间
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public int Version { set; get; }
+
+    /// <summary>
+    /// 发货时间 
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public DateTime ShippingDate { set; get; }
+
+    /// <summary>
+    /// 发运单号
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public string WmsBillNum { set; get; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 组合键值（LU+PN）
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public string KeyCode { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 日顺序号
+    /// </summary>
+    [Display(Name = "日顺序号")]
+    [ExporterHeader(DisplayName = "日顺序号")]
+    public string SeqNumber { get; set; }
+
+    /// <summary>
+    /// 小总成号
+    /// </summary>
+    [Display(Name = "小总成号")]
+    [ExporterHeader(DisplayName = "小总成号")]
+    public string AssemblyCode { get; set; }
+
+    /// <summary>
+    /// 注塑码
+    /// </summary>
+    [Display(Name = "注塑码")]
+    [ExporterHeader(DisplayName = "注塑码")]
+    public string InjectionCode { get; set; }
+
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    [Display(Name = "订单时间")]
+    [ExporterHeader(DisplayName = "订单时间")]
+    public DateTime BeginDate { get; set; }
 }

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
         /// 获取列表
         /// </summary>
         [HttpPost]
-        public async Task<PagedResultDto<PUB_SE_DETAIL_DTO>> GetListAsync(RequestDto input)
+        public async Task<PagedResultDto<PUB_SE_DETAIL_DTO>> 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<PUB_SE_DETAIL>, List<PUB_SE_DETAIL_DTO>>(entities);
@@ -74,4 +76,4 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         #endregion
 
     }
-}
+}