This commit is contained in:
chi
2023-11-20 08:31:49 +09:00
parent 1eef8e0303
commit 38bc5bf07e
17 changed files with 1023 additions and 839 deletions

View File

@@ -274,17 +274,17 @@ namespace FPJ0000.JobReport_
if (lnk.Text.Equals("상반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-05-31");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-30");
}
else if (lnk.Text.Equals("하반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-01");
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-07-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-12-31");
}
else
{
if (int.TryParse(lnk.Text.Substring(0, 2), out int mon) == false) return;
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00" + "-01"));
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00") + "-01");
dte.Value = dts.Value.AddMonths(1).AddDays(-1);
}
}

View File

@@ -29,10 +29,15 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport();
this.panel1 = new System.Windows.Forms.Panel();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.cmbUser = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel13 = new System.Windows.Forms.LinkLabel();
this.linkLabel14 = new System.Windows.Forms.LinkLabel();
this.linkLabel9 = new System.Windows.Forms.LinkLabel();
@@ -53,11 +58,6 @@
this.dts = new System.Windows.Forms.DateTimePicker();
this.btRefresh = new System.Windows.Forms.Button();
this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
this.cmbUser = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.checkBox1 = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.panel1.SuspendLayout();
@@ -107,6 +107,52 @@
this.panel1.Size = new System.Drawing.Size(1114, 58);
this.panel1.TabIndex = 7;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(786, 33);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(100, 16);
this.checkBox1.TabIndex = 32;
this.checkBox1.Text = "담당자별 분리";
this.checkBox1.UseVisualStyleBackColor = true;
//
// cmbUser
//
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbUser.FormattingEnabled = true;
this.cmbUser.Location = new System.Drawing.Point(598, 32);
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(180, 20);
this.cmbUser.TabIndex = 31;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(563, 36);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(29, 12);
this.label4.TabIndex = 30;
this.label4.Text = "사원";
//
// tbProcess
//
this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.tbProcess.FormattingEnabled = true;
this.tbProcess.Location = new System.Drawing.Point(598, 9);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(180, 20);
this.tbProcess.TabIndex = 29;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(564, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 28;
this.label1.Text = "공정";
//
// linkLabel13
//
this.linkLabel13.AutoSize = true;
@@ -275,6 +321,7 @@
this.linkLabel1.TabIndex = 13;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "01월";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
this.linkLabel1.Click += new System.EventHandler(this.linkLabel13_Click);
//
// label3
@@ -323,9 +370,9 @@
// reportViewer1
//
this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
reportDataSource2.Name = "DataSet1";
reportDataSource2.Value = this.bs;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
reportDataSource1.Name = "DataSet1";
reportDataSource1.Value = this.bs;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport_.rJobReportType.rdlc";
this.reportViewer1.Location = new System.Drawing.Point(0, 58);
this.reportViewer1.Name = "reportViewer1";
@@ -333,52 +380,6 @@
this.reportViewer1.Size = new System.Drawing.Size(1114, 641);
this.reportViewer1.TabIndex = 8;
//
// cmbUser
//
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbUser.FormattingEnabled = true;
this.cmbUser.Location = new System.Drawing.Point(598, 32);
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(180, 20);
this.cmbUser.TabIndex = 31;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(563, 36);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(29, 12);
this.label4.TabIndex = 30;
this.label4.Text = "사원";
//
// tbProcess
//
this.tbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.tbProcess.FormattingEnabled = true;
this.tbProcess.Location = new System.Drawing.Point(598, 9);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(180, 20);
this.tbProcess.TabIndex = 29;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(564, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 28;
this.label1.Text = "공정";
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(786, 33);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(100, 16);
this.checkBox1.TabIndex = 32;
this.checkBox1.Text = "담당자별 분리";
this.checkBox1.UseVisualStyleBackColor = true;
//
// rJobReportType
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

View File

@@ -41,7 +41,7 @@ namespace FPJ0000.JobReport_
System.Windows.Forms.Application.DoEvents();
//this.tbMon.Text = DateTime.Now.ToString("yyyy-MM");
refrehData();
//refrehData();
binit = true;
tbProcess.SelectedIndexChanged += tbProcess_SelectedIndexChanged;
@@ -133,17 +133,17 @@ namespace FPJ0000.JobReport_
if (lnk.Text.Equals("상반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-05-31");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-30");
}
else if (lnk.Text.Equals("하반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-01");
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-07-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-12-31");
}
else
{
if (int.TryParse(lnk.Text.Substring(0, 2), out int mon) == false) return;
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00" + "-01"));
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00") + "-01");
dte.Value = dts.Value.AddMonths(1).AddDays(-1);
}
}
@@ -153,5 +153,9 @@ namespace FPJ0000.JobReport_
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
}
}
}

View File

@@ -123,7 +123,4 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>