Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 307)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 122;
+        public static int s_SystemVersion = 124;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs	(revision 307)
@@ -422,11 +422,12 @@
                 Range = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.None].Key;
 
                 // æ‹…å½“è€…ãƒžã‚¹ã‚¿ã‚ˆã‚Šä¿�è­·åŒºåˆ†ãƒžã‚¹ã‚¿ã‚’å�–å¾—ã�™ã‚‹
-                string strSQL = "SELECT A.SECCODE, A.SECNAME, A.SECRANK, A.SECRANGE FROM SECURITYMASTER A";
-                strSQL += string.Format(" WHERE A.SECCODE = {0}", SecCode);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT A.SECCODE, A.SECNAME, A.SECRANK, A.SECRANGE FROM SECURITYMASTER A");
+                strSQL.AppendFormat(" WHERE A.SECCODE = {0}", SecCode);
 
                 ArrayList arList = new ArrayList();
-                if (!SecDB.ExecuteReader(strSQL, ref arList)) return Rank;
+                if (!SecDB.ExecuteReader(strSQL.ToString(), ref arList)) return Rank;
 
                 if (arList.Count == 0) return Rank;
                 object[] objRec = (object[])arList[0];
@@ -502,13 +503,22 @@
                 Range = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.None].Key;
                 
                 // æ‹…å½“è€…ãƒžã‚¹ã‚¿ã‚ˆã‚Šä¿�è­·åŒºåˆ†ãƒžã‚¹ã‚¿ã‚’å�–å¾—ã�™ã‚‹
-                string strSQL = "SELECT A.PERSONCODE, A.PERSONNAME, B.SECNAME, B.SECRANK, B.SECRANGE";
-                strSQL += " FROM PERSONINCHARGEMASTER A, SECURITYMASTER B";
-                strSQL += " WHERE B.SECCODE = A.SECCODE";
-                strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.PERSONCODE");
+                strSQL.Append(", A.PERSONNAME");
+                strSQL.Append(", B.SECNAME");
+                strSQL.Append(", B.SECRANK");
+                strSQL.Append(", B.SECRANGE ");
+                strSQL.Append(" FROM");
+                strSQL.Append(" PERSONINCHARGEMASTER A");
+                strSQL.Append(", SECURITYMASTER B");
+                strSQL.Append(" WHERE");
+                strSQL.Append(" B.SECCODE = A.SECCODE");
+                strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode);
 
                 ArrayList arList = new ArrayList();
-                if (!SecDB.ExecuteReader(strSQL, ref arList)) return Rank;
+                if (!SecDB.ExecuteReader(strSQL.ToString(), ref arList)) return Rank;
 
                 if (arList.Count == 0) return Rank;
                 object[] objRec = (object[])arList[0];
@@ -565,7 +575,7 @@
             try
             {
                 DepList.Clear();
-                string strSQL = string.Empty;
+                StringBuilder strSQL = new StringBuilder();
                 
                 // å…¨éƒ¨ç½²å¯¾è±¡ã�®ç¯„å›²ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
                 int AllPathRange = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.AllPath].Key;
@@ -584,20 +594,20 @@
                 // å¯¾è±¡è€…ã�®ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ç¯„å›²ã�Œå…¨éƒ¨ç½²å¯¾å¿œã�ªã‚‰ã�°å…¨éƒ¨ç½²ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                 if (TargetRange == AllPathRange)
                 {
-                    strSQL = "SELECT DEPARTMENTCODE, DEPARTMENTSTRING, DISPLAYORDER";
-                    strSQL += " FROM DEPARTMENTMASTER";
-                    strSQL += " WHERE DELETEFLG = 0ã€€ORDER BY DISPLAYORDER";
+                    strSQL.Append("SELECT DEPARTMENTCODE, DEPARTMENTSTRING, DISPLAYORDER");
+                    strSQL.Append(" FROM DEPARTMENTMASTER");
+                    strSQL.Append(" WHERE DELETEFLG = 0ã€€ORDER BY DISPLAYORDER");
                 }
                 else
                 {
                     // å�‚ç…§éƒ¨ç½²ãƒžã‚¹ã‚¿ã‚ˆã‚Šéƒ¨ç½²ã‚’å�–å¾—ã�™ã‚‹
-                    strSQL = "SELECT A.DEPARTMENTCODE, B.DEPARTMENTSTRING, A.AFFILIATIONFLG, A.PERSONCODE";
-                    strSQL += " FROM PERSONDEPARTMENTMASTER A, DEPARTMENTMASTER B";
-                    strSQL += " WHERE B.DEPARTMENTCODE = A.DEPARTMENTCODE";
-                    strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode);
+                    strSQL.Append("SELECT A.DEPARTMENTCODE, B.DEPARTMENTSTRING, A.AFFILIATIONFLG, A.PERSONCODE");
+                    strSQL.Append(" FROM PERSONDEPARTMENTMASTER A, DEPARTMENTMASTER B");
+                    strSQL.Append(" WHERE B.DEPARTMENTCODE = A.DEPARTMENTCODE");
+                    strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode);
                 }
                 ArrayList arList = new ArrayList();
-                if (!PersonDepDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (!PersonDepDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
 
                 if (arList.Count == 0) return false;
                 foreach (object[] objRec in arList)
@@ -662,13 +672,14 @@
             try
             {
                 // æ‹…å½“è€…ãƒžã‚¹ã‚¿ã‚ˆã‚Šä¿�è­·åŒºåˆ†ãƒžã‚¹ã‚¿ã‚’å�–å¾—ã�™ã‚‹
-                string strSQL = "SELECT A.PERSONCODE, A.PERSONNAME, B.SECCODE, B.SECNAME";
-                strSQL += " FROM PERSONINCHARGEMASTER A, SECURITYMASTER B";
-                strSQL += " WHERE B.SECCODE = A.SECCODE";
-                strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT A.PERSONCODE, A.PERSONNAME, B.SECCODE, B.SECNAME");
+                strSQL.Append(" FROM PERSONINCHARGEMASTER A, SECURITYMASTER B");
+                strSQL.Append(" WHERE B.SECCODE = A.SECCODE");
+                strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode);
 
                 ArrayList arList = new ArrayList();
-                if (!SecDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (!SecDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
 
                 if (arList.Count == 0) return false;
                 object[] objRec = (object[])arList[0];
@@ -888,6 +899,54 @@
         }
         #endregion
 
+        #region ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œå¯¾è±¡éƒ¨ç½²ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã‚‹ã�‹ã‚’è¿”ã�™
+        /// <summary>
+        /// ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œå¯¾è±¡éƒ¨ç½²ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã‚‹ã�‹ã‚’è¿”ã�™
+        /// </summary>
+        /// <returns></returns>
+        public static bool LoginPersonAccess(int TargetDepartment)
+        {
+            IOMPersonInCharge PersonDB = new IOMPersonInCharge();
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.PERSONCODE");
+                strSQL.Append(", A.PERSONNAME");
+                strSQL.Append(", B.SECNAME");
+                strSQL.Append(", B.SECRANK");
+                strSQL.Append(", B.SECRANGE");
+                strSQL.Append(", C.DepartmentCode");
+                strSQL.Append(", D.DepartmentString");
+                strSQL.Append(" FROM");
+                strSQL.Append(" PERSONINCHARGEMASTER As A");
+                strSQL.Append(" Left Join persondepartmentmaster As C");
+                strSQL.Append("   On C.PersonCode = A.PersonCode");
+                strSQL.Append(" Left Join departmentmaster As D");
+                strSQL.Append("   On D.DepartmentCode = C.DepartmentCode");
+                strSQL.Append(" Inner join SECURITYMASTER As B");
+                strSQL.Append("   On B.SECCODE = A.SECCODE");
+                strSQL.AppendFormat(" WHERE A.PersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
+                strSQL.AppendFormat(" And C.DepartmentCode = {0}", TargetDepartment);
+
+                ArrayList arData = new ArrayList();
+                if (!PersonDB.ExecuteReader(strSQL.ToString(), ref arData)) return false;
+                if (arData.Count < 1) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                PersonDB.close(); PersonDB = null;
+            }
+        }
+        #endregion
+
         #region å¯¾è±¡è€…ã�Œå¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã‚‹ã�‹ã‚’è¿”ã�™
         /// <summary>
         /// å¯¾è±¡è€…ã�Œå¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã‚‹ã�‹ã‚’è¿”ã�™
@@ -989,24 +1048,25 @@
             try
             {
                 // å·¥äº‹æƒ…å ±ã‚’å�–å¾—ã�™ã‚‹
-                string strBase = "SELECT A.CONSTRUCTIONCODE,";
-                strBase += " A.SALESPERSONCODE, B.DEPARTMENTCODE,";
-                strBase += " A.CONSTRUCTIONPERSONCODE, C.DEPARTMENTCODE,";
-                strBase += " D.PERSONCODE, D.DEPARTMENTCODE,";
-                strBase += " E.PERSONCODE, E.DEPARTMENTCODE,";
-                strBase += " A.CONSTRUCTIONSTATUSFLG,";
-                strBase += " A.TRANSFERCONSTRUCTION,";
-                strBase += " F.DEPARTMENTCODE";
-                strBase += " FROM CONSTRUCTIONBASEINFO A";
-                strBase += " LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = A.SALESPERSONCODE";
-                strBase += " LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.CONSTRUCTIONPERSONCODE";
-                strBase += " LEFT JOIN PERSONINCHARGEMASTER D ON D.PERSONCODE = A.CONSTRSUBPERSONCODE";
-                strBase += " LEFT JOIN PERSONINCHARGEMASTER E ON E.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR";
-                strBase += " LEFT JOIN PERSONINCHARGEMASTER F ON F.PERSONCODE = A.TRANSFERCONSTRUCTION";
-                strBase += BaseDB.CreatePrimarykeyString(ConstructionCode);
+                StringBuilder strBase = new StringBuilder();
+                strBase.Append("SELECT A.CONSTRUCTIONCODE,");
+                strBase.Append(" A.SALESPERSONCODE, B.DEPARTMENTCODE,");
+                strBase.Append(" A.CONSTRUCTIONPERSONCODE, C.DEPARTMENTCODE,");
+                strBase.Append(" D.PERSONCODE, D.DEPARTMENTCODE,");
+                strBase.Append(" E.PERSONCODE, E.DEPARTMENTCODE,");
+                strBase.Append(" A.CONSTRUCTIONSTATUSFLG,");
+                strBase.Append(" A.TRANSFERCONSTRUCTION,");
+                strBase.Append(" F.DEPARTMENTCODE");
+                strBase.Append(" FROM CONSTRUCTIONBASEINFO A");
+                strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = A.SALESPERSONCODE");
+                strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
+                strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER D ON D.PERSONCODE = A.CONSTRSUBPERSONCODE");
+                strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER E ON E.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR");
+                strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER F ON F.PERSONCODE = A.TRANSFERCONSTRUCTION");
+                strBase.Append(BaseDB.CreatePrimarykeyString(ConstructionCode));
 
                 ArrayList arBaseList = new ArrayList();
-                if (!BaseDB.ExecuteReader(strBase, ref arBaseList)) return false;
+                if (!BaseDB.ExecuteReader(strBase.ToString(), ref arBaseList)) return false;
                 if (arBaseList.Count == 0) return false;
 
                 object[] objBaseRec = (object[])arBaseList[0];
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs	(revision 307)
@@ -804,5 +804,17 @@
             EditTreeViewComment();
         }
         #endregion
+
+        #region ƒRƒ�ƒ“ƒgƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        /// <summary>
+        /// ƒRƒ�ƒ“ƒgƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tvDispData_DoubleClick(object sender, EventArgs e)
+        {
+            EditTreeViewComment();
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs	(revision 307)
@@ -31,13 +31,13 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            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();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            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 dataGridViewCellStyle5 = 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();
             this.label1 = new System.Windows.Forms.Label();
             this.btnEnd = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -144,14 +144,14 @@
             this.dgvEntryData.AllowUserToResizeRows = false;
             this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.Black;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvEntryData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvEntryData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvEntryData.ColumnHeadersHeight = 24;
             this.dgvEntryData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvEntryData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -187,10 +187,10 @@
             // 
             // Column02
             // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
-            this.Column02.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            this.Column02.DefaultCellStyle = dataGridViewCellStyle2;
             this.Column02.Frozen = true;
             this.Column02.HeaderText = "â„–";
             this.Column02.Name = "Column02";
@@ -201,8 +201,8 @@
             // 
             // Column03
             // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column03.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column03.DefaultCellStyle = dataGridViewCellStyle3;
             this.Column03.Frozen = true;
             this.Column03.HeaderText = "æ‰¿èª�è€…å��";
             this.Column03.Name = "Column03";
@@ -213,8 +213,8 @@
             // 
             // Column06
             // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column06.DefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column06.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column06.Frozen = true;
             this.Column06.HeaderText = "æ‰¿èª�çŠ¶æ…‹";
             this.Column06.Name = "Column06";
@@ -225,9 +225,9 @@
             // 
             // Column07
             // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column07.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column07.DefaultCellStyle = dataGridViewCellStyle5;
             this.Column07.Frozen = true;
             this.Column07.HeaderText = "å‡¦ç�†æ—¥ä»˜";
             this.Column07.Name = "Column07";
@@ -238,8 +238,8 @@
             // 
             // Column04
             // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column04.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column04.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column04.HeaderText = "æ‰€ã€€å±ž";
             this.Column04.Name = "Column04";
             this.Column04.ReadOnly = true;
@@ -249,8 +249,8 @@
             // 
             // Column05
             // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column05.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column05.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column05.HeaderText = "å½¹ã€€è�·";
             this.Column05.Name = "Column05";
             this.Column05.ReadOnly = true;
@@ -760,6 +760,7 @@
             this.tvDispData.Name = "tvDispData";
             this.tvDispData.Size = new System.Drawing.Size(544, 308);
             this.tvDispData.TabIndex = 158;
+            this.tvDispData.DoubleClick += new System.EventHandler(this.tvDispData_DoubleClick);
             // 
             // FrmApprovalPerson
             // 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.resx	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.resx	(revision 307)
@@ -138,9 +138,6 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>35</value>
   </metadata>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 307)
@@ -1446,6 +1446,11 @@
                     strNodeText = strNodeText.Substring(strNodeText.IndexOf("ï¼�") + 1);
                 }
 
+                // æ›¸è¾¼ã�¿è€…ä»¥å¤–ã�¯è¡¨ç¤ºã�®ã�¿
+                if (!CutOffPersonName().Equals(CommonMotions.LoginUserData.PersonName))
+                {
+                    frm.LockFlag = (int)FrmInputComment.LockFlagDef.Locked;
+                }
                 // ã‚³ãƒ¡ãƒ³ãƒˆå…¥åŠ›ç”»é�¢è¡¨ç¤º
                 frm.EditFlag = (int)FrmInputComment.EditFlagDef.EditData;
                 frm.CommentString = strNodeText;
@@ -1527,6 +1532,31 @@
         }
         #endregion
 
+        #region ã‚³ãƒ¡ãƒ³ãƒˆè¡Œã‚ˆã‚Šæ‹…å½“è€…å��ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ã‚³ãƒ¡ãƒ³ãƒˆè¡Œã‚ˆã‚Šæ‹…å½“è€…å��ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private string CutOffPersonName()
+        {
+            try
+            {
+                TreeNode TargetNodes = tvDispData.SelectedNode;
+                string strNodeText = TargetNodes.Text;
+
+                strNodeText = strNodeText.Substring(strNodeText.IndexOf("ï¼�") + 1);
+                strNodeText = strNodeText.Substring(0, strNodeText.IndexOf("ï¼�"));
+
+                return strNodeText;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
         #region ç™»éŒ²æ™‚æƒ…å ±
         /// <summary>
         /// ç™»éŒ²æ™‚ã‚³ãƒ¡ãƒ³ãƒˆç•ªå�·
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 307)
@@ -778,5 +778,17 @@
             EditTreeViewComment();
         }
         #endregion
+
+        #region ƒRƒ�ƒ“ƒgƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        /// <summary>
+        /// ƒRƒ�ƒ“ƒgƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tvDispData_DoubleClick(object sender, EventArgs e)
+        {
+            EditTreeViewComment();
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs	(revision 307)
@@ -531,6 +531,7 @@
             this.tvDispData.Name = "tvDispData";
             this.tvDispData.Size = new System.Drawing.Size(544, 308);
             this.tvDispData.TabIndex = 158;
+            this.tvDispData.DoubleClick += new System.EventHandler(this.tvDispData_DoubleClick);
             // 
             // lblLabel15
             // 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 307)
@@ -1444,9 +1444,14 @@
                     strNodeText = strNodeText.Substring(strNodeText.IndexOf("ï¼�") + 1);
                 }
 
+                // æ›¸è¾¼ã�¿è€…ä»¥å¤–ã�¯è¡¨ç¤ºã�®ã�¿
+                if (!CutOffPersonName().Equals(CommonMotions.LoginUserData.PersonName))
+                {
+                    frm.LockFlag = (int)FrmInputComment.LockFlagDef.Locked;
+                }
                 // ã‚³ãƒ¡ãƒ³ãƒˆå…¥åŠ›ç”»é�¢è¡¨ç¤º
                 frm.EditFlag = (int)FrmInputComment.EditFlagDef.EditData;
-                frm.CommentString = strNodeText;
+                frm.CommentString = strNodeText.Replace("\r\n", "");
                 frm.ShowDialog();
                 if (frm.EndButton == DialogResult.No) return;
 
@@ -1489,9 +1494,9 @@
         }
         #endregion
 
-        #region æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‰Šé™¤å‡¦ç�†
+        #region æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‰Šé™¤å‡¦ç�†ï¼ˆæœªä½¿ç”¨ï¼‰
         /// <summary>
-        /// æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‰Šé™¤å‡¦ç�†
+        /// æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‰Šé™¤å‡¦ç�†ï¼ˆæœªä½¿ç”¨ï¼‰
         /// </summary>
         private void RemoveTreeViewComment()
         {
@@ -1525,6 +1530,77 @@
         }
         #endregion
 
+        #region ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œã‚³ãƒ¡ãƒ³ãƒˆã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã‚‹ã�‹ã‚’è¿”ã�™
+        /// <summary>
+        /// ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œã‚³ãƒ¡ãƒ³ãƒˆã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã‚‹ã�‹ã‚’è¿”ã�™
+        /// </summary>
+        /// <returns></returns>
+        private bool CheckCommentAcess()
+        {
+            IOMPersonInCharge PersonDB = new IOMPersonInCharge();
+            try
+            {
+                // ç®¡ç�†è€…ã�¯ï¼¯ï¼«
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode) return true;
+
+                // ã‚³ãƒ¡ãƒ³ãƒˆã‚ˆã‚Šæ‹…å½“è€…å��å�–å¾—
+                string ChargePerson = CutOffPersonName();
+
+                // æ‹…å½“è€…æ¤œç´¢
+                PersonInChargeMaster PersonRec = new PersonInChargeMaster();
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(" Where PERSONNAME = '{0}'", ChargePerson);
+                if (!PersonDB.SelectAction(strSQL.ToString(), ref PersonRec)) return false;
+
+                // ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œæ‹…å½“è€…ã�®å ´å�ˆã�¯ã‚¢ã‚¯ã‚»ã‚¹ï¼¯ï¼«
+                if (CommonMotions.LoginUserData.PersonCode == PersonRec.PersonCode) return true;
+
+                //  ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œä¸€èˆ¬æ¨©é™�è€…ã�®å ´å�ˆã�¯ä»–ã�®ãƒ‡ãƒ¼ã‚¿ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�§ã��ã�ªã�„
+                int nNormal = (int)CommonDefine.SecurityRankPos.NormalAuthority;
+                if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[nNormal].Key) return false;
+
+                // ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãƒ�ã‚§ãƒƒã‚¯
+                if (!ClsSecurityPermission.LoginPersonAccess(PersonRec.DepartmentCode)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                PersonDB.close(); PersonDB = null;
+            }
+        }
+        #endregion
+
+        #region ã‚³ãƒ¡ãƒ³ãƒˆè¡Œã‚ˆã‚Šæ‹…å½“è€…å��ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ã‚³ãƒ¡ãƒ³ãƒˆè¡Œã‚ˆã‚Šæ‹…å½“è€…å��ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private string CutOffPersonName()
+        {
+            try
+            {
+                TreeNode TargetNodes = tvDispData.SelectedNode;
+                string strNodeText = TargetNodes.Text;
+
+                strNodeText = strNodeText.Substring(strNodeText.IndexOf("ï¼�") + 1);
+                strNodeText = strNodeText.Substring(0, strNodeText.IndexOf("ï¼�"));
+
+                return strNodeText;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
         #region ç™»éŒ²æ™‚æƒ…å ±
         /// <summary>
         /// ç™»éŒ²æ™‚ã‚³ãƒ¡ãƒ³ãƒˆç•ªå�·
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs	(revision 307)
@@ -722,7 +722,7 @@
                 SetConstructionTime();
 
                 // æ‹…å½“è€…å�–å¾—
-                int Person = m_ConstructionBaseInfo.ConstructionPersonCode;
+                int Person = m_PersonCode;
                 strSQL = PersonDB.CreatePrimarykeyString(Person);
                 PersonInChargeMaster PersonRec = new PersonInChargeMaster();
                 PersonDB.SelectAction(strSQL, ref PersonRec);
@@ -864,22 +864,24 @@
                 dgv.Rows.Clear();
 
                 // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = "SELECT A.JOBCATEGORYCODE";
-                strSQL += ", B.JOBCATEGORYNAME";
-                strSQL += ", A.COMPANYCODE";
-                strSQL += ", C.COMPANYNAME";
-                strSQL += ", A.TODAYHEADCOUNT";
-                strSQL += ", A.TOTALHEADCOUNT";
-                strSQL += ", A.TODAYWORK";
-                strSQL += ", A.NEXTDAYWORK";
-                strSQL += ", A.NEXTDAYHEADCOUNT";
-                strSQL += " FROM DAILYDATADETAIL A";
-                strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE";
-                strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE";
-                strSQL += DetailDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0);
-                strSQL += " ORDER BY A.SEQNO";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.JOBCATEGORYCODE");
+                strSQL.Append(", B.JOBCATEGORYNAME");
+                strSQL.Append(", A.COMPANYCODE");
+                strSQL.Append(", C.COMPANYNAME");
+                strSQL.Append(", A.TODAYHEADCOUNT");
+                strSQL.Append(", A.TOTALHEADCOUNT");
+                strSQL.Append(", A.TODAYWORK");
+                strSQL.Append(", A.NEXTDAYWORK");
+                strSQL.Append(", A.NEXTDAYHEADCOUNT");
+                strSQL.Append(" FROM DAILYDATADETAIL A");
+                strSQL.Append(" LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE");
+                strSQL.Append(" LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE");
+                strSQL.Append(DetailDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0));
+                strSQL.Append(" ORDER BY A.SEQNO");
                 ArrayList arList = new ArrayList();
-                if (!DetailDB.ExecuteReader(strSQL, ref arList) || arList.Count == 0)
+                if (!DetailDB.ExecuteReader(strSQL.ToString(), ref arList) || arList.Count == 0)
                 {
                     if (!MaxDateCheck(ref arList))
                     {
@@ -976,21 +978,23 @@
                 if (MaxDate > dTPCreateDate.Value) return false;
 
                 // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = "SELECT A.JOBCATEGORYCODE";
-                strSQL += ", B.JOBCATEGORYNAME";
-                strSQL += ", A.COMPANYCODE";
-                strSQL += ", C.COMPANYNAME";
-                strSQL += ", A.NEXTDAYHEADCOUNT";
-                strSQL += ", (A.TOTALHEADCOUNT + A.NEXTDAYHEADCOUNT)";
-                strSQL += ", A.NEXTDAYWORK";
-                strSQL += ", A.NEXTDAYWORK";
-                strSQL += ", 0";
-                strSQL += " FROM DAILYDATADETAIL A";
-                strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE";
-                strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE";
-                strSQL += DetailDB.CreatePrimarykeyString(m_PersonCode, MaxDate, m_ConstructionCode, 0);
-                strSQL += " ORDER BY A.SEQNO";
-                if (!DetailDB.ExecuteReader(strSQL, ref DispList) || DispList.Count == 0) return false;
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.JOBCATEGORYCODE");
+                strSQL.Append(", B.JOBCATEGORYNAME");
+                strSQL.Append(", A.COMPANYCODE");
+                strSQL.Append(", C.COMPANYNAME");
+                strSQL.Append(", A.NEXTDAYHEADCOUNT");
+                strSQL.Append(", (A.TOTALHEADCOUNT + A.NEXTDAYHEADCOUNT)");
+                strSQL.Append(", A.NEXTDAYWORK");
+                strSQL.Append(", A.NEXTDAYWORK");
+                strSQL.Append(", 0");
+                strSQL.Append(" FROM DAILYDATADETAIL A");
+                strSQL.Append(" LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE");
+                strSQL.Append(" LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE");
+                strSQL.Append(DetailDB.CreatePrimarykeyString(m_PersonCode, MaxDate, m_ConstructionCode, 0));
+                strSQL.Append(" ORDER BY A.SEQNO");
+                if (!DetailDB.ExecuteReader(strSQL.ToString(), ref DispList) || DispList.Count == 0) return false;
 
                 return true;
             }
@@ -1051,10 +1055,11 @@
                 dgv.Rows.Clear();
 
                 // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = VehiclesDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0);
-                strSQL += " ORDER BY SEQNO";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(VehiclesDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0));
+                strSQL.Append(" ORDER BY SEQNO");
                 List<DailyDataVehicles> VehiclesList = new List<DailyDataVehicles>();
-                if (!VehiclesDB.SelectAction(strSQL, ref VehiclesList) || VehiclesList.Count == 0)
+                if (!VehiclesDB.SelectAction(strSQL.ToString(), ref VehiclesList) || VehiclesList.Count == 0)
                 {
                     // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯ç©ºè¡Œã‚’è¡¨ç¤ºã�™ã‚‹
                     dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Vehicles]);
