1

SGGL/BLL/API/APIBaseInfoService.cs

@@ -82,7 +82,7 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var getDataLists = (from x in db.WBS_UnitWork
-                                    where x.ProjectId == projectId && x.SuperUnitWork == null
+                                    where x.ProjectId == projectId && x.SuperUnitWork == "0"
                                     orderby x.UnitWorkCode
                                     select new Model.BaseInfoItem
                                     {
@@ -106,7 +106,7 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var getDataLists = (from x in db.WBS_UnitWork
-                                    where x.ProjectId == projectId && x.UnitId == unitId && x.SuperUnitWork == null
+                                    where x.ProjectId == projectId && x.UnitId == unitId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                     orderby x.UnitWorkCode
                                     select new Model.BaseInfoItem
                                     {

SGGL/BLL/API/HSSE/APICheckSpecialService.cs

@@ -337,6 +337,8 @@ namespace BLL
                                       CheckItemDetailContent = x.CheckItemSetContent,
                                       Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
                                       CheckOpinions = x.CheckOpinions,
+
+                                      HiddenType=x.HiddenType
                                   };
                     return getInfo.ToList();
                 }
@@ -427,7 +429,8 @@ namespace BLL
                                   CheckItemDetailSetId=x.CheckItemSetId,
                                   CheckItemDetailContent=x.CheckItemSetContent,
                                   Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
-                                  CheckOpinions=x.CheckOpinions
+                                  CheckOpinions=x.CheckOpinions,
+                                  HiddenType=x.HiddenType
                               };
                 return getInfo.First();
             }
@@ -468,6 +471,7 @@ namespace BLL
                         CheckItemSetContent= newDetail.CheckItemDetailContent,
                         Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date),
                         CheckOpinions=newDetail.CheckOpinions,
+                        HiddenType=newDetail.HiddenType,
                     };
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
@@ -515,6 +519,7 @@ namespace BLL
                         updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
                         updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
                         updateDetail.CheckOpinions = newDetail.CheckOpinions;
+                        updateDetail.HiddenType = newDetail.HiddenType;
                         db.SubmitChanges();
                     }
                     ////保存附件

SGGL/BLL/API/HSSE/APIHazardRegisterService.cs

@@ -80,6 +80,10 @@ namespace BLL
                     IsWx = "Y",
                     CCManIds = hazardRegister.CCManIds,
                     Requirements = hazardRegister.Requirements,
+
+                    Risk_Level = hazardRegister.Risk_Level,
+                    HiddenType= hazardRegister.HiddenType
+
                 };
                 var RegisterTypesDt = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == newHazardRegister.RegisterTypesId);
                 if (RegisterTypesDt != null && RegisterTypesDt.HazardRegisterType == "4")
@@ -173,6 +177,7 @@ namespace BLL
                                            ResponsibilityManName = db.Sys_User.First(User => x.ResponsibleMan == User.UserId).UserName,
                                            RectificationTime = x.RectificationTime,
                                            Risk_Level = x.Risk_Level,
+                                           HiddenType=x.HiddenType
 
                                        }).OrderBy(x => x.CheckTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
                 return hazardRegisters;

SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs

@@ -107,6 +107,9 @@ namespace BLL
                                   IsRectify = x.IsRectify,
                                   PhotoBeforeUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#1", null),
                                   PhotoAfterUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#2", null),
+
+                                  HiddenType=x.HiddenType,
+                                  HiddenHazardType=x.HiddenHazardType
                               };
                 return getInfo.ToList();
             }
@@ -473,6 +476,9 @@ namespace BLL
                                 LimitTime = Funs.GetNewDateTime(rItem.LimitTime),
                                 RectifyResults = null,
                                 IsRectify = null,
+
+                                HiddenType=rItem.HiddenType,
+                                HiddenHazardType=rItem.HiddenHazardType
                             };
                             db.Check_RectifyNoticesItem.InsertOnSubmit(newItem);
                             db.SubmitChanges();

SGGL/BLL/BLL.csproj

@@ -54,9 +54,9 @@
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Microsoft.SQLServer.ManagedDTS, Version=10.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.SQLServer.ManagedDTS, Version=16.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
+      <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.SqlServer.ManagedDTS\v4.0_16.0.0.0__89845dcd8080cc91\新建文件夹\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -397,7 +397,9 @@
     <Compile Include="HSSE\CostGoods\CostManageService.cs" />
     <Compile Include="HSSE\CostGoods\CostSmallDetailItemService.cs" />
     <Compile Include="HSSE\CostGoods\CostSmallDetailService.cs" />
+    <Compile Include="HSSE\CostGoods\FeeRegistration.cs" />
     <Compile Include="HSSE\CostGoods\GoodsManageService.cs" />
+    <Compile Include="HSSE\CostGoods\HseExpenseService.cs" />
     <Compile Include="HSSE\EduTrain\AccidentCaseItemService.cs" />
     <Compile Include="HSSE\EduTrain\AccidentCaseService.cs" />
     <Compile Include="HSSE\EduTrain\CompanyTrainingItemService.cs" />
@@ -614,12 +616,6 @@
     <Compile Include="JDGL\WBS\WbsSetService.cs" />
     <Compile Include="JDGL\WBS\WorkloadStatisticsService.cs" />
     <Compile Include="Notice\NoticeService.cs" />
-    <Compile Include="obj\Debug\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
-    <Compile Include="obj\Debug\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
-    <Compile Include="obj\Debug\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
-    <Compile Include="obj\Release\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
-    <Compile Include="obj\Release\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
-    <Compile Include="obj\Release\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
     <Compile Include="OfficeCheck\Check\CheckNoticeService.cs" />
     <Compile Include="OfficeCheck\Check\CheckReportService.cs" />
     <Compile Include="OfficeCheck\Check\CheckTable1Service.cs" />

SGGL/BLL/BaseInfo/RiskLevelService.cs

@@ -22,6 +22,16 @@ namespace BLL
             return Funs.DB.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevelId);
         }
 
+        /// <summary>
+        /// 根据主键获取许可证类型
+        /// </summary>
+        /// <param name="licenseTypeId"></param>
+        /// <returns></returns>
+        public static Model.Base_RiskLevel GetRiskLevelBy(string riskLevel)
+        {
+            return Funs.DB.Base_RiskLevel.FirstOrDefault(e => e.RiskLevel == Convert.ToInt32(riskLevel));
+        }
+
         /// <summary>
         /// 添加许可证类型
         /// </summary>

SGGL/BLL/BoSheng/BOSHENGMonitorService.cs

@@ -125,7 +125,7 @@ namespace BLL
 
                     if (type == "0")
                     {
-                        //isOk = AddPerson(projectId, arr, sysUser);
+                        isOk = AddPerson(projectId, arr, sysUser);
                     }
                     else if (type == "1")
                     {
@@ -216,7 +216,7 @@ namespace BLL
                 try
                 {
                     List<Model.Bo_Sheng_Person> insertPersons = new List<Model.Bo_Sheng_Person>();
-                    List<Model.SitePerson_Person> insertSitePersons = new List<Model.SitePerson_Person>();
+                    //List<Model.SitePerson_Person> insertSitePersons = new List<Model.SitePerson_Person>();
                     foreach (var item in arr)
                     {
                         string getID = item["ID"].ToString();
@@ -292,39 +292,39 @@ namespace BLL
                                 db.SubmitChanges();
                             }
                         }
-                        var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString());
-                        if (!string.IsNullOrEmpty(getID))
-                        {
-                            if (getSitePerson == null)
-                            {
-                                Model.SitePerson_Person newPerson = new Model.SitePerson_Person
-                                {
-                                    PersonId = SQLHelper.GetNewID(),
-                                    ProjectId = projectId,
-                                    PersonName = item["Name"].ToString(),
-                                    Sex = item["Sex"].ToString(),
-                                    Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()),
-                                    Address = item["Address"].ToString(),
-                                    Nation = item["Nation"].ToString(),
-                                    IdentityCard = item["IdentifyID"].ToString(),
-                                    UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()),
-                                    Telephone = item["Telephone"].ToString(),
-                                    MaritalStatus = item["MaritalStatus"].ToString(),
-                                };
-                                insertSitePersons.Add(newPerson);
-                            }
-                        }
+                        //var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString());
+                        //if (!string.IsNullOrEmpty(getID))
+                        //{
+                        //    if (getSitePerson == null)
+                        //    {
+                        //        Model.SitePerson_Person newPerson = new Model.SitePerson_Person
+                        //        {
+                        //            PersonId = SQLHelper.GetNewID(),
+                        //            ProjectId = projectId,
+                        //            PersonName = item["Name"].ToString(),
+                        //            Sex = item["Sex"].ToString(),
+                        //            Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()),
+                        //            Address = item["Address"].ToString(),
+                        //            Nation = item["Nation"].ToString(),
+                        //            IdentityCard = item["IdentifyID"].ToString(),
+                        //            UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()),
+                        //            Telephone = item["Telephone"].ToString(),
+                        //            MaritalStatus = item["MaritalStatus"].ToString(),
+                        //        };
+                        //        insertSitePersons.Add(newPerson);
+                        //    }
+                        //}
 
                         if (insertPersons.Count() > 0)
                         {
                             db.Bo_Sheng_Person.InsertAllOnSubmit(insertPersons);
                             db.SubmitChanges();
                         }
-                        if (insertSitePersons.Count() > 0)
-                        {
-                            db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons);
-                            db.SubmitChanges();
-                        }
+                        //if (insertSitePersons.Count() > 0)
+                        //{
+                        //    db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons);
+                        //    db.SubmitChanges();
+                        //}
                     }
                 }
                 catch (Exception ex)

SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs

@@ -139,29 +139,31 @@ namespace BLL
         /// <param name="inspectionMachine"></param>
         public static void UpdateInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine)
         {
-            Model.SGGLDB db = Funs.DB;
-            Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
-            if (newInspectionMachine != null)
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                newInspectionMachine.ProjectId = inspectionMachine.ProjectId;
-                newInspectionMachine.UnitId = inspectionMachine.UnitId;
-                newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode;
-                newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName;
-                newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel;
-                newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
-                newInspectionMachine.InspectionType = inspectionMachine.InspectionType;
-                newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
-                newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
-                newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
-                newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
-                newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
-                newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
-                newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
-                newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
-                newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
-                newInspectionMachine.Status = inspectionMachine.Status;
-                newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
-                db.SubmitChanges();
+                Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
+                if (newInspectionMachine != null)
+                {
+                    newInspectionMachine.ProjectId = inspectionMachine.ProjectId;
+                    newInspectionMachine.UnitId = inspectionMachine.UnitId;
+                    newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode;
+                    newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName;
+                    newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel;
+                    newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
+                    newInspectionMachine.InspectionType = inspectionMachine.InspectionType;
+                    newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
+                    newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
+                    newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
+                    newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
+                    newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
+                    newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
+                    newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
+                    newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
+                    newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
+                    newInspectionMachine.Status = inspectionMachine.Status;
+                    newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
+                    db.SubmitChanges();
+                }
             }
         }
 

SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs

@@ -119,6 +119,7 @@ namespace BLL
             newNCRManagement.Problem = nCRManagement.Problem;
             newNCRManagement.Measure = nCRManagement.Measure;
             newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
+            newNCRManagement.Supervisor = nCRManagement.Supervisor;
             db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
             db.SubmitChanges();
         }
@@ -150,6 +151,7 @@ namespace BLL
                 newNCRManagement.Problem = nCRManagement.Problem;
                 newNCRManagement.Measure = nCRManagement.Measure;
                 newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
+                newNCRManagement.Supervisor = nCRManagement.Supervisor;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs

@@ -453,5 +453,30 @@ namespace BLL
 
             return InspectionMangementList;
         }
+
+
+        public static List<Model.View_MonthReport_InspectionManagement> getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
+        {
+            List<Model.View_MonthReport_InspectionManagement> InspectionMangementList = (from x in Funs.DB.View_MonthReport_InspectionManagement select x).ToList();
+
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                InspectionMangementList = (from x in InspectionMangementList 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();
+            }
+            if (isOnceQualified == true)
+            {
+                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
+            }
+            if (startDate != null && SoptDate != null)
+            {
+                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
+            }
+
+            return InspectionMangementList;
+        }
     }
 }

SGGL/BLL/Common/Const.cs

@@ -2279,6 +2279,11 @@ namespace BLL
         /// 安全费用管理
         /// </summary>
         public const string ProjectHSSECostManageMenuId = "5C74F09D-FDE3-4995-A1D6-0549A8693940";
+
+        /// <summary>
+        /// 合同HSE费用额登记
+        /// </summary>
+        public const string FeeRegistrationMenuId = "C6CF3A5C-546B-483A-B742-A77F2E152523";
         #endregion
 
         #region HSSE行政管理
@@ -3354,6 +3359,11 @@ namespace BLL
         /// </summary>
         public const string ConExperienceSummaryTemUrl = "File\\Excel\\DataIn\\类似项目施工经验总结清单导入模板.xls";
 
+        /// <summary>
+        /// 新项目安全月报模板文件原始虚拟路径
+        /// </summary>
+        public const string HseMonthReportNewTemplateUrl = "File\\Word\\HSSE\\项目安全月报.doc";
+
         #region 导出模板
         /// <summary>
         /// 质量专项检查模板文件原始虚拟路径
@@ -4298,6 +4308,9 @@ namespace BLL
         public const string PlumbingMenuId = "95295BF7-FB51-480D-9902-6ADA4E8427FC";
         public const string HVACMenuId = "05442049-1310-45B1-9D3D-CAAE759D8F3E";
         public const string PunchlistFromMenuId = "016903B1-3B86-4CF5-AFF8-FF8BE389BEE5";
+
+        public const string Transfer_LHCSystemListMenuId0 = "197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB";
+        public const string Transfer_LHCSystemListMenuId1 = "022428DC-FC99-4916-B8AF-6A9DC885DFAF";
         #endregion
 
         #endregion
@@ -4726,6 +4739,14 @@ namespace BLL
         /// 开车人员月绩效报告模板文件原始虚拟路径
         /// </summary>
         public const string TestRunPerformanceMonthReportTemplateUrl = "File\\Excel\\DataOut\\开车人员月绩效报告.xlsx";
+        /// <summary>
+        /// 月度计划情况模板文件原始虚拟路径
+        /// </summary>
+        public const string MonthPlanOutTemplateUrl = "File\\Excel\\DataOut\\月度计划情况.xlsx";
+        /// <summary>
+        /// 周进度计划模板文件原始虚拟路径
+        /// </summary>
+        public const string WeekPlanOutTemplateUrl = "File\\Excel\\DataOut\\周进度计划.xlsx";
         #endregion
 
         #endregion
@@ -6045,5 +6066,10 @@ namespace BLL
         /// 检查表尾项管理
         /// </summary>
         public const string InspectTailTerm = "B6A6EA7D-EDAB-40C8-920D-A106731D0E08";
+
+        /// <summary>
+        /// HSSE管理月报新
+        /// </summary>
+        public const string ManagerMonthCNewMenuId = "9E4B28DF-8C8E-49F8-AB15-270BBDC73449";
     }
 }

SGGL/BLL/Common/ConstValue.cs

@@ -423,5 +423,18 @@ namespace BLL
             }
         }
 
+        public static List<Model.DropDownItem> getHiddenTypeList(string groupid)
+        {
+            var list = (from x in Funs.DB.Sys_Const
+                        where x.GroupId== groupid
+                        orderby x.SortIndex
+                        select new Model.DropDownItem
+                        {
+                            Text = x.ConstText,
+                            Values = x.ConstValue
+                        }).ToList();
+            return list;
+        }
+
     }
 }

SGGL/BLL/HSSE/CostGoods/FeeRegistration.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 合同HSE费用额登记
+    /// </summary>
+    public class FeeRegistration
+    {
+        public static bool Insert(Model.CostGoods_FeeRegistration model)
+        {
+            try
+            {
+                Funs.DB.CostGoods_FeeRegistration.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Update(Model.CostGoods_FeeRegistration model)
+        {
+            try
+            {
+                var result = Funs.DB.CostGoods_FeeRegistration.FirstOrDefault(a => a.Id == model.Id);
+                if (result != null)
+                {
+                    result.UnitId = model.UnitId;
+                    result.Cost = model.Cost;
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(List<string> newId)
+        {
+            try
+            {
+                var result = Funs.DB.CostGoods_FeeRegistration.Where(a => newId.Contains(a.Id)).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.CostGoods_FeeRegistration.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(string newId)
+        {
+            try
+            {
+                var result = Funs.DB.CostGoods_FeeRegistration.Where(a => a.Id == newId).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.CostGoods_FeeRegistration.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static Model.CostGoods_FeeRegistration Detail(string newId)
+        {
+            var result = Funs.DB.CostGoods_FeeRegistration.FirstOrDefault(a => a.Id == newId);
+            return result;
+        }
+    }
+}

SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// HSE费用登记（新）
+    /// </summary>
+    public class HseExpenseService
+    {
+        public static bool Insert(Model.CostGoods_HseExpense model)
+        {
+            try
+            {
+                Funs.DB.CostGoods_HseExpense.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Update(Model.CostGoods_HseExpense model)
+        {
+            try
+            {
+                var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(a => a.Id == model.Id);
+                if (result != null)
+                {
+                    result.UnitId = model.UnitId;
+                    result.PayDate = model.PayDate;
+                    result.PayMonth = model.PayMonth;
+
+                    result.SMonthType1 = model.SMonthType1;
+                    result.SMonthType2 = model.SMonthType2;
+                    result.SMonthType3 = model.SMonthType3;
+                    result.SMonthType4 = model.SMonthType4;
+                    result.SMonthType5 = model.SMonthType5;
+                    result.SMonthType6 = model.SMonthType6;
+                    result.SMonthType7 = model.SMonthType7;
+                    result.SMonthType8 = model.SMonthType8;
+                    result.SMonthType9 = model.SMonthType9;
+                    result.SMonthType10 = model.SMonthType10;
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(List<string> newId)
+        {
+            try
+            {
+                var result = Funs.DB.CostGoods_HseExpense.Where(a => newId.Contains(a.Id)).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.CostGoods_HseExpense.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(string newId)
+        {
+            try
+            {
+                var result = Funs.DB.CostGoods_HseExpense.Where(a => a.Id == newId).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.CostGoods_HseExpense.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static Model.CostGoods_HseExpense Detail(string newId)
+        {
+            var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(a => a.Id == newId);
+            return result;
+        }
+
+        /// <summary>
+        /// 根据时间、项目获取五环安全费用投入登记信息
+        /// </summary>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.CostGoods_HseExpense> GetPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId, string unitId)
+        {
+            return (from x in Funs.DB.CostGoods_HseExpense where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId && x.UnitId == unitId select x).ToList();
+        }
+
+        /// <summary>
+        ///  根据时间、项目获取施工分包商安全费用投入登记信息
+        /// </summary>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.CostGoods_HseExpense> GetConPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId)
+        {
+            return (from x in Funs.DB.CostGoods_HseExpense
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId
+                    && y.UnitTypeId == BLL.Const.UnitId_Con
+                    select x).ToList();
+        }
+    }
+}

SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs

@@ -159,5 +159,15 @@ namespace BLL
         {
             return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate >= startTime && x.TrainStartDate <= endTime && x.ProjectId == projectId select x.TrainPersonNum).Sum();
         }
+
+        public static List<Model.EduTrain_TrainRecord> GetTrainingsByTrainDate(DateTime endTime, string projectId)
+        {
+            return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate <= endTime && x.ProjectId == projectId select x).ToList();
+        }
+
+        public static int? GetTrainPersonCount(DateTime endTime, string projectId)
+        {
+            return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate <= endTime && x.ProjectId == projectId select x.TrainPersonNum).Sum();
+        }
     }
 }

SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -70,6 +70,8 @@ namespace BLL
             newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
             newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
             newHazardRegister.Type=hazardRegister.Type;
+
+            newHazardRegister.HiddenType = hazardRegister.HiddenType;
             db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
             db.SubmitChanges();
         }
@@ -112,6 +114,7 @@ namespace BLL
                     newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
                     newHazardRegister.Type = hazardRegister.Type;
 
+                    newHazardRegister.HiddenType = hazardRegister.HiddenType;
                     //把附件表的路径复制过来
                     Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
                     if (file != null)

SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs

@@ -90,8 +90,12 @@ namespace BLL
         public static void DeleteAccidentSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_AccidentSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_AccidentSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_AccidentSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs

@@ -54,8 +54,12 @@ namespace BLL
         public static void DeleteCheckDetailSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_CheckDetailSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_CheckDetailSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_CheckDetailSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs

@@ -49,8 +49,10 @@ namespace BLL
         public static void DeleteDrillSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_DrillSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_DrillSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0) { 
+                db.Manager_DrillSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs

@@ -49,8 +49,9 @@ namespace BLL
         public static void DeleteEmergencySortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_EmergencySortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_EmergencySortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0) { 
+                db.Manager_EmergencySortC.DeleteAllOnSubmit(q);
+            db.SubmitChanges();}
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs

@@ -49,8 +49,13 @@ namespace BLL
         public static void DeleteHazardSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_HazardSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_HazardSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_HazardSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs

@@ -78,8 +78,11 @@ namespace BLL
         public static void DeleteHseCostsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_HseCostC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_HseCostC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_HseCostC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs

@@ -68,8 +68,11 @@ namespace BLL
         public static void DeleteIncentiveSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_IncentiveSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_IncentiveSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0)
+            {
+                db.Manager_IncentiveSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs

@@ -56,8 +56,12 @@ namespace BLL
         public static void DeleteMeetingSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_MeetingSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_MeetingSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_MeetingSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+           
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs

@@ -227,6 +227,21 @@ namespace BLL
                 Question = monthReport.Question,
                 SubcontractManHours = monthReport.SubcontractManHours,
                 AccidentDef = monthReport.AccidentDef,
+
+                StartDate=monthReport.StartDate,
+                EndDate=monthReport.EndDate,
+                TotalHseManhoursYear = monthReport.TotalHseManhoursYear,
+
+                EmergencyManagementWorkDef=monthReport.EmergencyManagementWorkDef,
+                MonthHdangerCount=monthReport.MonthHdangerCount,
+                YearHdangerCount=monthReport.YearHdangerCount,
+
+                MonthExpertCount=monthReport.MonthExpertCount,
+                MonthExpertNoCount=monthReport.MonthExpertNoCount,
+                Goalach1=monthReport.Goalach1,
+                Goalach2=monthReport.Goalach2,
+                Goalach3=monthReport.Goalach3,
+                MonthReportType=monthReport.MonthReportType
             };
 
             db.Manager_MonthReportC.InsertOnSubmit(newMonthReport);
@@ -245,7 +260,7 @@ namespace BLL
             Model.Manager_MonthReportC newMonthReport = db.Manager_MonthReportC.First(e => e.MonthReportId == monthReport.MonthReportId);
             newMonthReport.MonthReportCode = monthReport.MonthReportCode;
             newMonthReport.ProjectId = monthReport.ProjectId;
-            newMonthReport.Months = monthReport.Months;
+            //newMonthReport.Months = monthReport.Months;
             newMonthReport.MonthReportDate = monthReport.MonthReportDate;
             newMonthReport.ReportMan = monthReport.ReportMan;
             newMonthReport.HseManhours = monthReport.HseManhours;
@@ -298,6 +313,19 @@ namespace BLL
             newMonthReport.SubcontractManHours = monthReport.SubcontractManHours;
             newMonthReport.AccidentDef = monthReport.AccidentDef;
 
+            newMonthReport.StartDate = monthReport.StartDate;
+            newMonthReport.EndDate = monthReport.EndDate;
+            newMonthReport.TotalHseManhoursYear = monthReport.TotalHseManhoursYear;
+
+            newMonthReport.EmergencyManagementWorkDef = monthReport.EmergencyManagementWorkDef;
+            newMonthReport.MonthHdangerCount = monthReport.MonthHdangerCount;
+            newMonthReport.YearHdangerCount = monthReport.YearHdangerCount;
+            newMonthReport.MonthExpertCount = monthReport.MonthExpertCount;
+            newMonthReport.MonthExpertNoCount = monthReport.MonthExpertNoCount;
+            newMonthReport.Goalach1 = monthReport.Goalach1;
+            newMonthReport.Goalach2 = monthReport.Goalach2;
+            newMonthReport.Goalach3 = monthReport.Goalach3;
+            newMonthReport.MonthReportType = monthReport.MonthReportType;
             db.SubmitChanges();
         }
 
@@ -315,5 +343,31 @@ namespace BLL
             db.Manager_MonthReportC.DeleteOnSubmit(monthReport);
             db.SubmitChanges();
         }
+
+        #region 保存4.6.1应急预案发布情况
+        public static void AddManager_EmergencyPlan(Model.Manager_EmergencyPlan model) {
+            Model.SGGLDB db = Funs.DB;
+            db.Manager_EmergencyPlan.InsertOnSubmit(model);
+            db.SubmitChanges();
+        }
+        #endregion
+
+        #region 保存4.6.2  应急演练工作情况说明
+        public static void AddManager_DrillRecordList(Model.Manager_DrillRecordList model)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.Manager_DrillRecordList.InsertOnSubmit(model);
+            db.SubmitChanges();
+        }
+        #endregion
+
+        #region 保存6.1  未遂事件统计
+        public static void AddManager_Attempted(Model.Manager_Attempted model)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.Manager_Attempted.InsertOnSubmit(model);
+            db.SubmitChanges();
+        }
+        #endregion
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs

@@ -48,8 +48,11 @@ namespace BLL
         public static void DeleteOtherActiveSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_OtherActiveSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_OtherActiveSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0)
+            {
+                db.Manager_OtherActiveSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs

@@ -58,5 +58,77 @@ namespace BLL
             db.Manager_PersonSortC.DeleteAllOnSubmit(q);
             db.SubmitChanges();
         }
+
+        /// <summary>
+        /// 根据月报告主键删除对应的所有月报告HSE人力投入信息
+        /// </summary>
+        /// <param name="monthReportId">月报告主键</param>
+        public static void DeleteManager_HiddenDanger(string monthReportId)
+        {
+            var q = (from x in db.Manager_HiddenDanger where x.MonthReportId == monthReportId select x).ToList();
+            if (q.Count>0)
+            {
+                db.Manager_HiddenDanger.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 删除月报项目作业许可管理数据
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        public static void DeleteManager_ProjectAssignment(string monthReportId)
+        {
+            var q = (from x in db.Manager_ProjectAssignment where x.MonthReportId == monthReportId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.Manager_ProjectAssignment.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 删除月报应急预案发布情况
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        public static void DeleteManager_EmergencyPlan(string monthReportId)
+        {
+            var q = (from x in db.Manager_EmergencyPlan where x.MonthReportId == monthReportId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.Manager_EmergencyPlan.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 删除月报应急演练工作情况说明
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        public static void DeleteManager_DrillRecordList(string monthReportId)
+        {
+            var q = (from x in db.Manager_DrillRecordList where x.MonthReportId == monthReportId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.Manager_DrillRecordList.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 删除月报未遂事件
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        public static void DeleteManager_Attempted(string monthReportId)
+        {
+            var q = (from x in db.Manager_Attempted where x.MonthReportId == monthReportId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.Manager_Attempted.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs

@@ -49,8 +49,12 @@ namespace BLL
         public static void DeletePromotionalActiviteSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_PromotionalActiviteSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_PromotionalActiviteSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_PromotionalActiviteSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs

@@ -48,8 +48,12 @@ namespace BLL
         public static void DeleteTrainActivitySortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_TrainActivitySortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_TrainActivitySortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_TrainActivitySortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs

@@ -51,9 +51,20 @@ namespace BLL
         /// <param name="monthReportId">月报告主键</param>
         public static void DeleteTrainSortsByMonthReportId(string monthReportId)
         {
-            var q = (from x in db.Manager_TrainSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_TrainSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            try
+            {
+                var q = (from x in Funs.DB.Manager_TrainSortC where x.MonthReportId == monthReportId select x).ToList();
+                if (q.Count > 0)
+                {
+                    Funs.DB.Manager_TrainSortC.DeleteAllOnSubmit(q);
+                    Funs.DB.SubmitChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs

@@ -46,6 +46,8 @@ namespace BLL
                 CompileDate = SafePersonQuality.CompileDate,
                 AuditDate = SafePersonQuality.AuditDate,
                 AuditorId = SafePersonQuality.AuditorId,
+
+                CertificateId= SafePersonQuality.CertificateId,
             };
             db.QualityAudit_SafePersonQuality.InsertOnSubmit(newSafePersonQuality);
             db.SubmitChanges();
@@ -74,6 +76,8 @@ namespace BLL
                 newSafePersonQuality.CompileDate = SafePersonQuality.CompileDate;
                 newSafePersonQuality.AuditDate = SafePersonQuality.AuditDate;
                 newSafePersonQuality.AuditorId = SafePersonQuality.AuditorId;
+
+                newSafePersonQuality.CertificateId = SafePersonQuality.CertificateId;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/SitePerson/PersonService.cs

@@ -122,7 +122,7 @@ namespace BLL
         /// <param name="PageSize">每页数量</param>
         /// <returns></returns>
         public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
-                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1)
+                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1,bool isBlack=false)
         {
             IQueryable<Model.View_SitePerson_Person> getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
             if (!string.IsNullOrEmpty(unitId))
@@ -136,6 +136,15 @@ namespace BLL
                     getPersonList = getPersonList.Where(x => x.UnitId == unitId);
                 }
             }
+
+            if (isBlack == false)
+            {
+                getPersonList = getPersonList.Where(x => x.IsBlacklist != true || x.IsBlacklist == null);
+            }
+            else {
+                getPersonList = getPersonList.Where(x => x.IsBlacklist == true);
+            }
+            
             if (!string.IsNullOrEmpty(personName))
             {
                 getPersonList = getPersonList.Where(x => x.PersonName.Contains(personName));

SGGL/BLL/JDGL/Check/MonthPlanService.cs

@@ -52,6 +52,7 @@ namespace BLL
                 Remark = MonthPlan.Remark,
                 CompileMan = MonthPlan.CompileMan,
                 CompileDate = MonthPlan.CompileDate,
+                SortIndex = MonthPlan.SortIndex,
             };
             db.JDGL_MonthPlan.InsertOnSubmit(newMonthPlan);
             db.SubmitChanges();
@@ -75,7 +76,7 @@ namespace BLL
                 newMonthPlan.Remark = MonthPlan.Remark;
                 newMonthPlan.CompileMan = MonthPlan.CompileMan;
                 newMonthPlan.CompileDate = MonthPlan.CompileDate;
-               
+
                 db.SubmitChanges();
             }
         }

SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs

@@ -276,7 +276,7 @@ namespace BLL
                         }
                         else
                         {
-                            List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();//装置条件为空时获取对应操作表中所有的装置
+                            List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList();//装置条件为空时获取对应操作表中所有的装置
                             foreach (Model.WBS_UnitWork item in InstallationList)
                             {
                                 Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault();
@@ -289,7 +289,7 @@ namespace BLL
                     }
                     else
                     {
-                        List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId select x).ToList();
+                        List<Model.WBS_UnitWork> InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList();
                         foreach (Model.WBS_UnitWork item in InstallationList)
                         {
                             Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault();

SGGL/BLL/OpenService/GetDataService.cs

@@ -395,7 +395,7 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 try
-                {
+                { 
                     string miniprogram_state = ConfigurationManager.AppSettings["miniprogram_state"];
                     if (!string.IsNullOrEmpty(miniprogram_state) && miniprogram_state == "formal")
                     {

SGGL/BLL/OpenService/MonitorService.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Web.UI.WebControls;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
-using Microsoft.SqlServer.Dts.Runtime;
+//using Microsoft.SqlServer.Dts.Runtime;
 
 namespace BLL
 {

SGGL/BLL/ProjectData/UnitWorkService.cs

@@ -245,7 +245,7 @@ namespace BLL
         /// <returns></returns>
         public static ListItem[] GetUnitWorkList(string projectId)
         {
-            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
+            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
             ListItem[] item = new ListItem[q.Count()];
             for (int i = 0; i < q.Count(); i++)
             {
@@ -278,11 +278,11 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.WBS_UnitWork> GetUnitWorkLists(string projectId)
         {
-            return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
+            return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
         }
         public static ListItem[] GetUnitWork(string projectId)
         {
-            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
+            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
             ListItem[] item = new ListItem[q.Count()];
             for (int i = 0; i < q.Count(); i++)
             {
@@ -292,7 +292,7 @@ namespace BLL
         }
         public static ListItem[] GetUnitWork2(string projectId)
         {
-            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
+            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
             ListItem[] item = new ListItem[q.Count()];
             for (int i = 0; i < q.Count(); i++)
             {
@@ -390,7 +390,7 @@ namespace BLL
         public static List<Model.WBS_UnitWork> GetUnitWorkListByPid(string projectId)
         {
             Model.SGGLDB db = Funs.DB;
-            List<Model.WBS_UnitWork> q = (from x in db.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x).ToList();
+            List<Model.WBS_UnitWork> q = (from x in db.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") orderby x.UnitWorkCode select x).ToList();
             return q;
         }
         public static Model.WBS_UnitWork getUnitWorkByUnitWorkId(string UnitWorkId)
@@ -402,7 +402,7 @@ namespace BLL
             string[] type = null;
             if (!string.IsNullOrEmpty(projectType))
                 type = projectType.Split(',');
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x;
+            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x;
             return unitWorks.ToList();
         }
         /// <summary>
@@ -412,7 +412,7 @@ namespace BLL
         /// <returns></returns>
         public static ListItem[] GetUnitWorkListByProjectType(string projectId, string projectType)
         {
-            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && x.SuperUnitWork == null && x.ProjectType == projectType orderby x.UnitWorkCode select x).ToList();
+            List<Model.WBS_UnitWork> q = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") && x.ProjectType == projectType orderby x.UnitWorkCode select x).ToList();
             ListItem[] item = new ListItem[q.Count()];
             for (int i = 0; i < q.Count(); i++)
             {
@@ -454,12 +454,12 @@ namespace BLL
         {
             if (ProjectType == "1")
             {
-                List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList();
+                List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
                 return lis;
             }
             else if (ProjectType == "2")
             {
-                List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList();
+                List<Model.WBS_UnitWork> lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList();
                 return lis;
             }
             else
@@ -497,7 +497,7 @@ namespace BLL
         public static void InitUnitWorkDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
         {
             var unitWorks = from x in Funs.DB.WBS_UnitWork
-                            where x.ProjectId == projectId && x.SuperUnitWork == null
+                            where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                             orderby x.UnitWorkCode
                             select new
                             {
@@ -524,7 +524,7 @@ namespace BLL
         public static void InitUnitWorkNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
         {
             var unitWorks = from x in Funs.DB.WBS_UnitWork
-                            where x.ProjectId == projectId && x.SuperUnitWork == null
+                            where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                             orderby x.UnitWorkCode
                             select new
                             {
@@ -550,7 +550,7 @@ namespace BLL
         public static string GetUnitWorkALLName(string unitWorkId)
         {
             string name = string.Empty;
-            var getu = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == unitWorkId && x.SuperUnitWork == null);
+            var getu = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == unitWorkId && (x.SuperUnitWork == null || x.SuperUnitWork == "0"));
             if (getu != null)
             {
                 if (!string.IsNullOrEmpty(getu.ProjectType))
@@ -636,5 +636,41 @@ namespace BLL
                 return string.Empty;
             }
         }
+
+        /// <summary>
+        /// 是否可增加子级
+        /// </summary>
+        /// <param name="postName"></param>
+        /// <returns>true-可以，false-不可以</returns>
+        public static bool IsCanAddUnitWork(string unitWorkId)
+        {
+            var unitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == unitWorkId);
+            if (unitWork != null)
+            {
+                if (unitWork.IsChild == true)
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// 是否存在子级单位工程
+        /// </summary>
+        /// <param name="superUnitWork"></param>
+        /// <returns></returns>
+        public static bool IsExitsUnitWorkBySuperUnitWork(string superUnitWork)
+        {
+            return (from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == superUnitWork select x).Count() > 0;
+        }
+
     }
 }

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

@@ -702,7 +702,7 @@ namespace BLL
         public static int GetUnitProjectNum(string projectid)
         {
             int result = (from x in Funs.DB.WBS_UnitWork
-                          where x.ProjectId == projectid
+                          where x.ProjectId == projectid && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                           select x).Count();
             return result;
         }

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

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections;

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

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using Model;
 using System;
 using System.Collections;

SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using System;
 using System.Collections;
 using System.Collections.Generic;

SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using System;
 using System.Collections;
 using System.Collections.Generic;

SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs

@@ -42,6 +42,28 @@ namespace BLL
             }
         }
 
+        public static void StartUpdateSitePerson()
+        {
+            //var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault();
+            //if (getSynchroSet != null && getSynchroSet.Intervaltime.HasValue)
+            //{
+            //    adTimeJ = getSynchroSet.Intervaltime.Value;
+            //}
+            if (messageTimer != null)
+            {
+                messageTimer.Stop();
+                messageTimer.Dispose();
+                messageTimer = null;
+            }
+            messageTimer = new Timer
+            {
+                AutoReset = true
+            };
+            messageTimer.Elapsed += new ElapsedEventHandler(UpdateSitePerson);
+            messageTimer.Interval = 1000 * 60 * 60 * 24;// 60分钟 60000 * adTimeJ;
+            messageTimer.Start();
+        }
+
         /// <summary>
         /// 流程确认 定时执行 系统启动5分钟
         /// </summary>
@@ -75,6 +97,49 @@ namespace BLL
                 ErrLogInfo.WriteLog(ex, "数据接口定时器", "RealNameMonitorService.AdUserInProcess");
             }
         }
+
+        /// <summary>
+        /// 流程确认 定时执行 系统启动5分钟
+        /// </summary>
+        /// <param name="sender">Timer组件</param>
+        /// <param name="e">事件参数</param>
+        private static void UpdateSitePerson(object sender, ElapsedEventArgs e)
+        {
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var persons = from x in db.SitePerson_Person
+                                  join y in db.Base_Project on x.ProjectId equals y.ProjectId
+                                  join z in db.RealName_Project on y.JTProjectCode equals z.ProCode
+                                  join p in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
+                                  join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
+                                  join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
+                                  where z.JTproCode != null && x.IsCardNoOK == true && v.TeamId.HasValue && !x.OutTime.HasValue
+                                  && p.IsSynchro == true
+                                  select x;
+                    var personInOutNows = from x in db.RealName_PersonInOutNow select x;
+                    foreach (var person in persons)
+                    {
+                        var personInOutNow = personInOutNows.OrderByDescending(x => x.ChangeTime).FirstOrDefault();
+                        if (personInOutNow == null)
+                        {
+                            person.OutTime = DateTime.Now;
+                        }
+                        else if (personInOutNow.ChangeTime < DateTime.Now.AddDays(-3))
+                        {
+                            person.OutTime = personInOutNow.ChangeTime;
+                        }
+                    }
+                    db.SubmitChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                StartMonitor();
+                ErrLogInfo.WriteLog(ex, "数据接口定时器", "RealNameMonitorService.AdUserInProcess");
+            }
+        }
         #endregion
 
         #region 启动监视器 系统启动5分钟-实名制出入记录去重
@@ -159,7 +224,7 @@ namespace BLL
                     }
 
                     if (delCount >= 10000)
-                    {                        
+                    {
                         return;
                     }
                 }
@@ -185,7 +250,7 @@ namespace BLL
         /// </summary>
         public static void StartMonitorDeletePushLog()
         {
-            int adTimeJ =  60 * 4;         
+            int adTimeJ = 60 * 4;
             if (messageTimer1 != null)
             {
                 messageTimer1.Stop();

SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs

@@ -710,6 +710,81 @@ namespace FineUIPro.Web.AttachFile
                 ///保存方法
                 this.SaveData(source.ToString(), attachUrl);
                 ShowNotify("保存成功!", MessageBoxIcon.Success);
+
+                #region 统一人员资质上传功能2024-7-1
+                if (MenuId== BLL.Const.PersonListMenuId && Request.QueryString["strParam"]=="4")
+                {
+                    //如果是人员信息修改安全生产考核合格证书/特种作业操作证（同步 特种作业人员资质、安管人员资质）
+                    var personId = ToKeyId.Split('#')[0].ToString();
+                    var PersonQualityModel = Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonId == personId);
+                    if (PersonQualityModel!=null)
+                    {
+                        UploadFileService.SaveAttachUrl(source.ToString(), attachUrl, 
+                            BLL.Const.PersonQualityMenuId, PersonQualityModel.PersonQualityId);
+                    }
+
+                    var SafePersonQualityModel = Funs.DB.QualityAudit_SafePersonQuality.FirstOrDefault(x => x.PersonId == personId);
+                    if (SafePersonQualityModel != null)
+                    {
+                        UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+                            BLL.Const.SafePersonQualityMenuId, SafePersonQualityModel.SafePersonQualityId);
+                    }
+                }
+
+                if (MenuId== BLL.Const.PersonQualityMenuId)
+                {
+                    var PersonQualityModel = Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonQualityId == ToKeyId);
+                    if (PersonQualityModel!=null)
+                    {
+                        var personId = PersonQualityModel.PersonId;
+
+                        var SafePersonQualityModel = Funs.DB.QualityAudit_SafePersonQuality.FirstOrDefault(x => x.PersonId == personId);
+                        if (SafePersonQualityModel != null)
+                        {
+                            UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+                                BLL.Const.SafePersonQualityMenuId, SafePersonQualityModel.SafePersonQualityId);
+                        }
+
+                        var SitepersonModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId);
+                        if (SitepersonModel!=null)
+                        {
+                            UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+                               BLL.Const.PersonListMenuId, SitepersonModel.PersonId+"#4");
+                        }
+                    }
+                }
+
+                if (MenuId== BLL.Const.SafePersonQualityMenuId)
+                {
+                    var SafePersonQualityModel = Funs.DB.QualityAudit_SafePersonQuality.FirstOrDefault(x => x.SafePersonQualityId == ToKeyId);
+                    if (SafePersonQualityModel!=null)
+                    {
+                        var personId = SafePersonQualityModel.PersonId;
+                        var PersonQualityModel = Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonId == personId);
+                        if (PersonQualityModel != null)
+                        {
+                            UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+                                BLL.Const.PersonQualityMenuId, PersonQualityModel.PersonQualityId);
+                        }
+
+                        var SitepersonModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId);
+                        if (SitepersonModel != null)
+                        {
+                            UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+                               BLL.Const.PersonListMenuId, SitepersonModel.PersonId + "#4");
+                        }
+
+                    }
+                }
+                #endregion
+
+                //#region PunchlistFrom附件保存成功后处理事件
+                //if (MenuId == BLL.Const.PunchlistFromMenuId)
+                //{
+                //    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                //}
+                //#endregion
+
                 PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
         }

SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx

@@ -20,7 +20,7 @@
 
         .LabelColor {
             color: Red;
-            font-size: small;
+            font-size: small; 
         }
 
         /*.f-grid-row.LightRedRow {

SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs

@@ -109,7 +109,7 @@ namespace FineUIPro.Web.CQMS.Check
             string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
                           + @" QualityQuestionType.QualityQuestionType as QuestionType,chec.LimitDate,"
                           + @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,"
-                          + @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.userName "
+                          + @" unit.UnitName,unitWork.UnitWorkName,u.userName "
                           + @" FROM Check_CheckControl chec"
                           + @" left join Base_Unit unit on unit.unitId=chec.unitId"
                           + @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode"

SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs

@@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.Check
             if (e.Node.CommandName == "ProjectType")   //展开工程类型
             {
                 var trUnitWork = from x in Funs.DB.WBS_UnitWork
-                                 where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
+                                 where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") && x.ProjectType == e.Node.NodeID
                                  select x;
                 trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
                 if (trUnitWork.Count() > 0)

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -403,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -169,7 +169,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             select x;
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
-                var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId  select x;
+                var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId
+                                    && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
+                                    select x;
 
                 for (int i = 0; i < ir; i++)
                 {
@@ -386,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             select x;
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
-                var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x;
+                var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x;
                 var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder
                                    where x.ProjectId == this.CurrUser.LoginProjectId
                                    select x;

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

@@ -261,11 +261,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     }
 
                     string row9 = pds.Rows[i][9].ToString();
-                    if (string.IsNullOrEmpty(row9))
-                    {
-                        result += (i + 2).ToString() + "," + "上报日期" + "," + "此项为必填项！" + "|";
-                    }
-                    else
+                    if (!string.IsNullOrEmpty(row9))
                     {
                         try
                         {

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

@@ -171,7 +171,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
                 for (int i = 1; i < ir; i++)
                 {
@@ -428,7 +428,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork=="0")
                                 select x;
 
                 var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -412,7 +412,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -92,7 +92,7 @@
                     <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">
                         </f:Button>
 
                          <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -41,7 +41,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
 
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 this.DesignDetailsId = Request.Params["DesignDetailsId"];
                 Model.Comprehensive_DesignDetails designDetails = BLL.DesignDetailsService.GetDesignDetailsById(this.DesignDetailsId);
@@ -114,7 +114,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 else
                 {
                     this.txtDetailsDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.btnSave.Hidden = false;
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
                 }
             }

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -429,7 +429,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -105,7 +105,7 @@
                     <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">
                         </f:Button>
 
                          <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -42,7 +42,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
                 
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 this.DesignDrawingsId = Request.Params["DesignDrawingsId"];
                 Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.DesignDrawingsId);
@@ -104,7 +104,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 }
                 else
                 {
-                    this.btnSave.Hidden = false;
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
                 }
             }

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -403,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -64,7 +64,7 @@
                     <Items>
                         <f:HiddenField ID="hdAttachUrl" runat="server">
                         </f:HiddenField>
-                        <f:Button ID="btnSave" Icon="SystemSave" ToolTip="保存" runat="server" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
+                        <f:Button ID="btnSave" Icon="SystemSave" ToolTip="保存" Text="保存" runat="server" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
                         </f:Button>
                     </Items>
                 </f:Toolbar>

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

@@ -17,6 +17,9 @@
             color: Red;
             font-size: small;
         }
+        .f-grid-row.Gray {
+            background-color: gray;
+        }
     </style>
 </head>
 <body>

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

@@ -34,7 +34,7 @@ namespace FineUIPro.Web.Comprehensive
         {
             string strSql = @"select InspectionMachineId, InspectionMachineCode, U.UnitName,CN.ProfessionalName ,Status,
                               InspectionMachineName, SpecificationModel, NextTestDate, TestCycle, C.InspectionDate,
-                              InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode   
+                              InspectionDate CompileDate, (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification, InspectionType, LeaveDate, UnitsCount,C.RemarkCode,C.IsOnSite   
                               from Comprehensive_InspectionMachine C 
                               left join Base_Unit U on C.UnitId=U.UnitId
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.Comprehensive
             DataRowView row = e.DataItem as DataRowView;
             string IsVerification = row["IsVerification"].ToString();
             string NextTestDate = row["NextTestDate"].ToString();
-            string InspectionType= row["InspectionType"].ToString();
+            string InspectionType = row["InspectionType"].ToString();
             if (InspectionType == "计量")
             {
                 if (IsVerification == "是" && !string.IsNullOrEmpty(NextTestDate))  //在校验期内
@@ -126,6 +126,13 @@ namespace FineUIPro.Web.Comprehensive
 
                 }
             }
+            //离场为灰色
+            string LeaveDate = row["LeaveDate"].ToString();
+            string IsOnSite = row["IsOnSite"].ToString();
+            if (!string.IsNullOrEmpty(LeaveDate) || IsOnSite == "False")
+            {
+                e.RowCssClass = "Gray";
+            }
         }
 
         #region 查询

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

@@ -459,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
                         oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
-                                                                       && x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()));
+                                                                       && x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()));
                         if (oldViewInfo==null)
                         {
                             Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();

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

@@ -17,6 +17,9 @@
             color: Red;
             font-size: small;
         }
+        .f-grid-row.Gray {
+            background-color: gray;
+        }
     </style>
 </head>
 <body>

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

@@ -301,25 +301,27 @@ namespace FineUIPro.Web.Comprehensive
         {
             DataRowView row = e.DataItem as DataRowView;
 
-
             string ValidityDate = row["ValidityDate"].ToString();
             if (!string.IsNullOrEmpty(ValidityDate))
             {
                 if (DateTime.Compare(DateTime.Parse(ValidityDate).AddDays(-15), DateTime.Now) < 0)
                 {
-                   // Grid1.Rows[e.RowIndex].RowCssClass = "Red";
-                   //过期为红色
+                    // Grid1.Rows[e.RowIndex].RowCssClass = "Red";
+                    //过期为红色
                     e.RowCssClass = "Red";
-
                 }
             }
             else
             {
                 e.RowCssClass = "Yellow";
-
-
             }
-
+            //离场人员为灰色
+            string DepartureTime = row["DepartureTime"].ToString();
+            string IsOnSite = row["IsOnSite"].ToString();
+            if (!string.IsNullOrEmpty(DepartureTime) || IsOnSite == "False")
+            {
+                e.RowCssClass = "Gray";
+            }
         }
         /// <summary>
         /// Grid行点击事件

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 var posts = from x in Funs.DB.Base_Post select x;
@@ -456,7 +456,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 var posts = from x in Funs.DB.Base_Post select x;

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -397,7 +397,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -53,14 +53,14 @@
                         <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="130px">
+                        </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
                                 <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="130px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
                             HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
@@ -89,6 +89,9 @@
                         </f:RenderField>
                         <f:RenderField ColumnID="ResponsibleMan" DataField="ResponsibleMan" FieldType="String" HeaderText="责任人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SupervisorName" DataField="SupervisorName" FieldType="String" HeaderText="监督人" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                                <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>

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

@@ -29,12 +29,13 @@ namespace FineUIPro.Web.Comprehensive
         }
         public void BindGrid()
         {
-            string strSql = @"select NCRManagementId, ProjectId, SendUnit,  NCRCode, Contents,Problem,Measure,IssuedDate, ReceiveUnit,Status,
-                              ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState, 
-                              CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode  
+            string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit,  C.NCRCode, C.Contents,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";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -357,7 +358,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim()));
             }
-            lists = lists.OrderBy(x => x.RemarkCode);
+            lists = lists.OrderBy(x => x.IssuedDate);
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
@@ -417,11 +418,16 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(3);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.Contents);//主要内容
+                    string unitWorkName = string.Empty;
+                    if (!string.IsNullOrEmpty(item.UnitWorkId))
+                    {
+                        unitWorkName = ConvertUnitWork(item.UnitWorkId);
+                    }
+                    cell.SetCellValue(unitWorkName);//单位工程
 
                     cell = row.CreateCell(4);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
+                    cell.SetCellValue(item.Contents);//主要内容
 
                     cell = row.CreateCell(5);
                     cell.CellStyle = cellStyle;
@@ -433,13 +439,8 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(7);
                     cell.CellStyle = cellStyle;
-                    string unitWorkName = string.Empty;
-                    if (!string.IsNullOrEmpty(item.UnitWorkId))
-                    {
-                        unitWorkName = ConvertUnitWork(item.UnitWorkId);
-                    }
-                    cell.SetCellValue(unitWorkName);//单位工程
-
+                    cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
+                    
                     cell = row.CreateCell(8);
                     cell.CellStyle = cellStyle;
                     string receiveUnitName = string.Empty;
@@ -460,18 +461,27 @@ namespace FineUIPro.Web.Comprehensive
 
                     cell = row.CreateCell(10);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.ResponsibleMan);//责任人
+                    cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
 
                     cell = row.CreateCell(11);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
-
+                    cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
+                    
                     cell = row.CreateCell(12);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
+                    cell.SetCellValue(item.ResponsibleMan);//责任人
 
                     cell = row.CreateCell(13);
                     cell.CellStyle = cellStyle;
+                    string supervisorName = string.Empty;
+                    if (!string.IsNullOrEmpty(item.Supervisor))
+                    {
+                        supervisorName = BLL.UserService.GetUserNameByUserId(item.Supervisor);
+                    }
+                    cell.SetCellValue(supervisorName);//监督人
+
+                    cell = row.CreateCell(14);
+                    cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号
 
                     i++;

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

@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 14);
+                AddDatasetToSQL(ds.Tables[0], 15);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -175,9 +175,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
+                var users = from x in Funs.DB.Project_ProjectUser
+                            join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            && x.UnitId == BLL.Const.UnitId_CWCEC
+                            select y;
+
                 for (int i = 1; i < ir; i++)
                 {
                     string row0 = pds.Rows[i][0].ToString();
@@ -214,16 +220,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         result += (i + 2).ToString() + "," + "NCR单号" + "," + "此项为必填项！" + "|";
                     }
 
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    string row3 = pds.Rows[i][3].ToString();
+                    if (!string.IsNullOrEmpty(row3))
                     {
-                        try
+                        string[] reunit = row3.Split(',');
+                        foreach (string unitWork in reunit)
                         {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "下发日期" + "," + "[" + row4 + "]错误！" + "|";
+                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+                            if (u == null)
+                            {
+                                result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
+                            }
                         }
                     }
 
@@ -239,17 +246,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     string row7 = pds.Rows[i][7].ToString();
                     if (!string.IsNullOrEmpty(row7))
                     {
-                        string[] reunit = row7.Split(',');
-                        foreach (string unitWork in reunit)
+                        try
                         {
-                            var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
-                            if (u == null)
-                            {
-                                result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
-                            }
+                            DateTime date = Convert.ToDateTime(row7.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "下发日期" + "," + "[" + row7 + "]错误！" + "|";
                         }
                     }
 
+
                     string row8 = pds.Rows[i][8].ToString();
                     if (!string.IsNullOrEmpty(row8))
                     {
@@ -273,6 +280,19 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                     }
 
+                    string row10 = pds.Rows[i][10].ToString();
+                    if (!string.IsNullOrEmpty(row10))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row10.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row10 + "]错误！" + "|";
+                        }
+                    }
+
                     string row11 = pds.Rows[i][11].ToString();
                     if (!string.IsNullOrEmpty(row11))
                     {
@@ -282,25 +302,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         }
                         catch (Exception)
                         {
-                            result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row11 + "]错误！" + "|";
-                        }
-                    }
-
-                    string row12 = pds.Rows[i][12].ToString();
-                    if (!string.IsNullOrEmpty(row12))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row12.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|";
+                            result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row11 + "]错误！" + "|";
                         }
                     }
 
                     string row13 = pds.Rows[i][13].ToString();
-                    if (string.IsNullOrEmpty(row13))
+                    if (!string.IsNullOrEmpty(row13))
+                    {
+                        var u = users.Where(x => x.UserName == row13).FirstOrDefault();
+                        if (u == null)
+                        {
+                            result += (i + 2).ToString() + "," + "监督人" + "," + "[" + row13 + "]不存在！" + "|";
+                        }
+                    }
+
+                    string row14 = pds.Rows[i][14].ToString();
+                    if (string.IsNullOrEmpty(row14))
                     {
                         result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
                     }
@@ -308,11 +325,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     {
                         try
                         {
-                            int t = Convert.ToInt32(row13);
+                            int t = Convert.ToInt32(row14);
                         }
                         catch (Exception)
                         {
-                            result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row13 + "]错误！" + "|";
+                            result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row14 + "]错误！" + "|";
                         }
                     }
                 }
@@ -420,7 +437,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 14);
+                AddDatasetToSQL2(ds.Tables[0], 15);
             }
             catch (Exception ex)
             {
@@ -461,16 +478,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
+                var users = from x in Funs.DB.Project_ProjectUser
+                            join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            && x.UnitId == BLL.Const.UnitId_CWCEC
+                            select y;
+
                 for (int i = 1; i < ir; i++)
                 {
                     Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement();
                     string row0 = pds.Rows[i][0].ToString().Trim();
                     string row1 = pds.Rows[i][1].ToString().Trim();
                     var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault();
-                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][13].ToString().Trim())
+                    oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][14].ToString().Trim())
                                                          ).FirstOrDefault();
                     if (oldViewInfo == null)
                     {
@@ -480,33 +503,36 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         des.SendUnit = units.Where(x => x.UnitName == row0.Trim()).FirstOrDefault().UnitId;
                         des.CNProfessionalId = cn.CNProfessionalId;
                         des.NCRCode = pds.Rows[i][2].ToString().Trim();
-                        des.Contents = pds.Rows[i][3].ToString().Trim();
-                        if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
+                        if (!string.IsNullOrEmpty(pds.Rows[i][3].ToString().Trim()))
                         {
-                            des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim());
+                            des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][3].ToString().Trim());
                         }
+                        des.Contents = pds.Rows[i][4].ToString().Trim();
                         des.Problem = pds.Rows[i][5].ToString().Trim();
                         des.Measure = pds.Rows[i][6].ToString().Trim();
                         if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
                         {
-                            des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim());
-                        }
+                            des.IssuedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());
+                        }                        
                         if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
                         {
                             des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim());
                         }
-
                         des.ImplementationFrontState = pds.Rows[i][9].ToString().Trim();
-                        des.ResponsibleMan = pds.Rows[i][10].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
+                        {
+                            des.ClosedDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
+                        }
                         if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim()))
                         {
-                            des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
+                            des.CompleteDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
                         }
-                        if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
+                        des.ResponsibleMan = pds.Rows[i][12].ToString().Trim();
+                        if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim()))
                         {
-                            des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
+                            des.Supervisor = users.FirstOrDefault(x => x.UserName == pds.Rows[i][13].ToString().Trim()).UserId;
                         }
-                        des.RemarkCode = Funs.GetNewInt(pds.Rows[i][13].ToString().Trim());
+                        des.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
                         des.Status = BLL.Const.Comprehensive_Compile;
                         des.CompileMan = this.CurrUser.UserId;
                         BLL.NCRManagementService.AddNCRManagement(des);

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

@@ -59,6 +59,7 @@
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpUnitIds" runat="server" Label="接收单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelWidth="130px" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
+                        <f:DropDownList ID="drpSupervisor" runat="server" Label="监督人" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

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

@@ -39,6 +39,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
                 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, true);//监督人
                 //LoadAuditSelect();
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
@@ -89,6 +90,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     this.txtResponsibleMan.Text = nCRManagement.ResponsibleMan;
                     //this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState;                  
                     this.ddlImplementationFrontState.SelectedValue = nCRManagement.ImplementationFrontState;
+
+                    if (!string.IsNullOrEmpty(nCRManagement.Supervisor))
+                    {
+                        this.drpSupervisor.SelectedValue = nCRManagement.Supervisor;
+                    }
                   
                     //var currApprove = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId);
                     //if (currApprove != null)
@@ -154,8 +160,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             this.ddlProblem.Readonly = true;
             //this.btnAttach.Enabled = false; 
             this.txtRemarkCode.Readonly = true;
-           
-
+            this.drpSupervisor.Readonly = true;
         }
 
         ///// <summary>
@@ -273,6 +278,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             }
             nCRManagement.ReceiveUnit = unitIds;
             nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
+            if (this.drpSupervisor.SelectedValue!=BLL.Const._Null)
+            {
+                nCRManagement.Supervisor = this.drpSupervisor.SelectedValue;
+            }
             if (string.IsNullOrEmpty(this.NCRManagementId))
             {
                 if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))

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

@@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitIds;
         
+        /// <summary>
+        /// drpSupervisor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpSupervisor;
+        
         /// <summary>
         /// ddlImplementationFrontState 控件。
         /// </summary>

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

@@ -94,7 +94,7 @@
                     <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">
                         </f:Button>
 
                         <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
                 
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 this.PressurePipeId = Request.Params["PressurePipeId"];
                 Model.Comprehensive_PressurePipe pressurePipe = BLL.PressurePipeService.GetPressurePipeById(this.PressurePipeId);
@@ -99,7 +99,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 else
                 {
                     this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.btnSave.Hidden = false;
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
                 }
             }

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

@@ -173,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -379,7 +379,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -101,7 +101,7 @@
                         <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                         <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">
                         </f:Button>
 
                          <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //LoadAuditSelect();
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 
                 this.QualityAccidentId = Request.Params["QualityAccidentId"];
@@ -95,7 +95,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 else
                 {
                     this.txtTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.btnSave.Hidden = false;
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
                 }
             }

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

@@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)
@@ -407,7 +407,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var unitWorks = from x in Funs.DB.WBS_UnitWork
                                 where x.ProjectId == this.CurrUser.LoginProjectId
-                                && x.SuperUnitWork == null
+                                && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
                                 select x;
 
                 for (int i = 1; i < ir; i++)

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

@@ -85,7 +85,7 @@
                     <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">
                         </f:Button>
 
                          <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -42,7 +42,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
 
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 this.Id = Request.Params["Id"];
                 var model = BLL.ReviewDrawingsService.Detail(this.Id);
@@ -98,11 +98,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     //    }
                     //}
                 }
-                else
-                {
-                    this.btnSave.Hidden = false;
+                //else
+                //{
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
-                }
+                //}
             }
         }
 

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

@@ -166,7 +166,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
                             where y.ProjectId == this.CurrUser.LoginProjectId && (y.UnitType == Const.ProjectUnitType_1 || y.UnitType == Const.ProjectUnitType_2)
                             select x;
-                var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x;
+                var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId 
+                          && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
+                          orderby x.UnitWorkCode
+                          select x;
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
 
                 for (int i = 1; i < ir; i++)
@@ -394,7 +397,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                             select x;
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
-                var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null select x;
+                var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x;
                 var oldViewInfos = from x in Funs.DB.Comprehensive_SiteVisaManagement
                                    where x.ProjectId == this.CurrUser.LoginProjectId
                                    select x;

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

@@ -102,7 +102,7 @@
                     <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">
                         </f:Button>
 
                          <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -42,7 +42,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
                 
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 this.VisaId = Request.Params["VisaId"];
                 Model.Comprehensive_SiteVisaManagement siteVisaManagement = BLL.SiteVisaManagementService.GetSiteVisaManagementById(this.VisaId);
@@ -113,7 +113,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 else
                 {
                     this.txtVisaDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.btnSave.Hidden = false;
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
                 }
             }

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

@@ -89,7 +89,7 @@
                     <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" >
                         </f:Button>
 
                          <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">

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

@@ -43,7 +43,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
                 
-                this.btnSave.Hidden = true;
+                //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 Model.Comprehensive_SpecialEquipment specialEquipment = BLL.SpecialEquipmentServices.GetEquipmentById(this.SpecialEquipmentId);
                 if (specialEquipment != null)
@@ -103,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 else
                 {
                     this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    this.btnSave.Hidden = false;
+                    //this.btnSave.Hidden = false;
                     //this.btnSubmit.Hidden = false;
 
                 }

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

@@ -2287,7 +2287,7 @@ namespace FineUIPro.Web.CQMS.DataBase
         private void WBSDataBind(string cNProfessionalCode)
         {
             this.tvWBS.Nodes.Clear();
-            var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
             foreach (var q in installations)
             {
                 TreeNode newNode = new TreeNode();
@@ -2362,7 +2362,7 @@ namespace FineUIPro.Web.CQMS.DataBase
         private void WBSDataBind2(string cNProfessionalCode)
         {
             this.tvWBS2.Nodes.Clear();
-            var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
             foreach (var q in installations)
             {
                 TreeNode newNode = new TreeNode();

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

@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign
             this.tvControlItem.AutoScroll = true;
             this.tvControlItem.EnableSingleClickExpand = true;
 
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
             foreach (var item in unitWorks)
             {
                 TreeNode rootNode1 = new TreeNode();

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

@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign
             this.tvControlItem.AutoScroll = true;
             this.tvControlItem.EnableSingleClickExpand = true;
 
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
             foreach (var item in unitWorks)
             {
                 TreeNode rootNode1 = new TreeNode();

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

@@ -219,27 +219,64 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     #region 加载文本框内容
                     var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
-                    txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
-                    txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
-                    txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
-
-                    txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
-                    txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
-                    txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
-                    txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
-
-                    imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
-                    txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
-                    imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
-                    txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
-                    imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
-                    txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
-                    imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
-                    txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
-                    imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
-                    txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
-                    imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
-                    txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
+                    {
+                        txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
+                    {
+                        txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
+                    {
+                        txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
+                    {
+                        txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
+                    {
+                        txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
+                    {
+                        txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
+                    {
+                        txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
+                    {
+                        imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
+                        txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
+                    {
+                        imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
+                        txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
+                    {
+                        imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
+                        txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
+                    {
+                        imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
+                        txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
+                    {
+                        imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
+                        txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
+                    {
+                        imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
+                        txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                    }
                     #endregion
 
                     //加载所有grid
@@ -1365,12 +1402,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                 c.ProjectId,
                                 u.UnitId,
                                 u.UnitName,
-                                c.CompileDate
+                                c.InspectionDate
                             };
 
                 var AllList = query.ToList();
                 var monethCount = query
-                    .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
+                    .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
 
                 Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
 
@@ -1517,8 +1554,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             CheckLotBindStatisc("PP");//检验批统计:管道
             CheckLotBindStatisc("EL");//检验批统计:电气
             CheckLotBindStatisc("IN");//检验批统计:仪表
-            CheckLotBindStatisc("FF");//检验批统计:反腐
-            CheckLotBindStatisc("XF");//检验批统计:消防
+            CheckLotBindStatisc("AC");//检验批统计:反腐
+            CheckLotBindStatisc("FF");//检验批统计:消防
 
             #region 现场质量共检数据合计
             DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
@@ -1535,20 +1572,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             string Quantity1Sum = String.Empty;//本月检查合格点数/本月检查点数
             string Quantity2Sum = String.Empty;//累计检查合格点数/累计检查点数
 
-
-            //加载所有单位
-            //var units = from x in db.Project_ProjectUnit
-            //            join y in db.Base_Unit on x.UnitId equals y.UnitId
-            //            where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
-            //            orderby y.UnitCode
-            //            select new { x.UnitId, y.UnitName };
             var inspectionUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
             var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
                              join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
                              from u in unitJoin.DefaultIfEmpty()
                              select new
                              {
-                                 c.CheckDate,
+                                 c.InspectionDate,
                                  c.ProjectId,
                                  u.UnitId,
                                  u.UnitName,
@@ -1560,7 +1590,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
                             select new
                             {
-                                x.CheckDate,
+                                x.InspectionDate,
                                 x.ProjectId,
                                 x.UnitId,
                                 x.UnitName,
@@ -1568,7 +1598,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             };
                 var AllList = query.ToList();
                 var monethCount = query
-                    .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
+                    .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate)));
 
 
                 Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
@@ -1675,13 +1705,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             }
             //int i = 1;
             string cNProfessionalId = (from x in db.Base_CNProfessional where x.CNProfessionalCode == cNProfessionalCode select x.CNProfessionalId).FirstOrDefault();
-
+            
             List<string> workNames = new List<string>();
             //专业下所有集合
-            List<Model.View_CQMS_InspectionManagementDetail> totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
+            List<Model.View_MonthReport_InspectionManagement> totalManagementList = BLL.InspectionManagementService.getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
             //专业下当期集合
-            List<Model.View_CQMS_InspectionManagementDetail> managementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false);
+            List<Model.View_MonthReport_InspectionManagement> managementList = BLL.InspectionManagementService.getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false);
             workNames = totalManagementList.Select(x => x.UnitWorkId).DefaultIfEmpty().Distinct()?.ToList();
+
             foreach (string item in workNames)
             {
                 Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(item);
@@ -1841,7 +1872,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 GvYb.SummaryData = summary;
             }
             //检验批统计:防腐
-            if (cNProfessionalCode == "FF")
+            if (cNProfessionalCode == "AC")
             {
                 this.GvFf.DataSource = StatisticsList;
                 this.GvFf.DataBind();
@@ -1860,7 +1891,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 GvFf.SummaryData = summary;
             }
             //检验批统计:消防
-            if (cNProfessionalCode == "XF")
+            if (cNProfessionalCode == "FF")
             {
                 this.GvXf.DataSource = StatisticsList;
                 this.GvXf.DataBind();

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

@@ -1509,8 +1509,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             CheckLotBindStatisc("PP");//检验批统计:管道
             CheckLotBindStatisc("EL");//检验批统计:电气
             CheckLotBindStatisc("IN");//检验批统计:仪表
-            CheckLotBindStatisc("FF");//检验批统计:反腐
-            CheckLotBindStatisc("XF");//检验批统计:消防
+            CheckLotBindStatisc("AC");//检验批统计:反腐
+            CheckLotBindStatisc("FF");//检验批统计:消防
 
             #region 现场质量共检数据合计
             DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
@@ -1670,9 +1670,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
             List<string> workNames = new List<string>();
             //专业下所有集合
-            List<Model.View_CQMS_InspectionManagementDetail> totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
+            List<Model.View_MonthReport_InspectionManagement> totalManagementList = BLL.InspectionManagementService.getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
             //专业下当期集合
-            List<Model.View_CQMS_InspectionManagementDetail> managementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false);
+            List<Model.View_MonthReport_InspectionManagement> managementList = BLL.InspectionManagementService.getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false);
             workNames = totalManagementList.Select(x => x.UnitWorkId).DefaultIfEmpty().Distinct()?.ToList();
             foreach (string item in workNames)
             {
@@ -1833,7 +1833,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 GvYb.SummaryData = summary;
             }
             //检验批统计:防腐
-            if (cNProfessionalCode == "FF")
+            if (cNProfessionalCode == "AC")
             {
                 this.GvFf.DataSource = StatisticsList;
                 this.GvFf.DataBind();
@@ -1852,7 +1852,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 GvFf.SummaryData = summary;
             }
             //检验批统计:消防
-            if (cNProfessionalCode == "XF")
+            if (cNProfessionalCode == "FF")
             {
                 this.GvXf.DataSource = StatisticsList;
                 this.GvXf.DataBind();

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

@@ -22,7 +22,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
+                                <f:DropDownList ID="drpUnit" runat="server" Label="施工分包商" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
                                 </f:DropDownList>

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

@@ -23,7 +23,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             {
                 GetButtonPower();
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
-                UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
                 BindGrid();
             }
         }
@@ -59,25 +59,25 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                           + @" WHERE P.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            if (drpUnitWork.SelectedValue != BLL.Const._Null)
+            if (drpUnit.SelectedValue != BLL.Const._Null)
             {
-                strSql += " AND D.UnitWorkId=@UnitWorkId";
-                listStr.Add(new SqlParameter("@UnitWorkId", drpUnitWork.SelectedValue));
+                strSql += " AND P.UnitId=@UnitId";
+                listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
             }
             if (drpCNProfessional.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND P.CNProfessionalId=@CNProfessionalId";
                 listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            if (!string.IsNullOrEmpty(txtStarTime.Text))
             {
-                strSql += " AND P.InspectionDate >= @InspectionDate";
-                listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+                strSql += " AND P.InspectionDate >= @startTime";
+                listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text)));
             }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            if (!string.IsNullOrEmpty(txtEndTime.Text))
             {
-                strSql += " AND P.InspectionDate <= @InspectionDate";
-                listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                strSql += " AND P.InspectionDate <= @endTime";
+                listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text)));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -251,9 +251,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                          on x.InspectionId equals y.InspectionId
                          where y.ProjectId == this.CurrUser.LoginProjectId
                          select y);
-            if (drpUnitWork.SelectedValue != BLL.Const._Null)
+            if (drpUnit.SelectedValue != BLL.Const._Null)
             {
-                lists = lists.Where(x => x.UnitWorkId == drpUnitWork.SelectedValue);
+                lists = lists.Where(x => x.UnitId == drpUnit.SelectedValue);
             }
             if (drpCNProfessional.SelectedValue != BLL.Const._Null)
             {

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

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

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

@@ -22,7 +22,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelAlign="Right" LabelWidth="110px">
+                                <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>

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

@@ -26,7 +26,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             {
                 GetButtonPower();
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
-                UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
                 BindGrid();
             }
         }
@@ -59,10 +59,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                             + @" WHERE P.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            if (drpUnitWork.SelectedValue != BLL.Const._Null)
+            if (drpUnit.SelectedValue != BLL.Const._Null)
             {
-                strSql += " AND D.UnitWorkId=@UnitWorkId";
-                listStr.Add(new SqlParameter("@UnitWorkId", drpUnitWork.SelectedValue));
+                strSql += " AND P.UnitId=@UnitId";
+                listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
             }
             if (drpCNProfessional.SelectedValue != BLL.Const._Null)
             {
@@ -71,13 +71,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
             if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
             {
-                strSql += " AND P.InspectionDate >= @InspectionDate";
-                listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+                strSql += " AND P.InspectionDate >= @startTime";
+                listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
             {
-                strSql += " AND P.InspectionDate <= @InspectionDate";
-                listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                strSql += " AND P.InspectionDate <= @endTime";
+                listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -279,9 +279,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                          on x.InspectionId equals y.InspectionId
                          where y.ProjectId == this.CurrUser.LoginProjectId
                          select y);
-            if (drpUnitWork.SelectedValue != BLL.Const._Null)
+            if (drpUnit.SelectedValue != BLL.Const._Null)
             {
-                lists = lists.Where(x => x.UnitWorkId == drpUnitWork.SelectedValue);
+                lists = lists.Where(x => x.UnitId == drpUnit.SelectedValue);
             }
             if (drpCNProfessional.SelectedValue != BLL.Const._Null)
             {

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

@@ -58,13 +58,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         protected global::FineUIPro.Toolbar ToolSearch;
         
         /// <summary>
-        /// drpUnitWork 控件。
+        /// drpUnit 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWork;
+        protected global::FineUIPro.DropDownList drpUnit;
         
         /// <summary>
         /// drpCNProfessional 控件。

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

@@ -71,7 +71,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             this.trWBS.EnableIcons = true;
             this.trWBS.AutoScroll = true;
             this.trWBS.EnableSingleClickExpand = true;
-            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
+            var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x;
             foreach (var q in unitWorks)
             {
                 TreeNode newNode = new TreeNode();

SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx

@@ -14,8 +14,8 @@
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="质量管理制度" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange"
-                    runat="server" BoxFlex="1" DataKeyNames="QualityManagementSysId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="QualityManagementSysId" AllowSorting="true" SortField="ApprovalDate"
-                    SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                    runat="server" BoxFlex="1" DataKeyNames="QualityManagementSysId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="QualityManagementSysId" AllowSorting="true" SortField="FileCode"
+                    SortDirection="ASC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">

SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs

@@ -224,7 +224,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             {
                 lists = lists.Where(x => x.FileName.Contains(this.txtFileName.Text.Trim()));
             }
-            lists = lists.OrderByDescending(x => x.ApprovalDate);
+            lists = lists.OrderBy(x => x.FileCode);
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx

@@ -17,7 +17,7 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="true" Title="现场控制点裁剪"
-                    runat="server" EnableCollapse="true" DataKeyNames="ControlId,ParentId,ControlLevel,States" EnableTree="true"
+                    runat="server" EnableCollapse="true" DataKeyNames="ControlId,ParentId,ControlLevel,States,MaxLevel" EnableTree="true"
                     TreeColumn="DetectionItems" DataIDField="ControlId" AllowPaging="false" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
                     AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand" ExpandAllTreeNodes="true" EnableMultiSelect="false">
                     <Toolbars>