Merge branch 'master' of https://toscode.gitee.com/frane-yang/sggl_cd

2023-05-04 17:51:21 +08:00
parent 2f823b54b2 b28a6e55a6
commit 873a92c078
41 changed files with 17762 additions and 30 deletions
@@ -49,7 +49,7 @@
      <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
    </Reference>
    <Reference Include="EmitMapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\FineUIPro\Reference BLL\EmitMapper.dll</HintPath>
+      <HintPath>..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll</HintPath>
    </Reference>
    <Reference Include="FineUIPro, Version=3.1.0.2, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -126,7 +126,7 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Xml" />
    <Reference Include="ThoughtWorks.QRCode">
-      <HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll</HintPath>
+      <HintPath>..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\BLL\bin\Debug\ThoughtWorks.QRCode.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -182,7 +182,6 @@
    <Compile Include="API\HSSE\APITrainTestRecordService.cs" />
    <Compile Include="API\HSSE\APITrainRecordService.cs" />
    <Compile Include="BaseInfo\AccidentTypeService.cs" />
-    <Compile Include="BaseInfo\BaseFactoryService.cs" />
    <Compile Include="BaseInfo\CertificateService.cs" />
    <Compile Include="BaseInfo\CNProfessionalService.cs" />
    <Compile Include="BaseInfo\CostTypeService.cs" />
@@ -319,8 +318,6 @@
    <Compile Include="CQMS\ManageReport\ComprehensiveService.cs" />
    <Compile Include="CQMS\ManageReport\ConstructionProblemsService.cs" />
    <Compile Include="CQMS\ManageReport\NextQualityControlService.cs" />
-    <Compile Include="CQMS\ManageReport\ProjectQualityWorkSummaryReportService.cs" />
-    <Compile Include="CQMS\ManageReport\ProjectQuarterlyProjectQualityService.cs" />
    <Compile Include="CQMS\ManageReport\RowMaterialProblemService.cs" />
    <Compile Include="CQMS\ManageReport\ThisWeekOrMonthContentService.cs" />
    <Compile Include="CQMS\ManageReport\WeekAndMonthReportService.cs" />
@@ -511,12 +508,10 @@
    <Compile Include="HSSE\InformationProject\ProjectDrillConductedQuarterlyReportService.cs" />
    <Compile Include="HSSE\InformationProject\ProjectDrillPlanHalfYearReportItemService.cs" />
    <Compile Include="HSSE\InformationProject\ProjectDrillPlanHalfYearReportService.cs" />
-    <Compile Include="HSSE\InformationProject\ProjectEPSummaryReportService.cs" />
    <Compile Include="HSSE\InformationProject\ProjectFolderItemService.cs" />
    <Compile Include="HSSE\InformationProject\ProjectFolderService.cs" />
    <Compile Include="HSSE\InformationProject\ProjectMillionsMonthlyReportService.cs" />
    <Compile Include="HSSE\InformationProject\ProjectSafetyQuarterlyReportService.cs" />
-    <Compile Include="HSSE\InformationProject\ProjectWorkSummaryReportService.cs" />
    <Compile Include="HSSE\InformationProject\PromotionalActivitiesService.cs" />
    <Compile Include="HSSE\Law\HSSEStandardsListService.cs" />
    <Compile Include="HSSE\Law\ManageRuleService.cs" />
@@ -703,7 +698,11 @@
    <Compile Include="PZHGL\InformationProject\WorkHandoverService.cs" />
    <Compile Include="PZHGL\ProjectData\ProjectMapService.cs" />
    <Compile Include="PZHGL\ProjectData\ProjectPageDataService.cs" />
-    <Compile Include="SHIYE\InformationProject_SafetyBriefingService.cs" />
+    <Compile Include="Service References\CNCECHSSEService\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </Compile>
    <Compile Include="SortConditionHelper.cs" />
    <Compile Include="SQLHelper.cs" />
    <Compile Include="Common\Const.cs" />
@@ -778,7 +777,6 @@
    <Compile Include="WebService\CNCECHSSEWebService.cs" />
    <Compile Include="ZHGL\DataStatistics\DataStatisticsService.cs" />
    <Compile Include="ZHGL\DataSync\CQMSDataService.cs" />
-    <Compile Include="ZHGL\DataSync\Hazard_RealTimeDeviceService.cs" />
    <Compile Include="ZHGL\DataSync\HJGLData_DefectService.cs" />
    <Compile Include="ZHGL\DataSync\HJGLData_HJGLService.cs" />
    <Compile Include="ZHGL\DataSync\HSSEData_HiddenDangerDetailService.cs" />
@@ -790,21 +788,7 @@
    <Compile Include="ZHGL\DataSync\ProjectDataSync\Project_HSSEData_HSSEService.cs" />
    <Compile Include="ZHGL\DataSync\ProjectDataSync\Project_SYHSEData_SYHSEService.cs" />
    <Compile Include="ZHGL\DataSync\ServerService.cs" />
-    <Compile Include="ZHGL\DataSync\SYHSEData_DataService.cs" />
-    <Compile Include="ZHGL\DataSync\SYHSEData_HiddenDangerCheckService.cs" />
    <Compile Include="ZHGL\DataSync\SYHSEData_SYHSEService.cs" />
