lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-10-24

This commit is contained in:
李鹏飞 2023-10-24 17:25:06 +08:00
parent e0162f248b
commit 4157358c68
12 changed files with 162 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/版本日志/SGGLDB_V2023-10-24.sql
View File

@ -1,3 +1,6 @@
alter table dbo.Sys_Const alter table dbo.Sys_Const
alter column ConstValue nvarchar(500) alter column ConstValue nvarchar(500)
go go
alter table dbo.PHTGL_ContractTrack
add SerialNumber nvarchar(50)
go

16
DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
View File

@ -125,7 +125,7 @@ Go
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'数据中心',30,N'0',N'Menu_PHTGL',0,0,1) VALUES ( N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'数据中心',30,N'0',N'Menu_PHTGL',0,0,1)
GO GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) /*INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'FBCCEE66-D3EF-4275-A7EA-6A8796D6FD4E',N'招标管理',10,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,0,1) VALUES ( N'FBCCEE66-D3EF-4275-A7EA-6A8796D6FD4E',N'招标管理',10,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,0,1)
GO GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
@ -145,7 +145,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
VALUES ( N'7E03F115-B80E-41BA-926D-CFE1BA5FD1C1',N'施工分包合同',N'PHTGL/Filing/ContractFile.aspx',10,N'88CB0F1B-2516-4B4A-A61E-CD0FA94DEEBF',N'Menu_PHTGL',0,1,1) VALUES ( N'7E03F115-B80E-41BA-926D-CFE1BA5FD1C1',N'施工分包合同',N'PHTGL/Filing/ContractFile.aspx',10,N'88CB0F1B-2516-4B4A-A61E-CD0FA94DEEBF',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'9D9A32F9-9FEF-455A-BD90-D8CBC2DE612F',N'施工分包合同跟踪',20,N'88CB0F1B-2516-4B4A-A61E-CD0FA94DEEBF',N'Menu_PHTGL',0,1,1) VALUES ( N'9D9A32F9-9FEF-455A-BD90-D8CBC2DE612F',N'施工分包合同跟踪',20,N'88CB0F1B-2516-4B4A-A61E-CD0FA94DEEBF',N'Menu_PHTGL',0,1,1)
GO GO*/
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'11f4f882-28a9-4610-a657-6a58336097d2',N'招标工作台账',N'PHTGL/Filing/BidDocumentsStandingBook.aspx?Type=1',30,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1) VALUES ( N'11f4f882-28a9-4610-a657-6a58336097d2',N'招标工作台账',N'PHTGL/Filing/BidDocumentsStandingBook.aspx?Type=1',30,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1)
@ -187,11 +187,13 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'消防电信',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'消防电信',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'临建设施',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'临建设施',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'合同执行跟踪',40,N'0',N'Menu_PHTGL',0,0,1)
GO GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 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) VALUES ( N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'合同价格信息',N'PHTGL/ContractCompile/ContractTrackList.aspx',10,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
GO GO
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'5AD91BF5-4CA6-4A9E-A370-D17B0D99010F',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'修改',2) VALUES ( N'5AD91BF5-4CA6-4A9E-A370-D17B0D99010F',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'修改',2)
@ -204,7 +206,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],
GO GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS工作包',N'PHTGL/ContractCompile/ContractWBS.aspx',50,0,N'Menu_PHTGL',0,1,1) VALUES ( N'98269480-3F36-4169-A91D-16144D903C6C',N'WBS工作包',N'PHTGL/ContractCompile/ContractWBS.aspx',20,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
GO GO
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'修改',2) VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'修改',2)
@ -216,7 +218,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],
VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'增加',1) VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'增加',1)
GO GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'费用对比统计',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',60,0,N'Menu_PHTGL',0,1,1) VALUES ( N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'费用对比统计',N'PHTGL/ContractCompile/ContractTrackComparison.aspx',30,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
GO GO
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'修改',2) VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'修改',2)
@ -228,7 +230,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],
VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'增加',1) VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'增加',1)
GO GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'F545E899-B3B5-4B49-A741-DE19356553D5',N'进度检测',N'PHTGL/ContractCompile/ContractTrackProgressDetection.aspx',70,0,N'Menu_PHTGL',0,1,1) VALUES ( N'F545E899-B3B5-4B49-A741-DE19356553D5',N'进度检测',N'PHTGL/ContractCompile/ContractTrackProgressDetection.aspx',40,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1)
GO GO
INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
VALUES ( N'646C7C58-350D-484D-91BD-2FD3754FFD3E',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'修改',2) VALUES ( N'646C7C58-350D-484D-91BD-2FD3754FFD3E',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'修改',2)

50
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
View File

@ -62,10 +62,11 @@ namespace BLL
x.SettledQuantity.Contains(table.SettledQuantity)) && x.SettledQuantity.Contains(table.SettledQuantity)) &&
(string.IsNullOrEmpty(table.ContractId) || (string.IsNullOrEmpty(table.ContractId) ||
x.ContractId.Contains(table.ContractId)) x.ContractId.Contains(table.ContractId))
select x select x
; ;
var model = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList();
return q.ToList(); return model;
} }
/// <summary> /// <summary>
@ -156,6 +157,7 @@ namespace BLL
SettledAmount = newtable.SettledAmount, SettledAmount = newtable.SettledAmount,
ContractId = newtable.ContractId, ContractId = newtable.ContractId,
ProjectId = newtable.ProjectId, ProjectId = newtable.ProjectId,
SerialNumber = newtable.SerialNumber
}; };
Funs.DB.PHTGL_ContractTrack.InsertOnSubmit(table); Funs.DB.PHTGL_ContractTrack.InsertOnSubmit(table);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
@ -198,20 +200,23 @@ namespace BLL
table.SettledAmount = newtable.SettledAmount; table.SettledAmount = newtable.SettledAmount;
table.ContractId = newtable.ContractId; table.ContractId = newtable.ContractId;
table.ProjectId = newtable.ProjectId; table.ProjectId = newtable.ProjectId;
table.SerialNumber=newtable.SerialNumber;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }
public static void DeletePHTGL_ContractTrackById(string id) public static void DeletePHTGL_ContractTrackById(string id)
{ {
PhtglContracttrackprogressService.DeleteModleByContractTrackId(id);
PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id);
ConstructionLogWorkEfficiencyService.DeleteConstructionLogWorkEfficiencysByContractTrackId(id);
var table = Funs.DB.PHTGL_ContractTrack.FirstOrDefault(x => x.Id == id); var table = Funs.DB.PHTGL_ContractTrack.FirstOrDefault(x => x.Id == id);
if (table != null) if (table != null)
{ {
Funs.DB.PHTGL_ContractTrack.DeleteOnSubmit(table); Funs.DB.PHTGL_ContractTrack.DeleteOnSubmit(table);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
PhtglContracttrackprogressService.DeleteModleByContractTrackId(id);
PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id);
} }
/// <summary> /// <summary>
@ -293,13 +298,14 @@ namespace BLL
{ {
item.ContractId = contractid; item.ContractId = contractid;
item.ProjectId = projectid; item.ProjectId = projectid;
if (string.IsNullOrEmpty(item.ProjectCode)) continue;
var phtglContractTrack = new PHTGL_ContractTrack var phtglContractTrack = new PHTGL_ContractTrack
{ {
MainItemCode=item.MainItemCode,
ProjectCode = item.ProjectCode, ProjectCode = item.ProjectCode,
ContractId = contractid, ContractId = contractid,
ProjectId = projectid, ProjectId = projectid,
}; };
if (string.IsNullOrEmpty(item.ProjectCode)) continue;
var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack); var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack);
item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum; item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum;
if (!string .IsNullOrEmpty(item.ProjectCode)&& !item.ProjectCode.Contains("-")) if (!string .IsNullOrEmpty(item.ProjectCode)&& !item.ProjectCode.Contains("-"))
@ -969,6 +975,10 @@ namespace BLL
} }
public class PHTGL_ContractTrackDtoIn public class PHTGL_ContractTrackDtoIn
{ {
/// <summary>
/// 序号
/// </summary>
[ExcelColumnIndex("A")] public string SerialNumber { get; set; }
/// <summary> /// <summary>
/// 主项号 /// 主项号
/// </summary> /// </summary>
@ -986,48 +996,56 @@ namespace BLL
/// </summary> /// </summary>
[ExcelColumnIndex("E")] public string MajorName { get; set; } [ExcelColumnIndex("E")] public string MajorName { get; set; }
/// <summary> /// <summary>
/// 分部工程
/// </summary>
[ExcelColumnIndex("F")] public string SubProject { get; set; }
/// <summary>
/// 分项工程
/// </summary>
[ExcelColumnIndex("G")] public string SubItemProject { get; set; }
/// <summary>
/// 项目编码 /// 项目编码
/// </summary> /// </summary>
[ExcelColumnIndex("F")] public string ProjectCode { get; set; } [ExcelColumnIndex("H")] public string ProjectCode { get; set; }
/// <summary> /// <summary>
/// 项目名称 /// 项目名称
/// </summary> /// </summary>
[ExcelColumnIndex("G")] public string ProjectName { get; set; } [ExcelColumnIndex("I")] public string ProjectName { get; set; }
/// <summary> /// <summary>
/// 项目特征描述 /// 项目特征描述
/// </summary> /// </summary>
[ExcelColumnIndex("H")] public string ProjectDescription { get; set; } [ExcelColumnIndex("J")] public string ProjectDescription { get; set; }
/// <summary> /// <summary>
/// 计量单位 /// 计量单位
/// </summary> /// </summary>
[ExcelColumnIndex("I")] public string UnitOfMeasurement { get; set; } [ExcelColumnIndex("K")] public string UnitOfMeasurement { get; set; }
/// <summary> /// <summary>
/// 工程量 /// 工程量
/// </summary> /// </summary>
[ExcelColumnIndex("J")] public string Quantity { get; set; } [ExcelColumnIndex("L")] public string Quantity { get; set; }
/// <summary> /// <summary>
/// 全费用固定综合单价 /// 全费用固定综合单价
/// </summary> /// </summary>
[ExcelColumnIndex("K")] public string TotalCostFixedComprehensiveUnitPrice { get; set; } [ExcelColumnIndex("M")] public string TotalCostFixedComprehensiveUnitPrice { get; set; }
/// <summary> /// <summary>
/// 其中：主材费 /// 其中：主材费
/// </summary> /// </summary>
[ExcelColumnIndex("L")] public string MainMaterialCost { get; set; } [ExcelColumnIndex("N")] public string MainMaterialCost { get; set; }
/// <summary> /// <summary>
/// 合价/元 /// 合价/元
/// </summary> /// </summary>
[ExcelColumnIndex("M")] public string TotalPrice { get; set; } [ExcelColumnIndex("O")] public string TotalPrice { get; set; }
/// <summary> /// <summary>
/// 计算规则 /// 计算规则
/// </summary> /// </summary>
[ExcelColumnIndex("N")] public string CalculationRule { get; set; } [ExcelColumnIndex("P")] public string CalculationRule { get; set; }
/// <summary> /// <summary>
/// 工作内容 /// 工作内容
/// </summary> /// </summary>
[ExcelColumnIndex("O")] public string WorkContent { get; set; } [ExcelColumnIndex("Q")] public string WorkContent { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
[ExcelColumnIndex("P")] public string Remarks { get; set; } [ExcelColumnIndex("R")] public string Remarks { get; set; }
} }
} }

15
SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyService.cs
View File

@ -55,7 +55,20 @@ namespace BLL
db.SubmitChanges(); db.SubmitChanges();
} }
} }
/// <summary>
/// 根据合同价格清单id删除所有施工日志功效明细
/// </summary>
/// <param name="ContractTrackId"></param>
public static void DeleteConstructionLogWorkEfficiencysByContractTrackId(string ContractTrackId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogWorkEfficiency where x.ContractTrackId == ContractTrackId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogWorkEfficiency.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary> /// <summary>
/// 根据月报id获取对应的所有施工日志工效明细 /// 根据月报id获取对应的所有施工日志工效明细
/// </summary> /// </summary>

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx
View File

Binary file not shown.

17
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
View File

@ -19,8 +19,8 @@
<Items> <Items>
<f:DropDownList ID="DropContractCode" runat="server" Label="施工分包合同编号" ShowRedStar="True" Required="True" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList> <f:DropDownList ID="DropContractCode" runat="server" Label="施工分包合同编号" ShowRedStar="True" Required="True" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<%-- <f:TextBox ID="txtContractNum" runat="server" Label="施工分包合同编号" MaxLength="200"> <f:TextBox ID="txtSerialNumber" runat="server" Label="序号" MaxLength="200">
</f:TextBox>--%> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
@ -46,18 +46,9 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" >
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" Hidden="True">
</f:TextBox> </f:TextBox>
</Items> <f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" >
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" Hidden="True">
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>

2
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs
View File

@ -46,6 +46,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{ {
DropContractCode.SelectedValue = ContractService.GetContractById(model.ContractId).ContractNum; DropContractCode.SelectedValue = ContractService.GetContractById(model.ContractId).ContractNum;
txtSerialNumber.Text = model.SerialNumber;
txtMainItemCode.Text = model.MainItemCode; txtMainItemCode.Text = model.MainItemCode;
txtMainItemName.Text = model.MainItemName; txtMainItemName.Text = model.MainItemName;
txtMajorName.Text = model.MajorName; txtMajorName.Text = model.MajorName;
@ -154,6 +155,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
return; return;
} }
table.ContractId =ContractService.GetContractByContractNum(DropContractCode.SelectedValue).ContractId; table.ContractId =ContractService.GetContractByContractNum(DropContractCode.SelectedValue).ContractId;
table.SerialNumber = txtSerialNumber.Text;
table.MainItemCode = txtMainItemCode.Text; table.MainItemCode = txtMainItemCode.Text;
table.MainItemName = txtMainItemName.Text; table.MainItemName = txtMainItemName.Text;
table.MajorName = txtMajorName.Text; table.MajorName = txtMajorName.Text;

9
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs generated
View File

@ -50,6 +50,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList DropContractCode; protected global::FineUIPro.DropDownList DropContractCode;
/// <summary>
/// txtSerialNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSerialNumber;
/// <summary> /// <summary>
/// txtMainItemCode 控件。 /// txtMainItemCode 控件。
/// </summary> /// </summary>

15
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
View File

@ -74,12 +74,11 @@
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Columns> <Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center"> <f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
<ItemTemplate> FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate> </f:RenderField>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" <f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
@ -105,13 +104,13 @@
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox> <f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject" EnableColumnEdit="False" <f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor> <Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox> <f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False" <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor> <Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox> <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>

6
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
View File

@ -48,7 +48,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
table.ContractId = this.ContractId; table.ContractId = this.ContractId;
table.ProjectCode = this.txtProjectCode.Text.Trim(); table.ProjectCode = this.txtProjectCode.Text.Trim();
table.ProjectName = this.txtProjectName.Text.Trim(); table.ProjectName = this.txtProjectName.Text.Trim();
var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1); var tb = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(table);
Grid1.RecordCount = PhtglContractTrackService.Count; Grid1.RecordCount = PhtglContractTrackService.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb; Grid1.DataSource = tb;
@ -433,6 +433,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
var MainItemName = objects["values"]["MainItemName"].ToString(); var MainItemName = objects["values"]["MainItemName"].ToString();
var MajorName = objects["values"]["MajorName"].ToString(); var MajorName = objects["values"]["MajorName"].ToString();
var MajorCode = objects["values"]["MajorCode"].ToString(); var MajorCode = objects["values"]["MajorCode"].ToString();
var SubProject = objects["values"]["SubProject"].ToString();
var SubItemProject = objects["values"]["SubItemProject"].ToString();
//var ProjectCode = objects["values"]["ProjectCode"].ToString(); //var ProjectCode = objects["values"]["ProjectCode"].ToString();
var ProjectName = objects["values"]["ProjectName"].ToString(); var ProjectName = objects["values"]["ProjectName"].ToString();
var ProjectDescription = objects["values"]["ProjectDescription"].ToString(); var ProjectDescription = objects["values"]["ProjectDescription"].ToString();
@ -458,6 +460,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model.MainItemName = MainItemName; model.MainItemName = MainItemName;
model.MajorName = MajorName; model.MajorName = MajorName;
model.MajorCode = MajorCode; model.MajorCode = MajorCode;
model.SubProject= SubProject;
model.SubItemProject= SubItemProject;
// model.ProjectCode = ProjectCode; // model.ProjectCode = ProjectCode;
model.ProjectName = ProjectName; model.ProjectName = ProjectName;
model.ProjectDescription = ProjectDescription; model.ProjectDescription = ProjectDescription;

9
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs generated
View File

@ -158,15 +158,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnQuery; protected global::FineUIPro.Button btnQuery;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary> /// <summary>
/// TextBox2 控件。 /// TextBox2 控件。
/// </summary> /// </summary>

32
SGGL/Model/Model.cs
View File

@ -11763,7 +11763,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 public string ApproveIdea
{ {
get get
@ -151270,7 +151270,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 public string AttentPerson
{ {
get get
@ -181950,6 +181950,8 @@ namespace Model
private string _ProjectId; private string _ProjectId;
private string _SerialNumber;
private EntitySet<ZHGL_ConstructionLogWorkEfficiency> _ZHGL_ConstructionLogWorkEfficiency; private EntitySet<ZHGL_ConstructionLogWorkEfficiency> _ZHGL_ConstructionLogWorkEfficiency;
private EntitySet<ZHGL_ConstructionLogWorkEfficiencyMonth> _ZHGL_ConstructionLogWorkEfficiencyMonth; private EntitySet<ZHGL_ConstructionLogWorkEfficiencyMonth> _ZHGL_ConstructionLogWorkEfficiencyMonth;
@ -182016,6 +182018,8 @@ namespace Model
partial void OnContractIdChanged(); partial void OnContractIdChanged();
partial void OnProjectIdChanging(string value); partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged(); partial void OnProjectIdChanged();
partial void OnSerialNumberChanging(string value);
partial void OnSerialNumberChanged();
#endregion #endregion
public PHTGL_ContractTrack() public PHTGL_ContractTrack()
@ -182605,6 +182609,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SerialNumber", DbType="NVarChar(50)")]
public string SerialNumber
{
get
{
return this._SerialNumber;
}
set
{
if ((this._SerialNumber != value))
{
this.OnSerialNumberChanging(value);
this.SendPropertyChanging();
this._SerialNumber = value;
this.SendPropertyChanged("SerialNumber");
this.OnSerialNumberChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ZHGL_ConstructionLogWorkEfficiency_PHTGL_ContractTrack", Storage="_ZHGL_ConstructionLogWorkEfficiency", ThisKey="Id", OtherKey="ContractTrackId", DeleteRule="NO ACTION")] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ZHGL_ConstructionLogWorkEfficiency_PHTGL_ContractTrack", Storage="_ZHGL_ConstructionLogWorkEfficiency", ThisKey="Id", OtherKey="ContractTrackId", DeleteRule="NO ACTION")]
public EntitySet<ZHGL_ConstructionLogWorkEfficiency> ZHGL_ConstructionLogWorkEfficiency public EntitySet<ZHGL_ConstructionLogWorkEfficiency> ZHGL_ConstructionLogWorkEfficiency
{ {
@ -182769,7 +182793,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WorkPackageEstimate public System.Nullable<decimal> WorkPackageEstimate
{ {
get get
@ -292545,7 +292569,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")]
public string Name public string Name
{ {
get get