Browse Source

更新版本

master
学 赵 1 year ago
parent
commit
682d930a47
  1. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
  2. 20
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
  3. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs
  4. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs
  5. 11
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
  6. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
  7. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
  8. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs
  9. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
  10. 17
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  11. 10
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
  12. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
  13. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  14. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
  15. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs
  16. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Jobs/TaskJobService.cs
  17. 10
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  18. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
  19. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
  20. 5
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs
  21. 2
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDapperRepository.cs
  22. 2
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/Report/UnSettleAccountDiffReportDapperRepository.cs
  23. 2
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/PendingDeduction/PendingDeductionDapperRepository.cs
  24. 4
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs
  25. 2
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/WmsJitOutput/WmsJitOutputDapperRepository.cs
  26. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/PD_SERVICE.cs
  27. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisOutputService.cs
  28. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs
  29. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs
  30. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

1
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;"
},

20
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; }
/// <summary>
///发票分组号
/// </summary>
@ -367,9 +367,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
/// </summary>
[Display(Name = "客户零件号")]
public string LU { get; set; }
[Display(Name = "零件描述")]
public string PartDesc { get; set; }
/// <summary>
///单价
/// </summary>
@ -385,9 +382,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
/// </summary>
[Display(Name = "金额")]
public decimal Amt { get; set; }
/// <summary>
///业务分类
/// </summary>
/// <summary>
///扩展字段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
{

6
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)]
/// <summary>
/// 第一次开票
/// </summary>
@ -538,7 +538,7 @@ namespace Win.Sfs.SettleAccount.Bases
}
throw new BusinessException("8989", "生成失败,请检查调整表和旧发票内容");
}
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// <summary>
/// hbpo、jit、备件等
/// </summary>
@ -557,7 +557,7 @@ namespace Win.Sfs.SettleAccount.Bases
throw new BusinessException("8989", "生成失败,请检查调发票整表和旧发票内容");
}
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// <summary>
/// 第一次开票
/// </summary>

4
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<TEntity>, List<TEntityDto>>(entitys);
return new PagedResultDto<TEntityDto>(totalCount, dtos);
}
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// <summary>
/// hbpo、jit、备件等
/// </summary>
@ -190,7 +190,7 @@ namespace Win.Sfs.SettleAccount.Bases
throw new BusinessException("8989", "生成失败,请检可结算单明细数据是否结算分组存在");
}
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// <summary>
/// 第一次开票
/// </summary>

11
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<string> ApprovalPassed(List<string> p_list)
{
return await InvokePD(p_list, _service, false);
}
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<string> RejectAsync(List<string> p_list)
{
return await InvokePD(p_list, _service, true);
@ -198,13 +198,6 @@ namespace Win.Sfs.SettleAccount.Bases
return _taskid;
}
/// <summary>
/// 查询主表
/// </summary>

6
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)]
/// <summary>
/// 发票重开
/// </summary>
@ -323,7 +323,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
}
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// <summary>
/// 发票重开列表
/// </summary>
@ -458,7 +458,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
}
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// <summary>
/// 发票重开列表
/// </summary>

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

@ -68,7 +68,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
[HttpPost]
public async Task<IActionResult> GenerateInvoice([FromBody] string invbillNum)

6
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)]
/// <summary>
/// 发票重开
@ -291,7 +291,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// 发票重开列表
/// </summary>
/// <param name="input"></param>
@ -428,7 +428,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
/// 发票重开列表
/// </summary>
/// <param name="input"></param>

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

