Browse Source

结算期间

master
mahao 1 year ago
parent
commit
b85a671f70
  1. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
  2. 1091
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
  3. 7
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs
  4. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs
  5. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
  6. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs

2
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs

@ -130,7 +130,7 @@ public class HBPO_SA_DETAIL_IMPORT_DTO
[Display(Name = "PartNumber")] [Display(Name = "PartNumber")]
[Required(ErrorMessage = "{0}不能为空")] [Required(ErrorMessage = "{0}不能为空")]
[ImporterHeader(Name = "PartNumber")] [ImporterHeader(Name = "PartNumber")]
public string PartCode { get; set; } public string LU { get; set; }
/// <summary> /// <summary>
/// 数量 /// 数量

1091
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs

File diff suppressed because it is too large

7
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs

@ -74,11 +74,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// 获取列表 /// 获取列表
/// </summary> /// </summary>
[HttpPost] [HttpPost]
public async Task<PagedResultDto<PUB_SE_DETAIL_DTO>> GetListAsync(PUB_SE_DETAIL_RequestDto input) public async Task<PagedResultDto<PUB_SE_DETAIL_DTO>> GetListAsync(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).ConfigureAwait(false);
var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
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);
return new PagedResultDto<PUB_SE_DETAIL_DTO>(totalCount, dtos); return new PagedResultDto<PUB_SE_DETAIL_DTO>(totalCount, dtos);
} }

8
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs

@ -72,16 +72,16 @@ public class TM_BJBMPT_JIS_RECORD
public string RefVinCode { get; set; } public string RefVinCode { get; set; }
[DisplayName("单据类型")] [DisplayName("单据类型")]
public EnumBillType BillType { get; set; } public int? BillType { get; set; }
[DisplayName("子单据类型")] [DisplayName("子单据类型")]
public EnumSubBillType SubBillType { get; set; } public int? SubBillType { get; set; }
[DisplayName("单据性质")] [DisplayName("单据性质")]
public string BillCharacter { get; set; } public string BillCharacter { get; set; }
[DisplayName("事务类型")] [DisplayName("事务类型")]
public EnumDelTransType TransType { get; set; } public int? TransType { get; set; }
[DisplayName("发运主类型")] [DisplayName("发运主类型")]
public EnumDeliverBjBmpBillType DeliverBillType { get; set; } public EnumDeliverBjBmpBillType DeliverBillType { get; set; }
@ -111,7 +111,7 @@ public class TM_BJBMPT_JIS_RECORD
public string MatchNumber { get; set; } public string MatchNumber { get; set; }
[DisplayName("业务类型")] [DisplayName("业务类型")]
public EnumProTpe ProType { get; set; } public int? ProType { get; set; }
[DisplayName("发货条码")] [DisplayName("发货条码")]
public string DeliverCode { get; set; } public string DeliverCode { get; set; }

8
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs

@ -69,13 +69,13 @@ public class TM_BJBMPT_JIT_RECORD
public string ToLoc { get; set; } public string ToLoc { get; set; }
[DisplayName("单据类型")] [DisplayName("单据类型")]
public EnumBillType BillType { get; set; } public int? BillType { get; set; }
[DisplayName("子单据类型")] [DisplayName("子单据类型")]
public EnumSubBillType SubBillType { get; set; } public int? SubBillType { get; set; }
[DisplayName("事务类型")] [DisplayName("事务类型")]
public EnumDelTransType TransType { get; set; } public int? TransType { get; set; }
[DisplayName("发运主类型")] [DisplayName("发运主类型")]
public EnumDeliverBjBmpBillType DeliverBillType { get; set; } public EnumDeliverBjBmpBillType DeliverBillType { get; set; }
@ -93,7 +93,7 @@ public class TM_BJBMPT_JIT_RECORD
public string Remark { get; set; } public string Remark { get; set; }
[DisplayName("业务类型")] [DisplayName("业务类型")]
public EnumProTpe ProType { get; set; } public int? ProType { get; set; }
[DisplayName("JIS排序单号")] [DisplayName("JIS排序单号")]
public string OrderNum { get; set; } public string OrderNum { get; set; }

8
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs

@ -81,16 +81,16 @@ public class TM_BJBMPT_OTHER_RECORD
public string Remark { get; set; } public string Remark { get; set; }
[DisplayName("单据类型")] [DisplayName("单据类型")]
public EnumBillType BillType { get; set; } public int? BillType { get; set; }
[DisplayName("子单据类型")] [DisplayName("子单据类型")]
public EnumSubBillType SubBillType { get; set; } public int? SubBillType { get; set; }
[DisplayName("业务类型")] [DisplayName("业务类型")]
public EnumProTpe ProType { get; set; } public int? ProType { get; set; }
[DisplayName("事务类型")] [DisplayName("事务类型")]
public EnumDelTransType TransType { get; set; } public int? TransType { get; set; }
[DisplayName("发运主类型")] [DisplayName("发运主类型")]
public EnumDeliverBjBmpBillType DeliverBillType { get; set; } public EnumDeliverBjBmpBillType DeliverBillType { get; set; }

Loading…
Cancel
Save