|
@@ -558,8 +558,17 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
if (dto.GoodsId > 0) dto.GoodsName = string.Empty;
|
|
|
if (!string.IsNullOrEmpty(dto.GoodsName)) dto.GoodsId = 0;
|
|
|
|
|
|
- var beginBool = DateTime.TryParse($"{dto.BeginDt} 00:00:00", out DateTime begin);
|
|
|
- var endBool = DateTime.TryParse($"{dto.EndDt} 23:59:59", out DateTime end);
|
|
|
+ bool beginBool = false,
|
|
|
+ endBool = false;
|
|
|
+ DateTime begin = DateTime.Now,
|
|
|
+ end = DateTime.Now;
|
|
|
+ if (!string.IsNullOrEmpty(dto.BeginDt) && !string.IsNullOrEmpty(dto.EndDt))
|
|
|
+ {
|
|
|
+ beginBool = DateTime.TryParse($"{dto.BeginDt} 00:00:00", out begin);
|
|
|
+ endBool = DateTime.TryParse($"{dto.EndDt} 23:59:59", out end);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
RefAsync<int> total = 0;
|
|
|
var data = await _sqlSugar.Queryable<Pm_GoodsReceive>()
|