@@ -1141,10 +1146,11 @@
                 dgv.Rows.Clear();
 
                 // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = MaterialsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0);
-                strSQL += " ORDER BY SEQNO";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(MaterialsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0));
+                strSQL.Append(" ORDER BY SEQNO");
                 List<DailyDataMaterials> MaterialsList = new List<DailyDataMaterials>();
-                if (!MaterialsDB.SelectAction(strSQL, ref MaterialsList) || MaterialsList.Count == 0)
+                if (!MaterialsDB.SelectAction(strSQL.ToString(), ref MaterialsList) || MaterialsList.Count == 0)
                 {
                     // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯ç©ºè¡Œã‚’è¡¨ç¤ºã�™ã‚‹
                     dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Materials]);
@@ -1200,10 +1206,11 @@
                 dgv.Rows.Clear();
 
                 // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = SubcontractorsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0);
-                strSQL += " ORDER BY SEQNO";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(SubcontractorsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0));
+                strSQL.Append(" ORDER BY SEQNO");
                 List<DailyDataSubcontractors> SubcontractorsList = new List<DailyDataSubcontractors>();
-                if (!SubcontractorsDB.SelectAction(strSQL, ref SubcontractorsList) || SubcontractorsList.Count == 0)
+                if (!SubcontractorsDB.SelectAction(strSQL.ToString(), ref SubcontractorsList) || SubcontractorsList.Count == 0)
                 {
                     // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯ç©ºè¡Œã‚’è¡¨ç¤ºã�™ã‚‹
                     dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Subcontractors]);
@@ -1254,10 +1261,11 @@
                 dgv.Rows.Clear();
 
                 // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = FieldDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0);
-                strSQL += " ORDER BY SEQNO";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(FieldDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0));
+                strSQL.Append(" ORDER BY SEQNO");
                 List<DailyDataField> SubcontractorsList = new List<DailyDataField>();
-                FieldDB.SelectAction(strSQL, ref SubcontractorsList);
+                FieldDB.SelectAction(strSQL.ToString(), ref SubcontractorsList);
 
                 dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Field]);
 
@@ -2812,33 +2820,34 @@
             IODailyDataConstruction DailyDB = new IODailyDataConstruction();
             try
             {
-                string strSQL = string.Empty;
-
+                StringBuilder strSQL = new StringBuilder();
                 switch (ReadPoint)
                 {
                     case (int)ReadData.First:
-                        strSQL = "SELECT MIN(DAILYDATADATE) FROM DAILYDATACONSTRUCTION";
-                        strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                    case (int)ReadData.Next:
+                        strSQL.Append("SELECT MIN(DAILYDATADATE) FROM DAILYDATACONSTRUCTION");
                         break;
                     case (int)ReadData.Previous:
-                        strSQL = "SELECT MAX(DAILYDATADATE) FROM DAILYDATACONSTRUCTION";
-                        strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                        //strSQL += string.Format(" AND TRUNC(DAILYDATADATE) < TO_DATE('{0}','YYYY/MM/DD')", dTPCreateDate.Value.ToShortDateString());
-                        strSQL += string.Format(" AND DATE(DAILYDATADATE) < STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString());
+                    case (int)ReadData.Final:
+                        strSQL.Append("SELECT MAX(DAILYDATADATE) FROM DAILYDATACONSTRUCTION");
                         break;
+                }
+
+                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL.AppendFormat(" And PersonCode = {0}", m_PersonCode);
+
+                switch (ReadPoint)
+                {
+                    case (int)ReadData.Previous:
+                        strSQL.AppendFormat(" AND DATE(DAILYDATADATE) < STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString());
+                        break;
                     case (int)ReadData.Next:
-                        strSQL = "SELECT MIN(DAILYDATADATE) FROM DAILYDATACONSTRUCTION";
-                        strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                        //strSQL += string.Format(" AND TRUNC(DAILYDATADATE) > TO_DATE('{0}','YYYY/MM/DD')", dTPCreateDate.Value.ToShortDateString());
-                        strSQL += string.Format(" AND DATE(DAILYDATADATE) > STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString());
+                        strSQL.AppendFormat(" AND DATE(DAILYDATADATE) > STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString());
                         break;
-                    case (int)ReadData.Final:
-                        strSQL = "SELECT MAX(DAILYDATADATE) FROM DAILYDATACONSTRUCTION";
-                        strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                        break;
                 }
+
                 ArrayList arList = new ArrayList();
-                if (DailyDB.ExecuteReader(strSQL, ref arList))
+                if (DailyDB.ExecuteReader(strSQL.ToString(), ref arList))
                 {
                     object[] objRec = (object[])arList[0];
                     dtRet = CommonMotions.cnvDate(objRec[0]);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 307)
@@ -1332,9 +1332,6 @@
                 m_BeforeColumnCount = e.ColumnIndex;
                 m_BeforeRowCount = e.RowIndex;
 
-                // ’PˆÊ‚ªŽ®‚ÌŽž‚Í’P‰¿‚ðƒ�ƒbƒN‚·‚é
-                LockUnitValue(dgv.CurrentRow);
-
             }
             catch (Exception ex)
             {
@@ -1418,12 +1415,15 @@
                         LineReNumbering(m_EntryPage[iTabCnt].EntryDGV);
                 }
 
+                // ’PˆÊ‚ªŽ®‚ÌŽž‚Í’P‰¿‚ðƒ�ƒbƒN‚·‚é
+                LockUnitValue(m_EntryPage[iTabCnt].EntryDGV);
+
                 // ’†�€–Úƒ^ƒuˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
                 if (m_EntryPage[iTabCnt].Cotegory != CommonDefine.TabCotegory.Item) return;
 
                 if (CommonMotions.chkCellBlank(wrkRow.Cells[(int)GridItemColumn.MasterIn])) return;
 
-                // –¼�Ì�^•iŽ¿�EŒ`�ó�E�¡–@‚É•¶Žš‚ª‚ ‚ê‚ÎReadOnly‚ðfalse‚É‚·‚é
+                // –¼�Ì�^•iŽ¿�EŒ`�ó�E�¡–@‚É•¶Žš‚ª‚ ‚ê‚Îƒ}ƒXƒ^“o˜^ƒ`ƒFƒbƒN‚ÌReadOnly‚ðfalse‚É‚·‚é
                 if (ChkGridLineEffectiveness(wrkRow))
                     wrkRow.Cells[(int)GridItemColumn.MasterIn].ReadOnly = false;
                 else
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 307)
@@ -5977,10 +5977,14 @@
         /// å�˜ä½�ã�Œã€�å¼�ã€‘ã�®å ´å�ˆã�¯å�˜ä¾¡ã‚’ã‚¯ãƒªã‚¢ãƒ­ãƒƒã‚¯ã�™ã‚‹
         /// </summary>
         /// <param name="CurRow"></param>
-        private void LockUnitValue(DataGridViewRow CurRow)
+        private void LockUnitValue(DataGridView dgv)
         {
             try
             {
+                // å�˜ä½�ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (dgv.CurrentCell.ColumnIndex != (int)GridItemColumn.UnitName) return;
+
+                DataGridViewRow CurRow = dgv.CurrentRow;
                 if (CurRow == null) return;
 
                 string strValue = CommonMotions.cnvString(CurRow.Cells[(int)GridItemColumn.UnitName].Value).Trim();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs	(revision 307)
@@ -290,14 +290,9 @@
                 else if (m_PrintresRet == DialogResult.No)
                 {
                     // +++++++++++++++++++++++++ ä¿�å­˜ +++++++++++++++++++++++++
-                    string FilePath = @m_SelectSaveExcel;
-                    //// ç®¡ç�†ãƒ•ã‚¡ã‚¤ãƒ«ã�«ã�‚ã‚‹ã�‹ï¼Ÿ
-                    //if (FilePath.Length == 0)
-                    //{
-                    //    FilePath = CommonMotions.DFRModel.ExcelExecuteAction.SavePath.ToString();
-                    //}
+                    string strFilePath = @m_SelectSaveExcel;
                     // ã‚¨ã‚¯ã‚»ãƒ«ä¿�å­˜
-                    if (CommonMotions.ChkDirPath(FilePath, true))
+                    if (CommonMotions.ChkDirPath(strFilePath, true))
                     {
                         string wrkFile = "1.";
                         foreach (string ww in strParaList)
@@ -310,10 +305,10 @@
                             wrkFile = wrkFile.Replace(m_UsedExcel.ExcelBadCharcter[ix], "");
                         }
                         // ãƒ•ã‚¡ã‚¤ãƒ«å��ä½œæˆ�
-                        FilePath += @"\" + @wrkFile + @s_ExcelBookName;
+                        strFilePath += @"\" + @wrkFile + @s_ExcelBookName;
 
                         m_UsedExcel.SaveSwitch = true;
-                        m_UsedExcel.ExcelSaveBook(FilePath);
+                        m_UsedExcel.ExcelSaveBook(strFilePath);
                     }
                 }
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 307)
@@ -661,6 +661,12 @@
 
         #region ƒZƒ‹‚Ì“ü—Í‘O�ˆ—�
         /// <summary>
+        /// “ü—Í‘O’l
+        /// </summary>
+        object m_BeforeValue = null;
+        int m_CheckCol = -1;
+        int m_CheckRow = -1;
+        /// <summary>
         /// ƒZƒ‹‚Ì“ü—Í‘O�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
@@ -690,6 +696,11 @@
                 }
                 // ƒZƒ‹“à—e‘I‘ð
                 dgv.BeginEdit(true);
+
+                // ƒZƒ‹’lŽæ“¾
+                m_BeforeValue = dgv.CurrentCell.Value;
+                m_CheckCol = e.ColumnIndex;
+                m_CheckRow = e.RowIndex;
             }
             catch (System.Exception ex)
             {
@@ -698,6 +709,76 @@
         }
         #endregion
 
+        #region ƒOƒŠƒbƒhƒZƒ‹’l•Ï‰»
+        /// <summary>
+        /// ƒOƒŠƒbƒhƒZƒ‹’l•Ï‰»
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+        {
+            DataGridView dgv = (DataGridView)sender;
+            DataGridViewRow CurRow = dgv.CurrentRow;
+
+            // ˆê’UƒZƒ‹‚Ì’l•Ï�XƒCƒxƒ“ƒg‚ð–³Œø‚É‚·‚é
+            dgv.CellValueChanged -= DataGridView_CellValueChanged;
+            try
+            {
+                if (CurRow == null) return;
+
+                // ƒZƒ‹’l‚Ìƒ`ƒFƒbƒN
+                switch (e.ColumnIndex)
+                {
+                    case (int)DispColumn.KyoryokuKinRitu:
+                        break;
+                    default:
+                        if (m_CheckCol == e.ColumnIndex && m_CheckRow == e.RowIndex)
+                        {
+                            int CurVal = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value);
+                            if (CommonMotions.cnvInt(m_BeforeValue) == CurVal) return;
+                        }
+                        break;
+                }
+
+                // •Ï�Xƒtƒ‰ƒO
+                CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
+
+                if (dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.�¬Œv)
+                                                        .ToArray()
+                                                        .Count() == 0) return;
+
+                // ‹¦—Í‹à—L–³ƒJƒ‰ƒ€ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (e.ColumnIndex != (int)DispColumn.KyoryokuUmu) return;
+
+                //—ñ‚ÌƒCƒ“ƒfƒbƒNƒX‚ðŠm”F‚·‚é
+                int Code_Column = 0;
+                if (dgvCompany.Visible == true)
+                {
+                    Code_Column = (int)DispColumn_Company.SubConstractorCode;
+                }
+                else
+                {
+                    Code_Column = (int)DispColumn_Project.GengaCode;
+                }
+
+                // ‹¦—Í‹à�Ý’è
+                SetKyoryokukin(dgv, e.RowIndex, Code_Column);
+
+                // �‡Œv�s
+                setGoukei(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value));
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                // ƒZƒ‹‚Ì’l•Ï�XƒCƒxƒ“ƒg‚ð—LŒø‚É‚·‚é
+                dgv.CellValueChanged += DataGridView_CellValueChanged;
+            }
+        }
+        #endregion
+
         #region �~ƒ{ƒ^ƒ“
         /// <summary>
         /// �~ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
