结算期间

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")]
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "PartNumber")]
-    public string PartCode { get; set; }
+    public string LU { get; set; }
 
     /// <summary>
     /// 数量

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

@@ -1,22 +1,22 @@
-using Magicodes.ExporterAndImporter.Core;
-using Microsoft.AspNetCore.Http;
 using System;
 using System.ComponentModel.DataAnnotations;
+using Magicodes.ExporterAndImporter.Core;
+using Microsoft.AspNetCore.Http;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Domain.Entities.Auditing;
 
-namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+
+/// <summary>
+/// PUB结算
+/// </summary>
+public class PUB_SA_DTO : EntityDto<Guid>
 {
-    /// <summary>
-    /// PUB结算
-    /// </summary>
-    public class PUB_SA_DTO : EntityDto<Guid>
-    {
     /// <summary>
     /// 期间
     /// </summary>
     [Display(Name = "期间")]
-        public int Version { get; set; }
+    public string Version { get; set; }
 
     /// <summary>
     /// 结算单据
@@ -29,24 +29,24 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     /// </summary>
     [Display(Name = "状态")]
     public string State { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 查询
+/// 查询
-    /// </summary>
+/// </summary>
-    public class PUB_SARequestDto : RequestDto
+public class PUB_SARequestDto : RequestDto
-    {
+{
     /// <summary>
     /// 业务类别
     /// </summary>
     public EnumBusinessType BusinessType { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 导入请求
+/// 导入请求
-    /// </summary>
+/// </summary>
-    public class PUB_SAImportRequestDto
+public class PUB_SAImportRequestDto
-    {
+{
     /// <summary>
     /// 文件
     /// </summary>
@@ -62,13 +62,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     /// </summary>
     [Display(Name = "期间")]
     public int Version { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 直供件BBAC导入
+/// 直供件BBAC导入
-    /// </summary>
+/// </summary>
-    public class ZhiGongJianBBACImportDto
+public class ZhiGongJianBBACImportDto
-    {
+{
     /// <summary>
     /// 结算日期
     /// </summary>
@@ -106,13 +106,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     [ImporterHeader(Name = "Delivery")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 直供件HBPO导入
+/// 直供件HBPO导入
-    /// </summary>
+/// </summary>
-    public class ZhiGongJianHBPOImportDto
+public class ZhiGongJianHBPOImportDto
-    {
+{
     /// <summary>
     /// 结算日期
     /// </summary>
@@ -150,13 +150,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     [ImporterHeader(Name = "订单编号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 买单件HBPO导入
+/// 买单件HBPO导入
-    /// </summary>
+/// </summary>
-    public class MaiDanJianHBPOImportDto
+public class MaiDanJianHBPOImportDto
-    {
+{
     /// <summary>
     /// 结算日期
     /// </summary>
@@ -194,13 +194,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     [ImporterHeader(Name = "五联单号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 备件导入
+/// 备件导入
-    /// </summary>
+/// </summary>
-    public class BeiJianImportDto : BeiJianExtraImportDto
+public class BeiJianImportDto : BeiJianExtraImportDto
-    {
+{
     /// <summary>
     /// 结算日期
     /// </summary>
@@ -244,13 +244,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     ///// </summary>
     //[Display(Name = "备件扩展")]
     //public BeiJianExtraImportDto beiJianExtraImportDto { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 备件扩展
+/// 备件扩展
-    /// </summary>
+/// </summary>
-    public class BeiJianExtraImportDto
+public class BeiJianExtraImportDto
-    {
+{
     /// <summary>
     /// 交货号
     /// </summary>
@@ -355,13 +355,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     [Display(Name = "商品组")]
     [ImporterHeader(Name = "商品组")]
     public string CommodityGroup { set; get; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 印度件导入
+/// 印度件导入
-    /// </summary>
+/// </summary>
-    public class YinDuJianImportDto
+public class YinDuJianImportDto
-    {
+{
     /// <summary>
     /// 结算日期
     /// </summary>
@@ -406,13 +406,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     [Display(Name = "Supplier")]
     [ImporterHeader(Name = "Supplier")]
     public string Supplier { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// PUB结算明细
+/// PUB结算明细
-    /// </summary>
+/// </summary>
-    public class PUB_SA_DETAIL_DTO : AuditedAggregateRoot<Guid>
+public class PUB_SA_DETAIL_DTO : AuditedAggregateRoot<Guid>
-    {
+{
     /// <summary>
     /// 结算单
     /// </summary>
@@ -449,26 +449,26 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     /// 厂内物料号
     /// </summary>
     public string PartCode { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 结算明细导出请求
+/// 结算明细导出请求
-    /// </summary>
+/// </summary>
-    public class PUB_SA_DETAIL_EXPORT_REQUEST_DTO
+public class PUB_SA_DETAIL_EXPORT_REQUEST_DTO
-    {
+{
     /// <summary>
     /// 结算单号
     /// </summary>
     [Display(Name = "结算单号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string BillNum { set; get; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 结算明细导出
+/// 结算明细导出
-    /// </summary>
+/// </summary>
-    public class PUB_SA_DETAIL_EXPORT_DTO
+public class PUB_SA_DETAIL_EXPORT_DTO
-    {
+{
     /// <summary>
     /// 结算单号
     /// </summary>
@@ -510,13 +510,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     [Display(Name = "结算分组")]
     [ExporterHeader(DisplayName = "Delivery")]
     public string GroupNum { get; set; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Pub结算与发运对比请求
+/// Pub结算与发运对比请求
-    /// </summary>
+/// </summary>
-    public class PubSaSeCompareRequestDto
+public class PubSaSeCompareRequestDto
-    {
+{
     /// <summary>
     /// 期间
     /// </summary>
@@ -550,5 +550,4 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     /// 发运结束时间
     /// </summary>
     public DateTime? SeEndDateTime { get; set; }
-    }
 }

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>
         [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);
             return new PagedResultDto<PUB_SE_DETAIL_DTO>(totalCount, dtos);
         }

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

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

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; }
 
     [DisplayName("单据类型")]
-    public EnumBillType BillType { get; set; }
+    public int? BillType { get; set; }
 
     [DisplayName("子单据类型")]
-    public EnumSubBillType SubBillType { get; set; }
+    public int? SubBillType { get; set; }
 
     [DisplayName("业务类型")]
-    public EnumProTpe ProType { get; set; }
+    public int? ProType { get; set; }
 
     [DisplayName("事务类型")]
-    public EnumDelTransType TransType { get; set; }
+    public int? TransType { get; set; }
 
     [DisplayName("发运主类型")]
     public EnumDeliverBjBmpBillType DeliverBillType { get; set; }