Browse Source

1.修改维修模组查询报表,日期查询条件的结束时间加1(含当天)

PTD
Marvin 2 years ago
parent
commit
b8b95d0afb
  1. 4
      AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
  2. 12
      AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

4
AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs

@ -169,7 +169,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
if (unitNo != null) if (unitNo != null)
@ -271,7 +271,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
if (unitNo != null) if (unitNo != null)

12
AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

@ -156,7 +156,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
@ -495,7 +495,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
@ -1120,7 +1120,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
@ -1261,7 +1261,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
@ -1403,7 +1403,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }
@ -1545,7 +1545,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
{ {
if (dateStart != "" && dateEnd != "") if (dateStart != "" && dateEnd != "")
{ {
q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd)); q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
} }
} }

Loading…
Cancel
Save