diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index fc93fb60..66e9549e 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/DataBase/版本日志/SGGLDB_V2023-08-31.sql b/DataBase/版本日志/SGGLDB_V2023-08-31.sql
new file mode 100644
index 00000000..fb755b76
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-08-31.sql
@@ -0,0 +1,29 @@
+alter table dbo.PHTGL_ContractTrackMatchWBS
+ alter column ContractTrackId varchar(50) null
+go
+alter table dbo.PHTGL_ContractTrackMatchWBS
+ alter column WorkPackageEstimate decimal(18, 3) null
+go
+
+alter table dbo.PHTGL_ContractTrackProgress
+ add Date nvarchar(50)
+go
+alter table dbo.PHTGL_ContractTrack
+ alter column EstimatedAmount decimal(18, 2) null
+go
+
+alter table dbo.PHTGL_ContractTrack
+ alter column SettledAmount decimal(18, 2) null
+go
+INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
+ VALUES ( N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'ִͬи',N'PHTGL/ContractCompile/ContractTrackList.aspx',40,0,N'Menu_PHTGL',0,1,1)
+ GO
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'5AD91BF5-4CA6-4A9E-A370-D17B0D99010F',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',2)
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'5D1F64DE-32CE-4236-A6AE-3E276105D387',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'ɾ',3)
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'DD9A3A8A-8DD9-4B24-B51D-C3EB530B60F2',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',4)
+ INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
+ VALUES ( N'C1708178-C52B-4D32-9849-C69622D96105',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',1)
+ GO
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index e2af63a8..2c7b45de 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.7.0\lib\netstandard2.0\Quartz.dll
+
+ ..\packages\Quartz.3.5.0\lib\netstandard2.0\Quartz.dll
..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll
@@ -584,6 +584,7 @@
+
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index 6b9414eb..775ceb26 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
@@ -7,10 +7,11 @@ using FineUIPro;
using MiniExcelLibs;
using MiniExcelLibs.Attributes;
using Model;
+using WIA;
namespace BLL
{
- public static class PHTGL_ContractTrackService
+ public static class PhtglContractTrackService
{
#region 获取列表
@@ -157,6 +158,8 @@ namespace BLL
};
Funs.DB.PHTGL_ContractTrack.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
+ PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id);
+
}
@@ -206,6 +209,8 @@ namespace BLL
Funs.DB.PHTGL_ContractTrack.DeleteOnSubmit(table);
Funs.DB.SubmitChanges();
}
+ PhtglContracttrackprogressService.DeleteModleByContractTrackId(id);
+ PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id);
}
public static ResponeData ImportData(string path, string contractid, string projectid)
@@ -243,7 +248,9 @@ namespace BLL
ContractId = contractid,
ProjectId = projectid,
};
+ if (string.IsNullOrEmpty(item.ProjectCode)) continue;
var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack);
+ item.ContractNum=ContractService.GetContractById(contractid)?.ContractNum;
if (resultModel.Any())
{
item.Id = resultModel[0].Id;
@@ -254,6 +261,7 @@ namespace BLL
item.Id = SQLHelper.GetNewID();
AddPHTGL_ContractTrack(item);
}
+ PhtglContracttrackprogressService.CreateTemplateByContractTrackId(item.Id);
}
return responeData;
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs
new file mode 100644
index 00000000..7cc62f20
--- /dev/null
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackmatchwbsService.cs
@@ -0,0 +1,124 @@
+using FineUIPro;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+
+namespace BLL
+{
+
+ public static class PhtglContracttrackmatchwbsService
+ {
+
+
+
+ #region 获取列表
+ ///
+ /// 记录数
+ ///
+ public static int Count
+ {
+ get;
+ set;
+ }
+ public static List GetPHTGL_ContractTrackMatchWBSByModle(Model.PHTGL_ContractTrackMatchWBS table)
+ {
+ var q = from x in Funs.DB.PHTGL_ContractTrackMatchWBS
+ where
+ (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
+ (string.IsNullOrEmpty(table.ContractTrackId) || x.ContractTrackId.Contains(table.ContractTrackId)) &&
+ (string.IsNullOrEmpty(table.ControlItemAndCycleId) || x.ControlItemAndCycleId.Contains(table.ControlItemAndCycleId))
+ select x
+ ;
+
+ return q.ToList();
+ }
+
+ ///
+ /// 获取分页列表
+ ///
+ ///
+ ///
+ ///
+ public static IEnumerable GetListData(Model.PHTGL_ContractTrackMatchWBS table, Grid grid1)
+ {
+ var q = GetPHTGL_ContractTrackMatchWBSByModle(table);
+ Count = q.Count();
+ if (Count == 0)
+ {
+ return null;
+ }
+ q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
+ // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+ return from x in q
+ select new
+ {
+ x.Id,
+ x.ContractTrackId,
+ x.ControlItemAndCycleId,
+ x.WorkPackageEstimate,
+
+ };
+ }
+ #endregion
+
+ public static Model.PHTGL_ContractTrackMatchWBS GetPHTGL_ContractTrackMatchWBSById(string Id)
+ {
+ return Funs.DB.PHTGL_ContractTrackMatchWBS.FirstOrDefault(x => x.Id == Id);
+ }
+
+
+ public static void AddPHTGL_ContractTrackMatchWBS(Model.PHTGL_ContractTrackMatchWBS newtable)
+ {
+
+ Model.PHTGL_ContractTrackMatchWBS table = new Model.PHTGL_ContractTrackMatchWBS
+ {
+ Id = newtable.Id,
+ ContractTrackId = newtable.ContractTrackId,
+ ControlItemAndCycleId = newtable.ControlItemAndCycleId,
+ WorkPackageEstimate = newtable.WorkPackageEstimate,
+ };
+ Funs.DB.PHTGL_ContractTrackMatchWBS.InsertOnSubmit(table);
+ Funs.DB.SubmitChanges();
+ }
+
+
+ public static void UpdatePHTGL_ContractTrackMatchWBS(Model.PHTGL_ContractTrackMatchWBS newtable)
+ {
+
+ Model.PHTGL_ContractTrackMatchWBS table = Funs.DB.PHTGL_ContractTrackMatchWBS.FirstOrDefault(x => x.Id == newtable.Id);
+ if (table != null)
+ {
+ table.Id = newtable.Id;
+ table.ContractTrackId = newtable.ContractTrackId;
+ table.ControlItemAndCycleId = newtable.ControlItemAndCycleId;
+ table.WorkPackageEstimate = newtable.WorkPackageEstimate;
+ Funs.DB.SubmitChanges();
+ }
+
+ }
+ public static void DeleteModelById(string Id)
+ {
+
+ Model.PHTGL_ContractTrackMatchWBS table = Funs.DB.PHTGL_ContractTrackMatchWBS.FirstOrDefault(x => x.Id == Id);
+ if (table != null)
+ {
+ Funs.DB.PHTGL_ContractTrackMatchWBS.DeleteOnSubmit(table);
+ Funs.DB.SubmitChanges();
+ }
+
+ }
+ public static void DeleteModelByContractTrackId(string ContractTrackId)
+ {
+ var table = Funs.DB.PHTGL_ContractTrackMatchWBS.Where(x =>
+ x.ContractTrackId == ContractTrackId);
+ if (table != null)
+ {
+ Funs.DB.PHTGL_ContractTrackMatchWBS.DeleteAllOnSubmit(table);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
index 4c23749e..61e730bf 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using FineUIPro;
@@ -33,7 +34,10 @@ namespace BLL
(string.IsNullOrEmpty(table.ACWP_OutputValue) ||
x.ACWP_OutputValue.Contains(table.ACWP_OutputValue)) &&
(string.IsNullOrEmpty(table.ACWP_Percentage) ||
- x.ACWP_Percentage.Contains(table.ACWP_Percentage))
+ x.ACWP_Percentage.Contains(table.ACWP_Percentage)) &&
+ (string.IsNullOrEmpty(table.Date) ||
+ x.Date.Contains(table.Date))
+ orderby x.Date
select x
;
@@ -63,7 +67,8 @@ namespace BLL
x.BCWS_Percentage,
x.ACWP_Quantity,
x.ACWP_OutputValue,
- x.ACWP_Percentage
+ x.ACWP_Percentage,
+ x.Date
};
}
@@ -75,7 +80,52 @@ namespace BLL
x.ContractTrackProgressId == ContractTrackProgressId);
}
+ public static void CreateTemplateByContractTrackId(string ContractTrackId)
+ {
+ var model = PhtglContractTrackService.GetPHTGL_ContractTrackById(ContractTrackId);
+ if (model == null) return;
+ var contractNum=model.ContractNum;
+ var contractmode = ContractService.GetContractByContractNum(contractNum);
+ if (contractmode.ContractStartDate != null && contractmode.ContractEndDate != null)
+ {
+ var startDate = (DateTime)contractmode.ContractStartDate;
+ var endDate = (DateTime)contractmode.ContractEndDate;
+ List months = GetMonthsBetween(startDate, endDate);
+ foreach (DateTime month in months)
+ {
+ var querymodel = new Model.PHTGL_ContractTrackProgress
+ {
+ ContractTrackId = ContractTrackId,
+ Date= month.ToString("yyyy-MM")
+ };
+ if (!GetPHTGL_ContractTrackProgressByModle(querymodel).Any())
+ {
+ var newmodel = new Model.PHTGL_ContractTrackProgress();
+ newmodel.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress));
+ newmodel.ContractTrackId = ContractTrackId;
+ newmodel.Date = month.ToString("yyyy-MM");
+ AddPHTGL_ContractTrackProgress(newmodel);
+ }
+ //Console.WriteLine(month.ToString("yyyy-MM"));
+ }
+ }
+ }
+ public static List GetMonthsBetween(DateTime startDate, DateTime endDate)
+ {
+ List months = new List();
+
+ DateTime currentMonth = new DateTime(startDate.Year, startDate.Month, 1);
+ DateTime lastMonth = new DateTime(endDate.Year, endDate.Month, 1);
+
+ while (currentMonth <= lastMonth)
+ {
+ months.Add(currentMonth);
+ currentMonth = currentMonth.AddMonths(1);
+ }
+
+ return months;
+ }
public static void AddPHTGL_ContractTrackProgress(PHTGL_ContractTrackProgress newtable)
{
var table = new PHTGL_ContractTrackProgress
@@ -87,7 +137,9 @@ namespace BLL
BCWS_Percentage = newtable.BCWS_Percentage,
ACWP_Quantity = newtable.ACWP_Quantity,
ACWP_OutputValue = newtable.ACWP_OutputValue,
- ACWP_Percentage = newtable.ACWP_Percentage
+ ACWP_Percentage = newtable.ACWP_Percentage,
+ Date = newtable.Date
+
};
Funs.DB.PHTGL_ContractTrackProgress.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -108,6 +160,7 @@ namespace BLL
table.ACWP_Quantity = newtable.ACWP_Quantity;
table.ACWP_OutputValue = newtable.ACWP_OutputValue;
table.ACWP_Percentage = newtable.ACWP_Percentage;
+ table.Date =newtable.Date;
Funs.DB.SubmitChanges();
}
}
diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
index dd232097..e5cfebf5 100644
--- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
@@ -599,7 +599,7 @@ namespace BLL
}
///
- /// 获取企业总部总监人数
+ /// 获取企业总部总监人数
///
///
public static int GetHeadOfficeInspectorGeneralNum()
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index ca69c0f9..d00d86fc 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1258,6 +1258,7 @@
+
@@ -12367,6 +12368,13 @@
ContractTrackList.aspx
+
+ ContractTrackMatchWBS.aspx
+ ASPXCodeBehind
+
+
+ ContractTrackMatchWBS.aspx
+
GeneralTermsConditions.aspx
ASPXCodeBehind
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
index 5c365b79..dd057102 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
@@ -197,7 +197,7 @@
+ EnableColumnLines="true" DataIDField="ContractTrackProgressId" Hidden="True">
@@ -211,6 +211,12 @@
+
+
+
+
+
protected global::FineUIPro.Button btnDelete;
+ ///
+ /// TextBox1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox TextBox1;
+
///
/// txtBCWS_Quantity 控件。
///
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs
index 43f91278..34b8f586 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackIn.aspx.cs
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
var fileName = rootPath + initPath + hdFileName.Text;
ResponeData responeData = new ResponeData();
- responeData = PHTGL_ContractTrackService.ImportData(fileName, ContractId, this.CurrUser.LoginProjectId);
+ responeData = PhtglContractTrackService.ImportData(fileName, ContractId, this.CurrUser.LoginProjectId);
if (responeData.code == 1)
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
index 3ed16b01..3bc45eff 100644
--- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
@@ -5,179 +5,394 @@
-
+
合同执行跟踪表
--%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs
new file mode 100644
index 00000000..916b6ef4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.cs
@@ -0,0 +1,514 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+ public partial class ContractTrackMatchWBS : PageBase
+ {
+ public string ContractTrackId
+ {
+ get { return (string)ViewState["ContractTrackId"]; }
+ set { ViewState["ContractTrackId"] = value; }
+ }
+
+ #region 页面加载
+ ///
+ /// 页面加载
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ ContractTrackId = Request.Params["ContractTrackId"];
+
+ InitTreeMenu();
+ }
+ }
+ #endregion
+
+ #region 加载树
+ ///
+ /// 加载树
+ ///
+ private void InitTreeMenu()
+ {
+ this.trWBS.Nodes.Clear();
+ this.trWBS.ShowBorder = false;
+ this.trWBS.ShowHeader = false;
+ this.trWBS.EnableIcons = true;
+ this.trWBS.AutoScroll = true;
+ this.trWBS.EnableSingleClickExpand = true;
+
+ TreeNode rootNode1 = new TreeNode();
+ rootNode1.Text = "建筑工程";
+ rootNode1.NodeID = "1";
+ rootNode1.CommandName = "ProjectType";
+ rootNode1.EnableExpandEvent = true;
+ rootNode1.EnableClickEvent = true;
+ this.trWBS.Nodes.Add(rootNode1);
+ TreeNode emptyNode = new TreeNode();
+ emptyNode.Text = "";
+ emptyNode.NodeID = "";
+ rootNode1.Nodes.Add(emptyNode);
+ //this.GetNodes(rootNode1.Nodes, rootNode1.NodeID);
+
+ TreeNode rootNode2 = new TreeNode();
+ rootNode2.Text = "安装工程";
+ rootNode2.NodeID = "2";
+ rootNode2.CommandName = "ProjectType";
+ rootNode2.EnableExpandEvent = true;
+ rootNode2.EnableClickEvent = true;
+ this.trWBS.Nodes.Add(rootNode2);
+ rootNode2.Nodes.Add(emptyNode);
+ //this.GetNodes(rootNode2.Nodes, rootNode2.NodeID);
+ }
+
+ #region 遍历节点方法
+ ///
+ /// 遍历节点方法
+ ///
+ /// 节点集合
+ /// 父节点
+ private void GetNodes(TreeNodeCollection nodes, string parentId)
+ {
+ List workPackages = new List();
+ if (parentId.Length == 1) //工程类型节点
+ {
+ workPackages = (from x in Funs.DB.WBS_WorkPackageProject
+ where x.SuperWorkPack == null && x.ProjectId == this.CurrUser.LoginProjectId && x.ProjectType == parentId
+ orderby x.PackageCode ascending
+ select x).ToList();
+ }
+ else
+ {
+ workPackages = (from x in Funs.DB.WBS_WorkPackageProject
+ where x.SuperWorkPack == parentId && x.ProjectId == this.CurrUser.LoginProjectId
+ orderby x.PackageCode ascending
+ select x).ToList();
+ }
+ foreach (var q in workPackages)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = q.PackageContent;
+ newNode.NodeID = q.WorkPackageCode;
+ newNode.CommandName = "WorkPackage";
+ newNode.EnableClickEvent = true;
+ nodes.Add(newNode);
+ }
+
+ for (int i = 0; i < nodes.Count; i++)
+ {
+ GetNodes(nodes[i].Nodes, nodes[i].NodeID);
+ }
+ }
+ #endregion
+ #endregion
+
+ #region 展开树
+ ///
+ /// 展开树
+ ///
+ ///
+ ///
+ protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e)
+ {
+ e.Node.Nodes.Clear();
+ if (e.Node.CommandName == "ProjectType") //展开工程类型
+ {
+ var trUnitWork = from x in Funs.DB.WBS_UnitWork
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
+ select x;
+ trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
+ if (trUnitWork.Count() > 0)
+ {
+ foreach (var trUnitWorkItem in trUnitWork)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName;
+ newNode.NodeID = trUnitWorkItem.UnitWorkId;
+ newNode.CommandName = "UnitWork";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ e.Node.Nodes.Add(newNode);
+ if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null)
+ {
+ TreeNode temp = new TreeNode();
+ temp.Text = "temp";
+ temp.NodeID = "temp";
+ newNode.Nodes.Add(temp);
+ }
+ }
+ }
+ }
+ else if (e.Node.CommandName == "UnitWork") //展开单位工程节点
+ {
+ var workPackages = from x in Funs.DB.WBS_WorkPackage where x.UnitWorkId == e.NodeID && x.SuperWorkPack == null && x.IsApprove == true orderby x.WorkPackageCode select x;
+ foreach (var workPackage in workPackages)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = workPackage.PackageContent;
+ newNode.NodeID = workPackage.WorkPackageId;
+ newNode.CommandName = "WorkPackage";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ e.Node.Nodes.Add(newNode);
+ var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+ if (childWorkPackages.Count() > 0)
+ {
+ TreeNode emptyNode = new TreeNode();
+ emptyNode.Text = "";
+ emptyNode.NodeID = "";
+ newNode.Nodes.Add(emptyNode);
+ }
+ }
+ }
+ else if (e.Node.CommandName == "WorkPackage") //展开工作包节点
+ {
+ var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
+ if (workPackages.Count() > 0) //存在子单位工程
+ {
+ foreach (var workPackage in workPackages)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = workPackage.PackageContent;
+ newNode.NodeID = workPackage.WorkPackageId;
+ newNode.CommandName = "WorkPackage";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ e.Node.Nodes.Add(newNode);
+ var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+ if (childWorkPackages.Count() > 0)
+ {
+ TreeNode emptyNode = new TreeNode();
+ emptyNode.Text = "";
+ emptyNode.NodeID = "";
+ newNode.Nodes.Add(emptyNode);
+ }
+ }
+ }
+ }
+ }
+ #endregion
+
+ ///
+ /// 发起设计交底(树节点)
+ ///
+ ///
+ ///
+ protected void btnMenuAddTechnicalDisclose_Click(object sender, EventArgs e)
+ {
+ if (this.trWBS.SelectedNode != null)
+ {
+ if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.CQMSTechnicalDiscloseMenuId, BLL.Const.BtnAdd))
+ {
+ if (this.trWBS.SelectedNode.CommandName == "WorkPackage")
+ {
+ var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == this.trWBS.SelectedNodeID && x.IsApprove == true select x;
+ if (childWorkPackages.Count() == 0) //末级节点
+ {
+ var oldTechnicalDisclose = BLL.CQMS_TechnicalDiscloseService.GetTechnicalDiscloseByDataId(this.trWBS.SelectedNodeID);
+ if (oldTechnicalDisclose == null)
+ {
+ var unitWork = (from x in Funs.DB.WBS_UnitWork
+ join y in Funs.DB.WBS_WorkPackage on x.UnitWorkId equals y.UnitWorkId
+ where y.WorkPackageId == this.trWBS.SelectedNodeID
+ select x).FirstOrDefault();
+ Model.Technical_TechnicalDisclose technicalDisclose = new Model.Technical_TechnicalDisclose();
+ technicalDisclose.TechnicalDiscloseId = SQLHelper.GetNewID();
+ technicalDisclose.ProjectId = this.CurrUser.LoginProjectId;
+ if (unitWork != null)
+ {
+ technicalDisclose.UnitId = unitWork.UnitId;
+ technicalDisclose.UnitWorkId = unitWork.UnitWorkId;
+ }
+ technicalDisclose.DataId = this.trWBS.SelectedNodeID;
+ technicalDisclose.DiscloseName = this.trWBS.SelectedNode.Text;
+ technicalDisclose.State = "0"; //未交底
+ technicalDisclose.CompileMan = this.CurrUser.PersonId;
+ technicalDisclose.CompileDate = DateTime.Now;
+ BLL.CQMS_TechnicalDiscloseService.AddTechnicalDisclose(technicalDisclose);
+ ShowNotify("发起成功！", MessageBoxIcon.Success);
+ }
+ else
+ {
+ ShowNotify("该节点已发起设计交底！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("请选择末级节点发起设计交底！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("请选择末级节点发起设计交底！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("请选择树节点！", MessageBoxIcon.Warning);
+ }
+ }
+
+ ///
+ /// 展开全部
+ ///
+ ///
+ ///
+ protected void btnMenuMore_Click(object sender, EventArgs e)
+ {
+ if (this.trWBS.SelectedNode != null)
+ {
+ if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ControlItemAndCycleMenuId, BLL.Const.BtnAdd))
+ {
+ if (this.trWBS.SelectedNode.CommandName != "ProjectType") //非工程类型节点可以增加
+ {
+ Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(this.trWBS.SelectedNodeID);
+ if (unitWork != null) //单位工程节点
+ {
+ this.trWBS.SelectedNode.Expanded = true;
+ this.trWBS.SelectedNode.Nodes.Clear();
+ var workPackages = from x in Funs.DB.WBS_WorkPackage where x.UnitWorkId == this.trWBS.SelectedNodeID && x.SuperWorkPack == null && x.IsApprove == true orderby x.WorkPackageCode select x;
+ foreach (var workPackage in workPackages)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = workPackage.PackageContent;
+ newNode.NodeID = workPackage.WorkPackageId;
+ newNode.CommandName = "WorkPackage";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ this.trWBS.SelectedNode.Nodes.Add(newNode);
+ var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+ if (childWorkPackages.Count() > 0)
+ {
+ newNode.Expanded = true;
+ ExpandWorkPackage(newNode.Nodes, newNode.NodeID);
+ }
+ }
+ }
+ else
+ {
+ this.trWBS.SelectedNode.Expanded = true;
+ this.trWBS.SelectedNode.Nodes.Clear();
+ ExpandWorkPackage(this.trWBS.SelectedNode.Nodes, this.trWBS.SelectedNodeID);
+ }
+ }
+ else
+ {
+ ShowNotify("请选择单位工程节点展开！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("请选择树节点！", MessageBoxIcon.Warning);
+ }
+ }
+
+ ///
+ /// 展开子级分部分项节点
+ ///
+ ///
+ ///
+ private void ExpandWorkPackage(TreeNodeCollection nodes, string parentId)
+ {
+ var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == parentId && x.IsApprove == true orderby x.WorkPackageCode select x;
+ if (workPackages.Count() > 0) //存在子单位工程
+ {
+ foreach (var workPackage in workPackages)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = workPackage.PackageContent;
+ newNode.NodeID = workPackage.WorkPackageId;
+ newNode.CommandName = "WorkPackage";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ nodes.Add(newNode);
+ var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x;
+ if (childWorkPackages.Count() > 0)
+ {
+ newNode.Expanded = true;
+ ExpandWorkPackage(newNode.Nodes, newNode.NodeID);
+ }
+ }
+ }
+ }
+
+ #region Tree点击事件
+ ///
+ /// Tree点击事件
+ ///
+ ///
+ ///
+ protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 绑定数据
+ ///
+ /// 绑定数据
+ ///
+ ///
+ ///
+ protected void Grid1_FilterChange(object sender, EventArgs e)
+ {
+ BindGrid();
+ }
+
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ Grid1.PageIndex = e.NewPageIndex;
+ BindGrid();
+ }
+
+ ///
+ /// Grid1排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ Grid1.SortDirection = e.SortDirection;
+ Grid1.SortField = e.SortField;
+ BindGrid();
+ }
+
+ ///
+ /// 分页下拉选择事件
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ ///
+ /// 加载Grid
+ ///
+ private void BindGrid()
+ {
+ string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum"
+ + @" FROM WBS_ControlItemAndCycle ";
+ List listStr = new List();
+ strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 ";
+ listStr.Add(new SqlParameter("@WorkPackageId", this.trWBS.SelectedNodeID));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ Grid1.RecordCount = tb.Rows.Count;
+ tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+
+ Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.trWBS.SelectedNodeID);
+ if (workPackage != null)
+ {
+ if (workPackage.ProjectType == "1") //建筑工程
+ {
+ this.Grid1.Columns[4].HeaderText = "对应的建筑资料表格";
+ this.Grid1.Columns[5].Hidden = true;
+ }
+ else //安装工程
+ {
+ this.Grid1.Columns[4].HeaderText = "对应的化工资料表格";
+ this.Grid1.Columns[5].Hidden = false;
+ }
+ }
+ }
+ #endregion
+
+ //
+ //获取文本
+ //
+ //
+ //
+ public static string ConvertText(object Str)
+ {
+ string s = string.Empty;
+ if (Str != null)
+ {
+ string[] strs = Str.ToString().Split(',');
+ foreach (var item in strs)
+ {
+ s += item + "
";
+ }
+ if (!string.IsNullOrEmpty(s))
+ {
+ s = s.Substring(0, s.Length - 5);
+ }
+ }
+ return s;
+ }
+
+ protected void btnAccept_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIDArray.Length>0)
+ {
+ var Ids=Grid1.SelectedRowIDArray;
+ foreach (var item in Ids)
+ {
+ var querymodel = new Model.PHTGL_ContractTrackMatchWBS
+ {
+ ContractTrackId = ContractTrackId,
+ ControlItemAndCycleId = item,
+ };
+ var queryResult =
+ PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSByModle(querymodel);
+ if (!queryResult.Any())
+ {
+ var newtable = new Model.PHTGL_ContractTrackMatchWBS
+ {
+ Id = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackMatchWBS)),
+ ContractTrackId = ContractTrackId,
+ ControlItemAndCycleId = item,
+
+ };
+ BLL.PhtglContracttrackmatchwbsService.AddPHTGL_ContractTrackMatchWBS(newtable);
+ }
+ }
+ ShowNotify("添加成功", MessageBoxIcon.Success);
+ BindGrid();
+ }
+ else
+ {
+ ShowNotify("请选择需要添加的数据",MessageBoxIcon.Information);
+ }
+ }
+
+ protected void Grid1_OnRowDataBound(object sender, GridRowEventArgs e)
+ {
+ var querymodel = new Model.PHTGL_ContractTrackMatchWBS
+ {
+ ContractTrackId = ContractTrackId,
+ ControlItemAndCycleId = e.RowID,
+ };
+ var queryResult =
+ PhtglContracttrackmatchwbsService.GetPHTGL_ContractTrackMatchWBSByModle(querymodel);
+ if (queryResult.Any())
+ {
+ e.RowCssClass = "color3";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs
new file mode 100644
index 00000000..592e15f3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackMatchWBS.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PHTGL.ContractCompile
+{
+
+
+ public partial class ContractTrackMatchWBS
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// panelLeftRegion 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel panelLeftRegion;
+
+ ///
+ /// trWBS 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Tree trWBS;
+
+ ///
+ /// hdSelectId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.HiddenField hdSelectId;
+
+ ///
+ /// panelCenterRegion 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel panelCenterRegion;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// btnAccept 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAccept;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Label3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label3;
+
+ ///
+ /// Label2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label2;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label1;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuMore 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuMore;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
index f0ecac2c..025b6757 100644
--- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
@@ -1,9 +1,51 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -12,9 +54,13 @@
+
+
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index b241c0a1..fd6a0762 100644
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@@ -1,7 +1,11 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
index c8a6ab93..997760f7 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
@@ -35,4 +35,5 @@
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 03eb9188..9bc36592 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -48,43 +48,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index e78f8073..d2cbe31f 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(2000)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@@ -149756,7 +149756,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@@ -181094,7 +181094,7 @@ namespace Model
private string _Id;
- private System.Nullable _ContractTrackId;
+ private string _ContractTrackId;
private string _ControlItemAndCycleId;
@@ -181106,7 +181106,7 @@ namespace Model
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
- partial void OnContractTrackIdChanging(System.Nullable value);
+ partial void OnContractTrackIdChanging(string value);
partial void OnContractTrackIdChanged();
partial void OnControlItemAndCycleIdChanging(string value);
partial void OnControlItemAndCycleIdChanged();
@@ -181139,8 +181139,8 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractTrackId", DbType="Int")]
- public System.Nullable ContractTrackId
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractTrackId", DbType="VarChar(50)")]
+ public string ContractTrackId
{
get
{
@@ -181179,7 +181179,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,0)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable WorkPackageEstimate
{
get
@@ -181242,6 +181242,8 @@ namespace Model
private string _ACWP_Percentage;
+ private string _Date;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -181262,6 +181264,8 @@ namespace Model
partial void OnACWP_OutputValueChanged();
partial void OnACWP_PercentageChanging(string value);
partial void OnACWP_PercentageChanged();
+ partial void OnDateChanging(string value);
+ partial void OnDateChanged();
#endregion
public PHTGL_ContractTrackProgress()
@@ -181429,6 +181433,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Date", DbType="NVarChar(50)")]
+ public string Date
+ {
+ get
+ {
+ return this._Date;
+ }
+ set
+ {
+ if ((this._Date != value))
+ {
+ this.OnDateChanging(value);
+ this.SendPropertyChanging();
+ this._Date = value;
+ this.SendPropertyChanged("Date");
+ this.OnDateChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/SGGL/SGGL.sln b/SGGL/SGGL.sln
index c04800eb..2dcebcae 100644
--- a/SGGL/SGGL.sln
+++ b/SGGL/SGGL.sln
@@ -13,6 +13,8 @@ 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
@@ -77,6 +79,18 @@ 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