From 682d930a4758686f59c90b0ec11845f8e97dc98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 20 Sep 2023 13:38:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.json | 1 + .../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs | 20 +------------------ .../Bases/BA_SERVICE.cs | 6 +++--- .../Bases/CAN_SA_SERVICE.cs | 4 ++-- .../Bases/PD_SERVICE.cs | 11 ++-------- .../Entities/BQ/BBAC_BA_SERVICE.cs | 6 +++--- .../Entities/BQ/BBAC_CAN_SA_SERVICE.cs | 2 +- .../Entities/BQ/HBPO_BA_SERVICE.cs | 6 +++--- .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs | 2 +- .../Entities/BQ/INVOICE_SERVICE.cs | 17 +++++++++++----- .../Entities/BQ/PUB_BA_SERVICE.cs | 10 +++++----- .../Entities/BQ/PUB_CAN_SA_SERVICE.cs | 2 +- .../BQ/Syncs/PendingDeductionService.cs | 2 +- .../Entities/SecMatch/SecMatchAppService.cs | 6 +++--- .../Entities/TaskJobs/JobAppService.cs | 8 ++++---- .../Jobs/TaskJobService.cs | 2 +- .../ReportServices/ReportMakeService.cs | 10 +++++----- .../Entities/BQ/Managers/INV_MNG.cs | 12 +++++------ .../Entities/BQ/Managers/INV_MNG_EXT.cs | 4 ++-- .../ExChangeCenterDbContext.cs | 5 +++-- .../UnInterfaceDapperRepository.cs | 2 +- ...SettleAccountDiffReportDapperRepository.cs | 2 +- .../PendingDeductionDapperRepository.cs | 2 +- .../HQHSettledDetailDapperRepository.cs | 4 ++-- .../WmsJitOutputDapperRepository.cs | 2 +- .../SettleAccount.Job/Services/PD_SERVICE.cs | 2 +- .../Services/Report/FisOutputService.cs | 2 +- .../HQHSettledDetailDiffExportService.cs | 2 +- .../Services/Report/SyncFisService.cs | 4 ++-- .../Services/Report/UnSettledSumService.cs | 2 +- 30 files changed, 71 insertions(+), 89 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index 122445cd..81f04fdd 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -5,6 +5,7 @@ "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13326;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True", "SettleAccountService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", + "ExChangeCenterService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;", "WMSBJBMPT": "Server=dev.ccwin-in.com,6208;Database=WMS_BJBMPT_2;User ID=sa;Password=ChangkeTec@2021;Trusted_Connection=False;TrustServerCertificate=True;", "questdb": "host=dev.ccwin-in.com;port=10580;username=admin;password=quest;database=vmi;ServerCompatibilityMode=NoTypeLoading;" }, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs index 4496dad8..4153c351 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs @@ -356,7 +356,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "零件号")] public string PartCode { get; set; } [Display(Name = "零件名称")] - public string PartName { get; set; } + public string PartDesc { get; set; } /// ///发票分组号 /// @@ -367,9 +367,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// [Display(Name = "客户零件号")] public string LU { get; set; } - - [Display(Name = "零件描述")] - public string PartDesc { get; set; } /// ///单价 /// @@ -385,9 +382,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// [Display(Name = "金额")] public decimal Amt { get; set; } - /// - ///业务分类 - /// /// ///扩展字段3 @@ -408,18 +402,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos } - // DeliveryNumber = inv1.GetProperty("DeliveryNumber", ""),//交货号 - // InvoiceNumber = inv1.GetProperty("InvoiceNumber", ""),//发票号 - // VendorCode = inv1.GetProperty("VendorCode", ""),//供应商代码 - // VendorName = inv1.GetProperty("VendorName", ""),//供应商名称 - // PurchaseOrderNumber = inv1.GetProperty("PurchaseOrderNumber", ""),//采购订单号 - // DeliveryIndexNumber = inv1.GetProperty("DeliveryIndexNumber", ""),//交付索引号 - // PartName = inv1.GetProperty("PartName", ""),//零件名称 - - - - - public class INVOICE_WAIT_DETAIL_BBAC_DTO { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 666c9ea4..afa0da92 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -518,7 +518,7 @@ namespace Win.Sfs.SettleAccount.Bases throw new BusinessException("8989", "生成失败,请检查调发票整表和旧发票内容"); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 第一次开票 /// @@ -538,7 +538,7 @@ namespace Win.Sfs.SettleAccount.Bases } throw new BusinessException("8989", "生成失败,请检查调整表和旧发票内容"); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// hbpo、jit、备件等 /// @@ -557,7 +557,7 @@ namespace Win.Sfs.SettleAccount.Bases throw new BusinessException("8989", "生成失败,请检查调发票整表和旧发票内容"); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 第一次开票 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs index 6143dcf2..c1f363e9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs @@ -142,7 +142,7 @@ namespace Win.Sfs.SettleAccount.Bases var dtos = ObjectMapper.Map, List>(entitys); return new PagedResultDto(totalCount, dtos); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// hbpo、jit、备件等 /// @@ -190,7 +190,7 @@ namespace Win.Sfs.SettleAccount.Bases throw new BusinessException("8989", "生成失败,请检可结算单明细数据是否结算分组存在"); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 第一次开票 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index 10dc17f9..8c0c0121 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -133,13 +133,13 @@ namespace Win.Sfs.SettleAccount.Bases return _fileName; } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task ApprovalPassed(List p_list) { return await InvokePD(p_list, _service, false); } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task RejectAsync(List p_list) { return await InvokePD(p_list, _service, true); @@ -198,13 +198,6 @@ namespace Win.Sfs.SettleAccount.Bases return _taskid; } - - - - - - - /// /// 查询主表 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 763d66f0..c69b84d5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs @@ -195,7 +195,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 发票重开 /// @@ -323,7 +323,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 发票重开列表 /// @@ -458,7 +458,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 发票重开列表 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index b0354e8f..084eb43d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs @@ -68,7 +68,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] [HttpPost] public async Task GenerateInvoice([FromBody] string invbillNum) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs index 9c7731b1..d9aeb621 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs @@ -160,7 +160,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 发票重开 @@ -291,7 +291,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// 发票重开列表 /// /// @@ -428,7 +428,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// 发票重开列表 /// /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index fc4adc53..ced291f2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs @@ -65,7 +65,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] //[Route("generateinvoice")] public async Task GenerateInvoice([FromBody] string invbillnum) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 12433f66..3937b4e4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -82,7 +82,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task ApprovalPassed(List p_invs) { List errors = new List(); @@ -350,8 +350,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ .Select(p => new JIT_UNSETTLED_DETAIL_DTO { LU = p.Key.LU, GroupNum = p.Key.SettleGroupNum, Qty = p.Sum(itm => itm.Qty.Value) }); entity.JIT_UNSETTLED_DETAIL = unsettledList.ToList().OrderBy(p => p.GroupNum).ThenBy(p => p.LU).ToList(); } - - if (first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.JisBBAC) { entity.INVOICE_MAP_GROUP = lscompare.ToList().OrderBy(p => p.SettleGroupNum).ToList();//包含不可结结算分组号 @@ -384,7 +382,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ }); } entity.MAIDAN_HBPO_UNSETTLED_DETAIL = unsettle; - } entity.ADJ_DETAIL = adjQuery.ToList().OrderBy(p=>p.GroupNum).ThenBy(p=>p.LU).ToList(); @@ -495,7 +492,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _excel.Append(hbpounsettle, "未结零件汇总"); } } - + if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC) + { + + if (jitunsettle != null) + { + _excel.Append(jitunsettle, "未结零件汇总"); + } + } + + + //jis业务，发票分组对应关系，未结数据，调整数据 if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index 4977cb65..33600111 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.LinqAsync; @@ -54,7 +54,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task ReissueInvoiceExtend(List p_list) { var errorlist = await CheckRepeat(p_list).ConfigureAwait(false); @@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public override async Task ReissueInvoice([FromBody] string p_invbillnum) { //var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组 @@ -314,7 +314,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ return new JsonResult(new { Code = 200, Message = "发票重开成功" }); ; } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// 发票重开列表 /// /// @@ -489,7 +489,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task ReissueInvoiceList(List p_list) { var result = await _adjservice.CheckImport(p_list).ConfigureAwait(false); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index 47c00c1f..8ceee7e3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _notRepository = notRepository; } [HttpPost] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task GenerateInvoice([FromBody] string billnum) { var main = await _pubMng.GetMainAsync(billnum).ConfigureAwait(false); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs index 2b7731ce..3de22880 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs @@ -31,7 +31,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs _dbcontext = dbcontext; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public string ExportFile(Guid id, List exportName, List property) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs index b93b5b68..bea6c2cd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs @@ -285,7 +285,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch /// [HttpPost] [Route("Export")] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task ExportAsync(SecMatchBaseRequestDto input) { List fileList = new List(); @@ -493,7 +493,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch ///// //[HttpPost] //[Route("ExportSupplier")] - //[UnitOfWork(false)] + //[UnitOfWork(IsDisabled = false)] //virtual public async Task ExportSupplierAsync(SecMatchBaseRequestDto input) //{ // List fileList = new List(); @@ -514,7 +514,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch /// [HttpPost] [Route("ExportSummary")] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task ExportSummaryAsync(SecMatchBaseRequestDto input) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs index 39e96c89..c9a6cfb9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs @@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs /// [HttpPost] [Route("listold")] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task> GetListOldAsync(JobRequestDto input) { return await _service.GetListAsync(input).ConfigureAwait(false); @@ -37,7 +37,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs /// [HttpPost] [Route("list")] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task> GetListAsync(JobRequestDto input) { var lists = await _service.GetListAsync(input).ConfigureAwait(false); @@ -48,7 +48,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs [Route("{id}")] //[Authorize(SettleAccountPermissions.Materials.Default)] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task> GetUploadListAsync(string id) { return await _service.GetUpFileListAsync(id).ConfigureAwait(false); @@ -58,7 +58,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs [HttpPost] [Route("versionlist")] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task> GetVersionListAsync() { return await _service.GetVersionListAsync().ConfigureAwait(false); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs index 2d7f13de..5388d22e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs @@ -69,7 +69,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs return await _mng.UpdateAsync(p_id, remark).ConfigureAwait(false); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task> GetListAsync(JobRequestDto input) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 95cd1e1d..a5a88237 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -462,7 +462,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices [HttpPost] [Route("InvoiceSettledDetailDiff-Make")] [DisableRequestSizeLimit] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task InvoiceSettledDetailDiffMake( BaseRequestDto request ) @@ -494,7 +494,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices [HttpPost] [Route("UnInvoiceSettledDetailDiff-Make")] [DisableRequestSizeLimit] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task UnInvoiceSettledDetailDiffMake( BaseRequestDto request ) @@ -524,7 +524,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices [HttpPost] [Route("UnsettledDetailReportService-Make")] [DisableRequestSizeLimit] - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task UnsettledDetailReportServiceMake( BaseRequestDto input @@ -675,7 +675,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices //[HttpPost] //[Route("HQHSettledDetailDiffExportService")] //[DisableRequestSizeLimit] - //[UnitOfWork(false)] + //[UnitOfWork(IsDisabled = false)] //public async Task HQHSettledDetailDiffExportServiceMake( // HQKanbanRequestDto input // ) @@ -815,7 +815,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices //[HttpPost] //[Route("UnSettledSum-Make")] //[DisableRequestSizeLimit] - //[UnitOfWork(false)] + //[UnitOfWork(IsDisabled = false)] //public async Task UnSettledSumServiceMake( // BaseRequestDto input diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index 3428bb99..0511c2ec 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -115,7 +115,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers /// /// /// - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task SetForwardState(List p_invs, SettleBillState p_State) { List errors = new List(); @@ -940,7 +940,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers /// 版本号 /// 发票分组 /// 原发票号 - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task> SecInvoice(List p_list, List p_ajdlist, List dtos, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType) where TDetail : SA_CAN_BASE { @@ -1180,7 +1180,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers return _invls; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task> FirstInvoice(List p_list, List p_adjlist, List dtos, List p_notlist, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType) where TDetail : SA_CAN_BASE { @@ -1978,7 +1978,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers return _invls; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 重开一次开票 /// @@ -2032,9 +2032,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers case EnumBusinessType.YinDuJian: invlist = await JITInvoice(p_list, p_adjlist, dtos, new List(), p_version, inv.InvGroupNum, inv.InvbillNum, inv.BusinessType, true).ConfigureAwait(false);//重开可以变多张发票 break; - } - if (invlist.Count == 0) { return false; @@ -2249,7 +2247,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers preTaxDiff: 0, taxDiff: 0, clientCode: string.Empty, - realAmt: 0 + realAmt: readAmt ); invbill.CreationTime = DateTime.Now; invbill.ClientCode = "C001"; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs index 865e83d3..ccfc6cd8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs @@ -231,7 +231,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers return detailList; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public async Task> FirstInvoiceExtend(List p_list, List p_adjlist, List dtos, List p_notlist, int p_version, string p_InvGroupNum, string p_parentInvBillNum, EnumBusinessType businessType) where TDetail : SA_CAN_BASE { @@ -552,7 +552,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers } return detailList; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 第一次开票 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs index 5fa9a392..3031bda8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs @@ -5,14 +5,15 @@ using Win.Sfs.SettleAccount.Entities.BQ; namespace Win.Sfs.SettleAccount.EntityFrameworkCore { - [ConnectionStringName("WMSBJBMPT")] + [ConnectionStringName("ExChangeCenterService")] public class ExChangeCenterDbContext : DbContext { public DbSet TED_SA_INV { set; get; } - public ExChangeCenterDbContext(DbContextOptions options) : base(options) { + + } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDapperRepository.cs index 5e90db47..c0a077cc 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDapperRepository.cs @@ -19,7 +19,7 @@ namespace Win.Sfs.SettleAccount } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual bool Execute(string billnum, string date) { string sqlString = diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/Report/UnSettleAccountDiffReportDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/Report/UnSettleAccountDiffReportDapperRepository.cs index b14b3303..0c41806d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/Report/UnSettleAccountDiffReportDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/Report/UnSettleAccountDiffReportDapperRepository.cs @@ -16,7 +16,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount.Report : base(dbContextProvider) { } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual async Task> GetDiffUnSettleReport(string year, string customcode) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/PendingDeduction/PendingDeductionDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/PendingDeduction/PendingDeductionDapperRepository.cs index 1452b853..ee93ddcd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/PendingDeduction/PendingDeductionDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/PendingDeduction/PendingDeductionDapperRepository.cs @@ -21,7 +21,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// BBAC生成待扣减 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs index 4434ddc7..bcd1b1d8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs @@ -70,7 +70,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report /// /// /// - //[UnitOfWork(false)] + //[UnitOfWork(IsDisabled = false)] //public virtual List GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end, string materialGroup) //{ @@ -465,7 +465,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report //} - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual List GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end, string materialGroup) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/WmsJitOutput/WmsJitOutputDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/WmsJitOutput/WmsJitOutputDapperRepository.cs index 0f2de9ad..9562981f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/WmsJitOutput/WmsJitOutputDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/WmsJitOutput/WmsJitOutputDapperRepository.cs @@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob : base(dbContextProvider) { } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public virtual bool Execute(string billnum, string date) { string sqlString = diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/PD_SERVICE.cs index d34b0186..b8ea761f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/PD_SERVICE.cs @@ -30,7 +30,7 @@ namespace SettleAccount.Job.Services _dapper = dapper; //_pdmng=pdmng; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] /// /// 执行发票待开任务 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisOutputService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisOutputService.cs index 3f28b02e..33e6f638 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisOutputService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisOutputService.cs @@ -32,7 +32,7 @@ namespace SettleAccount.Job.Services _versionRepository = versionRepository; _dapperRepository = dapperRepository; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public string ExportFile(Guid id, List exportName, List p_list) { var billnum = p_list.Where(p => p.Name == "BillNum").FirstOrDefault().Value; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs index 7c401490..25eb7d04 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs @@ -47,7 +47,7 @@ namespace SettleAccount.Job.Services.Report _errorListRepository = errorListRepository; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public string ExportFile(Guid id, List exportName, List p_list) { var _filename = exportName.FirstOrDefault(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs index e6d97369..f03c8281 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs @@ -43,14 +43,14 @@ namespace SettleAccount.Job.Services.Report _fileContainer = fileContainer; _erpdapperRepository = erpdapperRepository; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public string ExportFile(Guid id, List exportName, List p_list) { return id.ToString(); } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public List GetFisSum(Guid id, List exportName, List p_list) { var _first = exportName.FirstOrDefault(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs index d65abb62..3045ec2a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs @@ -72,7 +72,7 @@ namespace SettleAccount.Job.Services.Report _fileContainer = fileContainer; } - [UnitOfWork(false)] + [UnitOfWork(IsDisabled = false)] public List GetFisSum(Guid id, List exportName, List p_list) { var _first = exportName.FirstOrDefault(); From 9adb5a83303e637e1ece98baeca3e4bb728dc69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 20 Sep 2023 13:38:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 3937b4e4..5a8d161a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -494,7 +494,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC) { - if (jitunsettle != null) { _excel.Append(jitunsettle, "未结零件汇总");