From 4c04e72cbf5c7ead73d8e06cc50c3d139951ade3 Mon Sep 17 00:00:00 2001
From: liyh <ahjdlyh2008123@126.com>
Date: Sat, 11 May 2024 10:07:46 +0800
Subject: [PATCH] 1111

---
 HJGL/.vs/HJGL/config/applicationhost.config   |   2 +-
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1040896 -> 1040896 bytes
 .../WeldingManage/JointInfo.aspx.cs           |  10 ++++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config
index 1963de0..b8c8efa 100644
--- a/HJGL/.vs/HJGL/config/applicationhost.config
+++ b/HJGL/.vs/HJGL/config/applicationhost.config
@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 1594d9ac213381115e1906f4984e1731b3e78513..6d6b55e792c4adb36c1ff3aa87691ece3f9d6fbc 100644
GIT binary patch
delta 1547
zcmcgsUu;uV7(d_XZMmmwyT1%V@8;MBmW_vMI&HABJuE7)!I%hTD<MM)l9V}dsAz}{
znfC#VS?^hPOc0sZi7)EfT~mnR0VX6HF@{`tQD1z}NO*u`!9U4l^*b$1#+WZYc#>bf
z-}mR7e*bQhS6Y)-T8D!`Qcw8T03n1SHY0{m0ZPb0<i`-F5vvisnb+pPJ8<KpxlNz`
z2xDkz<HzVb)Jv^Ds2kup4$6x7^JvfEsX%!j<<ls`4{Xw2io6U_j`&j{#J|9YD)BoB
zsYkew523+_vgScdEy@dsc79xGD3`A_q4qmQNuJ{wWratQZnQpw;5XGss1M0J8i!GC
zLTo{-#S&$59mtm>wjnm7tqbMr2;S~&Y>6R}L31cKAjU8N)%@v1T@vYcp?wznCHZ}R
zhV4>9=;eRGpqDhfxpcD(RjsPRD0xRF_X%>@Ij*Upa+&Evt>Ar1t5@b#EcZ$NrQ(M<
zKBK<4`rm58S97wa0Dsom+#<E&SzL^UFH7Ge#aLJj<tv$oU&?G1!|S}Y;?4z6h4GTh
z8uA<m4o%-G@}f1}6b7@58d^}5)kyHLHl25JrRML{c!-Ar8mN4GpaF8$(ZDG%js&bg
zb(fQ#1^%`_`{+eWsZmQrT^O`f+Jo2IiWeRAqA?2^-{^2z?b(Z9u3tO)E3N0_Q<}AL
zY6{F9iZI`Uit`m;v3{VlM4XslTY!qp1k<W@h~qe8q_=->;@+N#c=PTU*+;SwxCPM6
zGp8$^K?fm&0=}bB@z@t7nsqdGiiuREd#6aGnN}0Uc41%hh%A0fq|>Z!)nW1~*-zpm
zfxja|-JL~)cz1^F6x-9xUp+t$lSAaEzH5hmGtS<+-Ey__>dKDG;)59$6v+%rihZ-5
z_2P~IpBU&biCAyEa#A+gOw>-UdJ76|)6J9ASlkbzJ6z~|q`N&eUS*ARC%}j%3bui0
zvM{rIQ4g3S)K`iLIuUm<&;5k^dPd;|>$9F-Fh8Wmfsy<NC5J4JHFh8fOfos*9RK0q
z<K_lxd{bxDef+cIp&^XUyXtvki=5I^*5LU2<^ORcJ#r)t9EljNbnp6qCtzMw3VRWg
zNzkA}%>P0gi+ko+uoKr8>_o>>I}uqf_u$A<uAXIuO^C_eXw8q_oTlRCGqh6v3lOn4
z&DMS1Hpyt&;$=DC^)*X_`9005kOmqjVv@nu6Si)HZd2WM=(eKUPTh9t_A=d8b(`t7
TTenMe+oRiF-S(ZcOUwQN@RT;q

delta 3056
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

diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs
index 4d86810..afcdbdd 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs
@@ -1230,18 +1230,20 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
 
                     #endregion
 
-                    ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 8, style, 0, 14, false, false, true);
-                    rowIndex += 9;
+                    ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 9, style, 0, 14, false, false, true);
+                    rowIndex += 10;
                     ws.SetRowBreak(rowIndex - 1);
                 }
 
+                ws.FitToPage = true;
                 ws.PrintSetup.FitWidth = 1;
-                ws.PrintSetup.FitHeight = 0;
+                ws.PrintSetup.FitHeight = short.MaxValue;
+
 
                 ws.SetMargin(MarginType.LeftMargin, 0.3);
                 ws.SetMargin(MarginType.RightMargin, 0.2);
                 ws.PrintSetup.Landscape = true;
-                ws.PrintSetup.Scale = 70;
+                //ws.PrintSetup.Scale = 70;
                 ws.ForceFormulaRecalculation = true;
                 ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;