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

Compare commits

base: shecs:b1eec203aa00dc6547d3fa496fb935bb0fbd1f24
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:0336b35a738f7ee5c42b585bfaa8829e630b9adc
Branches Tags
shecs:master
shecs:Feature_20240510

6 Commits
b1eec203aa ... 0336b35a73

Author SHA1 Message Date
jackchenyang 0336b35a73 11 2024-05-11 10:13:33 +08:00
李云虎 6c42bba857 1111 2024-05-11 10:07:46 +08:00
佘春生 a1c00d5980 Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_TCC7 2024-05-11 09:08:26 +08:00
佘春生 bd4f50dca4 11 2024-05-11 09:08:13 +08:00
李云虎 6838e2bbf9 123 2024-05-10 18:51:49 +08:00
李云虎 4ebc46d4ae 1112 2024-05-10 18:24:57 +08:00
3 changed files with 29 additions and 12 deletions
Show Stats 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 Include="HotProcessHard\HardFeedback.aspx.cs">
<DependentUpon>HardFeedback.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HotProcessHard\HardFeedback.aspx.designer.cs">
<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(3, 12 * 256);
ws.SetColumnWidth(4, 18 * 256);
ws.SetColumnWidth(5, 19 * 256);
ws.SetColumnWidth(6, 16 * 256);
ws.SetColumnWidth(5, 15 * 256);
ws.SetColumnWidth(6, 15 * 256);
ws.SetColumnWidth(7, 13 * 256);
ws.SetColumnWidth(8, 14 * 256);
ws.SetColumnWidth(9, 13 * 256);
ws.SetColumnWidth(8, 10 * 256);
ws.SetColumnWidth(9, 10 * 256);
ws.SetColumnWidth(10, 13 * 256);
ws.SetColumnWidth(11, 10 * 256);
ws.SetColumnWidth(12, 16 * 256);
@ -1230,20 +1230,35 @@ 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.PrintSetup.FitWidth = 1;
ws.PrintSetup.FitHeight = 0;
ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;
ws.FitToPage = true;
ws.PrintSetup.FitWidth = 1;
ws.PrintSetup.FitHeight = short.MaxValue;
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.PrintSetup.Scale = 70;
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))
{