휴가신청구분 입력 불가 하게 함
This commit is contained in:
chi
@@ -14,4 +14,9 @@
|
||||
<PropertyGroup>
|
||||
<EnableSecurityDebugging>false</EnableSecurityDebugging>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
|
||||
<RemoteDebugEnabled>false</RemoteDebugEnabled>
|
||||
<RemoteDebugMachine>
|
||||
</RemoteDebugMachine>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
|
||||
// 지정되도록 할 수 있습니다.
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("22.06.02.0930")]
|
||||
[assembly: AssemblyFileVersion("22.06.02.0930")]
|
||||
[assembly: AssemblyVersion("22.07.04.0930")]
|
||||
[assembly: AssemblyFileVersion("22.07.04.0930")]
|
||||
|
||||
35
Project/_Common/fAddNewUser.Designer.cs
generated
35
Project/_Common/fAddNewUser.Designer.cs
generated
@@ -62,7 +62,8 @@
|
||||
this.textBox1 = new System.Windows.Forms.TextBox();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.tbState = new System.Windows.Forms.TextBox();
|
||||
this.chkUserSt = new System.Windows.Forms.CheckBox();
|
||||
this.chkJobReport = new System.Windows.Forms.CheckBox();
|
||||
this.chkUseState = new System.Windows.Forms.CheckBox();
|
||||
idLabel = new System.Windows.Forms.Label();
|
||||
passwordLabel = new System.Windows.Forms.Label();
|
||||
nameLabel = new System.Windows.Forms.Label();
|
||||
@@ -365,20 +366,31 @@
|
||||
//
|
||||
// chkUserSt
|
||||
//
|
||||
this.chkUserSt.AutoSize = true;
|
||||
this.chkUserSt.Location = new System.Drawing.Point(407, 262);
|
||||
this.chkUserSt.Name = "chkUserSt";
|
||||
this.chkUserSt.Size = new System.Drawing.Size(93, 25);
|
||||
this.chkUserSt.TabIndex = 36;
|
||||
this.chkUserSt.Text = "업무일지";
|
||||
this.chkUserSt.UseVisualStyleBackColor = true;
|
||||
this.chkUserSt.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged);
|
||||
this.chkJobReport.AutoSize = true;
|
||||
this.chkJobReport.Location = new System.Drawing.Point(407, 262);
|
||||
this.chkJobReport.Name = "chkUserSt";
|
||||
this.chkJobReport.Size = new System.Drawing.Size(93, 25);
|
||||
this.chkJobReport.TabIndex = 36;
|
||||
this.chkJobReport.Text = "업무일지";
|
||||
this.chkJobReport.UseVisualStyleBackColor = true;
|
||||
this.chkJobReport.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged);
|
||||
//
|
||||
// chkUseSta
|
||||
//
|
||||
this.chkUseState.AutoSize = true;
|
||||
this.chkUseState.Location = new System.Drawing.Point(503, 260);
|
||||
this.chkUseState.Name = "chkUseSta";
|
||||
this.chkUseState.Size = new System.Drawing.Size(93, 25);
|
||||
this.chkUseState.TabIndex = 37;
|
||||
this.chkUseState.Text = "계정사용";
|
||||
this.chkUseState.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// fAddNewUser
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
this.ClientSize = new System.Drawing.Size(601, 355);
|
||||
this.Controls.Add(this.chkUserSt);
|
||||
this.Controls.Add(this.chkUseState);
|
||||
this.Controls.Add(this.chkJobReport);
|
||||
this.Controls.Add(label6);
|
||||
this.Controls.Add(this.tbState);
|
||||
this.Controls.Add(this.button1);
|
||||
@@ -443,6 +455,7 @@
|
||||
private System.Windows.Forms.TextBox textBox1;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.TextBox tbState;
|
||||
private System.Windows.Forms.CheckBox chkUserSt;
|
||||
private System.Windows.Forms.CheckBox chkJobReport;
|
||||
private System.Windows.Forms.CheckBox chkUseState;
|
||||
}
|
||||
}
|
||||
@@ -52,9 +52,12 @@ namespace Project._Common
|
||||
{
|
||||
tbProcess.Text = db_guser.Process;
|
||||
tbState.Text = db_guser.state;
|
||||
|
||||
//this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
|
||||
this.chkUserSt.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
|
||||
this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
|
||||
this.chkUseState.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState);
|
||||
}
|
||||
|
||||
this.Text = "사용자 정보 변경";
|
||||
}
|
||||
else this.Text = "사용자 정보 추가";
|
||||
@@ -132,8 +135,8 @@ namespace Project._Common
|
||||
{
|
||||
drGuser.Process = this.tbProcess.Text.Trim();
|
||||
drGuser.state = this.tbState.Text.Trim();
|
||||
drGuser.useJobReport = chkUserSt.Checked;
|
||||
//drGuser.useJobReport = chkJobReport.Checked;
|
||||
drGuser.useJobReport = chkJobReport.Checked;
|
||||
drGuser.useUserState = chkUseState.Checked;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -153,7 +156,8 @@ namespace Project._Common
|
||||
drGuser.state = this.tbState.Text.Trim();
|
||||
drGuser.Process = this.tbProcess.Text.Trim();
|
||||
//drGuser.useJobReport = this.chkJobReport.Checked;
|
||||
drGuser.useJobReport = this.chkUserSt.Checked;
|
||||
drGuser.useJobReport = this.chkJobReport.Checked;
|
||||
drGuser.useUserState = this.chkUseState.Checked;
|
||||
db.EETGW_GroupUser.Add(drGuser);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -39,7 +39,8 @@
|
||||
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.tbSd = new System.Windows.Forms.TextBox();
|
||||
this.tbEd = new System.Windows.Forms.TextBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
|
||||
@@ -82,12 +83,13 @@
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.Controls.Add(this.tbEd);
|
||||
this.panel1.Controls.Add(this.button1);
|
||||
this.panel1.Controls.Add(this.tbProcess);
|
||||
this.panel1.Controls.Add(this.label1);
|
||||
this.panel1.Controls.Add(this.linkLabel1);
|
||||
this.panel1.Controls.Add(this.btRefresh);
|
||||
this.panel1.Controls.Add(this.tbMon);
|
||||
this.panel1.Controls.Add(this.tbSd);
|
||||
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panel1.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel1.Name = "panel1";
|
||||
@@ -109,7 +111,7 @@
|
||||
// tbProcess
|
||||
//
|
||||
this.tbProcess.FormattingEnabled = true;
|
||||
this.tbProcess.Location = new System.Drawing.Point(222, 10);
|
||||
this.tbProcess.Location = new System.Drawing.Point(344, 10);
|
||||
this.tbProcess.Name = "tbProcess";
|
||||
this.tbProcess.Size = new System.Drawing.Size(158, 20);
|
||||
this.tbProcess.TabIndex = 7;
|
||||
@@ -118,7 +120,7 @@
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(187, 15);
|
||||
this.label1.Location = new System.Drawing.Point(309, 15);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(29, 12);
|
||||
this.label1.TabIndex = 6;
|
||||
@@ -145,14 +147,23 @@
|
||||
this.btRefresh.UseVisualStyleBackColor = true;
|
||||
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
|
||||
//
|
||||
// tbMon
|
||||
// tbSd
|
||||
//
|
||||
this.tbMon.Location = new System.Drawing.Point(66, 10);
|
||||
this.tbMon.Name = "tbMon";
|
||||
this.tbMon.Size = new System.Drawing.Size(115, 21);
|
||||
this.tbMon.TabIndex = 1;
|
||||
this.tbMon.Text = "2020";
|
||||
this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
this.tbSd.Location = new System.Drawing.Point(66, 10);
|
||||
this.tbSd.Name = "tbSd";
|
||||
this.tbSd.Size = new System.Drawing.Size(115, 21);
|
||||
this.tbSd.TabIndex = 1;
|
||||
this.tbSd.Text = "2020";
|
||||
this.tbSd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// tbEd
|
||||
//
|
||||
this.tbEd.Location = new System.Drawing.Point(187, 10);
|
||||
this.tbEd.Name = "tbEd";
|
||||
this.tbEd.Size = new System.Drawing.Size(115, 21);
|
||||
this.tbEd.TabIndex = 9;
|
||||
this.tbEd.Text = "2020";
|
||||
this.tbEd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// rJobReportOT
|
||||
//
|
||||
@@ -182,9 +193,10 @@
|
||||
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.TextBox tbSd;
|
||||
private System.Windows.Forms.ComboBox tbProcess;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.TextBox tbEd;
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,8 @@ namespace FPJ0000.JobReport_
|
||||
//this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
this.tbMon.Text = DateTime.Now.Year.ToString();
|
||||
this.tbSd.Text = DateTime.Now.Year.ToString() + "-01";
|
||||
this.tbEd.Text = DateTime.Now.Year.ToString() + "-12";
|
||||
this.Show();
|
||||
Application.DoEvents();
|
||||
|
||||
@@ -43,7 +44,7 @@ namespace FPJ0000.JobReport_
|
||||
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
|
||||
|
||||
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
|
||||
this.ta.FillByOt2(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
|
||||
this.ta.FillByOt2(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
|
||||
|
||||
|
||||
//그리드뷰 생성
|
||||
@@ -55,6 +56,8 @@ namespace FPJ0000.JobReport_
|
||||
this.dataGridView1.ColumnHeadersHeight = 35;
|
||||
this.dataGridView1.Columns.Add("공정", "공정");
|
||||
this.dataGridView1.Columns.Add("이름", "이름");
|
||||
this.dataGridView1.Columns.Add("사번", "사번");
|
||||
|
||||
|
||||
//이름/년도데이터추가
|
||||
var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm);
|
||||
@@ -62,8 +65,13 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
var drYm = ym.FirstOrDefault();
|
||||
var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", ""));
|
||||
this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\r\n(" + basehr.ToString() + ")");
|
||||
this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\n휴일");// + "\r\n(" + basehr.ToString() + ")");
|
||||
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n연장");
|
||||
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].Tag = basehr;
|
||||
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].Tag = basehr;
|
||||
}
|
||||
this.dataGridView1.Columns.Add("subtotal", "합계\n휴일");
|
||||
this.dataGridView1.Columns.Add("subtotal", "합계\n연장");
|
||||
|
||||
//이름으로 정렬해서 데이터를 가져온다
|
||||
var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname);
|
||||
@@ -73,20 +81,32 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
List<string> rowdata = new List<string>();
|
||||
rowdata.Add(drName.UserProcess);
|
||||
rowdata.Add(drName.uname + "(" + drName.uid + ")");
|
||||
rowdata.Add(drName.uname);
|
||||
rowdata.Add(drName.uid);
|
||||
|
||||
if (drName.uid.Equals("221597"))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
double User_sumhl = 0;
|
||||
double User_sumot = 0;
|
||||
|
||||
List<Boolean> high = new List<bool>();
|
||||
List<Boolean> low = new List<bool>();
|
||||
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
|
||||
for (int i = 3; i < this.dataGridView1.ColumnCount; i += 2)
|
||||
{
|
||||
var coltitle = dataGridView1.Columns[i].HeaderText;
|
||||
var basehr = int.Parse(coltitle.Split('\n')[1].Replace("(", "").Replace(")", ""));
|
||||
var col = dataGridView1.Columns[i];
|
||||
var coltitle = col.HeaderText;
|
||||
if (col.Tag == null) continue;
|
||||
var basehr = int.Parse(col.Tag.ToString());
|
||||
|
||||
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == dataGridView1.Columns[i].Name);
|
||||
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == col.Name);
|
||||
if (userDatas == null || userDatas.Count() == 0)
|
||||
{
|
||||
//이달에는 데이터가없다
|
||||
rowdata.Add("--");
|
||||
rowdata.Add(null); //휴일
|
||||
rowdata.Add(null); //연장
|
||||
high.Add(false);
|
||||
low.Add(false);
|
||||
}
|
||||
@@ -105,7 +125,14 @@ namespace FPJ0000.JobReport_
|
||||
var sumot = userDatas.Sum(t => t.ot2);
|
||||
var sumhl = userDatas.Sum(t => t.holyot2);
|
||||
|
||||
rowdata.Add($"휴일({sumhl})\r\n연장({sumot})");
|
||||
User_sumhl += sumhl;
|
||||
User_sumot += sumot;
|
||||
|
||||
if (sumhl == 0.0) rowdata.Add(null);
|
||||
else rowdata.Add($"{sumhl}");
|
||||
|
||||
if (sumot == 0.0) rowdata.Add(null);
|
||||
else rowdata.Add($"{sumot}");
|
||||
|
||||
if (sumhr > basehr) high.Add(true);
|
||||
else high.Add(false);
|
||||
@@ -115,17 +142,65 @@ namespace FPJ0000.JobReport_
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
rowdata.Add($"{User_sumhl}"); //합게
|
||||
rowdata.Add($"{User_sumot}"); //합게
|
||||
dataGridView1.Rows.Add(rowdata.ToArray());
|
||||
|
||||
//이번에 추가한 줄의 셀 컬러를 지정한다
|
||||
var currentrow = dataGridView1.Rows.Count - 1;
|
||||
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
|
||||
for (int i = 0; i < this.dataGridView1.ColumnCount; i++)
|
||||
{
|
||||
if (high[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
|
||||
var col = this.dataGridView1.Columns[i];
|
||||
if (col.Tag == null)
|
||||
{
|
||||
dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
|
||||
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.WhiteSmoke;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (col.HeaderText.Contains("연장"))
|
||||
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.Linen;// 155,82,93);
|
||||
else
|
||||
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.White;
|
||||
}
|
||||
|
||||
var idx = i - 2;
|
||||
if (idx < high.Count)
|
||||
{
|
||||
if (high[idx]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
|
||||
else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue;
|
||||
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
|
||||
}
|
||||
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
|
||||
}
|
||||
}
|
||||
|
||||
//총계추가
|
||||
|
||||
|
||||
List<object> rowdata2 = new List<object>();
|
||||
rowdata2.Add("합계");
|
||||
rowdata2.Add(dataGridView1.Rows.Count);
|
||||
rowdata2.Add(null);
|
||||
for (int i = 0; i < this.dataGridView1.ColumnCount; i++)
|
||||
{
|
||||
var col = this.dataGridView1.Columns[i];
|
||||
if (col.Tag == null && col.HeaderText.StartsWith("합계") == false) continue;
|
||||
|
||||
var sum = 0.0;
|
||||
for (int r = 0; r < this.dataGridView1.RowCount; r++)
|
||||
{
|
||||
var cell = dataGridView1.Rows[r].Cells[i];
|
||||
if (cell.Value != null) sum += double.Parse(cell.Value.ToString());
|
||||
}
|
||||
if (sum != 0.0) rowdata2.Add(sum);
|
||||
else rowdata2.Add(null);
|
||||
}
|
||||
dataGridView1.Rows.Add(rowdata2.ToArray());
|
||||
dataGridView1.Rows[dataGridView1.Rows.Count - 1].DefaultCellStyle.BackColor = Color.LightGray;
|
||||
|
||||
this.dataGridView1.AutoResizeColumns();
|
||||
|
||||
}
|
||||
|
||||
@@ -110,6 +110,7 @@ namespace FPJ0000.OtConfirm
|
||||
if (curLevel >= 5)
|
||||
{
|
||||
grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)";
|
||||
|
||||
}
|
||||
var 관리자사전멘트 = FCOMMON.DBM.getCodeList("54");
|
||||
cmbPreset.Items.Clear();
|
||||
@@ -118,6 +119,14 @@ namespace FPJ0000.OtConfirm
|
||||
cmbPreset.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
if(curLevel >= 5)
|
||||
{
|
||||
tbCate.DropDownStyle = ComboBoxStyle.DropDown;
|
||||
}
|
||||
else
|
||||
{
|
||||
tbCate.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
}
|
||||
|
||||
binit = true;
|
||||
}
|
||||
@@ -136,6 +145,14 @@ namespace FPJ0000.OtConfirm
|
||||
return;
|
||||
}
|
||||
|
||||
//일반사용인데 내용이 대체 라는 문자라면 오류로 한다 220627
|
||||
if (radTime.Checked == false && cate.Equals("대체"))
|
||||
{
|
||||
FCOMMON.Util.MsgE("일반 휴가 사용에 '대체' 문자는 입력할 수 없습니다\n대체 시간을 사용하는 경우 라면 '대체시간사용'을 입력하세요");
|
||||
tbCate.Focus();
|
||||
return;
|
||||
}
|
||||
|
||||
if (tbED.Value.ToShortDateString().CompareTo(tbSD.Value.ToShortDateString()) < 0)
|
||||
{
|
||||
FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요");
|
||||
@@ -237,7 +254,7 @@ namespace FPJ0000.OtConfirm
|
||||
dr.HolyBackup = tbBackup.Text.Trim();
|
||||
dr.cate = cate;// tbCate.Text.Trim();
|
||||
|
||||
if (dr.Remark.Contains(richTextBox1.Text) == false)
|
||||
if ( dr.RowState == DataRowState.Detached && dr.Remark.Contains(richTextBox1.Text) == false)
|
||||
dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text;
|
||||
else
|
||||
dr.Remark = tbRemark.Text.Trim();
|
||||
|
||||
55
SubProject/FPJ0000/dsReport.Designer.cs
generated
55
SubProject/FPJ0000/dsReport.Designer.cs
generated
@@ -6052,13 +6052,14 @@ namespace FPJ0000.dsReportTableAdapters {
|
||||
this._commandCollection[1].Connection = this.Connection;
|
||||
this._commandCollection[1].CommandText = @"SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
|
||||
WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR
|
||||
ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
|
||||
ORDER BY yymm";
|
||||
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[1].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[1].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, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -6125,25 +6126,31 @@ ORDER BY yymm";
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
|
||||
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) {
|
||||
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string gcode, string userprocess, string startM, string endM) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[1];
|
||||
if ((yyyy == null)) {
|
||||
throw new global::System.ArgumentNullException("yyyy");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
|
||||
}
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
|
||||
}
|
||||
if ((userprocess == null)) {
|
||||
throw new global::System.ArgumentNullException("userprocess");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess));
|
||||
}
|
||||
if ((startM == null)) {
|
||||
throw new global::System.ArgumentNullException("startM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM));
|
||||
}
|
||||
if ((endM == null)) {
|
||||
throw new global::System.ArgumentNullException("endM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM));
|
||||
}
|
||||
if ((this.ClearBeforeFill == true)) {
|
||||
dataTable.Clear();
|
||||
@@ -6156,25 +6163,31 @@ ORDER BY yymm";
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
|
||||
public virtual dsReport.jobReportDataTable GetByOt2(string yyyy, string gcode, string userprocess) {
|
||||
public virtual dsReport.jobReportDataTable GetByOt2(string gcode, string userprocess, string startM, string endM) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[1];
|
||||
if ((yyyy == null)) {
|
||||
throw new global::System.ArgumentNullException("yyyy");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
|
||||
}
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
|
||||
}
|
||||
if ((userprocess == null)) {
|
||||
throw new global::System.ArgumentNullException("userprocess");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess));
|
||||
}
|
||||
if ((startM == null)) {
|
||||
throw new global::System.ArgumentNullException("startM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM));
|
||||
}
|
||||
if ((endM == null)) {
|
||||
throw new global::System.ArgumentNullException("endM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM));
|
||||
}
|
||||
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
|
||||
@@ -43,13 +43,14 @@ ORDER BY yymm</CommandText>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
|
||||
WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR
|
||||
ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
|
||||
ORDER BY yymm</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="yyyy" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yyyy" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="startM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@startM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="endM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@endM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
@@ -329,7 +330,7 @@ ORDER BY title, ww</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_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: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: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">
|
||||
@@ -369,7 +370,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
|
||||
@@ -412,7 +413,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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: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">
|
||||
@@ -425,7 +426,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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: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">
|
||||
@@ -466,7 +467,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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: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" />
|
||||
@@ -478,7 +479,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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: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" />
|
||||
@@ -508,7 +509,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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: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" />
|
||||
@@ -625,7 +626,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<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: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: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" />
|
||||
@@ -639,7 +640,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="JobProjectTimes" msprop:Generator_TableClassName="JobProjectTimesDataTable" msprop:Generator_TableVarName="tableJobProjectTimes" msprop:Generator_RowChangedName="JobProjectTimesRowChanged" msprop:Generator_TablePropName="JobProjectTimes" msprop:Generator_RowDeletingName="JobProjectTimesRowDeleting" msprop:Generator_RowChangingName="JobProjectTimesRowChanging" msprop:Generator_RowEvHandlerName="JobProjectTimesRowChangeEventHandler" msprop:Generator_RowDeletedName="JobProjectTimesRowDeleted" msprop:Generator_RowClassName="JobProjectTimesRow" msprop:Generator_UserTableName="JobProjectTimes" msprop:Generator_RowEvArgName="JobProjectTimesRowChangeEvent">
|
||||
<xs:element name="JobProjectTimes" msprop:Generator_TableClassName="JobProjectTimesDataTable" msprop:Generator_TableVarName="tableJobProjectTimes" msprop:Generator_TablePropName="JobProjectTimes" msprop:Generator_RowDeletingName="JobProjectTimesRowDeleting" msprop:Generator_RowChangingName="JobProjectTimesRowChanging" msprop:Generator_RowEvHandlerName="JobProjectTimesRowChangeEventHandler" msprop:Generator_RowDeletedName="JobProjectTimesRowDeleted" msprop:Generator_UserTableName="JobProjectTimes" msprop:Generator_RowChangedName="JobProjectTimesRowChanged" msprop:Generator_RowEvArgName="JobProjectTimesRowChangeEvent" msprop:Generator_RowClassName="JobProjectTimesRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ww" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_UserColumnName="ww" minOccurs="0">
|
||||
@@ -658,7 +659,7 @@ ORDER BY title, ww</CommandText>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" minOccurs="0" />
|
||||
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
</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="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:jobReport" ZOrder="3" X="494" Y="216" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
|
||||
<Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
|
||||
<Shape ID="DesignTable:jobReport" ZOrder="1" X="494" Y="216" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
|
||||
<Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
|
||||
<Shape ID="DesignTable:ProcessList" ZOrder="9" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:ProcessUserList" ZOrder="8" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
|
||||
<Shape ID="DesignTable:HolidayLIst" ZOrder="6" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:JobProjectTimes" ZOrder="1" X="537" Y="622" Height="191" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:JobProjectTimes" ZOrder="2" X="537" Y="622" Height="191" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:PartSummary" ZOrder="7" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
|
||||
<Shape ID="DesignTable:K5DailyForm" ZOrder="5" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
|
||||
</Shapes>
|
||||
|
||||
Reference in New Issue
Block a user