Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

.gitignore

@@ -58,3 +58,4 @@
 /SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2025-4
 /SGGL/BLLTests
 /SGGL/FineUIPro.Web/FileUpload/CheckControl/2025-08
+/SGGL/FineUIPro.Web/FileUpload/TestRun/FeedingTestRun/2025-10

DataBase/版本日志/SUBQHSE_V2025-10-21-xiaj.sql

@@ -0,0 +1,7 @@
+
+
+
+ALTER TABLE DriverGoods_GoodsModel
+ALTER COLUMN Description NVARCHAR(500);
+
+

DataBase/版本日志/SUBQHSE_V2025-10-22-xiaj.sql

@@ -0,0 +1,10 @@
+
+
+
+
+--质量管理NCR管理补充字段问题原因分析
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Comprehensive_NCRManagement' AND COLUMN_NAME = 'ReasonAnalysis')
+BEGIN
+	ALTER TABLE Comprehensive_NCRManagement ADD ReasonAnalysis nvarchar(1000);
+END
+GO

DataBase/版本日志/SUBQHSE_V2025-10-24-xiaj.sql

@@ -0,0 +1,28 @@
+
+
+ALTER VIEW [dbo].[View_MonthReport_InspectionManagement]
+AS
+/************Ô±¨È¡Êý************/
+select im.InspectionId,
+im.ProjectId,
+im.CNProfessionalId,
+im.IsOnceQualified,
+im.InspectionDate,
+im.CompileDate,
+im.UnitId,
+detail.UnitWorkId
+from ProcessControl_InspectionManagement as im
+left join (select distinct(InspectionId),UnitWorkId from ProcessControl_InspectionManagementDetail) as detail on detail.InspectionId = im.InspectionId
+GO
+
+
+update ProcessControl_InspectionManagement
+set IsOnceQualified=1,InspectionDate=DATEADD(day,1,CompileDate)
+where InspectionDate is null and IsOnceQualified is null and CompileDate<'2025-10-01'
+
+GO
+update ProcessControl_InspectionManagement
+set InspectionDate=DATEADD(day,1,CompileDate)
+where InspectionDate is null and IsOnceQualified is not null and CompileDate<'2025-10-01'
+
+GO

SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs

@@ -32,7 +32,7 @@ namespace BLL.API.CQMS
                 newInspectionManagement.Branch = inspectionManagement.Branch;
                 newInspectionManagement.ControlPointType = inspectionManagement.ControlPointType;
                 newInspectionManagement.AcceptanceSite = inspectionManagement.AcceptanceSite;
-                newInspectionManagement.IsOnceQualified = (inspectionManagement.IsOnceQualified == "true"|| inspectionManagement.IsOnceQualified == null) ? true : false;
+                newInspectionManagement.IsOnceQualified = (inspectionManagement.IsOnceQualified == "true"|| inspectionManagement.IsOnceQualified == "True") ? true : false;
                 if (!string.IsNullOrEmpty(inspectionManagement.InspectionDate))
                     newInspectionManagement.InspectionDate = DateTime.Parse(inspectionManagement.InspectionDate);
                 newInspectionManagement.AttachUrl = inspectionManagement.AttachUrl;

SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs

@@ -60,6 +60,7 @@ namespace BLL
                        ProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalId select y.ProfessionalName).FirstOrDefault(),
                        x.NCRCode,
                        x.Contents,
+                       x.ReasonAnalysis,
                        x.IssuedDate,
                        ReceiveUnit = x.ReceiveUnit!= null ? BLL.UnitService.getUnitNamesUnitIds(x.ReceiveUnit) : null,
                        UnitWorkName = x.UnitWorkId != null ? BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkId) : null,
@@ -106,6 +107,7 @@ namespace BLL
             newNCRManagement.CNProfessionalId = nCRManagement.CNProfessionalId;
             newNCRManagement.NCRCode = nCRManagement.NCRCode;
             newNCRManagement.Contents = nCRManagement.Contents;
+            newNCRManagement.ReasonAnalysis = nCRManagement.ReasonAnalysis;
             newNCRManagement.IssuedDate = nCRManagement.IssuedDate;
             newNCRManagement.ReceiveUnit = nCRManagement.ReceiveUnit;
             newNCRManagement.ClosedDate = nCRManagement.ClosedDate;
@@ -139,6 +141,7 @@ namespace BLL
                 newNCRManagement.CNProfessionalId = nCRManagement.CNProfessionalId;
                 newNCRManagement.NCRCode = nCRManagement.NCRCode;
                 newNCRManagement.Contents = nCRManagement.Contents;
+                newNCRManagement.ReasonAnalysis = nCRManagement.ReasonAnalysis;
                 newNCRManagement.IssuedDate = nCRManagement.IssuedDate;
                 newNCRManagement.ReceiveUnit = nCRManagement.ReceiveUnit;
                 newNCRManagement.ClosedDate = nCRManagement.ClosedDate;

SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs

@@ -164,7 +164,7 @@ namespace BLL
             {
                 return (from x in db.ProcessControl_InspectionManagementDetail
                         join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                        where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
+                        where x.InspectionId == InspectionId && y.IsOnceQualified == true
                         select x).ToList();
             }
         }
@@ -174,7 +174,7 @@ namespace BLL
             {
                 return (from x in db.ProcessControl_InspectionManagementDetail
                         join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                        where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
+                        where x.InspectionId == InspectionId && y.IsOnceQualified == true
                         select x).ToList();
             }
         }

SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs

@@ -72,7 +72,7 @@ namespace BLL
                        ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点
                        Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级
                        x.AcceptanceSite,
-                       IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
+                       IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"),
                        x.InspectionDate,
                        x.AttachUrl,
                        x.AttachUrl2,
@@ -121,7 +121,7 @@ namespace BLL
                        ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点
                        Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级
                        x.AcceptanceSite,
-                       IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
+                       IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"),
                        x.InspectionDate,
                        x.AttachUrl,
                        x.AttachUrl2,
@@ -318,16 +318,28 @@ namespace BLL
             List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
             if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
             }
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
 
             return InspectionMangementList;
         }
@@ -337,20 +349,32 @@ namespace BLL
 
             if (!string.IsNullOrEmpty(projectId))
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.ProjectId == projectId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.ProjectId == projectId).ToList();
             }
             if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
             }
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
 
             return InspectionMangementList;
         }
@@ -359,16 +383,28 @@ namespace BLL
             List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList();
             if (!string.IsNullOrEmpty(unitId) && unitId != "0")
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.UnitId == unitId).ToList();
             }
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
 
             return InspectionMangementList;
         }
@@ -407,12 +443,24 @@ namespace BLL
             List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
             return InspectionMangementList;
         }
 
@@ -422,20 +470,32 @@ namespace BLL
 
             if (!string.IsNullOrEmpty(projectId))
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.ProjectId == projectId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.ProjectId == projectId).ToList();
             }
             if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
             }
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
 
             return InspectionMangementList;
         }
@@ -445,16 +505,28 @@ namespace BLL
             List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
             if (!string.IsNullOrEmpty(unitId) && unitId != "0")
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.UnitId == unitId).ToList();
             }
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
 
             return InspectionMangementList;
         }
@@ -466,20 +538,32 @@ namespace BLL
 
             if (!string.IsNullOrEmpty(projectId))
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.ProjectId == projectId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.ProjectId == projectId).ToList();
             }
             if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
             }
             if (isOnceQualified == true)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
             }
-            if (startDate != null && SoptDate != null)
+            if (startDate != null)
             {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
             }
+            if (SoptDate != null)
+            {
+                InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
+            }
+            //if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
+            //}
+            //if (SoptDate != null)
+            //{
+            //    InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
+            //}
 
             return InspectionMangementList;
         }

SGGL/BLL/IDP/IDPDataService.cs

@@ -840,7 +840,8 @@ namespace BLL
                     {
                         if (!string.IsNullOrWhiteSpace(item.RdpId) && !string.IsNullOrWhiteSpace(item.fileid))
                         {
-                            IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.StockId == item.RdpId && x.ThirdId == item.fileid);
+                            //IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.StockId == item.RdpId && x.ThirdId == item.fileid);
+                            IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.StockId == item.RdpId && x.FormatFileCode == item.doc_no && x.FormatFileName == item.maintitle);
                             if (newItem != null)
                             {
                                 newItem.RdpId = item.RdpId;

SGGL/BLL/JDGL/SGManPower/SGManPowerService.cs

@@ -12,35 +12,39 @@ namespace BLL
         /// <summary>
         /// 检查并发送人力资源预警
         /// </summary>
-        public static Model.ResponeData CheckAndSendPersonWarning()
+        public static List<ToDoItem> CheckAndSendPersonWarning(string userId)
         {
             var responeData = new Model.ResponeData();
             // 合并两个集合
             var allItems = new List<ToDoItem>();
             var projects = Funs.DB.Base_Project.Where(p => p.ProjectState == BLL.Const.ProjectState_1).ToList();
-            // foreach (var project in projects)
-            // {
-            // 检查管理人员到期未到岗情况
-            var items1 = CheckManagerNotArrived("c7ade79e-7646-4c59-a8fd-020a7e3138c6");
-
-            // 检查作业人员人力偏差情况
-            var items2 = CheckWorkerDeviation("c7ade79e-7646-4c59-a8fd-020a7e3138c6");
-
-
-            if (items1 != null)
+            foreach (var project in projects)
             {
-                allItems.AddRange(items1);
+                // 检查管理人员到期未到岗情况
+                var items1 = CheckManagerNotArrived(project.ProjectId);
+
+                // 检查作业人员人力偏差情况
+                var items2 = CheckWorkerDeviation(project.ProjectId);
+
+
+                if (items1 != null)
+                {
+                    allItems.AddRange(items1);
+                }
+
+                if (items2 != null)
+                {
+                    allItems.AddRange(items2);
+                }
             }
 
-            if (items2 != null)
+            if (!string.IsNullOrEmpty(userId))
             {
-                allItems.AddRange(items2);
+                //过滤出指定用户的数据
+                allItems = allItems.Where(x => x.UserId == userId).ToList();
             }
 
-            // }
-            responeData.data = allItems;
-            responeData.message = "人员预警";
-            return responeData;
+            return allItems;
         }
 
 
@@ -75,7 +79,8 @@ namespace BLL
                 int num = getInOutRecordNum(data);
                 if (data.Quantity > num)
                 {
-                    lItems = SendManagerWarning(data.UnitId, projectId, data.UnitWorkId, data.PlanDate, data.Quantity, num);
+                    lItems = SendManagerWarning(data.UnitId, projectId, data.WorkPostId, data.UnitWorkId, data.PlanDate,
+                        data.Quantity, num);
                 }
             }
 
@@ -145,7 +150,8 @@ namespace BLL
             }
             else
             {
-                dataSource = dataSource.Where(x => x["UnitWorkId"] != DBNull.Value && x["UnitWorkId"].ToString() == sgManPower.UnitWorkId);
+                dataSource = dataSource.Where(x =>
+                    x["UnitWorkId"] != DBNull.Value && x["UnitWorkId"].ToString() == sgManPower.UnitWorkId);
             }
 
             return dataSource.Count();
@@ -156,7 +162,8 @@ namespace BLL
         /// </summary>
         /// <param name="projectId">项目ID</param>
         /// <param name="unitId">单位id</param>
-        private static List<ToDoItem> SendManagerWarning(string unitId, string projectId, string unitWorkId, DateTime? planDate, int? quantity, int num)
+        private static List<ToDoItem> SendManagerWarning(string unitId, string projectId, string workPostId,
+            string unitWorkId, DateTime? planDate, int? quantity, int num)
         {
             // 发送预警信息
             var toDoItems = new List<ToDoItem>();
@@ -242,26 +249,70 @@ namespace BLL
                 string warningContent = string.Empty;
                 if (unitWorks != null)
                 {
-                    warningContent = $"{projectUnits.UnitName}单位{unitWorks.UnitWorkName}装置计划{planDate}投入人力{quantity}人，实际考勤为{num}人。";
+                    warningContent =
+                        $"{projectUnits.UnitName}单位{unitWorks.UnitWorkName}装置计划{string.Format("{0:yyyy-MM-dd}", planDate)}投入人力{quantity}人，实际考勤为{num}人。";
                 }
                 else
                 {
-                    warningContent = $"{projectUnits.UnitName}单位计划{planDate}投入人力{quantity}人，实际考勤为{num}人。";
+                    warningContent =
+                        $"{projectUnits.UnitName}单位计划{string.Format("{0:yyyy-MM-dd}", planDate)}投入人力{quantity}人，实际考勤为{num}人。";
                 }
 
+                string urlParams = "JDGL/SGManPower/SGWarningDetails.aspx?projectId=" + projectId;
+                // 添加单位参数（如果已选择）
+                if (!string.IsNullOrEmpty(unitId))
+                {
+                    urlParams += "&unitId=" + unitId;
+                }
+
+                // 添加装置参数（如果已选择）
+                if (!string.IsNullOrEmpty(unitWorkId))
+                {
+                    urlParams += "&unitWorkId=" + unitWorkId;
+                }
+
+                // 添加岗位参数（如果已选择）
+                if (!string.IsNullOrEmpty(workPostId))
+                {
+                    urlParams += "&workPostId=" + workPostId;
+                }
+
+                // 添加时间参数
+                if (planDate.HasValue)
+                {
+                    urlParams += "&planDate=" + string.Format("{0:yyyy-MM-dd}", planDate);
+                }
+
+                // 添加岗位参数（如果已选择）
+                if (quantity.HasValue)
+                {
+                    urlParams += "&quantity=" + quantity.Value;
+                }
+
+                // 添加岗位参数（如果已选择）
+                if (num >= 0)
+                {
+                    urlParams += "&num=" + num;
+                }
+                else
+                {
+                    urlParams += "&num=0";
+                }
+
+
                 foreach (var userId in toUserIds)
                 {
                     Model.ToDoItem toDoItem = new Model.ToDoItem();
                     toDoItem.DataId = SQLHelper.GetNewID(typeof(Model.ToDoItem));
                     toDoItem.MenuId = "";
                     toDoItem.MenuName = "管理人员到岗预警";
+                    toDoItem.ProjectCode = "";
                     toDoItem.Content = warningContent;
                     toDoItem.UserId = userId;
                     toDoItem.UserName = UserService.GetUserNameByUserId(userId);
                     toDoItem.DataTime = DateTime.Now;
                     toDoItem.DataTimeStr = DateTime.Now.ToString("yyyy-MM-dd");
-                    toDoItem.PCUrl = "";
-                    toDoItem.UrlStr = "pages/exam/examjs";
+                    toDoItem.PCUrl = urlParams;
                     toDoItems.Add(toDoItem);
                 }
             }
@@ -284,12 +335,16 @@ namespace BLL
                 version = sgMan.Version;
             }
 
