From 9fa458d406a6e727812638bbf218cef50dfaa98b Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 28 Oct 2024 14:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FineUIPro.Web/FineUIPro.Web.csproj.user   |   2 +-
 .../HJGL/HotHardManage/HardTestReport.aspx    |   2 +-
 HJGL_ZH/FineUIPro.Web/Web.config              |   2 +-
 HJGL_ZH/Model/bin/Release/Model.dll           | Bin 1216512 -> 1216512 bytes
 HJGL_ZH/Model/bin/Release/Model.pdb           | Bin 3376640 -> 3376640 bytes
 .../Model.csprojAssemblyReference.cache       | Bin 2063 -> 0 bytes
 6 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 HJGL_ZH/Model/obj/Release/Model.csprojAssemblyReference.cache

diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8ba20cd..ac1e608 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx
index b449275..25c46c4 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx
@@ -145,7 +145,7 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="硬度检测报告" EnableCollapse="true"
                         runat="server" BoxFlex="1" DataKeyNames="HardTestReportItemId" AllowCellEditing="true"
                         AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HardTestReportItemId"
-                        AllowSorting="true" SortField="Sort1,Sort2,Sort3,Sort4,Sort5,SortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
+                        AllowSorting="true" SortField="Sort1,Sort2,Sort3,Sort4,Sort5,JOT_JointNo,SortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
                         AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
                         EnableTextSelection="True" AutoScroll="true">
                         <Toolbars>
diff --git a/HJGL_ZH/FineUIPro.Web/Web.config b/HJGL_ZH/FineUIPro.Web/Web.config
index 2bd1c9c..04fa778 100644
--- a/HJGL_ZH/FineUIPro.Web/Web.config
+++ b/HJGL_ZH/FineUIPro.Web/Web.config
@@ -40,7 +40,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="true" targetFramework="4.0">
+    <compilation debug="false" targetFramework="4.0">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>
diff --git a/HJGL_ZH/Model/bin/Release/Model.dll b/HJGL_ZH/Model/bin/Release/Model.dll
index 8b7f66fcd5beef3c957b3b6d435f82981bfad10b..b02fd93280773c08f1c1d4808a3997264e28e16d 100644
GIT binary patch
delta 126
zcmZoz;MK6eYeEN8)QQHf)-J}@E~eHl=GHEj)-Kl8F1FS#_SP<r)-KN0F0R%t?$$1z
z)-K-GF21c@{9Ne*x`qATht?{3&+Fh7R-Yl<+P);6ABY8jSaAE2bfFh=Kx3!(wFyZH
b)XSBhIp=lGt2vLU?|-C&!uB0)LLQs|K(sM}

delta 126
zcmZoz;MK6eYeEOp-_4C(tzC?*T}-WA%&lE4tzE3GU2Lsg?5$lKtzDe0U0khQ+^t<a
ztzEpWU3^=+__@*r)+NtfHkGr$WiP|cH6IVOb+<1`=Lcc|AQs%dBwgr*9MIV5eQiQg
d0%ix--hN%^??3a6*`|BOnWo!!v<Z1|0suTMHlzRm

diff --git a/HJGL_ZH/Model/bin/Release/Model.pdb b/HJGL_ZH/Model/bin/Release/Model.pdb
index 5776f6b0209a93cfb6ecef312205bb70828a27a3..7e78e2e4ef699a5ff41bec225647802ead119386 100644
GIT binary patch
delta 293
zcmZ|KISv5<06@_h+c5Th8;pHlPcT}QM!^MCv`P|%f=EO%=a48gN`*q^0$Qar;9o%T
z4)9hxLtNoxkz<p)Zz>9cuuLx=#=sb?=cfI4tf^;3esAp~=~|hoPx074CJ)2#TGKb0
zF2V#eEU>}`33fOj!wDDM@W2Zn{0Jb35W<KciWuTZAPEI2q>+J&EON-BfFepLqk<}G
ZsH1@<T4<w#?nTpkx9Q*dMfvnzn;%|xZ7To(

delta 293
zcmZ|KISv5<06@_hyRq-v*!O)4^*8}nP>E8hlPDB4BALV?BtoH<s5MH7O2-w5e*wii
zz?-eE;tYG86#N{WBT*29?s<2AP5S-qyL))F$DN}ry_cq`|E3=%?&7AmiL3{{xuPx<
zRfGmw=%9xIMwnoR1PiRN!43zUaKQ}^yzs$~0D=f1j0j{z5knjaB#}ZI8Dx<|9t9Lp
aLKziQQ9~UKG*61!x{UtTPx80*T>Jo(5ODec

diff --git a/HJGL_ZH/Model/obj/Release/Model.csprojAssemblyReference.cache b/HJGL_ZH/Model/obj/Release/Model.csprojAssemblyReference.cache
deleted file mode 100644
index 3588c06601fcfc103542ff1f192d1965d3828290..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2063
zcmcIl+iuf95OuC~k^<p=E8qeTphl}iAy7aOg3ySHf(nTO4*|4^$E}sMH|(xM+wb5P
zc;rv`2Y!HmfSqlcB4hDpOFmxP$9rbZOeR*wvaH|wz$+fhSq&dw`D4K)_Y`>+`OGDK
zDkqY3xPY2703m%Iwi_+dAazo&Ih}~9NI*M;ND0bn&UQ3n{`e*A_xS|E_Nd<UTHXV%
z(QsRJ+N1>(TTRyJ?MnqgPf-QPDtSHwbC+8=e5Ipc48}@_Aju0VcNHBmz^F?(4S9tB
zQkOKLyv3>8rDMg#(mWr#!-FXmAgZ`&hr6&X_{?`f*!ZC5A3$DbB#Q&eB9NAq%UOj&
z#ZJ=NJlgAaLd={0?EmY{`jcghs(e~wDUVRlP{mbQpT(jE*?Bb7A?*knI9=_Ebnfh}
z-@iM23mymv$KX7b5(4c!$l=1=VOR6v3m20idA-p;zMI`6_2E3ccQ7K)siFg4MwIyn
z6x}5*V?{KJrYHP9U`EE)GAcb8%*`a&1GTZIAjAfiM!BSwKcuIO9%2P|Qjl2Gm~?u(
zR7_1i6)iSOL2S{;0*ns!>!%cS0y*Y_`6DB8BHd(6TVRDwrc|N1X+~$u4?mlvPH8bO
z1?T2s_>(%)s^S#E_A6Bp%yc<}tFs8_5Y8i9K)8r-3E{Ga0)DY}++u(K4;(6)sl0}h
z$gFTu<O1&I^*PDXFz>=t7A4MaSrBRlBI|{gmCa@|R>{ubz_uR${Qm9h4;u%4xm+$@
z!7I)s(yTWd53LLajB&(?SK~xXDv7ufCt~7B#A|UPnv+Dl9w(xKNyHm*BAT2;bmBxT
YL=tf|PQ+p*5pTwcSkNTmtr)TL2iM+KNdN!<