更新版本

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

@@ -69,7 +69,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         [ExporterHeader(DisplayName = "是否退货")]             //BBAC-JIS显示 其他没有这个字段
         public string IsReturn { get; set; }
 
-        [ExporterHeader(DisplayName = "合同号")]
+        [ExporterHeader(DisplayName = "SA号")]
         public string ContractDocID { set; get; }
 
 
@@ -132,8 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [ExporterHeader(DisplayName = "版本号")]
         public int Version { get; set; }
-        [ExporterHeader(DisplayName = "合同号")]
-        public int ContractDocID { set; get; }
+        [ExporterHeader(DisplayName = "SA号")]
+        public string ContractDocID { set; get; }
 
     }
     //public class BBAC_CAN_SA_EXP_DTO

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

@@ -59,6 +59,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         [Display(Name = "发票税后尾差")]
         public decimal TaxDiff { get; set; }
+
         [Display(Name = "客户代码")]
         public string ClientCode { get; set; }
     }
@@ -146,7 +147,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         //[ExporterHeader(DisplayName ="发票税后尾差")]
         //public decimal TaxDiff { get; set; }
-        [ExporterHeader(DisplayName = "客户编码")]
+        [ExporterHeader(DisplayName = "客户代码")]
         public string ClientCode { get; set; }
     }
 
@@ -179,7 +180,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         public decimal Tax { get; set; }
 
-        [ImporterHeader(Name = "客户编码", FixAllSpace = true)]
+        [ImporterHeader(Name = "客户代码", FixAllSpace = true)]
         [Required(ErrorMessage = "{0}是必填项")]
         public string ClientCode { get; set; }
 
@@ -298,7 +299,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// <summary>
         ///扩展字段1
         /// </summary>
-        [Display(Name = "合同号")]
+        [Display(Name = "SA号")]
         public string Extend1 { get; set; }
       
         /// <summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs

@@ -325,14 +325,6 @@ public class ADJ_SERVICE : BASE_SERVICE
             ls = inner.ToList();
 
         }
-
-
-
-
-
-
-
-
         return new JsonResult(new { Code = 200, data =ls  }); ;
     }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs

@@ -127,18 +127,18 @@ namespace Win.Sfs.SettleAccount.Bases
                  );
             return _fileName;
         }
-        /// <summary>
-        /// 生成发票
-        /// </summary>
-        /// <param name="input">主表查询条件</param>
-        /// <returns></returns>
-        [HttpPost]
-        //[Route("generateinvoice")]
-        public virtual async Task<IActionResult> GenerateInvoice([FromBody] string input)
-        {
+        ///// <summary>
+        ///// 生成发票
+        ///// </summary>
+        ///// <param name="input">主表查询条件</param>
+        ///// <returns></returns>
+        //[HttpPost]
+        ////[Route("generateinvoice")]
+        //public virtual async Task<IActionResult> GenerateInvoice([FromBody] string input)
+        //{
 
-            return   new JsonResult(new { Code = 200, Message = "创建成功" }); ;
-        }
+        //    return   new JsonResult(new { Code = 200, Message = "创建成功" }); ;
+        //}
 
         /// <summary>
         /// 查询主表

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs

@@ -79,6 +79,7 @@ namespace Win.Sfs.SettleAccount.Bases
             _hbpoSecRepository=hbpoSecRepository;
         }
 
+
         /// <summary>
         /// 查询明细
         /// </summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs

@@ -75,15 +75,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             _priceRepository = priceRepository;
         }
 
-      
+
         /// <summary>
         /// 生成发票
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
+       
         [HttpPost]
         [UnitOfWork(false)]
