shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
jackchenyang 2024-05-11 10:13:33 +08:00
parent b1eec203aa 6c42bba857
commit 0336b35a73
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json Normal file
View File

File diff suppressed because one or more lines are too long

1
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -3476,6 +3476,7 @@
</Compile> </Compile>
<Compile Include="HotProcessHard\HardFeedback.aspx.cs"> <Compile Include="HotProcessHard\HardFeedback.aspx.cs">
<DependentUpon>HardFeedback.aspx</DependentUpon> <DependentUpon>HardFeedback.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile> </Compile>
<Compile Include="HotProcessHard\HardFeedback.aspx.designer.cs"> <Compile Include="HotProcessHard\HardFeedback.aspx.designer.cs">
<DependentUpon>HardFeedback.aspx</DependentUpon> <DependentUpon>HardFeedback.aspx</DependentUpon>

37
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs
View File

@ -986,11 +986,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
ws.SetColumnWidth(2, 6 * 256); ws.SetColumnWidth(2, 6 * 256);
ws.SetColumnWidth(3, 12 * 256); ws.SetColumnWidth(3, 12 * 256);
ws.SetColumnWidth(4, 18 * 256); ws.SetColumnWidth(4, 18 * 256);
ws.SetColumnWidth(5, 19 * 256); ws.SetColumnWidth(5, 15 * 256);
ws.SetColumnWidth(6, 16 * 256); ws.SetColumnWidth(6, 15 * 256);
ws.SetColumnWidth(7, 13 * 256); ws.SetColumnWidth(7, 13 * 256);
ws.SetColumnWidth(8, 14 * 256); ws.SetColumnWidth(8, 10 * 256);
ws.SetColumnWidth(9, 13 * 256); ws.SetColumnWidth(9, 10 * 256);
ws.SetColumnWidth(10, 13 * 256); ws.SetColumnWidth(10, 13 * 256);
ws.SetColumnWidth(11, 10 * 256); ws.SetColumnWidth(11, 10 * 256);
ws.SetColumnWidth(12, 16 * 256); ws.SetColumnWidth(12, 16 * 256);
@ -1230,20 +1230,35 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
#endregion #endregion
ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 8, style, 0, 14, false, false, true); ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 9, style, 0, 14, false, false, true);
rowIndex += 9; rowIndex += 10;
ws.SetRowBreak(rowIndex - 1);
} }
ws.PrintSetup.FitWidth = 1;
ws.PrintSetup.FitHeight = 0;
ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;
ws.FitToPage = true; ws.FitToPage = true;
ws.PrintSetup.FitWidth = 1;
ws.PrintSetup.FitHeight = short.MaxValue;
ws.SetMargin(MarginType.LeftMargin, 0.3); ws.SetMargin(MarginType.LeftMargin, 0.3);
ws.SetMargin(MarginType.RightMargin, 0.2); ws.SetMargin(MarginType.RightMargin, 0.2);
ws.PrintSetup.Landscape = true; ws.PrintSetup.Landscape = true;
ws.PrintSetup.Scale = 75; //ws.PrintSetup.Scale = 70;
ws.PrintSetup.PaperSize = 9;
ws.ForceFormulaRecalculation = true; ws.ForceFormulaRecalculation = true;
ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;
//ws.PrintSetup.FitWidth = 1;
//ws.PrintSetup.FitHeight = 0;
//ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;
//ws.FitToPage = true;
//ws.SetMargin(MarginType.LeftMargin, 0.3);
//ws.SetMargin(MarginType.RightMargin, 0.2);
//ws.PrintSetup.Landscape = true;
//ws.PrintSetup.Scale = 75;
//ws.PrintSetup.PaperSize = 9;
//ws.ForceFormulaRecalculation = true;
using (FileStream filess = System.IO.File.OpenWrite(ReportFileName)) using (FileStream filess = System.IO.File.OpenWrite(ReportFileName))
{ {