+            //当前时间
+            var endDate = DateTime.Now;
+            //当前时间前7天
+            var startDate = DateTime.Now.AddDays(-7);
             // 先获取计划表一周的作业岗位有哪些
             var dataList = (from x in Funs.DB.JDGL_SGManPower
                 join p in Funs.DB.Base_WorkPost on x.WorkPostId equals p.WorkPostId into pp
                 from y in pp.DefaultIfEmpty()
                 where x.ProjectId == projectId && (y.PostType == "2" || y.PostType == "3") &&
-                      x.PlanDate >= DateTime.Now.AddDays(-7) && x.PlanDate <= DateTime.Now && x.Version == version
+                      x.PlanDate >= startDate && x.PlanDate <= endDate && x.Version == version
                 group x by new
                 {
                     x.UnitId,
@@ -310,25 +365,25 @@ namespace BLL
             foreach (var data in dataList)
             {
                 //根据人员计划表获取计划中的作业人员数
-                int num = getInOutRecordNum1(data.UnitId, data.UnitWorkId, data.WorkPostId,projectId);
-                
+                int num = getInOutRecordNum1(data.UnitId, data.UnitWorkId, data.WorkPostId, projectId);
+
                 // 计算偏差百分比
-                if (data.QuantitySum > num)
+                if (data.QuantitySum != 0)
                 {
                     double deviationPercentage = Math.Abs((double)((data.QuantitySum - num) / data.QuantitySum));
                     // 如果偏差超过10%，发出预警
                     if (deviationPercentage > 0.1)
                     {
-                        lItems = SendWorkerDeviationWarning(data.UnitId, projectId, data.UnitWorkId, data.QuantitySum, 0);
+                        lItems = SendWorkerDeviationWarning(data.UnitId, projectId, data.WorkPostId, data.UnitWorkId,
+                            startDate, endDate, data.QuantitySum, num);
                     }
                 }
             }
 
             return lItems;
-            
         }
 
-        
+
         //获取实际考勤人员数
         private static int getInOutRecordNum1(string unitId, string unitWorkId, string workPostId, string projectId)
         {
@@ -394,12 +449,13 @@ namespace BLL
             }
             else
             {
-                dataSource = dataSource.Where(x => x["UnitWorkId"] != DBNull.Value && x["UnitWorkId"].ToString() == unitWorkId);
+                dataSource = dataSource.Where(x =>
+                    x["UnitWorkId"] != DBNull.Value && x["UnitWorkId"].ToString() == unitWorkId);
             }
 
             return dataSource.Count();
         }
-        
+
 
         /// <summary>
         /// 发送作业人员偏差预警
@@ -409,13 +465,14 @@ namespace BLL
         /// <param name="planTotal">计划总人数</param>
         /// <param name="actualTotal">实际总人数</param>
         /// <param name="deviationPercentage">偏差百分比</param>
-        private static List<ToDoItem> SendWorkerDeviationWarning(string unitId, string projectId, string unitWorkId, int? quantity, int num)
+        private static List<ToDoItem> SendWorkerDeviationWarning(string unitId, string projectId, string workPostId,
+            string unitWorkId,
+            DateTime? startDate, DateTime? endDate, int? quantity, int num)
         {
-            
             // 发送预警信息
             var toDoItems = new List<ToDoItem>();
             List<string> toUserIds = new List<string>();
-            
+
             var unitWorks = (from x in Funs.DB.WBS_UnitWork
                 where x.UnitWorkId == unitWorkId
                 select new { x.UnitWorkId, x.UnitWorkName }).FirstOrDefault();
@@ -438,6 +495,7 @@ namespace BLL
                     toUserIds.Add(projectUser.UserId);
                 }
             }
+
             // 获取总包单位施工经理
             var generalContractorUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(pu =>
                 pu.ProjectId == projectId && pu.UnitType == Const.ProjectUnitType_1); // 总包单位
@@ -456,7 +514,7 @@ namespace BLL
                     }
                 }
             }
-            
+
             // 构建预警信息内容
             string warningContent = string.Empty;
             if (unitWorks != null)
@@ -468,7 +526,50 @@ namespace BLL
             {
                 warningContent = $"{projectUnits.UnitName}单位计划投入人力{quantity}人，实际考勤为{num}人。";
             }
-            
+
+            string urlParams = "JDGL/SGManPower/SGWarningDetails.aspx?projectId=" + projectId;
+            // 添加单位参数（如果已选择）
+            if (!string.IsNullOrEmpty(unitId))
+            {
+                urlParams += "&unitId=" + unitId;
+            }
+
+            // 添加装置参数（如果已选择）
+            if (!string.IsNullOrEmpty(unitWorkId))
+            {
+                urlParams += "&unitWorkId=" + unitWorkId;
+            }
+
+            // 添加岗位参数（如果已选择）
+            if (!string.IsNullOrEmpty(workPostId))
+            {
+                urlParams += "&workPostId=" + workPostId;
+            }
+
+            // 添加时间参数
+            if (startDate.HasValue && endDate.HasValue)
+            {
+                urlParams += "&planDate=" + string.Format("{0:yyyy-MM-dd}", startDate) + "~" +
+                             string.Format("{0:yyyy-MM-dd}", endDate);
+            }
+
+
+            // 添加岗位参数（如果已选择）
+            if (quantity.HasValue)
+            {
+                urlParams += "&quantity=" + quantity.Value;
+            }
+
+            // 添加岗位参数（如果已选择）
+            if (num >= 0)
+            {
+                urlParams += "&num=" + num;
+            }
+            else
+            {
+                urlParams += "&num=0";
+            }
+
             // 发送预警信息
             foreach (var userId in toUserIds)
             {
@@ -476,15 +577,16 @@ namespace BLL
                 toDoItem.DataId = SQLHelper.GetNewID(typeof(Model.ToDoItem));
                 toDoItem.MenuId = "";
                 toDoItem.MenuName = "人力资源偏差预警";
+                toDoItem.ProjectCode = "";
                 toDoItem.Content = warningContent;
                 toDoItem.UserId = userId;
                 toDoItem.UserName = UserService.GetUserNameByUserId(userId);
                 toDoItem.DataTime = DateTime.Now;
                 toDoItem.DataTimeStr = DateTime.Now.ToString("yyyy-MM-dd");
-                toDoItem.PCUrl = "";
-                toDoItem.UrlStr = "pages/exam/examjs";
+                toDoItem.PCUrl = urlParams;
                 toDoItems.Add(toDoItem);
             }
+
             return toDoItems;
         }
     }

SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs

@@ -485,6 +485,7 @@ namespace BLL
                 var userIds = BLL.UserService.GetUserHaveEmailList();
 
                 //userIds = userIds.Where(x => x.UserName == "张邦兴" || x.UserName == "申银行").ToList();
+                //userIds = userIds.Where(x => x.UserName == "白金潮" || x.UserName == "申银行").ToList();
                 if (userIds.Any() && lstOverdue.Any())
                 {
                     //int allnum = 0;
@@ -608,8 +609,8 @@ namespace BLL
 
                             #region 事项逾期提醒项目主管和项目经理
 
-                            var projectSupervisors = ProjectUserService.GetProjectUserByRoleId(Const.ProjectSupervisor);
-                            var projectManagers = ProjectUserService.GetProjectUserByRoleId(Const.ProjectManager);
+                            var projectSupervisors = ProjectUserService.GetProjectUserByRoleId(pro.ProjectId,Const.ProjectSupervisor);
+                            var projectManagers = ProjectUserService.GetProjectUserByRoleId(pro.ProjectId, Const.ProjectManager);
 
                             List<string> remindUserIds = new List<string>();
                             List<string> projectSupervisorIds = projectSupervisors.Select(x => x.UserId).ToList();

SGGL/BLL/ProjectData/ProjectUserService.cs

@@ -2,6 +2,7 @@
 {
     using System.Collections.Generic;
     using System.Linq;
+    using System.Web.Security;
     using Model;
 
     public static class ProjectUserService
@@ -39,9 +40,9 @@
         ///获取项目用户信息 根据用户角色ID
         /// </summary>
         /// <returns></returns>
-        public static List<Project_ProjectUser> GetProjectUserByRoleId(string roleId)
+        public static List<Project_ProjectUser> GetProjectUserByRoleId(string projectId, string roleId)
         {
-            return (from x in Funs.DB.Project_ProjectUser where x.RoleId.Contains(roleId) select x).ToList();
+            return (from x in Funs.DB.Project_ProjectUser where x.ProjectId == projectId && x.RoleId.Contains(roleId) select x).ToList();
         }
 
         /// <summary>

SGGL/BLL/ProjectData/UnitWorkService.cs

@@ -192,6 +192,16 @@ namespace BLL
             return (from x in Funs.DB.WBS_UnitWork where x.UnitWorkCode == UnitWorkCode select x).ToList();
         }
 
+        /// <summary>
+        /// 根据项目Id获取单位工程信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.WBS_UnitWork> GetUnitWorkByProjectId(string projectId)
+        {
+            return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();
+        }
+
         /// <summary>
         /// 下拉框选择(获取 text value)
         /// </summary>

SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs

@@ -1527,7 +1527,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,
@@ -1589,7 +1589,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,
@@ -1650,7 +1650,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,
@@ -1713,7 +1713,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,
@@ -1776,7 +1776,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,
@@ -1839,7 +1839,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,
@@ -1901,7 +1901,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select new Model.InspectionManagementOutput()
                           {
                               ProjectId = y.ProjectId,

SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs

@@ -743,7 +743,7 @@ namespace BLL
             int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where y.ProjectId == projectid && y.CheckAcceptType == "1" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where y.ProjectId == projectid && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -768,7 +768,7 @@ namespace BLL
             var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where y.ProjectId == projectid && y.CheckAcceptType == "2" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where y.ProjectId == projectid && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -793,7 +793,7 @@ namespace BLL
             int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where y.ProjectId == projectid && y.CheckAcceptType == "3" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where y.ProjectId == projectid && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -818,7 +818,7 @@ namespace BLL
             int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where y.ProjectId == projectid && y.CheckAcceptType == "4" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where y.ProjectId == projectid && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -843,7 +843,7 @@ namespace BLL
             int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where y.ProjectId == projectid && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where y.ProjectId == projectid && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -868,7 +868,7 @@ namespace BLL
             int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                           join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
                           join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
-                          where y.ProjectId == projectid && y.CheckAcceptType == "6" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
+                          where y.ProjectId == projectid && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }

SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx

@@ -416,6 +416,9 @@
   </data>
 	<data name="ApprovalCompleted" xml:space="preserve">
     <value>审批完成</value>
+  </data>
+	<data name="ApprovalCompletedUnderConstruction" xml:space="preserve">
+    <value>已审待施工</value>
   </data>
 	<data name="call" xml:space="preserve">
     <value>呼叫</value>

SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs

@@ -105,6 +105,15 @@ namespace Resources {
             }
         }
         
+        /// <summary>
+        ///   查找类似 已审待施工 的本地化字符串。
+        /// </summary>
+        internal static string ApprovalCompletedUnderConstruction {
+            get {
+                return ResourceManager.GetString("ApprovalCompletedUnderConstruction", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 材料到货 的本地化字符串。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx

@@ -67,6 +67,9 @@
                         <f:RenderField ColumnID="Problem" DataField="Problem" FieldType="String" HeaderText="问题类别" TextAlign="Left"
                             HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="ReasonAnalysis" DataField="ReasonAnalysis" FieldType="String" HeaderText="原因分析" TextAlign="Left"
+                            HeaderTextAlign="Center" Width="280px">
+                        </f:RenderField>
                         <f:RenderField ColumnID="Measure" DataField="Measure" FieldType="String" HeaderText="改进措施" TextAlign="Left"
                             HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs

@@ -29,14 +29,14 @@ namespace FineUIPro.Web.Comprehensive
         }
         public void BindGrid()
         {
-            string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit,  C.NCRCode, C.Contents,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
+            string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit,  C.NCRCode, C.Contents,C.ReasonAnalysis,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
                               C.ClosedDate, C.CompleteDate, C.ResponsibleMan, C.AttachUrl, C.ImplementationFrontState,C.Supervisor,
                               C.CompileMan, C.UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode,su.UserName as SupervisorName 
                               from Comprehensive_NCRManagement C 
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
 							  left join Base_Unit u on u.UnitId = C.SendUnit
                               left join Sys_User su on su.UserId = C.Supervisor
-                              where C.ProjectId = @ProjectId";
+                              where C.ProjectId = @ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             if (sdrpUnitId.SelectedValue != BLL.Const._Null)
@@ -469,13 +469,17 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(6);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.Measure);//改进措施
+                    cell.SetCellValue(item.ReasonAnalysis);//问题原因分析
 
                     cell = row.CreateCell(7);
                     cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.Measure);//改进措施
+
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
                     
-                    cell = row.CreateCell(8);
+                    cell = row.CreateCell(9);
                     cell.CellStyle = cellStyle;
                     string receiveUnitName = string.Empty;
                     if (!string.IsNullOrEmpty(item.ReceiveUnit))
@@ -484,7 +488,7 @@ namespace FineUIPro.Web.Comprehensive
                     }
                     cell.SetCellValue(receiveUnitName);//接收单位
 
-                    cell = row.CreateCell(9);
+                    cell = row.CreateCell(10);
                     cell.CellStyle = cellStyle;
                     string state = string.Empty;
                     if (!string.IsNullOrEmpty(item.ImplementationFrontState))
@@ -493,19 +497,19 @@ namespace FineUIPro.Web.Comprehensive
                     }
                     cell.SetCellValue(state);//实施状态
 
-                    cell = row.CreateCell(10);
+                    cell = row.CreateCell(11);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
 
-                    cell = row.CreateCell(11);
+                    cell = row.CreateCell(12);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
                     
-                    cell = row.CreateCell(12);
+                    cell = row.CreateCell(13);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.ResponsibleMan);//责任人
 
-                    cell = row.CreateCell(13);
+                    cell = row.CreateCell(14);
                     cell.CellStyle = cellStyle;
                     string supervisorName = string.Empty;
                     if (!string.IsNullOrEmpty(item.Supervisor))
@@ -514,7 +518,7 @@ namespace FineUIPro.Web.Comprehensive
                     }
                     cell.SetCellValue(supervisorName);//监督人
 
-                    cell = row.CreateCell(14);
+                    cell = row.CreateCell(15);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号
 

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx

@@ -97,31 +97,34 @@
                         <f:RenderField Width="90px" HeaderText="问题类别" ColumnID="Value6" DataField="Value6" SortField="Value6"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="120px" HeaderText="改进措施" ColumnID="Value7" DataField="Value7" SortField="Value7"
+                        <f:RenderField Width="120px" HeaderText="原因分析" ColumnID="Value7" DataField="Value7" SortField="Value7"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" HeaderText="下发日期" ColumnID="Value8" DataField="Value8" SortField="Value8"
+                        <f:RenderField Width="120px" HeaderText="改进措施" ColumnID="Value8" DataField="Value8" SortField="Value8"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" HeaderText="接收单位" ColumnID="Value9" DataField="Value9" SortField="Value9"
+                        <f:RenderField Width="100px" HeaderText="下发日期" ColumnID="Value9" DataField="Value9" SortField="Value9"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" HeaderText="实施状态" ColumnID="Value10" DataField="Value10" SortField="Value10"
+                        <f:RenderField Width="100px" HeaderText="接收单位" ColumnID="Value10" DataField="Value10" SortField="Value10"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value11" DataField="Value11" SortField="Value11"
+                        <f:RenderField Width="100px" HeaderText="实施状态" ColumnID="Value11" DataField="Value11" SortField="Value11"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>
-                        <f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
+                        <f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value13" DataField="Value13" SortField="Value13"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value13" DataField="Value13" SortField="Value13"
+                        <f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value14" DataField="Value14" SortField="Value14"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>  
-                        <f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value14" DataField="Value14" SortField="Value14"
+                        <f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value15" DataField="Value15" SortField="Value15"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField> 
-                        <f:RenderField Width="80px" HeaderText="标志编号" ColumnID="Value15" DataField="Value15" SortField="Value15"
+                        <f:RenderField Width="80px" HeaderText="标志编号" ColumnID="Value16" DataField="Value16" SortField="Value16"
                             FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>    
                     </Columns>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs

@@ -248,6 +248,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString();
                         newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString();
                         newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString();
+                        newDataInTemp.Value16 = ds.Tables[0].Rows[i][15].ToString();
 
                         BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
                     }
