|
@@ -9,7 +9,7 @@ namespace wms.service.Extensions
|
|
|
/// </summary>
|
|
|
public static class PrimitiveTypeExtensions
|
|
|
{
|
|
|
- public static DateTime GetDateTime(this string time) => DateTime.ParseExact(time, "yyyyMMddHHmmss", null);
|
|
|
+ public static DateTime GetDateTime(this string time) => GetDateTime(time, null);
|
|
|
|
|
|
/// <summary>
|
|
|
/// 获取时间
|
|
@@ -21,10 +21,8 @@ namespace wms.service.Extensions
|
|
|
{
|
|
|
DateTime prodate = DateTime.Now;
|
|
|
DateTime item = prodate;
|
|
|
- if (!string.IsNullOrEmpty(time) && DateTime.TryParseExact(time, "yyyyMMddHHmmss", null, System.Globalization.DateTimeStyles.None, out prodate))
|
|
|
- {
|
|
|
- prodate = DateTime.ParseExact(time, "yyyyMMddHHmmss", null);
|
|
|
- }
|
|
|
+ if (DateTime.TryParseExact(time, "yyyyMMddHHmmss", null, System.Globalization.DateTimeStyles.None, out prodate)) prodate = DateTime.ParseExact(time, "yyyyMMddHHmmss", null);
|
|
|
+ else if (DateTime.TryParseExact(time, "yyyy-MM-dd HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out prodate)) prodate = DateTime.ParseExact(time, "yyyy-MM-dd HH:mm:ss", null);
|
|
|
else
|
|
|
{
|
|
|
if (logger != null)
|