BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

发运数据

master
mahao 1 year ago
parent
2e13a294c2
commit
849c42688d
2 changed files with 162 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 309
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs
  2. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs

309
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs
View File

@ -1,160 +1,165 @@
using Magicodes.ExporterAndImporter.Core;
using System; using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using Magicodes.ExporterAndImporter.Core;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos; 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> /// <summary>
/// PUB发运数据 /// 期间
/// </summary> /// </summary>
public class PUB_SE_DETAIL_DTO : EntityDto<Guid> [Display(Name = "期间")]
{ public int Version { set; get; }
/// <summary>
/// 期间 /// <summary>
/// </summary> /// 发货时间
[Display(Name = "期间")] /// </summary>
public int Version { set; get; } [Display(Name = "发货时间")]
public DateTime ShippingDate { set; get; }
/// <summary>
/// 发货时间 /// <summary>
/// </summary> /// 发运单号
[Display(Name = "发货时间")] /// </summary>
public DateTime ShippingDate { set; get; } [Display(Name = "发运单号")]
public string WmsBillNum { set; get; }
/// <summary>
/// 发运单号 /// <summary>
/// </summary> /// 零件号
[Display(Name = "发运单号")] /// </summary>
public string WmsBillNum { set; get; } [Display(Name = "零件号")]
public string LU { get; set; }
/// <summary>
/// 零件号 /// <summary>
/// </summary> /// 生产号
[Display(Name = "零件号")] /// </summary>
public string LU { get; set; } [Display(Name = "生产号")]
public string PN { get; set; }
/// <summary>
/// 生产号 /// <summary>
/// </summary> /// 组合键值（LU+PN）
[Display(Name = "生产号")] /// </summary>
public string PN { get; set; } [Display(Name = "组合键值（LU+PN）")]
public string KeyCode { get; set; }
/// <summary>
/// 组合键值（LU+PN） /// <summary>
/// </summary> /// 数量
[Display(Name = "组合键值（LU+PN）")] /// </summary>
public string KeyCode { get; set; } [Display(Name = "数量")]
public decimal Qty { get; set; }
/// <summary>
/// 数量 /// <summary>
/// </summary> /// 日顺序号
[Display(Name = "数量")] /// </summary>
public decimal Qty { get; set; } [Display(Name = "日顺序号")]
public string SeqNumber { get; set; }
/// <summary>
/// 日顺序号 /// <summary>
/// </summary> /// 小总成号
[Display(Name = "日顺序号")] /// </summary>
public string SeqNumber { get; set; } [Display(Name = "小总成号")]
public string AssemblyCode { get; set; }
/// <summary>
/// 小总成号 /// <summary>
/// </summary> /// 注塑码
[Display(Name = "小总成号")] /// </summary>
public string AssemblyCode { get; set; } [Display(Name = "注塑码")]
public string InjectionCode { 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>
/// 订单时间
/// </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; }
} }

6
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs
View File

@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SettleAccount.Domain.BQ; using SettleAccount.Domain.BQ;
using Shouldly; using Shouldly;
@ -10,6 +10,7 @@ using Volo.Abp.Application.Services;
using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.BaseData.ImportExcelCommon;
using Win.Sfs.SettleAccount.Entities.BQ.Dtos; using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
using Win.Sfs.SettleAccount.ExcelImporter; using Win.Sfs.SettleAccount.ExcelImporter;
using Win.Sfs.Shared.Filter;
using Win.Sfs.Shared.RepositoryBase; using Win.Sfs.Shared.RepositoryBase;
namespace Win.Sfs.SettleAccount.Entities.BQ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
@ -64,8 +65,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// 获取列表 /// 获取列表
/// </summary> /// </summary>
[HttpPost] [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 entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
var totalCount = await _repository.GetCountByFilterAsync(input.Filters); var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
var dtos = ObjectMapper.Map<List<PUB_SE_DETAIL>, List<PUB_SE_DETAIL_DTO>>(entities); var dtos = ObjectMapper.Map<List<PUB_SE_DETAIL>, List<PUB_SE_DETAIL_DTO>>(entities);

Write Preview
Loading…
Cancel
Save