Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

업무일지 시간 요약화면에 휴일 데이터를 추가 함.

Browse Source
This commit is contained in:
chi
2021-06-25 14:18:23 +09:00
parent 139c48721f
commit acc368d065
24 changed files with 712 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SubProject/FCM0000/FCM0000.csproj
View File

@@ -33,7 +33,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\Amkor\GroupWare\</OutputPath>
<OutputPath>bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

31
SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs generated
View File

@@ -32,8 +32,9 @@
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport();
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.dataGridView1 = new arCtl.arDatagridView();
this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
@@ -61,6 +62,11 @@
//
// dataGridView1
//
this.dataGridView1.A_DelCurrentCell = true;
this.dataGridView1.A_EnterToTab = true;
this.dataGridView1.A_KoreanField = null;
this.dataGridView1.A_UpperField = null;
this.dataGridView1.A_ViewRownumOnHeader = true;
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -69,11 +75,12 @@
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(721, 544);
this.dataGridView1.Size = new System.Drawing.Size(1003, 534);
this.dataGridView1.TabIndex = 2;
//
// panel1
//
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.linkLabel1);
@@ -83,9 +90,20 @@
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.panel1.Size = new System.Drawing.Size(721, 42);
this.panel1.Size = new System.Drawing.Size(1003, 42);
this.panel1.TabIndex = 3;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(848, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 32);
this.button1.TabIndex = 8;
this.button1.Text = "내보내기";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tbProcess
//
this.tbProcess.FormattingEnabled = true;
@@ -117,7 +135,7 @@
// btRefresh
//
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.btRefresh.Location = new System.Drawing.Point(641, 5);
this.btRefresh.Location = new System.Drawing.Point(923, 5);
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(75, 32);
this.btRefresh.TabIndex = 2;
@@ -138,7 +156,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(721, 586);
this.ClientSize = new System.Drawing.Size(1003, 576);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.panel1);
this.Name = "rJobReport";
@@ -157,12 +175,13 @@
private System.Windows.Forms.BindingSource bs;
private dsReport dsReport;
private dsReportTableAdapters.jobReportTableAdapter ta;
private System.Windows.Forms.DataGridView dataGridView1;
private arCtl.arDatagridView dataGridView1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Button btRefresh;
private System.Windows.Forms.TextBox tbMon;
private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button1;
}
}

29
SubProject/FPJ0000/JobReport_/rJobReport.cs
View File

@@ -36,6 +36,14 @@ namespace FPJ0000.JobReport_
void refrehData()
{
////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
//this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
@@ -87,13 +95,27 @@ namespace FPJ0000.JobReport_
}
else
{
////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
//var sumhr = 0f;
//var sumot = 0f;
//var sumholy = 0f;
//foreach(dsReport.jobReportRow item in userDatas)
//{
// dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
//}
var sumhr = userDatas.Sum(t => t.hrs);
var sumot = userDatas.Sum(t => t.ot);
var sumhl = userDatas.Sum(t => t.holyot);
if (sumot == 0) rowdata.Add(string.Format("{0}", sumhr, sumot));
else rowdata.Add(string.Format("{0}+{1}", sumhr, sumot));
else rowdata.Add(string.Format("{0}+{1}(*{2})", sumhr, sumot,sumhl));
if (sumhr > basehr) high.Add(true);
else high.Add(false);
if (sumhr < basehr) low.Add(true);
else low.Add(false);
}
@@ -123,5 +145,10 @@ namespace FPJ0000.JobReport_
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
}

34
SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs generated
View File

