リビジョン 274
出勤日報修正中
工事情報一覧:注文書一覧不具合修正
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 84;
|
|
17 |
public static int s_SystemVersion = 85;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs | ||
---|---|---|
504 | 504 |
|
505 | 505 |
// データを追加する |
506 | 506 |
frm.AddingConstrCode = ConstructionCode; |
507 |
if (!frm.AddDataLedger) |
|
508 |
{ |
|
509 |
frm.Close(); // 画面を閉じる |
|
510 |
return false; |
|
511 |
} |
|
507 |
if (!frm.AddDataLedger) return false; |
|
512 | 508 |
|
513 | 509 |
// データ作成処理 |
514 |
if (!frm.SaveLedgerData) |
|
515 |
{ |
|
516 |
frm.Close(); // 画面を閉じる |
|
517 |
return false; |
|
518 |
} |
|
510 |
if (!frm.SaveLedgerData) return false; |
|
519 | 511 |
|
520 |
// 画面を閉じる |
|
521 |
frm.Close(); |
|
522 |
|
|
523 | 512 |
return true; |
524 | 513 |
} |
525 | 514 |
catch (System.Exception ex) |
... | ... | |
529 | 518 |
} |
530 | 519 |
finally |
531 | 520 |
{ |
521 |
// 画面を閉じる |
|
522 |
frm.Close(); |
|
532 | 523 |
frm.Dispose(); frm = null; |
533 | 524 |
LedgerDB.close(); LedgerDB = null; |
534 | 525 |
LinkDB.close(); LinkDB = null; |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs | ||
---|---|---|
700 | 700 |
{ |
701 | 701 |
try |
702 | 702 |
{ |
703 |
// 旧セキュリティを使用している場合はチェック無 |
|
704 |
if (CommonMotions.LoginUserData.SecCode == 0) |
|
705 |
{ |
|
706 |
Editflg = (int)CommonDefine.ProcessDataEdit.Edit; |
|
707 |
return true; |
|
708 |
} |
|
709 | 703 |
// サブウィンドウ等の特殊処理はすべて起動OK |
710 | 704 |
if ((int)ClsExcute.SubFormExecuteNo.MessageWriter <= ExecCode) |
711 | 705 |
{ |
... | ... | |
768 | 762 |
} |
769 | 763 |
else |
770 | 764 |
{ // ログイン者以外はDBより読込チェックする |
771 |
string strSQL = "SELECT B.EXECCODE, B.EDITFLG, A.PERSONCODE, A.PERSONNAME, B.SECCODE"; |
|
772 |
strSQL += " FROM PERSONINCHARGEMASTER A, PROCESSEXCUTEMASTER B"; |
|
773 |
strSQL += " WHERE B.SECCODE = A.SECCODE"; |
|
774 |
strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode); |
|
775 |
strSQL += string.Format(" AND B.EXECCODE = {0}", ExecCode); |
|
765 |
StringBuilder strSQL = new StringBuilder(); |
|
766 |
strSQL.Append("SELECT B.EXECCODE, B.EDITFLG, A.PERSONCODE, A.PERSONNAME, B.SECCODE"); |
|
767 |
strSQL.Append(" FROM PERSONINCHARGEMASTER A, PROCESSEXCUTEMASTER B"); |
|
768 |
strSQL.Append(" WHERE B.SECCODE = A.SECCODE"); |
|
769 |
strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode); |
|
770 |
strSQL.AppendFormat(" AND B.EXECCODE = {0}", ExecCode); |
|
776 | 771 |
|
777 | 772 |
ArrayList arList = new ArrayList(); |
778 |
if (!ExecDB.ExecuteReader(strSQL, ref arList)) return false; |
|
773 |
if (!ExecDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
779 | 774 |
|
780 | 775 |
if (arList.Count == 0) return false; |
781 | 776 |
object[] objRec = (object[])arList[0]; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
---|---|---|
651 | 651 |
strSQL.Append(" AND EXISTS (SELECT * FROM PURCHASEORDER B1 WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)"); |
652 | 652 |
strSQL.Append(" AND A.CONSTRUCTIONPERSONCODE != 0"); |
653 | 653 |
strSQL.Append(" AND A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"); |
654 |
strSQL.Append(" Group by A.CONSTRUCTIONCODE)"); |
|
655 | 654 |
|
656 | 655 |
// ???????I??????????? |
657 | 656 |
strSQL.Append(GetDepartmentString()); |
... | ... | |
662 | 661 |
// ?Z?L?????e?B??????Z?b?g |
663 | 662 |
strSQL.Append(wrkBuff.ToString()); |
664 | 663 |
|
664 |
strSQL.Append(" Group by A.CONSTRUCTIONCODE)"); |
|
665 |
|
|
665 | 666 |
// ORDER BY ??? |
666 | 667 |
strSQL.AppendFormat(" ORDER BY {0} ASC, {1} ASC, {2} ASC, {3} ASC, {4} ASC, {5} DESC", |
667 | 668 |
(int)GetData.CONSTRUCTIONSTATUSFLG + 1, |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
---|---|---|
6082 | 6082 |
DateTime EdDate = CommonMotions.cnvDate(NowMonth); |
6083 | 6083 |
int Betwen = (int)GridColumn.Payment + MonthDiff(StDate, EdDate); |
6084 | 6084 |
|
6085 |
double dExpenses = 0; |
|
6086 |
double NowValue = 0; |
|
6087 |
double CalcValue = 0; |
|
6088 |
// 合計欄位置取得 |
|
6089 |
int TotalPoint = dgv.ColumnCount + (int)ColPayTotal.Totals; |
|
6085 | 6090 |
for (int i = StartLine; i < dgv.RowCount; i++) |
6086 | 6091 |
{ |
6087 | 6092 |
DataGridViewRow GridRow = dgv.Rows[i]; |
... | ... | |
6090 | 6095 |
if (CommonMotions.cnvInt(GridRow.Cells[(int)GridColumn.GroupCount].Value) != GroupNo) break; |
6091 | 6096 |
|
6092 | 6097 |
// 経費率取得 |
6093 |
double dExpenses = CommonMotions.cnvDouble(GridRow.Cells[(int)GridColumn.Percent].Value);
|
|
6098 |
dExpenses = CommonMotions.cnvDouble(GridRow.Cells[(int)GridColumn.Percent].Value); |
|
6094 | 6099 |
|
6095 | 6100 |
// 実行金額現在値取得 |
6096 |
double NowValue = CommonMotions.cnvInt(GridRow.Cells[(int)GridColumn.ExecPrice].Value);
|
|
6101 |
NowValue = CommonMotions.cnvInt(GridRow.Cells[(int)GridColumn.ExecPrice].Value); |
|
6097 | 6102 |
// 金額計算 |
6098 |
double CalcValue = CommonMotions.cnvRound(OrdersPrice * (dExpenses / 100.0));
|
|
6103 |
CalcValue = CommonMotions.cnvRound(OrdersPrice * (dExpenses / 100.0)); |
|
6099 | 6104 |
|
6100 |
// データセット 元の金額は変更しない |
|
6101 |
//GridRow.Cells[(int)DispGridColumn.ExecPrice].Value = ((int)CalcValue).ToString("#,#"); |
|
6102 |
|
|
6103 | 6105 |
// 支払金額セット |
6104 | 6106 |
if (Betwen == (int)GridColumn.Payment) |
6105 | 6107 |
{ // 工期が1カ月しかない場合 |
... | ... | |
6110 | 6112 |
GridRow.Cells[Betwen].Value = ((int)(CalcValue - NowValue)).ToString("#,#"); |
6111 | 6113 |
} |
6112 | 6114 |
|
6113 |
// 合計欄位置取得 |
|
6114 |
int TotalPoint = dgv.ColumnCount + (int)ColPayTotal.Totals; |
|
6115 |
// 経費セット |
|
6115 | 6116 |
GridRow.Cells[TotalPoint].Value = ((int)CalcValue).ToString("#,#"); |
6116 | 6117 |
} |
6117 | 6118 |
return true; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs | ||
---|---|---|
31 | 31 |
private void InitializeComponent() |
32 | 32 |
{ |
33 | 33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); |
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
36 | 34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); |
37 | 35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); |
38 | 36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); |
... | ... | |
41 | 39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); |
42 | 40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); |
43 | 41 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); |
42 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
43 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
44 | 44 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); |
45 | 45 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); |
46 | 46 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); |
47 | 47 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); |
48 | 48 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); |
49 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
50 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
49 | 51 |
this.label1 = new System.Windows.Forms.Label(); |
50 | 52 |
this.btnLineDel = new System.Windows.Forms.Button(); |
51 | 53 |
this.btnLineAdd = new System.Windows.Forms.Button(); |
... | ... | |
196 | 198 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
197 | 199 |
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
198 | 200 |
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
201 |
this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
199 | 202 |
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
200 | 203 |
this.Column15 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); |
201 | 204 |
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
1839 | 1842 |
this.Column1, |
1840 | 1843 |
this.Column4, |
1841 | 1844 |
this.Column3, |
1845 |
this.Column16, |
|
1842 | 1846 |
this.Column2, |
1843 | 1847 |
this.Column15, |
1844 | 1848 |
this.Column5, |
... | ... | |
1856 | 1860 |
this.dgvAllDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; |
1857 | 1861 |
this.dgvAllDisplay.Size = new System.Drawing.Size(1310, 458); |
1858 | 1862 |
this.dgvAllDisplay.TabIndex = 37; |
1863 |
this.dgvAllDisplay.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellDoubleClick); |
|
1859 | 1864 |
this.dgvAllDisplay.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter); |
1860 | 1865 |
this.dgvAllDisplay.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValidated); |
1861 | 1866 |
this.dgvAllDisplay.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValueChanged); |
... | ... | |
1868 | 1873 |
this.dgvTransport02.AllowUserToResizeRows = false; |
1869 | 1874 |
this.dgvTransport02.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |
1870 | 1875 |
this.dgvTransport02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
1871 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
1872 |
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
|
|
1873 |
dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
1874 |
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
1875 |
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
1876 |
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
1877 |
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
1878 |
this.dgvTransport02.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
|
|
1876 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
1877 |
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
|
|
1878 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
1879 |
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
1880 |
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
1881 |
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
1882 |
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
1883 |
this.dgvTransport02.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
|
|
1879 | 1884 |
this.dgvTransport02.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
1880 | 1885 |
this.dgvTransport02.ColumnHeadersVisible = false; |
1881 | 1886 |
this.dgvTransport02.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
... | ... | |
1908 | 1913 |
// |
1909 | 1914 |
// dataGridViewTextBoxColumn1 |
1910 | 1915 |
// |
1911 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
1912 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
1913 |
dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
|
|
1914 |
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle8;
|
|
1916 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
1917 |
dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
1918 |
dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
|
|
1919 |
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle10;
|
|
1915 | 1920 |
this.dataGridViewTextBoxColumn1.Frozen = true; |
1916 | 1921 |
this.dataGridViewTextBoxColumn1.HeaderText = "日"; |
1917 | 1922 |
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; |
... | ... | |
1930 | 1935 |
// |
1931 | 1936 |
// dataGridViewTextBoxColumn2 |
1932 | 1937 |
// |
1933 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1934 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
1935 |
dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
|
|
1936 |
this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle9;
|
|
1938 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1939 |
dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
1940 |
dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black;
|
|
1941 |
this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle11;
|
|
1937 | 1942 |
this.dataGridViewTextBoxColumn2.Frozen = true; |
1938 | 1943 |
this.dataGridViewTextBoxColumn2.HeaderText = "事務所発"; |
1939 | 1944 |
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; |
... | ... | |
1942 | 1947 |
// |
1943 | 1948 |
// dataGridViewTextBoxColumn3 |
1944 | 1949 |
// |
1945 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1946 |
dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
1947 |
dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
|
|
1948 |
this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle10;
|
|
1950 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1951 |
dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
1952 |
dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
|
|
1953 |
this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle12;
|
|
1949 | 1954 |
this.dataGridViewTextBoxColumn3.Frozen = true; |
1950 | 1955 |
this.dataGridViewTextBoxColumn3.HeaderText = "事務所着"; |
1951 | 1956 |
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; |
... | ... | |
1954 | 1959 |
// |
1955 | 1960 |
// dataGridViewTextBoxColumn4 |
1956 | 1961 |
// |
1957 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1958 |
dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
1959 |
dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black;
|
|
1960 |
this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle11;
|
|
1962 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1963 |
dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
1964 |
dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Black;
|
|
1965 |
this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle13;
|
|
1961 | 1966 |
this.dataGridViewTextBoxColumn4.Frozen = true; |
1962 | 1967 |
this.dataGridViewTextBoxColumn4.HeaderText = "当日計"; |
1963 | 1968 |
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; |
... | ... | |
2013 | 2018 |
this.dgvTransport01.AllowUserToResizeRows = false; |
2014 | 2019 |
this.dgvTransport01.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |
2015 | 2020 |
this.dgvTransport01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
2016 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
2017 |
dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
|
|
2018 |
dataGridViewCellStyle12.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
2019 |
dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
2020 |
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
2021 |
dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
2022 |
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
2023 |
this.dgvTransport01.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
|
|
2021 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
2022 |
dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
|
|
2023 |
dataGridViewCellStyle14.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
2024 |
dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
2025 |
dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
2026 |
dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
2027 |
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
2028 |
this.dgvTransport01.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
|
|
2024 | 2029 |
this.dgvTransport01.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
2025 | 2030 |
this.dgvTransport01.ColumnHeadersVisible = false; |
2026 | 2031 |
this.dgvTransport01.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
... | ... | |
2053 | 2058 |
// |
2054 | 2059 |
// dataGridViewTextBoxColumn5 |
2055 | 2060 |
// |
2056 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
2057 |
dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
2058 |
dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Black;
|
|
2059 |
this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle13;
|
|
2061 |
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
2062 |
dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
2063 |
dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
|
|
2064 |
this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle15;
|
|
2060 | 2065 |
this.dataGridViewTextBoxColumn5.Frozen = true; |
2061 | 2066 |
this.dataGridViewTextBoxColumn5.HeaderText = "日"; |
2062 | 2067 |
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; |
... | ... | |
2075 | 2080 |
// |
2076 | 2081 |
// dataGridViewTextBoxColumn6 |
2077 | 2082 |
// |
2078 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
2079 |
dataGridViewCellStyle14.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
2080 |
dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black;
|
|
2081 |
this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle14;
|
|
2083 |
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
2084 |
dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
2085 |
dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
|
|
2086 |
this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle16;
|
|
2082 | 2087 |
this.dataGridViewTextBoxColumn6.Frozen = true; |
2083 | 2088 |
this.dataGridViewTextBoxColumn6.HeaderText = "事務所発"; |
2084 | 2089 |
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; |
... | ... | |
2087 | 2092 |
// |
2088 | 2093 |
// dataGridViewTextBoxColumn7 |
2089 | 2094 |
// |
2090 |
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
2091 |
dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
2092 |
dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
|
|
2093 |
this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle15;
|
|
2095 |
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
2096 |
dataGridViewCellStyle17.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
2097 |
dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
|
|
2098 |
this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle17;
|
|
2094 | 2099 |
this.dataGridViewTextBoxColumn7.Frozen = true; |
2095 | 2100 |
this.dataGridViewTextBoxColumn7.HeaderText = "事務所着"; |
2096 | 2101 |
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; |
... | ... | |
2099 | 2104 |
// |
2100 | 2105 |
// dataGridViewTextBoxColumn8 |
2101 | 2106 |
// |
2102 |
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
2103 |
dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
2104 |
dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
|
|
2105 |
this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle16;
|
|
2107 |
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
2108 |
dataGridViewCellStyle18.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
|
|
2109 |
dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
|
|
2110 |
this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle18;
|
|
2106 | 2111 |
this.dataGridViewTextBoxColumn8.Frozen = true; |
2107 | 2112 |
this.dataGridViewTextBoxColumn8.HeaderText = "当日計"; |
2108 | 2113 |
this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; |
... | ... | |
2226 | 2231 |
this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2227 | 2232 |
this.Column3.Width = 80; |
2228 | 2233 |
// |
2234 |
// Column16 |
|
2235 |
// |
|
2236 |
this.Column16.Frozen = true; |
|
2237 |
this.Column16.HeaderText = "工事番号"; |
|
2238 |
this.Column16.Name = "Column16"; |
|
2239 |
this.Column16.ReadOnly = true; |
|
2240 |
this.Column16.Visible = false; |
|
2241 |
// |
|
2229 | 2242 |
// Column2 |
2230 | 2243 |
// |
2231 | 2244 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
2232 | 2245 |
this.Column2.DefaultCellStyle = dataGridViewCellStyle4; |
2233 | 2246 |
this.Column2.Frozen = true; |
2234 |
this.Column2.HeaderText = "行 先";
|
|
2247 |
this.Column2.HeaderText = "作 業 内 容";
|
|
2235 | 2248 |
this.Column2.Name = "Column2"; |
2236 | 2249 |
this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2237 | 2250 |
this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
... | ... | |
2250 | 2263 |
// |
2251 | 2264 |
// Column5 |
2252 | 2265 |
// |
2266 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
2267 |
dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
2268 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle6; |
|
2253 | 2269 |
this.Column5.Frozen = true; |
2254 |
this.Column5.HeaderText = "開始時間";
|
|
2270 |
this.Column5.HeaderText = "残業開始";
|
|
2255 | 2271 |
this.Column5.Name = "Column5"; |
2272 |
this.Column5.ReadOnly = true; |
|
2256 | 2273 |
this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2257 | 2274 |
this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2258 | 2275 |
// |
2259 | 2276 |
// Column8 |
2260 | 2277 |
// |
2278 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
2279 |
dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
2280 |
this.Column8.DefaultCellStyle = dataGridViewCellStyle7; |
|
2261 | 2281 |
this.Column8.Frozen = true; |
2262 |
this.Column8.HeaderText = "終了時間";
|
|
2282 |
this.Column8.HeaderText = "残業終了";
|
|
2263 | 2283 |
this.Column8.Name = "Column8"; |
2284 |
this.Column8.ReadOnly = true; |
|
2264 | 2285 |
this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2265 | 2286 |
this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2266 | 2287 |
// |
2267 | 2288 |
// Column7 |
2268 | 2289 |
// |
2269 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
2270 |
this.Column7.DefaultCellStyle = dataGridViewCellStyle6; |
|
2290 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
2291 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
2292 |
this.Column7.DefaultCellStyle = dataGridViewCellStyle8; |
|
2271 | 2293 |
this.Column7.Frozen = true; |
2272 | 2294 |
this.Column7.HeaderText = "残業時間"; |
2273 | 2295 |
this.Column7.Name = "Column7"; |
... | ... | |
2474 | 2496 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column1; |
2475 | 2497 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column4; |
2476 | 2498 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column3; |
2499 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column16; |
|
2477 | 2500 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column2; |
2478 | 2501 |
private System.Windows.Forms.DataGridViewCheckBoxColumn Column15; |
2479 | 2502 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column5; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs | ||
---|---|---|
48 | 48 |
DispDay = 0, |
49 | 49 |
AttendanceDate, |
50 | 50 |
WeekString, |
51 |
ConstractionCode, |
|
51 | 52 |
ActionResult, |
52 | 53 |
OverTimeFlg, |
53 | 54 |
StartTime, |
... | ... | |
464 | 465 |
/// <param name="e"></param> |
465 | 466 |
private void btnLineDel_Click(object sender, EventArgs e) |
466 | 467 |
{ |
467 |
// 行削除処理を行った |
|
468 |
DeleteLineData(); |
|
469 |
m_bChengeAns = true; |
|
468 |
try |
|
469 |
{ |
|
470 |
// 行削除処理を行った |
|
471 |
DeleteLineData(); |
|
472 |
m_bChengeAns = true; |
|
473 |
} |
|
474 |
catch (Exception ex) |
|
475 |
{ |
|
476 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
477 |
} |
|
470 | 478 |
} |
471 | 479 |
#endregion |
472 | 480 |
|
... | ... | |
609 | 617 |
} |
610 | 618 |
#endregion |
611 | 619 |
|
612 |
#region 出勤グリッドセル値の変更
|
|
620 |
#region 日報グリッドセル値の変更
|
|
613 | 621 |
/// <summary> |
614 |
/// 出勤グリッドセル値の変更
|
|
622 |
/// 日報グリッドセル値の変更
|
|
615 | 623 |
/// </summary> |
616 | 624 |
/// <param name="sender"></param> |
617 | 625 |
/// <param name="e"></param> |
... | ... | |
620 | 628 |
// 初期表示は処理しない |
621 | 629 |
if (GetConstructionPersonCode() == 0) return; |
622 | 630 |
|
631 |
DataGridView dgv = dgvAllDisplay; |
|
623 | 632 |
// 参照時は処理しない |
624 | 633 |
if (m_EditLock) return; |
634 |
if (dgv.ReadOnly) return; |
|
625 | 635 |
|
626 |
// 出勤日数・残業時間セット |
|
627 |
SetWorkDaysAndOverTimes(); |
|
636 |
switch (e.ColumnIndex) |
|
637 |
{ |
|
638 |
case (int)GridColumn01.OverTimeFlg: |
|
639 |
if (CommonMotions.chkCellBlank(dgv.CurrentCell.Value)) break; |
|
640 |
LockOverTimeArea(); |
|
641 |
break; |
|
642 |
case (int)GridColumn01.StartTime: |
|
643 |
case (int)GridColumn01.Comptime: |
|
644 |
// 出勤日数・残業時間セット |
|
645 |
SetWorkDaysAndOverTimes(); |
|
646 |
break; |
|
647 |
default: |
|
648 |
break; |
|
649 |
} |
|
628 | 650 |
|
629 | 651 |
m_bChengeAns = true; |
630 | 652 |
} |
... | ... | |
640 | 662 |
{ |
641 | 663 |
try |
642 | 664 |
{ |
665 |
DataGridView dgv = (DataGridView)sender; |
|
666 |
|
|
643 | 667 |
// 参照時は処理しない |
644 | 668 |
if (m_EditLock) return; |
669 |
if (dgv.ReadOnly) return; |
|
645 | 670 |
|
646 | 671 |
// データグリッドがActiveでなければ処理しない |
647 | 672 |
if (ActiveControl == null) return; |
648 | 673 |
if (!ActiveControl.GetType().Equals(typeof(DataGridViewEX))) return; |
649 | 674 |
|
650 |
DataGridView dgv = (DataGridView)sender; |
|
651 | 675 |
|
652 | 676 |
// 読込専用セルは処理しない |
653 | 677 |
if (dgv.CurrentCell.ReadOnly) return; |
... | ... | |
673 | 697 |
} |
674 | 698 |
#endregion |
675 | 699 |
|
700 |
#region 日報グリッド状態が変わればコミットする |
|
701 |
/// <summary> |
|
702 |
/// 日報グリッド状態が変わればコミットする |
|
703 |
/// </summary> |
|
704 |
/// <param name="sender"></param> |
|
705 |
/// <param name="e"></param> |
|
706 |
private void dgvAllDisplay_CurrentCellDirtyStateChanged(object sender, EventArgs e) |
|
707 |
{ |
|
708 |
DataGridView dgv = dgvAllDisplay; |
|
709 |
if (dgv.ReadOnly) return; |
|
710 |
|
|
711 |
switch (dgv.CurrentCellAddress.X) |
|
712 |
{ |
|
713 |
case (int)GridColumn01.OverTimeFlg: |
|
714 |
if (CommonMotions.chkCellBlank(dgv.CurrentCell.Value)) break; |
|
715 |
dgv.CommitEdit(DataGridViewDataErrorContexts.Commit); |
|
716 |
break; |
|
717 |
default: |
|
718 |
break; |
|
719 |
} |
|
720 |
} |
|
721 |
#endregion |
|
722 |
|
|
723 |
#region 日報グリッドセルダブルクリック |
|
724 |
/// <summary> |
|
725 |
/// 日報グリッドセルダブルクリック |
|
726 |
/// </summary> |
|
727 |
/// <param name="sender"></param> |
|
728 |
/// <param name="e"></param> |
|
729 |
private void dgvAllDisplay_CellDoubleClick(object sender, DataGridViewCellEventArgs e) |
|
730 |
{ |
|
731 |
SetConstruction(); |
|
732 |
} |
|
733 |
#endregion |
|
734 |
|
|
676 | 735 |
#region 日報グリッドセル入力後処理 |
677 | 736 |
/// <summary> |
678 | 737 |
/// 日報グリッドセル入力後処理 |
... | ... | |
683 | 742 |
{ |
684 | 743 |
try |
685 | 744 |
{ |
745 |
DataGridView dgv = (DataGridView)sender; |
|
746 |
|
|
686 | 747 |
// 参照時は処理しない |
687 | 748 |
if (m_EditLock) return; |
749 |
if (dgv.ReadOnly) return; |
|
688 | 750 |
|
689 |
DataGridView dgv = (DataGridView)sender; |
|
690 | 751 |
DataGridViewCell CurCell = dgv.CurrentCell; |
691 | 752 |
DataGridViewRow CurRow = dgv.CurrentRow; |
692 | 753 |
|
693 | 754 |
// 開始終了時間以外は処理しない |
694 |
bool bflag = true; |
|
695 | 755 |
switch (CurCell.ColumnIndex) |
696 | 756 |
{ |
697 | 757 |
case (int)GridColumn01.StartTime: |
698 | 758 |
case (int)GridColumn01.Comptime: |
699 | 759 |
CellTimeCalculate(CurRow); |
700 | 760 |
break; |
701 |
case(int)GridColumn01.OverTimeFlg: |
|
702 |
bflag = false; |
|
703 |
break; |
|
704 | 761 |
default: |
705 |
bflag = false; |
|
706 | 762 |
break; |
707 | 763 |
} |
708 |
if (!bflag) return; |
|
709 |
|
|
710 |
// 開始・終了時間より経過時間を求める |
|
711 |
CellTimeCalculate(CurRow); |
|
712 | 764 |
} |
713 | 765 |
catch (Exception ex) |
714 | 766 |
{ |
... | ... | |
726 | 778 |
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) |
727 | 779 |
{ |
728 | 780 |
TabControl CurTab = (TabControl)sender; |
781 |
bool bDispCtrl = false; |
|
729 | 782 |
switch (CurTab.SelectedIndex) |
730 | 783 |
{ |
731 | 784 |
case 0: |
732 |
btnLineAdd.Visible = true; |
|
733 |
btnLineDel.Visible = true; |
|
785 |
bDispCtrl = true; |
|
734 | 786 |
break; |
735 | 787 |
case 1: |
736 |
btnLineAdd.Visible = false; |
|
737 |
btnLineDel.Visible = false; |
|
788 |
bDispCtrl = false; |
|
738 | 789 |
break; |
739 | 790 |
} |
791 |
btnLineAdd.Visible = bDispCtrl; |
|
792 |
btnLineDel.Visible = bDispCtrl; |
|
740 | 793 |
} |
741 | 794 |
#endregion |
742 | 795 |
|
... | ... | |
1206 | 1259 |
} |
1207 | 1260 |
} |
1208 | 1261 |
#endregion |
1209 |
|
|
1210 |
} |
|
1262 |
} |
|
1211 | 1263 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx | ||
---|---|---|
126 | 126 |
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
127 | 127 |
<value>True</value> |
128 | 128 |
</metadata> |
129 |
<metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
130 |
<value>True</value> |
|
131 |
</metadata> |
|
129 | 132 |
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
130 | 133 |
<value>True</value> |
131 | 134 |
</metadata> |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs | ||
---|---|---|
198 | 198 |
} |
199 | 199 |
#endregion |
200 | 200 |
|
201 |
#region データ取得SQL作成 |
|
202 |
/// <summary> |
|
203 |
/// データ取得SQL作成 |
|
204 |
/// </summary> |
|
205 |
/// <param name="strSQL"></param> |
|
206 |
/// <param name="WorktDate"></param> |
|
207 |
private void CreateSQL(ref StringBuilder strSQL, DateTime WorktDate) |
|
208 |
{ |
|
209 |
try |
|
210 |
{ |
|
211 |
strSQL.Append("SELECT"); |
|
212 |
strSQL.Append(" t1.d,"); |
|
213 |
strSQL.Append(" DATE_FORMAT(C.HOLIDAY, '%Y/%m/%d') HOLIDAY,"); |
|
214 |
strSQL.Append(" D.ConstructionCode,"); |
|
215 |
strSQL.Append(" D.ACTIONRESULT,"); |
|
216 |
strSQL.Append(" DATE_FORMAT(D.StartTime, '%Y/%m/%d %H:%i:%s') As StartTime,"); |
|
217 |
strSQL.Append(" DATE_FORMAT(D.CompTime, '%Y/%m/%d %H:%i:%s') As CompTime,"); |
|
218 |
strSQL.Append(" D.NightFlg,"); |
|
219 |
strSQL.Append(" D.DAYTIMES,"); |
|
220 |
strSQL.Append(" D.WORKINGCOMMENT"); |
|
221 |
strSQL.Append(" FROM"); |
|
222 |
|
|
223 |
strSQL.Append(" (SELECT"); |
|
224 |
strSQL.Append(" A1.years,"); |
|
225 |
strSQL.Append(" A2.month,"); |
|
226 |
strSQL.Append(" A3.days,"); |
|
227 |
strSQL.Append(" CAST(CONCAT(A1.years, '/', A2.month, '/', A3.days) as DATE) as d"); |
|
228 |
strSQL.Append(" FROM yearmaster as A1, monthmaster as A2, daymaster as A3"); |
|
229 |
strSQL.AppendFormat(" WHERE A1.years = {0}", WorktDate.Year); |
|
230 |
strSQL.AppendFormat(" AND A2.month = {0}", WorktDate.Month); |
|
231 |
strSQL.Append(" AND CAST(CONCAT(A1.years, '/', A2.month, '/', A3.days) as DATE) IS NOT NULL) t1"); |
|
232 |
|
|
233 |
strSQL.Append(" LEFT JOIN HOLIDAYCALENDERMASTER C ON C.HOLIDAY = t1.d"); |
|
234 |
strSQL.Append(" LEFT JOIN ATTENDANCEDAILYDATA D"); |
|
235 |
strSQL.AppendFormat(" ON D.PERSONCODE = {0}", CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue)); |
|
236 |
strSQL.Append(" AND D.ATTENDANCEDATE = t1.d"); |
|
237 |
strSQL.Append(" ORDER BY t1.d, D.SEQNO"); |
|
238 |
|
|
239 |
} |
|
240 |
catch (Exception ex) |
|
241 |
{ |
|
242 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
243 |
} |
|
244 |
} |
|
245 |
#endregion |
|
246 |
|
|
201 | 247 |
#region 日報データ表示 |
202 | 248 |
/// <summary> |
203 | 249 |
/// 日報データ表示 |
... | ... | |
230 | 276 |
|
231 | 277 |
// 指定日の翌日より指定日数分の日付を取得する |
232 | 278 |
StringBuilder strSQL = new StringBuilder(); |
233 |
strSQL.Append("SELECT"); |
|
234 |
strSQL.Append(" t1.d,"); |
|
235 |
strSQL.Append(" DATE_FORMAT(C.HOLIDAY, '%Y/%m/%d') HOLIDAY,"); |
|
236 |
strSQL.Append(" D.ACTIONRESULT,"); |
|
237 |
strSQL.Append(" DATE_FORMAT(D.StartTime, '%Y/%m/%d %H:%i:%s') As StartTime,"); |
|
238 |
strSQL.Append(" DATE_FORMAT(D.CompTime, '%Y/%m/%d %H:%i:%s') As CompTime,"); |
|
239 |
strSQL.Append(" D.NightFlg,"); |
|
240 |
strSQL.Append(" D.DAYTIMES,"); |
|
241 |
strSQL.Append(" D.WORKINGCOMMENT"); |
|
242 |
strSQL.Append(" FROM"); |
|
243 |
|
|
244 |
strSQL.Append(" (SELECT"); |
|
245 |
strSQL.Append(" A1.years,"); |
|
246 |
strSQL.Append(" A2.month,"); |
|
247 |
strSQL.Append(" A3.days,"); |
|
248 |
strSQL.Append(" CAST(CONCAT(A1.years, '/', A2.month, '/', A3.days) as DATE) as d"); |
|
249 |
strSQL.Append(" FROM yearmaster as A1, monthmaster as A2, daymaster as A3"); |
|
250 |
strSQL.AppendFormat(" WHERE A1.years = {0}", WorktDate.Year); |
|
251 |
strSQL.AppendFormat(" AND A2.month = {0}", WorktDate.Month); |
|
252 |
strSQL.Append(" AND CAST(CONCAT(A1.years, '/', A2.month, '/', A3.days) as DATE) IS NOT NULL) t1"); |
|
253 |
|
|
254 |
strSQL.Append(" LEFT JOIN HOLIDAYCALENDERMASTER C ON C.HOLIDAY = t1.d"); |
|
255 |
strSQL.Append(" LEFT JOIN ATTENDANCEDAILYDATA D"); |
|
256 |
strSQL.AppendFormat(" ON D.PERSONCODE = {0}", CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue)); |
|
257 |
strSQL.Append(" AND D.ATTENDANCEDATE = t1.d"); |
|
258 |
strSQL.Append(" ORDER BY t1.d, D.SEQNO"); |
|
259 |
|
|
279 |
CreateSQL(ref strSQL, WorktDate); |
|
260 | 280 |
ArrayList arList = new ArrayList(); |
261 | 281 |
if (!calDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
282 |
|
|
262 | 283 |
DateTime DispDate = DateTime.Now; |
263 | 284 |
DateTime BreakDate = DateTime.MinValue; |
264 | 285 |
string strHoliday = string.Empty; |
265 | 286 |
string strResultName = string.Empty; |
266 | 287 |
string strDispDay = string.Empty; |
267 | 288 |
string strWeek = string.Empty; |
268 |
string SDate = string.Empty; |
|
269 |
string CDate = string.Empty; |
|
289 |
string STime = string.Empty; |
|
290 |
string CTime = string.Empty; |
|
291 |
string TotalTime = string.Empty; |
|
270 | 292 |
bool Flag = false; |
293 |
int AddRow = 0; |
|
271 | 294 |
|
272 | 295 |
// 日付の表示 |
273 | 296 |
foreach (object[] CurRec in arList) |
... | ... | |
275 | 298 |
DispDate = CommonMotions.cnvDate(CurRec[0]); |
276 | 299 |
strHoliday = string.Empty; |
277 | 300 |
strHoliday = CommonMotions.cnvString(CurRec[1]); |
278 |
strResultName = CommonMotions.cnvString(CurRec[2]);
|
|
301 |
strResultName = CommonMotions.cnvString(CurRec[3]);
|
|
279 | 302 |
strDispDay = string.Format("{0}日", DispDate.Day.ToString()); |
280 | 303 |
strWeek = DispDate.ToString("dddd"); |
281 | 304 |
|
282 |
if (CommonMotions.cnvDate(CurRec[3]) == DateTime.MinValue) |
|
283 |
SDate = string.Empty; |
|
284 |
else |
|
285 |
SDate = CommonMotions.cnvDate(CurRec[3]).ToShortTimeString(); |
|
305 |
STime = string.Empty; |
|
306 |
if (CommonMotions.cnvDate(CurRec[4]) != DateTime.MinValue) |
|
307 |
STime = CommonMotions.cnvDate(CurRec[4]).ToShortTimeString(); |
|
286 | 308 |
|
287 |
if (CommonMotions.cnvDate(CurRec[4]) == DateTime.MinValue) |
|
288 |
CDate = string.Empty; |
|
289 |
else |
|
290 |
CDate = CommonMotions.cnvDate(CurRec[4]).ToShortTimeString(); |
|
309 |
CTime = string.Empty; |
|
310 |
if (CommonMotions.cnvDate(CurRec[5]) != DateTime.MinValue) |
|
311 |
CTime = CommonMotions.cnvDate(CurRec[5]).ToShortTimeString(); |
|
291 | 312 |
|
292 |
if (CommonMotions.cnvInt(CurRec[5]) == (int)AttendanceDailyData.OverTimeDef.Normal) |
|
293 |
Flag = false; |
|
294 |
else |
|
313 |
TotalTime = string.Empty; |
|
314 |
if (CommonMotions.cnvDouble(CurRec[7]) > 0) |
|
315 |
TotalTime = CommonMotions.cnvDouble(CurRec[7]).ToString("#.0"); |
|
316 |
|
|
317 |
Flag = false; |
|
318 |
if (CommonMotions.cnvInt(CurRec[6]) == (int)AttendanceDailyData.OverTimeDef.OverTime) |
|
295 | 319 |
Flag = true; |
296 | 320 |
|
297 | 321 |
if (DispDate == BreakDate) |
... | ... | |
303 | 327 |
{ |
304 | 328 |
BreakDate = DispDate; |
305 | 329 |
} |
306 |
int AddRow = dgv.Rows.Add(strDispDay,
|
|
330 |
AddRow = dgv.Rows.Add(strDispDay, |
|
307 | 331 |
DispDate.ToShortDateString(), |
308 | 332 |
strWeek, |
333 |
CommonMotions.cnvInt(CurRec[2]), |
|
309 | 334 |
strResultName, |
310 | 335 |
Flag, |
311 |
SDate,
|
|
312 |
CDate,
|
|
313 |
CommonMotions.cnvDouble(CurRec[6]).ToString("#.#"),
|
|
314 |
CommonMotions.cnvString(CurRec[7])
|
|
336 |
STime,
|
|
337 |
CTime,
|
|
338 |
TotalTime,
|
|
339 |
CommonMotions.cnvString(CurRec[8])
|
|
315 | 340 |
); |
316 | 341 |
|
317 | 342 |
// 休日のチェック |
... | ... | |
320 | 345 |
dgv.Rows[AddRow].Cells[(int)GridColumn01.DispDay].Style.ForeColor = Color.Red; |
321 | 346 |
dgv.Rows[AddRow].Cells[(int)GridColumn01.WeekString].Style.ForeColor = Color.Red; |
322 | 347 |
m_HolidayCount++; |
323 |
continue; |
|
324 | 348 |
} |
349 |
// 残業以外は時間の入力ができない |
|
350 |
dgv.Rows[AddRow].Cells[(int)GridColumn01.StartTime].ReadOnly = !Flag; |
|
351 |
dgv.Rows[AddRow].Cells[(int)GridColumn01.Comptime].ReadOnly = !Flag; |
|
325 | 352 |
} |
326 | 353 |
// 出勤日数・残業時間のセット |
327 | 354 |
SetWorkDaysAndOverTimes(); |
... | ... | |
522 | 549 |
|
523 | 550 |
// 日付セット |
524 | 551 |
dgv.Rows[InsertCnt].Cells[(int)GridColumn01.AttendanceDate].Value = TargetDay; |
525 |
// 残業時間0 |
|
526 |
dgv.Rows[InsertCnt].Cells[(int)GridColumn01.OverTimes].Value = "0"; |
|
552 |
// 残業時間 |
|
553 |
dgv.Rows[InsertCnt].Cells[(int)GridColumn01.OverTimeFlg].Value = false; |
|
554 |
dgv.Rows[InsertCnt].Cells[(int)GridColumn01.StartTime].ReadOnly = true; |
|
555 |
dgv.Rows[InsertCnt].Cells[(int)GridColumn01.Comptime].ReadOnly = true; |
|
527 | 556 |
|
528 | 557 |
// データ変更フラグON |
529 | 558 |
m_bChengeAns = true; |
... | ... | |
566 | 595 |
if ((RemoveCnt > 0) && CurDay == CommonMotions.cnvDate(dgv.Rows[(RemoveCnt - 1)].Cells[(int)GridColumn01.AttendanceDate].Value)) sameCount++; |
567 | 596 |
if ((RemoveCnt < (dgv.RowCount - 1)) && CurDay == CommonMotions.cnvDate(dgv.Rows[(RemoveCnt + 1)].Cells[(int)GridColumn01.AttendanceDate].Value)) sameCount++; |
568 | 597 |
|
569 |
// 日付が1日だけの場合は行削除できない
|
|
598 |
// 日付が1日だけの場合は行クリアを行う
|
|
570 | 599 |
if (sameCount == 0) |
571 | 600 |
{ |
572 | 601 |
foreach (DataGridViewCell wrkcell in CurRow.Cells) |
573 | 602 |
{ |
574 |
// 日付はクリアしない |
|
575 |
if (wrkcell.ColumnIndex == (int)GridColumn01.DispDay) continue; |
|
576 |
if (wrkcell.ColumnIndex == (int)GridColumn01.AttendanceDate) continue; |
|
577 |
if (wrkcell.ColumnIndex == (int)GridColumn01.WeekString) continue; |
|
578 |
// クリア |
|
579 |
wrkcell.Value = ""; |
|
603 |
switch (wrkcell.ColumnIndex) |
|
604 |
{ |
|
605 |
case (int)GridColumn01.DispDay: |
|
606 |
case (int)GridColumn01.AttendanceDate: |
|
607 |
case (int)GridColumn01.WeekString: |
|
608 |
// 日付はクリアしない |
|
609 |
break; |
|
610 |
case (int)GridColumn01.OverTimeFlg: |
|
611 |
wrkcell.Value = false; |
|
612 |
break; |
|
613 |
default: |
|
614 |
// クリア |
|
615 |
wrkcell.Value = string.Empty; |
|
616 |
break; |
|
617 |
} |
|
580 | 618 |
} |
581 | 619 |
} |
582 | 620 |
else |
... | ... | |
1147 | 1185 |
/// <returns></returns> |
1148 | 1186 |
private bool DispFeildCheck() |
1149 | 1187 |
{ |
1150 |
bool bRet = true; |
|
1151 | 1188 |
try |
1152 | 1189 |
{ |
1153 | 1190 |
bool bSelFlg = false; |
... | ... | |
1164 | 1201 |
} |
1165 | 1202 |
} |
1166 | 1203 |
|
1167 |
// 残業エラー |
|
1168 |
if (CommonMotions.cnvDouble(m_DspControl[(int)DspCtrlName.Overtime].Text) > 999.9) |
|
1169 |
{ |
|
1170 |
MessageBox.Show("残業時間の合計は999.9までしか登録できません。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
1171 |
return false; |
|
1172 |
} |
|
1173 |
|
|
1204 |
bool bRet = true; |
|
1174 | 1205 |
DataGridView dgv = dgvAllDisplay; |
1206 |
string strWrk = string.Empty; |
|
1175 | 1207 |
// グリッドの行分処理を行う |
1176 | 1208 |
foreach (DataGridViewRow wrkRow in dgv.Rows) |
1177 | 1209 |
{ |
1178 |
// 背景色変更(正常色) |
|
1179 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.OverTimes], true); |
|
1180 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.Comment], true); |
|
1210 |
// 開始時間 |
|
1211 |
if (!CheckGridCellDatetime(wrkRow, (int)GridColumn01.StartTime)) bRet = false; |
|
1212 |
// 終了時間 |
|
1213 |
if (!CheckGridCellDatetime(wrkRow, (int)GridColumn01.Comptime)) bRet = false; |
|
1181 | 1214 |
|
1182 | 1215 |
// 行動実績 |
1183 |
if (CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.ActionResult].Value).Length > 30) |
|
1216 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.ActionResult], true); |
|
1217 |
strWrk = CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.ActionResult].Value); |
|
1218 |
if (strWrk.Length > 120) |
|
1184 | 1219 |
{ |
1185 | 1220 |
// 背景色変更 |
1186 | 1221 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.ActionResult], false); |
1187 | 1222 |
bRet = false; |
1188 | 1223 |
} |
1189 | 1224 |
|
1190 |
// 残業時間 |
|
1191 |
if (!CommonMotions.chkNumeric(wrkRow.Cells[(int)GridColumn01.OverTimes].Value)) |
|
1192 |
{ |
|
1193 |
// 背景色変更 |
|
1194 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.OverTimes], false); |
|
1195 |
bRet = false; |
|
1196 |
} |
|
1197 |
if (CommonMotions.cnvDouble(wrkRow.Cells[(int)GridColumn01.OverTimes].Value) > 999.9) |
|
1198 |
{ |
|
1199 |
// 背景色変更 |
|
1200 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.OverTimes], false); |
|
1201 |
bRet = false; |
|
1202 |
} |
|
1203 |
|
|
1204 | 1225 |
// 備考レングス |
1205 |
if (CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.Comment].Value).Length > 120) |
|
1226 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.Comment], true); |
|
1227 |
strWrk = CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.Comment].Value); |
|
1228 |
if (strWrk.Length > 120) |
|
1206 | 1229 |
{ |
1207 | 1230 |
// 背景色変更 |
1208 | 1231 |
CommonMotions.chgBackColor(wrkRow.Cells[(int)GridColumn01.Comment], false); |
... | ... | |
1360 | 1383 |
// グリッドの行分処理を行う |
1361 | 1384 |
int LineCnt = 1; |
1362 | 1385 |
string AttendName = string.Empty; |
1363 |
double OverTimes = 0;
|
|
1386 |
bool OverTimeflg = false;
|
|
1364 | 1387 |
string strComment = string.Empty; |
1365 | 1388 |
DateTime AttendanceDate = DateTime.Now; |
1366 | 1389 |
DateTime BreakDate = DateTime.MinValue; |
... | ... | |
1370 | 1393 |
foreach (DataGridViewRow wrkRow in dgv.Rows) |
1371 | 1394 |
{ |
1372 | 1395 |
AttendName = CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.ActionResult].Value); |
1373 |
OverTimes = CommonMotions.cnvDouble(wrkRow.Cells[(int)GridColumn01.OverTimes].Value); |
|
1374 | 1396 |
strComment = CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.Comment].Value); |
1375 | 1397 |
AttendanceDate = CommonMotions.cnvDate(wrkRow.Cells[(int)GridColumn01.AttendanceDate].Value); |
1398 |
|
|
1399 |
if (!CommonMotions.chkCellBlank(wrkRow.Cells[(int)GridColumn01.OverTimeFlg].Value)) |
|
1400 |
OverTimeflg = (bool)wrkRow.Cells[(int)GridColumn01.OverTimeFlg].Value; |
|
1401 |
|
|
1376 | 1402 |
// 空白行は処理しない |
1377 |
if (AttendName.Length == 0 && OverTimes == 0 && strComment.Length == 0) continue;
|
|
1403 |
if (AttendName.Length == 0 && strComment.Length == 0 && !OverTimeflg) continue;
|
|
1378 | 1404 |
|
1379 | 1405 |
// 日付が違えば行番号クリア |
1380 | 1406 |
if (AttendanceDate != BreakDate) |
... | ... | |
1421 | 1447 |
DateTime StartTime = GetGridCellDatetime(wrkRow, (int)GridColumn01.StartTime); |
1422 | 1448 |
DateTime CompTime = GetGridCellDatetime(wrkRow, (int)GridColumn01.Comptime); |
1423 | 1449 |
|
1450 |
// 残業時間フラグ取得 |
|
1451 |
int OverTimeFlg = (int)AttendanceDailyData.OverTimeDef.Normal; |
|
1452 |
if (!CommonMotions.chkCellBlank(wrkRow.Cells[(int)GridColumn01.OverTimeFlg].Value)) |
|
1453 |
if ((bool)wrkRow.Cells[(int)GridColumn01.OverTimeFlg].Value) |
|
1454 |
OverTimeFlg = (int)AttendanceDailyData.OverTimeDef.OverTime; |
|
1455 |
|
|
1424 | 1456 |
double OverTimes = CommonMotions.cnvDouble(wrkRow.Cells[(int)GridColumn01.OverTimes].Value); |
1425 | 1457 |
string strComment = CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.Comment].Value); |
1458 |
int nConstrCode = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn01.ConstractionCode].Value); |
|
1426 | 1459 |
DateTime AttendanceDate = CommonMotions.cnvDate(wrkRow.Cells[(int)GridColumn01.AttendanceDate].Value); |
1427 | 1460 |
|
1428 | 1461 |
int PersonCode = GetConstructionPersonCode(); |
... | ... | |
1432 | 1465 |
NewRec.PersonCode = PersonCode; // 担当者コード |
1433 | 1466 |
NewRec.AttendanceDate = AttendanceDate; // 日報作成日 |
1434 | 1467 |
NewRec.SeqNo = LineCnt; // 明細行番号 |
1468 |
NewRec.ConstructionCode = nConstrCode; // 工事番号 |
|
1435 | 1469 |
NewRec.ActionResult = ActionResult; // 行動実績 |
1470 |
NewRec.NightFlg = OverTimeFlg; // 残業フラグ |
|
1436 | 1471 |
NewRec.StartTime = StartTime; // 開始時間 |
1437 | 1472 |
NewRec.CompTime = CompTime; // 終了時間 |
1438 | 1473 |
NewRec.DayTimes = OverTimes; // 残業時間 |
... | ... | |
1447 | 1482 |
} |
1448 | 1483 |
#endregion |
1449 | 1484 |
|
1485 |
#region セルのTime値を検証する |
|
1486 |
/// <summary> |
|
1487 |
/// セルのTime値を検証する |
|
1488 |
/// </summary> |
|
1489 |
/// <param name="CellCnt"></param> |
|
1490 |
/// <returns></returns> |
|
1491 |
private bool CheckGridCellDatetime(DataGridViewRow wrkRow, int CellCnt) |
|
1492 |
{ |
|
1493 |
try |
|
1494 |
{ |
|
1495 |
// セル正常色へ |
|
1496 |
CommonMotions.chgBackColor(wrkRow.Cells[CellCnt], true); |
|
1497 |
|
|
1498 |
string wrktime = CommonMotions.cnvString(wrkRow.Cells[CellCnt].Value); |
|
1499 |
if (wrktime.Length < 1) return true; |
|
1500 |
|
|
1501 |
wrktime = string.Format("{0} {1}", |
|
1502 |
CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.AttendanceDate].Value), |
|
1503 |
CommonMotions.cnvString(wrkRow.Cells[CellCnt].Value)); |
|
1504 |
// Valueチェック |
|
1505 |
bool bRet = CommonMotions.chkDate(wrktime); |
|
1506 |
|
|
1507 |
if (bRet) |
|
1508 |
{ // 正常時時間フォーマット |
|
1509 |
wrkRow.Cells[CellCnt].Value = CommonMotions.cnvDate(wrktime).ToShortTimeString(); |
|
1510 |
} |
|
1511 |
else |
|
1512 |
{ // エラー時色変更 |
|
1513 |
CommonMotions.chgBackColor(wrkRow.Cells[CellCnt], false); |
|
1514 |
} |
|
1515 |
|
|
1516 |
return bRet; |
|
1517 |
} |
|
1518 |
catch (Exception ex) |
|
1519 |
{ |
|
1520 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1521 |
return false; |
|
1522 |
} |
|
1523 |
} |
|
1524 |
#endregion |
|
1525 |
|
|
1450 | 1526 |
#region セルのDateTime値を取得する |
1451 | 1527 |
/// <summary> |
1452 | 1528 |
/// セルのDateTime値を取得する |
... | ... | |
1459 | 1535 |
{ |
1460 | 1536 |
DateTime dtRet = DateTime.MinValue; |
1461 | 1537 |
|
1462 |
string wrktime = string.Empty; |
|
1463 |
wrktime = string.Format("{0} {1}", |
|
1464 |
CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.AttendanceDate].Value), |
|
1465 |
CommonMotions.cnvString(wrkRow.Cells[CellCnt].Value)); |
|
1538 |
string wrktime = CommonMotions.cnvString(wrkRow.Cells[CellCnt].Value); |
|
1466 | 1539 |
|
1467 |
dtRet = CommonMotions.cnvDate(wrktime); |
|
1540 |
if (wrktime.Length > 1) |
|
1541 |
{ |
|
1542 |
wrktime = string.Format("{0} {1}", |
|
1543 |
CommonMotions.cnvString(wrkRow.Cells[(int)GridColumn01.AttendanceDate].Value), |
|
1544 |
CommonMotions.cnvString(wrkRow.Cells[CellCnt].Value)); |
|
1545 |
dtRet = CommonMotions.cnvDate(wrktime); |
|
1546 |
} |
|
1468 | 1547 |
|
1469 | 1548 |
return dtRet; |
1470 | 1549 |
} |
... | ... | |
2005 | 2084 |
{ |
2006 | 2085 |
try |
2007 | 2086 |
{ |
2087 |
if (!CheckGridCellDatetime(CurRow, (int)GridColumn01.StartTime)) return; |
|
2008 | 2088 |
DateTime StartTime = GetGridCellDatetime(CurRow, (int)GridColumn01.StartTime); |
2089 |
|
|
2090 |
if (!CheckGridCellDatetime(CurRow, (int)GridColumn01.Comptime)) return; |
|
2009 | 2091 |
DateTime CompTime = GetGridCellDatetime(CurRow, (int)GridColumn01.Comptime); |
2092 |
if (StartTime == DateTime.MinValue && CompTime == DateTime.MinValue) return; |
|
2010 | 2093 |
|
2011 | 2094 |
TimeSpan tsData = CompTime - StartTime; |
2012 | 2095 |
|
... | ... | |
2027 | 2110 |
} |
2028 | 2111 |
#endregion |
2029 | 2112 |
|
2030 |
#region 残業時間入力
|
|
2113 |
#region 残業エリア設定処理
|
|
2031 | 2114 |
/// <summary> |
2032 |
/// 残業時間入力
|
|
2115 |
/// 残業エリア設定処理
|
|
2033 | 2116 |
/// </summary> |
2034 |
/// <param name="CurRow"></param> |
|
2035 |
private void CellOverTimeInput(DataGridViewRow CurRow) |
|
2117 |
private void LockOverTimeArea() |
|
2036 | 2118 |
{ |
2119 |
DataGridView dgv = dgvAllDisplay; |
|
2120 |
bool bReadFlg = true; |
|
2037 | 2121 |
try |
2038 | 2122 |
{ |
2039 |
int pos = (int)GridColumn01.OverTimeFlg; |
|
2040 |
if (CommonMotions.chkObjectIsNull(CurRow.Cells[pos].Value)) return; |
|
2123 |
if (CommonMotions.chkCellBlank(dgv.CurrentCell.Value)) return; |
|
2041 | 2124 |
|
2042 |
bool RedFlg = false; |
|
2043 |
if ((bool)CurRow.Cells[pos].Value) RedFlg = false; |
|
2044 |
else RedFlg = true; |
|
2045 |
CurRow.Cells[(int)GridColumn01.StartTime].ReadOnly = RedFlg; |
|
2046 |
CurRow.Cells[(int)GridColumn01.Comptime].ReadOnly = RedFlg; |
|
2125 |
bReadFlg = !(bool)dgv.CurrentCell.Value; |
|
2126 |
|
|
2047 | 2127 |
} |
2048 | 2128 |
catch (Exception ex) |
2049 | 2129 |
{ |
2050 | 2130 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
2051 | 2131 |
} |
2132 |
finally |
|
2133 |
{ |
|
2134 |
dgv.CurrentRow.Cells[(int)GridColumn01.StartTime].ReadOnly = bReadFlg; |
|
2135 |
dgv.CurrentRow.Cells[(int)GridColumn01.Comptime].ReadOnly = bReadFlg; |
|
2136 |
if (bReadFlg) |
|
2137 |
{ |
|
2138 |
dgv.CurrentRow.Cells[(int)GridColumn01.StartTime].Value = string.Empty; |
|
2139 |
dgv.CurrentRow.Cells[(int)GridColumn01.Comptime].Value = string.Empty; |
|
2140 |
} |
|
2141 |
} |
|
2052 | 2142 |
} |
2053 | 2143 |
#endregion |
2144 |
|
|
2145 |
#region 工事名称選択 |
|
2146 |
/// <summary> |
|
2147 |
/// 工事名称選択 |
|
2148 |
/// </summary> |
|
2149 |
/// <param name="RowCnt"></param> |
|
2150 |
private void SetConstruction() |
|
2151 |
{ |
|
2152 |
FrmConstructionDiag frm = new FrmConstructionDiag(); |
|
2153 |
try |
|
2154 |
{ |
|
2155 |
DataGridView dgv = dgvAllDisplay; |
|
2156 |
DataGridViewRow dgvRow = dgv.CurrentRow; |
|
2157 |
|
|
2158 |
// 作業内容列以外は処理しない |
|
2159 |
if (dgv.CurrentCell.ColumnIndex != (int)GridColumn01.ActionResult) return; |
|
2160 |
|
|
2161 |
// グリッドがREADONLYは処理しない |
|
2162 |
if (dgv.ReadOnly) return; |
|
2163 |
|
|
2164 |
// 担当者コンボボックス値取得 |
|
2165 |
int PersonCode = GetConstructionPersonCode(); |
|
2166 |
if (PersonCode == 0) return; |
|
2167 |
|
|
2168 |
// 工事担当者検索 |
|
2169 |
frm.PersonCharge = (int)FrmConstructionDiag.PersonChargePoint.Construction; |
|
2170 |
frm.PersonCode = PersonCode; |
|
2171 |
frm.ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts; |
|
2172 |
frm.SelectType = (int)FrmConstructionDiag.SelectConstructionType.Ongoing; |
|
2173 |
|
|
2174 |
frm.ShowDialog(); |
|
2175 |
// 終了コード確認 |
|
2176 |
if (frm.EndButton == DialogResult.No) return; |
|
2177 |
|
|
2178 |
// 工事コードセット |
|
2179 |
dgvRow.Cells[(int)GridColumn01.ConstractionCode].Value = frm.ConstructionCode; |
|
2180 |
// 工事名称セット |
|
2181 |
dgvRow.Cells[(int)GridColumn01.ActionResult].Value = frm.ConstructionName; |
|
2182 |
|
|
2183 |
dgv.EndEdit(); |
|
2184 |
} |
|
2185 |
catch (System.Exception ex) |
|
2186 |
{ |
|
2187 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
2188 |
} |
|
2189 |
finally |
|
2190 |
{ |
|
2191 |
frm.Dispose(); frm = null; |
|
2192 |
} |
|
2193 |
} |
|
2194 |
#endregion |
|
2054 | 2195 |
} |
2055 | 2196 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.Designer.cs | ||
---|---|---|
39 | 39 |
this.label1 = new System.Windows.Forms.Label(); |
40 | 40 |
this.btnEnd = new System.Windows.Forms.Button(); |
41 | 41 |
this.panel3 = new System.Windows.Forms.Panel(); |
42 |
this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
42 | 43 |
this.label6 = new System.Windows.Forms.Label(); |
43 | 44 |
this.dgvList = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
44 |
this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
45 | 45 |
this.ApprovalColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
46 | 46 |
this.ApprovalColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
47 | 47 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
92 | 92 |
this.panel3.Size = new System.Drawing.Size(780, 44); |
93 | 93 |
this.panel3.TabIndex = 104; |
94 | 94 |
// |
95 |
// comboBox1 |
|
96 |
// |
|
97 |
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
98 |
this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
99 |
this.comboBox1.Font = new System.Drawing.Font("MS 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
100 |
this.comboBox1.FormattingEnabled = true; |
|
101 |
this.comboBox1.Location = new System.Drawing.Point(133, 4); |
|
102 |
this.comboBox1.Name = "comboBox1"; |
|
103 |
this.comboBox1.Size = new System.Drawing.Size(160, 29); |
|
104 |
this.comboBox1.TabIndex = 114; |
|
105 |
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); |
|
106 |
// |
|
95 | 107 |
// label6 |
96 | 108 |
// |
97 | 109 |
this.label6.BackColor = System.Drawing.Color.SandyBrown; |
... | ... | |
146 | 158 |
this.dgvList.Size = new System.Drawing.Size(780, 530); |
147 | 159 |
this.dgvList.TabIndex = 105; |
148 | 160 |
// |
149 |
// comboBox1 |
|
150 |
// |
|
151 |
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
152 |
this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
153 |
this.comboBox1.Font = new System.Drawing.Font("MS 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
154 |
this.comboBox1.FormattingEnabled = true; |
|
155 |
this.comboBox1.Location = new System.Drawing.Point(133, 4); |
|
156 |
this.comboBox1.Name = "comboBox1"; |
|
157 |
this.comboBox1.Size = new System.Drawing.Size(160, 29); |
|
158 |
this.comboBox1.TabIndex = 114; |
|
159 |
// |
|
160 | 161 |
// ApprovalColumn02 |
161 | 162 |
// |
162 | 163 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.cs | ||
---|---|---|
38 | 38 |
#endregion |
39 | 39 |
|
40 | 40 |
#region 定数 |
41 |
#region 出勤日報グリッドカラム |
|
42 |
/// <summary> |
|
43 |
/// 出勤日報グリッドカラム |
|
44 |
/// </summary> |
|
45 |
private enum GridColumn01 |
|
46 |
{ |
|
47 |
DispDay = 0, |
|
48 |
AttendanceDate, |
|
49 |
WeekString, |
|
50 |
ConstructionCode, |
|
51 |
ConstructionName, |
|
52 |
OverTimes, |
|
53 |
Comment, |
|
54 |
} |
|
55 |
#endregion |
|
56 | 41 |
|
57 |
#region 通勤交通費グリッドカラム |
|
58 |
/// <summary> |
|
59 |
/// 通勤交通費グリッドカラム |
|
60 |
/// </summary> |
|
61 |
private enum GridColumn02 |
|
62 |
{ |
|
63 |
DispDay = 0, |
|
64 |
AttendanceDate, |
|
65 |
StartNumber, |
|
66 |
CompNumber, |
|
67 |
TotalDistance, |
|
68 |
OfficeGo, |
|
69 |
OfficeOut, |
|
70 |
TrancePayGo, |
|
71 |
TrancePayOut, |
|
72 |
WareHouse, |
|
73 |
} |
|
74 | 42 |
#endregion |
75 | 43 |
|
76 |
#region 表示コントロール |
|
77 |
/// <summary> |
|
78 |
/// 表示コントロール |
|
79 |
/// </summary> |
|
80 |
private enum DspCtrlName |
|
81 |
{ |
|
82 |
/// <summary> |
|
83 |
/// 部署名 |
|
84 |
/// </summary> |
|
85 |
DepartmentName = 0, |
|
86 |
/// <summary> |
|
87 |
/// 担当者名 |
|
88 |
/// </summary> |
|
89 |
PersonName, |
|
90 |
/// <summary> |
|
91 |
/// 日報年月 |
|
92 |
/// </summary> |
|
93 |
ConstructionYear, |
|
94 |
/// <summary> |
|
95 |
/// 日報開始日 |
|
96 |
/// </summary> |
|
97 |
ConstructionDayFrom, |
|
98 |
/// <summary> |
|
99 |
/// 日報終了日 |
|
100 |
/// </summary> |
|
101 |
ConstructionDayTo, |
|
102 |
/// <summary> |
|
103 |
/// 出勤日数 |
|
104 |
/// </summary> |
|
105 |
WorkingDays, |
|
106 |
/// <summary> |
|
107 |
/// 残業時間 |
|
108 |
/// </summary> |
|
109 |
Overtime, |
|
110 |
|
|
111 |
KmTodayTotal, |
|
112 |
OfficeTodayCnt01, |
|
113 |
OfficeTodayCnt02, |
|
114 |
TrancePayCnt01, |
|
115 |
TrancePayCnt02, |
|
116 |
WarehouseTodayCnt01, |
|
117 |
KmMonthTotal01, |
|
118 |
KmMonthTotal02, |
|
119 |
KmMonthTotal03, |
|
120 |
UnitPrice01, |
|
121 |
UnitPrice02, |
|
122 |
UnitPrice03, |
|
123 |
UnitPrice04, |
|
124 |
MonthCnt01, |
|
125 |
MonthCnt02, |
|
126 |
MonthCnt03, |
|
127 |
MonthTotal01, |
|
128 |
MonthTotal02, |
|
129 |
MonthTotal03, |
|
130 |
MonthTotal04, |
|
131 |
MonthTotal05, |
|
132 |
} |
|
133 |
#endregion |
|
134 |
|
|
135 |
/// <summary> |
|
136 |
/// グリッド表示行数 |
|
137 |
/// </summary> |
|
138 |
private const int s_GridDispLine = 5; |
|
139 |
/// <summary> |
|
140 |
/// 自画面幅 |
|
141 |
/// </summary> |
|
142 |
private const int s_MyWidth = 812; |
|
143 |
/// <summary> |
|
144 |
/// 自画面高さ |
|
145 |
/// </summary> |
|
146 |
private const int s_MyHeight = 720; |
|
147 |
|
|
148 |
#endregion |
|
149 |
|
|
150 | 44 |
#region 変数 |
151 | 45 |
|
152 | 46 |
/// <summary> |
... | ... | |
313 | 207 |
comboBox1.DataSource = null; |
314 | 208 |
|
315 | 209 |
// 存在月を出勤データより取得する |
316 |
string strSQL = "SELECT TO_CHAR(ATTENDANCEDATE,'YYYY/MM'), COUNT(*) FROM ATTENDANCEDAILYDATA GROUP BY TO_CHAR(ATTENDANCEDATE,'YYYY/MM') ORDER BY 1"; |
|
210 |
StringBuilder strSQL = new StringBuilder(); |
|
211 |
strSQL.Append("SELECT"); |
|
212 |
strSQL.Append(" DATE_FORMAT(ATTENDANCEDATE,'%Y/%m'),"); |
|
213 |
strSQL.Append(" COUNT(*)"); |
|
214 |
strSQL.Append(" FROM ATTENDANCEDAILYDATA"); |
|
215 |
strSQL.Append(" GROUP BY DATE_FORMAT(ATTENDANCEDATE,'%Y/%m')"); |
|
216 |
strSQL.Append(" ORDER BY 1"); |
|
317 | 217 |
ArrayList arList = new ArrayList(); |
318 |
CostDB.ExecuteReader(strSQL, ref arList); |
|
218 |
CostDB.ExecuteReader(strSQL.ToString(), ref arList);
|
|
319 | 219 |
|
320 | 220 |
List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>(); |
321 | 221 |
foreach (object[] wrkobj in arList) |
322 | 222 |
{ |
323 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(wrkobj[0].ToString(), (wrkobj[0].ToString().Replace("/", "年") + "月")); |
|
223 |
KeyValuePair<string, string> keyval |
|
224 |
= new KeyValuePair<string, string>(wrkobj[0].ToString(), |
|
225 |
string.Format("{0}月", wrkobj[0].ToString().Replace("/", "年"))); |
|
324 | 226 |
DataList.Add(keyval); |
325 | 227 |
} |
326 | 228 |
|
... | ... | |
329 | 231 |
// 当月を追加するかの判断 |
330 | 232 |
if (arList.Count == 0 || !DataList[DataList.Count - 1].Key.Equals(ToMonth)) |
331 | 233 |
{ |
332 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(ToMonth, (ToMonth.ToString().Replace("/", "年") + "月")); |
|
234 |
KeyValuePair<string, string> keyval |
|
235 |
= new KeyValuePair<string, string>(ToMonth, |
|
236 |
string.Format("{0}月", ToMonth.ToString().Replace("/", "年"))); |
|
333 | 237 |
DataList.Add(keyval); |
334 | 238 |
} |
335 | 239 |
// 来月の追加判定(25日過ぎは来月の追加をする) |
... | ... | |
337 | 241 |
{ |
338 | 242 |
DateTime dtNext = DateTime.Now.AddMonths(1); |
339 | 243 |
string NextMonth = string.Format("{0}/{1}", dtNext.Year, dtNext.Month.ToString("00")); |
340 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(NextMonth, (NextMonth.ToString().Replace("/", "年") + "月")); |
|
244 |
KeyValuePair<string, string> keyval |
|
245 |
= new KeyValuePair<string, string>(NextMonth, |
|
246 |
string.Format("{0}月", NextMonth.ToString().Replace("/", "年"))); |
|
341 | 247 |
DataList.Add(keyval); |
342 | 248 |
} |
343 | 249 |
|
... | ... | |
383 | 289 |
} |
384 | 290 |
#endregion |
385 | 291 |
|
292 |
#region データ取得SQL作成 |
|
293 |
/// <summary> |
|
294 |
/// データ取得SQL作成 |
|
295 |
/// </summary> |
|
296 |
/// <param name="strSQL"></param> |
|
297 |
private void CreateSQL(ref StringBuilder strSQL) |
|
298 |
{ |
|
299 |
try |
|
300 |
{ |
|
301 |
strSQL.Append("SELECT"); |
|
302 |
strSQL.Append(" B.DEPARTMENTCODE,"); |
|
303 |
strSQL.Append(" B.DEPARTMENTSTRING,"); |
|
304 |
strSQL.Append(" A.PERSONCODE,"); |
|
305 |
strSQL.Append(" A.PERSONNAME,"); |
|
306 |
strSQL.Append(" ifnull(C.CNT, 0),"); |
|
307 |
strSQL.Append(" ifnull(D.CNT, 0),"); |
|
308 |
strSQL.Append(" ifnull(E.APPROVALSTATUS, 4)"); |
|
309 |
strSQL.Append(" FROM PERSONINCHARGEMASTER A"); |
|
310 |
strSQL.Append(" LEFT JOIN DEPARTMENTMASTER B ON B.DEPARTMENTCODE = A.DEPARTMENTCODE"); |
|
311 |
strSQL.Append(" LEFT JOIN (SELECT CX.PERSONCODE, COUNT(*) CNT FROM ATTENDANCEDAILYDATA CX"); |
|
312 |
strSQL.AppendFormat(" WHERE DATE_FORMAT(CX.AttendanceDate, '%Y/%m') = '{0}'", CommonMotions.cnvString(comboBox1.SelectedValue)); |
|
313 |
strSQL.Append(" GROUP BY CX.PERSONCODE) C ON C.PERSONCODE = A.PERSONCODE"); |
|
314 |
strSQL.Append(" LEFT JOIN (SELECT DX.PERSONCODE, COUNT(*) CNT FROM TRANCEPORTDAILYDATA DX"); |
|
315 |
strSQL.AppendFormat(" WHERE DATE_FORMAT(DX.AttendanceDate, '%Y/%m') = '{0}'", CommonMotions.cnvString(comboBox1.SelectedValue)); |
|
316 |
strSQL.Append(" GROUP BY DX.PERSONCODE) D ON D.PERSONCODE = A.PERSONCODE"); |
|
317 |
strSQL.Append(" LEFT JOIN PERSONAPPROVAL E ON E.PERSONCODE = A.PERSONCODE"); |
|
318 |
strSQL.AppendFormat(" AND E.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.DRWorkApproval); |
|
319 |
strSQL.Append(" AND E.ORDERNO = 1 AND E.SEQNO = 1"); |
|
320 |
strSQL.AppendFormat(" AND E.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval); |
|
321 |
strSQL.Append(" WHERE"); |
|
322 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
323 |
{ |
|
324 |
strSQL.Append(" A.DEPARTMENTCODE IN (SELECT DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER F"); |
|
325 |
strSQL.AppendFormat(" WHERE F.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode); |
|
326 |
strSQL.Append(" AND"); |
|
327 |
} |
|
328 |
strSQL.AppendFormat(" A.EMPLOYEECLASSFLG = {0} AND A.DELETEFLG = 0", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular); |
|
329 |
strSQL.AppendFormat(" AND A.EMPLOYEECLASSFLG = {0} AND A.DELETEFLG = 0", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular); |
|
330 |
strSQL.Append(" ORDER BY A.DISPLAYORDER ASC"); |
|
331 |
} |
|
332 |
catch (System.Exception ex) |
|
333 |
{ |
|
334 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
335 |
} |
|
336 |
} |
|
337 |
#endregion |
|
338 |
|
|
386 | 339 |
#region 初期表示 |
387 | 340 |
/// <summary> |
388 | 341 |
/// 初期表示 |
... | ... | |
392 | 345 |
IOAttendanceDailyData AttDayDB = new IOAttendanceDailyData(); |
393 | 346 |
try |
394 | 347 |
{ |
395 |
string strSQL = "SELECT B.DEPARTMENTCODE, B.DEPARTMENTSTRING, A.PERSONCODE, A.PERSONNAME, C.CNT, D.CNT, E.APPROVALSTATUS"; |
|
396 |
strSQL += " FROM PERSONINCHARGEMASTER A"; |
|
397 |
strSQL += " LEFT JOIN DEPARTMENTMASTER B ON B.DEPARTMENTCODE = A.DEPARTMENTCODE"; |
|
398 |
strSQL += " LEFT JOIN (SELECT CX.PERSONCODE, COUNT(*) CNT FROM ATTENDANCEDAILYDATA CX"; |
|
399 |
strSQL += string.Format(" WHERE TO_CHAR(CX.AttendanceDate, 'YYYY/MM') = '{0}' GROUP BY CX.PERSONCODE) C ON C.PERSONCODE = A.PERSONCODE", m_ReportDate); |
|
400 |
strSQL += " LEFT JOIN (SELECT DX.PERSONCODE, COUNT(*) CNT FROM TRANCEPORTDAILYDATA DX"; |
|
401 |
strSQL += string.Format(" WHERE TO_CHAR(DX.AttendanceDate, 'YYYY/MM') = '{0}' GROUP BY DX.PERSONCODE) D ON D.PERSONCODE = A.PERSONCODE", m_ReportDate); |
|
402 |
strSQL += " LEFT JOIN PERSONAPPROVAL E ON E.PERSONCODE = A.PERSONCODE"; |
|
403 |
strSQL += string.Format(" AND E.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.DRWorkApproval); |
|
404 |
strSQL += " AND E.ORDERNO = 1 AND E.SEQNO = 1"; |
|
405 |
strSQL += string.Format(" AND E.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval); |
|
406 |
strSQL += " WHERE"; |
|
407 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
408 |
{ |
|
409 |
strSQL += " A.DEPARTMENTCODE IN (SELECT DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER F"; |
|
410 |
strSQL += string.Format(" WHERE F.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode); |
|
411 |
strSQL += " AND"; |
|
412 |
} |
|
413 |
strSQL += string.Format(" A.EMPLOYEECLASSFLG = {0} AND A.DELETEFLG = 0", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular); |
|
414 |
strSQL += string.Format(" AND A.EMPLOYEECLASSFLG = {0} AND A.DELETEFLG = 0", (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular); |
|
415 |
strSQL += " ORDER BY A.DISPLAYORDER ASC"; |
|
348 |
StringBuilder strSQL = new StringBuilder(); |
|
349 |
CreateSQL(ref strSQL); |
|
416 | 350 |
|
417 | 351 |
DataGridView dgv = dgvList; |
352 |
dgv.Rows.Clear(); |
|
418 | 353 |
ArrayList arData = new ArrayList(); |
419 |
if (!AttDayDB.ExecuteReader(strSQL, ref arData)) return; |
|
420 |
string[] strDisp = new string[3]; |
|
354 |
if (!AttDayDB.ExecuteReader(strSQL.ToString(), ref arData)) return; |
|
355 |
|
|
356 |
string strDisp = string.Empty; |
|
421 | 357 |
int DispNo = 1; |
358 |
int DispLine = -1; |
|
422 | 359 |
foreach (object[] objRec in arData) |
423 | 360 |
{ |
424 |
Array.Clear(strDisp, 0, 3); |
|
425 |
if (CommonMotions.cnvInt(objRec[4]) == 0) strDisp[0] = "×"; |
他の形式にエクスポート: Unified diff