Index: trunk/src/ProcessManagement/ProcessManagement/Common/Office/UsedWord.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Office/UsedWord.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Office/UsedWord.cs	(revision 50)
@@ -575,8 +575,7 @@
                 if (!m_SaveSwitch) return;
 
                 // パス作成
-                //string strFilename = @strFilePath + s_WordExtension[m_WordVersion];
-                string strFilename = @strFilePath + s_WordExtension[0];
+                string strFilename = @strFilePath + s_WordExtension[m_WordVersion];
 
                 object[] Parameters = new object[16];
                 Parameters[0] = strFilename;                    // FileName
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs	(revision 50)
@@ -120,6 +120,8 @@
 
                 List<int> RemoveList = new List<int>();
                 List<int> UpdateLinkList = new List<int>();
+                int ParentCode = 0;
+                int LinkCount = 0;
                 RemoveList.Add(RemoveCode);
                 // 増減工事親確認
                 if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Parent)
@@ -126,6 +128,10 @@
                 {
                     GetLinkageCode(RemoveCode, DB03, ref RemoveList, false);
                 }
+                else if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying)
+                {
+                    LinkCount = GetLinkageCode2(RemoveCode, DB03, ref ParentCode);
+                }
                 // 結合工事親確認
                 if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
                 {
@@ -146,12 +152,13 @@
 
                 bool ProcSuccess = true;
                 string strRemove = string.Empty;
+                string strRemove2 = string.Empty;
                 for (int i = 0; i < RemoveList.Count; i++)
                 {
                     strRemove = DB01.CreatePrimarykeyString(RemoveList[i]);
                     if (!DB01.DeleteAction(strRemove, false)) { ProcSuccess = false; break; }
                     if (!DB02.DeleteAction(strRemove, false)) { ProcSuccess = false; break; }
-                    DB03.DeleteAction(strRemove, false);
+
                     DB04.DeleteAction(strRemove, false);
                     DB05.DeleteAction(strRemove, false);
                     DB06.DeleteAction(strRemove, false);
@@ -176,23 +183,38 @@
                     DB25.DeleteAction(strRemove, false);
                     DB26.DeleteAction(strRemove, false);
                     DB27.DeleteAction(strRemove, false);
+
+                    if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent
+                        || BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Parent)
+                    {
+                        DB03.DeleteAction(strRemove, false);
+                    }
+                    else if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying)
+                    {
+                        strRemove2 = string.Format(" Where FluctuationCode = {0}", RemoveList[i]);
+                        strRemove2 += string.Format(" AND LINKTYPE = {0}", (int)CommonDefine.LinkDataType.FluctuationType);
+                        DB03.DeleteAction(strRemove2, false);
+                    }
+                    else if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinChildren)
+                    {
+                        // 削除処理の未実装
+                    }
                 }
 
                 // 結合工事リンク情報更新
                 if (ProcSuccess)
                 {
-                    // 増減工事親確認
-                    if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Parent)
+                    // 増減工事子の場合（最後のリンク情報か、どうかの確認）
+                    if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying)
                     {
-                        for (int i = 0; i < RemoveList.Count; i++)
-                        {
-                            if (!DB01.UpdateFeild(RemoveList[i]
+                        if (LinkCount == 1)
+                        {   // 最後のリンクは親を増減工事より外す
+                            if (!DB01.UpdateFeild(ParentCode
                                                 , (int)IOConstructionBaseInfo.TableColumn.TyingFlg
                                                 , (int)CommonDefine.BaseInfoTyingFlg.Standard
                                                 , false))
                             {
                                 ProcSuccess = false;
-                                break;
                             }
                         }
                     }
@@ -288,6 +310,36 @@
         }
         #endregion
 
+        #region 増減工事リンク親コード取得
+        /// <summary>
+        /// 増減工事リンク親コード取得
+        /// </summary>
+        private static int GetLinkageCode2(int RemoveCode, IOConstructionLink LinkDB, ref int ParentCode)
+        {
+            try
+            {
+                string strSQL = "SELECT B.CONSTRUCTIONCODE, COUNT(*) FROM CONSTRUCTIONLINK A, CONSTRUCTIONLINK B";
+                strSQL += string.Format(" WHERE A.FLUCTUATIONCODE = {0}", RemoveCode);
+                strSQL += string.Format(" AND A.LINKTYPE = {0}", (int)CommonDefine.LinkDataType.FluctuationType);
+                strSQL += " AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
+                strSQL += " GROUP BY B.CONSTRUCTIONCODE";
+
+                ArrayList arList = new ArrayList();
+                if (!LinkDB.ExecuteReader(strSQL, ref arList)) return 0;
+
+                object[] CurRec = (object[])arList[0];
+
+                ParentCode = CommonMotions.cnvInt(CurRec[0]);
+                return CommonMotions.cnvInt(CurRec[1]);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
         #region 結合親工事番号取得処理
         /// <summary>
         /// 結合親工事番号取得処理
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 50)
@@ -399,7 +399,7 @@
                             break;
 
                         case (int)ProcessExecuteNo.DRWork:                              // 18:出勤日報入力
-                            
+                            ProcessExecuteNo_DRWork(m_ProcControlPara[NowPoint]);
                             break;
 
                         case (int)ProcessExecuteNo.PurchaseOrderStatus:                 // 19:注文書発給一覧
@@ -1521,8 +1521,51 @@
         }
         #endregion
 
+        #region 出勤管理入力
+        /// <summary>
+        /// 出勤管理入力
+        /// </summary>
+        /// <returns></returns>
+        public static void ProcessExecuteNo_DRWork(ProcessParameter CurrentPara)
+        {
+            // 出勤管理入力
+            FrmDRWork frm = new FrmDRWork();
+            try
+            {
+                // 自分のハンドルをリストへセットする
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
+                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = ProcessNo;
+                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = (Form)frm;
+
+                // 起動・編集フラグ
+                //int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
+                //if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
+                //{
+                //    BackProcess();
+                //    return;
+                //}
+                //if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
+
+                // パラメータセット
+                frm.PersonCode = CurrentPara.IntExecParameter[1];
+
+                // フォーム表示
+                frm.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                BackProcess();
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
         #endregion
 
+        #endregion
+
         #region マスタメンテナンス
         // ----------------- メンテナンス起動
         #region 管理マスタ
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceData.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceData.cs	(revision 50)
@@ -0,0 +1,459 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Collections;
+
+using log4net;
+using Oracle.ManagedDataAccess.Client;
+
+using ProcessManagement.DB.Oracle;
+using ProcessManagement.DB.Core;
+using ProcessManagement.DataModel;
+using ProcessManagement.Common;
+
+namespace ProcessManagement.DB.IOAccess
+{
+    /// <summary>
+    /// 出勤日報データＤＢアクセス
+    /// </summary>
+    public class IOAttendanceData : OracleProcess
+    {
+        #region 定義部
+        /// <summary>
+        /// log4netログを使用する
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region 定数
+        /// <summary>
+        /// データフィールド並び
+        /// </summary>
+        public enum DataColumn
+        {
+            /// <summary>
+            /// 作成者コード
+            /// </summary>
+            PersonCode,
+            /// <summary>
+            /// 日報作成日
+            /// </summary>
+            AttendanceDate,
+            /// <summary>
+            /// 明細行番号
+            /// </summary>
+            SeqNo,
+            /// <summary>
+            /// 工事番号
+            /// </summary>
+            ConstructionCode,
+            /// <summary>
+            /// 残業時間
+            /// </summary>
+            OvertimeHours,
+            /// <summary>
+            /// コメント
+            /// </summary>
+            WorkingComment,
+            /// <summary>
+            /// 登録年月日
+            /// </summary>
+            EntryDate,
+            /// <summary>
+            /// 更新年月日
+            /// </summary>
+            UpdateDate,
+        }
+        #endregion
+
+        #region コンストラクタ
+        /// <summary>
+        /// コンストラクタ
+        /// </summary>
+        /// <param name="ConnectionString"></param>
+        public IOAttendanceData()
+            : base(DBCommon.Instance.DBConnectString)
+        {
+        }
+
+        #endregion
+
+        #region SQL作成
+        /// <summary>
+        /// SQL作成
+        /// </summary>
+        private string CreateSelectSQL()
+        {
+            // SQL作成（oracleのDateTime型が変換できないのでCharに変換しておく）
+            string strcmd = "SELECT";
+
+            strcmd += "  PersonCode";                                       // 担当者コード
+            strcmd += " ,TO_CHAR(AttendanceDate, 'YYYY/MM/DD')";            // 日報作成日
+            strcmd += " ,SeqNo";                                            // 明細行番号
+            strcmd += " ,ConstructionCode";                                 // 工事番号
+            strcmd += " ,OvertimeHours";                                    // 残業時間
+            strcmd += " ,WorkingComment";                                   // コメント
+            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
+            strcmd += ", TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";     // 更新年月日
+            strcmd += " FROM AttendanceData";
+
+            return strcmd;
+        }
+        #endregion
+
+        #region 複数読込み処理
+        public bool SelectAction(string AddSQLString, ref List<AttendanceData> data, bool bConnect = true)
+        {
+            //Oracle インターフェース
+            string strcmd = "";
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                // SQL作成
+                strcmd = CreateSelectSQL() + AddSQLString;
+
+                // SQL実行
+                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
+
+                // データセット
+                foreach (object[] objwrk in arData)
+                {
+                    AttendanceData work = new AttendanceData();
+                    Reader2Struct(objwrk, ref work);
+                    data.Add(work);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1件読込み処理
+        public bool SelectAction(string AddSQLString, ref AttendanceData data, bool bConnect = true)
+        {
+            //Oracle インターフェース
+            string strcmd = "";
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                strcmd = CreateSelectSQL() + AddSQLString;
+
+                // SQL実行
+                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
+                if (arData.Count == 0) return false;
+
+                // データセット
+                foreach (object[] objwrk in arData)
+                {
+                    Reader2Struct(objwrk, ref data);
+                    break;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1件追加処理
+        /// <summary>
+        /// 担当者毎経費データ追加
+        /// </summary>
+        /// <param name="data">担当者毎経費データデータ</param>
+        /// <returns>true：成功 false：失敗</returns>
+        public bool InsertAction(AttendanceData work, bool bConnect = true)
+        {
+            string strcmd = "";
+            try
+            {
+                strcmd = "INSERT INTO AttendanceData";
+                strcmd += "  (PersonCode";      // 担当者コード
+                strcmd += " ,AttendanceDate";   // 日報作成日
+                strcmd += " ,SeqNo";            // 明細行番号
+                strcmd += " ,ConstructionCode"; // 工事番号
+                strcmd += " ,OvertimeHours";    // 残業時間
+                strcmd += " ,WorkingComment";   // コメント
+                strcmd += " ,EntryDate";        // 登録年月日
+                strcmd += " ,UpdateDate)";      // 更新年月日
+
+                strcmd += " VALUES (";
+
+                strcmd += string.Format("  {0}", work.PersonCode);                      // 担当者コード
+                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
+                                            , work.AttendanceDate.ToShortDateString()); // 日報作成日
+                strcmd += string.Format(", {0}", work.SeqNo);                           // 明細行番号
+                strcmd += string.Format(", {0}", work.ConstructionCode);                // 工事番号
+                strcmd += string.Format(", {0}", work.OvertimeHours);                   // 残業時間
+                strcmd += string.Format(",'{0}'", work.WorkingComment);                 // コメント
+
+                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
+                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
+                strcmd = strcmd + ")";
+
+                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 複数追加処理
+        public bool InsertAction(List<AttendanceData> data, bool bConnect = true)
+        {
+            string strcmd = "";
+            try
+            {
+                foreach (AttendanceData work in data)
+                {
+                    if (!InsertAction(work, bConnect)) return false;
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 更新処理
+        /// <summary>
+        /// 担当者毎経費データ更新
+        /// </summary>
+        /// <param name="AddSQLString">更新条件SQL文字列</param>
+        /// <param name="data">担当者毎経費データデータ</param>
+        /// <returns>true：成功 false：失敗</returns>
+        public bool UpdateAction(string AddSQLString, AttendanceData data, bool bConnect = true)
+        {
+            string strcmd = "";
+            try
+            {
+
+                strcmd = "UPDATE AttendanceData";
+
+                strcmd += " SET";
+
+                strcmd += string.Format(" PersonCode = {0}", data.PersonCode);                  // 担当者コード
+                strcmd += string.Format(",AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')"
+                                        , data.AttendanceDate.ToShortDateString());             // 日報作成日
+                strcmd += string.Format(",SeqNo =  {0} ", data.SeqNo);                          // 明細行番号
+                strcmd += string.Format(",ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
+                strcmd += string.Format(",OvertimeHours = {0}", data.OvertimeHours);            // 残業時間
+                strcmd += string.Format(",WorkingComment = '{0}'", data.WorkingComment);        // コメント
+                
+                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
+                strcmd += AddSQLString;
+
+                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 削除処理
+        /// <summary>
+        /// 担当者毎経費データ削除
+        /// </summary>
+        /// <param name="AddSQLString">削除条件SQL文字列</param>
+        /// <param name="data">担当者毎経費データデータ</param>
+        /// <returns>true：成功 false：失敗</returns>
+        public bool DeleteAction(string AddSQLString, bool bConnect = true)
+        {
+            //Oracle インターフェース
+            string strcmd = "";
+            try
+            {
+                strcmd = string.Format("{0}{1}", "DELETE FROM AttendanceData", AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1項目更新処理
+        /// <summary>
+        /// 1項目の更新を行う
+        /// </summary>
+        /// <param name="ConstructionCode"></param>
+        /// <param name="FeildNo"></param>
+        /// <param name="value"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public bool UpdateFeild(int PersonCode, DateTime AttendanceDate, int SeqNo, int FeildNo, object value, bool bConnect = true)
+        {
+            string strcmd = "";
+            try
+            {
+                strcmd = "UPDATE AttendanceData";
+
+                strcmd += " SET";
+                switch (FeildNo)
+                {
+                    case (int)DataColumn.PersonCode:
+                        strcmd += string.Format(" PersonCode = {0}", (int)value);
+                        break;
+                    case (int)DataColumn.AttendanceDate:
+                        strcmd += string.Format(" AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')", ((DateTime)value).ToShortDateString());
+                        break;
+                    case (int)DataColumn.SeqNo:
+                        strcmd += string.Format(" SeqNo = {0}", (int)value);
+                        break;
+                    case (int)DataColumn.ConstructionCode:
+                        strcmd += string.Format(" ConstructionCode = {0}", (int)value);
+                        break;
+                    case (int)DataColumn.OvertimeHours:
+                        strcmd += string.Format(" OvertimeHours = {0}", (double)value);
+                        break;
+                    case (int)DataColumn.WorkingComment:
+                        strcmd += string.Format(" WorkingComment = '{0}'", CommonMotions.cnvString(value));
+                        break;
+                }
+
+                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
+                strcmd += CreatePrimarykeyString(PersonCode, AttendanceDate, SeqNo);
+
+                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
+        #region データセット処理
+        /// <summary>
+        /// OracleDataReaderより構造体へセットする
+        /// </summary>
+        /// <param name="reader">OracleDataReader</param>
+        /// <param name="wrk">構造体</param>
+        public void Reader2Struct(object[] objwrk, ref AttendanceData wrk)
+        {
+            try
+            {
+                // データ取得
+                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());                  // 担当者コード
+                wrk.AttendanceDate = DateTime.Parse(objwrk[(int)DataColumn.AttendanceDate].ToString());     // 日報作成日
+                wrk.SeqNo = int.Parse(objwrk[(int)DataColumn.SeqNo].ToString());                            // 明細行番号
+                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
+                wrk.OvertimeHours = double.Parse(objwrk[(int)DataColumn.OvertimeHours].ToString());         // 残業時間
+                wrk.WorkingComment = objwrk[(int)DataColumn.WorkingComment].ToString();                     // 当日作業内容
+                
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
+            }
+            catch (OracleException oraex)
+            {
+                logger.ErrorFormat("オラクルエラー：{0}：{1}", CommonMotions.GetMethodName(2), oraex.Message);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(2), ex.Message);
+            }
+        }
+        #endregion
+
+        #region 検索文字列作成処理
+        /// <summary>
+        /// 主キー検索の文字列を返す
+        /// </summary>
+        /// <param name="PersonCode"></param>
+        /// <param name="ActionDate"></param>
+        /// <param name="DataType"></param>
+        /// <param name="DataAddCount"></param>
+        /// <returns></returns>
+        public string CreatePrimarykeyString(int PersonCode, DateTime AttendanceDate, int SeqNo = 0)
+        {
+            string strWork = "";
+            try
+            {
+                strWork = string.Format(" WHERE PersonCode = {0}", PersonCode);
+                if (AttendanceDate != DateTime.MinValue)
+                    strWork += string.Format(" AND AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')", AttendanceDate.ToShortDateString());
+                if (SeqNo != 0)
+                    strWork += string.Format(" AND SeqNo = {0}", SeqNo);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strWork);
+            }
+
+            return strWork;
+        }
+        #endregion
+
+        #region 追加番号の最大値を取得
+        /// <summary>
+        /// 追加番号の最大値を取得する
+        /// </summary>
+        /// <param name="AddSQLString"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public int SelectMaxAddDataCount(string AddSQLString, bool bConnect = true)
+        {
+            //Oracle インターフェース
+            string strcmd = "";
+            ArrayList arData = new ArrayList();
+            int iRet = 0;
+            try
+            {
+                // SQL作成
+                strcmd = "SELECT NVL(MAX(SeqNo), 0) FROM AttendanceData" + AddSQLString;
+
+                // SQL実行
+                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
+
+                // データセット
+                foreach (object[] objwrk in arData)
+                {
+                    if (objwrk[0].ToString().Equals("null"))
+                        iRet = 0;
+                    else
+                        iRet = int.Parse(objwrk[0].ToString());
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}：{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+            }
+            return iRet;
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/AttendanceData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/AttendanceData.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/AttendanceData.cs	(revision 50)
@@ -0,0 +1,115 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ProcessManagement.DataModel
+{
+    /// <summary>
+    /// 出勤日報データ定義クラス
+    /// </summary>
+    public class AttendanceData
+    {
+        #region メンバ変数
+        /// <summary>
+        /// 作成者コード
+        /// </summary>
+        private int         m_PersonCode = 0;
+        /// <summary>
+        /// 日報作成日
+        /// </summary>
+        private DateTime    m_AttendanceDate = DateTime.Now;
+        /// <summary>
+        /// 明細行番号
+        /// </summary>
+        private int         m_SeqNo = 0;
+        /// <summary>
+        /// 工事番号
+        /// </summary>
+        private int         m_ConstructionCode = 0;
+        /// <summary>
+        /// 残業時間
+        /// </summary>
+        private double      m_OvertimeHours = 0;
+        /// <summary>
+        /// コメント
+        /// </summary>
+        private string      m_WorkingComment = string.Empty;
+        /// <summary>
+        /// 登録年月日
+        /// </summary>
+        private DateTime    m_EntryDate = DateTime.Now;
+        /// <summary>
+        /// 更新年月日
+        /// </summary>
+        private DateTime    m_UpdateDate = DateTime.Now;
+        #endregion
+
+        #region プロパティ
+        /// <summary>
+        /// 作成者コード
+        /// </summary>
+        public int PersonCode
+        {
+            get { return m_PersonCode; }
+            set { m_PersonCode = value; }
+        }
+        /// <summary>
+        /// 日報作成日
+        /// </summary>
+        public DateTime AttendanceDate
+        {
+            get { return m_AttendanceDate; }
+            set { m_AttendanceDate = value; }
+        }
+        /// <summary>
+        /// 明細行番号
+        /// </summary>
+        public int SeqNo
+        {
+            get { return m_SeqNo; }
+            set { m_SeqNo = value; }
+        }
+        /// <summary>
+        /// 工事番号
+        /// </summary>
+        public int ConstructionCode
+        {
+            get { return m_ConstructionCode; }
+            set { m_ConstructionCode = value; }
+        }
+        /// <summary>
+        /// 残業時間
+        /// </summary>
+        public double OvertimeHours
+        {
+            get { return m_OvertimeHours; }
+            set { m_OvertimeHours = value; }
+        }
+        /// <summary>
+        /// 作業コメント
+        /// </summary>
+        public string WorkingComment
+        {
+            get { return m_WorkingComment; }
+            set { m_WorkingComment = value; }
+        }
+        /// <summary>
+        /// 登録年月日
+        /// </summary>
+        public DateTime EntryDate
+        {
+            get { return m_EntryDate; }
+            set { m_EntryDate = value; }
+        }
+        /// <summary>
+        /// 更新年月日
+        /// </summary>
+        public DateTime UpdateDate
+        {
+            get { return m_UpdateDate; }
+            set { m_UpdateDate = value; }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs	(revision 50)
@@ -28,10 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnLineDel = new System.Windows.Forms.Button();
             this.btnLineAdd = new System.Windows.Forms.Button();
@@ -46,16 +47,39 @@
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.label2 = new System.Windows.Forms.Label();
+            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label14 = new System.Windows.Forms.Label();
+            this.cmbConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label15 = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label6 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
+            this.pnlApproval = new System.Windows.Forms.Panel();
+            this.lblApprovalCount = new System.Windows.Forms.Label();
+            this.btnPetition = new System.Windows.Forms.Button();
+            this.btnApproval = new System.Windows.Forms.Button();
+            this.pnlApprovalButton = new System.Windows.Forms.Panel();
+            this.btnOnApproval = new System.Windows.Forms.Button();
+            this.btnNotApproval = new System.Windows.Forms.Button();
+            this.btnOnHold = new System.Windows.Forms.Button();
             this.pnlWork.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
-            this.groupBox1.SuspendLayout();
+            this.panel3.SuspendLayout();
+            this.pnlApproval.SuspendLayout();
+            this.pnlApprovalButton.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
@@ -65,11 +89,11 @@
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(390, 9);
+            this.label1.Location = new System.Drawing.Point(422, 9);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(500, 20);
             this.label1.TabIndex = 7;
-            this.label1.Text = "作　業　日　報";
+            this.label1.Text = "出　勤　日　報";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // btnLineDel
@@ -77,7 +101,7 @@
             this.btnLineDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnLineDel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
             this.btnLineDel.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnLineDel.Location = new System.Drawing.Point(751, 656);
+            this.btnLineDel.Location = new System.Drawing.Point(815, 635);
             this.btnLineDel.Name = "btnLineDel";
             this.btnLineDel.Size = new System.Drawing.Size(130, 30);
             this.btnLineDel.TabIndex = 100;
@@ -90,7 +114,7 @@
             this.btnLineAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnLineAdd.BackColor = System.Drawing.Color.PaleGreen;
             this.btnLineAdd.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnLineAdd.Location = new System.Drawing.Point(613, 656);
+            this.btnLineAdd.Location = new System.Drawing.Point(677, 635);
             this.btnLineAdd.Name = "btnLineAdd";
             this.btnLineAdd.Size = new System.Drawing.Size(130, 30);
             this.btnLineAdd.TabIndex = 99;
@@ -104,7 +128,7 @@
             this.btnDataDelete.BackColor = System.Drawing.Color.Red;
             this.btnDataDelete.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataDelete.ForeColor = System.Drawing.Color.White;
-            this.btnDataDelete.Location = new System.Drawing.Point(1025, 656);
+            this.btnDataDelete.Location = new System.Drawing.Point(1089, 635);
             this.btnDataDelete.Name = "btnDataDelete";
             this.btnDataDelete.Size = new System.Drawing.Size(120, 30);
             this.btnDataDelete.TabIndex = 97;
@@ -117,7 +141,7 @@
             this.btnDataEntry.BackColor = System.Drawing.Color.Green;
             this.btnDataEntry.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(899, 656);
+            this.btnDataEntry.Location = new System.Drawing.Point(963, 635);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
             this.btnDataEntry.TabIndex = 96;
@@ -130,7 +154,7 @@
             this.btnEnd.BackColor = System.Drawing.Color.Blue;
             this.btnEnd.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1151, 656);
+            this.btnEnd.Location = new System.Drawing.Point(1215, 635);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
             this.btnEnd.TabIndex = 98;
@@ -142,7 +166,7 @@
             // 
             this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
-            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
+            this.btnOtherProc.Location = new System.Drawing.Point(7, 635);
             this.btnOtherProc.Name = "btnOtherProc";
             this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
             this.btnOtherProc.TabIndex = 101;
@@ -152,15 +176,14 @@
             // 
             // pnlWork
             // 
-            this.pnlWork.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.pnlWork.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.pnlWork.BackColor = System.Drawing.Color.WhiteSmoke;
             this.pnlWork.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.pnlWork.Controls.Add(this.dgvAllDisplay);
-            this.pnlWork.Location = new System.Drawing.Point(5, 100);
+            this.pnlWork.Location = new System.Drawing.Point(5, 122);
             this.pnlWork.Name = "pnlWork";
-            this.pnlWork.Size = new System.Drawing.Size(1270, 540);
+            this.pnlWork.Size = new System.Drawing.Size(1334, 500);
             this.pnlWork.TabIndex = 102;
             // 
             // dgvAllDisplay
@@ -173,14 +196,15 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            this.dgvAllDisplay.ColumnHeadersHeight = 24;
             this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
@@ -187,8 +211,10 @@
             this.Column4,
             this.Column3,
             this.Column5,
-            this.Column2});
-            this.dgvAllDisplay.Location = new System.Drawing.Point(8, 8);
+            this.Column2,
+            this.Column7,
+            this.Column6});
+            this.dgvAllDisplay.Location = new System.Drawing.Point(5, 8);
             this.dgvAllDisplay.Name = "dgvAllDisplay";
             this.dgvAllDisplay.RowHeadersVisible = false;
             this.dgvAllDisplay.RowHeadersWidth = 20;
@@ -195,15 +221,15 @@
             this.dgvAllDisplay.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             this.dgvAllDisplay.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.dgvAllDisplay.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Black;
-            this.dgvAllDisplay.RowTemplate.Height = 20;
+            this.dgvAllDisplay.RowTemplate.Height = 24;
             this.dgvAllDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvAllDisplay.Size = new System.Drawing.Size(1250, 505);
+            this.dgvAllDisplay.Size = new System.Drawing.Size(1320, 482);
             this.dgvAllDisplay.TabIndex = 36;
             // 
             // Column1
             // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "日付";
             this.Column1.Name = "Column1";
@@ -210,6 +236,7 @@
             this.Column1.ReadOnly = true;
             this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 70;
             // 
             // Column4
             // 
@@ -224,8 +251,8 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column3.Frozen = true;
             this.Column3.HeaderText = "曜日";
             this.Column3.Name = "Column3";
@@ -232,6 +259,7 @@
             this.Column3.ReadOnly = true;
             this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 80;
             // 
             // Column5
             // 
@@ -246,8 +274,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle9;
             this.Column2.Frozen = true;
             this.Column2.HeaderText = "現　　場　　名　　称";
             this.Column2.Name = "Column2";
@@ -254,31 +282,255 @@
             this.Column2.ReadOnly = true;
             this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 1030;
+            this.Column2.Width = 650;
             // 
+            // Column7
+            // 
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column7.Frozen = true;
+            this.Column7.HeaderText = "残業時間";
+            this.Column7.Name = "Column7";
+            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column6
+            // 
+            this.Column6.Frozen = true;
+            this.Column6.HeaderText = "備　考";
+            this.Column6.Name = "Column6";
+            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column6.Width = 400;
+            // 
+            // panel3
+            // 
+            this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel3.Controls.Add(this.label2);
+            this.panel3.Controls.Add(this.cmbDepartment);
+            this.panel3.Controls.Add(this.label14);
+            this.panel3.Controls.Add(this.cmbConstructionPerson);
+            this.panel3.Controls.Add(this.label15);
+            this.panel3.Controls.Add(this.label13);
+            this.panel3.Controls.Add(this.label12);
+            this.panel3.Controls.Add(this.label10);
+            this.panel3.Controls.Add(this.label11);
+            this.panel3.Controls.Add(this.label9);
+            this.panel3.Controls.Add(this.label8);
+            this.panel3.Controls.Add(this.label7);
+            this.panel3.Controls.Add(this.label5);
+            this.panel3.Controls.Add(this.comboBox1);
+            this.panel3.Controls.Add(this.label6);
+            this.panel3.Controls.Add(this.label4);
+            this.panel3.Controls.Add(this.label3);
+            this.panel3.Controls.Add(this.pnlApproval);
+            this.panel3.Controls.Add(this.pnlApprovalButton);
+            this.panel3.Location = new System.Drawing.Point(6, 40);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(1325, 74);
+            this.panel3.TabIndex = 104;
+            // 
+            // label2
+            // 
+            this.label2.BackColor = System.Drawing.Color.LemonChiffon;
+            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label2.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(692, 39);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(54, 27);
+            this.label2.TabIndex = 127;
+            this.label2.Text = "時間";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cmbDepartment
+            // 
+            this.cmbDepartment.BackColor = System.Drawing.Color.White;
+            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDepartment.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold);
+            this.cmbDepartment.FormattingEnabled = true;
+            this.cmbDepartment.Location = new System.Drawing.Point(437, 4);
+            this.cmbDepartment.Name = "cmbDepartment";
+            this.cmbDepartment.Size = new System.Drawing.Size(260, 29);
+            this.cmbDepartment.TabIndex = 123;
+            this.cmbDepartment.TextChanged += new System.EventHandler(this.cmbDepartment_TextChanged);
+            // 
+            // label14
+            // 
+            this.label14.BackColor = System.Drawing.Color.SandyBrown;
+            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label14.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label14.ForeColor = System.Drawing.Color.Black;
+            this.label14.Location = new System.Drawing.Point(309, 5);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(120, 27);
+            this.label14.TabIndex = 126;
+            this.label14.Text = "担当部署";
+            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cmbConstructionPerson
+            // 
+            this.cmbConstructionPerson.BackColor = System.Drawing.Color.White;
+            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionPerson.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstructionPerson.FormattingEnabled = true;
+            this.cmbConstructionPerson.Location = new System.Drawing.Point(841, 4);
+            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
+            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 29);
+            this.cmbConstructionPerson.TabIndex = 124;
+            this.cmbConstructionPerson.TextChanged += new System.EventHandler(this.cmbConstructionPerson_TextChanged);
+            // 
+            // label15
+            // 
+            this.label15.BackColor = System.Drawing.Color.SandyBrown;
+            this.label15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label15.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label15.ForeColor = System.Drawing.Color.Black;
+            this.label15.Location = new System.Drawing.Point(713, 5);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(120, 27);
+            this.label15.TabIndex = 125;
+            this.label15.Text = "担　当　者";
+            this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label13
+            // 
+            this.label13.BackColor = System.Drawing.Color.White;
+            this.label13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label13.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label13.Location = new System.Drawing.Point(632, 39);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(60, 27);
+            this.label13.TabIndex = 122;
+            this.label13.Text = "999";
+            this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label12
+            // 
+            this.label12.BackColor = System.Drawing.Color.LemonChiffon;
+            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label12.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label12.ForeColor = System.Drawing.Color.Black;
+            this.label12.Location = new System.Drawing.Point(469, 39);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(27, 27);
+            this.label12.TabIndex = 121;
+            this.label12.Text = "日";
+            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label10
+            // 
+            this.label10.BackColor = System.Drawing.Color.LemonChiffon;
+            this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label10.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label10.ForeColor = System.Drawing.Color.Black;
+            this.label10.Location = new System.Drawing.Point(272, 39);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(27, 27);
+            this.label10.TabIndex = 120;
+            this.label10.Text = "日";
+            this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label11
+            // 
+            this.label11.BackColor = System.Drawing.Color.Transparent;
+            this.label11.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label11.ForeColor = System.Drawing.Color.Black;
+            this.label11.Location = new System.Drawing.Point(200, 39);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(32, 27);
+            this.label11.TabIndex = 120;
+            this.label11.Text = "～";
+            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label9
+            // 
+            this.label9.BackColor = System.Drawing.Color.LemonChiffon;
+            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label9.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label9.ForeColor = System.Drawing.Color.Black;
+            this.label9.Location = new System.Drawing.Point(173, 39);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(27, 27);
+            this.label9.TabIndex = 120;
+            this.label9.Text = "日";
+            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label8
+            // 
+            this.label8.BackColor = System.Drawing.Color.White;
+            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label8.Font = new System.Drawing.Font("Century", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label8.Location = new System.Drawing.Point(232, 39);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(40, 27);
+            this.label8.TabIndex = 119;
+            this.label8.Text = "99";
+            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label7
+            // 
+            this.label7.BackColor = System.Drawing.Color.White;
+            this.label7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label7.Font = new System.Drawing.Font("Century", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label7.Location = new System.Drawing.Point(133, 39);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(40, 27);
+            this.label7.TabIndex = 119;
+            this.label7.Text = "99";
+            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label5
+            // 
+            this.label5.BackColor = System.Drawing.Color.LemonChiffon;
+            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label5.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label5.ForeColor = System.Drawing.Color.Black;
+            this.label5.Location = new System.Drawing.Point(512, 39);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(120, 27);
+            this.label5.TabIndex = 117;
+            this.label5.Text = "残業時間";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBox1.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(133, 4);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(160, 29);
+            this.comboBox1.TabIndex = 114;
+            // 
             // label6
             // 
-            this.label6.BackColor = System.Drawing.Color.LemonChiffon;
+            this.label6.BackColor = System.Drawing.Color.SandyBrown;
             this.label6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label6.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(6, 16);
+            this.label6.Location = new System.Drawing.Point(5, 5);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(120, 27);
-            this.label6.TabIndex = 43;
-            this.label6.Text = "作業年月";
+            this.label6.TabIndex = 111;
+            this.label6.Text = "対象年月";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label2
+            // label4
             // 
-            this.label2.BackColor = System.Drawing.Color.White;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(134, 17);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(160, 25);
-            this.label2.TabIndex = 44;
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label4.BackColor = System.Drawing.Color.White;
+            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label4.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label4.Location = new System.Drawing.Point(429, 39);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(40, 27);
+            this.label4.TabIndex = 113;
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label3
             // 
@@ -286,67 +538,121 @@
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label3.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(318, 16);
+            this.label3.Location = new System.Drawing.Point(309, 39);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(120, 27);
-            this.label3.TabIndex = 45;
+            this.label3.TabIndex = 112;
             this.label3.Text = "出勤日数";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label4
+            // pnlApproval
             // 
-            this.label4.BackColor = System.Drawing.Color.White;
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.Location = new System.Drawing.Point(446, 17);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(80, 25);
-            this.label4.TabIndex = 46;
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlApproval.BackColor = System.Drawing.Color.White;
+            this.pnlApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlApproval.Controls.Add(this.lblApprovalCount);
+            this.pnlApproval.Controls.Add(this.btnPetition);
+            this.pnlApproval.Controls.Add(this.btnApproval);
+            this.pnlApproval.Location = new System.Drawing.Point(1056, 0);
+            this.pnlApproval.Name = "pnlApproval";
+            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
+            this.pnlApproval.TabIndex = 109;
+            this.pnlApproval.Visible = false;
             // 
-            // groupBox1
+            // lblApprovalCount
             // 
-            this.groupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.groupBox1.Controls.Add(this.textBox1);
-            this.groupBox1.Controls.Add(this.label5);
-            this.groupBox1.Controls.Add(this.label6);
-            this.groupBox1.Controls.Add(this.label4);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.ForeColor = System.Drawing.Color.White;
-            this.groupBox1.Location = new System.Drawing.Point(5, 40);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1270, 50);
-            this.groupBox1.TabIndex = 103;
-            this.groupBox1.TabStop = false;
+            this.lblApprovalCount.BackColor = System.Drawing.Color.Black;
+            this.lblApprovalCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblApprovalCount.ForeColor = System.Drawing.Color.White;
+            this.lblApprovalCount.Location = new System.Drawing.Point(205, 3);
+            this.lblApprovalCount.Name = "lblApprovalCount";
+            this.lblApprovalCount.Size = new System.Drawing.Size(50, 24);
+            this.lblApprovalCount.TabIndex = 1;
+            this.lblApprovalCount.Text = "4/5";
+            this.lblApprovalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBox1
+            // btnPetition
             // 
-            this.textBox1.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.textBox1.Location = new System.Drawing.Point(678, 16);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(89, 26);
-            this.textBox1.TabIndex = 48;
+            this.btnPetition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnPetition.BackColor = System.Drawing.Color.White;
+            this.btnPetition.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnPetition.ForeColor = System.Drawing.Color.Red;
+            this.btnPetition.Location = new System.Drawing.Point(3, 3);
+            this.btnPetition.Name = "btnPetition";
+            this.btnPetition.Size = new System.Drawing.Size(100, 24);
+            this.btnPetition.TabIndex = 12;
+            this.btnPetition.Text = "未申請";
+            this.btnPetition.UseVisualStyleBackColor = false;
             // 
-            // label5
+            // btnApproval
             // 
-            this.label5.BackColor = System.Drawing.Color.Orange;
-            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label5.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(550, 16);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(120, 27);
-            this.label5.TabIndex = 47;
-            this.label5.Text = "残業時間";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.btnApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnApproval.BackColor = System.Drawing.Color.White;
+            this.btnApproval.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnApproval.ForeColor = System.Drawing.Color.Red;
+            this.btnApproval.Location = new System.Drawing.Point(104, 3);
+            this.btnApproval.Name = "btnApproval";
+            this.btnApproval.Size = new System.Drawing.Size(100, 24);
+            this.btnApproval.TabIndex = 12;
+            this.btnApproval.Text = "未承認";
+            this.btnApproval.UseVisualStyleBackColor = false;
             // 
+            // pnlApprovalButton
+            // 
+            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlApprovalButton.AutoSize = true;
+            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
+            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
+            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
+            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
+            this.pnlApprovalButton.Location = new System.Drawing.Point(1056, 0);
+            this.pnlApprovalButton.Name = "pnlApprovalButton";
+            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
+            this.pnlApprovalButton.TabIndex = 110;
+            this.pnlApprovalButton.Visible = false;
+            // 
+            // btnOnApproval
+            // 
+            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
+            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
+            this.btnOnApproval.Name = "btnOnApproval";
+            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
+            this.btnOnApproval.TabIndex = 34;
+            this.btnOnApproval.TabStop = false;
+            this.btnOnApproval.Text = "承認";
+            this.btnOnApproval.UseVisualStyleBackColor = false;
+            // 
+            // btnNotApproval
+            // 
+            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
+            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
+            this.btnNotApproval.Name = "btnNotApproval";
+            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
+            this.btnNotApproval.TabIndex = 35;
+            this.btnNotApproval.TabStop = false;
+            this.btnNotApproval.Text = "不承認";
+            this.btnNotApproval.UseVisualStyleBackColor = false;
+            // 
+            // btnOnHold
+            // 
+            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
+            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
+            this.btnOnHold.Name = "btnOnHold";
+            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
+            this.btnOnHold.TabIndex = 36;
+            this.btnOnHold.TabStop = false;
+            this.btnOnHold.Text = "保留";
+            this.btnOnHold.UseVisualStyleBackColor = false;
+            // 
             // FrmDRWork
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1280, 692);
-            this.Controls.Add(this.groupBox1);
+            this.ClientSize = new System.Drawing.Size(1344, 677);
+            this.Controls.Add(this.panel3);
             this.Controls.Add(this.pnlWork);
             this.Controls.Add(this.btnOtherProc);
             this.Controls.Add(this.btnLineDel);
@@ -361,12 +667,14 @@
             this.Name = "FrmDRWork";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTAndPCosts_FormClosing);
-            this.Load += new System.EventHandler(this.FrmTAndPCosts_Load);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmDRWork_FormClosing);
+            this.Load += new System.EventHandler(this.FrmDRWork_Load);
             this.pnlWork.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.pnlApproval.ResumeLayout(false);
+            this.pnlApprovalButton.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -382,17 +690,38 @@
         private System.Windows.Forms.Button btnOtherProc;
         private System.Windows.Forms.Panel pnlWork;
         private CustomControls.DataGridViewEX dgvAllDisplay;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Panel pnlApproval;
+        private System.Windows.Forms.Label lblApprovalCount;
+        private System.Windows.Forms.Button btnPetition;
+        private System.Windows.Forms.Button btnApproval;
+        private System.Windows.Forms.Panel pnlApprovalButton;
+        private System.Windows.Forms.Button btnOnApproval;
+        private System.Windows.Forms.Button btnNotApproval;
+        private System.Windows.Forms.Button btnOnHold;
+        private System.Windows.Forms.Label label5;
+        private CustomControls.ComboBoxEX comboBox1;
         private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.Label label13;
+        private CustomControls.ComboBoxEX cmbDepartment;
+        private System.Windows.Forms.Label label14;
+        private CustomControls.ComboBoxEX cmbConstructionPerson;
+        private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs	(revision 50)
@@ -36,7 +36,7 @@
         /// <summary>
         /// グリッドカラム
         /// </summary>
-        private enum DispGridColumn
+        private enum GridColumn
         {
             DispDay = 0,
             Day,
@@ -43,6 +43,8 @@
             WeekString,
             ConstructionCode,
             ConstructionName,
+            OverTimes,
+            Comment,
         }
         #endregion
 
@@ -53,13 +55,29 @@
         private enum DspCtrlName
         {
             /// <summary>
-            /// 作業年月
+            /// 部署名
             /// </summary>
-            ConstructionYear = 0,
+            DepartmentName = 0,
             /// <summary>
+            /// 担当者名
+            /// </summary>
+            PersonName,
+            /// <summary>
+            /// 日報年月
+            /// </summary>
+            ConstructionYear,
+            /// <summary>
+            /// 日報開始日
+            /// </summary>
+            ConstructionDayFrom,
+            /// <summary>
+            /// 日報終了日
+            /// </summary>
+            ConstructionDayTo,
+            /// <summary>
             /// 出勤日数
             /// </summary>
-            attendancesDays,
+            WorkingDays,
             /// <summary>
             /// 残業時間
             /// </summary>
@@ -75,6 +93,11 @@
 
         #region 変数
         /// <summary>
+        /// 初期表示フラグ
+        /// </summary>
+        private bool m_bInitFlg = true;
+
+        /// <summary>
         /// フィールド値変化フラグ
         /// </summary>
         private bool m_bChengeAns = false;
@@ -99,16 +122,6 @@
         /// </summary>
         private bool m_EditLock = false;
 
-        /// <summary>
-        /// グリッドサイズ
-        /// </summary>
-        private int m_GridWidth = 0;
-        /// <summary>
-        /// ウィンドウサイズ保持領域
-        /// </summary>
-        private int m_WindowWidth = 0;
-        private int m_WindowHeight = 0;
-
         #endregion
 
         #region プロパティ
@@ -157,11 +170,30 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FrmTAndPCosts_Load(object sender, EventArgs e)
+        private void FrmDRWork_Load(object sender, EventArgs e)
         {
             try
             {
+                // 表示オブジェクトの取得
+                SetDisplayObject();
+
+                // 対象年度のセット
+                SetActionMonthly();
+
+                // 部署のセット
+                SetcmbDepartment();
+
+                // 担当者のセット
+                SetcombBoxPerson();
+
+                // コンボボックス初期表示
+                InitCombBox();
+
+                // 初期表示
                 InitDataLoad();
+
+                // 初期表示フラグOFF
+                m_bInitFlg = false;
             }
             catch (System.Exception ex)
             {
@@ -188,7 +220,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FrmTAndPCosts_FormClosing(object sender, FormClosingEventArgs e)
+        private void FrmDRWork_FormClosing(object sender, FormClosingEventArgs e)
         {
             try
             {
@@ -240,5 +272,54 @@
         }
         #endregion
 
+        #region 営業期コンボボックス変更
+        /// <summary>
+        /// 営業期変更
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void numUDConstPro_ValueChanged(object sender, EventArgs e)
+        {
+            if (m_bInitFlg) return;
+            // データ表示
+            InitDispData();
+        }
+        #endregion
+
+        #region 部署コンボボックス変更
+        /// <summary>
+        /// 部署コンボボックス変更
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void cmbDepartment_TextChanged(object sender, EventArgs e)
+        {
+            if (m_bInitFlg) return;
+
+            // 担当者コンボボックス変更
+            //SetcombBoxPerson();
+
+            // データ表示
+            InitDispData();
+        }
+        #endregion
+
+        #region 担当者コンボボックス変更
+        /// <summary>
+        /// 担当者変更
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void cmbConstructionPerson_TextChanged(object sender, EventArgs e)
+        {
+            if (m_bInitFlg) return;
+
+            // 担当者選択時部署選択を設定する
+            SetPerosonToDepartment();
+
+            // データ表示
+            InitDispData();
+        }
+        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx	(revision 50)
@@ -132,4 +132,10 @@
   <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs	(revision 50)
@@ -18,26 +18,6 @@
 {
     partial class FrmDRWork
     {
-        #region 初期設定
-        /// <summary>
-        /// 初期設定
-        /// </summary>
-        private void InitSettingLoad()
-        {
-            try
-            {
-                // 初期サイズ保持
-                m_GridWidth = dgvAllDisplay.Width;
-                m_WindowWidth = this.Width;
-                m_WindowHeight = this.Height;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
         #region 画面サイズ変更時のセルサイズ変更
         /// <summary>
         /// 画面サイズ変更時のセルサイズ変更
@@ -48,30 +28,6 @@
             {
                 DataGridView dgv = dgvAllDisplay;
 
-                //int CellWidth1 = m_CellSize[(int)DispGridColumn.ItemName];
-                //int CellWidth2 = m_CellSize[(int)DispGridColumn.TextName];
-                //int CellWidth3 = m_CellSize[(int)DispGridColumn.SubContractorName];
-                //// 最大化の場合
-                //if (!bNormal)
-                //{
-                //    int allWidth = 0;
-                //    for (int i = 0; i < dgv.ColumnCount;i++ )
-                //    {
-                //        allWidth += m_CellSize[i];
-                //    }
-                //    // セルの合計サイズが大きい場合は処理しない
-                //    if (allWidth > dgv.Width) return;
-
-                //    int idifference = (dgv.Width - (allWidth + dgv.RowHeadersWidth)) / 3;
-                //    CellWidth1 += idifference;
-                //    CellWidth2 += idifference;
-                //    CellWidth3 += idifference;
-                //}
-
-                //dgv.Columns[(int)DispGridColumn.ItemName].Width = CellWidth1;
-                //dgv.Columns[(int)DispGridColumn.TextName].Width = CellWidth2;
-                //dgv.Columns[(int)DispGridColumn.SubContractorName].Width = CellWidth3;
-
             }
             catch (Exception ex)
             {
@@ -91,13 +47,23 @@
                 // 表示ラベルオブジェクト取得
                 int ArrayCount = Enum.GetNames(typeof(DspCtrlName)).Length;
                 m_DspControl = new Control[ArrayCount];
-                // ヘッダー情報
-                // 作業年月
-                m_DspControl[(int)DspCtrlName.ConstructionYear] = label2;
+
+                // ----- ヘッダー情報
+                // 担当者名
+                m_DspControl[(int)DspCtrlName.DepartmentName] = cmbDepartment;
+                // 担当者名
+                m_DspControl[(int)DspCtrlName.PersonName] = cmbConstructionPerson;
+                // 日報年月
+                m_DspControl[(int)DspCtrlName.ConstructionYear] = comboBox1;
+                // 日報開始日
+                m_DspControl[(int)DspCtrlName.ConstructionDayFrom] = label7;
+                // 日報終了日
+                m_DspControl[(int)DspCtrlName.ConstructionDayTo] = label8;
                 // 出勤日数
-                m_DspControl[(int)DspCtrlName.attendancesDays] = label4;
+                m_DspControl[(int)DspCtrlName.WorkingDays] = label4;
                 // 残業時間
-                m_DspControl[(int)DspCtrlName.Overtime] = textBox1;
+                m_DspControl[(int)DspCtrlName.Overtime] = label13;
+
             }
             catch (Exception ex)
             {
@@ -130,10 +96,11 @@
         {
             try
             {
-                // 対象月
-                string strYear = CommonMotions.cnvJapaneseCalendar(m_ReportDate);
-                m_DspControl[(int)DspCtrlName.ConstructionYear].Text = strYear.Substring(0, strYear.IndexOf("月") + 1);
+                // 対象年度のセット
+                SetActionMonthly();
 
+                // 対象月の開始～終了日のセット
+
                 return true;
             }
             catch (Exception ex)
@@ -156,12 +123,6 @@
         {
             try
             {
-                // 初期設定
-                InitSettingLoad();
-                
-                // 表示オブジェクトの取得
-                SetDisplayObject();
-
                 // 表示クリア
                 ClearDisplay();
 
@@ -168,8 +129,8 @@
                 // ヘッダー表示
                 if (!DispHeader()) return;
 
-                // 固定文字の表示
-                FixDispData();
+                // データ表示
+                InitDispData();
                 
             }
             catch (Exception ex)
@@ -189,39 +150,72 @@
         /// 固定表示の設定
         /// </summary>
         /// <returns></returns>
-        private void FixDispData()
+        private void InitDispData()
         {
             IOMHolidayCalender calDB = new IOMHolidayCalender();
             try
             {
+                // 選択年月を取得する
+                string strSelDate = CommonMotions.cnvString(comboBox1.SelectedValue);
+                DateTime WorktDate = CommonMotions.cnvDate((strSelDate + "/1"));
+
                 // 月の最終日を求める
-                int monthlyLastDay = DateTime.DaysInMonth(m_ReportDate.Year, m_ReportDate.Month);
+                int monthlyLastDay = DateTime.DaysInMonth(WorktDate.Year, WorktDate.Month);
 
+                // 開始日・終了日のセット
+                m_DspControl[(int)DspCtrlName.ConstructionDayFrom].Text = "1";
+                m_DspControl[(int)DspCtrlName.ConstructionDayTo].Text = monthlyLastDay.ToString("00");
+
                 DataGridView dgv = dgvAllDisplay;
                 
                 dgv.Rows.Clear();
+
+                string strSQL = "SELECT AX.DT, TO_CHAR(C.HOLIDAY,'YYYY/MM/DD'), D.CONSTRUCTIONCODE, E.DETAILSTRING, D.OVERTIMEHOURS, D.WORKINGCOMMENT FROM";
+                strSQL += " (SELECT TO_CHAR((st+ROWNUM-1), 'YYYY/MM/DD') DT";
+                strSQL += " FROM SYS.ALL_CATALOG A,";
+                strSQL += string.Format(" (SELECT TO_DATE('{0}','yyyymmdd') st,", (WorktDate.Year.ToString() + WorktDate.Month.ToString("00") + "01"));
+                strSQL += string.Format(" TO_DATE('{0}','yyyymmdd') ed FROM SYS.DUAL) B", (WorktDate.Year.ToString() + WorktDate.Month.ToString("00") + monthlyLastDay.ToString("00")));
+                strSQL += " WHERE ROWNUM <= (ed - st + 1)) AX";
+                strSQL += " LEFT JOIN HOLIDAYCALENDERMASTER C ON C.HOLIDAY = AX.DT";
+                strSQL += " LEFT JOIN ATTENDANCEDATA D ON D.ATTENDANCEDATE = AX.DT";
+                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFODETAIL E ON E.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND E.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+                strSQL += " ORDER BY AX.DT, D.SEQNO";
+
+                ArrayList arList = new ArrayList();
+                if (!calDB.ExecuteReader(strSQL, ref arList)) return;
+                DateTime DispDate = DateTime.Now;
+                string strHoliday = string.Empty;
+                string strConstrName = string.Empty;
+                int AttendamceCnt = 0;
                 // 日付の表示
-                for (int iday = 1; iday <= monthlyLastDay; iday++)
+                foreach (object[] CurRec in arList)
                 {
-                    int AddRow = dgv.Rows.Add(1);
+                    DispDate = CommonMotions.cnvDate(CurRec[0]);
+                    strHoliday = string.Empty;
+                    strHoliday = CommonMotions.cnvString(CurRec[1]);
+                    strConstrName = CommonMotions.cnvString(CurRec[3]);
 
-                    // 日付
-                    dgv.Rows[AddRow].Cells[(int)DispGridColumn.DispDay].Value = string.Format("{0}日", iday);
-                    dgv.Rows[AddRow].Cells[(int)DispGridColumn.Day].Value = iday;
-                    // 曜日
-                    DateTime dtwork = m_ReportDate.AddDays(iday - 1);
-                    dgv.Rows[AddRow].Cells[(int)DispGridColumn.WeekString].Value = dtwork.ToString("dddd");
+                    int AddRow = dgv.Rows.Add(string.Format("{0}日", DispDate.Day.ToString()),
+                                                DispDate.Day,
+                                                DispDate.ToString("dddd"),
+                                                CommonMotions.cnvInt(CurRec[2]),
+                                                strConstrName,
+                                                CommonMotions.cnvDouble(CurRec[4]).ToString("#.#"),
+                                                CommonMotions.cnvString(CurRec[5])
+                                                );
 
                     // 休日のチェック
-                    string strSQL = calDB.CreatePrimarykeyString(dtwork);
-                    HolidayCalenderMaster calRec = new HolidayCalenderMaster();
-                    if (calDB.SelectAction(strSQL, ref calRec))
+                    if (strHoliday.Length != 0)
                     {
-                        dgv.Rows[AddRow].Cells[(int)DispGridColumn.DispDay].Style.ForeColor = Color.Red;
-                        dgv.Rows[AddRow].Cells[(int)DispGridColumn.WeekString].Style.ForeColor = Color.Red;
+                        dgv.Rows[AddRow].Cells[(int)GridColumn.DispDay].Style.ForeColor = Color.Red;
+                        dgv.Rows[AddRow].Cells[(int)GridColumn.WeekString].Style.ForeColor = Color.Red;
+                        continue;
                     }
+                    if (strConstrName.Length != 0) AttendamceCnt++;
                 }
-
+                // 出勤日数
+                m_DspControl[(int)DspCtrlName.WorkingDays].Text = AttendamceCnt.ToString("#");
             }
             catch (Exception ex)
             {
@@ -272,7 +266,7 @@
                 DataGridViewRow CurRow = dgv.CurrentRow;
 
                 // 対象日付取得
-                int TargetDay = CommonMotions.cnvInt(CurRow.Cells[(int)DispGridColumn.Day].Value);
+                int TargetDay = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.Day].Value);
 
                 int InsertCnt = CurRow.Index + 1;
                 // 選択行が不正ならば処理しない
@@ -282,7 +276,7 @@
                 DataGridViewAction.CreateNewLine(dgv, ref InsertCnt);
 
                 // 日付セット
-                dgv.Rows[InsertCnt].Cells[(int)DispGridColumn.Day].Value = TargetDay;
+                dgv.Rows[InsertCnt].Cells[(int)GridColumn.Day].Value = TargetDay;
 
                 // データ変更フラグON
                 m_bChengeAns = true;
@@ -316,7 +310,7 @@
                 if (RemoveCnt == 0) return;
 
                 // 日付が1日だけの場合は削除できない
-                int CurDay = CommonMotions.cnvInt(CurRow.Cells[(int)DispGridColumn.Day].Value);
+                int CurDay = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.Day].Value);
                 
                 if (MessageBox.Show("カレント行を削除します、よろしいですか？", "行削除確認"
                         , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
@@ -323,8 +317,8 @@
 
 
                 int sameCount = 0;
-                if ((RemoveCnt >= 0) && CurDay == CommonMotions.cnvInt(dgv.Rows[(RemoveCnt - 1)].Cells[(int)DispGridColumn.Day].Value)) sameCount++;
-                if ((RemoveCnt <= (dgv.RowCount - 1)) && CurDay == CommonMotions.cnvInt(dgv.Rows[(RemoveCnt + 1)].Cells[(int)DispGridColumn.Day].Value)) sameCount++;
+                if ((RemoveCnt >= 0) && CurDay == CommonMotions.cnvInt(dgv.Rows[(RemoveCnt - 1)].Cells[(int)GridColumn.Day].Value)) sameCount++;
+                if ((RemoveCnt <= (dgv.RowCount - 1)) && CurDay == CommonMotions.cnvInt(dgv.Rows[(RemoveCnt + 1)].Cells[(int)GridColumn.Day].Value)) sameCount++;
 
                 // 日付が1日だけの場合は行削除できない
                 if (sameCount == 0)
@@ -332,9 +326,9 @@
                     foreach (DataGridViewCell wrkcell in CurRow.Cells)
                     {
                         // 日付はクリアしない
-                        if (wrkcell.ColumnIndex == (int)DispGridColumn.DispDay) continue;
-                        if (wrkcell.ColumnIndex == (int)DispGridColumn.Day) continue;
-                        if (wrkcell.ColumnIndex == (int)DispGridColumn.WeekString) continue;
+                        if (wrkcell.ColumnIndex == (int)GridColumn.DispDay) continue;
+                        if (wrkcell.ColumnIndex == (int)GridColumn.Day) continue;
+                        if (wrkcell.ColumnIndex == (int)GridColumn.WeekString) continue;
                         // クリア
                         wrkcell.Value = "";
                     }
@@ -342,16 +336,16 @@
                 else
                 {
                     // 日付表示行は表示日付を下の行に移す
-                    Color DayColor = dgv.Rows[RemoveCnt].Cells[(int)DispGridColumn.DispDay].Style.ForeColor;
-                    Color WeekColor = dgv.Rows[RemoveCnt].Cells[(int)DispGridColumn.WeekString].Style.ForeColor;
-                    string strDispDay = CommonMotions.cnvString(dgv.Rows[RemoveCnt].Cells[(int)DispGridColumn.DispDay].Value);
-                    string strWeek = CommonMotions.cnvString(dgv.Rows[RemoveCnt].Cells[(int)DispGridColumn.WeekString].Value);
+                    Color DayColor = dgv.Rows[RemoveCnt].Cells[(int)GridColumn.DispDay].Style.ForeColor;
+                    Color WeekColor = dgv.Rows[RemoveCnt].Cells[(int)GridColumn.WeekString].Style.ForeColor;
+                    string strDispDay = CommonMotions.cnvString(dgv.Rows[RemoveCnt].Cells[(int)GridColumn.DispDay].Value);
+                    string strWeek = CommonMotions.cnvString(dgv.Rows[RemoveCnt].Cells[(int)GridColumn.WeekString].Value);
                     if (strDispDay.Length != 0)
                     {
-                        dgv.Rows[RemoveCnt + 1].Cells[(int)DispGridColumn.DispDay].Value = strDispDay;
-                        dgv.Rows[RemoveCnt + 1].Cells[(int)DispGridColumn.WeekString].Value = strWeek;
-                        dgv.Rows[RemoveCnt + 1].Cells[(int)DispGridColumn.DispDay].Style.ForeColor = DayColor;
-                        dgv.Rows[RemoveCnt + 1].Cells[(int)DispGridColumn.WeekString].Style.ForeColor = WeekColor;
+                        dgv.Rows[RemoveCnt + 1].Cells[(int)GridColumn.DispDay].Value = strDispDay;
+                        dgv.Rows[RemoveCnt + 1].Cells[(int)GridColumn.WeekString].Value = strWeek;
+                        dgv.Rows[RemoveCnt + 1].Cells[(int)GridColumn.DispDay].Style.ForeColor = DayColor;
+                        dgv.Rows[RemoveCnt + 1].Cells[(int)GridColumn.WeekString].Style.ForeColor = WeekColor;
                     }
 
                     // 行削除
@@ -372,5 +366,493 @@
             }
         }
         #endregion
+
+        #region 対象年度のセット
+        /// <summary>
+        /// 対象年度のセット
+        /// </summary>
+        private void SetActionMonthly()
+        {
+            IOCostDataOfPerson CostDB = new IOCostDataOfPerson();
+            try
+            {
+                // 存在月を出勤データより取得する
+                string strSQL = "SELECT TO_CHAR(ATTENDANCEDATE,'YYYY/MM'), COUNT(*) FROM ATTENDANCEDATA GROUP BY TO_CHAR(ATTENDANCEDATE,'YYYY/MM') ORDER BY 1";
+                ArrayList arList = new ArrayList();
+                CostDB.ExecuteReader(strSQL, ref arList);
+
+                List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>();
+                foreach (object[] wrkobj in arList)
+                {
+                    KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(wrkobj[0].ToString(), (wrkobj[0].ToString().Replace("/", "年") + "月"));
+                    DataList.Add(keyval);
+                }
+
+                // 当月を作成する
+                string ToMonth = string.Format("{0}/{1}", DateTime.Now.Year, DateTime.Now.Month.ToString("00"));
+                // 当月を追加するかの判断
+                if (arList.Count == 0 || !DataList[DataList.Count - 1].Key.Equals(ToMonth))
+                {
+                    KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(ToMonth, (ToMonth.ToString().Replace("/", "年") + "月"));
+                    DataList.Add(keyval);
+                }
+                // 来月の追加判定(25日過ぎは来月の追加をする)
+                if (DateTime.Now.Day > 25)
+                {
+                    DateTime dtNext = DateTime.Now.AddMonths(1);
+                    string NextMonth = string.Format("{0}/{1}", dtNext.Year, dtNext.Month.ToString("00"));
+                    KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(NextMonth, (NextMonth.ToString().Replace("/", "年") + "月"));
+                    DataList.Add(keyval);
+                }
+
+                ComboBoxAction.InitDataSetCombBox(comboBox1, DataList);
+                comboBox1.SelectedValue = ToMonth;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                CostDB.close(); CostDB = null;
+            }
+        }
+        #endregion
+
+        #region コンボボックス初期表示
+        /// <summary>
+        /// コンボボックス初期表示
+        /// </summary>
+        private void InitCombBox()
+        {
+            try
+            {
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // 全部署
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // 複数部署
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // 自部署のみ
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // 自担当者のみ
+
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
+                {
+                    // 部署・担当者コンボ表示
+                    DispAllCombBoxControl(true);
+                }
+                else
+                {
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
+                    {
+                        // 部署・担当者コンボ表示
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
+                        // 部署コンボ非表示
+                        NonDispDepCombBox();
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    {
+                        // 部署・担当者コンボ表示
+                        DispAllCombBoxControl(false);
+                    }
+                }
+
+                // 初期設定対象がコンボボックスデータにあればセットする
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
+                    {
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
+                        break;
+                    }
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
+                    {
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
+                        break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region 担当者コンボより担当者コードを取得する
+        /// <summary>
+        /// 担当者コンボより担当者コードを取得する
+        /// </summary>
+        /// <returns></returns>
+        private int GetConstructionPersonCode()
+        {
+            try
+            {
+                // 表示されていない場合はログインユーザーを返す
+                if (!cmbConstructionPerson.Visible)
+                {
+                    return CommonMotions.LoginUserData.PersonCode;
+                }
+
+                return CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}", ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
+        #region 対象月をコンボボックスより取得する
+        /// <summary>
+        /// 対象月をコンボボックスより取得する
+        /// </summary>
+        /// <returns></returns>
+        private string GetTargetMonth()
+        {
+            try
+            {
+                return CommonMotions.cnvString(comboBox1.SelectedValue);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}", ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region 部署コンボボックスの非表示処理
+        /// <summary>
+        /// 部署コンボボックスの非表示処理
+        /// </summary>
+        private void NonDispDepCombBox()
+        {
+            try
+            {
+                // 部署コンボ非表示
+                label2.Visible = false;
+                cmbDepartment.Visible = false;
+
+                // 表示位置のセット
+                Point loc3 = label3.Location;
+                loc3.X = label2.Location.X + 10;
+                label3.Location = loc3;
+
+                Point loc4 = cmbConstructionPerson.Location;
+                loc4.X = label3.Location.X + label3.Width + 10;
+                cmbConstructionPerson.Location = loc4;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region 全コンボボックス表示をON/OFFする
+        /// <summary>
+        /// 全コンボボックス表示をON/OFFする
+        /// </summary>
+        private void DispAllCombBoxControl(bool bDsp)
+        {
+            try
+            {
+                // 部署・担当者コンボ非表示
+                label2.Visible = bDsp;
+                cmbDepartment.Visible = bDsp;
+                label3.Visible = bDsp;
+                cmbConstructionPerson.Visible = bDsp;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region 部署コンボボックスをセットする
+        /// <summary>
+        /// 部署コンボボックスへ文字をセットする
+        /// </summary>
+        private bool SetcmbDepartment()
+        {
+            IOMDepartment depDB = new IOMDepartment();
+            bool bSave = m_bInitFlg;
+            m_bInitFlg = true;
+            try
+            {
+
+                cmbDepartment.DataSource = null;
+                cmbDepartment.Items.Clear();
+                cmbDepartment.Text = "";
+
+                string strSQL = string.Empty;
+                // 部署マスタを検索する
+                strSQL = "SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*)";
+                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C";
+                strSQL += " WHERE A.DELETEFLG = 0";
+
+                // 新セキュリティデータ対応済みかを確認する
+                //if (CommonMotions.LoginUserData.SecCode == 0)
+                //{
+                //    // システム権限によってデータアクセスに制限がある
+                //    if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key
+                //        || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
+                //    {
+                //        // 所属長
+                //        // 一般使用者（自分のみアクセス可能）
+                //        strSQL += string.Format(" AND A.DEPARTMENTCODE = {0}", CommonMotions.LoginUserData.DepartmentCode);
+                //    }
+                //}
+                //else
+                //{
+                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode)
+                    {
+
+                    }
+                    else
+                    {
+                        // 参照部署マスタより取得する
+                        strSQL += " AND A.DEPARTMENTCODE IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1";
+                        strSQL += string.Format(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
+                    }
+                //}
+                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
+                strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
+                strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER";
+                strSQL += " ORDER BY A.DISPLAYORDER ASC";
+
+                // 部署マスタ読込
+                ArrayList arList = new ArrayList();
+                if (!depDB.ExecuteReader(strSQL, ref arList)) return false;
+
+                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
+                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
+
+                foreach (object[] work in arList)
+                {
+                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(CommonMotions.cnvInt(work[0])
+                                                                                    , CommonMotions.cnvString(work[1]));
+
+                    ConstructionDataList.Add(keyval);
+                }
+
+                // コンボボックス初期表示
+                ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList);
+
+                //// 新セキュリティデータ対応済みかを確認する
+                //if (CommonMotions.LoginUserData.SecCode == 0)
+                //{
+                //    // 所属長
+                //    // 一般使用者（自分のみアクセス可能）
+                //    if (CommonMotions.LoginUserData.SecurityManagement != CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
+                //    {
+                //        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
+                //    }
+                //}
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                depDB.close(); depDB = null;
+                m_bInitFlg = bSave;
+            }
+        }
+        #endregion
+
+        #region 部署コンボボックスに対象があるかをチェックする
+        /// <summary>
+        /// 部署コンボボックスに対象があるかをチェックする
+        /// </summary>
+        /// <param name="Department"></param>
+        /// <returns></returns>
+        private bool SearchDepartmentCombBoxItem(int Department)
+        {
+            try
+            {
+                bool bRet = false;
+
+                // 対象がコンボボックスデータにあればセットする
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == Department)
+                    {
+                        bRet = true;
+                        break;
+                    }
+                }
+
+                return bRet;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 担当者コンボボックスデータセット
+        /// <summary>
+        /// 担当者コンボボックスへ文字をセットする
+        /// </summary>
+        private void SetcombBoxPerson()
+        {
+            IOMPersonInCharge picDB = new IOMPersonInCharge();
+            try
+            {
+                // 担当者マスタを検索する
+                //string strSQL = string.Format(" WHERE EMPLOYEECLASSFLG = {0} AND DELETEFLG = 0", (int)CommonDefine.EmployeeClassFlg.Regular);
+                string strSQL = " WHERE DELETEFLG = 0";
+
+                // 所　属　長
+                int Superior = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key;
+                // 一般ユーザー
+                int User = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key;
+                if (CommonMotions.LoginUserData.SecurityManagement == Superior)
+                {
+                    // 所属長（所属内のみ）
+                    strSQL += string.Format(" AND DEPARTMENTCODE = {0}", CommonMotions.LoginUserData.DepartmentCode);
+                }
+                else if (CommonMotions.LoginUserData.SecurityManagement == User)
+                {
+                    // 一般ユーザーは担当者を選択できない
+                    return;
+                }
+                else
+                {
+                    if (CommonMotions.cnvInt(cmbDepartment.SelectedValue) != 0)
+                        strSQL += string.Format(" AND DEPARTMENTCODE = {0}", CommonMotions.cnvInt(cmbDepartment.SelectedValue));
+                }
+
+                // 担当者マスタ読込
+                strSQL += " ORDER BY EMPLOYEECLASSFLG ASC, DISPLAYORDER ASC";
+                List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
+                if (!picDB.SelectAction(strSQL, ref workList)) return;
+
+                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
+                // データ表示
+                foreach (PersonInChargeMaster wrk in workList)
+                {
+                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrk.PersonCode, wrk.PersonName);
+                    DataList.Add(keyval);
+                }
+
+                // コンボボックス初期表示
+                ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, DataList);
+
+                //// 新セキュリティデータ対応済みかを確認する
+                //if (CommonMotions.LoginUserData.SecCode == 0)
+                //{
+                //    // 一般ユーザーで総務部所属者ではない場合、ログイン者のコードをセットする
+                //    if (CommonMotions.LoginUserData.SecurityManagement != CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key &&
+                //        CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision)
+                //    {
+                //        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
+                //    }
+                //}
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                picDB.close(); picDB = null;
+            }
+        }
+        #endregion
+
+        #region 担当者コンボボックスに対象があるかをチェックする
+        /// <summary>
+        /// 担当者コンボボックスに対象があるかをチェックする
+        /// </summary>
+        /// <param name="PersonCode"></param>
+        /// <returns></returns>
+        private bool SearchPersonCombBoxItem(int PersonCode)
+        {
+            try
+            {
+                bool bRet = false;
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == PersonCode)
+                    {
+                        bRet = true;
+                        break;
+                    }
+                }
+
+                return bRet;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 担当者コンボボックスセット時部署をセットする
+        /// <summary>
+        /// 担当者コンボボックスセット時部署をセットする
+        /// </summary>
+        /// <returns></returns>
+        private bool SetPerosonToDepartment()
+        {
+            IOMPersonInCharge PersonDB = new IOMPersonInCharge();
+            try
+            {
+                // コンボボックスより選択担当者を取得する
+                int PersonCode = GetConstructionPersonCode();
+                if (PersonCode < 1) return false;
+
+                int DepartmentCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+
+                string strSQL = PersonDB.CreatePrimarykeyString(PersonCode);
+                PersonInChargeMaster PersonRec = new PersonInChargeMaster();
+                PersonDB.SelectAction(strSQL, ref PersonRec);
+
+                // 部署コンボボックスへ部署コードセット
+                if (PersonRec.DepartmentCode > 0 && DepartmentCode != PersonRec.DepartmentCode)
+                {
+                    bool bSave = m_bInitFlg;
+                    m_bInitFlg = true;
+                    cmbDepartment.SelectedValue = PersonRec.DepartmentCode;
+                    SetcombBoxPerson();    // 担当者コンボボックス変更
+                    cmbConstructionPerson.SelectedValue = PersonCode;
+                    m_bInitFlg = bSave;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                PersonDB.close(); PersonDB = null;
+            }
+        }
+        #endregion
+
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs	(revision 50)
@@ -2304,7 +2304,7 @@
             this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbDepartment.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold);
             this.cmbDepartment.FormattingEnabled = true;
-            this.cmbDepartment.Location = new System.Drawing.Point(433, 5);
+            this.cmbDepartment.Location = new System.Drawing.Point(437, 4);
             this.cmbDepartment.Name = "cmbDepartment";
             this.cmbDepartment.Size = new System.Drawing.Size(260, 29);
             this.cmbDepartment.TabIndex = 1;
@@ -2317,9 +2317,9 @@
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label2.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(311, 5);
+            this.label2.Location = new System.Drawing.Point(309, 5);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(114, 29);
+            this.label2.Size = new System.Drawing.Size(120, 27);
             this.label2.TabIndex = 108;
             this.label2.Text = "担当部署";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2331,7 +2331,7 @@
             this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbConstructionPerson.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.cmbConstructionPerson.FormattingEnabled = true;
-            this.cmbConstructionPerson.Location = new System.Drawing.Point(839, 5);
+            this.cmbConstructionPerson.Location = new System.Drawing.Point(841, 4);
             this.cmbConstructionPerson.Name = "cmbConstructionPerson";
             this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 29);
             this.cmbConstructionPerson.TabIndex = 2;
@@ -2344,9 +2344,9 @@
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label3.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(717, 5);
+            this.label3.Location = new System.Drawing.Point(713, 5);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(114, 29);
+            this.label3.Size = new System.Drawing.Size(120, 27);
             this.label3.TabIndex = 106;
             this.label3.Text = "担　当　者";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2357,7 +2357,7 @@
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label4.Location = new System.Drawing.Point(5, 5);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(114, 29);
+            this.label4.Size = new System.Drawing.Size(120, 27);
             this.label4.TabIndex = 104;
             this.label4.Text = "対象年月";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2368,7 +2368,7 @@
             this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.comboBox1.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(127, 5);
+            this.comboBox1.Location = new System.Drawing.Point(133, 4);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(160, 29);
             this.comboBox1.TabIndex = 0;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 50)
@@ -2115,7 +2115,13 @@
                                 break;
                                 #endregion
                             case 9:
+                                #region 出勤管理
+                                // 出勤管理
+                                //NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.DRWork);
+                                //ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0);    // ダミー
+                                //ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.LoginUserData.PersonCode);
                                 break;
+                                #endregion
                         }
                         break;
                     case 3:
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 49)
+++ trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 50)
@@ -127,6 +127,7 @@
     <Compile Include="Common\CommonDefine.cs" />
     <Compile Include="Common\Office\UsedWord.cs" />
     <Compile Include="DataModel\ConstructionLink.cs" />
+    <Compile Include="DataModel\AttendanceData.cs" />
     <Compile Include="DataModel\OrdersPriceData.cs" />
     <Compile Include="DataModel\PersonDepartmentMaster.cs" />
     <Compile Include="DataModel\PersonSalaryMaster.cs" />
@@ -157,6 +158,7 @@
     <Compile Include="DataModel\SuppliersMaster.cs" />
     <Compile Include="DataModel\SecurityMaster.cs" />
     <Compile Include="DB\IOAccess\IOConstructionLink.cs" />
+    <Compile Include="DB\IOAccess\IOAttendanceData.cs" />
     <Compile Include="DB\IOAccess\IOMPersonDepartment.cs" />
     <Compile Include="DB\IOAccess\IOMPersonSalary.cs" />
     <Compile Include="DB\IOAccess\IOMSecurity.cs" />
Index: trunk/src/ProcessManagement/ProcessManagement.v12.suo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