@@ -32,13 +32,14 @@
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport();
this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btRefresh = new System.Windows.Forms.Button();
this.tbMon = new System.Windows.Forms.TextBox();
this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.dataGridView1 = new arCtl.arDatagridView();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.panel1.SuspendLayout();
@@ -57,6 +58,7 @@
//
// panel1
//
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.linkLabel1);
@@ -66,9 +68,20 @@
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.panel1.Size = new System.Drawing.Size(751, 42);
this.panel1.Size = new System.Drawing.Size(1041, 42);
this.panel1.TabIndex = 0;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(886, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 32);
this.button1.TabIndex = 6;
this.button1.Text = "내보내기";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click_1);
//
// tbProcess
//
this.tbProcess.FormattingEnabled = true;
@@ -101,7 +114,7 @@
// btRefresh
//
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.btRefresh.Location = new System.Drawing.Point(671, 5);
this.btRefresh.Location = new System.Drawing.Point(961, 5);
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(75, 32);
this.btRefresh.TabIndex = 2;
@@ -123,19 +136,27 @@
//
// dataGridView1
//
this.dataGridView1.A_DelCurrentCell = true;
this.dataGridView1.A_EnterToTab = true;
this.dataGridView1.A_KoreanField = null;
this.dataGridView1.A_UpperField = null;
this.dataGridView1.A_ViewRownumOnHeader = true;
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 42);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(751, 546);
this.dataGridView1.Size = new System.Drawing.Size(1041, 586);
this.dataGridView1.TabIndex = 1;
//
// rJobReportDay
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(751, 588);
this.ClientSize = new System.Drawing.Size(1041, 628);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.panel1);
this.Name = "rJobReportDay";
@@ -160,6 +181,7 @@
private dsReportTableAdapters.JobReportDayTableAdapter ta;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.DataGridView dataGridView1;
private arCtl.arDatagridView dataGridView1;
private System.Windows.Forms.Button button1;
}
}

12
SubProject/FPJ0000/JobReport_/rJobReportDay.cs
View File

@@ -135,8 +135,9 @@ namespace FPJ0000.JobReport_
if (col.Tag.ToString() == "1")
{
//이날은 휴일이다
sumFR += daydata.ot + daydata.hrs;
rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
sumFR += daydata.ot;// + daydata.hrs;
//sumOT += daydata.ot;
rowdata.Add("*" + daydata.hrs.ToString() + "+" + daydata.ot.ToString());
}
else
{
@@ -147,7 +148,7 @@ namespace FPJ0000.JobReport_
}
else rowdata.Add("--");
}
rowdata.Add(sum.ToString() + "+" + sumOT.ToString());
rowdata.Add(sum.ToString() + "+" + sumOT.ToString() + "(*" + sumFR.ToString() + ")");
this.dataGridView1.Rows.Add(rowdata.ToArray());
}
foreach(DataGridViewRow dvrow in this.dataGridView1.Rows)
@@ -205,5 +206,10 @@ namespace FPJ0000.JobReport_
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click_1(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
}

3
SubProject/FPJ0000/JobReport_/rJobReportDay.resx
View File

@@ -123,9 +123,6 @@
<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>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value>
</metadata>

114
SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs generated
View File