@@ -432,29 +433,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             Ins.Problem = tempData.Value6.Trim();
                         }
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//改进措施
+                    if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//问题原因分析
                     {
-                        Ins.Measure = tempData.Value7.Trim();
+                        Ins.ReasonAnalysis = tempData.Value7.Trim();
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
+                    if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//改进措施
+                    {
+                        Ins.Measure = tempData.Value8.Trim();
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
                     {
                         try
                         {
-                            Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value8.Trim());
+                            Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value9.Trim());
                             if (Ins.IssuedDate == null)
                             {
-                                errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
+                                errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；";
                             }
                         }
                         catch (Exception)
                         {
-                            errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
+                            errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；";
                         }
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
+                    if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
                     {
                         string unitIds = string.Empty;
-                        string[] reunit = tempData.Value9.Split(',');
+                        string[] reunit = tempData.Value10.Split(',');
                         foreach (string unitName in reunit)
                         {
                             var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault();
@@ -473,54 +478,54 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                         Ins.ReceiveUnit = unitIds;
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
+                    if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
                     {
-                        if (tempData.Value10.Trim() != "整改中" && tempData.Value10.Trim() != "已闭合")
+                        if (tempData.Value11.Trim() != "整改中" && tempData.Value11.Trim() != "已闭合")
                         {
-                            errInfo += "实时状态[" + tempData.Value10.Trim() + "]错误；";
+                            errInfo += "实时状态[" + tempData.Value11.Trim() + "]错误；";
                         }
                         else
                         {
-                            Ins.ImplementationFrontState = tempData.Value10.Trim();
-                        }
-                    }
-                    if (!string.IsNullOrEmpty(tempData.Value11))
-                    {
-                        try
-                        {
-                            Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value11);
-                            if (Ins.ClosedDate == null)
-                            {
-                                errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
-                            }
-                        }
-                        catch (Exception)
-                        {
-                            errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
+                            Ins.ImplementationFrontState = tempData.Value11.Trim();
                         }
                     }
                     if (!string.IsNullOrEmpty(tempData.Value12))
                     {
                         try
                         {
-                            Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value12);
-                            if (Ins.CompleteDate == null)
+                            Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value12);
+                            if (Ins.ClosedDate == null)
                             {
-                                errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
+                                errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；";
                             }
                         }
                         catch (Exception)
                         {
-                            errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
+                            errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；";
                         }
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value13.Trim()))//责任人
+                    if (!string.IsNullOrEmpty(tempData.Value13))
                     {
-                        Ins.ResponsibleMan = tempData.Value13.Trim();
+                        try
+                        {
+                            Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value13);
+                            if (Ins.CompleteDate == null)
+                            {
+                                errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；";
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；";
+                        }
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//监督人
+                    if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//责任人
                     {
-                        string[] strs = tempData.Value14.Trim().Split(',');
+                        Ins.ResponsibleMan = tempData.Value14.Trim();
+                    }
+                    if (!string.IsNullOrEmpty(tempData.Value15.Trim()))//监督人
+                    {
+                        string[] strs = tempData.Value15.Trim().Split(',');
                         bool b = true;
                         string supervisor = string.Empty;
                         foreach (var item in strs)
@@ -544,15 +549,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             }
                         }
                     }
-                    if (!string.IsNullOrEmpty(tempData.Value15))
+                    if (!string.IsNullOrEmpty(tempData.Value16))
                     {
                         try
                         {
-                            Ins.RemarkCode = Convert.ToInt32(tempData.Value15);
+                            Ins.RemarkCode = Convert.ToInt32(tempData.Value16);
                         }
                         catch (Exception)
                         {
-                            errInfo += "标志编号[" + tempData.Value15 + "]格式错误；";
+                            errInfo += "标志编号[" + tempData.Value16 + "]格式错误；";
                         }
                     }
                     else
@@ -564,7 +569,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         Ins.ProjectId = LoginProjectId;
                         Ins.Status = BLL.Const.Comprehensive_Compile;
                         Ins.CompileMan = this.CurrUser.UserId;
-                        var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
+                        var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value16));
                         if (isExitISOValue != null) ///已存在
                         {
                             Ins.NCRManagementId = isExitISOValue.NCRManagementId;

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx

@@ -33,7 +33,6 @@
                         </f:TextBox>
                         <f:TextBox ID="txtValue4" Label="单位工程名称" runat="server" LabelWidth="120px">
                         </f:TextBox>
-
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
@@ -42,32 +41,38 @@
                         </f:TextBox>
                         <f:TextBox ID="txtValue6" Label="问题类别" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue7" Label="改进措施" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue7" Label="原因分析" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue8" Label="下发日期" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue8" Label="改进措施" runat="server" LabelWidth="120px">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtValue9" Label="接收单位" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue9" Label="下发日期" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue10" Label="实施状态" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue10" Label="接收单位" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue11" Label="要求关闭日期" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue11" Label="实施状态" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue12" Label="完成日期" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue12" Label="要求关闭日期" runat="server" LabelWidth="120px">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtValue13" Label="责任人" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue13" Label="完成日期" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue14" Label="监督人" runat="server" LabelWidth="120px">
+                        <f:TextBox ID="txtValue14" Label="责任人" runat="server" LabelWidth="120px">
                         </f:TextBox>
-                        <f:TextBox ID="txtValue15" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtValue15" Label="监督人" runat="server" LabelWidth="120px">
                         </f:TextBox>
+                        <f:TextBox ID="txtValue16" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
                     </Items>
                 </f:FormRow>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs

@@ -57,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     this.txtValue13.Text = dataInTemp.Value13;
                     this.txtValue14.Text = dataInTemp.Value14;
                     this.txtValue15.Text = dataInTemp.Value15;
+                    this.txtValue16.Text = dataInTemp.Value16;
 
                     this.lbErrCout.Text = dataInTemp.ToopValue;
                 }
@@ -244,6 +245,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                     }
                 }
+                if (dataInTemp.Value16 != this.txtValue16.Text.Trim())
+                {
+                    var tempValue16 = allDataInTemp.Where(x => x.Value16 == dataInTemp.Value16 || (x.Value16 == null && dataInTemp.Value16 == null));
+                    if (tempValue16 != null)
+                    {
+                        foreach (var item in tempValue16)
+                        {
+                            item.Value16 = this.txtValue16.Text.Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+                    }
+                }
                 var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
                 if (toopValue != null)
                 {
@@ -276,6 +289,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 newDataInTemp.Value13 = this.txtValue13.Text.Trim();
                 newDataInTemp.Value14 = this.txtValue14.Text.Trim();
                 newDataInTemp.Value15 = this.txtValue15.Text.Trim();
+                newDataInTemp.Value16 = this.txtValue16.Text.Trim();
                 if (!string.IsNullOrEmpty(this.TempId))
                 {
                     newDataInTemp.TempId = this.TempId;

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Comprehensive {
-    
-    
-    public partial class NCRManagementDataInNewEdit {
-        
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class NCRManagementDataInNewEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// txtValue1 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue1;
-        
+
         /// <summary>
         /// txtValue2 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue2;
-        
+
         /// <summary>
         /// txtValue3 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue3;
-        
+
         /// <summary>
         /// txtValue4 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue4;
-        
+
         /// <summary>
         /// txtValue5 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue5;
-        
+
         /// <summary>
         /// txtValue6 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue6;
-        
+
         /// <summary>
         /// txtValue7 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue7;
-        
+
         /// <summary>
         /// txtValue8 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue8;
-        
+
         /// <summary>
         /// txtValue9 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue9;
-        
+
         /// <summary>
         /// txtValue10 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue10;
-        
+
         /// <summary>
         /// txtValue11 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue11;
-        
+
         /// <summary>
         /// txtValue12 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue12;
-        
+
         /// <summary>
         /// txtValue13 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue13;
-        
+
         /// <summary>
         /// txtValue14 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue14;
-        
+
         /// <summary>
         /// txtValue15 控件。
         /// </summary>
@@ -200,7 +202,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue15;
-        
+
+        /// <summary>
+        /// txtValue16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue16;
+
         /// <summary>
         /// ckAll 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckAll;
-        
+
         /// <summary>
         /// lbErrCout 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx

@@ -29,15 +29,15 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" AutoSelectFirstItem="false"  LabelAlign="Right" LabelWidth="130px" EnableMultiSelect="true" EnableCheckBoxSelect="true">     
+                        <f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="130px" EnableMultiSelect="true" EnableCheckBoxSelect="true">
                             <f:ListItem Value="过程监督不到位" Text="过程监督不到位" />
-                             <f:ListItem Value="质量缺陷" Text="质量缺陷" />
-                             <f:ListItem Value="质量管理问题" Text="质量管理问题" />
-                             <f:ListItem Value="不按设计要求施工" Text="不按设计要求施工" />
-                             <f:ListItem Value="不按程序施工" Text="不按程序施工" />
-                             <f:ListItem Value="成品保护不到位" Text="成品保护不到位" />
-                        </f:DropDownList>  
-                         <f:NumberBox ID="txtRemarkCode" runat="server" Label="标志编号" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                            <f:ListItem Value="质量缺陷" Text="质量缺陷" />
+                            <f:ListItem Value="质量管理问题" Text="质量管理问题" />
+                            <f:ListItem Value="不按设计要求施工" Text="不按设计要求施工" />
+                            <f:ListItem Value="不按程序施工" Text="不按程序施工" />
+                            <f:ListItem Value="成品保护不到位" Text="成品保护不到位" />
+                        </f:DropDownList>
+                        <f:NumberBox ID="txtRemarkCode" runat="server" Label="标志编号" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
@@ -45,7 +45,12 @@
                         <f:TextArea ID="txtContents" runat="server" Label="主要内容" MaxLength="500" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
                     </Items>
                 </f:FormRow>
-                 <f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtReasonAnalysis" runat="server" Label="问题原因分析" MaxLength="500" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
                     <Items>
                         <f:TextArea ID="txtMeasure" runat="server" Label="改进措施" MaxLength="1000" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
                     </Items>
@@ -62,12 +67,12 @@
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
-                    <Items>                
-                          <f:DropDownList ID="ddlImplementationFrontState" runat="server" Label="实施状态" Required="true"  LabelAlign="Right" LabelWidth="130px">     
+                    <Items>
+                        <f:DropDownList ID="ddlImplementationFrontState" runat="server" Label="实施状态" Required="true" LabelAlign="Right" LabelWidth="130px">
                             <f:ListItem Value="" Text="-请选择-" Selected="true" />
                             <f:ListItem Value="整改中" Text="整改中" />
-                             <f:ListItem Value="已闭合" Text="已闭合" />                             
-                        </f:DropDownList> 
+                            <f:ListItem Value="已闭合" Text="已闭合" />
+                        </f:DropDownList>
                         <f:TextBox ID="txtResponsibleMan" runat="server" Label="责任人" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
                     </Items>
                 </f:FormRow>
@@ -91,10 +96,10 @@
                                 <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                 </f:Button>
                             </Items>
-                        </f:Panel>                       
+                        </f:Panel>
                     </Items>
                 </f:FormRow>
-              <%--  <f:FormRow MarginTop="10px">
+                <%--  <f:FormRow MarginTop="10px">
                     <Items>
                         <f:DropDownList runat="server" Width="300px" Label="专业工程师确认" LabelWidth="130px" ID="drpAudit" ShowRedStar="true" Required="true" EmptyText="--请选择--">
                         </f:DropDownList>
@@ -120,17 +125,16 @@
 
                     </Items>
                 </f:FormRow>--%>
-
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
                         <f:HiddenField ID="hdAttachUrl" runat="server">
                         </f:HiddenField>
-                            <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
                         </f:Button>
 
-                         <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
+                        <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
                         </f:Button>--%>
                     </Items>
                 </f:Toolbar>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs

@@ -40,9 +40,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 BLL.UnitService.InitAllUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, true);
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
                 BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpSupervisor, this.CurrUser.LoginProjectId, BLL.Const.UnitId_CWCEC, false);//监督人
-                                                                                                                                                    //LoadAuditSelect();
-                                                                                                                                                    //this.agree.Hidden = true;
-                                                                                                                                                    //this.options.Hidden = true;
 
                 this.NCRManagementId = Request.Params["NCRManagementId"];
                 Model.Comprehensive_NCRManagement nCRManagement = BLL.NCRManagementService.GetNCRManagementById(this.NCRManagementId);
@@ -60,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     }
                     this.txtNCRCode.Text = nCRManagement.NCRCode;
                     this.txtContents.Text = nCRManagement.Contents;
+                    this.txtReasonAnalysis.Text = nCRManagement.ReasonAnalysis;
                     if (nCRManagement.IssuedDate != null)
                     {
                         this.txtIssuedDate.Text = string.Format("{0:yyyy-MM-dd}", nCRManagement.IssuedDate);
@@ -164,6 +162,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             this.txtCompleteDate.Readonly = true;
             this.drpCNProfessionalId.Readonly = true;
             this.txtContents.Readonly = true;
+            this.txtReasonAnalysis.Readonly = true;
             this.ddlImplementationFrontState.Readonly = true;
             this.txtIssuedDate.Readonly = true;
             this.txtNCRCode.Readonly = true;
@@ -215,6 +214,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 Alert.ShowInTop("请选择发出单位！", MessageBoxIcon.Warning);
                 return;
             }
+            if (string.IsNullOrWhiteSpace(this.txtReasonAnalysis.Text.Trim()))
+            {
+                Alert.ShowInTop("请填写问题原因分析！", MessageBoxIcon.Warning);
+                return;
+            }
             if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
@@ -243,7 +247,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             }
             nCRManagement.NCRCode = this.txtNCRCode.Text.Trim();
             nCRManagement.Contents = this.txtContents.Text.Trim();
-
+            nCRManagement.ReasonAnalysis = this.txtReasonAnalysis.Text.Trim();
+            
             #region 新增2024-03-29
             string problem = string.Empty;
             foreach (var item in this.ddlProblem.SelectedValueArray)

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Comprehensive {
-    
-    
-    public partial class NCRManagementEdit {
-        
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class NCRManagementEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// drpSendUnit 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSendUnit;
-        
+
         /// <summary>
         /// drpCNProfessionalId 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessionalId;
-        
+
         /// <summary>
         /// txtNCRCode 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtNCRCode;
-        
+
         /// <summary>
         /// txtIssuedDate 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtIssuedDate;
-        
+
         /// <summary>
         /// ddlProblem 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlProblem;
-        
+
         /// <summary>
         /// txtRemarkCode 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtRemarkCode;
-        
+
         /// <summary>
         /// txtContents 控件。
         /// </summary>
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtContents;
-        
+
+        /// <summary>
+        /// txtReasonAnalysis 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtReasonAnalysis;
+
         /// <summary>
         /// txtMeasure 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtMeasure;
-        
+
         /// <summary>
         /// drpUnitWorkIds 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWorkIds;
-        
+
         /// <summary>
         /// drpUnitIds 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitIds;
-        
+
         /// <summary>
         /// drpSupervisor 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSupervisor;
-        
+
         /// <summary>
         /// ddlImplementationFrontState 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlImplementationFrontState;
-        
+
         /// <summary>
         /// txtResponsibleMan 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibleMan;
-        
+
         /// <summary>
         /// txtClosedDate 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtClosedDate;
-        
+
         /// <summary>
         /// txtCompleteDate 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCompleteDate;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// btnAttach 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs

@@ -3179,7 +3179,7 @@ namespace FineUIPro.Web.CQMS.DataBase
                                      Ins.UnitWorkId,
                                      Ins.ControlPointType,
                                      Ins.AcceptanceSite,
-                                     (CASE WHEN Ins.IsOnceQualified=0 THEN '否' ELSE '是' END) AS IsOnceQualified,
+                                     (CASE WHEN Ins.IsOnceQualified=1 THEN '是' ELSE '否' END) AS IsOnceQualified,
                                      Ins.InspectionDate,
                                      Ins.AttachUrl,
                                      Ins.CheckDate,

SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx

@@ -54,7 +54,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
@@ -194,7 +194,7 @@
                                 </f:RenderField>
                                 <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
                                     </ItemTemplate>
                                 </f:TemplateField>
                             </Columns>
@@ -203,6 +203,10 @@
                     <%-- <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>--%>
+
+                    <%--<Listeners>
+                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                    </Listeners>--%>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                         </f:ToolbarSeparator>
@@ -242,6 +246,11 @@
         </f:Menu>--%>
     </form>
     <script type="text/javascript">
+        //function onGridDataLoad(event) {
+        //    this.mergeColumns(['projectDeviceProcedureSubjectCode', 'wbsFullPath', 'formatFileCode', 'formatFileName', 'majorNo', 'majorName', 'fileVersion'], {
+        //        depends: true
+        //    });
+        //}
        <%-- var menuID = '<%= Menu1.ClientID %>';
 
         // 返回false，来阻止浏览器右键菜单

SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx

@@ -54,7 +54,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="100000" OnPageIndexChange="Grid1_PageIndexChange" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
@@ -202,7 +202,7 @@
                                 </f:RenderField>
                                 <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
                                     </ItemTemplate>
                                 </f:TemplateField>
                             </Columns>

SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx

@@ -54,7 +54,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
@@ -189,7 +189,7 @@
                                 </f:RenderField>
                                 <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
                                     </ItemTemplate>
                                 </f:TemplateField>
                             </Columns>

SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs

@@ -48,7 +48,7 @@ namespace FineUIPro.Web.CQMS.Foreign
                                     checks.Branch, 
                                     breakdown.BreakdownName as ControlPointType, 
                                     checks.AcceptanceSite, 
-                                    (CASE WHEN checks.IsOnceQualified='Flase' THEN '否' ELSE '是' END) AS IsOnceQualified, 
+                                    (CASE WHEN checks.IsOnceQualified='True' THEN '是' ELSE '否' END) AS IsOnceQualified, 
                                     checks.InspectionDate,
                                     checks.AttachUrl, 
                                     checks.CheckDate, 

SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs

@@ -101,8 +101,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 workNames.Add(divisionProject.DivisionName);
                                 checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
-                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 StatisticsList.Add(checkStatisc);
                             }
                             else   //更新已有记录
@@ -110,8 +110,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
                                 checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                             }
                         }
                     }
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                     checkStatisc.CheckNum = managementList.Count();
                     checkStatisc.TotalCheckNum = totalManagementList.Count();
                     checkStatisc.OKNum = managementList.Count(x => x.IsOnceQualified == null|| x.IsOnceQualified == true);
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.IsOnceQualified == true);
                     StatisticsList.Add(checkStatisc);
                     i++;
                 }
@@ -251,7 +251,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 StatisticsList.Add(checkStatisc);
                             }
                             else   //更新已有记录
@@ -259,8 +259,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
                                 checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                             }
                         }
                     }

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs

@@ -535,8 +535,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                     checkStatisc.WorkName = ins.UnitWorkName;
                     checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
-                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
                     StatisticsList.Add(checkStatisc);
                 }
 

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportPrint.aspx.cs

@@ -250,8 +250,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     workNames.Add(ins.UnitWorkName);
                                     checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                     StatisticsList.Add(checkStatisc);
                                     i++;
                                 }
@@ -260,8 +260,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
                                     checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 }
                             }
                         }
@@ -286,8 +286,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 workNames.Add(divisionProject.DivisionName);
                                 checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 StatisticsList.Add(checkStatisc);
                                 i++;
                             }
@@ -296,8 +296,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
                                 checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                             }
                         }
                     }
@@ -1519,8 +1519,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     workNames.Add(ins.UnitWorkName);
                                     checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                     StatisticsList.Add(checkStatisc);
                                     i++;
                                 }
@@ -1529,8 +1529,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
                                     checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 }
                             }
                         }
@@ -1555,8 +1555,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 workNames.Add(divisionProject.DivisionName);
                                 checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 StatisticsList.Add(checkStatisc);
                                 i++;
                             }
@@ -1565,8 +1565,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
                                 checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                             }
                         }
                     }

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs

@@ -530,8 +530,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                     checkStatisc.WorkName = ins.UnitWorkName;
                     checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
-                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
                     StatisticsList.Add(checkStatisc);
                 }
 

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportPrint.aspx.cs

@@ -252,8 +252,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     workNames.Add(ins.UnitWorkName);
                                     checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                     StatisticsList.Add(checkStatisc);
                                     i++;
                                 }
@@ -262,8 +262,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
                                     checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 }
                             }
                         }
@@ -288,8 +288,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 workNames.Add(divisionProject.DivisionName);
                                 checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 StatisticsList.Add(checkStatisc);
                                 i++;
                             }
@@ -298,8 +298,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
                                 checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                             }
                         }
                     }
@@ -1523,8 +1523,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     workNames.Add(ins.UnitWorkName);
                                     checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                     StatisticsList.Add(checkStatisc);
                                     i++;
                                 }
@@ -1533,8 +1533,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                     Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
                                     checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                     checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 }
                             }
                         }
@@ -1559,8 +1559,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 workNames.Add(divisionProject.DivisionName);
                                 checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                                 StatisticsList.Add(checkStatisc);
                                 i++;
                             }
@@ -1569,8 +1569,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
                                 checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
                                 checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
                             }
                         }
                     }

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs

@@ -27,7 +27,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         public void BindGrid()
         {
             string strSql = @"select Id, Sortid, StartDate, EndDate, ProjectId,ReportType
-                              from Report_WeekAndMonthReport_New C 
+                              from Report_WeekAndMonthReport_New C with(nolock) 
                               where C.ReportType='1' AND C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -363,6 +363,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 //自动设置表格样式
                 table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                table.Alignment = TableAlignment.Center;
                 #endregion
 
                 #region 本月主要工作内容
@@ -447,6 +448,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -503,6 +505,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -556,6 +559,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -611,6 +615,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -664,6 +669,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -763,6 +769,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
 
                 }
 
@@ -908,6 +915,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
 
                 #endregion
@@ -968,6 +976,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -995,12 +1004,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     double numcount2 = table.FirstRow.Cells[2].CellFormat.Width;
                     double numcount3 = table.FirstRow.Cells[3].CellFormat.Width;
                     double numcount4 = table.FirstRow.Cells[4].CellFormat.Width;
-                    double numcount = numcount0 + numcount1 + numcount2 + numcount3 + numcount4;
+                    double numcount5 = table.FirstRow.Cells[5].CellFormat.Width;
+                    double numcount6 = table.FirstRow.Cells[6].CellFormat.Width;
+                    double numcount = numcount0 + numcount1 + numcount2 + numcount3 + numcount4 + numcount5 + numcount6;
                     rowhj.Cells.Add(CreateCell("暂无数据", doc, numcount));
                     table.Rows.Insert(numberIndex + 1, rowhj);
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -1227,6 +1239,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1262,6 +1275,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
 
                 #endregion
@@ -1319,6 +1333,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1353,6 +1368,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
 
                 #endregion
@@ -1409,6 +1425,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1533,6 +1550,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1569,6 +1587,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -1661,6 +1680,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1697,6 +1717,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -1789,6 +1810,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1825,6 +1847,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -1917,6 +1940,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -1953,6 +1977,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2045,6 +2070,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -2081,6 +2107,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2173,6 +2200,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -2209,6 +2237,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion  
 
@@ -2301,6 +2330,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 else
                 {
@@ -2337,6 +2367,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion  
 
@@ -2436,6 +2467,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2495,6 +2527,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2551,6 +2584,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2607,6 +2641,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2674,6 +2709,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2729,6 +2765,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2782,6 +2819,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2839,6 +2877,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     //自动设置表格样式
                     table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
                 }
                 #endregion
 
@@ -2878,6 +2917,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 //自动设置表格样式
                 table18_1.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                table18_1.Alignment = TableAlignment.Center;
                 #endregion
 
                 #region (2)施工过程问题
@@ -2915,6 +2955,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 //自动设置表格样式
                 table18_2.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                table18_2.Alignment = TableAlignment.Center;
                 #endregion
                 #endregion
 
@@ -2949,6 +2990,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 //自动设置表格样式
                 table19.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                table19.Alignment = TableAlignment.Center;
                 #endregion
 
                 #region 20.项目质量体系审核

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs

@@ -357,6 +357,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
             DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
             var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            var units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)).ToList();
             var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
 
             var remarks = loadRemarksDt();
@@ -461,7 +462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     }
                 }
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
 
                     Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
@@ -529,7 +530,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
 
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
                     model.Id = Guid.NewGuid().ToString();
@@ -1340,7 +1341,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                 }
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -1453,7 +1454,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     string UnitWorkName = checkLotBindStatiscData.Rows[i]["UnitWorkName"].ToString();
                     string cNProfessionalCode = checkLotBindStatiscData.Rows[i]["cNProfessionalCode"].ToString();
                     string IsOnceQualified = checkLotBindStatiscData.Rows[i]["IsOnceQualified"].ToString();
-                    DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
+                    DateTime? CompileDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["CompileDate"].ToString());
+                    //DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
 
                     if (tempCV != cNProfessionalCode || tempArea != UnitWorkName)
                     {
@@ -1476,7 +1478,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                         }
                     }
-                    if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
                     {
                         checkStatisc.CheckNum += 1;
                         if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
@@ -1484,6 +1486,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             checkStatisc.OKNum += 1;
                         }
                     }
+                    //if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    //{
+                    //    checkStatisc.CheckNum += 1;
+                    //    if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
+                    //    {
+                    //        checkStatisc.OKNum += 1;
+                    //    }
+                    //}
 
                     checkStatisc.TotalCheckNum += 1;
                     //if (IsOnceQualified == "1")
@@ -1924,7 +1934,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 {
                     string UnitId = row["UnitId"].ToString();
                     string IsOnceQualified = row["IsOnceQualified"].ToString();
-                    DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
+                    //DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
+                    DateTime? CompileDate = Funs.GetNewDateTime(row["CompileDate"].ToString());
                     if (!Quantity1Dic.ContainsKey(UnitId))
                     {
                         Quantity1Dic.Add(UnitId, 0);
@@ -1941,27 +1952,31 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     {
                         Quantity4Dic.Add(UnitId, 0);
                     }
-                    if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
                     {
                         Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
-                        if (IsOnceQualified == "1")
+                        if (IsOnceQualified == "1" || IsOnceQualified == "True")
                         {
                             Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
                         }
                     }
+                    //if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    //{
+                    //    Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
+                    //    if (IsOnceQualified == "1" || IsOnceQualified == "True")
+                    //    {
+                    //        Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
+                    //    }
+                    //}
                     Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + 1;
-                    if (IsOnceQualified == "1")
+                    if (IsOnceQualified == "1" || IsOnceQualified == "True")
                     {
                         Quantity4Dic[UnitId] = Quantity4Dic[UnitId] + 1;
                     }
                 }
 
-
-
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
-
-
                     Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
                     checkStatisc.Id = Guid.NewGuid().ToString();
                     checkStatisc.ReportId = ReportId;
@@ -1971,8 +1986,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                         checkStatisc.CheckNum = Quantity1Dic[item.UnitId];
                         checkStatisc.TotalCheckNum = Quantity2Dic[item.UnitId];
                         checkStatisc.OKNum = Quantity3Dic[item.UnitId]; ;
-                        checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId]; ;
-
+                        checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId];
                     }
                     if (checkStatisc.CheckNum != 0)//被除数不能为零
                     {
@@ -2004,8 +2018,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     OKNum += checkStatisc.OKNum;
                     TotalOKNum += checkStatisc.TotalOKNum;
-
-
                 }
 
                 gvInspectionDataInspection.DataSource = list;
@@ -2082,7 +2094,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber;
 
                 }
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -2158,10 +2170,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber;
 
                 }
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
-
-
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
                     model.ContentName = item.UnitName;
@@ -2238,7 +2248,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber;
 
                 }
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -2334,6 +2344,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 foreach (var item in units)
                 {
+                    if (item.UnitId == Const.UnitId_CWCEC)
+                    {
+                        continue;
+                    }
                     Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
                     NCRStatisc.Id = Guid.NewGuid().ToString();
                     NCRStatisc.WorkName = item.UnitName;
@@ -2428,7 +2442,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                 }
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
 
                     var ClosedCount = 0;
@@ -2503,22 +2517,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 {
                     string CheckType = row["CheckType"].ToString();
                     DateTime? CheckDate = Funs.GetNewDateTime(row["CheckDate"].ToString());
-
-                    if (!Quantity1Dic.ContainsKey(CheckType))
+                    string CheckTypeName = ConvertJointCheckType(CheckType);
+                    if (!Quantity1Dic.ContainsKey(CheckTypeName))
                     {
-                        Quantity1Dic.Add(CheckType, 0);
+                        Quantity1Dic.Add(CheckTypeName, 0);
                     }
-                    if (!Quantity2Dic.ContainsKey(CheckType))
+                    if (!Quantity2Dic.ContainsKey(CheckTypeName))
                     {
-                        Quantity2Dic.Add(CheckType, 0);
+                        Quantity2Dic.Add(CheckTypeName, 0);
                     }
 
                     if (CheckDate.HasValue && CheckDate.Value >= startDate && CheckDate.Value <= endDate)
                     {
-                        Quantity1Dic[CheckType] = Quantity1Dic[CheckType] + 1;
+                        Quantity1Dic[CheckTypeName] = Quantity1Dic[CheckTypeName] + 1;
 
                     }
-                    Quantity2Dic[CheckType] = Quantity2Dic[CheckType] + 1;
+                    Quantity2Dic[CheckTypeName] = Quantity2Dic[CheckTypeName] + 1;
 
 
                 }
