Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

2026-05-29 14:37:37 +08:00
parent cb3c2c65ad 7ee78c852e
commit f7ee79c8f2
233 changed files with 6845 additions and 5 deletions
@@ -106,6 +106,9 @@
      <EmbedInteropTypes>False</EmbedInteropTypes>
      <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\netstandard2.0\Microsoft.Bcl.HashCode.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -135,6 +138,12 @@
    <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
      <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
    </Reference>
+    <Reference Include="Spire.Pdf, Version=12.2.6.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+      <HintPath>..\packages\Spire.PDF.12.2.6\lib\net40\Spire.Pdf.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Data.Linq" />
    <Reference Include="System.DirectoryServices" />
@@ -144,8 +153,14 @@
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.IO.Compression.FileSystem" />
    <Reference Include="System.Management" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\netstandard2.0\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\netstandard2.0\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
@@ -177,6 +192,27 @@
    <Reference Include="ThoughtWorks.QRCode.Fakes">
      <HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.Fakes.dll</HintPath>
    </Reference>
+    <Reference Include="UglyToad.PdfPig, Version=0.1.14.0, Culture=neutral, PublicKeyToken=605d367334e74123, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.dll</HintPath>
+    </Reference>
+    <Reference Include="UglyToad.PdfPig.Core, Version=0.1.14.0, Culture=neutral, PublicKeyToken=605d367334e74123, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="UglyToad.PdfPig.DocumentLayoutAnalysis, Version=0.1.14.0, Culture=neutral, PublicKeyToken=605d367334e74123, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.DocumentLayoutAnalysis.dll</HintPath>
+    </Reference>
+    <Reference Include="UglyToad.PdfPig.Fonts, Version=0.1.14.0, Culture=neutral, PublicKeyToken=605d367334e74123, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.Fonts.dll</HintPath>
+    </Reference>
+    <Reference Include="UglyToad.PdfPig.Package, Version=0.1.14.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.Package.dll</HintPath>
+    </Reference>
+    <Reference Include="UglyToad.PdfPig.Tokenization, Version=0.1.14.0, Culture=neutral, PublicKeyToken=605d367334e74123, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.Tokenization.dll</HintPath>
+    </Reference>
+    <Reference Include="UglyToad.PdfPig.Tokens, Version=0.1.14.0, Culture=neutral, PublicKeyToken=605d367334e74123, processorArchitecture=MSIL">
+      <HintPath>..\packages\PdfPig.0.1.14\lib\netstandard2.0\UglyToad.PdfPig.Tokens.dll</HintPath>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Content Include="AttachFile\dist\add-on\jplayer.playlist.js" />
@@ -1534,8 +1570,14 @@
    <Content Include="HJGL\BaseInfo\WeldingMethodEdit.aspx" />
    <Content Include="HJGL\BaseInfo\WeldingMethodView.aspx" />
    <Content Include="HJGL\BaseInfo\WeldView.aspx" />
+    <Content Include="HJGL\DataImport\DrawingRecognition.aspx" />
+    <Content Include="HJGL\DataImport\DrawingRecognitionContent.aspx" />
+    <Content Include="HJGL\DataImport\DrawingRecognitionContentEdit.aspx" />
    <Content Include="HJGL\DataImport\MaterialInformation.aspx" />
    <Content Include="HJGL\DataImport\MaterialStock.aspx" />
+    <Content Include="HJGL\DataImport\PipelineGrid.aspx" />
+    <Content Include="HJGL\DataImport\PipeLineInAuto.aspx" />
+    <Content Include="HJGL\DataImport\PipelineInEdit.aspx" />
    <Content Include="HJGL\DataImport\TDMImport.aspx" />
    <Content Include="HJGL\DataImport\DrawingImport.aspx" />
    <Content Include="HJGL\DataImport\TDMImportEdit.aspx" />
@@ -1558,6 +1600,11 @@
    <Content Include="HJGL\InfoQuery\JointQueryChart.aspx" />
    <Content Include="HJGL\InfoQuery\PipelineQuery.aspx" />
    <Content Include="HJGL\InfoQuery\PipelineQueryChart.aspx" />
