diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-28-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-28-bwj.sql
new file mode 100644
index 00000000..ef05d2f8
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-05-28-bwj.sql
@@ -0,0 +1,3 @@
+alter table Comprehensive_NCRManagement alter column Measure nvarchar(1000)
+alter table Comprehensive_NCRManagement alter column Problem nvarchar(1000)
+go
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
index 08f047ec..396437fa 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="施工技术交底管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ConTechnologyDisclosureId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="ConTechnologyDisclosureId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="ConTechnologyDisclosureId" AllowSorting="true" SortField="DisclosureDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
index 51eb19ad..a3fc80d1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="资料收发文登记记录" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="DataReceivingDocId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="DataReceivingDocId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="DataReceivingDocId" AllowSorting="true" SortField="ReceiveDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx
index 90fa1098..aa073ff7 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设计变更单" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="DesignChangeOrderId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="DesignChangeOrderId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="DesignChangeOrderId" AllowSorting="true" SortField="IssuedDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx
index d3b260b5..96063d19 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设计交底管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="DesignDetailsId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="DesignDetailsId" AllowSorting="true"
-                    SortField="RemarCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    SortField="DetailsDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
index b508159b..8728e512 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             {
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
                 BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorks, this.CurrUser.LoginProjectId, false);
-                BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
+                BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
                 LoadAuditSelect();
                 this.agree.Hidden = true;
                 this.options.Hidden = true;
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
index c83b8e00..f9bd525c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸收发记录" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="DesignDrawingsId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="DesignDrawingsId" AllowSorting="true"
-                    SortField="RemarkCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    SortField="SendDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx
index 7fddcb12..a9e10cb0 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="施工组织设计及施工方案" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="GeneralPlanApprovalId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="GeneralPlanApprovalId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="GeneralPlanApprovalId" AllowSorting="true" SortField="ApprovalDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
index 86852203..93cbcdde 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="InspectionDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
index 49b3fb13..2d23213c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
@@ -26,7 +26,7 @@
             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="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="RemarkCode"
+                    runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="InspectionDate"
                     SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnRowDataBound="Grid1_RowDataBound"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
index e67a17df..5117c16f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
@@ -27,7 +27,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人员报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="ApprovalTime"
                     SortDirection="DESC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"   OnRowDataBound="Grid1_RowDataBound"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
index 1ee77feb..73e5dcf8 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
@@ -16,7 +16,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检验试验计划" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ApprovalDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
index a21337d8..d581e069 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="超过一定规模的危大施工方案" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="MajorPlanApprovalId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="MajorPlanApprovalId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="MajorPlanApprovalId" AllowSorting="true" SortField="ApprovalDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
index e9c8a125..bc2bd4f6 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="NCR管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="NCRManagementId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="IssuedDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
index 15914813..37bfe503 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
@@ -48,7 +48,7 @@
                 </f:FormRow>
                  <f:FormRow>
                     <Items>
-                        <f:TextArea ID="txtMeasure" runat="server" Label="改进措施" MaxLength="500" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
+                        <f:TextArea ID="txtMeasure" runat="server" Label="改进措施" MaxLength="1000" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx
index 7c73a7f9..8ad01d7e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量事故处理记录" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="QualityAccidentId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="QualityAccidentId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="QualityAccidentId" AllowSorting="true" SortField="Time"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx
index 26762a84..b95a242c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸收发记录" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
-                    SortField="RemarkCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    SortField="ReviewDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
index 78007deb..318e4b2e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 GetButtonPower();
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
                 BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
-                BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
+                BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
                 LoadAuditSelect();
                 this.agree.Hidden = true;
                 this.options.Hidden = true;
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx
index 045cfaf7..9b2042d1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx
@@ -15,7 +15,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场签证管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="VisaId" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="VisaId" AllowSorting="true" SortField="RemarkCode"
+                    ClicksToEdit="2" DataIDField="VisaId" AllowSorting="true" SortField="VisaDate"
                     SortDirection="DESC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 67bf69dc..a4669f34 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -436,8 +436,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var generalPlanUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in generalPlanUnits)
             {
 
                 var query = from c in db.Comprehensive_GeneralPlanApproval
@@ -518,8 +518,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var majorPlanUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in majorPlanUnits)
             {
 
                 var query = from c in db.Comprehensive_MajorPlanApproval
@@ -858,8 +858,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
             }
             int i = 1;
-            var cNProfessionals = from x in db.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
-                                  && x.CNProfessionalId != BLL.Const.ComprehensiveId orderby x.SortIndex select x;
+            var cNProfessionals = from x in db.Base_CNProfessional
+                                  where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+ && x.CNProfessionalId != BLL.Const.ComprehensiveId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
+                                  orderby x.SortIndex
+                                  select x;
             foreach (var item in cNProfessionals)
             {
                 //专业下所有集合
@@ -928,10 +931,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
-            foreach (var item in units)
+            var passWelderUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
+            foreach (var item in passWelderUnits)
             {
-
                 var query = from c in db.Comprehensive_InspectionPerson
 
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -1152,12 +1154,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2)
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
+            var nondestructiveTestUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
 
             int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计
 
 
-            foreach (var item in units)
+            foreach (var item in nondestructiveTestUnits)
             {
                 int? num0 = 0, num1 = 0;//拍片数量小计
 
@@ -1343,10 +1345,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var inspectionEquipmentUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in inspectionEquipmentUnits)
             {
-
                 var query = from c in db.Comprehensive_InspectionEquipment
 
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -1452,8 +1453,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var measuringInspectionUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in measuringInspectionUnits)
             {
                 var query = from c in db.Comprehensive_InspectionMachine
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -1541,7 +1542,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            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()
@@ -1553,7 +1554,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                  u.UnitName,
                                  c.IsOnceQualified
                              };
-            foreach (var item in units)
+            foreach (var item in inspectionUnits)
             {
                 var query = from x in cqmsDetail
                             where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
@@ -1902,8 +1903,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var pressureUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in pressureUnits)
             {
                 var query = from c in db.Comprehensive_PressurePipe
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -1979,8 +1980,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var pipingUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in pipingUnits)
             {
                 var query = from c in db.Comprehensive_PressurePipe
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -2056,8 +2057,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+           var specialUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in specialUnits)
             {
                 var query = from c in db.Comprehensive_SpecialEquipment
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -2139,9 +2140,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
+            var ncrUnits = units.ToList();
 
-            foreach (var item in units)
+            foreach (var item in ncrUnits)
             {
 
                 var query = from c in db.Comprehensive_NCRManagement
@@ -2234,8 +2235,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Check_CheckControl
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -2388,13 +2389,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             int Quantity3Sum = 0;
             int Quantity4Sum = 0;
             //加载所有单位
-            //var units = from x in db.Project_ProjectUnit
+            //var sendUnits = 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)
+            //            where x.ProjectId == this.CurrUser.LoginProjectId 
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Comprehensive_DataReceivingDoc
                             join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index e9a5d952..eded5ab3 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -521,8 +521,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+             var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
 
                 var query = from c in db.Comprehensive_MajorPlanApproval
@@ -923,8 +923,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
+            foreach (var item in unitLists)
             {
 
                 var query = from c in db.Comprehensive_InspectionPerson
@@ -1143,12 +1143,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2)
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
+           var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
 
             int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计
 
 
-            foreach (var item in units)
+            foreach (var item in unitLists)
             {
                 int? num0 = 0, num1 = 0;//拍片数量小计
 
@@ -1336,8 +1336,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
 
                 var query = from c in db.Comprehensive_InspectionEquipment
@@ -1445,8 +1445,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Comprehensive_InspectionMachine
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -1534,7 +1534,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            var unitLists = 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()
@@ -1546,7 +1546,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                  u.UnitName,
                                  c.IsOnceQualified
                              };
-            foreach (var item in units)
+            foreach (var item in unitLists)
             {
                 var query = from x in cqmsDetail
                             where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
@@ -1895,8 +1895,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Comprehensive_PressurePipe
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -1972,8 +1972,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Comprehensive_PressurePipe
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -2049,8 +2049,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Comprehensive_SpecialEquipment
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -2132,9 +2132,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
             //            orderby y.UnitCode
             //            select new { x.UnitId, y.UnitName };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
+            var unitLists = units.ToList();
 
-            foreach (var item in units)
+            foreach (var item in unitLists)
             {
 
                 var query = from c in db.Comprehensive_NCRManagement
@@ -2227,8 +2227,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Check_CheckControl
                             join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
@@ -2386,8 +2386,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             //            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 };
-            units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
-            foreach (var item in units)
+            var unitLists = units.ToList();
+            foreach (var item in unitLists)
             {
                 var query = from c in db.Comprehensive_DataReceivingDoc
                             join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index b52b49a8..b8cc84be 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index eafda425..9fc55c34 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>