@@ -2846,7 +2860,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             {
                 if (objType == "1")
                 {
-                    string strSql = @"select UnitOrMajor,ReType,  Remarks from Report_Construction_Plan  
+                    string strSql = @"select UnitOrMajor,ReType,  Remarks from Report_Construction_Plan  with(nolock) 
                             where  ReportId='" + ReportId + "' ";
                     DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                     return dt;
@@ -2941,7 +2955,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 string strSql = @"select ApprovalDate,
                                 ProjectId,
                                 UnitId,
-                               CompileDate from Comprehensive_GeneralPlanApproval  
+                               CompileDate from Comprehensive_GeneralPlanApproval with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3040,7 +3054,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 string strSql = @"select ApprovalDate,
                                 ProjectId,
                                 UnitId,IsReview,
-                               CompileDate from Comprehensive_MajorPlanApproval  
+                               CompileDate from Comprehensive_MajorPlanApproval with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3134,7 +3148,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 string strSql = @"select ApprovalDate,
                                 ProjectId,
                                 CNProfessionalId,
-                               CreateDate from Inspection_Test_Plan  
+                               CreateDate from Inspection_Test_Plan with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3230,7 +3244,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 string strSql = @"select Status,
                                 ProjectId,
                                 CNProfessionalId,
-                               CompileDate from Comprehensive_DesignDetails  
+                               CompileDate from Comprehensive_DesignDetails with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3324,7 +3338,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 string strSql = @"select Status,
                                 ProjectId,
                                 CNProfessionalId,
-                               ReviewDate from Comprehensive_ReviewDrawings  
+                               ReviewDate from Comprehensive_ReviewDrawings with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3405,7 +3419,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 string strSql = @"select ImplementationFrontState,
                                 ProjectId,
                                 CNProfessionalId,
-                               IssuedDate,ApprovalDate from Comprehensive_DesignChangeOrder  
+                               IssuedDate,ApprovalDate from Comprehensive_DesignChangeOrder with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3514,8 +3528,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
                 string strSql = @"select  InspectionPersonId,UnitId,ApprovalTime,ProfessionalName,PostName
-                                     from Comprehensive_InspectionPerson a left join Base_CNProfessional b on a.CNProfessionalId=b.CNProfessionalId
-                                     left join Base_Post c on a.PostId=c.PostId
+                                     from Comprehensive_InspectionPerson a with(nolock)
+                                    left join Base_CNProfessional b with(nolock) on a.CNProfessionalId=b.CNProfessionalId
+                                     left join Base_Post c with(nolock) on a.PostId=c.PostId
                             where  a.ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3858,7 +3873,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
 
                 string strSql = @"select UnitId,ProfessionalName,MonthQuantity,TotalQuantity,MonthRate,TotalRate 
-	                                from ProcessControl_NondestructiveTest_New
+	                                from ProcessControl_NondestructiveTest_New with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' and  CreateDate >='" + startDate + "' and  CreateDate <='" + endDate + "'";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -3973,7 +3988,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
 
                 string strSql = @"select UnitId,InspectionDate,SamplingResult
-	                                from Comprehensive_InspectionEquipment
+	                                from Comprehensive_InspectionEquipment with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4067,7 +4082,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             {
                 if (objType == "1")
                 {
-                    string strSql = @"select ContentName,ReType,  Remarks from Report_CQMS_MonthReportItem  
+                    string strSql = @"select ContentName,ReType,  Remarks from Report_CQMS_MonthReportItem with(nolock)  
                             where  ReportId='" + ReportId + "' ";
                     DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                     return dt;
@@ -4087,7 +4102,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59"));
 
                 string strSql = @"select UnitId,InspectionDate
-	                                from Comprehensive_InspectionMachine
+	                                from Comprehensive_InspectionMachine with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "' and InspectionType='计量'";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4142,6 +4157,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                            select new
                            {
                                c.InspectionDate,
+                               c.CompileDate,
                                c.ProjectId,
                                u.UnitId,
                                u.UnitName,
@@ -4154,14 +4170,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             select new
                             {
                                 x.InspectionDate,
+                                x.CompileDate,
                                 x.ProjectId,
                                 x.UnitId,
                                 x.UnitName,
                                 x.IsOnceQualified
                             };
                 var AllList = query.ToList();
+                //var monethCount = query
+                //    .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
                 var monethCount = query
-                    .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
+                                  .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
 
 
                 Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
@@ -4170,8 +4189,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 checkStatisc.WorkName = item.UnitName;
                 checkStatisc.CheckNum = monethCount.Count();
                 checkStatisc.TotalCheckNum = AllList.Count();
-                checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == true);
+                checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true);
 
                 if (checkStatisc.CheckNum != 0)//被除数不能为零
                 {
@@ -4248,7 +4267,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  UnitId,IsOnceQualified, InspectionDate from View_CQMS_InspectionManagementDetail 
+                string strSql = @"select  UnitId,IsOnceQualified, InspectionDate, CompileDate from View_MonthReport_InspectionManagement 
                             where   ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4302,8 +4321,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
 
-                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
 
                     if (checkStatisc.CheckNum != 0)//被除数不能为零
                     {
@@ -4494,10 +4513,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         {
             return await Task.Run(() =>
             {
-
-                string strSql = @"select  a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate from View_MonthReport_InspectionManagement a
-                                    left join WBS_UnitWork b on a.UnitWorkId =b.UnitWorkId
-                                    left join Base_CNProfessional c on a.CNProfessionalId= c.CNProfessionalId
+                string strSql = @"select  a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate,CompileDate 
+from View_MonthReport_InspectionManagement a with(nolock) 
+        left join WBS_UnitWork b with(nolock) on a.UnitWorkId =b.UnitWorkId 
+        left join Base_CNProfessional c with(nolock) on a.CNProfessionalId= c.CNProfessionalId 
                             where  a.ProjectId='" + this.CurrUser.LoginProjectId + "'  order by  cNProfessionalCode,UnitWorkName";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4585,7 +4604,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  UnitId, PressurePipeNumber,ActualNumber, ReportTime from Comprehensive_PressurePipe
+                string strSql = @"select  UnitId, PressurePipeNumber,ActualNumber, ReportTime from Comprehensive_PressurePipe with(nolock) 
                             where  Projctid='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4674,7 +4693,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         {
             return await Task.Run(() =>
             {
-                string strSql = @"select  UnitId, PackageNumber,IssuedReportNumber, ReportTime from Comprehensive_PressurePipe
+                string strSql = @"select  UnitId, PackageNumber,IssuedReportNumber, ReportTime from Comprehensive_PressurePipe with(nolock) 
                             where  Projctid='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4761,7 +4780,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  UnitId, SunNumber,MonitoringReportNumber, ReportTime from Comprehensive_SpecialEquipment
+                string strSql = @"select  UnitId, SunNumber,MonitoringReportNumber, ReportTime from Comprehensive_SpecialEquipment with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4873,7 +4892,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select ReceiveUnit,ImplementationFrontState, IssuedDate from Comprehensive_NCRManagement
+                string strSql = @"select ReceiveUnit,ImplementationFrontState, IssuedDate from Comprehensive_NCRManagement with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4977,7 +4996,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select UnitId,State, CheckDate from Check_CheckControl
+                string strSql = @"select UnitId,State, CheckDate from Check_CheckControl with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -5054,7 +5073,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  CheckType, CheckDate from Check_JointCheck
+                string strSql = @"select  CheckType, CheckDate from Check_JointCheck with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -5149,7 +5168,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  SendUnit, ReceiveDate ,IsReply,RetrunWuhuangCopies from Comprehensive_DataReceivingDoc
+                string strSql = @"select  SendUnit, ReceiveDate ,IsReply,RetrunWuhuangCopies from Comprehensive_DataReceivingDoc with(nolock) 
                             where  ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -7167,5 +7186,37 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         {
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
+
+
+        //<summary>
+        //获取检查类别
+        //</summary>
+        //<param name="state"></param>
+        //<returns></returns>
+        protected string ConvertJointCheckType(string CheckType)
+        {
+            if (!string.IsNullOrWhiteSpace(CheckType))
+            {
+                string checkType = CheckType.ToString();
+                if (checkType == "1")
+                {
+                    return "周检查";
+                }
+                else if (checkType == "2")
+                {
+                    return "月检查";
+                }
+                else if (checkType == "3")
+                {
+                    return "不定期检查";
+                }
+                else if (checkType == "4")
+                {
+                    return "专业检查";
+                }
+            }
+            return CheckType;
+        }
+
     }
 }

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs

@@ -664,8 +664,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     checkStatisc.WorkName = ins.UnitWorkName;
                     checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
-                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
                     StatisticsList.Add(checkStatisc);
                 }
             }

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs

@@ -1576,8 +1576,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     checkStatisc.WorkName = ins.UnitWorkName;
                     checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
-                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
                     StatisticsList.Add(checkStatisc);
                 }
             }

SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs

@@ -289,7 +289,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     #endregion
 
                     //加载所有grid
-                   // lodAllGrid("1");
+                    // lodAllGrid("1");
                     objType = "1";
                     RegisterAsyncTask(new PageAsyncTask(lodAllGrid));
                 }
@@ -324,11 +324,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// 加载grid
         /// </summary>
         /// <param name="objType"></param>
-        async Task   lodAllGrid()
+        async Task lodAllGrid()
         {
             DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
             DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
             var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            var units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)).ToList();
             var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
 
             var remarks = loadRemarksDt();
@@ -433,7 +434,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     }
                 }
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
 
                     Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
@@ -501,7 +502,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
 
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
                     model.Id = Guid.NewGuid().ToString();
@@ -1312,7 +1313,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                 }
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -1425,7 +1426,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     string UnitWorkName = checkLotBindStatiscData.Rows[i]["UnitWorkName"].ToString();
                     string cNProfessionalCode = checkLotBindStatiscData.Rows[i]["cNProfessionalCode"].ToString();
                     string IsOnceQualified = checkLotBindStatiscData.Rows[i]["IsOnceQualified"].ToString();
-                    DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
+                    //DateTime? InspectionDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["InspectionDate"].ToString());
+                    DateTime? CompileDate = Funs.GetNewDateTime(checkLotBindStatiscData.Rows[i]["CompileDate"].ToString());
 
                     if (tempCV != cNProfessionalCode || tempArea != UnitWorkName)
                     {
@@ -1448,7 +1450,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                         }
                     }
-                    if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
                     {
                         checkStatisc.CheckNum += 1;
                         if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
@@ -1456,6 +1458,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             checkStatisc.OKNum += 1;
                         }
                     }
+                    //if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    //{
+                    //    checkStatisc.CheckNum += 1;
+                    //    if (IsOnceQualified == "1" || IsOnceQualified == "True" || IsOnceQualified == "true")
+                    //    {
+                    //        checkStatisc.OKNum += 1;
+                    //    }
+                    //}
 
                     checkStatisc.TotalCheckNum += 1;
                     if (IsOnceQualified == "1")
@@ -1896,7 +1906,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 {
                     string UnitId = row["UnitId"].ToString();
                     string IsOnceQualified = row["IsOnceQualified"].ToString();
-                    DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
+                    //DateTime? InspectionDate = Funs.GetNewDateTime(row["InspectionDate"].ToString());
+                    DateTime? CompileDate = Funs.GetNewDateTime(row["CompileDate"].ToString());
                     if (!Quantity1Dic.ContainsKey(UnitId))
                     {
                         Quantity1Dic.Add(UnitId, 0);
@@ -1913,27 +1924,31 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     {
                         Quantity4Dic.Add(UnitId, 0);
                     }
-                    if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    if (CompileDate.HasValue && CompileDate.Value >= startDate && CompileDate.Value <= endDate)
                     {
                         Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
-                        if (IsOnceQualified == "1")
+                        if (IsOnceQualified == "1" || IsOnceQualified == "True")
                         {
                             Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
                         }
                     }
+                    //if (InspectionDate.HasValue && InspectionDate.Value >= startDate && InspectionDate.Value <= endDate)
+                    //{
+                    //    Quantity1Dic[UnitId] = Quantity1Dic[UnitId] + 1;
+                    //    if (IsOnceQualified == "1" || IsOnceQualified == "True")
+                    //    {
+                    //        Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + 1;
+                    //    }
+                    //}
                     Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + 1;
-                    if (IsOnceQualified == "1")
+                    if (IsOnceQualified == "1" || IsOnceQualified == "True")
                     {
                         Quantity4Dic[UnitId] = Quantity4Dic[UnitId] + 1;
                     }
                 }
 
-
-
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
-
-
                     Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
                     checkStatisc.Id = Guid.NewGuid().ToString();
                     checkStatisc.ReportId = ReportId;
@@ -1976,8 +1991,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     OKNum += checkStatisc.OKNum;
                     TotalOKNum += checkStatisc.TotalOKNum;
-
-
                 }
 
                 gvInspectionDataInspection.DataSource = list;
@@ -2054,7 +2067,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber;
 
                 }
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -2130,10 +2143,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber;
 
                 }
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
-
-
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
                     model.ContentName = item.UnitName;
@@ -2210,7 +2221,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber;
 
                 }
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -2306,6 +2317,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 foreach (var item in units)
                 {
+                    if (item.UnitId == Const.UnitId_CWCEC)
+                    {
+                        continue;
+                    }
                     Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
                     NCRStatisc.Id = Guid.NewGuid().ToString();
                     NCRStatisc.WorkName = item.UnitName;
@@ -2400,9 +2415,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                 }
 