+    <Content Include="HJGL\JoinMarking\DataInEdit.aspx" />
+    <Content Include="HJGL\JoinMarking\JoinMarking.aspx" />
+    <Content Include="HJGL\JoinMarking\JointShow.aspx" />
+    <Content Include="HJGL\JoinMarking\PDFMarking.aspx" />
+    <Content Include="HJGL\JoinMarking\PDFShow.aspx" />
    <Content Include="HJGL\LeakVacuum\LeakVacuumAudit.aspx" />
    <Content Include="HJGL\LeakVacuum\LeakVacuumComplete.aspx" />
    <Content Include="HJGL\LeakVacuum\LeakVacuumEdit.aspx" />
@@ -10458,6 +10505,27 @@
    <Compile Include="HJGL\BaseInfo\WeldView.aspx.designer.cs">
      <DependentUpon>WeldView.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HJGL\DataImport\DrawingRecognition.aspx.cs">
+      <DependentUpon>DrawingRecognition.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\DataImport\DrawingRecognition.aspx.designer.cs">
+      <DependentUpon>DrawingRecognition.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\DataImport\DrawingRecognitionContent.aspx.cs">
+      <DependentUpon>DrawingRecognitionContent.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\DataImport\DrawingRecognitionContent.aspx.designer.cs">
+      <DependentUpon>DrawingRecognitionContent.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\DataImport\DrawingRecognitionContentEdit.aspx.cs">
+      <DependentUpon>DrawingRecognitionContentEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\DataImport\DrawingRecognitionContentEdit.aspx.designer.cs">
+      <DependentUpon>DrawingRecognitionContentEdit.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HJGL\DataImport\MaterialInformation.aspx.cs">
      <DependentUpon>MaterialInformation.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -10472,6 +10540,27 @@
    <Compile Include="HJGL\DataImport\MaterialStock.aspx.designer.cs">
      <DependentUpon>MaterialStock.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HJGL\DataImport\PipelineGrid.aspx.cs">
+      <DependentUpon>PipelineGrid.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\DataImport\PipelineGrid.aspx.designer.cs">
+      <DependentUpon>PipelineGrid.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\DataImport\PipeLineInAuto.aspx.cs">
+      <DependentUpon>PipeLineInAuto.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\DataImport\PipeLineInAuto.aspx.designer.cs">
+      <DependentUpon>PipeLineInAuto.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\DataImport\PipelineInEdit.aspx.cs">
+      <DependentUpon>PipelineInEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\DataImport\PipelineInEdit.aspx.designer.cs">
+      <DependentUpon>PipelineInEdit.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HJGL\DataImport\TDMImport.aspx.cs">
      <DependentUpon>TDMImport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -10626,6 +10715,41 @@
    <Compile Include="HJGL\InfoQuery\PipelineQueryChart.aspx.designer.cs">
      <DependentUpon>PipelineQueryChart.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HJGL\JoinMarking\DataInEdit.aspx.cs">
+      <DependentUpon>DataInEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\DataInEdit.aspx.designer.cs">
+      <DependentUpon>DataInEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JoinMarking.aspx.cs">
+      <DependentUpon>JoinMarking.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JoinMarking.aspx.designer.cs">
+      <DependentUpon>JoinMarking.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JointShow.aspx.cs">
+      <DependentUpon>JointShow.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JointShow.aspx.designer.cs">
+      <DependentUpon>JointShow.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFMarking.aspx.cs">
+      <DependentUpon>PDFMarking.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFMarking.aspx.designer.cs">
+      <DependentUpon>PDFMarking.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFShow.aspx.cs">
+      <DependentUpon>PDFShow.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFShow.aspx.designer.cs">
+      <DependentUpon>PDFShow.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HJGL\LeakVacuum\LeakVacuumAudit.aspx.cs">
      <DependentUpon>LeakVacuumAudit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -17068,4 +17192,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>