diff --git a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo index e3209a30..d884462a 100644 Binary files a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo and b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo differ diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs index d0053c72..5e891ea1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHSettledDetailDapperRepository.cs @@ -62,7 +62,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report //// condition += string.Format(" B.chassisNumber='{0}' ", materialGroup); ////} string str = "SELECT\n" + - " temp1.交货日期,\n" + + " Convert(varchar(10),temp1.交货日期,120) 交货日期,\n" + " isnull( temp1.手工或自动, '' ) 手工或自动,\n" + " isnull( temp1.交货单号, '' ) 交货单号,\n" + " temp1.收货仓库,\n" + @@ -79,6 +79,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " temp1.结算数量,\n" + " temp1.结算单价,\n" + " temp1.结算金额,\n" + + + " TEMP1.工厂,\n" + + " isnull( TEMP2.Price, 0 ) AS 发货定价,\n" + " isnull( temp1.发货数量, 0 ) * isnull( TEMP2.Price, 0 ) AS 发货总金额,\n" + " 0 AS 数量差异,\n" + @@ -103,7 +106,9 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " isnull( a.Qty, 0 ) AS 结算数量,\n" + " isnull( a.Price, 0 ) AS 结算单价,\n" + " isnull( a.Amt, 0 ) AS 结算金额 ,\n" + - " C.EstimateTypeDesc AS 物料组 \n" + + " C.EstimateTypeDesc AS 物料组, \n" + + " A.Factory 工厂 \n"+ + " FROM\n" + " Set_HQ_H_Platform AS a\n" + " LEFT OUTER JOIN Set_HQ_H_Kanban AS b ON a.HQHKanBan = b.Kanban \n" + @@ -260,15 +265,19 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { [ExporterHeader(DisplayName = "交货单号")] public string 交货单号 { set; get; } - [ExporterHeader(DisplayName = "交货时间")] - public string 交货时间 { set; get; } + [ExporterHeader(DisplayName = "交货日期")] + public string 交货日期 { set; get; } [ExporterHeader(DisplayName = "手工或自动")] public string 手工或自动 { set; get; } + + [ExporterHeader(DisplayName = "工厂")] + public string 工厂 { set; get; } + [ExporterHeader(DisplayName = "收货仓库")] public string 收货仓库 { set; get; } [ExporterHeader(DisplayName = "收货仓库描述")] public string 收货仓库描述 { set; get; } - [ExporterHeader(DisplayName = "订货看板编号")] + [ExporterHeader(DisplayName = "看板编号")] public string 订货看板编号 { set; get; } [ExporterHeader(DisplayName = "订货零件号")] public string 订货零件号 { set; get; } @@ -284,7 +293,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report public decimal 发货数量 { set; get; } [ExporterHeader(DisplayName = "发货状态")] public string 发货状态 { set; get; } - [ExporterHeader(DisplayName = "结算验收单号")] + [ExporterHeader(DisplayName = "验收单号")] public string 结算验收单号 { set; get; } [ExporterHeader(DisplayName = "结算数量")] public decimal 结算数量 { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs index fb67fc45..6666505c 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSettledDetailDiffExportService.cs @@ -109,6 +109,7 @@ namespace SettleAccount.Job.Services.Report _ls = _ls.Where(p => _groupList.Contains(p.Sap编码)).ToList(); } } + _ls=_ls.OrderBy(p => p.交货单号).ToList(); _outputService.Export(id, _filename, _ls); return id.ToString(); }