-                foreach (var item in units21)
+                foreach (var item in units22)
                 {
-
                     var ClosedCount = 0;
                     Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                     model.Id = Guid.NewGuid().ToString();
@@ -2475,6 +2489,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 {
                     string CheckType = row["CheckType"].ToString();
                     DateTime? CheckDate = Funs.GetNewDateTime(row["CheckDate"].ToString());
+                    string CheckTypeName = ConvertJointCheckType(CheckType);
 
                     if (!Quantity1Dic.ContainsKey(CheckType))
                     {
@@ -2681,7 +2696,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //loadReviewDrawings(objType);
 
             //6 加载设计变更管理情况
-           // loadDesignChangeOrder();
+            // loadDesignChangeOrder();
 
             //7.1 加载合格焊工管理情况
             //loadPassWelder();
@@ -2690,27 +2705,27 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //loadProcessControl_NondestructiveTest_New();
 
             //8 设备报验管理Grid11
-           // LoadInspectionEquipment(objType);
+            // LoadInspectionEquipment(objType);
 
             //加载9.计量器具报验管理情况
             //loadMeasuringInspection(objType);
             //加载10.现场质量共检数据
-           // loadInspectionDataInspection(objType);
+            // loadInspectionDataInspection(objType);
             //加载11.压力管道监检情况
-           // loadPressureInspection(objType);
+            // loadPressureInspection(objType);
             //加载12.管道试压包管理情况
-           // loadPipingInspection(objType);
+            // loadPipingInspection(objType);
             //加载13.特种设备监检情况
-           // loadSpecialInspection(objType);
+            // loadSpecialInspection(objType);
             ////加载14.NCR管理情况
-           // loadNcrManagementInspection(objType);
+            // loadNcrManagementInspection(objType);
 
             //加载15.质量巡检情况
-          //  loadQualityInspection(objType);
+            //  loadQualityInspection(objType);
             //加载16.质量专项检查情况
-           // loadSpecialCheck(objType);
+            // loadSpecialCheck(objType);
             //加载17.质量文件上报情况
-           // loadFileReport(objType);
+            // loadFileReport(objType);
         }
         #endregion
 
@@ -4111,6 +4126,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                            select new
                            {
                                c.CheckDate,
+                               c.InspectionDate,
+                               c.CompileDate,
                                c.ProjectId,
                                u.UnitId,
                                u.UnitName,
@@ -4123,14 +4140,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             select new
                             {
                                 x.CheckDate,
+                                x.InspectionDate,
+                                x.CompileDate,
                                 x.ProjectId,
                                 x.UnitId,
                                 x.UnitName,
                                 x.IsOnceQualified
                             };
                 var AllList = query.ToList();
+                //var monethCount = query
+                //    .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
+
                 var monethCount = query
-                    .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
+                    .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
 
 
                 Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
@@ -4138,9 +4160,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 checkStatisc.ReportId = ReportId;
                 checkStatisc.WorkName = item.UnitName;
                 checkStatisc.CheckNum = monethCount.Count();
-                checkStatisc.TotalCheckNum = AllList.Count(); 
-                checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                checkStatisc.TotalCheckNum = AllList.Count();
+                checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == true);
+                checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true);
 
                 if (checkStatisc.CheckNum != 0)//被除数不能为零
                 {
@@ -4213,7 +4235,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  UnitId,IsOnceQualified, InspectionDate from View_CQMS_InspectionManagementDetail 
+                string strSql = @"select  UnitId,IsOnceQualified, InspectionDate,CompileDate from View_MonthReport_InspectionManagement 
                             where   ProjectId='" + this.CurrUser.LoginProjectId + "'  ";
                 DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
                 return dt;
@@ -4266,8 +4288,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
                     checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
 
-                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
-                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                    checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
+                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true);
 
                     if (checkStatisc.CheckNum != 0)//被除数不能为零
                     {
@@ -4457,7 +4479,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return await Task.Run(() =>
             {
 
-                string strSql = @"select  a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate from View_MonthReport_InspectionManagement a
+                string strSql = @"select  a.UnitWorkId,UnitWorkName,cNProfessionalCode,IsOnceQualified,InspectionDate,CompileDate from View_MonthReport_InspectionManagement a
                                     left join WBS_UnitWork b on a.UnitWorkId =b.UnitWorkId
                                     left join Base_CNProfessional c on a.CNProfessionalId= c.CNProfessionalId
                             where  a.ProjectId='" + this.CurrUser.LoginProjectId + "'  order by  cNProfessionalCode,UnitWorkName";
@@ -5738,10 +5760,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             ////保存23.施工照片
             //saveImages();
 
-          
+
             #endregion
 
-           
+
         }
         #endregion
 
@@ -5776,9 +5798,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             {
                 try
                 {
-                    var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId).ToList(); 
+                    var result = db.Report_CqmsTarget.Where(a => a.ReportId == ReportId).ToList();
                     db.Report_CqmsTarget.DeleteAllOnSubmit(result);
-                       // CqmsTargetService.Delete(ReportId);
+                    // CqmsTargetService.Delete(ReportId);
                     db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
                     db.SubmitChanges();
                 }
@@ -6161,9 +6183,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             #endregion
             try
             {
-                var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList(); 
+                var result = db.Report_TextBoxContent.Where(a => a.ReportId == ReportId).ToList();
                 db.Report_TextBoxContent.DeleteAllOnSubmit(result);
-                  //  TextBoxContentService.Delete(ReportId);
+                //  TextBoxContentService.Delete(ReportId);
                 db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
                 db.SubmitChanges();
 
@@ -7107,5 +7129,36 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         {
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
+
+        //<summary>
+        //获取检查类别
+        //</summary>
+        //<param name="state"></param>
+        //<returns></returns>
+        protected string ConvertJointCheckType(string CheckType)
+        {
+            if (!string.IsNullOrWhiteSpace(CheckType))
+            {
+                string checkType = CheckType.ToString();
+                if (checkType == "1")
+                {
+                    return "周检查";
+                }
+                else if (checkType == "2")
+                {
+                    return "月检查";
+                }
+                else if (checkType == "3")
+                {
+                    return "不定期检查";
+                }
+                else if (checkType == "4")
+                {
+                    return "专业检查";
+                }
+            }
+            return CheckType;
+        }
+
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx

@@ -22,18 +22,26 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
+                                <f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" LabelWidth="110px">
                                 </f:DropDownList>
-                                <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
+                                <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px" Width="180px">
                                 </f:DropDownList>
                                 <f:DatePicker runat="server" Label="验收日期" ID="txtStarTime" LabelAlign="Right"
-                                    LabelWidth="100px" Width="220px">
+                                    LabelWidth="90px" Width="200px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
                                     Width="110px">
                                 </f:DatePicker>
+                                <f:DatePicker runat="server" Label="创建日期" ID="txtCompileDateS" LabelAlign="Right"
+                                    LabelWidth="90px" Width="200px">
+                                </f:DatePicker>
+                                <f:Label ID="Label2" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtCompileDateE" LabelAlign="Right" LabelWidth="80px"
+                                    Width="110px">
+                                </f:DatePicker>
                                 <f:Button ID="btnSearch" Icon="SystemSearch"
                                     EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
                                 </f:Button>
@@ -82,6 +90,9 @@
                         <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" SortField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="验收日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="创建日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
                                 <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs

@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         public void BindGrid()
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append("SELECT P.InspectionId,P.ProjectId,P.UnitId,P.CNProfessionalId,P.UnitWorkId,U.UnitName,C.ProfessionalName,P.NoticeCode,UnitWork.UnitWorkName,DP.DivisionName AS Branch,BP.BreakdownName AS ControlPointType,BP.Class,P.AcceptanceSite,P.AcceptanceCheckMan,(CASE WHEN IsOnceQualified='False' THEN '否' ELSE '是' END)AS IsOnceQualified,P.InspectionCode,P.InspectionDate ");
+            sb.Append("SELECT P.InspectionId,P.ProjectId,P.UnitId,P.CNProfessionalId,P.UnitWorkId,U.UnitName,C.ProfessionalName,P.NoticeCode,UnitWork.UnitWorkName,DP.DivisionName AS Branch,BP.BreakdownName AS ControlPointType,BP.Class,P.AcceptanceSite,P.AcceptanceCheckMan,(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,P.InspectionCode,P.InspectionDate,P.CompileDate ");
             sb.Append("FROM ProcessControl_InspectionManagement AS P ");
             sb.Append("LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId ");
             sb.Append("LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId ");
@@ -68,6 +68,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     listStr.Add(new SqlParameter("@endTime", endTime));
                 }
             }
+            if (!string.IsNullOrEmpty(txtCompileDateS.Text.Trim()))
+            {
+                sb.Append("AND P.CompileDate >= @CompileDateS ");
+                listStr.Add(new SqlParameter("@CompileDateS", Funs.GetNewDateTime(txtCompileDateS.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtCompileDateE.Text.Trim()))
+            {
+                sb.Append("AND P.CompileDate <= @CompileDateE ");
+                listStr.Add(new SqlParameter("@CompileDateE", Funs.GetNewDateTime(txtCompileDateE.Text.Trim())));
+            }
             sb.Append("ORDER BY P.NoticeCode DESC ");
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
@@ -349,7 +359,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
 
                     cell = row.CreateCell(5);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.IsOnceQualified == false ? "否" : "是");//是否一次合格
+                    cell.SetCellValue(item.IsOnceQualified == true ? "是" : "否");//是否一次合格
 
                     cell = row.CreateCell(6);
                     cell.CellStyle = cellStyle;

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl {
-    
-    
-    public partial class InspectionManagement {
-        
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class InspectionManagement
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpCNProfessional 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessional;
-        
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -101,7 +103,34 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
+        /// <summary>
+        /// txtCompileDateS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDateS;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label2;
+
+        /// <summary>
+        /// txtCompileDateE 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDateE;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx

@@ -38,8 +38,8 @@
                 <f:FormRow>
                     <Items>
                         <f:RadioButtonList ID="rblIsOnceQualified" runat="server" Label="是否一次合格" LabelAlign="Right" LabelWidth="130px" AutoPostBack="true" OnSelectedIndexChanged="rblIsOnceQualified_SelectedIndexChanged">
-                            <f:RadioItem Value="True" Text="是" Selected="true" />
-                            <f:RadioItem Value="False" Text="否" />
+                            <f:RadioItem Value="True" Text="是"  />
+                            <f:RadioItem Value="False" Text="否" Selected="true" />
                         </f:RadioButtonList>
                         <f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true"></f:DatePicker>
                     </Items>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs

@@ -120,9 +120,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                                 else
                                 {
                                     //统计所给事件段的全部数量
-                                    managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, false);
+                                    managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NextDate, false);
                                     //统计所给事件段的合格数量
-                                    managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NewDate, true);
+                                    managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(this.CurrUser.LoginProjectId, StartDate, NextDate, true);
                                 }
                                 Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NextDate);
                                 Statistics.SunNumber = managementListSunNumber.Count();

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx

@@ -24,16 +24,24 @@
                             <Items>
                                 <f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" LabelWidth="110px">
                                 </f:DropDownList>
-                                <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="110px">
+                                <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px" Width="180px">
                                 </f:DropDownList>
                                 <f:DatePicker runat="server" Label="验收日期" ID="txtStarTime" LabelAlign="Right"
-                                    LabelWidth="100px" Width="220px">
+                                    LabelWidth="90px" Width="200px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
                                     Width="110px">
                                 </f:DatePicker>
+                                <f:DatePicker runat="server" Label="创建日期" ID="txtCompileDateS" LabelAlign="Right"
+                                    LabelWidth="90px" Width="200px">
+                                </f:DatePicker>
+                                <f:Label ID="Label2" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtCompileDateE" LabelAlign="Right" LabelWidth="80px"
+                                    Width="110px">
+                                </f:DatePicker>
                                 <f:Button ID="btnSearch" Icon="SystemSearch"
                                     EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
                                 </f:Button>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs

@@ -188,6 +188,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 sb.Append("AND P.InspectionDate <= @endTime ");
                 listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(txtCompileDateS.Text.Trim()))
+            {
+                sb.Append("AND P.CompileDate >= @CompileDateS ");
+                listStr.Add(new SqlParameter("@CompileDateS", Funs.GetNewDateTime(txtCompileDateS.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtCompileDateE.Text.Trim()))
+            {
+                sb.Append("AND P.CompileDate <= @CompileDateE ");
+                listStr.Add(new SqlParameter("@CompileDateE", Funs.GetNewDateTime(txtCompileDateE.Text.Trim())));
+            }
             sb.Append("ORDER BY P.NoticeCode DESC ");
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl {
-    
-    
-    public partial class InspectionNotice {
-        
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class InspectionNotice
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpCNProfessional 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessional;
-        
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -101,7 +103,34 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
+        /// <summary>
+        /// txtCompileDateS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDateS;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label2;
+
+        /// <summary>
+        /// txtCompileDateE 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDateE;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDel;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuCopy 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx

@@ -35,6 +35,8 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
@@ -91,6 +93,10 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="800px" Height="500px">
         </f:Window>
+        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="700px" Height="560px">
+        </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs

@@ -197,6 +197,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     this.btnNew.Hidden = false;
+                    this.btnImport.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -215,6 +216,18 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         }
         #endregion
 
+        #region 导入
+        /// <summary>
+        /// 导入按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("TestPackageManagementDataIn.aspx", "导入 - ")));
+        }
+        #endregion
+
         #region 导出按钮
         /// 导出按钮
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl {
-    
-    
-    public partial class TestPackageManagement {
-        
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class TestPackageManagement
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// drpUnitWork 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWork;
-        
+
         /// <summary>
         /// drpCompletedState 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCompletedState;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +148,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx

@@ -0,0 +1,68 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageManagementDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProcessControl.TestPackageManagementDataIn" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click" Text="下载模板">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="管道试压包管理" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs

@@ -0,0 +1,439 @@
+using BLL;
+using FineUIPro.Web.DataShow;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+    public partial class TestPackageManagementDataIn : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+            }
+        }
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties='Excel 8.0;HDR=Yes;IMEX=1;'";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 8);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
+        {
+            string result = string.Empty;
+            errorInfos.Clear();
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var unitWorks = UnitWorkService.GetUnitWorkByProjectId(this.CurrUser.LoginProjectId);
+                for (int i = 0; i < ir; i++)
+                {
+                    string code = pds.Rows[i][0].ToString();
+                    string unitWorkName = pds.Rows[i][1].ToString().Trim();
+                    string testMedium = pds.Rows[i][2].ToString();
+                    string testPressure = pds.Rows[i][3].ToString();
+                    string planTestDate = pds.Rows[i][4].ToString();
+                    string completedDate = pds.Rows[i][5].ToString();
+                    string completedState = pds.Rows[i][6].ToString();
+                    string remark = pds.Rows[i][7].ToString();
+
+                    if (string.IsNullOrEmpty(code))
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试压包编号", Reason = "此项为必填项！" });
+                    }
+                    else
+                    {
+                        var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementCode == code);
+                        if (q != null)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试压包编号", Reason = $"试压包编号（{code}）已存在！" });
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(unitWorkName))
+                    {
+                        var isExistUnitWork = unitWorks.Where(x => x.UnitWorkName == unitWorkName);
+                        if (!isExistUnitWork.Any())
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "单位工程名称", Reason = $"不存在{unitWorkName}！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "单位工程名称", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrWhiteSpace(planTestDate))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(planTestDate);
+                        }
+                        catch (Exception)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "不是日期格式！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrWhiteSpace(completedDate))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(completedDate);
+                        }
+                        catch (Exception)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试验完成日期", Reason = "不是日期格式！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "试验完成日期", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrWhiteSpace(completedState))
+                    {
+                        if (completedState != "已完成" && completedState != "未完成")
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "完成状态", Reason = $"不存在{completedState}！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "完成状态", Reason = "此项为必填项！" });
+                    }
+                }
+
+                if (errorInfos.Count > 0)
+                {
+                    this.gvErrorInfo.DataSource = errorInfos;
+                    this.gvErrorInfo.DataBind();
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties='Excel 8.0;HDR=Yes;IMEX=1;'";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 8);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var unitWorks = UnitWorkService.GetUnitWorkByProjectId(this.CurrUser.LoginProjectId);
+                List<Model.ProcessControl_TestPackageManagement> list = new List<Model.ProcessControl_TestPackageManagement>();
+                for (int i = 0; i < ir; i++)
+                {
+                    string code = pds.Rows[i][0].ToString();
+                    string unitWorkName = pds.Rows[i][1].ToString().Trim();
+                    string testMedium = pds.Rows[i][2].ToString();
+                    string testPressure = pds.Rows[i][3].ToString();
+                    string planTestDate = pds.Rows[i][4].ToString();
+                    string completedDate = pds.Rows[i][5].ToString();
+                    string completedState = pds.Rows[i][6].ToString();
+                    string remark = pds.Rows[i][7].ToString();
+
+                    Model.ProcessControl_TestPackageManagement model = new Model.ProcessControl_TestPackageManagement();
+                    model.TestPackageManagementId = SQLHelper.GetNewID(typeof(Model.ProcessControl_TestPackageManagement));
+                    model.ProjectId = this.CurrUser.LoginProjectId;
+
+                    model.TestPackageManagementCode = code;
+                    model.UnitWorkId = unitWorks.Where(x => x.UnitWorkName == unitWorkName).FirstOrDefault().UnitWorkId;
+                    model.TestMedium = testMedium.Trim();
+                    model.TestPressure = testPressure.Trim();
+                    model.PlanTestDate = Convert.ToDateTime(planTestDate);
+                    model.CompletedDate = Convert.ToDateTime(completedDate);
+                    model.CompletedState = completedState == "已完成" ? "1" : "2";
+                    model.Remark = remark;
+                    list.Add(model);
+                }
+                if (list.Count > 0)
+                {
+                    Funs.DB.ProcessControl_TestPackageManagement.InsertAllOnSubmit(list);
+                    Funs.DB.SubmitChanges();
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\管道试压包管理导入模板.xls";
+                string filePath = "File\\Excel\\DataIn\\管道试压包管理导入模板.xls";
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+    }
+}

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.designer.cs

@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class TestPackageManagementDataIn
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+    }
+}

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementEdit.aspx.cs

@@ -1,10 +1,11 @@
 using BLL;
