diff --git a/DataBase/版本日志/Solution1.sqlsuo b/DataBase/版本日志/Solution1.sqlsuo
deleted file mode 100644
index 8834d7f..0000000
Binary files a/DataBase/版本日志/Solution1.sqlsuo and /dev/null differ
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index babee87..af9c681 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -276,6 +276,7 @@
     <Content Include="config\release_time_chart.htm" />
     <Content Include="config\vars.aspx" />
     <Content Include="ContinuousPrint\CommissionRepairPrint.aspx" />
+    <Content Include="ContinuousPrint\HardnessCheckOrderPrint.aspx" />
     <Content Include="ContinuousPrint\HardnessTestOrderPrint.aspx" />
     <Content Include="ContinuousPrint\HardnessTestReportPrint.aspx" />
     <Content Include="ContinuousPrint\PipingSingleDiagramPrint.aspx" />
@@ -4671,6 +4672,13 @@
       <DependentUpon>CommissionRepairPrint.aspx</DependentUpon>
     </Compile>
     <Compile Include="ContinuousPrint\CommonPrint.cs" />
+    <Compile Include="ContinuousPrint\HardnessCheckOrderPrint.aspx.cs">
+      <DependentUpon>HardnessCheckOrderPrint.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ContinuousPrint\HardnessCheckOrderPrint.aspx.designer.cs">
+      <DependentUpon>HardnessCheckOrderPrint.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ContinuousPrint\HardnessTestOrderPrint.aspx.cs">
       <DependentUpon>HardnessTestOrderPrint.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