@@ -117,13 +117,13 @@
this.taPartStatus = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter();
this.panel3 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox5 = new System.Windows.Forms.TextBox();
this.tbProjectName = new System.Windows.Forms.TextBox();
this.tbProjectIdx = new System.Windows.Forms.TextBox();
this.tbDue = new System.Windows.Forms.TextBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.textBox3 = new System.Windows.Forms.TextBox();
this.pdateTextBox = new System.Windows.Forms.TextBox();
this.textBox4 = new System.Windows.Forms.TextBox();
this.tbOrderNo = new System.Windows.Forms.TextBox();
this.tbPDate = new System.Windows.Forms.TextBox();
this.tbStatus = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
pdateLabel = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
@@ -1012,7 +1012,6 @@
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amt";
this.fpSpread1_Sheet1.Columns.Get(12).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-3]*RC[-2]";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "1대 금액";
this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amt";
@@ -1021,7 +1020,6 @@
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "amtn";
this.fpSpread1_Sheet1.Columns.Get(13).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[-4]*RC[-2]";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "N대 금액";
this.fpSpread1_Sheet1.Columns.Get(13).Tag = "amtn";
@@ -1139,16 +1137,16 @@
//
// panel4
//
this.panel4.Controls.Add(this.textBox1);
this.panel4.Controls.Add(this.textBox5);
this.panel4.Controls.Add(this.tbProjectName);
this.panel4.Controls.Add(this.tbProjectIdx);
this.panel4.Controls.Add(this.tbDue);
this.panel4.Controls.Add(this.linkLabel1);
this.panel4.Controls.Add(this.textBox3);
this.panel4.Controls.Add(this.tbOrderNo);
this.panel4.Controls.Add(label3);
this.panel4.Controls.Add(label5);
this.panel4.Controls.Add(this.pdateTextBox);
this.panel4.Controls.Add(this.tbPDate);
this.panel4.Controls.Add(pdateLabel);
this.panel4.Controls.Add(this.textBox4);
this.panel4.Controls.Add(this.tbStatus);
this.panel4.Controls.Add(label4);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(0, 24);
@@ -1157,26 +1155,26 @@
this.panel4.Size = new System.Drawing.Size(1345, 31);
this.panel4.TabIndex = 8;
//
// textBox1
// tbProjectName
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Location = new System.Drawing.Point(768, 5);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(572, 21);
this.textBox1.TabIndex = 3;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbProjectName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true));
this.tbProjectName.Dock = System.Windows.Forms.DockStyle.Fill;
this.tbProjectName.Location = new System.Drawing.Point(768, 5);
this.tbProjectName.Name = "tbProjectName";
this.tbProjectName.Size = new System.Drawing.Size(572, 21);
this.tbProjectName.TabIndex = 3;
this.tbProjectName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox5
// tbProjectIdx
//
this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true));
this.textBox5.Dock = System.Windows.Forms.DockStyle.Left;
this.textBox5.Location = new System.Drawing.Point(714, 5);
this.textBox5.Name = "textBox5";
this.textBox5.ReadOnly = true;
this.textBox5.Size = new System.Drawing.Size(54, 21);
this.textBox5.TabIndex = 9;
this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbProjectIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true));
this.tbProjectIdx.Dock = System.Windows.Forms.DockStyle.Left;
this.tbProjectIdx.Location = new System.Drawing.Point(714, 5);
this.tbProjectIdx.Name = "tbProjectIdx";
this.tbProjectIdx.ReadOnly = true;
this.tbProjectIdx.Size = new System.Drawing.Size(54, 21);
this.tbProjectIdx.TabIndex = 9;
this.tbProjectIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbDue
//
@@ -1201,35 +1199,35 @@
this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// textBox3
// tbOrderNo
//
this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true));
this.textBox3.Dock = System.Windows.Forms.DockStyle.Left;
this.textBox3.Location = new System.Drawing.Point(345, 5);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(177, 21);
this.textBox3.TabIndex = 5;
this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbOrderNo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true));
this.tbOrderNo.Dock = System.Windows.Forms.DockStyle.Left;
this.tbOrderNo.Location = new System.Drawing.Point(345, 5);
this.tbOrderNo.Name = "tbOrderNo";
this.tbOrderNo.Size = new System.Drawing.Size(177, 21);
this.tbOrderNo.TabIndex = 5;
this.tbOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// pdateTextBox
// tbPDate
//
this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true));
this.pdateTextBox.Dock = System.Windows.Forms.DockStyle.Left;
this.pdateTextBox.Location = new System.Drawing.Point(193, 5);
this.pdateTextBox.Name = "pdateTextBox";
this.pdateTextBox.Size = new System.Drawing.Size(100, 21);
this.pdateTextBox.TabIndex = 1;
this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbPDate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true));
this.tbPDate.Dock = System.Windows.Forms.DockStyle.Left;
this.tbPDate.Location = new System.Drawing.Point(193, 5);
this.tbPDate.Name = "tbPDate";
this.tbPDate.Size = new System.Drawing.Size(100, 21);
this.tbPDate.TabIndex = 1;
this.tbPDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox4
// tbStatus
//
this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true));
this.textBox4.Dock = System.Windows.Forms.DockStyle.Left;
this.textBox4.Location = new System.Drawing.Point(49, 5);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(100, 21);
this.textBox4.TabIndex = 7;
this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbStatus.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true));
this.tbStatus.Dock = System.Windows.Forms.DockStyle.Left;
this.tbStatus.Location = new System.Drawing.Point(49, 5);
this.tbStatus.Name = "tbStatus";
this.tbStatus.Size = new System.Drawing.Size(100, 21);
this.tbStatus.TabIndex = 7;
this.tbStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label1
//
@@ -1323,13 +1321,13 @@
private dsPRJTableAdapters.ProjectPartStatusTableAdapter taPartStatus;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.TextBox pdateTextBox;
private System.Windows.Forms.TextBox tbPDate;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.TextBox tbProjectName;
private System.Windows.Forms.TextBox tbOrderNo;
private System.Windows.Forms.TextBox tbStatus;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.TextBox tbProjectIdx;
private System.Windows.Forms.TextBox tbDue;
private System.Windows.Forms.LinkLabel linkLabel1;
private arCtl.arLabel prb4;

45
SubProject/FPJ0000/Project/fPartBuyStatus.cs
View File

@@ -39,6 +39,19 @@ namespace FPJ0000
this.FormClosed += fPartList_FormClosed;
this.FormClosing += FPartList_FormClosing;
this.KeyDown += fPartList_KeyDown;
this.dsPRJ.ProjectPartStatus.ColumnChanged += ProjectPartStatus_ColumnChanged;
this.dsPRJ.ProjectPartStatus.RowChanged += ProjectPartStatus_RowChanged;
}
private void ProjectPartStatus_RowChanged(object sender, DataRowChangeEventArgs e)
{
//if (e.Action == DataRowAction.Add || ) return;
//Console.WriteLine("d");
}
private void ProjectPartStatus_ColumnChanged(object sender, DataColumnChangeEventArgs e)
{
}
private void FPartList_FormClosing(object sender, FormClosingEventArgs e)
@@ -96,7 +109,8 @@ namespace FPJ0000
string sortkey = string.Empty;
void RefreshData()
{
if (dsPRJ.HasChanges())
var changes = dsPRJ.ProjectPartStatus.GetChanges();
if (changes != null && changes.Rows.Count > 0)
{
var dlg = FCOMMON.Util.MsgQ("변경 사항이 있습니다. 갱신하면 변경 내용이 손실 됩니다.\n지금 갱신 하겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
@@ -127,9 +141,10 @@ namespace FPJ0000
// }
//}
//this.dsPRJ.AcceptChanges();
RefreshSum();
//RefreshSum();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
FormattingData();
dsPRJ.ProjectPartStatus.AcceptChanges();
}
void FormattingData()
{
@@ -287,14 +302,12 @@ namespace FPJ0000
this.fpSpread1.ResumeLayout();
}
void RefreshSum()
{
decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
//lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
}
//void RefreshSum()
//{
// decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
// decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
// //lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
//}
private void toolStripButton1_Click(object sender, EventArgs e)
@@ -488,7 +501,7 @@ namespace FPJ0000
var amt = iQty1 * iPrice1;
fpSpread1.ActiveSheet.Cells[Rowidx, colidx_amt].Value = amt;
//dv1.Rows[e.RowIndex].Cells["dvc_amt"].Value = amt;
RefreshSum();
//RefreshSum();
break;
}
@@ -861,7 +874,7 @@ namespace FPJ0000
if (dlg == DialogResult.Yes)
{
var taprj = new dsPRJTableAdapters.ProjectsTableAdapter();
var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(textBox5.Text), FCOMMON.info.Login.gcode);
var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(tbProjectIdx.Text), FCOMMON.info.Login.gcode);
if (cnt != 1)
{
FCOMMON.Util.MsgE($"적용실패 {cnt}건의 자료가 업데이트 됨");
@@ -875,6 +888,14 @@ namespace FPJ0000
var drv = this.bsPart.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
//tbDue.Text = dr.crdue;
//tbProjectIdx.Text = dr.Project.ToString();
//tbProjectName.Text = dr.name;
//tbOrderNo.Text = dr.orderno;
//tbPDate.Text = dr.pdate;
//tbStatus.Text = dr.status;
if (dr.crdue.isEmpty() == false)
{
DateTime dt;

26
SubProject/FPJ0000/Project/fPartBuyStatus.resx
View File

@@ -332,19 +332,19 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY
zVTMvM0pmprowiBbTCNTF5o4oUKUohcV2kWnNnXOOd1wRuYytTl1XsDLUnc5x+1Mvz3nbKmB0A8+PC+e
8/1wft9zeOyE3VcnX6rQKaMrdb/DJTqKnDSHjD31dHTFAB35RGs8K9ZUB8S83ceFdk/Eoz7Nko1eMRqN
HqtjA1b7Dis2Fho/F2wo/mRBfOWYU5Cj2O+LeieqTLvEhgem3dDPMNBbGOimGWinXFD/2kD7qAMbDNAy
RqH4wwzSnhmpfyThknZq3enC0KwHX2cZcjIY5CQu9Jo28GXUSQSbGFrwQD/vRqnCgpB73W+4cJws2HxD
ErMlkl9DWu111HY0oqRJhhBJIIIJgtIzCJOeRFVLFbeKnWawuOpEWFIvwwliK0Led4+0onXiJWp1hZwk
qSYSha8TkdsYD2HdZaTWpaJleBGtRjs+f1/HGukpXNpHcwJBtWB/gCTPoxvvwasRKcrVOZwkWR5FwleQ
+TwDGpODW6VrgoKS9LDqcCO8pN8rYCeirJfOr0+BwaRFnf4uHncWIE52Ack1MTBMO2EgxbIFaya9nViJ
IEy6S3DugcR9qugwEqsFGJocQGlPFqSKfMQ/DUWj+iO+zTEwkGIHptzoJyzZ3Ah56BMcF/uJ+OJDyG1I
wE15BBKqLnKSfEUixE0Z5E1Cwd4PWTwYZD8xwUaKDMrTegV88YE5vvggecgP/EI/XC0PRfaLFGhGlShV
FiHrXQqE8lgYiEBP/g0dEdDuTSJQ76xwPq+PXlijMTzn4egdn8ed+kykk6CoLh4FDbe371icLg8RNO8I
WNusdUfwPxzsChm7BKfzVc5yecPWXg/vhUql2jya1GL3xUmRmZ3mmXWnjb0wL1MwL1Ew+Vi2uznY5u20
N0xR1Jr/rbYfvjiPdyKzIztI2N55TKS0Boma6W3SvQT+RdhM+wvbVo+ktnUFpijSeDwe7w/xnZ33IE8q
nQAAAABJRU5ErkJggg==
zVTMdDqnaGpDFwbZYhqal9BEB11EKXpRoV10alPnnNMNZ2QuU5vzLnhZ6i7n6M7023POlhoI/eDD8+I5
3w/n9z2Hx07IfU3ipVK9KrJM/ztUpqfISXOUs6eBjizto8Mf60xnpdpKv6i3+7jQ7gl71KNdtNHLJpPJ
bXWsw2rfYdnGQuPnvA35n6YRWzbiFGQq93ujnoko1i2y4b5JFwxTDAzTDPSTDHQTG9D8WkfrsAPrDNA0
QiH/wxSSn5qofyShslZqzbmBgRk3vs4w5GTQz0k20G1ex5dhJxFsYmDeDcOcC4XKaQTd63zDhWPKAy03
ZFFb4pprSK6+juq2ehQ0lCNI5o9AgqDwDELkJ1HRVMGtYqcZLKw4EZLQzXCC6NKg951DzWgee4FqfS4n
SagKR+7reGTVx0KkuIwkRRKaBhfQbLLj8/c1rJKeQuU9NCcQVAr2+8my3frRLrwakqNEk8lJEmsiSPgK
0p6lQmt2cKt0jFFQkR5WHC6EFvR6BOyEFXfTklohjGYdFIa7KGrPQUz5BSRWRcE46YSRFMsWrB33dGIl
ghD5LsG5BzLXqbzDiK8UYGC8D4Vd6ZArJYh9Eox6zUd8m2VgJMX2TbjQS1i0uRD00Cs4LvUR86WHkFUX
h5s1YYiruMhJJMp4SBtSyZsEg70fmHajn/3EBBspMiBb5xHwpQdm+dKD5CEf8HN9cLUkGBnPhdAOq1Co
ykP6OyFENdEwEoGB/Bt6IqBdm0Sg2VnhfHYPPb9KY3DWzdE9Ooc7tWlIIUGxIhY5dbe371icG24iaNwR
sLYZ647gfzjYFVJ3CU5L1M6iqpdbez28F2q1evNoQpPdGydFprVbptacNvbCskTBskjB7GXJ7uJgm7fT
njBFUau+t1p+eOM83om0towAUWv7MbHKGiBupLdJ8eD/F1Ej7StqWTmS1NLhL1Qm83g83h/rHJ3uwC6N
XgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

53
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -538,6 +538,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnUserProcess;
private global::System.Data.DataColumn columnholyot;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportDataTable() {
@@ -627,6 +629,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn holyotColumn {
get {
return this.columnholyot;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -664,7 +674,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess) {
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot) {
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
yymm,
@@ -673,7 +683,8 @@ namespace FPJ0000 {
uname,
hrs,
ot,
UserProcess};
UserProcess,
holyot};
rowjobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowjobReportRow);
return rowjobReportRow;
@@ -711,6 +722,7 @@ namespace FPJ0000 {
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnUserProcess = base.Columns["UserProcess"];
this.columnholyot = base.Columns["holyot"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -730,6 +742,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnot);
this.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserProcess);
this.columnholyot = new global::System.Data.DataColumn("holyot", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnholyot);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnyymm,
this.columnuid}, true));
@@ -3400,6 +3414,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double holyot {
get {
if (this.IsholyotNull()) {
return 0D;
}
else {
return ((double)(this[this.tablejobReport.holyotColumn]));
}
}
set {
this[this.tablejobReport.holyotColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IstotalNull() {
@@ -3459,6 +3489,18 @@ namespace FPJ0000 {
public void SetUserProcessNull() {
this[this.tablejobReport.UserProcessColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsholyotNull() {
return this.IsNull(this.tablejobReport.holyotColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetholyotNull() {
this[this.tablejobReport.holyotColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -5065,6 +5107,7 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
tableMapping.ColumnMappings.Add("holyot", "holyot");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -5081,9 +5124,9 @@ namespace FPJ0000.dsReportTableAdapters {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess\r\nFROM vUserWorkTimeList" +
"\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserPr" +
"ocess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot\r\nFROM vUserWork" +
"TimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNUL" +
"L(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

26
SubProject/FPJ0000/dsReport.xsd
View File

@@ -12,7 +12,7 @@
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot
FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
ORDER BY yymm</CommandText>
@@ -33,6 +33,7 @@ ORDER BY yymm</CommandText>
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
<Mapping SourceColumn="holyot" DataSetColumn="holyot" />
</Mappings>
<Sources />
</TableAdapter>
@@ -272,10 +273,10 @@ ORDER BY pdate</CommandText>
<xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="22" />
@@ -283,7 +284,7 @@ ORDER BY pdate</CommandText>
</xs:simpleType>
</xs:element>
<xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columntotal" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_UserColumnName="total" type="xs:int" minOccurs="0" />
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
@@ -306,10 +307,11 @@ ORDER BY pdate</CommandText>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInRow="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -345,7 +347,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -358,7 +360,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -385,7 +387,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
@@ -397,7 +399,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -427,7 +429,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
<xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -534,7 +536,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent">
<xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_RowClassName="K5DailyFormRow">
<xs:complexType>
<xs:sequence>
<xs:element name="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_UserColumnName="Grp" type="xs:string" />
@@ -544,7 +546,7 @@ ORDER BY pdate</CommandText>
<xs:element name="value" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_ColumnVarNameInTable="columnvalue" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:Generator_UserColumnName="value" type="xs:double" minOccurs="0" />
<xs:element name="Sign" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Sign" msprop:Generator_ColumnVarNameInTable="columnSign" msprop:Generator_ColumnPropNameInTable="SignColumn" msprop:Generator_UserColumnName="Sign" type="xs:string" minOccurs="0" />
<xs:element name="Format" msprop:nullValue="N0" msprop:Generator_ColumnPropNameInRow="Format" msprop:Generator_ColumnVarNameInTable="columnFormat" msprop:Generator_ColumnPropNameInTable="FormatColumn" msprop:Generator_UserColumnName="Format" type="xs:string" minOccurs="0" />
<xs:element name="graph" msprop:Generator_ColumnVarNameInTable="columngraph" msprop:Generator_ColumnPropNameInRow="graph" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="graphColumn" msprop:Generator_UserColumnName="graph" type="xs:boolean" minOccurs="0" />
<xs:element name="graph" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="graph" msprop:Generator_ColumnVarNameInTable="columngraph" msprop:Generator_ColumnPropNameInTable="graphColumn" msprop:Generator_UserColumnName="graph" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

16
SubProject/FPJ0000/dsReport.xss
View File

@@ -6,14 +6,14 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="8" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="7" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="6" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="5" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="3" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PartSummary" ZOrder="4" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:K5DailyForm" ZOrder="1" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
<Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="8" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="7" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="6" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="4" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="3" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PartSummary" ZOrder="5" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:K5DailyForm" ZOrder="2" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
</Shapes>
<Connectors />
</DiagramLayout>

33
SubProject/WebServer/Controller/CommonController.cs
View File

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Net.Http;
@@ -8,16 +9,42 @@ namespace WebServer
{
public class CommonController : BaseController
{
[HttpGet]
public HttpResponseMessage Index()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var db = new EEEntities();
var sb = new System.Text.StringBuilder();
sb.AppendLine("List");
sb.AppendLine("Paramter Gcode");
sb.AppendLine("Paramter Grp");
//System.Web.Http.Results.JsonResult<string>
//var json = JsonConvert.SerializeObject(liast);
return new HttpResponseMessage()
{
Content = new StringContent(
sb.ToString(),
System.Text.Encoding.UTF8,
"text/html")
};
}
[HttpGet]
public HttpResponseMessage List()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var db = new EEEntities();
var liast = db.Common.Where(t => t.gcode == "EET1P").OrderBy(t => t.code).ToArray();
var vGcode = "EET1P";
var vGrp = "99";
var liast = db.Common.Where(t => t.gcode == vGcode && t.grp == vGrp).OrderBy(t => t.code).ToArray();
//System.Web.Http.Results.JsonResult<string>
var json = JObject.FromObject(liast);
var json = JsonConvert.SerializeObject(liast);
return new HttpResponseMessage()
{
Content = new StringContent(

18
SubProject/WebServer/Controller/HomeController.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
@@ -8,13 +9,13 @@ namespace WebServer
public class HomeController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
public void Index([FromBody] string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
public void Put(int id, [FromBody] string value)
{
}
@@ -64,13 +65,20 @@ namespace WebServer
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var contents = string.Empty;
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
Dictionary<string, string> list = new Dictionary<string, string>();
list.Add("공용코드 목록", "/Common/List/?Gcode=EET1P&Grp=99");
list.Add("사용자 목록", "/User/List/?Gcode=EET1P");
foreach (var item in list)
{
contents += $"<a target='_blank' href='{item.Value}'>{item.Key}</a>";
}
//공용값 적용
ApplyCommonValue(ref contents);
@@ -88,6 +96,6 @@ namespace WebServer
return resp;
}
}
}

58
SubProject/WebServer/Controller/UserController.cs Normal file
View File

@@ -0,0 +1,58 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace WebServer
{
public class UserController : BaseController
{
[HttpGet]
public HttpResponseMessage Index()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var db = new EEEntities();
var sb = new System.Text.StringBuilder();
sb.AppendLine("List");
sb.AppendLine("Gcode");
//System.Web.Http.Results.JsonResult<string>
//var json = JsonConvert.SerializeObject(liast);
return new HttpResponseMessage()
{
Content = new StringContent(
sb.ToString(),
System.Text.Encoding.UTF8,
"text/html")
};
}
[HttpGet]
public HttpResponseMessage List()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
using (var db = new EEEntities())
{
var vGcode = "EET1P";
var liast = db.vGroupUser.AsNoTracking().Where(t => t.gcode == vGcode).OrderBy(t => t.id).ToArray();
//System.Web.Http.Results.JsonResult<string>
var json = JsonConvert.SerializeObject(liast);
return new HttpResponseMessage()
{
Content = new StringContent(
json.ToString(),
System.Text.Encoding.UTF8,
"application/json")
};
}
}
}
}

4
SubProject/WebServer/Program.cs
View File

@@ -14,8 +14,10 @@ namespace WebServer
// Start OWIN host
try
{
WebApp.Start<OWIN.Startup>(url: "http://127.0.0.1:9000");
var url = "http://127.0.0.1:9000";
WebApp.Start<OWIN.Startup>(url: url);
Console.WriteLine("start webapp");
Console.WriteLine(url);
Console.ReadLine();
}
catch (Exception ex)

1
SubProject/WebServer/WebServer.csproj
View File

@@ -162,6 +162,7 @@
<Compile Include="Common.cs">
<DependentUpon>Model1.tt</DependentUpon>
</Compile>
<Compile Include="Controller\UserController.cs" />
<Compile Include="Controller\CustomerController.cs" />
<Compile Include="Controller\CommonController.cs" />
<Compile Include="Controller\APIController.cs" />