@@ -817,33 +898,6 @@
         }
         #endregion
 
-        #region •\Ž¦ƒ{ƒ^ƒ“‰Ÿ‰ºŽž
-        /// <summary>
-        /// •\Ž¦ƒ{ƒ^ƒ“‰Ÿ‰ºŽž
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnShowView_Click(object sender, EventArgs e)
-        {
-            if (m_bChengeAns == true)
-            {
-                if (MessageBox.Show("ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É‘Î�Û‚ð•Ï�X‚µ‚Ä‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "Šm”F"
-                    , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
-                {
-                    return;
-                }
-            }
-
-            showView();
-            SetColumnID();
-            controlButton();
-
-            // •\Ž¦
-            InitDataLoad();
-            DispGridData();
-        }
-        #endregion
-
         #region ƒ`ƒFƒbƒNƒ{ƒbƒNƒX‘I‘ð
         /// <summary>
         /// ƒ`ƒFƒbƒNƒ{ƒbƒNƒX‘I‘ð
@@ -854,7 +908,7 @@
         {
             if (m_initDataLoad) return;
 
-            btnShowView_Click(sender, e);
+            DispShowView();
         }
         #endregion
 
@@ -868,7 +922,7 @@
         {
             if (m_initDataLoad) return;
 
-            btnShowView_Click(sender, e);
+            DispShowView();
         }
         #endregion
 
@@ -939,62 +993,6 @@
         }
         #endregion
 
-        #region ƒOƒŠƒbƒhƒZƒ‹’l•Ï‰»
-        /// <summary>
-        /// ƒOƒŠƒbƒhƒZƒ‹’l•Ï‰»
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
-        {
-            DataGridView dgv = (DataGridView)sender;
-            DataGridViewRow CurRow = dgv.CurrentRow;
-
-            // ˆê’UƒZƒ‹‚Ì’l•Ï�XƒCƒxƒ“ƒg‚ð–³Œø‚É‚·‚é
-            dgv.CellValueChanged -= DataGridView_CellValueChanged;
-            try
-            {
-                if (CurRow == null) return;
-
-                // •Ï�Xƒtƒ‰ƒO
-                CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
-
-                if (dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.�¬Œv)
-                                                        .ToArray()
-                                                        .Count() == 0) return;
-
-                // ‹¦—Í‹à—L–³ƒJƒ‰ƒ€ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-                if (e.ColumnIndex != (int)DispColumn.KyoryokuUmu) return;
-
-                //—ñ‚ÌƒCƒ“ƒfƒbƒNƒX‚ðŠm”F‚·‚é
-                int Code_Column = 0;
-                if (dgvCompany.Visible == true)
-                {
-                    Code_Column = (int)DispColumn_Company.SubConstractorCode;
-                }
-                else
-                {
-                    Code_Column = (int)DispColumn_Project.GengaCode;
-                }
-
-                // ‹¦—Í‹à�Ý’è
-                SetKyoryokukin(dgv, e.RowIndex, Code_Column);
-
-                // �‡Œv�s
-                setGoukei(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value));
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                // ƒZƒ‹‚Ì’l•Ï�XƒCƒxƒ“ƒg‚ð—LŒø‚É‚·‚é
-                dgv.CellValueChanged += DataGridView_CellValueChanged;
-            }
-        }
-        #endregion
-
         #region ƒZƒ‹•Ï�XŒãƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¢�ê�‡ƒRƒ~ƒbƒg‚·‚é
         /// <summary>
         /// ƒZƒ‹•Ï�XŒãƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¢�ê�‡ƒRƒ~ƒbƒg‚·‚é
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs	(revision 307)
@@ -104,9 +104,8 @@
             this.button1 = new System.Windows.Forms.Button();
             this.btnOtherProc = new System.Windows.Forms.Button();
             this.DataProgressBar = new System.Windows.Forms.ProgressBar();
-            this.btnShowView = new System.Windows.Forms.Button();
+            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.btnDataUpDate = new System.Windows.Forms.Button();
-            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.pnlApproval = new System.Windows.Forms.Panel();
             this.lblApprovalCount = new System.Windows.Forms.Label();
             this.btnPetition = new System.Windows.Forms.Button();
@@ -569,33 +568,6 @@
             this.DataProgressBar.TabIndex = 96;
             this.DataProgressBar.Visible = false;
             // 
-            // btnShowView
-            // 
-            this.btnShowView.BackColor = System.Drawing.Color.Blue;
-            this.btnShowView.ForeColor = System.Drawing.Color.White;
-            this.btnShowView.Location = new System.Drawing.Point(206, 6);
-            this.btnShowView.Margin = new System.Windows.Forms.Padding(4);
-            this.btnShowView.Name = "btnShowView";
-            this.btnShowView.Size = new System.Drawing.Size(120, 30);
-            this.btnShowView.TabIndex = 8;
-            this.btnShowView.Text = "è¡¨ã€€ç¤º";
-            this.btnShowView.UseVisualStyleBackColor = false;
-            this.btnShowView.Visible = false;
-            this.btnShowView.Click += new System.EventHandler(this.btnShowView_Click);
-            // 
-            // btnDataUpDate
-            // 
-            this.btnDataUpDate.BackColor = System.Drawing.Color.Aquamarine;
-            this.btnDataUpDate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDataUpDate.ForeColor = System.Drawing.Color.Black;
-            this.btnDataUpDate.Location = new System.Drawing.Point(206, 5);
-            this.btnDataUpDate.Name = "btnDataUpDate";
-            this.btnDataUpDate.Size = new System.Drawing.Size(120, 30);
-            this.btnDataUpDate.TabIndex = 97;
-            this.btnDataUpDate.Text = "æœ€æ–°çŠ¶æ…‹ã�«æ›´æ–°";
-            this.btnDataUpDate.UseVisualStyleBackColor = false;
-            this.btnDataUpDate.Click += new System.EventHandler(this.btnDataUpDate_Click);
-            // 
             // groupBoxEx1
             // 
             this.groupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -603,6 +575,7 @@
             this.groupBoxEx1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.groupBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.groupBoxEx1.BorderColor = System.Drawing.Color.Gray;