+using Model;
 using System;
 using System.Linq;
 
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
-    public partial class TestPackageManagementEdit :PageBase
+    public partial class TestPackageManagementEdit : PageBase
     {
         #region 定义变量
         /// <summary>
@@ -72,14 +73,41 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (this.drpUnitWork.SelectedValue==BLL.Const._Null)
+            if (this.drpUnitWork.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("请选择单位工程名称！", MessageBoxIcon.Warning);
                 return;
             }
+            string code = this.txtTestPackageManagementCode.Text.Trim();
+            if (string.IsNullOrWhiteSpace(code))
+            {
+                Alert.ShowInTop("请填写试压包编号！", MessageBoxIcon.Warning);
+                return;
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(this.TestPackageManagementId))
+                {
+                    var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementCode == code);
+                    if (q != null)
+                    {
+                        Alert.ShowInTop("试压包编号已存在！", MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+                else
+                {
+                    var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementId !=this.TestPackageManagementId && x.TestPackageManagementCode == code);
+                    if (q != null)
+                    {
+                        Alert.ShowInTop("试压包编号已存在！", MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+            }
             Model.ProcessControl_TestPackageManagement testPackageManagement = new Model.ProcessControl_TestPackageManagement();
             testPackageManagement.ProjectId = this.CurrUser.LoginProjectId;
-            testPackageManagement.TestPackageManagementCode = this.txtTestPackageManagementCode.Text.Trim();
+            testPackageManagement.TestPackageManagementCode = code;
             if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
             {
                 testPackageManagement.UnitWorkId = this.drpUnitWork.SelectedValue;

SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx

@@ -218,6 +218,6 @@
             showImg();
         })
     </script>
-    <script src="../../res/js/hook.js" type="text/javascript"></script>
+    <%--<script src="../../res/js/hook.js" type="text/javascript"></script>--%>
 </body>
 </html>

SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx

@@ -33,6 +33,14 @@
                                 </f:Label>
                                 <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
                                     Width="130px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" Label="创建日期" ID="txtCompileDateS" LabelAlign="Right"
+                                    LabelWidth="90px" Width="200px">
+                                </f:DatePicker>
+                                <f:Label ID="Label4" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtCompileDateE" LabelAlign="Right" LabelWidth="80px"
+                                    Width="110px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
                                  <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">

SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs

@@ -166,6 +166,8 @@ namespace FineUIPro.Web.DataShow
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
+                var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
+                var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
                 var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
                 if (datetime1.HasValue)
                 {
@@ -173,7 +175,15 @@ namespace FineUIPro.Web.DataShow
                 }
                 if (datetime2.HasValue)
                 {
-                    getT = getT.Where(x => x.InspectionDate <= datetime2);
+                    getT = getT.Where(x =>  x.InspectionDate <= datetime2);
+                }
+                if (datetime3.HasValue)
+                {
+                    getT = getT.Where(x => x.CompileDate >= datetime3);
+                }
+                if (datetime4.HasValue)
+                {
+                    getT = getT.Where(x =>  x.CompileDate <= datetime4);
                 }
 
                 cout1 = getT.Count();
@@ -188,14 +198,24 @@ namespace FineUIPro.Web.DataShow
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
-                var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
+                var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
+                var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
+                var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
                 if (datetime1.HasValue)
                 {
                     getT = getT.Where(x => x.InspectionDate >= datetime1);
                 }
                 if (datetime2.HasValue)
                 {
-                    getT = getT.Where(x => x.InspectionDate <= datetime2);
+                    getT = getT.Where(x =>  x.InspectionDate <= datetime2);
+                }
+                if (datetime3.HasValue)
+                {
+                    getT = getT.Where(x => x.CompileDate >= datetime3);
+                }
+                if (datetime4.HasValue)
+                {
+                    getT = getT.Where(x => x.CompileDate <= datetime4);
                 }
 
                 cout1 = getT.Count();
@@ -210,17 +230,27 @@ namespace FineUIPro.Web.DataShow
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
+                var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
+                var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
                 var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
 
                 if (datetime1.HasValue)
                 {
-                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                    getALL = getALL.Where(x => x.InspectionDate >= datetime1);
                 }
                 if (datetime2.HasValue)
                 {
-                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                    getALL = getALL.Where(x => x.InspectionDate >= datetime1);
                 }
-                var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                if (datetime3.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CompileDate >= datetime3);
+                }
+                if (datetime4.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CompileDate <= datetime4);
+                }
+                var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
                 int coutall = getALL.Count();
                 int cout0 = getT.Count();
                 if (coutall > 0)

SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.DataShow {
-    
-    
-    public partial class InspectionManagement {
-        
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class InspectionManagement
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpProject 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject;
-        
+
         /// <summary>
         /// txtStartTime 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartTime;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label3;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -92,7 +94,34 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
+        /// <summary>
+        /// txtCompileDateS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDateS;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label4;
+
+        /// <summary>
+        /// txtCompileDateE 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDateE;
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// labNumber 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labNumber;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// Label5 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label5;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +211,7 @@ namespace FineUIPro.Web.DataShow {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnView 控件。
         /// </summary>

SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs

@@ -53,7 +53,7 @@ namespace FineUIPro.Web.DataShow
                                     BP.Class,
                                     P.AcceptanceSite,
                                     P.AcceptanceCheckMan,
-                                    (CASE WHEN IsOnceQualified='Flase' THEN '否' ELSE '是' END)AS IsOnceQualified,
+                                    (CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,
                                     P.InspectionCode,
                                     P.InspectionDate"
                             + @" FROM ProcessControl_InspectionManagementDetail AS D"

SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs

@@ -162,7 +162,7 @@ namespace FineUIPro.Web.DataShow
             int cout1 = 0;
             if (projectId != null)
             {
-                var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
                 cout1 = getT.Count();
             }
             return cout1;
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.DataShow
             if (projectId != null)
             {
                 var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
-                var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
                 cout1 = getT1.Count() - getT2.Count();
             }
             return cout1;
@@ -196,7 +196,7 @@ namespace FineUIPro.Web.DataShow
             if (projectId != null)
             {
                 var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
-                var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
+                var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true);
                 if (getT1.Count() > 0)
                 {
                     rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();

SGGL/FineUIPro.Web/DataShowLocal/InspectionManagementStatisc.aspx.cs

@@ -185,7 +185,7 @@ namespace FineUIPro.Web.DataShowLocal
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var getD1 = from x in Funs.DB.View_CQMS_InspectionManagementDetail
-                            where x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                            where x.ProjectId == projectId.ToString() && x.IsOnceQualified == true
                             select x;
 
                 if (datetime1.HasValue)

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -635,6 +635,7 @@
     <Content Include="CQMS\ProcessControl\NondestructiveTestEdit.aspx" />
     <Content Include="CQMS\ProcessControl\NondestructiveTest_New.aspx" />
     <Content Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx" />
+    <Content Include="CQMS\ProcessControl\TestPackageManagementDataIn.aspx" />
     <Content Include="CQMS\ProcessControl\ShowUnitWork.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagement.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagementEdit.aspx" />
@@ -1551,6 +1552,7 @@
     <Content Include="JDGL\SGManPower\ManPowerWork.aspx" />
     <Content Include="JDGL\SGManPower\ManPowerWorkChart.aspx" />
     <Content Include="JDGL\SGManPower\ManPowerWorkGrid.aspx" />
+    <Content Include="JDGL\SGManPower\SGWarningDetails.aspx" />
     <Content Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx" />
     <Content Include="JDGL\WBSCompleteAndReal\WBSReport.aspx" />
     <Content Include="JDGL\WBSPlan\SeeDetailHistory.aspx" />
@@ -8925,6 +8927,13 @@
     <Compile Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx.designer.cs">
       <DependentUpon>NondestructiveTest_NewEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\ProcessControl\TestPackageManagementDataIn.aspx.cs">
+      <DependentUpon>TestPackageManagementDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\TestPackageManagementDataIn.aspx.designer.cs">
+      <DependentUpon>TestPackageManagementDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\ProcessControl\ShowUnitWork.aspx.cs">
       <DependentUpon>ShowUnitWork.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15039,6 +15048,13 @@
     <Compile Include="JDGL\SGManPower\ManPowerWorkGrid.aspx.designer.cs">
       <DependentUpon>ManPowerWorkGrid.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JDGL\SGManPower\SGWarningDetails.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>SGWarningDetails.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\SGWarningDetails.aspx.designer.cs">
+      <DependentUpon>SGWarningDetails.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx.cs">
       <DependentUpon>WBSCompleteAudit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx

@@ -0,0 +1,84 @@
+<%@ Page Language="C#" CodeBehind="SGWarningDetails.aspx.cs" Inherits="FineUIPro.Web.JDGL.SGManPower.SGWarningDetails" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>预警详情</title>
+</head>
+<body>
+<form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+        <Rows>
+
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lProject" runat="server" Label="项目" LabelWidth="150px">
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+            
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lUnit" runat="server" Label="单位" LabelWidth="150px">
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lUnitWork" runat="server" Label="装置" LabelWidth="150px">
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lWorkPost" runat="server" Label="岗位" LabelWidth="150px" >
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lPlanDate" runat="server" Label="时间" LabelAlign="Right" LabelWidth="150px">
+                    </f:Label>
+                </Items>
+            </f:FormRow>
+            
+            <%--<f:FormRow>
+                <Items>
+                    <f:Label ID="lVersion" runat="server" Label="计划版本" LabelAlign="Right" LabelWidth="150px"></f:Label>
+                </Items>
+            </f:FormRow>--%>
+
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lQuantity" runat="server" Label="计划人力" LabelAlign="Right" LabelWidth="150px"></f:Label>
+                </Items>
+            </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                    <f:Label ID="lNumber" runat="server" Label="实际人力" LabelAlign="Right" LabelWidth="150px"></f:Label>
+                </Items>
+            </f:FormRow>
+
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                    </f:ToolbarFill>
+                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+</form>
+</body>
+</html>

SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx.cs

@@ -0,0 +1,123 @@
+using BLL;
+using System;
+using System.Linq;
+
+
+namespace FineUIPro.Web.JDGL.SGManPower
+{
+    public partial class SGWarningDetails : PageBase
+    {
+        #region 定义项
+
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get { return (string)ViewState["ProjectId"]; }
+            set { ViewState["ProjectId"] = value; }
+        }
+
+        public string UnitId
+        {
+            get => (string)ViewState["UnitId"];
+            set => ViewState["UnitId"] = value;
+        }
+
+        public string UnitWorkId
+        {
+            get => (string)ViewState["UnitWorkId"];
+            set => ViewState["UnitWorkId"] = value;
+        }
+
+        public string WorkPostId
+        {
+            get => (string)ViewState["WorkPostId"];
+            set => ViewState["WorkPostId"] = value;
+        }
+        public string PlanDate
+        {
+            get => (string)ViewState["PlanDate"];
+            set => ViewState["PlanDate"] = value;
+        }
+
+        public string Quantity
+        {
+            get => (string)ViewState["Quantity"];
+            set => ViewState["Quantity"] = value;
+        }
+
+        public string Num
+        {
+            get => (string)ViewState["Num"];
+            set => ViewState["Num"] = value;
+        }
+
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.ProjectId = Request.Params["projectId"];
+                this.UnitId = Request.Params["unitId"];
+                this.UnitWorkId = Request.Params["unitWorkId"];
+                this.WorkPostId = Request.Params["workPostId"];
+                this.PlanDate = Request.Params["planDate"];
+                this.Quantity = Request.Params["quantity"];
+                this.Num = Request.Params["num"];
+                if (!string.IsNullOrEmpty(ProjectId))
+                {
+                    var project = BLL.ProjectService.GetProjectByProjectId(ProjectId); //项目
+                    if (project != null)
+                    {
+                        this.lProject.Text = project.ProjectName;
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(UnitId))
+                {
+                    var unit = BLL.UnitService.GetUnitByUnitId(UnitId); //单位
+                    if (unit != null)
+                    {
+                        this.lUnit.Text = unit.UnitName;
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(UnitWorkId))
+                {
+                    var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(UnitWorkId); //单位工程(装置)
+                    if (unitWork != null)
+                    {
+                        this.lUnitWork.Text = unitWork.UnitWorkName;
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(WorkPostId))
+                {
+                    var workPost = BLL.WorkPostService.GetWorkPostById(WorkPostId); //岗位
+                    if (workPost != null)
+                    {
+                        this.lWorkPost.Text = workPost.WorkPostName;
+                    }
+                }
+                
+                if (!string.IsNullOrEmpty(PlanDate))
+                {
+                    this.lPlanDate.Text = PlanDate;
+                }
+
+                if (!string.IsNullOrEmpty(Quantity))
+                {
+                    this.lQuantity.Text = Quantity;
+                }
+
+                if (!string.IsNullOrEmpty(Num))
+                {
+                    this.lNumber.Text = Num;
+                }
+            }
+        }
+    }
+}

SGGL/FineUIPro.Web/JDGL/SGManPower/SGWarningDetails.aspx.designer.cs

@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JDGL.SGManPower
+{
+
+
+    public partial class SGWarningDetails
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// lProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lProject;
+
+        /// <summary>
+        /// lUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lUnit;
+
+        /// <summary>
+        /// lUnitWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lUnitWork;
+
+        /// <summary>
+        /// lWorkPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lWorkPost;
+
+        /// <summary>
+        /// lPlanDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lPlanDate;
+
+        /// <summary>
+        /// lQuantity 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lQuantity;
+
+        /// <summary>
+        /// lNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lNumber;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}

SGGL/FineUIPro.Web/Login.aspx

@@ -14,20 +14,20 @@
             src="./images/login.png"
             style="height: 100%; left: 0px; top: 0px; bottom: 0px; position: absolute; display: none;" />--%>
         <img alt="" 
-            src="res/index/images/iconlogo.png"
+            src="res/index/images/iconlogo.png?v2"
             style="height: auto;width:300px; left: 100px; top: 60px; position: absolute;" />
         <div class="bi-flex-center-adapt-layout login-area"
             style="width: 23%; right: 10%; top: 0px; bottom: 0px; position: absolute;">
             <!-- <div class="bi-absolute-layout edit-area" height: 440px;-->
             <div class="bi-absolute-layout "
-                style="width: 100%; height: 420px; position: relative; flex-shrink: 0; margin: 0px;">
+                style="width: 100%; height: 430px; position: relative; flex-shrink: 0; margin: 0px;">
                 <div class="bi-horizon-auto-layout"
                     style="height: 100px; left: 0px; right: 0px; top: 30px; position: absolute;">
                     <div class="bi-flex-center-adapt-layout" style="position: relative; margin: 0px auto;">
                         <img
                             class="bi-single bi-img display-block"
-                            src="res/index/images/logo.png"
-                            style="width: auto; height: 50px; position: relative; flex-shrink: 0; margin: 0px 10px;">
+                            src="res/index/images/logo.png?v=2025"
+                            style="width: 90%; height: 60px; position: relative; flex-shrink: 0; margin: 0px 10px;">
                     </div>
                     <!-- <div class="bi-single bi-label dec-login-visual-title bi-text"
             style="height: 24px; line-height: 24px; text-align: center; white-space: nowrap; text-overflow: ellipsis; position: relative; margin: 5px auto 0px;">

SGGL/FineUIPro.Web/TestRun/FeedingTestRun.aspx

@@ -11,12 +11,18 @@
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" runat="server" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="投料试车管理" EnableCollapse="true"
+               <%-- <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="投料试车管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="FeedingTestRunId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="FeedingTestRunId" AllowSorting="true" SortField="Code"
                     SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick" Height="660px">
+                    <Toolbars>--%>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="投料试车管理" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="FeedingTestRunId" DataIDField="FeedingTestRunId" AllowSorting="true"
+                    SortField="Code" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" Height="660px">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
@@ -53,12 +59,12 @@
                             FieldType="String" HeaderText="试车情况说明" HeaderTextAlign="Center" Width="220px">
                         </f:RenderField>
                         <f:RenderField ColumnID="ProblemsAndSolutions" DataField="ProblemsAndSolutions"
-                            FieldType="String" HeaderText="出现问题及解决措施" HeaderTextAlign="Center" Width="220px">
+                            FieldType="String" HeaderText="出现问题及解决措施" HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="Remark" DataField="Remark"
-                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px">
+                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
+                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="70px" CommandName="AttachUrl" ColumnID="AttachUrl"
                             TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>

SGGL/FineUIPro.Web/TestRun/FeedingTestRun.aspx.cs

@@ -174,7 +174,7 @@ namespace FineUIPro.Web.TestRun
             string id = Grid1.DataKeys[e.RowIndex][0].ToString();
             if (e.CommandName == "AttachUrl")
             {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", id, BLL.Const.FeedingTestRunMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", id, BLL.Const.FeedingTestRunMenuId)));
             }
         }
         #endregion

SGGL/FineUIPro.Web/TestRun/FeedingTestRunEdit.aspx.cs

@@ -54,7 +54,7 @@ namespace FineUIPro.Web.TestRun
             {
                 this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_FeedingTestRun));
             }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", this.hdId.Text, BLL.Const.FeedingTestRunMenuId)));
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/FeedingTestRun&menuId={1}", this.hdId.Text, BLL.Const.FeedingTestRunMenuId)));
         }
         #endregion
 

