diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 2c7b45de..6037c38e 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -106,8 +106,8 @@
..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll
-
- ..\packages\Quartz.3.5.0\lib\netstandard2.0\Quartz.dll
+
+ ..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll
..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll
diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs
index e3f23512..426d539e 100644
--- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs
@@ -405,7 +405,7 @@ namespace BLL
row[12] = workPackage.RealStartDate;
}
if (workPackage.RealEndDate != null)
- {
+ {
row[13] = workPackage.RealEndDate;
}
if (workPackage.PlanCost != null)
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index d2cbe31f..f8da4e25 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -11539,7 +11539,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
public string ApproveIdea
{
get
@@ -149756,7 +149756,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
public string AttentPerson
{
get
@@ -180965,7 +180965,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EstimatedAmount", DbType="Decimal(18,0)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EstimatedAmount", DbType="Decimal(18,2)")]
public System.Nullable EstimatedAmount
{
get
@@ -181005,7 +181005,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SettledAmount", DbType="Decimal(18,0)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SettledAmount", DbType="Decimal(18,2)")]
public System.Nullable SettledAmount
{
get
@@ -181179,7 +181179,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
public System.Nullable WorkPackageEstimate
{
get
diff --git a/SGGL/SGGL.sln b/SGGL/SGGL.sln
index 2dcebcae..721038cf 100644
--- a/SGGL/SGGL.sln
+++ b/SGGL/SGGL.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33516.290
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.2017
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Mobile", "FineUIPro.Mobile\FineUIPro.Mobile.csproj", "{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BLLTests", "BLLTests\BLLTests.csproj", "{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -79,18 +77,6 @@ Global
{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.ActiveCfg = Release|Any CPU
{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.Build.0 = Release|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|x86.Build.0 = Debug|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Any CPU.Build.0 = Release|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|x86.ActiveCfg = Release|Any CPU
- {18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE