diff --git a/DataBase/版本日志/SGGLDB_V2023-10-24.sql b/DataBase/版本日志/SGGLDB_V2023-10-24.sql index 947354a9..01b9c436 100644 --- a/DataBase/版本日志/SGGLDB_V2023-10-24.sql +++ b/DataBase/版本日志/SGGLDB_V2023-10-24.sql @@ -1,3 +1,6 @@ alter table dbo.Sys_Const alter column ConstValue nvarchar(500) +go +alter table dbo.PHTGL_ContractTrack + add SerialNumber nvarchar(50) go \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql index d3683fea..a1c29ee8 100644 --- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql +++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql @@ -125,7 +125,7 @@ Go 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) 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) GO 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) 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) - GO + GO*/ 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) @@ -187,58 +187,60 @@ 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) 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) - - 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 -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) - GO - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'޸',2) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'ɾ',3) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'',4) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'',1) - GO -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) - GO - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'޸',2) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'C375017D-7521-4339-8CAB-029CD3EBB36B',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'ɾ',3) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'64464E85-267F-4559-89D4-FB6F1E2B5FA5',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',4) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',1) - GO -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) - GO - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'646C7C58-350D-484D-91BD-2FD3754FFD3E',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'޸',2) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'6765754C-917B-4C07-A0F6-CCDED2ABDD07',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'ɾ',3) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'1F7FDDC4-2746-4B65-9F65-37C71F11D342',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'',4) - INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) - VALUES ( N'D11BD092-6A18-44A3-8ABD-9CF9B95340E1',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'',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 + 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',10,'73B84D49-940A-42DF-AC14-F4C75E10EC39',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 + + 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',20,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'08CD24EB-98F4-407D-822F-8CF9C8D33E82',N'98269480-3F36-4169-A91D-16144D903C6C',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'97308133-D190-4AD7-917F-A2AF444E8462',N'98269480-3F36-4169-A91D-16144D903C6C',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'0B7306D1-A4A8-4C3C-814F-B28B991C5488',N'98269480-3F36-4169-A91D-16144D903C6C',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'3D4B433D-EA34-4D0C-B744-E12CE232171C',N'98269480-3F36-4169-A91D-16144D903C6C',N'',1) + GO + 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',30,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'E2C32BE6-A98D-4A6E-A2C5-6C2A50CF1105',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'C375017D-7521-4339-8CAB-029CD3EBB36B',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'64464E85-267F-4559-89D4-FB6F1E2B5FA5',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'1859C0E1-437C-419F-ABEE-63EE72E24AFC',N'D715B66F-8E99-498F-87DA-E85B4B8EB923',N'',1) + GO + 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',40,'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'646C7C58-350D-484D-91BD-2FD3754FFD3E',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'6765754C-917B-4C07-A0F6-CCDED2ABDD07',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'1F7FDDC4-2746-4B65-9F65-37C71F11D342',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D11BD092-6A18-44A3-8ABD-9CF9B95340E1',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'',1) + GO GO INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs index 10fd5af5..ea581863 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs @@ -62,10 +62,11 @@ namespace BLL x.SettledQuantity.Contains(table.SettledQuantity)) && (string.IsNullOrEmpty(table.ContractId) || x.ContractId.Contains(table.ContractId)) + select x ; - - return q.ToList(); + var model = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList(); + return model; } /// @@ -156,6 +157,7 @@ namespace BLL SettledAmount = newtable.SettledAmount, ContractId = newtable.ContractId, ProjectId = newtable.ProjectId, + SerialNumber = newtable.SerialNumber }; Funs.DB.PHTGL_ContractTrack.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -198,20 +200,23 @@ namespace BLL table.SettledAmount = newtable.SettledAmount; table.ContractId = newtable.ContractId; table.ProjectId = newtable.ProjectId; + table.SerialNumber=newtable.SerialNumber; Funs.DB.SubmitChanges(); } } 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); if (table != null) { Funs.DB.PHTGL_ContractTrack.DeleteOnSubmit(table); Funs.DB.SubmitChanges(); } - PhtglContracttrackprogressService.DeleteModleByContractTrackId(id); - PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id); + } /// @@ -293,13 +298,14 @@ namespace BLL { item.ContractId = contractid; item.ProjectId = projectid; + if (string.IsNullOrEmpty(item.ProjectCode)) continue; var phtglContractTrack = new PHTGL_ContractTrack { + MainItemCode=item.MainItemCode, ProjectCode = item.ProjectCode, ContractId = contractid, ProjectId = projectid, }; - if (string.IsNullOrEmpty(item.ProjectCode)) continue; var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack); item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum; if (!string .IsNullOrEmpty(item.ProjectCode)&& !item.ProjectCode.Contains("-")) @@ -969,6 +975,10 @@ namespace BLL } public class PHTGL_ContractTrackDtoIn { + /// + /// 序号 + /// + [ExcelColumnIndex("A")] public string SerialNumber { get; set; } /// /// 主项号 /// @@ -986,48 +996,56 @@ namespace BLL /// [ExcelColumnIndex("E")] public string MajorName { get; set; } /// + /// 分部工程 + /// + [ExcelColumnIndex("F")] public string SubProject { get; set; } + /// + /// 分项工程 + /// + [ExcelColumnIndex("G")] public string SubItemProject { get; set; } + /// /// 项目编码 /// - [ExcelColumnIndex("F")] public string ProjectCode { get; set; } + [ExcelColumnIndex("H")] public string ProjectCode { get; set; } /// /// 项目名称 /// - [ExcelColumnIndex("G")] public string ProjectName { get; set; } + [ExcelColumnIndex("I")] public string ProjectName { get; set; } /// /// 项目特征描述 /// - [ExcelColumnIndex("H")] public string ProjectDescription { get; set; } + [ExcelColumnIndex("J")] public string ProjectDescription { get; set; } /// /// 计量单位 /// - [ExcelColumnIndex("I")] public string UnitOfMeasurement { get; set; } + [ExcelColumnIndex("K")] public string UnitOfMeasurement { get; set; } /// /// 工程量 /// - [ExcelColumnIndex("J")] public string Quantity { get; set; } + [ExcelColumnIndex("L")] public string Quantity { get; set; } /// /// 全费用固定综合单价 /// - [ExcelColumnIndex("K")] public string TotalCostFixedComprehensiveUnitPrice { get; set; } + [ExcelColumnIndex("M")] public string TotalCostFixedComprehensiveUnitPrice { get; set; } /// /// 其中：主材费 /// - [ExcelColumnIndex("L")] public string MainMaterialCost { get; set; } + [ExcelColumnIndex("N")] public string MainMaterialCost { get; set; } /// /// 合价/元 /// - [ExcelColumnIndex("M")] public string TotalPrice { get; set; } + [ExcelColumnIndex("O")] public string TotalPrice { get; set; } /// /// 计算规则 /// - [ExcelColumnIndex("N")] public string CalculationRule { get; set; } + [ExcelColumnIndex("P")] public string CalculationRule { get; set; } /// /// 工作内容 /// - [ExcelColumnIndex("O")] public string WorkContent { get; set; } + [ExcelColumnIndex("Q")] public string WorkContent { get; set; } /// /// 备注 /// - [ExcelColumnIndex("P")] public string Remarks { get; set; } + [ExcelColumnIndex("R")] public string Remarks { get; set; } } } \ No newline at end of file diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyService.cs index 337c1ce7..8fbfa530 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyService.cs @@ -55,7 +55,20 @@ namespace BLL db.SubmitChanges(); } } - + /// + /// 根据合同价格清单id删除所有施工日志功效明细 + /// + /// + 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(); + } + } /// /// 根据月报id获取对应的所有施工日志工效明细 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx index aa8ccadb..43003440 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx index dd057102..b618a04e 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx @@ -19,8 +19,8 @@ - <%-- - --%> + + @@ -46,21 +46,12 @@ - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs index 7910fcdc..42ac786e 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs @@ -46,6 +46,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile { DropContractCode.SelectedValue = ContractService.GetContractById(model.ContractId).ContractNum; + txtSerialNumber.Text = model.SerialNumber; txtMainItemCode.Text = model.MainItemCode; txtMainItemName.Text = model.MainItemName; txtMajorName.Text = model.MajorName; @@ -154,6 +155,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile return; } table.ContractId =ContractService.GetContractByContractNum(DropContractCode.SelectedValue).ContractId; + table.SerialNumber = txtSerialNumber.Text; table.MainItemCode = txtMainItemCode.Text; table.MainItemName = txtMainItemName.Text; table.MajorName = txtMajorName.Text; diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs index 5adcd3b0..c5e3ea67 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs @@ -50,6 +50,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.DropDownList DropContractCode; + /// + /// txtSerialNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSerialNumber; + /// /// txtMainItemCode 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx index d58edceb..6ddfd618 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx @@ -74,12 +74,11 @@ - - - - - + + + + @@ -105,13 +104,13 @@ - - diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs index 4e2a4d9e..365ac68c 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs @@ -48,7 +48,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile table.ContractId = this.ContractId; table.ProjectCode = this.txtProjectCode.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; //tb = GetFilteredTable(Grid1.FilteredData, tb); Grid1.DataSource = tb; @@ -433,6 +433,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile var MainItemName = objects["values"]["MainItemName"].ToString(); var MajorName = objects["values"]["MajorName"].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 ProjectName = objects["values"]["ProjectName"].ToString(); var ProjectDescription = objects["values"]["ProjectDescription"].ToString(); @@ -458,6 +460,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile model.MainItemName = MainItemName; model.MajorName = MajorName; model.MajorCode = MajorCode; + model.SubProject= SubProject; + model.SubItemProject= SubItemProject; // model.ProjectCode = ProjectCode; model.ProjectName = ProjectName; model.ProjectDescription = ProjectDescription; diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs index 5b8601b2..bf1f7c53 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs @@ -158,15 +158,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.Button btnQuery; - /// - /// lblNumber 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label lblNumber; - /// /// TextBox2 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 4fca87bc..1ffc1b9e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -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 { 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 { get @@ -181950,6 +181950,8 @@ namespace Model private string _ProjectId; + private string _SerialNumber; + private EntitySet _ZHGL_ConstructionLogWorkEfficiency; private EntitySet _ZHGL_ConstructionLogWorkEfficiencyMonth; @@ -182016,6 +182018,8 @@ namespace Model partial void OnContractIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); + partial void OnSerialNumberChanging(string value); + partial void OnSerialNumberChanged(); #endregion 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")] public EntitySet 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 WorkPackageEstimate { 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 { get