Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
4e6c1bac79
  1. 4238
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220428.txt
  2. 4
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  3. 4
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettle/UnSettleDetailReport.cs
  4. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs
  5. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/ReportDetailBase.cs
  6. 5
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs

4238
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220428.txt

File diff suppressed because it is too large

4
src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@ -35,8 +35,8 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace Win.Sfs.SettleAccount.Reports.ReportServices namespace Win.Sfs.SettleAccount.Reports.ReportServices
{ {
[Authorize(SettleAccountPermissions.Reports.Default)] [Authorize(SettleAccountPermissions.Reports.Default)]
//[AllowAnonymous] [AllowAnonymous]
[Route("api/settleaccount/ReportMakeService")] //[Route("api/settleaccount/ReportMakeService")]
public class ReportService : ApplicationService public class ReportService : ApplicationService
{ {

4
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettle/UnSettleDetailReport.cs

@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.Entities.UnSettle
[ExporterHeader(DisplayName = "交货单号 ")] [ExporterHeader(DisplayName = "交货单号 ")]
public override string WmsBillNum { set; get; } public override string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期 ")] [ExporterHeader(DisplayName = "实际发货日期 ")]
public override DateTime CP5Time { set; get; } public override string CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")] [ExporterHeader(DisplayName = "KENN号")]
public override string KENNCode { set; get; } public override string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")] [ExporterHeader(DisplayName = "底盘号")]
@ -75,7 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.UnSettle
[ExporterHeader(DisplayName = "交货单号 ")] [ExporterHeader(DisplayName = "交货单号 ")]
public override string WmsBillNum { set; get; } public override string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期 ")] [ExporterHeader(DisplayName = "实际发货日期 ")]
public new string CP5Time { set; get; } public override string CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")] [ExporterHeader(DisplayName = "KENN号")]
public override string KENNCode { set; get; } public override string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")] [ExporterHeader(DisplayName = "底盘号")]

2
src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs

@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs
[ExporterHeader(DisplayName = "交货单号")] [ExporterHeader(DisplayName = "交货单号")]
public override string WmsBillNum { set; get; } public override string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期", Format = "yyyy-MM-dd")] [ExporterHeader(DisplayName = "实际发货日期", Format = "yyyy-MM-dd")]
public override DateTime CP5Time { set; get; } public override string CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")] [ExporterHeader(DisplayName = "KENN号")]
public override string KENNCode { set; get; } public override string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")] [ExporterHeader(DisplayName = "底盘号")]

2
src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/ReportDetailBase.cs

@ -21,7 +21,7 @@ namespace Win.Sfs.SettleAccount.Reports
[ExporterHeader(DisplayName = "交货单号 ")] [ExporterHeader(DisplayName = "交货单号 ")]
public virtual string WmsBillNum { set; get; } public virtual string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期 ")] [ExporterHeader(DisplayName = "实际发货日期 ")]
public virtual DateTime CP5Time { set; get; } public virtual string CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")] [ExporterHeader(DisplayName = "KENN号")]
public virtual string KENNCode { set; get; } public virtual string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")] [ExporterHeader(DisplayName = "底盘号")]

5
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs

@ -37,8 +37,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
else else
{ {
string isExistSql = string.Format("SELECT count(1) lincount FROM [Set_Settle_RAM] WITH(SNAPSHOT) where Version = '{0}'", version); //string isExistSql = string.Format("SELECT count(1) lincount FROM [Set_Settle_RAM] WITH(SNAPSHOT) where Version = '{0}'", version);
int _count = DbConnection.ExecuteScalar<int>(isExistSql); //int _count = DbConnection.ExecuteScalar<int>(isExistSql);
int _count = 0;
string condition = " where 1=1 "; string condition = " where 1=1 ";
if (!string.IsNullOrEmpty(begin)) if (!string.IsNullOrEmpty(begin))

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs

@ -19,7 +19,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "交货单号")] [ExporterHeader(DisplayName = "交货单号")]
public override string WmsBillNum { set; get; } public override string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期",Format = "yyyy-MM-dd")] [ExporterHeader(DisplayName = "实际发货日期",Format = "yyyy-MM-dd")]
public override DateTime CP5Time { set; get; } public override string CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")] [ExporterHeader(DisplayName = "KENN号")]
public override string KENNCode { set; get; } public override string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")] [ExporterHeader(DisplayName = "底盘号")]

Loading…
Cancel
Save