new file mode 100644
index 0000000..8ba20cd
--- /dev/null
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <UseIISExpress>true</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <StartPageUrl>Login.aspx</StartPageUrl>
+          <StartAction>SpecificPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>False</EnableENC>
+          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>5001</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:5001/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/HJGL_ZH/FineUIPro.Web/Web.config b/HJGL_ZH/FineUIPro.Web/Web.config
new file mode 100644
index 0000000..a7edb5e
--- /dev/null
+++ b/HJGL_ZH/FineUIPro.Web/Web.config
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!--
+  有关如何配置 ASP.NET 应用程序的详细消息，请访问
+
+  http://go.microsoft.com/fwlink/?LinkId=169433
+  -->
+<configuration>
+  <configSections>
+    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
+  </configSections>
+  <FineUIPro DebugMode="false" Theme="Cupertino"/>
+  <appSettings>
+    <!--连接字符串-->
+    <add key="ConnectionString" value="Server=.\SQL2019;Database=HJGLDB_ZHJA;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <!--系统名称-->
+    <add key="SystemName" value="诺必达焊接管理系统"/>
+    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
+    <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
+    <add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001"/>
+    <add key="ADomainUrl" value="10.151.130.1"/>
+    <add key="APPUrl" value="https://www.pgyer.com/pWSd"/>
+    <!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
+    <add key="SystemCode" value="HJCLGL"/>
+    <add key="http" value="http://localhost/test/"/>
+  </appSettings>
+  <system.web>
+    <!--  会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
+    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
+    <!--<processModel enable="true" requestQueueLimit="100000"/>-->
+    <pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
+      <controls>
+        <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/>
+        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+      </controls>
+    </pages>
+    <httpModules>
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
+    </httpModules>
+    <httpHandlers>
+      <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="true" targetFramework="4.0">
+      <assemblies>
+        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      </assemblies>
+    </compilation>
+    <httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000"/>
+    <authentication mode="Forms">
+      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
+    </authentication>
+    <membership>
+      <providers>
+        <clear/>
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
+      </providers>
+    </membership>
+    <profile>
+      <providers>
+        <clear/>
+        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
+      </providers>
+    </profile>
+    <roleManager enabled="false">
+      <providers>
+        <clear/>
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
+        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
+      </providers>
+    </roleManager>
+    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
+    <webServices>
+      <protocols>
+        <add name="HttpSoap"/>
+        <add name="HttpPost"/>
+        <add name="HttpGet"/>
+        <add name="Documentation"/>
+      </protocols>
+    </webServices>
+  </system.web>
+  <location path="res.axd"/>
+  <system.webServer>
+    <staticContent>
+      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
+      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
+    </staticContent>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <modules runAllManagedModulesForAllRequests="true">
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
+      <remove name="ScriptModule"/>
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+    </modules>
+    <handlers>
+      <remove name="ChartImageHandler"/>
+      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
+      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+    </handlers>
+    <defaultDocument>
+      <files>
+        <add value="Login.aspx"/>
+      </files>
+    </defaultDocument>
+    <security>
+      <requestFiltering>
+        <requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647"/>
+      </requestFiltering>
+    </security>
+  </system.webServer>
+  <!-- SERVER -->
+  <system.serviceModel>
+    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
+    <services>
+      <service name="BLL.OpenService.HSSEService" behaviorConfiguration="HSSEServiceBehavior">
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
+      </service>
+    </services>
+    <behaviors>
+      <serviceBehaviors>
+        <behavior name="HSSEServiceBehavior">
+          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
+        </behavior>
+      </serviceBehaviors>
+    </behaviors>
+    <bindings>
+      <wsHttpBinding>
+        <binding name="HSSEServiceBinding" maxReceivedMessageSize="2147483647" useDefaultWebProxy="false" maxBufferPoolSize="2147483647" closeTimeout="20:00:00" openTimeout="00:01:10" receiveTimeout="20:00:00" sendTimeout="20:00:00">
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647"/>
+          <security mode="None"/>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+  </system.serviceModel>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/HJGL_ZH/Model/bin/Debug/Model.pdb b/HJGL_ZH/Model/bin/Debug/Model.pdb
new file mode 100644
index 0000000..fa675ef
Binary files /dev/null and b/HJGL_ZH/Model/bin/Debug/Model.pdb differ
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..65d3ae3
--- /dev/null
+++ b/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+a6955a8bd83aefc970745e3ecd8f2f7e05cd3ae06a00b34c3c3f0aefa0c1e08b
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..d47e3df
--- /dev/null
+++ b/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -0,0 +1,210 @@
+D:\CQMS\LuoYang\CQMS\Model\bin\Debug\Model.dll
+D:\CQMS\LuoYang\CQMS\Model\bin\Debug\Model.pdb
+D:\CQMS\LuoYang\CQMS\Model\obj\Debug\ResolveAssemblyReference.cache
+D:\CQMS\LuoYang\CQMS\Model\obj\Debug\Model.dll
+D:\CQMS\LuoYang\CQMS\Model\obj\Debug\Model.pdb
+D:\SCMS\SCMS\Model\bin\Debug\Model.dll
+D:\SCMS\SCMS\Model\bin\Debug\Model.pdb
+D:\SCMS\SCMS\Model\obj\Debug\ResolveAssemblyReference.cache
+D:\SCMS\SCMS\Model\obj\Debug\Model.dll
+D:\SCMS\SCMS\Model\obj\Debug\Model.pdb
+E:\SCMS\SCMS\Model\bin\Debug\Model.dll
+E:\SCMS\SCMS\Model\bin\Debug\Model.pdb
+E:\SCMS\SCMS\Model\obj\Debug\ResolveAssemblyReference.cache
+E:\SCMS\SCMS\Model\obj\Debug\Model.dll
+E:\SCMS\SCMS\Model\obj\Debug\Model.pdb
+F:\GJSX\GJSX\GJSX\Model\bin\Debug\Model.dll
+F:\GJSX\GJSX\GJSX\Model\bin\Debug\Model.pdb
+F:\GJSX\GJSX\GJSX\Model\obj\Debug\ResolveAssemblyReference.cache
+F:\GJSX\GJSX\GJSX\Model\obj\Debug\Model.dll
+F:\GJSX\GJSX\GJSX\Model\obj\Debug\Model.pdb
+F:\HJGL\GJSX\HJGL\Model\bin\Debug\Model.dll
+F:\HJGL\GJSX\HJGL\Model\bin\Debug\Model.pdb
+F:\HJGL\GJSX\HJGL\Model\obj\Debug\ResolveAssemblyReference.cache
+F:\HJGL\GJSX\HJGL\Model\obj\Debug\Model.dll
+F:\HJGL\GJSX\HJGL\Model\obj\Debug\Model.pdb
+F:\HJGL\HJGL\HJGL\Model\bin\Debug\Model.dll
+F:\HJGL\HJGL\HJGL\Model\bin\Debug\Model.pdb
+F:\HJGL\HJGL\HJGL\Model\obj\Debug\ResolveAssemblyReference.cache
+F:\HJGL\HJGL\HJGL\Model\obj\Debug\Model.dll
+F:\HJGL\HJGL\HJGL\Model\obj\Debug\Model.pdb
+F:\最新\管道焊接\HJGL\HJGL\Model\bin\Debug\Model.dll
+F:\最新\管道焊接\HJGL\HJGL\Model\bin\Debug\Model.pdb
+F:\最新\管道焊接\HJGL\HJGL\Model\obj\Debug\ResolveAssemblyReference.cache
+F:\最新\管道焊接\HJGL\HJGL\Model\obj\Debug\Model.dll
+F:\最新\管道焊接\HJGL\HJGL\Model\obj\Debug\Model.pdb
+D:\HJGL\HJGL\Model\bin\Debug\Model.dll
+D:\HJGL\HJGL\Model\bin\Debug\Model.pdb
+D:\HJGL\HJGL\Model\obj\Debug\ResolveAssemblyReference.cache
+D:\HJGL\HJGL\Model\obj\Debug\Model.dll
+D:\HJGL\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\HJGL\Model\bin\Debug\Model.dll
+E:\HJGL\HJGL\Model\bin\Debug\Model.pdb
+E:\HJGL\HJGL\Model\obj\Debug\Model.dll
+E:\HJGL\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\LUOYANG\HJGL\HJGL\Model\bin\Debug\Model.dll
+E:\HJGL\LUOYANG\HJGL\HJGL\Model\bin\Debug\Model.pdb
+E:\HJGL\LUOYANG\HJGL\HJGL\Model\obj\Debug\Model.dll
+E:\HJGL\LUOYANG\HJGL\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\LuoYang\HJGL\Model\bin\Debug\Model.dll
+E:\HJGL\LuoYang\HJGL\Model\bin\Debug\Model.pdb
+E:\HJGL\LuoYang\HJGL\Model\obj\Debug\Model.dll
+E:\HJGL\LuoYang\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\HJGL\HJGL\Model\bin\Debug\Model.dll
+E:\HJGL\HJGL\HJGL\Model\bin\Debug\Model.pdb
+E:\HJGL\HJGL\HJGL\Model\obj\Debug\ResolveAssemblyReference.cache
+E:\HJGL\HJGL\HJGL\Model\obj\Debug\Model.dll
+E:\HJGL\HJGL\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\LuoYang\Model\bin\Debug\Model.dll
+E:\HJGL\LuoYang\Model\bin\Debug\Model.pdb
+E:\HJGL\LuoYang\Model\obj\Debug\Model.csprojResolveAssemblyReference.cache
+E:\HJGL\LuoYang\Model\obj\Debug\Model.dll
+E:\HJGL\LuoYang\Model\obj\Debug\Model.pdb
+E:\HJGL\TongYong\HJGL\Model\bin\Debug\Model.dll
+E:\HJGL\TongYong\HJGL\Model\bin\Debug\Model.pdb
+E:\HJGL\TongYong\HJGL\Model\obj\Debug\Model.dll
+E:\HJGL\TongYong\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\TianChen\HJGL\Model\bin\Debug\Model.dll
+E:\HJGL\TianChen\HJGL\Model\bin\Debug\Model.pdb
+E:\HJGL\TianChen\HJGL\Model\obj\Debug\Model.dll
+E:\HJGL\TianChen\HJGL\Model\obj\Debug\Model.pdb
+E:\HJGL\TianChen\HJGL\Model\obj\Debug\Model.csprojResolveAssemblyReference.cache
+D:\ExtJs\TCCHSSE\TCCHSSE\Model\bin\Debug\Model.dll
+D:\ExtJs\TCCHSSE\TCCHSSE\Model\bin\Debug\Model.pdb
+D:\ExtJs\TCCHSSE\TCCHSSE\Model\obj\Debug\ResolveAssemblyReference.cache
+D:\ExtJs\TCCHSSE\TCCHSSE\Model\obj\Debug\Model.dll
+D:\ExtJs\TCCHSSE\TCCHSSE\Model\obj\Debug\Model.pdb
+E:\TCCHSSE\TCCHSSE\Model\bin\Debug\Model.dll
+E:\TCCHSSE\TCCHSSE\Model\bin\Debug\Model.pdb
+E:\TCCHSSE\TCCHSSE\Model\obj\Debug\Model.dll
+E:\TCCHSSE\TCCHSSE\Model\obj\Debug\Model.pdb
+E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\bin\Debug\Model.dll
+E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\bin\Debug\Model.pdb
+E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\obj\Debug\Model.dll
+E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\obj\Debug\Model.pdb
+F:\工作\悬停\CNCECHSSE\CNCECHSSE\Model\bin\Debug\Model.dll
+F:\工作\悬停\CNCECHSSE\CNCECHSSE\Model\bin\Debug\Model.pdb
+F:\工作\悬停\CNCECHSSE\CNCECHSSE\Model\obj\Debug\Model.dll
+F:\工作\悬停\CNCECHSSE\CNCECHSSE\Model\obj\Debug\Model.pdb
+D:\ExtJs\SGGL\SGGL\Model\bin\Debug\Model.dll
+D:\ExtJs\SGGL\SGGL\Model\bin\Debug\Model.pdb
+D:\ExtJs\SGGL\SGGL\Model\obj\Debug\ResolveAssemblyReference.cache
+D:\ExtJs\SGGL\SGGL\Model\obj\Debug\Model.dll
+D:\ExtJs\SGGL\SGGL\Model\obj\Debug\Model.pdb
+H:\工作\SGGL_New\SGGL\SGGL\Model\bin\Debug\Model.dll
+H:\工作\SGGL_New\SGGL\SGGL\Model\bin\Debug\Model.pdb
+H:\工作\SGGL_New\SGGL\SGGL\Model\obj\Debug\ResolveAssemblyReference.cache
+H:\工作\SGGL_New\SGGL\SGGL\Model\obj\Debug\Model.dll
+H:\工作\SGGL_New\SGGL\SGGL\Model\obj\Debug\Model.pdb
+D:\ExtJs\SGGL_NB\SGGL\Model\bin\Debug\Model.dll
+D:\ExtJs\SGGL_NB\SGGL\Model\bin\Debug\Model.pdb
+D:\ExtJs\SGGL_NB\SGGL\Model\obj\Debug\ResolveAssemblyReference.cache
+D:\ExtJs\SGGL_NB\SGGL\Model\obj\Debug\Model.dll
+D:\ExtJs\SGGL_NB\SGGL\Model\obj\Debug\Model.pdb
+D:\开发代码\SGGL_NBBAK\SGGL\Model\bin\Debug\Model.dll
+D:\开发代码\SGGL_NBBAK\SGGL\Model\bin\Debug\Model.pdb
+D:\开发代码\SGGL_NBBAK\SGGL\Model\obj\Debug\Model.dll
+D:\开发代码\SGGL_NBBAK\SGGL\Model\obj\Debug\Model.pdb
+D:\开发代码\SGGL_NB_\SGGL\Model\bin\Debug\Model.dll
+D:\开发代码\SGGL_NB_\SGGL\Model\bin\Debug\Model.pdb
+D:\开发代码\SGGL_NB_\SGGL\Model\obj\Debug\Model.dll
+D:\开发代码\SGGL_NB_\SGGL\Model\obj\Debug\Model.pdb
+D:\开发代码\宁波\SGGL_NB_\SGGL\Model\bin\Debug\Model.dll
+D:\开发代码\宁波\SGGL_NB_\SGGL\Model\bin\Debug\Model.pdb
+D:\开发代码\宁波\SGGL_NB_\SGGL\Model\obj\Debug\Model.dll
+D:\开发代码\宁波\SGGL_NB_\SGGL\Model\obj\Debug\Model.pdb
+D:\开发代码\宁波\SGGL(NB)\SGGL\Model\bin\Debug\Model.dll
+D:\开发代码\宁波\SGGL(NB)\SGGL\Model\bin\Debug\Model.pdb
+D:\开发代码\宁波\SGGL(NB)\SGGL\Model\obj\Debug\Model.dll
+D:\开发代码\宁波\SGGL(NB)\SGGL\Model\obj\Debug\Model.pdb
+D:\开发代码\SGGL_NB\SGGL\Model\bin\Debug\Model.dll
+D:\开发代码\SGGL_NB\SGGL\Model\bin\Debug\Model.pdb
+D:\开发代码\SGGL_NB\SGGL\Model\obj\Debug\Model.dll
+D:\开发代码\SGGL_NB\SGGL\Model\obj\Debug\Model.pdb
+D:\ExtJs\HJGL\SGGL\Model\bin\Debug\Model.dll
+D:\ExtJs\HJGL\SGGL\Model\bin\Debug\Model.pdb
+D:\ExtJs\HJGL\SGGL\Model\obj\Debug\Model.dll
+D:\ExtJs\HJGL\SGGL\Model\obj\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL\Model\bin\Debug\Model.dll
+E:\工作\镇海焊接\SGGL\Model\bin\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL\Model\obj\Debug\Model.dll
+E:\工作\镇海焊接\SGGL\Model\obj\Debug\Model.pdb
+E:\ExtJs\HJGL\SGGL\Model\bin\Debug\Model.dll
+E:\ExtJs\HJGL\SGGL\Model\bin\Debug\Model.pdb
+E:\ExtJs\HJGL\SGGL\Model\obj\Debug\Model.dll
+E:\ExtJs\HJGL\SGGL\Model\obj\Debug\Model.pdb
+E:\ExtJs\HJGL\SGGL\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\ExtJs\HJGL\SGGL\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyProject\ZHJA\HJGL\SGGL\Model\bin\Debug\Model.dll
+D:\MyProject\ZHJA\HJGL\SGGL\Model\bin\Debug\Model.pdb
+D:\MyProject\ZHJA\HJGL\SGGL\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyProject\ZHJA\HJGL\SGGL\Model\obj\Debug\Model.dll
+D:\MyProject\ZHJA\HJGL\SGGL\Model\obj\Debug\Model.pdb
+D:\MyProject\ZHNew\HJGL\SGGL\Model\bin\Debug\Model.dll
+D:\MyProject\ZHNew\HJGL\SGGL\Model\bin\Debug\Model.pdb
+D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Debug\Model.dll
+D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\bin\Debug\Model.dll
+E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\bin\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Debug\Model.dll
+E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\工作\镇海焊接\SGGL_New\SGGL\Model\bin\Debug\Model.dll
+E:\工作\镇海焊接\SGGL_New\SGGL\Model\bin\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Debug\Model.dll
+E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Debug\Model.pdb
+D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Debug\Model.csprojAssemblyReference.cache
+D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\bin\Debug\Model.dll
+D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\bin\Debug\Model.pdb
+D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\obj\Debug\Model.dll
+D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\obj\Debug\Model.pdb
+E:\工作\镇海焊接\HJGL_ZH\Model\bin\Debug\Model.dll
+E:\工作\镇海焊接\HJGL_ZH\Model\bin\Debug\Model.pdb
+E:\工作\镇海焊接\HJGL_ZH\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\工作\镇海焊接\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\工作\镇海焊接\HJGL_ZH\Model\obj\Debug\Model.dll
+E:\工作\镇海焊接\HJGL_ZH\Model\obj\Debug\Model.pdb
+E:\工作\镇海焊接\SGGL\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\工作\镇海焊接\SGGL\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyNewProject\ZHJA\HJGL_ZH\Model\bin\Debug\Model.dll
+D:\MyNewProject\ZHJA\HJGL_ZH\Model\bin\Debug\Model.pdb
+D:\MyNewProject\ZHJA\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyNewProject\ZHJA\HJGL_ZH\Model\obj\Debug\Model.dll
+D:\MyNewProject\ZHJA\HJGL_ZH\Model\obj\Debug\Model.pdb
+D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Debug\Model.dll
+D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Debug\Model.pdb
+D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.dll
+D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.pdb
+E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Debug\Model.dll
+E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Debug\Model.pdb
+E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.dll
+E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.pdb
+E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.csprojAssemblyReference.cache
+D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.dll
+D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.pdb
+D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.AssemblyReference.cache
+D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.dll
+D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.pdb
+E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.dll
+E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.pdb
+E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.dll
+E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.pdb
+E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csprojAssemblyReference.cache
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.dll
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.pdb
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Newtonsoft.Json.dll
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Newtonsoft.Json.xml
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.AssemblyReference.cache
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.Up2Date
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.dll
+E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.pdb
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache b/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache
new file mode 100644
index 0000000..3588c06
Binary files /dev/null and b/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache differ
diff --git a/HJGL_ZH/Model/obj/Debug/Model.dll b/HJGL_ZH/Model/obj/Debug/Model.dll
new file mode 100644
index 0000000..11a69ff
Binary files /dev/null and b/HJGL_ZH/Model/obj/Debug/Model.dll differ
diff --git a/HJGL_ZH/Model/obj/Debug/Model.pdb b/HJGL_ZH/Model/obj/Debug/Model.pdb
new file mode 100644
index 0000000..fa675ef
Binary files /dev/null and b/HJGL_ZH/Model/obj/Debug/Model.pdb differ
diff --git a/HJGL_ZH/WebAPI/Web.config b/HJGL_ZH/WebAPI/Web.config
index 990e8af..a88eda5 100644
--- a/HJGL_ZH/WebAPI/Web.config
+++ b/HJGL_ZH/WebAPI/Web.config
@@ -46,7 +46,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
+<<<<<<< HEAD
         <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+=======
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+>>>>>>> dc93671919a8a14de2974baf5392f5ce823f0a4d
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
diff --git a/HJGL_ZH/WebAPI/WebAPI.csproj b/HJGL_ZH/WebAPI/WebAPI.csproj
index ccfbeb8..24c721e 100644
--- a/HJGL_ZH/WebAPI/WebAPI.csproj
+++ b/HJGL_ZH/WebAPI/WebAPI.csproj
@@ -108,7 +108,15 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
+<<<<<<< HEAD
     <Reference Include="System.Xml.Linq" />
+=======
+    <Reference Include="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.Linq.3.5.21022.801\lib\net20\System.Xml.Linq.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+>>>>>>> dc93671919a8a14de2974baf5392f5ce823f0a4d
     <Reference Include="WebGrease">
       <Private>True</Private>
       <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
diff --git a/HJGL_ZH/WebAPI/WebAPI.csproj.user b/HJGL_ZH/WebAPI/WebAPI.csproj.user
new file mode 100644
index 0000000..ca0d73e
--- /dev/null
+++ b/HJGL_ZH/WebAPI/WebAPI.csproj.user
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UseIISExpress>true</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>True</EnableENC>
+          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/HJGL_ZH/WebAPI/packages.config b/HJGL_ZH/WebAPI/packages.config
index 5fd93cc..f118d88 100644
--- a/HJGL_ZH/WebAPI/packages.config
+++ b/HJGL_ZH/WebAPI/packages.config
@@ -22,6 +22,11 @@
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
+<<<<<<< HEAD
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+=======
+  <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
+  <package id="System.Xml.Linq" version="3.5.21022.801" targetFramework="net461" />
+>>>>>>> dc93671919a8a14de2974baf5392f5ce823f0a4d
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
 </packages>
\ No newline at end of file