-    <Compile Include="ZHGL\Environmental\ArchitectureReportItemService.cs" />
-    <Compile Include="ZHGL\Environmental\ArchitectureReportService.cs" />
-    <Compile Include="ZHGL\Environmental\ChemicalReportItemService.cs" />
-    <Compile Include="ZHGL\Environmental\ChemicalReportService.cs" />
-    <Compile Include="ZHGL\Environmental\EnergyreportItemService .cs" />
-    <Compile Include="ZHGL\Environmental\EnergyReportService.cs" />
-    <Compile Include="ZHGL\Environmental\ProjectArchitectureReportItemService.cs" />
-    <Compile Include="ZHGL\Environmental\ProjectArchitectureReportService.cs" />
-    <Compile Include="ZHGL\Environmental\ProjectChemicalReportItemService.cs" />
-    <Compile Include="ZHGL\Environmental\ProjectChemicalReportService.cs" />
-    <Compile Include="ZHGL\Environmental\ProjectEnergyreportItemService .cs" />
-    <Compile Include="ZHGL\Environmental\ProjectEnergyReportService.cs" />
    <Compile Include="ZHGL\HSSESystem\HSSEManageItemService.cs" />
    <Compile Include="ZHGL\HSSESystem\HSSEManageService.cs" />
    <Compile Include="ZHGL\HSSESystem\HSSEOrganizeService.cs" />
@@ -815,15 +799,10 @@
    <Compile Include="ZHGL\Information\DrillConductedQuarterlyReportService.cs" />
    <Compile Include="ZHGL\Information\DrillPlanHalfYearReportItemService.cs" />
    <Compile Include="ZHGL\Information\DrillPlanHalfYearReportService.cs" />
-    <Compile Include="ZHGL\Information\EPSummaryReportService.cs" />
    <Compile Include="ZHGL\Information\MillionsMonthlyReportItemService.cs" />
    <Compile Include="ZHGL\Information\MillionsMonthlyReportService.cs" />
-    <Compile Include="ZHGL\Information\QualityWorkSummaryReportService.cs" />
-    <Compile Include="ZHGL\Information\QuarterlyProjectQualityService.cs" />
-    <Compile Include="ZHGL\Information\SafetyBriefingService.cs" />
    <Compile Include="ZHGL\Information\SafetyQuarterlyReportService.cs" />
    <Compile Include="ZHGL\Information\UrgeReportService.cs" />
-    <Compile Include="ZHGL\Information\WorkSummaryReportService.cs" />
    <Compile Include="ZHGL\ProjectAccident\AccidentAnalysisItemService.cs" />
    <Compile Include="ZHGL\ProjectAccident\AccidentAnalysisService.cs" />
    <Compile Include="ZHGL\ProjectAccident\AccidentStatisticsService.cs" />
@@ -846,7 +825,6 @@
    <Compile Include="ZHGL\Supervise\SuperviseCheckRectifyService.cs" />
    <Compile Include="ZHGL\Supervise\SuperviseCheckReportItemService.cs" />
    <Compile Include="ZHGL\Supervise\SuperviseCheckReportService.cs" />
-    <Compile Include="ZHGL\DataSync\SYHSEData_RiskControlService.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Model\Model.csproj">
@@ -879,6 +857,107 @@
    <None Include="packages.config" />
    <None Include="Scripts\jquery-3.5.1.min.map" />
    <None Include="Scripts\jquery-3.5.1.slim.min.map" />
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Base_Unit.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Check_CheckInfo_Table8Item.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Check_CheckRectify.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.EduTrain_AccidentCase.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.EduTrain_AccidentCaseItem.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Information_UrgeReport.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Law_HSSEStandardsList.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Law_LawRegulationList.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Law_ManageRule.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Law_RulesRegulations.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Supervise_SubUnitReport.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Supervise_SubUnitReportItem.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Supervise_SuperviseCheckRectify.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Sys_Version.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_Appraise.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_Emergency.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_Expert.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_HazardList.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_HazardListType.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_HAZOP.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_Rectify.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_RectifyItem.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Technique_SpecialScheme.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Training_Knowledge.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Training_KnowledgeItem.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Training_Training.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Training_TrainingItem.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Training_TrainTestDB.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\BLL.CNCECHSSEService.Training_TrainTestDBItem.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Service References\CNCECHSSEService\HSSEService.wsdl" />
+    <None Include="Service References\CNCECHSSEService\HSSEService.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\CNCECHSSEService\HSSEService1.wsdl" />
+    <None Include="Service References\CNCECHSSEService\HSSEService1.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\CNCECHSSEService\HSSEService2.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Service References\CNCECHSSEService\HSSEService3.xsd">
+      <SubType>Designer</SubType>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <Content Include="obj\Debug\BLL.csproj.FileListAbsolute.txt" />
@@ -896,8 +975,17 @@
    <Content Include="Scripts\jquery-3.5.1.min.js" />
    <Content Include="Scripts\jquery-3.5.1.slim.js" />
    <Content Include="Scripts\jquery-3.5.1.slim.min.js" />
+    <None Include="Service References\CNCECHSSEService\Reference.svcmap">
+      <Generator>WCF Proxy Generator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+    <None Include="Service References\CNCECHSSEService\configuration.svcinfo" />
+    <None Include="Service References\CNCECHSSEService\configuration91.svcinfo" />
+    <None Include="Service References\CNCECHSSEService\HSSEService.disco" />
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadataStorage Include="Service References\CNCECHSSEService\" />
  </ItemGroup>
-  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.