@ -65,7 +65,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// <returns></returns>
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
//[Route("generateinvoice")]
public async Task<IActionResult> GenerateInvoice([FromBody] string invbillnum)
{

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

@ -82,7 +82,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<IActionResult> ApprovalPassed(List<string> p_invs)
{
List<ERR_EXP_DTO> errors = new List<ERR_EXP_DTO>();
@ -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)
{

10
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
/// <exception cref="UserFriendlyException"></exception>
/// <exception cref="BusinessException"></exception>
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<IActionResult> ReissueInvoiceExtend(List<PUB_ADJ_DETAIL_DTO> p_list)
{
var errorlist = await CheckRepeat(p_list).ConfigureAwait(false);
@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public override async Task<IActionResult> 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)]
/// 发票重开列表
/// </summary>
/// <param name="input"></param>
@ -489,7 +489,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
[HttpPost]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<IActionResult> ReissueInvoiceList(List<PUB_ADJ_DETAIL_DTO> p_list)
{
var result = await _adjservice.CheckImport(p_list).ConfigureAwait(false);

2
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<IActionResult> GenerateInvoice([FromBody] string billnum)
{
var main = await _pubMng.GetMainAsync(billnum).ConfigureAwait(false);

2
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<string> exportName, List<CustomCondition> property)
{

6
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs

@ -285,7 +285,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
/// <returns></returns>
[HttpPost]
[Route("Export")]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<string> ExportAsync(SecMatchBaseRequestDto input)
{
List<string> fileList = new List<string>();
@ -493,7 +493,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
///// <returns></returns>
//[HttpPost]
//[Route("ExportSupplier")]
//[UnitOfWork(false)]
//[UnitOfWork(IsDisabled = false)]
//virtual public async Task<string> ExportSupplierAsync(SecMatchBaseRequestDto input)
//{
// List<string> fileList = new List<string>();
@ -514,7 +514,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
/// <returns></returns>
[HttpPost]
[Route("ExportSummary")]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<string> ExportSummaryAsync(SecMatchBaseRequestDto input)
{

8
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs

@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs
/// <remarks>
[HttpPost]
[Route("listold")]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<List<JobDto>> GetListOldAsync(JobRequestDto input)
{
return await _service.GetListAsync(input).ConfigureAwait(false);
@ -37,7 +37,7 @@ namespace Win.Sfs.SettleAccount.Entities.TaskJobs
/// </summary>
[HttpPost]
[Route("list")]
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<PagedResultDto<JobDto>> 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<List<string>> 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<List<string>> GetVersionListAsync()
{
return await _service.GetVersionListAsync().ConfigureAwait(false);

2
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<List<JobDto>> GetListAsync(JobRequestDto input)
{

10
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<string> 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<string> 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<string> 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<string> 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<string> UnSettledSumServiceMake(
// BaseRequestDto input

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

@ -115,7 +115,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
/// <param name="p_State"></param>
/// <returns></returns>
/// <exception cref="BusinessException"></exception>
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public virtual async Task<bool> SetForwardState(List<string> p_invs, SettleBillState p_State)
{
List<string> errors = new List<string>();
@ -940,7 +940,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
/// <param name="p_version">版本号</param>
/// <param name="p_InvGroupNum">发票分组</param>
/// <param name="p_parentInvBillNum">原发票号</param>
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public async Task<List<string>> SecInvoice<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_ajdlist, List<TEMP_CAN_SA_DETAIL> 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<List<string>> FirstInvoice<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> dtos, List<TEMP_NOT_SA_DETAIL> 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)]
/// <summary>
/// 重开一次开票
/// </summary>
@ -2032,9 +2032,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
case EnumBusinessType.YinDuJian:
invlist = await JITInvoice(p_list, p_adjlist, dtos, new List<TEMP_NOT_SA_DETAIL>(), 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";

4
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<List<INVOICE_WAIT_DETAIL>> FirstInvoiceExtend<TDetail>(List<TDetail> p_list, List<PUB_ADJ_DETAIL> p_adjlist, List<TEMP_CAN_SA_DETAIL> dtos, List<TEMP_NOT_SA_DETAIL> 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)]
/// <summary>
/// 第一次开票
/// </summary>

5
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> TED_SA_INV { set; get; }
public ExChangeCenterDbContext(DbContextOptions<WMSBJBMPTDbContext> options) : base(options)
{
}
protected override void OnModelCreating(ModelBuilder modelBuilder)

2
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 =

2
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<List<DiffUnsetttleReport>> GetDiffUnSettleReport(string year, string customcode)
{

2
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)]
/// <summary>
/// BBAC生成待扣减
/// </summary>

4
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs

@ -70,7 +70,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
/// <param name="end"></param>
/// <param name="materialGroup"></param>
/// <returns></returns>
//[UnitOfWork(false)]
//[UnitOfWork(IsDisabled = false)]
//public virtual List<HQHSettledDetailDiff> 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<HQHSettledDetailDiff> GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end, string materialGroup)
{

2
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 =

2
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)]
/// <summary>
/// 执行发票待开任务
/// </summary>

2
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<string> exportName, List<CustomCondition> p_list)
{
var billnum = p_list.Where(p => p.Name == "BillNum").FirstOrDefault().Value;

2
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<string> exportName, List<CustomCondition> p_list)
{
var _filename = exportName.FirstOrDefault();

4
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<string> exportName, List<CustomCondition> p_list)
{
return id.ToString();
}
[UnitOfWork(false)]
[UnitOfWork(IsDisabled = false)]
public List<UnSettledSum> GetFisSum(Guid id, List<string> exportName, List<CustomCondition> p_list)
{
var _first = exportName.FirstOrDefault();

2
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<UnSettledSum> GetFisSum(Guid id, List<string> exportName, List<CustomCondition> p_list)
{
var _first = exportName.FirstOrDefault();

Loading…
Cancel
Save