From d9b832c1565d786ca75ccd2e77b669a383fab550 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Tue, 11 Mar 2025 11:12:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E6=89=93=E7=A0=81,=E6=94=B9?= =?UTF-8?q?=E5=AE=8C=E7=BA=B5=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InjectionPC/FrmMain2408.cs | 27 +++++++++++++++------------ InjectionPC/FrmMain2411.cs | 24 ++++++++++++------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index 5e47559..869d790 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -634,8 +634,11 @@ namespace InjectionPC DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); + //ReportHelper rp = new ReportHelper(filename, headTable, null, + // (int) GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, - (int) GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo( GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, @@ -767,7 +770,7 @@ namespace InjectionPC ReportHelper rp = new ReportHelper(filename, headTable, null, - (int) GRPaperOrientation.grpoDefault, 1, reportName); + (int) GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo( GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); @@ -964,7 +967,7 @@ namespace InjectionPC DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, - (int) GRPaperOrientation.grpoDefault, 1, reportName); + (int) GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo( GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, @@ -1113,7 +1116,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); } @@ -1370,7 +1373,7 @@ namespace InjectionPC DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); } @@ -1465,7 +1468,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); } @@ -1960,7 +1963,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); } @@ -2037,7 +2040,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); } @@ -2271,7 +2274,7 @@ namespace InjectionPC ReportHelper rp = new ReportHelper(filename, headTable, null, - (int)GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); @@ -2415,7 +2418,7 @@ namespace InjectionPC ReportHelper rp = new ReportHelper(filename, headTable, null, - (int)GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); @@ -2591,7 +2594,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printBoxName].ToString(); headTable.Rows.Add(row); SaveLog3(Program.station + "打印箱单:" + textBox3.Text.Trim()); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); @@ -3435,7 +3438,7 @@ namespace InjectionPC headTable.Rows.Add(row); SaveLog3(Program.station + "打印箱单:" + boxCode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs index 0771a8e..ae07c75 100644 --- a/InjectionPC/FrmMain2411.cs +++ b/InjectionPC/FrmMain2411.cs @@ -551,7 +551,7 @@ namespace InjectionPC DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, - (int)GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo( GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, @@ -704,7 +704,7 @@ namespace InjectionPC ReportHelper rp = new ReportHelper(filename, headTable, null, - (int)GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo( GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); @@ -913,7 +913,7 @@ namespace InjectionPC DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, - (int)GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo( GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, @@ -1070,7 +1070,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); } @@ -1379,7 +1379,7 @@ namespace InjectionPC DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); } @@ -1473,7 +1473,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); } @@ -1971,7 +1971,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); } @@ -2051,7 +2051,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName].ToString(); DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); } @@ -2239,7 +2239,7 @@ namespace InjectionPC ReportHelper rp = new ReportHelper(filename, headTable, null, - (int)GRPaperOrientation.grpoDefault, 1, reportName); + (int)GRPaperOrientation.grpoPortrait, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod()); rp.Report.Print(false); @@ -2405,7 +2405,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printBoxName].ToString(); headTable.Rows.Add(row); - ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, reportName); rp.Report.Print(false); @@ -3005,7 +3005,7 @@ namespace InjectionPC // DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); // ReportHelper rp = new ReportHelper(filename, headTable, null, - // (int) GRPaperOrientation.grpoDefault, 1, reportName); + // (int) GRPaperOrientation.grpoPortrait, 1, reportName); // rp.Report.Print(false); // } @@ -3084,7 +3084,7 @@ namespace InjectionPC // LogHelper.WriteLog(printName + ";" + reportName + ";" + filename); // ReportHelper rp = new ReportHelper(filename, headTable, null, - // (int) GRPaperOrientation.grpoDefault, 1, reportName); + // (int) GRPaperOrientation.grpoPortrait, 1, reportName); // rp.Report.Print(false); // }