SGGL/FineUIPro.Web/WorkBench.aspx

@@ -7,7 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>工作台</title>
     <link href="res/largescreen/css/reset1.css" rel="stylesheet" />
-    <link href="res/largescreen/css/userPage.css" rel="stylesheet" />
+    <link href="res/largescreen/css/userPage.css?v=2025" rel="stylesheet" />
     <script src="res/largescreen/libs/flex.js"></script>
     <script src="res/largescreen/libs/jquery.js"></script>
     <link href="res/css/company.css" rel="stylesheet" />

SGGL/FineUIPro.Web/WorkBench.aspx.cs

@@ -143,6 +143,19 @@ namespace FineUIPro.Web
         {
             string returnDbHtml = "";
             var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList();
+            //调人力预警接口
+            if (sType != "2")
+            {
+                var sgList = SGManPowerService.CheckAndSendPersonWarning(userId);
+                if (sgList != null)
+                {
+                    foreach (var item in sgList)
+                    {
+                        getDataList.Add(item);
+                    }
+                }
+            }
+            //把getDataList和sgList的数据合并
             foreach (var item in getDataList)
             {
                 returnDbHtml += "<div class=\"z-item\" style=\"cursor:pointer\"  onclick=\"returnWindows('" + item.PCUrl + "')\"><p class=\"z-val\"><span>" + item.ProjectCode + "   " + "</span><span>" + item.MenuName + "    " + item.Content + "</span></p><p class=\"z-data\">" + item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</p></div>";

SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSCheckData.aspx.cs

@@ -70,8 +70,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 value1 = managementList.Count();
                 value2 = totalManagementList.Count();
                 
-                value3 = managementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                value4 = totalManagementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                value3 = managementList.Count(x => x.IsOnceQualified == true);
+                value4 = totalManagementList.Count(x => x.IsOnceQualified == true);
 
                 
                 if (value1 != 0)//被除数不能为零

SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSNoticeDetailsData.aspx.cs

@@ -92,8 +92,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 value1 = managementList1.Count();
                 value2 = totalManagementList1.Count();
                 
-                value3 = managementList1.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                value4 = totalManagementList1.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                value3 = managementList1.Count(x => x.IsOnceQualified == true);
+                value4 = totalManagementList1.Count(x => x.IsOnceQualified == true);
                 
                 if (value1 != 0)//被除数不能为零
                 {
@@ -119,8 +119,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 value7 = managementList2.Count();
                 value8 = totalManagementList2.Count();
                 
-                value9 = managementList2.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                value10 = totalManagementList2.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                value9 = managementList2.Count(x => x.IsOnceQualified == true);
+                value10 = totalManagementList2.Count(x => x.IsOnceQualified == true);
                 
                 if (value7 != 0)//被除数不能为零
                 {
@@ -146,8 +146,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 value13 = managementList3.Count();
                 value14 = totalManagementList3.Count();
                 
-                value15 = managementList3.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                value16 = totalManagementList3.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                value15 = managementList3.Count(x => x.IsOnceQualified == true);
+                value16 = totalManagementList3.Count(x => x.IsOnceQualified == true);
                 
                 if (value13 != 0)//被除数不能为零
                 {
@@ -173,8 +173,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 value19 = managementList4.Count();
                 value20 = totalManagementList4.Count();
                 
-                value21 = managementList4.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                value22 = totalManagementList4.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                value21 = managementList4.Count(x => x.IsOnceQualified == true);
+                value22 = totalManagementList4.Count(x => x.IsOnceQualified == true);
                 
                 if (value19 != 0)//被除数不能为零
                 {
@@ -200,8 +200,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 value25 = managementList5.Count();
                 value26 = totalManagementList5.Count();
                 
-                value27 = managementList5.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
-                value28 = totalManagementList5.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
+                value27 = managementList5.Count(x => x.IsOnceQualified == true);
+                value28 = totalManagementList5.Count(x => x.IsOnceQualified == true);
                 
                 if (value25 != 0)//被除数不能为零
                 {

SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs

@@ -276,7 +276,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
 
             //一次共检合格数
             var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement 
-                          where x.IsOnceQualified == null || x.IsOnceQualified == true 
+                          where x.IsOnceQualified == true 
                           select new {  x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
             ////总数
             var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement

SGGL/FineUIPro.Web/common/mainIII.aspx.cs

@@ -55,7 +55,7 @@ namespace FineUIPro.Web.common
                 var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
                 this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString();
                 //验收数据
-                this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
+                this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
                 //焊工过期人数统计
                 var welders = from x in db.Comprehensive_InspectionPerson
                               join y in db.Base_Post on x.PostId equals y.PostId
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.common
                               select x;
                 this.divHG.InnerHtml = welders.Count().ToString();
                 //竣工资料
-                this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
+                this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
                 //NCR
                 var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
                 this.divNCR.InnerHtml = NCRManagements.Count().ToString();

SGGL/FineUIPro.Web/common/mainIV.aspx.cs

@@ -78,7 +78,7 @@ namespace FineUIPro.Web.common
                                                    select new { x.InspectionId, y.IsOnceQualified }).Distinct().ToList();
                 this.divZLGJ.InnerHtml = inspectionManagementDetails.Count().ToString();
                 //验收数据
-                this.divYS.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
+                this.divYS.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == true).ToString();
                 //焊工过期人数统计
                 var welders = from x in db.Comprehensive_InspectionPerson
                               join y in db.Base_Post on x.PostId equals y.PostId
@@ -92,7 +92,7 @@ namespace FineUIPro.Web.common
                 newWelders = newWelders.Distinct().ToList();
                 this.divHG.InnerHtml = newWelders.Count().ToString();
                 //竣工资料
-                this.divJGZL.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
+                this.divJGZL.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == true).ToString();
                 //NCR
                 var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
                 List<Model.Comprehensive_NCRManagement> newNCRManagements = new List<Model.Comprehensive_NCRManagement>();

SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs

@@ -26,7 +26,7 @@ namespace FineUIPro.Web
             {
                 var db = new Model.SGGLDB(Funs.ConnString);
                 List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
-                                                                                           where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                                                                           where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
                                                                                            select x).ToList();
                 List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
                                                                                          where x.ProjectId == this.CurrUser.LoginProjectId
@@ -284,7 +284,7 @@ namespace FineUIPro.Web
                 Model.SGGLDB db = Funs.DB;
                 var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
                 List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
-                                                                                           where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                                                                           where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
                                                                                            select x).ToList();
                 List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
                                                                                          where x.ProjectId == this.CurrUser.LoginProjectId
@@ -340,7 +340,7 @@ namespace FineUIPro.Web
                     var cns = BLL.CNProfessionalService.GetCnProList();
                     Model.SGGLDB db = Funs.DB;
                     List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
-                                                                                               where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                                                                               where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
                                                                                                select x).ToList();
                     List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
                                                                                              where x.ProjectId == this.CurrUser.LoginProjectId
@@ -384,7 +384,7 @@ namespace FineUIPro.Web
                     var cns = BLL.CNProfessionalService.GetList();
                     Model.SGGLDB db = Funs.DB;
                     List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
-                                                                                               where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                                                                               where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
                                                                                                select x).ToList();
                     List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
                                                                                              where x.ProjectId == this.CurrUser.LoginProjectId
@@ -452,7 +452,7 @@ namespace FineUIPro.Web
                 foreach (var unitWork in unitWorks)
                 {
                     listCategories.Add(unitWork.UnitWorkName);
-                    var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && (x.IsOnceQualified == null || x.IsOnceQualified == true)).ToList();
+                    var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.IsOnceQualified == true).ToList();
                     var totalChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
                     if (okChecks.Count > 0 && totalChecks.Count > 0)
                     {

SGGL/FineUIPro.Web/common/mainProject.aspx.cs

@@ -44,9 +44,9 @@ namespace FineUIPro.Web.common
                 var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString();
                 //验收数据
-                this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified== null || x.IsOnceQualified == true).ToString();
+                this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
                 //竣工资料
-                this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
+                this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
                 //NCR
                 var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
                 this.divNCR.InnerHtml = NCRManagements.Count().ToString();

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -108,8 +108,8 @@
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
-                                        <div style="font-size: .14rem;color: #DADADA;width:40px">
-                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompleted %>" />
+                                        <div style="font-size: .14rem;color: #DADADA;width:50px">
+                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompletedUnderConstruction %>" />
                                         </div>
                                         <div style="font-size: .25rem;color: #FEB185;"><%=CompletedNum %></div>
                                     </div>
@@ -149,8 +149,8 @@
                                     </div>
                                     <span></span>
                                     <div class="inner-box">
-                                        <div style="font-size: .14rem;color: #DADADA; width:40px">
-                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompleted %>" />
+                                        <div style="font-size: .14rem;color: #DADADA; width:50px">
+                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompletedUnderConstruction %>" />
                                         </div>
                                         <div style="font-size: .25rem;color: #FEB185;"><%=SuperCompletedNum %></div>
                                     </div>

SGGL/FineUIPro.Web/common/mainProject2.aspx.cs

@@ -894,7 +894,7 @@ namespace FineUIPro.Web.common
                                  select x).Count().ToString();
 
                 var num2 = (from x in db.ProcessControl_InspectionManagement
-                            where (x.IsOnceQualified == null || x.IsOnceQualified == true) && x.ProjectId == ProjectId
+                            where x.IsOnceQualified == true && x.ProjectId == ProjectId
                             select x).Count();
                 zlgjfinishNumber = num2.ToString();
 

SGGL/FineUIPro.Web/common/main_new.aspx.cs

@@ -792,7 +792,7 @@ namespace FineUIPro.Web.common
                     zlgjallNumber = num1.ToString();
 
                     var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                                where (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                where x.IsOnceQualified == true
                                 select x).Count();
                     zlgjfinishNumber = num2.ToString();
 
@@ -808,7 +808,7 @@ namespace FineUIPro.Web.common
                     zlgjallNumber = num1.ToString();
 
                     var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                                where (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
+                                where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
                                 select x).Count();
                     zlgjfinishNumber = num2.ToString();
 

SGGL/FineUIPro.Web/common/main_new1.aspx.cs

@@ -411,7 +411,7 @@ namespace FineUIPro.Web.common
                 //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
                 //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
                 var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                            where (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                            where x.IsOnceQualified == true
                             select x).Count();
                 result = num2;
 
@@ -425,7 +425,7 @@ namespace FineUIPro.Web.common
                 int result = 0;
 
                 var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                            where (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
+                            where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
                             select x).Count();
                 result = num2;
 
@@ -873,7 +873,7 @@ namespace FineUIPro.Web.common
                                 where x.CNProfessionalId == item.ControlId
                                 select x).Count();
                         num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                                where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true
                                 select x).Count();
                     }
                     else
@@ -882,7 +882,7 @@ namespace FineUIPro.Web.common
                                 where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId)
                                 select x).Count();
                         num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                                where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
+                                where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
                                 select x).Count();
                     }
 
@@ -927,7 +927,7 @@ namespace FineUIPro.Web.common
                                 where x.CNProfessionalId == item.CNProfessionalId
                                 select x).Count();
                         num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                                where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
+                                where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
                                 select x).Count();
                     }
                     else
@@ -936,7 +936,7 @@ namespace FineUIPro.Web.common
                                 where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
                                 select x).Count();
                         num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                                where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
+                                where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
                                 select x).Count();
                     }
 

SGGL/FineUIPro.Web/index.aspx

@@ -352,7 +352,7 @@
                                 </div>
                             </div>
                             <div class="nav-center" style="position: relative;">
-                                <h1>中国五环工程有限公司智慧施工管理信息系统<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
+                                <h1>中国化学五环公司智慧施工管理信息系统<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
                                     EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
                                 </f:Button>
                                 </h1>

SGGL/FineUIPro.Web/res/largescreen/css/userPage.css

@@ -17,11 +17,11 @@
 
 .z-head>.z-logo {
     height: 100%;
-    padding-left: 2.1625rem;
-    background-image: url(../images/logo.png);
+    padding-left: 3.3rem;
+    background-image: url(../images/logo.png?v=2025);
     background-repeat: no-repeat;
     background-position: left center;
-    background-size: 2.1125rem .65rem;
+    background-size: 3.2rem .65rem;
 }
 
 .z-head>.z-logo>.z-tit {

SGGL/Model/Model.cs

@@ -100366,6 +100366,8 @@ namespace Model
 		
 		private string _Supervisor;
 		
+		private string _ReasonAnalysis;
+		
 		private EntityRef<Sys_User> _Sys_User;
 		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
@@ -100420,6 +100422,8 @@ namespace Model
     partial void OnRemarkCodeChanged();
     partial void OnSupervisorChanging(string value);
     partial void OnSupervisorChanged();
+    partial void OnReasonAnalysisChanging(string value);
+    partial void OnReasonAnalysisChanged();
     #endregion
 		
 		public Comprehensive_NCRManagement()
@@ -100867,6 +100871,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReasonAnalysis", DbType="NVarChar(1000)")]
+		public string ReasonAnalysis
+		{
+			get
+			{
+				return this._ReasonAnalysis;
+			}
+			set
+			{
+				if ((this._ReasonAnalysis != value))
+				{
+					this.OnReasonAnalysisChanging(value);
+					this.SendPropertyChanging();
+					this._ReasonAnalysis = value;
+					this.SendPropertyChanged("ReasonAnalysis");
+					this.OnReasonAnalysisChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
 		public Sys_User Sys_User
 		{
@@ -134179,7 +134203,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(500)")]
 		public string Description
 		{
 			get
@@ -429911,7 +429935,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(500)")]
 		public string Description
 		{
 			get
@@ -450303,6 +450327,10 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _InspectionDate;
 		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _UnitId;
+		
 		private string _UnitWorkId;
 		
 		public View_MonthReport_InspectionManagement()
@@ -450389,6 +450417,38 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this._CompileDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this._UnitId = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
 		public string UnitWorkId
 		{

SGGL/WebAPI/Controllers/JDGL/SGManPowerController.cs

@@ -11,13 +11,13 @@ namespace WebAPI.Controllers.JDGL
         /// 人力预警
         /// </summary>
         /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData ManPowerWarning()
+        public Model.ResponeData getManPowerWarning(string userId)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                responeData = SGManPowerService.CheckAndSendPersonWarning();
+                var list = SGManPowerService.CheckAndSendPersonWarning(userId);
+                responeData.data = list;
             }
             catch (Exception ex)
             {

SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-09-29T07:39:36.8617347Z||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;</History>
+    <History>True|2025-10-24T07:59:19.4176668Z||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>10/08/2025 11:14:05</publishTime>
+      <publishTime>10/24/2025 15:59:16</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>10/08/2025 11:14:05</publishTime>
+      <publishTime>10/24/2025 15:59:16</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>10/08/2025 11:13:54</publishTime>
+      <publishTime>10/24/2025 15:58:53</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>10/08/2025 11:13:54</publishTime>
+      <publishTime>10/24/2025 15:58:53</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/29/2025 15:39:16</publishTime>
+      <publishTime>10/24/2025 15:58:47</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/29/2025 15:39:16</publishTime>
+      <publishTime>10/24/2025 15:58:47</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>10/08/2025 11:13:55</publishTime>
+      <publishTime>10/24/2025 15:58:57</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>10/08/2025 11:13:55</publishTime>
+      <publishTime>10/24/2025 15:58:57</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>10/08/2025 11:13:55</publishTime>
+      <publishTime>10/24/2025 15:58:56</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>10/08/2025 11:13:56</publishTime>
+      <publishTime>10/24/2025 15:58:58</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />