diff --git a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo index 59036805..84ff1702 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/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs index f61dc81f..d78f62fe 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs @@ -126,11 +126,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report ////} if (!string.IsNullOrEmpty(begin)) { - condition += string.Format(" and a.BeginTime>='{0}' ", begin); + condition += string.Format(" and b.LastModificationTime>='{0}' ", begin); } if (!string.IsNullOrEmpty(end)) { - condition += string.Format(" and a.BeginTime<='{0}' ", end); + condition += string.Format(" and b.LastModificationTime<='{0}' ", end); } //if (!string.IsNullOrEmpty(cp7begin)) //{ @@ -180,7 +180,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " (\n" + " SELECT\n" + " b.WmsBillNum AS 交货单号,\n" + -" a.CreationTime AS 交货时间,\n" + +" b.LastModificationTime AS 交货时间,\n" + " b.IsAuto AS 手工或自动,\n" + " a.StorageLocation AS 收货仓库,\n" + " a.StorageLocationDesc AS 收货仓库描述,\n" + @@ -202,7 +202,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " AND a.MaterialCode = b.MaterialCode\n" + " LEFT OUTER JOIN Set_material AS c ON a.MaterialCode = c.CustomerPartCode \n" + " WHERE\n" + -" ( a.HQHKanBan <> 'BJ' ) and a.Version='{0}') AS temp1\n" + +" ( a.HQHKanBan <> 'BJ' ) and a.Version='{0}' {1}) AS temp1\n" + " LEFT OUTER JOIN (\n" + " SELECT\n" + " Price,\n" + @@ -271,11 +271,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report if (!string.IsNullOrEmpty(begin)) { - condition += string.Format(" and a.BeginTime>='{0}' ", begin); + condition += string.Format(" and a.LastModificationTime>='{0}' ", begin); } if (!string.IsNullOrEmpty(end)) { - condition += string.Format(" and a.BeginTime<='{0}' ", end); + condition += string.Format(" and a.LastModificationTime<='{0}' ", end); } string str = @@ -307,7 +307,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " Set_HQ_H_Platform \n" + " WHERE\n" + " version = '{0}' \n" + -" AND HQHKanBan = 'BJ' \n" + +" AND HQHKanBan = 'BJ' {1}\n" + " GROUP BY\n" + " MaterialCode,\n" + " StorageLocation,\n" +