-        public async override Task<IActionResult> GenerateInvoice([FromBody] string invbillNum)
+        public async  Task<IActionResult> GenerateInvoice([FromBody] string invbillNum)
         {
             var main =await _bbacMng.GetMainAsync(invbillNum);
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs

@@ -21,6 +21,8 @@ using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 using Win.Sfs.Shared.RepositoryBase;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Volo.Abp.Uow;
+using Volo.Abp;
+using EFCore.BulkExtensions;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
@@ -44,18 +46,32 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         {
             _service = service;
         }
-     
+        [UnitOfWork(false)]
         public override async Task<string> ApprovalPassed(List<string> p_list)
         {
+            
             var detailist = _detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
             List<CustomCondition> customConditionList = new List<CustomCondition>();
             customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value =string.Join(",",p_list) });
             customConditionList.Add(new CustomCondition() { Name = "Type", Value = EnumBusinessType.JisBBAC.ToString() });
             customConditionList.Add(new CustomCondition() { Name = "IsOut", Value ="out"});
+            var ls = _repository.Where(p => p_list.Contains(p.BillNum)).ToList();
+            var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
+            if (lst.Count() > 0)
+            {
+                throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交");
+            }
+            foreach (var item in ls)
+            {
+                item.State = SettleBillState.已提交扣减;
+            }
+            await _repository.DbContext.BulkUpdateAsync(ls);
             var _taskid = await _service.ExportEnqueueAsync("BBAC待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) =>
             {
             });
+        
             return _taskid;
+
         }
     }
 }                                          

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@@ -74,11 +74,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [UnitOfWork(false)]
+       
         [HttpPost]
-        
+        [UnitOfWork(false)]
         //[Route("generateinvoice")]
-        public async override Task<IActionResult> GenerateInvoice([FromBody] string invbillnum)
+        public async  Task<IActionResult> GenerateInvoice([FromBody] string invbillnum)
         {
             var main =await _hbpoMng.GetMainAsync(invbillnum);
             if (main != null)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs

@@ -1,8 +1,10 @@
 using DocumentFormat.OpenXml.Bibliography;
 using DocumentFormat.OpenXml.Drawing.Charts;
+using EFCore.BulkExtensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using SettleAccount.Domain.BQ;
+using SettleAccount.Job.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,7 +12,9 @@ using System.Text;
 using System.Threading.Tasks;
 using TaskJob.EventArgs;
 using TaskJob.Services;
+using Volo.Abp;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Bases;
@@ -20,6 +24,7 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ;
 using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
+using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.Shared.RepositoryBase;
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
@@ -29,73 +34,37 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         HBPO_PD_DETAIL, HBPO_PD_DETAIL_DTO, HBPO_PD_REQ_DTO,
         HBPO_PD_DETAIL_REQ_DTO, HBPO_PD_DETAIL_EXP_DTO>
     {
-        public HBPO_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
+        private readonly TaskJobService _service;
+        public HBPO_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
         {
+            _service = service;
         }
 
 
-        //public HBPO_PD_SERVICE(IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<HBPO_PD, Guid> repository, INormalEfCoreRepository<HBPO_PD_DETAIL, Guid> detailRepository) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository)
-        //{
-        //    //List<CustomCondition> customConditionList = new List<CustomCondition>();
-        //    //customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
-        //    //customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty });
-        //    //customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? string.Empty });
-        //    //customConditionList.Add(new CustomCondition() { Name = "Period", Value = period ?? string.Empty });
-        //    //customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
-        //    //var _versionQuery = _versionRepository.Where(p => p.Version == version);
-        //    //if (_versionQuery.Count() > 0)
-        //    //{
-        //    //    _versionQuery.BatchDelete();
-        //    //}
-
-        //    //var _query = _repository.Where(p => p.Version == version);
-        //    //if (_query.Count() > 0)
-        //    //{
-        //    //    await _query.BatchDeleteAsync();
-        //    //}
-        //    //var _taskid = await _service.ImportEnqueueAsync<ImportTaskArgs>(files, "结算数据", CurrentUser, typeof(SettleAccountImportService), customConditionList, (rs) =>
-        //    //{
-
-
-
-
-        //    //});
-
-
-
-        //}
-
-
+        [UnitOfWork(false)]
         public override async Task<string> ApprovalPassed(List<string> p_list)
         {
             var detailist = _detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
-            if (detailist != null && detailist.Count > 0)
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value = string.Join(",", p_list) });
+            customConditionList.Add(new CustomCondition() { Name = "Type", Value = EnumBusinessType.JisHBPO.ToString() });
+            customConditionList.Add(new CustomCondition() { Name = "IsOut", Value = "out" });
+            var ls = _repository.Where(p => p_list.Contains(p.BillNum)).ToList();
+            var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
+            if (lst.Count() > 0)
             {
-                foreach (var itm in detailist)
-                {
-                    await _vimservice.Out(Entities.BQ.Vmi.VmiLogType.Type200, "1", new Entities.BQ.Vmi.VmiLog()
-                    {
-                        BillTime = itm.CreationTime,
-                        ChangedTime = DateTime.Now,
-                        Qty = itm.Qty,
-                        AssembleData = itm.CreationTime,
-                        LogType = Entities.BQ.Vmi.VmiLogType.Type200,
-                        ChangedQty = itm.Qty,
-                        ChangedType = VmiType.Out,
-                        DeliverSubBillType = EnumDeliverSubBillType.小件BBAC,
-                        DeliverBillType = EnumDeliverBjBmpBillType.JIS件,
-                        RealPartCode = itm.LU,
-                        SettlementVinCode = itm.PN,
-                        //PartCode2 = itm.LU,
-                        CustPartCode = itm.LU,
-                        VinCode = itm.PN,
-                        OrderNum = itm.GroupNum,
-                        ErpToLoc = "C0001"
-                    });
-                }
+                throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交");
             }
-            return ApplicationConsts.SuccessStr;
+            foreach (var item in ls)
+            {
+                item.State = SettleBillState.已提交扣减;
+            }
+            await _repository.DbContext.BulkUpdateAsync(ls);
+            var _taskid = await _service.ExportEnqueueAsync("HBPO待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) =>
+            {
+            });
 
+            return _taskid;
 
         }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

@@ -378,6 +378,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 inv.RealnvBillNum = newinv.RealnvBillNum;
                 inv.RealAmt = newinv.RealAmt;
                 inv.TaxDiff = inv.TaxAmt-newinv.RealAmt;
+                inv.ClientCode = newinv.ClientCode;
             }
             foreach (var detail in invdetail)
             {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs

@@ -10,6 +10,7 @@ using SettleAccount.Domain.BQ;
 using Volo.Abp;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Bases;
@@ -66,7 +67,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             _pricebjRepository = pricebjRepository;
         }
         [HttpPost]
-        public async override Task<IActionResult> GenerateInvoice( [FromBody] string billnum)
+        [UnitOfWork(false)]
+        public async Task<IActionResult> GenerateInvoice( [FromBody] string billnum)
         {
             var main = await _pubMng.GetMainAsync(billnum);
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs

@@ -1,12 +1,17 @@
+using EFCore.BulkExtensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using SettleAccount.Domain.BQ;
+using SettleAccount.Job.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TaskJob.EventArgs;
+using Volo.Abp;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Bases;
@@ -16,6 +21,7 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos.SettleAccount.Domain.BQ;
 using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
+using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
@@ -26,39 +32,35 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         PUB_PD_DETAIL, PUB_PD_DETAIL_DTO, PUB_PD_REQ_DTO,
         PUB_PD_DETAIL_REQ_DTO, PUB_PD_DETAIL_EXP_DTO>
     {
-        public PUB_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> detailRepository) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
+        private readonly TaskJobService _service;
+        public PUB_PD_SERVICE(INormalEfCoreRepository<BBAC_SEC_DETAIL, Guid> bbacSecRepository, INormalEfCoreRepository<HBPO_SEC_DETAIL, Guid> hbpoSecRepository, INormalEfCoreRepository<PUB_SEC_DETAIL, Guid> pubSecRepository, IExcelImportAppService excelImportService, ISnowflakeIdGenerator snowflakeIdGenerator, ICommonManager commonManager, INormalEfCoreRepository<PUB_PD, Guid> repository, VmiAppService vimservice, INormalEfCoreRepository<PUB_PD_DETAIL, Guid> detailRepository, TaskJobService service) : base(bbacSecRepository, hbpoSecRepository, pubSecRepository, excelImportService, snowflakeIdGenerator, commonManager, repository, vimservice, detailRepository)
         {
+            _service=service;
         }
-
+        [UnitOfWork(false)]
         public override async Task<string> ApprovalPassed(List<string> p_list)
         {
             var detailist = _detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
-            if (detailist != null && detailist.Count > 0)
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value = string.Join(",", p_list) });
+            customConditionList.Add(new CustomCondition() { Name = "Type", Value = "PUB" });
+            customConditionList.Add(new CustomCondition() { Name = "IsOut", Value = "out" });
+            var ls = _repository.Where(p => p_list.Contains(p.BillNum)).ToList();
+            var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
+            if (lst.Count() > 0)
+            {
+                throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交");
+            }
+            foreach (var item in ls)
             {
-                foreach (var itm in detailist)
-                {
-                    await _vimservice.Out(Entities.BQ.Vmi.VmiLogType.Type200, "1", new Entities.BQ.Vmi.VmiLog()
-                    {
-                        BillTime = itm.CreationTime,
-                        ChangedTime = DateTime.Now,
-                        Qty = itm.Qty,
-                        AssembleData = itm.CreationTime,
-                        LogType = Entities.BQ.Vmi.VmiLogType.Type200,
-                        ChangedQty = itm.Qty,
-                        ChangedType = VmiType.Out,
-                        DeliverSubBillType = EnumDeliverSubBillType.小件BBAC,
-                        DeliverBillType = EnumDeliverBjBmpBillType.JIS件,
-                        RealPartCode = itm.LU,
-                        SettlementVinCode = itm.PN,
-                        //PartCode2 = itm.LU,
-                        CustPartCode = itm.LU,
-                        VinCode = itm.PN,
-                        OrderNum = itm.GroupNum,
-                        ErpToLoc = "C0001"
-                    });
-                }
+                item.State = SettleBillState.已提交扣减;
             }
-            return ApplicationConsts.SuccessStr;
+            await _repository.DbContext.BulkInsertAsync(ls);
+            var _taskid = await _service.ExportEnqueueAsync("BBAC待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) =>
+            {
+            });
+
+            return _taskid;
 
 
         }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs

@@ -109,7 +109,7 @@ public class BBAC_CAN_SA_DETAIL: SA_CAN_BASE
     public bool IsReturn { get; set; } =false;
 
 
-    [Display(Name="合同号")]
+    [Display(Name="SA")]
     public string ContractDocID { get; set; }
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@@ -1190,7 +1190,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             bussiessType: businessType,
                             amt: detail.Amt,
                             pRICE: detail.Price,
-                            extend1: string.Empty,
+                            extend1: detail.ContractDocID,
                             extend2: string.Empty,
                             beginDate: detail.BeginDate,
                             endDate: detail.EndDate,
@@ -1394,7 +1394,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             bussiessType: businessType,
                             amt: detail.Amt,
                             pRICE: detail.Price,
-                            extend1: string.Empty,
+                            extend1: detail.ContactDocID,
                             extend2: string.Empty,
                             beginDate: detail.BeginDate,
                             endDate: detail.EndDate,

code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs

@@ -30,7 +30,8 @@ namespace Win.Sfs.SettleAccount
         已扣减 = 5,
         [Description("客户已收票")]
         客户已收票 = 4,
-
+        [Description("已提交扣减")]
+        已提交扣减 = 6
     }
 
     public enum InvoiceBillState