Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
1eb2a09340
  1. 1
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
  2. 3
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/FisUpdateStateDapperRepository.cs
  3. 49
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
  4. 3
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisUpdateExportService.cs

1
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj

@ -6,6 +6,7 @@
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace>Win.Sfs.SettleAccount</RootNamespace> <RootNamespace>Win.Sfs.SettleAccount</RootNamespace>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>

3
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/FisUpdateStateDapperRepository.cs

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories.Dapper; using Volo.Abp.Domain.Repositories.Dapper;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Uow;
using Win.Sfs.SettleAccount.Entities; using Win.Sfs.SettleAccount.Entities;
using Win.Sfs.SettleAccount.Entities.Materials; using Win.Sfs.SettleAccount.Entities.Materials;
using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.Entities.Prices;
@ -28,7 +29,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{ {
} }
[UnitOfWork(isTransactional: false)]
public virtual void UpdateFisSettle() public virtual void UpdateFisSettle()
{ {

49
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs

@ -18,29 +18,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
//public string 行号 { set; get; }
//public string 客户 { set; get; }
//public string 出库类型 { set; get; }
//public string 结算单 { set; get; }
//public string 物料号 { set; get; }
//public string 通用代码号 { set; get; }
//public string 结算数量 { set; get; }
//public string 实际出库数量 { set; get; }
//public string 差异数量 { set; get; }
//public string 开票单价 { set; get; }
//public string 结算金额 { set; get; }
//public string WMS待出库金额 { set; get; }
//public string 物料组编码 { set; get; }
//public string 物料组车型 { set; get; }
//public string 物料描述 { set; get; }
//public string 备注 { set; get; }
@ -63,8 +41,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
//[ImporterHeader(Name = "客户代码")] //[ImporterHeader(Name = "客户代码")]
//[ExporterHeader(DisplayName = "客户代码")] //[ExporterHeader(DisplayName = "客户代码")]
//public string 客户代码 { set; get; } //public string 客户代码 { set; get; }
//[ImporterHeader(Name = "结算单")] [ImporterHeader(Name = "结算单")]
//[ExporterHeader(DisplayName = "结算单")] [ExporterHeader(DisplayName = "结算单")]
public string { set; get; } public string { set; get; }
[ImporterHeader(Name = "物料号")] [ImporterHeader(Name = "物料号")]
[ExporterHeader(DisplayName = "物料号")] [ExporterHeader(DisplayName = "物料号")]
@ -110,7 +88,26 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
public string { set; get; } public string { set; get; }
//public string 行号 { set; get; }
//public string 客户 { set; get; }
//public string 出库类型 { set; get; }
//public string 结算单 { set; get; }
//public string 物料号 { set; get; }
//public string 通用代码号 { set; get; }
//public string 结算数量 { set; get; }
//public string 实际出库数量 { set; get; }
//public string 差异数量 { set; get; }
//public string 开票单价 { set; get; }
//public string 结算金额 { set; get; }
//public string WMS待出库金额 { set; get; }
//public string 物料组编码 { set; get; }
//public string 物料组车型 { set; get; }
//public string 物料描述 { set; get; }
//public string 备注 { set; get; }

3
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/FisUpdateExportService.cs

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using TaskJob.EventArgs; using TaskJob.EventArgs;
using TaskJob.Interfaces; using TaskJob.Interfaces;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Uow;
using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace SettleAccount.Job.Services.Report namespace SettleAccount.Job.Services.Report
@ -23,7 +24,7 @@ namespace SettleAccount.Job.Services.Report
{ {
_dapperRepository = dapperRepository; _dapperRepository = dapperRepository;
} }
[UnitOfWork(isTransactional: false)]
public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> property) public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> property)
{ {
_dapperRepository.UpdateFisSettle(); _dapperRepository.UpdateFisSettle();

Loading…
Cancel
Save