From b85a671f70e565ef3867d6ef7dd6351da1cee536 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 16 Aug 2023 13:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=9C=9F=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/HBPO_SA_DTO.cs           |    2 +-
 .../Entities/BQ/Dtos/PUB_SA_DTO.cs            | 1091 ++++++++---------
 .../Entities/BQ/PUB_SE_DETAIL_SERVICE.cs      |    7 +-
 .../Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs |    8 +-
 .../Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs |    8 +-
 .../BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs        |    8 +-
 6 files changed, 561 insertions(+), 563 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
index bb31d34a..346f0f81 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
+++ b/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>
     /// 数量
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
index 4f9c0726..9e421dba 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
@@ -1,554 +1,553 @@
-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>
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    public string Version { get; set; }
+
+    /// <summary>
+    /// 结算单据
+    /// </summary>
+    [Display(Name = "结算单据")]
+    public string BillNum { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; }
+}
+
+/// <summary>
+/// 查询
+/// </summary>
+public class PUB_SARequestDto : RequestDto
+{
+    /// <summary>
+    /// 业务类别
+    /// </summary>
+    public EnumBusinessType BusinessType { get; set; }
+}
+
+/// <summary>
+/// 导入请求
+/// </summary>
+public class PUB_SAImportRequestDto
+{
+    /// <summary>
+    /// 文件
+    /// </summary>
+    public IFormFileCollection Files { get; set; }
+
+    /// <summary>
+    /// 业务类别
+    /// </summary>
+    public EnumBusinessType BusinessType { get; set; }
+
+    /// <summary>
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    public int Version { get; set; }
+}
+
+/// <summary>
+/// 直供件BBAC导入
+/// </summary>
+public class ZhiGongJianBBACImportDto
+{
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    [Display(Name = "Pstng Date")]
+    [ImporterHeader(Name = "Pstng Date")]
+    public DateTime SettleDate { set; get; }
+
+    /// <summary>
+    /// 客户零件号
+    /// </summary>
+    [Display(Name = "Material")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    [ImporterHeader(Name = "Material")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "External Delivery ID")]
+    [ImporterHeader(Name = "External Delivery ID")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "Quantity")]
+    [ImporterHeader(Name = "Quantity")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    [Display(Name = "Delivery")]
+    [ImporterHeader(Name = "Delivery")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string GroupNum { get; set; }
+}
+
+/// <summary>
+/// 直供件HBPO导入
+/// </summary>
+public class ZhiGongJianHBPOImportDto
+{
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    [Display(Name = "结算日期")]
+    [ImporterHeader(IsIgnore = true)]
+    public DateTime SettleDate { set; get; }
+
+    /// <summary>
+    /// 客户零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    [ImporterHeader(Name = "零件号")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "订单编号")]
+    [ImporterHeader(Name = "订单编号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [ImporterHeader(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    [Display(Name = "订单编号")]
+    [ImporterHeader(Name = "订单编号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string GroupNum { get; set; }
+}
+
+/// <summary>
+/// 买单件HBPO导入
+/// </summary>
+public class MaiDanJianHBPOImportDto
+{
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    [Display(Name = "买单日期")]
+    [ImporterHeader(Name = "买单日期")]
+    public DateTime SettleDate { set; get; }
+
+    /// <summary>
+    /// 客户零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    [ImporterHeader(Name = "零件号")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "现产品生产号")]
+    [ImporterHeader(Name = "现产品生产号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [ImporterHeader(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    [Display(Name = "五联单号")]
+    [ImporterHeader(Name = "五联单号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string GroupNum { get; set; }
+}
+
+/// <summary>
+/// 备件导入
+/// </summary>
+public class BeiJianImportDto : BeiJianExtraImportDto
+{
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    [Display(Name = "结算日期")]
+    [ImporterHeader(Name = "零件时间")]
+    public DateTime SettleDate { set; get; }
+
+    /// <summary>
+    /// 客户零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    [ImporterHeader(Name = "零件号")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "交付识别号")]
+    [ImporterHeader(Name = "交付识别号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [ImporterHeader(Name = "数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    [Display(Name = "凭证号")]
+    [ImporterHeader(Name = "凭证号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string GroupNum { get; set; }
+
+    ///// <summary>
+    ///// 备件扩展
+    ///// </summary>
+    //[Display(Name = "备件扩展")]
+    //public BeiJianExtraImportDto beiJianExtraImportDto { get; set; }
+}
+
+/// <summary>
+/// 备件扩展
+/// </summary>
+public class BeiJianExtraImportDto
+{
+    /// <summary>
+    /// 交货号
+    /// </summary>
+    [Display(Name = "交货号")]
+    [ImporterHeader(Name = "交货号")]
+    public string DeliveryNumber { set; get; }
+
+    /// <summary>
+    /// 发票号
+    /// </summary>
+    [Display(Name = "发票号")]
+    [ImporterHeader(Name = "发票号")]
+    public string InvoiceNumber { set; get; }
+
+    /// <summary>
+    /// 开票日期
+    /// </summary>
+    [Display(Name = "开票日期")]
+    [ImporterHeader(Name = "开票日期")]
+    public DateTime? MakeDate { set; get; }
+
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    [Display(Name = "供应商代码")]
+    [ImporterHeader(Name = "供应商代码")]
+    public string VendorCode { set; get; }
+
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [Display(Name = "供应商名称")]
+    [ImporterHeader(Name = "供应商名称")]
+    public string VendorName { set; get; }
+
+    /// <summary>
+    /// 采购订单号
+    /// </summary>
+    [Display(Name = "采购订单号")]
+    [ImporterHeader(Name = "采购订单号")]
+    public string PurchaseOrderNumber { set; get; }
+
+    /// <summary>
+    /// 交付索引号
+    /// </summary>
+    [Display(Name = "交付索引号")]
+    [ImporterHeader(Name = "交付索引号")]
+    public string DeliveryIndexNumber { set; get; }
+
+    /// <summary>
+    /// 零件名称
+    /// </summary>
+    [Display(Name = "零件名称")]
+    [ImporterHeader(Name = "零件名称")]
+    public string PartName { set; get; }
+
+    /// <summary>
+    /// 价格
+    /// </summary>
+    [Display(Name = "价格")]
+    [ImporterHeader(Name = "价格")]
+    public decimal? Price { set; get; }
+
+    /// <summary>
+    /// 金额
+    /// </summary>
+    [Display(Name = "金额")]
+    [ImporterHeader(Name = "金额")]
+    public decimal? Amount { set; get; }
+
+    /// <summary>
+    /// 税额
+    /// </summary>
+    [Display(Name = "税额")]
+    [ImporterHeader(Name = "税额")]
+    public decimal? Tallage { set; get; }
+
+    /// <summary>
+    /// 价税合计
+    /// </summary>
+    [Display(Name = "价税合计")]
+    [ImporterHeader(Name = "价税合计")]
+    public decimal? Total { set; get; }
+
+    /// <summary>
+    /// 协议编号
+    /// </summary>
+    [Display(Name = "协议编号")]
+    [ImporterHeader(Name = "协议编号")]
+    public string ProtocolNumber { set; get; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    [ImporterHeader(Name = "备注")]
+    public string Remark { set; get; }
+  
+    /// <summary>
+    /// 商品组
+    /// </summary>
+    [Display(Name = "商品组")]
+    [ImporterHeader(Name = "商品组")]
+    public string CommodityGroup { set; get; }
+}
+
+/// <summary>
+/// 印度件导入
+/// </summary>
+public class YinDuJianImportDto
+{
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    [Display(Name = "Delivery Date")]
+    [ImporterHeader(Name = "Delivery Date")]
+    public DateTime SettleDate { set; get; }
+
+    /// <summary>
+    /// 客户零件号
+    /// </summary>
+    [Display(Name = "Material")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    [ImporterHeader(Name = "Material")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "External Delivery ID")]
+    [ImporterHeader(Name = "External Delivery ID")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [ImporterHeader(Name = "Item")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    [Display(Name = "External Delivery ID")]
+    [ImporterHeader(Name = "External Delivery ID")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string GroupNum { get; set; }
+
+    /// <summary>
+    /// Supplier
+    /// </summary>
+    [Display(Name = "Supplier")]
+    [ImporterHeader(Name = "Supplier")]
+    public string Supplier { get; set; }
+}
+
+/// <summary>
+/// PUB结算明细
+/// </summary>
+public class PUB_SA_DETAIL_DTO : AuditedAggregateRoot<Guid>
+{
+    /// <summary>
+    /// 结算单
+    /// </summary>
+    public string BillNum { set; get; }
+    /// <summary>
+    /// 期间
+    /// </summary>
+    public int Version { set; get; }
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    public string GroupNum { get; set; }
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    public string PN { get; set; }
+    /// <summary>
+    /// 客户物料号
+    /// </summary>
+    public string LU { get; set; }
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public string Qty { get; set; }
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    public DateTime SettleDate { set; get; }
+    /// <summary>
+    /// 单价
+    /// </summary>
+    public decimal Price { set; get; }
+    /// <summary>
+    /// 厂内物料号
+    /// </summary>
+    public string PartCode { get; set; }
+}
+
+/// <summary>
+/// 结算明细导出请求
+/// </summary>
+public class PUB_SA_DETAIL_EXPORT_REQUEST_DTO
 {
     /// <summary>
-    /// PUB结算
-    /// </summary>
-    public class PUB_SA_DTO : EntityDto<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public int Version { get; set; }
-
-        /// <summary>
-        /// 结算单据
-        /// </summary>
-        [Display(Name = "结算单据")]
-        public string BillNum { get; set; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [Display(Name = "状态")]
-        public string State { get; set; }
-    }
-
-    /// <summary>
-    /// 查询
-    /// </summary>
-    public class PUB_SARequestDto : RequestDto
-    {
-        /// <summary>
-        /// 业务类别
-        /// </summary>
-        public EnumBusinessType BusinessType { get; set; }
-    }
-
-    /// <summary>
-    /// 导入请求
-    /// </summary>
-    public class PUB_SAImportRequestDto
-    {
-        /// <summary>
-        /// 文件
-        /// </summary>
-        public IFormFileCollection Files { get; set; }
-
-        /// <summary>
-        /// 业务类别
-        /// </summary>
-        public EnumBusinessType BusinessType { get; set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public int Version { get; set; }
-    }
-
-    /// <summary>
-    /// 直供件BBAC导入
-    /// </summary>
-    public class ZhiGongJianBBACImportDto
-    {
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [Display(Name = "Pstng Date")]
-        [ImporterHeader(Name = "Pstng Date")]
-        public DateTime SettleDate { set; get; }
-
-        /// <summary>
-        /// 客户零件号
-        /// </summary>
-        [Display(Name = "Material")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        [ImporterHeader(Name = "Material")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "External Delivery ID")]
-        [ImporterHeader(Name = "External Delivery ID")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "Quantity")]
-        [ImporterHeader(Name = "Quantity")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 结算分组号
-        /// </summary>
-        [Display(Name = "Delivery")]
-        [ImporterHeader(Name = "Delivery")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string GroupNum { get; set; }
-    }
-
-    /// <summary>
-    /// 直供件HBPO导入
-    /// </summary>
-    public class ZhiGongJianHBPOImportDto
-    {
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [Display(Name = "结算日期")]
-        [ImporterHeader(IsIgnore = true)]
-        public DateTime SettleDate { set; get; }
-
-        /// <summary>
-        /// 客户零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        [ImporterHeader(Name = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "订单编号")]
-        [ImporterHeader(Name = "订单编号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 结算分组号
-        /// </summary>
-        [Display(Name = "订单编号")]
-        [ImporterHeader(Name = "订单编号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string GroupNum { get; set; }
-    }
-
-    /// <summary>
-    /// 买单件HBPO导入
-    /// </summary>
-    public class MaiDanJianHBPOImportDto
-    {
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [Display(Name = "买单日期")]
-        [ImporterHeader(Name = "买单日期")]
-        public DateTime SettleDate { set; get; }
-
-        /// <summary>
-        /// 客户零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        [ImporterHeader(Name = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "现产品生产号")]
-        [ImporterHeader(Name = "现产品生产号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 结算分组号
-        /// </summary>
-        [Display(Name = "五联单号")]
-        [ImporterHeader(Name = "五联单号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string GroupNum { get; set; }
-    }
-
-    /// <summary>
-    /// 备件导入
-    /// </summary>
-    public class BeiJianImportDto : BeiJianExtraImportDto
-    {
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [Display(Name = "结算日期")]
-        [ImporterHeader(Name = "零件时间")]
-        public DateTime SettleDate { set; get; }
-
-        /// <summary>
-        /// 客户零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        [ImporterHeader(Name = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "交付识别号")]
-        [ImporterHeader(Name = "交付识别号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 结算分组号
-        /// </summary>
-        [Display(Name = "凭证号")]
-        [ImporterHeader(Name = "凭证号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string GroupNum { get; set; }
-
-        ///// <summary>
-        ///// 备件扩展
-        ///// </summary>
-        //[Display(Name = "备件扩展")]
-        //public BeiJianExtraImportDto beiJianExtraImportDto { get; set; }
-    }
-
-    /// <summary>
-    /// 备件扩展
-    /// </summary>
-    public class BeiJianExtraImportDto
-    {
-        /// <summary>
-        /// 交货号
-        /// </summary>
-        [Display(Name = "交货号")]
-        [ImporterHeader(Name = "交货号")]
-        public string DeliveryNumber { set; get; }
-
-        /// <summary>
-        /// 发票号
-        /// </summary>
-        [Display(Name = "发票号")]
-        [ImporterHeader(Name = "发票号")]
-        public string InvoiceNumber { set; get; }
-
-        /// <summary>
-        /// 开票日期
-        /// </summary>
-        [Display(Name = "开票日期")]
-        [ImporterHeader(Name = "开票日期")]
-        public DateTime? MakeDate { set; get; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        [ImporterHeader(Name = "供应商代码")]
-        public string VendorCode { set; get; }
-
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        [ImporterHeader(Name = "供应商名称")]
-        public string VendorName { set; get; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        [Display(Name = "采购订单号")]
-        [ImporterHeader(Name = "采购订单号")]
-        public string PurchaseOrderNumber { set; get; }
-
-        /// <summary>
-        /// 交付索引号
-        /// </summary>
-        [Display(Name = "交付索引号")]
-        [ImporterHeader(Name = "交付索引号")]
-        public string DeliveryIndexNumber { set; get; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        [ImporterHeader(Name = "零件名称")]
-        public string PartName { set; get; }
-
-        /// <summary>
-        /// 价格
-        /// </summary>
-        [Display(Name = "价格")]
-        [ImporterHeader(Name = "价格")]
-        public decimal? Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [Display(Name = "金额")]
-        [ImporterHeader(Name = "金额")]
-        public decimal? Amount { set; get; }
-
-        /// <summary>
-        /// 税额
-        /// </summary>
-        [Display(Name = "税额")]
-        [ImporterHeader(Name = "税额")]
-        public decimal? Tallage { set; get; }
-
-        /// <summary>
-        /// 价税合计
-        /// </summary>
-        [Display(Name = "价税合计")]
-        [ImporterHeader(Name = "价税合计")]
-        public decimal? Total { set; get; }
-
-        /// <summary>
-        /// 协议编号
-        /// </summary>
-        [Display(Name = "协议编号")]
-        [ImporterHeader(Name = "协议编号")]
-        public string ProtocolNumber { set; get; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注")]
-        [ImporterHeader(Name = "备注")]
-        public string Remark { set; get; }
-      
-        /// <summary>
-        /// 商品组
-        /// </summary>
-        [Display(Name = "商品组")]
-        [ImporterHeader(Name = "商品组")]
-        public string CommodityGroup { set; get; }
-    }
-
-    /// <summary>
-    /// 印度件导入
-    /// </summary>
-    public class YinDuJianImportDto
-    {
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [Display(Name = "Delivery Date")]
-        [ImporterHeader(Name = "Delivery Date")]
-        public DateTime SettleDate { set; get; }
-
-        /// <summary>
-        /// 客户零件号
-        /// </summary>
-        [Display(Name = "Material")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        [ImporterHeader(Name = "Material")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "External Delivery ID")]
-        [ImporterHeader(Name = "External Delivery ID")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        [ImporterHeader(Name = "Item")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 结算分组号
-        /// </summary>
-        [Display(Name = "External Delivery ID")]
-        [ImporterHeader(Name = "External Delivery ID")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string GroupNum { get; set; }
-
-        /// <summary>
-        /// Supplier
-        /// </summary>
-        [Display(Name = "Supplier")]
-        [ImporterHeader(Name = "Supplier")]
-        public string Supplier { get; set; }
-    }
-
-    /// <summary>
-    /// PUB结算明细
-    /// </summary>
-    public class PUB_SA_DETAIL_DTO : AuditedAggregateRoot<Guid>
-    {
-        /// <summary>
-        /// 结算单
-        /// </summary>
-        public string BillNum { set; get; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public int Version { set; get; }
-        /// <summary>
-        /// 结算分组号
-        /// </summary>
-        public string GroupNum { get; set; }
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        public string PN { get; set; }
-        /// <summary>
-        /// 客户物料号
-        /// </summary>
-        public string LU { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public string Qty { get; set; }
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        public DateTime SettleDate { set; get; }
-        /// <summary>
-        /// 单价
-        /// </summary>
-        public decimal Price { set; get; }
-        /// <summary>
-        /// 厂内物料号
-        /// </summary>
-        public string PartCode { get; set; }
-    }
-
-    /// <summary>
-    /// 结算明细导出请求
-    /// </summary>
-    public class PUB_SA_DETAIL_EXPORT_REQUEST_DTO
-    {
-        /// <summary>
-        /// 结算单号
-        /// </summary>
-        [Display(Name = "结算单号")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string BillNum { set; get; }
-    }
-
-    /// <summary>
-    /// 结算明细导出
-    /// </summary>
-    public class PUB_SA_DETAIL_EXPORT_DTO
-    {
-        /// <summary>
-        /// 结算单号
-        /// </summary>
-        [Display(Name = "结算单号")]
-        [ExporterHeader(DisplayName = "结算单号")]
-        public string BillNum { set; get; }
-
-        /// <summary>
-        /// 结算日期（收货日期）
-        /// </summary>
-        [Display(Name = "结算日期（收货日期）")]
-        [ExporterHeader(DisplayName = "Pstng Date")]
-        public DateTime SettleDate { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        [ExporterHeader(DisplayName = "Material")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        [ExporterHeader(DisplayName = "Quantity")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 发货单号
-        /// </summary>
-        [Display(Name = "发货单号")]
-        [ExporterHeader(DisplayName = "External Delivery ID")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 结算分组
-        /// </summary>
-        [Display(Name = "结算分组")]
-        [ExporterHeader(DisplayName = "Delivery")]
-        public string GroupNum { get; set; }
-    }
-
-    /// <summary>
-    /// Pub结算与发运对比请求
-    /// </summary>
-    public class PubSaSeCompareRequestDto
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        [Required(ErrorMessage = "{0}不能为空")]
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 通用码
-        /// </summary>
-        [Display(Name = "通用码")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 业务类型
-        /// </summary>
-        public EnumBusinessType BusinessType { get; set; }
-
-        /// <summary>
-        /// 发运开始时间
-        /// </summary>
-        public DateTime? SeStartDateTime { get; set; }
-
-        /// <summary>
-        /// 发运结束时间
-        /// </summary>
-        public DateTime? SeEndDateTime { get; set; }
-    }
+    /// 结算单号
+    /// </summary>
+    [Display(Name = "结算单号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string BillNum { set; get; }
+}
+
+/// <summary>
+/// 结算明细导出
+/// </summary>
+public class PUB_SA_DETAIL_EXPORT_DTO
+{
+    /// <summary>
+    /// 结算单号
+    /// </summary>
+    [Display(Name = "结算单号")]
+    [ExporterHeader(DisplayName = "结算单号")]
+    public string BillNum { set; get; }
+
+    /// <summary>
+    /// 结算日期（收货日期）
+    /// </summary>
+    [Display(Name = "结算日期（收货日期）")]
+    [ExporterHeader(DisplayName = "Pstng Date")]
+    public DateTime SettleDate { set; get; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [ExporterHeader(DisplayName = "Material")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [ExporterHeader(DisplayName = "Quantity")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    [ExporterHeader(DisplayName = "External Delivery ID")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 结算分组
+    /// </summary>
+    [Display(Name = "结算分组")]
+    [ExporterHeader(DisplayName = "Delivery")]
+    public string GroupNum { get; set; }
+}
+
+/// <summary>
+/// Pub结算与发运对比请求
+/// </summary>
+public class PubSaSeCompareRequestDto
+{
+    /// <summary>
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string Version { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string LU { get; set; }
+
+    /// <summary>
+    /// 通用码
+    /// </summary>
+    [Display(Name = "通用码")]
+    public string PN { get; set; }
+
+    /// <summary>
+    /// 业务类型
+    /// </summary>
+    public EnumBusinessType BusinessType { get; set; }
+
+    /// <summary>
+    /// 发运开始时间
+    /// </summary>
+    public DateTime? SeStartDateTime { get; set; }
+
+    /// <summary>
+    /// 发运结束时间
+    /// </summary>
+    public DateTime? SeEndDateTime { 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 530c4dca..77e6062e 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
@@ -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);
-            var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
+            var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
+            var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
             var dtos = ObjectMapper.Map<List<PUB_SE_DETAIL>, List<PUB_SE_DETAIL_DTO>>(entities);
             return new PagedResultDto<PUB_SE_DETAIL_DTO>(totalCount, dtos);
         }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs
index 452748c8..484e2b03 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs
+++ b/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; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
index 67c6d5db..86988df7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
+++ b/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; }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs
index aa936e84..2f4d5970 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs
+++ b/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; }