Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_TCC7
This commit is contained in:
		
						commit
						a1c00d5980
					
				|  | @ -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); | ||||||
|  | @ -1232,18 +1232,31 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage | ||||||
| 
 | 
 | ||||||
|                     ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 8, style, 0, 14, false, false, true); |                     ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 8, style, 0, 14, false, false, true); | ||||||
|                     rowIndex += 9; |                     rowIndex += 9; | ||||||
|  |                     ws.SetRowBreak(rowIndex - 1); | ||||||
|                 } |                 } | ||||||
|  | 
 | ||||||
|                 ws.PrintSetup.FitWidth = 1; |                 ws.PrintSetup.FitWidth = 1; | ||||||
|                 ws.PrintSetup.FitHeight = 0; |                 ws.PrintSetup.FitHeight = 0; | ||||||
|                 ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; |  | ||||||
| 
 | 
 | ||||||
|                 ws.FitToPage = true; |  | ||||||
|                 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)) | ||||||
|                 { |                 { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue