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

2025-09-13 13:09:29 +08:00
parent c85a3f69f0 c5080c2a98
commit 2323e1ca78
134 changed files with 19704 additions and 2557 deletions
@@ -234,7 +234,9 @@
    <Content Include="BaseInfo\BaseFactory.aspx" />
    <Content Include="BaseInfo\BaseFactoryEdit.aspx" />
    <Content Include="BaseInfo\Certificate.aspx" />
+    <Content Include="BaseInfo\Qualification.aspx" />
    <Content Include="BaseInfo\CNProfessional.aspx" />
+    <Content Include="BaseInfo\QualificationEdit.aspx" />
    <Content Include="BaseInfo\CNProfessionalEdit.aspx" />
    <Content Include="BaseInfo\CNProfessionalView.aspx" />
    <Content Include="BaseInfo\CostType.aspx" />
@@ -578,6 +580,8 @@
    <Content Include="CQMS\DataBase\WBS2FileEdit.aspx" />
    <Content Include="CQMS\DataBase\WBSFileEdit.aspx" />
    <Content Include="CQMS\DesignDrawing\ArchivesLib.aspx" />
+    <Content Include="CQMS\DesignDrawing\ArchivesLibIssue.aspx" />
+    <Content Include="CQMS\DesignDrawing\ArchivesLibReceive.aspx" />
    <Content Include="CQMS\Foreign\ControlPointCheck.aspx" />
    <Content Include="CQMS\Foreign\ControlPointCheckEdit.aspx" />
    <Content Include="CQMS\Foreign\ControlPointList.aspx" />
@@ -1538,6 +1542,15 @@
    <Content Include="JDGL\CostAnalysis\PlanAdjust.aspx" />
    <Content Include="JDGL\CostAnalysis\RectificationMeasureSet.aspx" />
    <Content Include="JDGL\Progress\WbsManager.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerPlan.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerPlanChart.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerPlanEdit.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerPlanGrid.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerPlanIn.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerStat.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerWork.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerWorkChart.aspx" />
+    <Content Include="JDGL\SGManPower\ManPowerWorkGrid.aspx" />
    <Content Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx" />
    <Content Include="JDGL\WBSCompleteAndReal\WBSReport.aspx" />
    <Content Include="JDGL\WBSPlan\SeeDetailHistory.aspx" />
@@ -1910,6 +1923,7 @@
    <Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" />
    <Content Include="SysManage\HttpLog.aspx" />
    <Content Include="SysManage\ProjectToDo.aspx" />
+    <Content Include="SysManage\UnitCleanupMerge.aspx" />
    <Content Include="TaskScheduling\InterFace\IFLogList.aspx" />
    <Content Include="TaskScheduling\InterFace\InterFaceEdit.aspx" />
    <Content Include="TaskScheduling\InterFace\InterFaceSet.aspx" />
@@ -2197,6 +2211,11 @@
    <Content Include="WorkBench.aspx" />
    <Content Include="Work\ToDoList.aspx" />
    <Content Include="ZHDD\ZHDD.aspx" />
+    <Content Include="ZHGL\CQMSData\CQMSBasicData.aspx" />
+    <Content Include="ZHGL\CQMSData\CQMSCheckData.aspx" />
+    <Content Include="ZHGL\CQMSData\CQMSEquipAndMachineData.aspx" />
+    <Content Include="ZHGL\CQMSData\CQMSNoticeDetailsData.aspx" />
+    <Content Include="ZHGL\CQMSData\WeldingData.aspx" />
    <Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
    <Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
    <Content Include="ZHGL\DataIn\AccidentCauseReportImport.aspx" />
@@ -6585,6 +6604,13 @@
    <Compile Include="BaseInfo\Certificate.aspx.designer.cs">
      <DependentUpon>Certificate.aspx</DependentUpon>
    </Compile>
+    <Compile Include="BaseInfo\Qualification.aspx.cs">
+      <DependentUpon>Qualification.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\Qualification.aspx.designer.cs">
+      <DependentUpon>Qualification.aspx</DependentUpon>
+    </Compile>
    <Compile Include="BaseInfo\CNProfessional.aspx.cs">
      <DependentUpon>CNProfessional.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -6592,6 +6618,13 @@
    <Compile Include="BaseInfo\CNProfessional.aspx.designer.cs">
      <DependentUpon>CNProfessional.aspx</DependentUpon>
    </Compile>
+    <Compile Include="BaseInfo\QualificationEdit.aspx.cs">
+      <DependentUpon>QualificationEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\QualificationEdit.aspx.designer.cs">
+      <DependentUpon>QualificationEdit.aspx</DependentUpon>
+    </Compile>
    <Compile Include="BaseInfo\CNProfessionalEdit.aspx.cs">
      <DependentUpon>CNProfessionalEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -8496,6 +8529,20 @@
    <Compile Include="CQMS\DesignDrawing\ArchivesLib.aspx.designer.cs">
      <DependentUpon>ArchivesLib.aspx</DependentUpon>
    </Compile>
