From 4157358c685779cbb4482694a4da50fd229ebbd5 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Tue, 24 Oct 2023 17:25:06 +0800
Subject: [PATCH] 2023-10-24

---
 DataBase/版本日志/SGGLDB_V2023-10-24.sql      |   3 +
 .../1-6合同管理（Menu_PHTGL）.sql             | 106 +++++++++---------
 .../PhtglContracttrackService .cs             |  50 ++++++---
 .../ConstructionLogWorkEfficiencyService.cs   |  15 ++-
 .../Excel/DataIn/合同执行跟踪导入模板.xlsx    | Bin 11410 -> 11498 bytes
 .../ContractCompile/ContractTrackEdit.aspx    |  21 +---
 .../ContractCompile/ContractTrackEdit.aspx.cs |   2 +
 .../ContractTrackEdit.aspx.designer.cs        |   9 ++
 .../ContractCompile/ContractTrackList.aspx    |  15 ++-
 .../ContractCompile/ContractTrackList.aspx.cs |   6 +-
 .../ContractTrackList.aspx.designer.cs        |   9 --
 SGGL/Model/Model.cs                           |  32 +++++-
 12 files changed, 162 insertions(+), 106 deletions(-)

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; 
         }
 
         /// <summary>
@@ -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);
+           
         }
 
         /// <summary>
@@ -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
     {
+        /// <summary>
+        /// 序号
+        /// </summary>
+        [ExcelColumnIndex("A")] public string SerialNumber { get; set; }
         /// <summary>
         /// 主项号
         /// </summary>
@@ -986,48 +996,56 @@ namespace BLL
         /// </summary>
         [ExcelColumnIndex("E")] public string MajorName { get; set; }
         /// <summary>
+        /// 分部工程
+        /// </summary>
+        [ExcelColumnIndex("F")] public string SubProject { get; set; }
+        /// <summary>
+        /// 分项工程
+        /// </summary>
+        [ExcelColumnIndex("G")] public string SubItemProject { get; set; }
+        /// <summary>
         /// 项目编码
         /// </summary>
-        [ExcelColumnIndex("F")] public string ProjectCode { get; set; }
+        [ExcelColumnIndex("H")] public string ProjectCode { get; set; }
         /// <summary>
         /// 项目名称
         /// </summary>
-        [ExcelColumnIndex("G")] public string ProjectName { get; set; }
+        [ExcelColumnIndex("I")] public string ProjectName { get; set; }
         /// <summary>
         /// 项目特征描述
         /// </summary>
-        [ExcelColumnIndex("H")] public string ProjectDescription { get; set; }
+        [ExcelColumnIndex("J")] public string ProjectDescription { get; set; }
         /// <summary>
         /// 计量单位
         /// </summary>
-        [ExcelColumnIndex("I")] public string UnitOfMeasurement { get; set; }
+        [ExcelColumnIndex("K")] public string UnitOfMeasurement { get; set; }
         /// <summary>
         /// 工程量
         /// </summary>
-        [ExcelColumnIndex("J")] public string Quantity { get; set; }
+        [ExcelColumnIndex("L")] public string Quantity { get; set; }
         /// <summary>
         /// 全费用固定综合单价
         /// </summary>
-        [ExcelColumnIndex("K")] public string TotalCostFixedComprehensiveUnitPrice { get; set; }
+        [ExcelColumnIndex("M")] public string TotalCostFixedComprehensiveUnitPrice { get; set; }
         /// <summary>
         /// 其中：主材费
         /// </summary>
-        [ExcelColumnIndex("L")] public string MainMaterialCost { get; set; }
+        [ExcelColumnIndex("N")] public string MainMaterialCost { get; set; }
         /// <summary>
         /// 合价/元
         /// </summary>
-        [ExcelColumnIndex("M")] public string TotalPrice { get; set; }
+        [ExcelColumnIndex("O")] public string TotalPrice { get; set; }
         /// <summary>
         /// 计算规则
         /// </summary>
-        [ExcelColumnIndex("N")] public string CalculationRule { get; set; }
+        [ExcelColumnIndex("P")] public string CalculationRule { get; set; }
         /// <summary>
         /// 工作内容
         /// </summary>
-        [ExcelColumnIndex("O")] public string WorkContent { get; set; }
+        [ExcelColumnIndex("Q")] public string WorkContent { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
-        [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();
             }
         }
-
+        /// <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>
         /// 根据月报id获取对应的所有施工日志工效明细
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx
index aa8ccadb6c1dc1d1f30c4ad1e25935db379ccdb6..43003440105ba9dc908ba515558ce1deae206eac 100644
GIT binary patch
delta 4273
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

delta 4194
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
Siy<#D!8_O)(TG|9Zut*3{MzCG

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 @@
                     <Items>
                         <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>--%>
+                        <f:TextBox ID="txtSerialNumber" runat="server" Label="序号" MaxLength="200">
+                        </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
@@ -46,21 +46,12 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                       
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" Hidden="True">
+                        <f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" >
+                        </f:TextBox>
+                        <f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" >
                         </f:TextBox>
                     </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" Hidden="True">
-                        </f:TextBox>
-                    </Items>
-                </f:FormRow>
+                </f:FormRow> 
                 <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtProjectCode" runat="server" Label="项目编码" MaxLength="200">
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
         /// </remarks>
         protected global::FineUIPro.DropDownList DropContractCode;
 
+        /// <summary>
+        /// txtSerialNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSerialNumber;
+
         /// <summary>
         /// txtMainItemCode 控件。
         /// </summary>
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 @@
                                 </f:Toolbar>
                             </Toolbars>
                             <Columns>
-                                <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                                    TextAlign="Center">
-                                    <ItemTemplate>
-                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                                    </ItemTemplate>
-                                </f:TemplateField>
+                                 
+                                <f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
+                                               FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
+                                   
+                                </f:RenderField>
 
                                 <f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
                                     FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
@@ -105,13 +104,13 @@
                                         <f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </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">
                                     <Editor>
                                         <f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </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">
                                     <Editor>
                                         <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
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
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
 
-        /// <summary>
-        /// lblNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblNumber;
-
         /// <summary>
         /// TextBox2 控件。
         /// </summary>
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> _ZHGL_ConstructionLogWorkEfficiency;
 		
 		private EntitySet<ZHGL_ConstructionLogWorkEfficiencyMonth> _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> 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
 		{
 			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