+            this.groupBoxEx1.Controls.Add(this.btnDataUpDate);
             this.groupBoxEx1.Controls.Add(this.pnlApproval);
             this.groupBoxEx1.Controls.Add(this.pnlApprovalButton);
             this.groupBoxEx1.Controls.Add(this.label11);
@@ -624,6 +597,20 @@
             this.groupBoxEx1.TabIndex = 2;
             this.groupBoxEx1.TabStop = false;
             // 
+            // btnDataUpDate
+            // 
+            this.btnDataUpDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDataUpDate.BackColor = System.Drawing.Color.Aquamarine;
+            this.btnDataUpDate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDataUpDate.ForeColor = System.Drawing.Color.Black;
+            this.btnDataUpDate.Location = new System.Drawing.Point(1193, 37);
+            this.btnDataUpDate.Name = "btnDataUpDate";
+            this.btnDataUpDate.Size = new System.Drawing.Size(120, 30);
+            this.btnDataUpDate.TabIndex = 97;
+            this.btnDataUpDate.Text = "æœ€æ–°çŠ¶æ…‹ã�«æ›´æ–°";
+            this.btnDataUpDate.UseVisualStyleBackColor = false;
+            this.btnDataUpDate.Click += new System.EventHandler(this.btnDataUpDate_Click);
+            // 
             // pnlApproval
             // 
             this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1122,7 +1109,6 @@
             this.Column24.ReadOnly = true;
             this.Column24.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column24.Visible = false;
             // 
             // Column137
             // 
@@ -1147,7 +1133,6 @@
             this.Column26.Name = "Column26";
             this.Column26.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column26.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column26.Visible = false;
             // 
             // Column3
             // 
@@ -1363,7 +1348,6 @@
             // 
             this.Column155.HeaderText = "æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column155.Name = "Column155";
-            this.Column155.Visible = false;
             // 
             // Column37
             // 
@@ -1752,7 +1736,6 @@
             this.Column64.Name = "Column64";
             this.Column64.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column64.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column64.Visible = false;
             // 
             // Column139
             // 
@@ -1760,7 +1743,6 @@
             this.Column139.Name = "Column139";
             this.Column139.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column139.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column139.Visible = false;
             // 
             // Column140
             // 
@@ -1768,7 +1750,6 @@
             this.Column140.Name = "Column140";
             this.Column140.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column140.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column140.Visible = false;
             // 
             // Column145
             // 
@@ -1775,49 +1756,41 @@
             this.Column145.HeaderText = "å·¥äº‹æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column145.Name = "Column145";
             this.Column145.ReadOnly = true;
-            this.Column145.Visible = false;
             // 
             // Column147
             // 
             this.Column147.HeaderText = "å·¥äº‹æ‹…å½“è€…";
             this.Column147.Name = "Column147";
-            this.Column147.Visible = false;
             // 
             // Column149
             // 
             this.Column149.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.Column149.Name = "Column149";
-            this.Column149.Visible = false;
             // 
             // Column150
             // 
             this.Column150.HeaderText = "å‰¯æ‹…å½“è€…";
             this.Column150.Name = "Column150";
-            this.Column150.Visible = false;
             // 
             // Column151
             // 
             this.Column151.HeaderText = "æŒ‡å°Žå“¡";
             this.Column151.Name = "Column151";
-            this.Column151.Visible = false;
             // 
             // Column152
             // 
             this.Column152.HeaderText = "å–¶æ¥­éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column152.Name = "Column152";
-            this.Column152.Visible = false;
             // 
             // Column153
             // 
             this.Column153.HeaderText = "å‰¯æ‹…å½“éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column153.Name = "Column153";
-            this.Column153.Visible = false;
             // 
             // Column154
             // 
             this.Column154.HeaderText = "æŒ‡å°Žå“¡éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column154.Name = "Column154";
-            this.Column154.Visible = false;
             // 
             // dgvProject
             // 
@@ -2046,7 +2019,6 @@
             this.Project_Column4.Name = "Project_Column4";
             this.Project_Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Project_Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Project_Column4.Visible = false;
             // 
             // Project_Column5
             // 
@@ -2065,13 +2037,11 @@
             this.Project_Column6.Name = "Project_Column6";
             this.Project_Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Project_Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Project_Column6.Visible = false;
             // 
             // Column138
             // 
             this.Column138.HeaderText = "å�”åŠ›ä¼šç¤¾\r\nã‚³ãƒ¼ãƒ‰";
             this.Column138.Name = "Column138";
-            this.Column138.Visible = false;
             // 
             // Project_Column7
             // 
@@ -2287,7 +2257,6 @@
             // 
             this.Column156.HeaderText = "æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column156.Name = "Column156";
-            this.Column156.Visible = false;
             // 
             // Column52
             // 
@@ -2683,7 +2652,6 @@
             this.Column77.Name = "Column77";
             this.Column77.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column77.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column77.Visible = false;
             // 
             // Column141
             // 
@@ -2691,7 +2659,6 @@
             this.Column141.Name = "Column141";
             this.Column141.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column141.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column141.Visible = false;
             // 
             // Column142
             // 
@@ -2699,7 +2666,6 @@
             this.Column142.Name = "Column142";
             this.Column142.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column142.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column142.Visible = false;
             // 
             // Column146
             // 
@@ -2706,49 +2672,41 @@
             this.Column146.HeaderText = "æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column146.Name = "Column146";
             this.Column146.ReadOnly = true;
-            this.Column146.Visible = false;
             // 
             // Column148
             // 
             this.Column148.HeaderText = "å·¥äº‹æ‹…å½“è€…";
             this.Column148.Name = "Column148";
-            this.Column148.Visible = false;
             // 
             // dataGridViewTextBoxColumn2
             // 
             this.dataGridViewTextBoxColumn2.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Visible = false;
             // 
             // dataGridViewTextBoxColumn3
             // 
             this.dataGridViewTextBoxColumn3.HeaderText = "å‰¯æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.Visible = false;
             // 
             // dataGridViewTextBoxColumn4
             // 
             this.dataGridViewTextBoxColumn4.HeaderText = "æŒ‡å°Žå“¡";
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.Visible = false;
             // 
             // dataGridViewTextBoxColumn5
             // 
             this.dataGridViewTextBoxColumn5.HeaderText = "å–¶æ¥­éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.Visible = false;
             // 
             // dataGridViewTextBoxColumn6
             // 
             this.dataGridViewTextBoxColumn6.HeaderText = "å‰¯æ‹…å½“éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.Visible = false;
             // 
             // dataGridViewTextBoxColumn7
             // 
             this.dataGridViewTextBoxColumn7.HeaderText = "æŒ‡å°Žå“¡éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.Visible = false;
             // 
             // FrmRequestSummaryList
             // 
@@ -2756,10 +2714,8 @@
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1340, 697);
-            this.Controls.Add(this.btnDataUpDate);
             this.Controls.Add(this.btnOtherProc);
             this.Controls.Add(this.button1);
-            this.Controls.Add(this.btnShowView);
             this.Controls.Add(this.CombinedOrderLabel1);
             this.Controls.Add(this.CombinedOrderLabel2);
             this.Controls.Add(this.panel1);
@@ -2772,8 +2728,8 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.btnEnd);
             this.Controls.Add(this.DataProgressBar);
+            this.Controls.Add(this.dgvProject);
             this.Controls.Add(this.dgvCompany);
-            this.Controls.Add(this.dgvProject);
             this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
             this.KeyPreview = true;
@@ -2842,7 +2798,6 @@
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.ComboBox cmbPerson;
-        private System.Windows.Forms.Button btnShowView;
         private System.Windows.Forms.Button btnDataUpDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column135;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column133;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 307)
@@ -32,6 +32,34 @@
 {
     partial class FrmRequestSummaryList
     {
+
+        #region ƒf�[ƒ^�Ä•\Ž¦
+        /// <summary>
+        /// ƒf�[ƒ^�Ä•\Ž¦
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DispShowView()
+        {
+            if (m_bChengeAns == true)
+            {
+                if (MessageBox.Show("ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É‘Î�Û‚ð•Ï�X‚µ‚Ä‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "Šm”F"
+                    , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                {
+                    return;
+                }
+            }
+
+            showView();
+            SetColumnID();
+            controlButton();
+
+            // •\Ž¦
+            InitDataLoad();
+            DispGridData();
+        }
+        #endregion
+
         #region ƒpƒ‰ƒ��[ƒ^�‰ŠúƒZƒbƒg
         /// <summary>
         /// ƒpƒ‰ƒ��[ƒ^�‰ŠúƒZƒbƒg
@@ -674,8 +702,19 @@
             {
                 dgv.Columns[Column].Visible = false;
             }
-            for (int Column = (int)DispColumn.TantoShoninCode; Column < (int)DispColumn.Bikou; Column++)
+
+            int[] VisCol = new int[]{
+                    dgv.Equals(dgvCompany) ? (int)DispColumn_Company.SubConstractorCode : (int)DispColumn_Project.SubConstractorCode,
+                    dgv.Equals(dgvCompany) ? (int)DispColumn_Company.CompanyCode : (int)DispColumn_Project.CompanyCode,
+                    dgv.Equals(dgvCompany) ? (int)DispColumn_Company.GengaCode : (int)DispColumn_Project.GengaCode};
+
+            for (int i = 0; i < VisCol.Length; i++)
             {
+                dgv.Columns[VisCol[i]].Visible = false;
+            }
+
+            for (int Column = (int)DispColumn.TantoShoninCode; Column <= (int)DispColumn.InstrDepCode; Column++)
+            {
                 if (Column != (int)DispColumn.TantoShonin
                     && Column != (int)DispColumn.Shonin1
                     && Column != (int)DispColumn.Shonin2
@@ -686,7 +725,8 @@
                     && Column != (int)DispColumn.Shonin7
                     && Column != (int)DispColumn.Shonin8
                     && Column != (int)DispColumn.Shonin9
-                    && Column != (int)DispColumn.Shonin10)
+                    && Column != (int)DispColumn.Shonin10
+                    && Column != (int)DispColumn.Bikou)
                     dgv.Columns[Column].Visible = false;
             }
             int TargetCol = (int)DispColumn_Project.GengaName;
@@ -1876,17 +1916,17 @@
                             if (bFirst)
                             {
                                 r.Cells[(int)DispColumn.No].Value = iNo;
-                                r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
-                                r.Cells[m_GoukeiCode_Column + 2].Value = k.Key.GoukeiName;
-                                r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName;
+                                //r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
+                                //r.Cells[m_GoukeiCode_Column + 2].Value = k.Key.GoukeiName;
+                                //r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName;
                                 bFirst = false;
                                 continue;
                             }
 
                             r.Cells[(int)DispColumn.No].Value = "";
-                            r.Cells[m_GoukeiCode_Column + 1].Value = "";
-                            r.Cells[m_GoukeiCode_Column + 2].Value = "";
-                            r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName;
+                            //r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
+                            r.Cells[m_CompanyNM_Column].Value = "";
+                            //r.Cells[m_CompanyNM_Column].ToolTipText = k.Key.GoukeiName;
                         }
                         iNo++;
                     }
@@ -1941,15 +1981,15 @@
                             if (bFirst)
                             {
                                 r.Cells[(int)DispColumn.No].Value = iNo;
-                                r.Cells[m_GoukeiCode_Column + 1].Value = k.GoukeiName;
-                                r.Cells[m_GoukeiCode_Column + 1].ToolTipText = k.GoukeiName;
+                                //r.Cells[m_GoukeiCode_Column + 1].Value = k.GoukeiName;
+                                //r.Cells[m_GoukeiCode_Column + 1].ToolTipText = k.GoukeiName;
                                 bFirst = false;
                                 continue;
                             }
 
                             r.Cells[(int)DispColumn.No].Value = "";
-                            r.Cells[m_GoukeiCode_Column + 1].Value = "";
-                            r.Cells[m_GoukeiCode_Column + 1].ToolTipText = k.GoukeiName;
+                            r.Cells[m_GenbaNM_Column].Value = "";
+                            //r.Cells[m_GenbaNM_Column].ToolTipText = k.GoukeiName;
                         }
                         iNo++;
                     }
@@ -3578,6 +3618,7 @@
                     setGoukei_DataDisp(dgv, iGoukeiCd);
                 }
 
+                // ƒOƒ‹�[ƒsƒ“ƒO•\Ž¦
                 ResetNo();
 
                 // �Å‘å�³”F�”ˆÈ�~‚Ì�³”F—ñ‚Í”ñ•\Ž¦
@@ -3939,6 +3980,7 @@
                 int nCompanyCode = CommonMotions.cnvInt(work[(int)ClickGetData.COMPANYCODE]);
                 string strCompanyName = CommonMotions.cnvString(work[(int)ClickGetData.COMPANYNAME]);
                 dgv.Rows[icnt].Cells[m_Company_Column].Value = nCompanyCode;
+                dgv.Rows[icnt].Cells[m_Company_DispColumn].Value = nCompanyCode;
                 dgv.Rows[icnt].Cells[m_CompanyNM_Column].Value = nCompanyCode > 0 ? strCompanyName : s_UnknownString;
                 dgv.Rows[icnt].Cells[m_CompanyNM_Column].ToolTipText = nCompanyCode > 0 ? strCompanyName : s_UnknownString;
 
@@ -4453,7 +4495,6 @@
                 sql.Append("       on Bd.CompanyCode = Bdd.CompanyCode ");
                 sql.Append("       and Bd.TargetDate = Bdd.TargetDate ");
                 sql.Append("       and Bd.SeqNo = Bdd.SeqNo ");
-                sql.AppendFormat(" and Bd.TargetDate = {0} ", m_Select_TargetDate);
 
                 sql.Append("  left join (PurchaseOrderDate as Pod )");
                 sql.Append("       on Bd.CompanyCode = Pod.CompanyCode ");
@@ -4484,11 +4525,12 @@
                 sql.Append("        And PayApp.SEQNO = Pdd.SEQNO");
                 sql.Append("        And PayApp.LINECOUNT = Pdd.LINECOUNT");
                 sql.Append("        And PayApp.APPROVALPERSON = AppM.ApprovalPerson");
-
                 sql.Append("         , SubContractorMaster as Scm ");
-                sql.Append("              where Bdd.CompanyCode = Scm.CompanyCode ");
-                sql.AppendFormat("        and Scm.LabourKind = {0} ", m_Labourkind);
 
+                sql.AppendFormat(" Where Bd.TargetDate = {0} ", m_Select_TargetDate);
+                sql.Append(" And Bdd.CompanyCode = Scm.CompanyCode ");
+                sql.AppendFormat(" And Scm.LabourKind = {0} ", m_Labourkind);
+
             }
             catch (Exception ex)
             {
@@ -5004,6 +5046,7 @@
                     int NowSeqNo = 0;
                     foreach (DataGridViewRow r in Rows)
                     {
+                        // ‰ïŽÐƒR�[ƒh�E˜A”ÔŽæ“¾
                         NowCompanyCode = CommonMotions.cnvInt(r.Cells[m_Company_Column].Value);
                         NowSeqNo = CommonMotions.cnvInt(r.Cells[(int)DispColumn.GroupSeqNo].Value);
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs	(revision 307)
@@ -33,6 +33,28 @@
         #endregion
 
         #region å®šæ•°
+
+        #region è¡¨ç¤ºãƒ­ãƒƒã‚¯ãƒ•ãƒ©ã‚°
+        /// <summary>
+        /// è¡¨ç¤ºãƒ­ãƒƒã‚¯ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public enum LockFlagDef
+        {
+            /// <summary>
+            /// ãƒ­ãƒƒã‚¯ç„¡
+            /// </summary>
+            UnLocked = 0,
+            /// <summary>
+            /// ãƒ­ãƒƒã‚¯
+            /// </summary>
+            Locked
+        }
+        #endregion
+
+        #region ç·¨é›†ãƒ•ãƒ©ã‚°å®šç¾©
+        /// <summary>
+        /// ç·¨é›†ãƒ•ãƒ©ã‚°å®šç¾©
+        /// </summary>
         public enum EditFlagDef
         {
             /// <summary>
@@ -46,6 +68,8 @@
         }
         #endregion
 
+        #endregion
+
         #region å¤‰æ•°
         /// <summary>
         /// ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰å€¤å¤‰åŒ–ãƒ•ãƒ©ã‚°
@@ -53,6 +77,11 @@
         private bool m_bChengeAns = false;
 
         /// <summary>
+        /// è¡¨ç¤ºãƒ­ãƒƒã‚¯ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private int m_LockFlag = 0;
+        
+        /// <summary>
         /// ç·¨é›†ãƒ•ãƒ©ã‚°
         /// </summary>
         private int m_EditFlag = -1;
@@ -70,6 +99,18 @@
         #endregion
 
         #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+
+        #region è¡¨ç¤ºãƒ­ãƒƒã‚¯ãƒ•ãƒ©ã‚°
+        /// <summary>
+        /// è¡¨ç¤ºãƒ­ãƒƒã‚¯ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public int LockFlag 
+        {
+            get { return m_LockFlag; }
+            set { m_LockFlag = value; }
+        }
+        #endregion
+
         #region ç·¨é›†ãƒ•ãƒ©ã‚°
         /// <summary>
         /// ç·¨é›†ãƒ•ãƒ©ã‚°
@@ -132,12 +173,26 @@
         /// <param name="e"></param>
         private void FrmCommentWriter_Load(object sender, EventArgs e)
         {
+            // æ–°è¦�æ™‚ã�¯ç©ºç™½ãƒ»ç·¨é›†æ™‚ã�¯ã‚³ãƒ¡ãƒ³ãƒˆæ–‡å­—è¡¨ç¤º
             if (m_EditFlag == (int)EditFlagDef.NewData)
+            {
                 this.txtMessage.Text = string.Empty;
+            }
             else if (m_EditFlag == (int)EditFlagDef.EditData)
+            {
                 this.txtMessage.Text = m_CommentString;
+            }
 
-            this.txtMessage.Focus();
+            // ãƒ­ãƒƒã‚¯æ™‚ã�¯è¡¨ç¤ºã�®ã�¿ãƒ»ç·¨é›†æ™‚ã�¯ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚»ãƒƒãƒˆ
+            if (m_LockFlag == (int)LockFlagDef.Locked)
+            {
+                DisplayReadOnly();
+                txtMessage.Select(0, 0);
+            }
+            else
+            {
+                this.txtMessage.Focus();
+            }
         }
         #endregion
 
@@ -292,5 +347,24 @@
             }
         }
         #endregion
+
+        #region ç”»é�¢è¡¨ç¤ºãƒ­ãƒƒã‚¯
+        /// <summary>
+        /// ç”»é�¢è¡¨ç¤ºãƒ­ãƒƒã‚¯
+        /// </summary>
+        private void DisplayReadOnly()
+        {
+            try
+            {
+                txtMessage.ReadOnly = true;
+                btnRemText.Visible = false;
+                btnDataEntry.Visible = false;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNumberOfWorkers.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNumberOfWorkers.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNumberOfWorkers.cs	(revision 307)
@@ -279,19 +279,15 @@
             try
             {
                 // å¹´æœˆã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
-                string strSQL = "SELECT";
-                //strSQL += " TO_CHAR(A.DAILYDATADATE, 'YYYY/MM')";
-                strSQL += " DATE_FORMAT(A.DAILYDATADATE, '%Y/%m')";
-                strSQL += " FROM DAILYDATADETAIL A";
-                strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE";
-                strSQL += " LEFT JOIN  SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE";
-                strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
-                strSQL += string.Format(" AND ConstructionCode = {0}", m_ConstructionCode);
-                //strSQL += " group By TO_CHAR(A.DAILYDATADATE, 'YYYY/MM')";
-                strSQL += " group By DATE_FORMAT(A.DAILYDATADATE, '%Y/%m')";
-                strSQL += " ORDER BY 1";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.Append(" DATE_FORMAT(A.DAILYDATADATE, '%Y/%m') As ExecDate");
+                strSQL.Append(" FROM DAILYDATADETAIL A");
+                strSQL.AppendFormat(" WHERE A.ConstructionCode = {0}", m_ConstructionCode);
+                strSQL.Append(" Group By ExecDate");
+                strSQL.Append(" ORDER BY ExecDate");
                 ArrayList arList = new ArrayList();
-                DailyDB.ExecuteReader(strSQL, ref arList);
+                DailyDB.ExecuteReader(strSQL.ToString(), ref arList);
                 if (arList.Count == 0) return;
 
                 int ColumnCount = arList.Count;
@@ -310,25 +306,6 @@
 
                     // ã‚«ãƒ©ãƒ ä½œæˆ�
                     CreateColumn(i, strTitle);
-                    //// ã‚¹ã‚¿ã‚¤ãƒ«ä½œæˆ�
-                    //m_GridCellStyleList[i] = new DataGridViewCellStyle();
-                    //m_GridCellStyleList[i].Alignment = DataGridViewContentAlignment.MiddleRight;
-
-                    //// ã‚»ãƒ«ä½œæˆ�
-                    //m_GridColList[i] = new DataGridViewColumn();
-                    //m_GridColList[i].CellTemplate = new DataGridViewTextBoxCell();
-                    //dgv.Columns.Add(m_GridColList[i]);
-
-                    //// ã‚«ãƒ©ãƒ ã�®è¨­å®š
-                    //m_GridColList[i].CellTemplate = new DataGridViewTextBoxCell();
-                    //m_GridColList[i].DefaultCellStyle = m_GridCellStyleList[i];
-                    //m_GridColList[i].HeaderText = CommonMotions.cnvString(wrkobj[0]);
-
-                    //m_GridColList[i].Name = string.Format("GridColumns{0}", i);
-                    //m_GridColList[i].ReadOnly = false;
-                    //m_GridColList[i].Resizable = DataGridViewTriState.False;
-                    //m_GridColList[i].SortMode = DataGridViewColumnSortMode.NotSortable;
-                    //m_GridColList[i].Width = 80;
                 }
 
             }
@@ -410,21 +387,35 @@
                 int icnt = 1;
                 // ãƒ‡ãƒ¼ã‚¿ã‚’è¡¨ç¤ºã�™ã‚‹
                 dgvMain.Rows.Clear();
-                string strSQL = "SELECT";
-                strSQL += " A.JOBCATEGORYCODE, B.JOBCATEGORYNAME, A.COMPANYCODE,";
-                //strSQL += " C.COMPANYNAME, TO_CHAR(A.DAILYDATADATE, 'YYYY/MM'), SUM(A.TODAYHEADCOUNT)";
-                strSQL += " C.COMPANYNAME, DATE_FORMAT(A.DAILYDATADATE, '%Y/%m'), SUM(A.TODAYHEADCOUNT)";
-                strSQL += " FROM DAILYDATADETAIL A";
-                strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE";
-                strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE";
-                strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
-                strSQL += string.Format(" AND ConstructionCode = {0}", m_ConstructionCode);
-                //strSQL += " GROUP BY A.JOBCATEGORYCODE, B.JOBCATEGORYNAME, A.COMPANYCODE, C.COMPANYNAME, TO_CHAR(A.DAILYDATADATE, 'YYYY/MM')";
-                strSQL += " GROUP BY A.JOBCATEGORYCODE, B.JOBCATEGORYNAME, A.COMPANYCODE, C.COMPANYNAME, DATE_FORMAT(A.DAILYDATADATE, '%Y/%m')";
-                strSQL += " ORDER BY 3, 1, 4";
+                StringBuilder strSQL = new StringBuilder();
 
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.JOBCATEGORYCODE");
+                strSQL.Append(", B.JOBCATEGORYNAME");
+                strSQL.Append(", A.COMPANYCODE");
+                strSQL.Append(", C.COMPANYNAME");
+                strSQL.Append(", DATE_FORMAT(A.DAILYDATADATE, '%Y/%m') As ExecDate");
+                strSQL.Append(", SUM(A.TODAYHEADCOUNT) As ExecCnt");
+                strSQL.Append(" FROM");
+                strSQL.Append(" DAILYDATADETAIL A");
+                strSQL.Append(" LEFT JOIN SUBCONTRACTORJOBCATEGORY B");
+                strSQL.Append(" ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE");
+                strSQL.Append(" LEFT JOIN SUBCONTRACTORMASTER C");
+                strSQL.Append(" ON A.COMPANYCODE = C.COMPANYCODE");
+                strSQL.AppendFormat(" WHERE A.ConstructionCode = {0}", m_ConstructionCode);
+                strSQL.Append(" GROUP BY");
+                strSQL.Append(" A.JOBCATEGORYCODE");
+                strSQL.Append(", B.JOBCATEGORYNAME");
+                strSQL.Append(", A.COMPANYCODE");
+                strSQL.Append(", C.COMPANYNAME");
+                strSQL.Append(", DATE_FORMAT(A.DAILYDATADATE, '%Y/%m')");
+                strSQL.Append(" ORDER BY");
+                strSQL.Append(" A.COMPANYCODE");
+                strSQL.Append(", A.JOBCATEGORYCODE");
+                strSQL.Append(", ExecDate");
+
                 ArrayList arList = new ArrayList();
-                DailyDB.ExecuteReader(strSQL, ref arList);
+                DailyDB.ExecuteReader(strSQL.ToString(), ref arList);
                 if (arList.Count == 0) return;
 
                 DataGridView dgv = dgvMain;
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 306)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 307)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.22")]
-[assembly: AssemblyFileVersion("1.0.1.22")]
+[assembly: AssemblyVersion("1.0.1.24")]
+[assembly: AssemblyFileVersion("1.0.1.24")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