+    <Compile Include="CQMS\DesignDrawing\ArchivesLibIssue.aspx.cs">
+      <DependentUpon>ArchivesLibIssue.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\DesignDrawing\ArchivesLibIssue.aspx.designer.cs">
+      <DependentUpon>ArchivesLibIssue.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\DesignDrawing\ArchivesLibReceive.aspx.cs">
+      <DependentUpon>ArchivesLibReceive.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\DesignDrawing\ArchivesLibReceive.aspx.designer.cs">
+      <DependentUpon>ArchivesLibReceive.aspx</DependentUpon>
+    </Compile>
    <Compile Include="CQMS\Foreign\ControlPointCheck.aspx.cs">
      <DependentUpon>ControlPointCheck.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -14918,6 +14965,69 @@
    <Compile Include="JDGL\Progress\WbsManager.aspx.designer.cs">
      <DependentUpon>WbsManager.aspx</DependentUpon>
    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlan.aspx.cs">
+      <DependentUpon>ManPowerPlan.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlan.aspx.designer.cs">
+      <DependentUpon>ManPowerPlan.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanChart.aspx.cs">
+      <DependentUpon>ManPowerPlanChart.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanChart.aspx.designer.cs">
+      <DependentUpon>ManPowerPlanChart.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanEdit.aspx.cs">
+      <DependentUpon>ManPowerPlanEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanEdit.aspx.designer.cs">
+      <DependentUpon>ManPowerPlanEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanGrid.aspx.cs">
+      <DependentUpon>ManPowerPlanGrid.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanGrid.aspx.designer.cs">
+      <DependentUpon>ManPowerPlanGrid.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanIn.aspx.cs">
+      <DependentUpon>ManPowerPlanIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerPlanIn.aspx.designer.cs">
+      <DependentUpon>ManPowerPlanIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerStat.aspx.cs">
+      <DependentUpon>ManPowerStat.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerStat.aspx.designer.cs">
+      <DependentUpon>ManPowerStat.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerWork.aspx.cs">
+      <DependentUpon>ManPowerWork.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerWork.aspx.designer.cs">
+      <DependentUpon>ManPowerWork.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerWorkChart.aspx.cs">
+      <DependentUpon>ManPowerWorkChart.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerWorkChart.aspx.designer.cs">
+      <DependentUpon>ManPowerWorkChart.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerWorkGrid.aspx.cs">
+      <DependentUpon>ManPowerWorkGrid.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\SGManPower\ManPowerWorkGrid.aspx.designer.cs">
+      <DependentUpon>ManPowerWorkGrid.aspx</DependentUpon>
+    </Compile>
    <Compile Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx.cs">
      <DependentUpon>WBSCompleteAudit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -16563,6 +16673,13 @@
    <Compile Include="SysManage\Unit.aspx.designer.cs">
      <DependentUpon>Unit.aspx</DependentUpon>
    </Compile>
+    <Compile Include="SysManage\UnitCleanupMerge.aspx.cs">
+      <DependentUpon>UnitCleanupMerge.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="SysManage\UnitCleanupMerge.aspx.designer.cs">
+      <DependentUpon>UnitCleanupMerge.aspx</DependentUpon>
+    </Compile>
    <Compile Include="SysManage\UnitEdit.aspx.cs">
      <DependentUpon>UnitEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -18705,6 +18822,41 @@
    <Compile Include="ZHDD\ZHDD.aspx.designer.cs">
      <DependentUpon>ZHDD.aspx</DependentUpon>
    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSBasicData.aspx.cs">
+      <DependentUpon>CQMSBasicData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSBasicData.aspx.designer.cs">
+      <DependentUpon>CQMSBasicData.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSCheckData.aspx.cs">
+      <DependentUpon>CQMSCheckData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSCheckData.aspx.designer.cs">
+      <DependentUpon>CQMSCheckData.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSEquipAndMachineData.aspx.cs">
+      <DependentUpon>CQMSEquipAndMachineData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSEquipAndMachineData.aspx.designer.cs">
+      <DependentUpon>CQMSEquipAndMachineData.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSNoticeDetailsData.aspx.cs">
+      <DependentUpon>CQMSNoticeDetailsData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\CQMSNoticeDetailsData.aspx.designer.cs">
+      <DependentUpon>CQMSNoticeDetailsData.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\WeldingData.aspx.cs">
+      <DependentUpon>WeldingData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\CQMSData\WeldingData.aspx.designer.cs">
+      <DependentUpon>WeldingData.aspx</DependentUpon>
+    </Compile>
    <Compile Include="ZHGL\DataIn\AccidentCauseReportBar.aspx.cs">
      <DependentUpon>AccidentCauseReportBar.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>