Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 308)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 124;
+        public static int s_SystemVersion = 125;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs	(revision 308)
@@ -17,95 +17,95 @@
         public enum DataNoDef
         {
             /// <summary>
-            /// ç™ºæ³¨è€…å��ï¼‘
+            ///  1:ç™ºæ³¨è€…å��ï¼‘
             /// </summary>
             OrderersName = 1,
             /// <summary>
-            /// å·¥äº‹å��ç§°
+            ///  2:å·¥äº‹å��ç§°
             /// </summary>
             ConstructionName,
             /// <summary>
-            /// å·¥äº‹å ´æ‰€éƒµä¾¿ç•ªå�·
+            ///  3:å·¥äº‹å ´æ‰€éƒµä¾¿ç•ªå�·
             /// </summary>
             PlaceZipCode,
             /// <summary>
-            /// å·¥äº‹å ´æ‰€ï¼‘
+            ///  4:å·¥äº‹å ´æ‰€ï¼‘
             /// </summary>
             ConstructionPlace1,
             /// <summary>
-            /// å·¥äº‹å ´æ‰€ï¼’
+            ///  5:å·¥äº‹å ´æ‰€ï¼’
             /// </summary>
             ConstructionPlace2,
             /// <summary>
-            /// å·¥äº‹å ´æ‰€ï¼“
+            ///  6:å·¥äº‹å ´æ‰€ï¼“
             /// </summary>
             ConstructionPlace3,
             /// <summary>
-            /// å·¥äº‹æ¦‚è¦�ï¼‘
+            ///  7:å·¥äº‹æ¦‚è¦�ï¼‘
             /// </summary>
             Overview1,
             /// <summary>
-            /// å·¥äº‹æ¦‚è¦�ï¼’
+            ///  8:å·¥äº‹æ¦‚è¦�ï¼’
             /// </summary>
             Overview2,
             /// <summary>
-            /// å·¥äº‹æ¦‚è¦�ï¼“
+            ///  9:å·¥äº‹æ¦‚è¦�ï¼“
             /// </summary>
             Overview3,
             /// <summary>
-            /// å·¥äº‹æ¦‚è¦�ï¼”
+            /// 10å·¥äº‹æ¦‚è¦�ï¼”
             /// </summary>
             Overview4,
             /// <summary>
-            /// å·¥äº‹æ¦‚è¦�ï¼•
+            /// 11:å·¥äº‹æ¦‚è¦�ï¼•
             /// </summary>
             Overview5,
             /// <summary>
-            /// æ”¯çµ¦å“�ï¼‘
+            /// 12:æ”¯çµ¦å“�ï¼‘
             /// </summary>
             PaidGoods1,
             /// <summary>
-            /// æ”¯çµ¦å“�ï¼’
+            /// 13:æ”¯çµ¦å“�ï¼’
             /// </summary>
             PaidGoods2,
             /// <summary>
-            /// åˆ¥é€”å·¥äº‹ï¼‘
+            /// 14:åˆ¥é€”å·¥äº‹ï¼‘
             /// </summary>
             SeparateProject1,
             /// <summary>
-            /// åˆ¥é€”å·¥äº‹ï¼’
+            /// 15:åˆ¥é€”å·¥äº‹ï¼’
             /// </summary>
             SeparateProject2,
             /// <summary>
-            /// å‚™è€ƒï¼‘
+            /// 16:å‚™è€ƒï¼‘
             /// </summary>
             Note1,
             /// <summary>
-            /// å‚™è€ƒï¼’
+            /// 17:å‚™è€ƒï¼’
             /// </summary>
             Note2,
             /// <summary>
-            /// å�—æ³¨æ±ºå®šç”³é€�ã‚Šã‚³ãƒ¡ãƒ³ãƒˆ
+            /// 18:å�—æ³¨æ±ºå®šç”³é€�ã‚Šã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             OrdersDecisionComment,
             /// <summary>
-            /// å·¥äº‹æ‹…å½“è€…ã‚³ãƒ¡ãƒ³ãƒˆ
+            /// 19:å·¥äº‹æ‹…å½“è€…ã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             ContructorComment,
             /// <summary>
-            /// æ–½å·¥å®Œäº†ã‚³ãƒ¡ãƒ³ãƒˆ
+            /// 20:æ–½å·¥å®Œäº†ã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             CompleteComment,
             /// <summary>
-            /// å–¶æ¥­ã‚³ãƒ¡ãƒ³ãƒˆ
+            /// 21:å–¶æ¥­ã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             SalesComment,
             /// <summary>
-            /// è«‹æ±‚ã‚³ãƒ¡ãƒ³ãƒˆ
+            /// 22:è«‹æ±‚ã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             BillingComment,
             /// <summary>
-            /// å…¥é‡‘ã‚³ãƒ¡ãƒ³ãƒˆ
+            /// 23:å…¥é‡‘ã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             PaymentComment,
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 308)
@@ -284,14 +284,6 @@
         {
             if (m_bInitFlg) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 308)
@@ -314,16 +314,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SubControlEvent((int)EventDef.Department | (int)EventDef.Person);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-            SetControlEvent((int)EventDef.Department | (int)EventDef.Person);
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 308)
@@ -180,7 +180,7 @@
             this.grpExample1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.grpExample1.Location = new System.Drawing.Point(10, 616);
             this.grpExample1.Name = "grpExample1";
-            this.grpExample1.Size = new System.Drawing.Size(400, 38);
+            this.grpExample1.Size = new System.Drawing.Size(330, 38);
             this.grpExample1.TabIndex = 33;
             this.grpExample1.TabStop = false;
             this.grpExample1.Text = "æ–½å·¥çŠ¶æ…‹å¤‰æ›´ã‚ˆã‚Š1ã‚«æœˆçµŒé�Ž";
@@ -190,10 +190,11 @@
             // 
             this.lblEstimateType03.BackColor = System.Drawing.Color.OliveDrab;
             this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEstimateType03.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed;
-            this.lblEstimateType03.Location = new System.Drawing.Point(264, 14);
+            this.lblEstimateType03.Location = new System.Drawing.Point(224, 14);
             this.lblEstimateType03.Name = "lblEstimateType03";
-            this.lblEstimateType03.Size = new System.Drawing.Size(120, 20);
+            this.lblEstimateType03.Size = new System.Drawing.Size(100, 20);
             this.lblEstimateType03.TabIndex = 0;
             this.lblEstimateType03.Text = "äºˆç®—å�–ã‚Šæ¡ˆä»¶";
             this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -203,9 +204,9 @@
             this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange;
             this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblEstimateType02.ForeColor = System.Drawing.Color.Black;
-            this.lblEstimateType02.Location = new System.Drawing.Point(136, 14);
+            this.lblEstimateType02.Location = new System.Drawing.Point(116, 14);
             this.lblEstimateType02.Name = "lblEstimateType02";
-            this.lblEstimateType02.Size = new System.Drawing.Size(120, 20);
+            this.lblEstimateType02.Size = new System.Drawing.Size(100, 20);
             this.lblEstimateType02.TabIndex = 0;
             this.lblEstimateType02.Text = "å…¥æœ­æ¡ˆä»¶";
             this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -217,7 +218,7 @@
             this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue;
             this.lblEstimateType01.Location = new System.Drawing.Point(8, 14);
             this.lblEstimateType01.Name = "lblEstimateType01";
-            this.lblEstimateType01.Size = new System.Drawing.Size(120, 20);
+            this.lblEstimateType01.Size = new System.Drawing.Size(100, 20);
             this.lblEstimateType01.TabIndex = 0;
             this.lblEstimateType01.Text = "å·¥äº‹æ¡ˆä»¶";
             this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs	(revision 308)
@@ -314,14 +314,6 @@
         {
             if (m_bInitFlag) return;
 
-            // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆ
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
             InitDataLoad();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 308)
@@ -615,16 +615,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SubControlEvent((int)EventDef.Department | (int)EventDef.Person);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-            SetControlEvent((int)EventDef.Department | (int)EventDef.Person);
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs	(revision 308)
@@ -282,14 +282,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs	(revision 308)
@@ -44,75 +44,48 @@
                 DataGridViewRow DataGridViewRow1 = (DataGridViewRow)x;
                 DataGridViewRow DataGridViewRow2 = (DataGridViewRow)y;
 
-                int CompareResult = System.String.Compare(
-                    DataGridViewRow1.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value.ToString(),
-                    DataGridViewRow2.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value.ToString());
+                int CompareResult = System.Decimal.Compare(
+                    CommonMotions.cnvDecimal(DataGridViewRow1.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value),
+                    CommonMotions.cnvDecimal(DataGridViewRow2.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value));
 
                 if (CompareResult == 0)
                 {
-                    CompareResult = System.String.Compare(
-                        DataGridViewRow1.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value.ToString(),
-                        DataGridViewRow2.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value.ToString());
+                    CompareResult = System.DateTime.Compare(
+                        CommonMotions.cnvDate(DataGridViewRow2.Cells[(int)DispColumn.ProcessDate].Value),
+                        CommonMotions.cnvDate(DataGridViewRow1.Cells[(int)DispColumn.ProcessDate].Value));
                 }
+
+                if (CompareResult == 0)
+                {
+                    CompareResult = System.Decimal.Compare(
+                        CommonMotions.cnvDecimal(DataGridViewRow1.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value),
+                        CommonMotions.cnvDecimal(DataGridViewRow2.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value));
+                }
                 return CompareResult * sortOrderModifier;
             }
         }
         #endregion
 
-        #region ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�®ãƒ­ãƒ¼ãƒ‰
+        #region åˆ�æœŸè¡¨ç¤ºã�®ã‚¹ã‚¿ã‚¤ãƒ«ã‚’å¤‰æ›´
         /// <summary>
-        /// ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�®ãƒ­ãƒ¼ãƒ‰
+        /// åˆ�æœŸè¡¨ç¤ºã�®ã‚¹ã‚¿ã‚¤ãƒ«ã‚’å¤‰æ›´
         /// </summary>
-        private void LoadComboBox()
+        /// <param name="dgv"></param>
+        private void InitDisplayStyle()
         {
-            IOMaterialRecordInfo IoMri = new IOMaterialRecordInfo();
             try
             {
-                if (ConstructionCode == 0) return;
-
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("select");
-                strSQL.AppendLine(" DATE_FORMAT(ProcessDate, '%Y/%m/%d')");
-                strSQL.AppendLine(" from");
-                strSQL.AppendLine(" MaterialRecordInfo");
-                strSQL.AppendLine(" where");
-                strSQL.AppendFormat(" ConstructionCode = {0}", ConstructionCode);
-                strSQL.AppendFormat(" And RECKIND = {0} ", (int)MaterialRecordInfo.RecKindDef.Rental);
-                strSQL.AppendLine(" group by ProcessDate");
-                strSQL.AppendLine(" order by ProcessDate desc");
-
-                ArrayList arData = new ArrayList();
-                if (!IoMri.ExecuteReader(strSQL.ToString(), ref arData)) return;
-
-                List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>();
-
-                DataList.Add(new KeyValuePair<string, string>("0", "ã€€æ–°ã€€è¦�"));
-
-                // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-                int cnt = 0;
-                foreach (object[] work in arData)
+                DataGridView dgv = dgvMaster;
+                int nColumnMax = Enum.GetNames(typeof(DispColumn)).Length;
+                for (int i = 0; i < nColumnMax; i++)
                 {
-                    KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(CommonMotions.cnvString(work[0]), CommonMotions.cnvString(work[0]));
-
-                    DataList.Add(keyval);
-                    cnt++;
+                    dgv.Columns[i].Visible = s_ColumnVisbleDef[i];
                 }
-
-                // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆ�æœŸè¡¨ç¤º
-                cmbProcessDate.DataSource = null;
-                cmbProcessDate.ValueMember = "Key";
-                cmbProcessDate.DisplayMember = "Value";
-                ComboBoxAction.InitDataSetCombBox(cmbProcessDate, DataList, false);
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                IoMri.close();
-                IoMri = null;
-            }
         }
         #endregion
 
@@ -123,24 +96,28 @@
         private void InitDataLoad()
         {
             IOConstructionBaseInfoDetail IoConB = new IOConstructionBaseInfoDetail();
-            ConstructionBaseInfoDetail ConB = new ConstructionBaseInfoDetail();
             try
             {
                 // ç”»é�¢è¡¨ç¤ºç”¨ãƒ‡ãƒ¼ã‚¿å�–å¾—
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.AppendFormat(" where ConstructionCode = {0} and DETAILNO = {1}",
-                                        ConstructionCode,
-                                        (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.AppendFormat(" Where ConstructionCode = {0}", ConstructionCode);
+                strSQL.AppendFormat(" And DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+
+                ConstructionBaseInfoDetail ConB = new ConstructionBaseInfoDetail();
                 if (!IoConB.SelectAction(strSQL.ToString(), ref ConB)) return;
 
+                lblLabel01.Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
                 lblDETAILSTRING.Text = ConB.DetailString;
 
                 // æ‹…å½“ã�«ãƒ­ã‚°ã‚¤ãƒ³ãƒ¦ãƒ¼ã‚¶ãƒ¼å��ã‚’è¡¨ç¤º
                 lblPerson.Text = CommonMotions.LoginUserData.PersonName;
 
-                // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹è¨­å®š
-                LoadComboBox();
+                // è²¸å‡ºæ—¥
+                lblProcessDate.Text = DateTime.Now.Date.ToString("yyyy/MM/dd");
 
+                // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
+                if (!DispGridData()) return;
+
                 m_bChengeAns = false;
             }
             catch (Exception ex)
@@ -213,10 +190,8 @@
             {
 
                 // è²¸å‡ºæ—¥æŒ‡å®š
-                DateTime dtProcessDate = CommonMotions.cnvDate(cmbProcessDate.SelectedValue).Date == DateTime.MinValue.Date ? 
-                                        DateTime.Now.Date : CommonMotions.cnvDate(cmbProcessDate.SelectedValue);
+                DateTime dtProcessDate = CommonMotions.cnvDate(lblProcessDate.Text);
 
-
                 StringBuilder strMimSQL = new StringBuilder();
 
                 int intMaterialItemCode = 0;
@@ -651,8 +626,7 @@
             try
             {
                 // è²¸å‡ºæ—¥æŒ‡å®š
-                string strProcessdate = cmbProcessDate.SelectedValue.ToString() == "0" ?
-                                        DateTime.Now.Date.ToString("yyyy/MM/dd") : cmbProcessDate.SelectedValue.ToString();
+                string strProcessdate = lblProcessDate.Text;
 
                 // ã‚°ãƒªãƒƒãƒ‰ãƒ˜ãƒƒãƒ€ãƒ¼ã‚¹ã‚¿ã‚¤ãƒ«ã‚»ãƒƒãƒˆ
                 SetGridColumnHeaderStyle();
@@ -674,7 +648,7 @@
                 sql.AppendLine(" , Cmi.RENTCOUNT");
                 sql.AppendLine(" , ifnull(DATE_FORMAT(Mri.RepayPlanDate, '%Y/%m/%d'), '') as RepayPlanDate");
                 sql.AppendLine(" , ifnull(Mri.CommentText, '') as CommentText");
-                sql.AppendLine(" , Cmi.PROCESSDATE");
+                sql.AppendLine(" , ifnull(DATE_FORMAT(Cmi.PROCESSDATE, '%Y/%m/%d'), '') as ProcessDate");
                 sql.AppendLine(" , Cmi.REPAYCOUNT");
                 sql.AppendLine(" , Cmi.JUNKCOUNT");
                 sql.AppendLine(" , Cmi.COMPLETEFLG ");
@@ -682,8 +656,7 @@
                 sql.AppendLine(" ConstructionMaterialInfo as Cmi");
                 sql.AppendLine(" left join MaterialInfo as Mi");
                 sql.AppendLine("   on Mi.MaterialItemCode = Cmi.MaterialItemCode ");
-                sql.AppendLine(" left join (");
-                sql.AppendLine("   MaterialItemMaster as Mim");
+                sql.AppendLine(" left join (MaterialItemMaster as Mim");
                 sql.AppendLine("     left join MaterialKindMaster as Mkm");
                 sql.AppendLine("       on Mim.MaterialKindCode = Mkm.MaterialKindCode");
                 sql.AppendLine(" )");
@@ -691,7 +664,6 @@
                 sql.AppendLine(", MaterialRecordInfo as Mri");
 
                 sql.AppendFormat(" where Cmi.CONSTRUCTIONCODE = {0} ", ConstructionCode);
-                sql.AppendFormat(" and Cmi.PROCESSDATE = '{0}' ", strProcessdate);
                 sql.AppendLine(" And Mri.CONSTRUCTIONCODE = Cmi.CONSTRUCTIONCODE");
                 sql.AppendLine(" And Mri.MATERIALITEMCODE = Cmi.MATERIALITEMCODE");
                 sql.AppendLine(" And Mri.PROCESSDATE = Cmi.PROCESSDATE");
@@ -702,33 +674,49 @@
 
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
                 int icnt = 0;
+                int nColumnMax = Enum.GetNames(typeof(DispColumn)).Length;
                 foreach (object[] work in arData)
                 {
                     icnt = dgv.Rows.Add();
 
-                    dgv.Rows[icnt].Cells[(int)DispColumn.RowState].Value = DataRowState.Unchanged;
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindCode]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindName].ToolTipText = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialKindDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindDisplayOrder]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialItemCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialItemName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialItemName]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialItemDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemDisplayOrder]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.RentCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.RentCount]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.MaterialCountBefore].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Value = CommonMotions.cnvString(work[(int)DataColumn.RepayPlanDate]);
-                    dgv.Rows[icnt].Cells[(int)DispColumn.CommentText].Value = CommonMotions.cnvString(work[(int)DataColumn.CommentText]);
+                    DataGridViewRow CurRow = dgv.Rows[icnt];
+                    CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Unchanged;
+                    CurRow.Cells[(int)DispColumn.MaterialKindCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindCode]);
+                    CurRow.Cells[(int)DispColumn.MaterialKindName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]);
+                    CurRow.Cells[(int)DispColumn.MaterialKindName].ToolTipText = CommonMotions.cnvString(work[(int)DataColumn.MaterialKindName]);
+                    CurRow.Cells[(int)DispColumn.MaterialKindDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialKindDisplayOrder]);
+                    CurRow.Cells[(int)DispColumn.MaterialItemCode].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]);
+                    CurRow.Cells[(int)DispColumn.MaterialItemName].Value = CommonMotions.cnvString(work[(int)DataColumn.MaterialItemName]);
+                    CurRow.Cells[(int)DispColumn.MaterialItemDisplayOrder].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemDisplayOrder]);
+                    CurRow.Cells[(int)DispColumn.RentCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.RentCount]);
+                    CurRow.Cells[(int)DispColumn.MaterialCount].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]);
+                    CurRow.Cells[(int)DispColumn.MaterialCountBefore].Value = CommonMotions.cnvInt(work[(int)DataColumn.MaterialCount]);
+                    CurRow.Cells[(int)DispColumn.ProcessDate].Value = CommonMotions.cnvString(work[(int)DataColumn.ProcessDate]);
+                    CurRow.Cells[(int)DispColumn.RepayPlanDate].Value = CommonMotions.cnvString(work[(int)DataColumn.RepayPlanDate]);
+                    CurRow.Cells[(int)DispColumn.CommentText].Value = CommonMotions.cnvString(work[(int)DataColumn.CommentText]);
 
                     // è¿”å�´äºˆå®šæ—¥ã�¯å¤‰ã�ˆã‚‰ã‚Œã�ªã�„
-                    dgv.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].ReadOnly = true;
+                    CurRow.Cells[(int)DispColumn.RepayPlanDate].ReadOnly = true;
 
+                    // å½“æ—¥åˆ†ä»¥å¤–ã�¯å¤‰æ›´ç¦�æ­¢
+                    if (CommonMotions.cnvDate(work[(int)DataColumn.ProcessDate]).Date != DateTime.Today.Date)
+                    {
+                        CurRow.Cells[(int)DispColumn.MaterialCount].ReadOnly = true;
+                        CurRow.Cells[(int)DispColumn.CommentText].ReadOnly = true;
+                        // å¤‰æ›´ç¦�æ­¢ã�¯è‰²ã‚’å¤‰ã�ˆã‚‹
+                        for (int i = (int)DispColumn.MaterialItemCode; i < nColumnMax; i++)
+                        {
+                            CurRow.Cells[i].Style.ForeColor = Color.Gray;
+                        }
+                        continue;
+                    }
+
                     // è¿”å�´ãƒ»ç ´æ£„ã�Œã�‚ã‚‹ã‚‚ã�®ã€�è¿”å�´æ¸ˆã�¿ã�®ã‚‚ã�®ã�¯å¤‰æ›´ã�§ã��ã�ªã�„
                     if (CommonMotions.cnvInt(work[(int)DataColumn.RepayCount]) > 0 || CommonMotions.cnvInt(work[(int)DataColumn.JunkCount]) > 0
                         || CommonMotions.cnvInt(work[(int)DataColumn.CompleteFlg]) == (int)ConstructionMaterialInfo.CompleteFlgDef.Completed)
                     {
-                        dgv.Rows[icnt].Cells[(int)DispColumn.MaterialCount].ReadOnly = true;
-                        dgv.Rows[icnt].Cells[(int)DispColumn.CommentText].ReadOnly = true;
+                        CurRow.Cells[(int)DispColumn.MaterialCount].ReadOnly = true;
+                        CurRow.Cells[(int)DispColumn.CommentText].ReadOnly = true;
                     }
                 }
 
@@ -735,6 +723,7 @@
                 // ã‚°ãƒªãƒƒãƒ‰ã‚’è³‡æ��ç¨®é¡žè¡¨ç¤ºã€�è³‡æ��å“�ç›®è¡¨ç¤ºé †ã�«ã‚½ãƒ¼ãƒˆ
                 dgv.Sort(new RowComparer());
 
+                // å�Œã�˜ç¨®é¡žå��ã�¯è¡¨ç¤ºã�—ã�ªã�„
                 icnt = 0;
                 foreach (DataGridViewRow work in dgv.Rows)
                 {
@@ -754,10 +743,10 @@
 
                 // ãƒœã‚¿ãƒ³åˆ¶å¾¡
                 setButtonEnable();
+
+                // å¤‰æ›´ãƒ•ãƒ©ã‚°OFF
                 m_bChengeAns = false;
 
-                // è²¸å‡ºæ—¥é€€é�¿
-                m_ProcessPrev = strProcessdate;
             }
             catch (Exception ex)
             {
@@ -812,6 +801,9 @@
                 StringBuilder strSQL = new StringBuilder();
                 foreach (DataGridViewRow r in dgvMaster.Rows)
                 {
+                    // ----- è¡Œã�«å¤‰åŒ–ã�Œã�ªã�„å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if ((DataRowState)r.Cells[(int)DispColumn.RowState].Value == DataRowState.Unchanged) continue;
+
                     // è¡Œã�®ãƒ�ã‚§ãƒƒã‚¯å‰�ã�«å…ƒã�«æˆ»ã�™
                     CommonMotions.chgBackColor(r.Cells[(int)DispColumn.MaterialCount], true);
                     CommonMotions.chgBackColor(r.Cells[(int)DispColumn.RepayPlanDate], true);
@@ -924,30 +916,29 @@
         /// <summary>
         /// ãƒœã‚¿ãƒ³åˆ¶å¾¡
         /// </summary>
-        private void setButtonEnable()
+        private void setButtonEnable(DataGridViewRow CurRow = null)
         {
-            bool bEnableFlg = false;
             try
             {
+                btnMaterialRelease.Enabled = false;
+                btnMaterialHistory.Enabled = false;
+
+                if (CurRow == null) return;
+
+                // è³‡æ��å±¥æ­´ãƒœã‚¿ãƒ³è¡¨ç¤º
+                btnMaterialHistory.Enabled = true;
+
                 // æœ¬æ—¥ä»¥å¤–ã�¯ä¿®æ­£ã�§ã��ã�ªã�„
-                DateTime dtWrk = CommonMotions.cnvDate(cmbProcessDate.SelectedValue);
-                if (DateTime.Now.Date != dtWrk.Date && DateTime.MinValue.Date != dtWrk) return;
+                DateTime dtWrk = CommonMotions.cnvDate(CurRow.Cells[(int)DispColumn.ProcessDate].Value);
+                if (DateTime.Now.Date != dtWrk.Date) return;
 
-                bEnableFlg = true;
+                // è³‡æ��å‰Šé™¤ãƒœã‚¿ãƒ³è¡¨ç¤º
+                btnMaterialRelease.Enabled = true;
             }
             catch (System.Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                btnDataEntry.Enabled = bEnableFlg;
-                btnMaterialSelect.Enabled = bEnableFlg;
-                btnMaterialRelease.Enabled = bEnableFlg;
-                btnMaterialHistory.Enabled = bEnableFlg;
-                // ã�“ã�“ã�§ã‚°ãƒªãƒƒãƒ‰ã‚‚ãƒ­ãƒƒã‚¯åˆ¶å¾¡
-                dgvMaster.ReadOnly = !bEnableFlg;
-            }
         }
         #endregion
 
@@ -1010,6 +1001,8 @@
 
                         dgv.Rows[setRow].Cells[(int)DispColumn.RentCount].Value = itemscount[cnt];
                         dgv.Rows[setRow].Cells[(int)DispColumn.RepayPlanDate].ReadOnly = false;
+
+                        dgv.Rows[setRow].Cells[(int)DispColumn.ProcessDate].Value = lblProcessDate.Text;
                     }
 
                     cnt++;
@@ -1037,6 +1030,10 @@
 
                 // â„–å†�æŽ¡ç•ª
                 LineReNumbering();
+
+                // å¤‰æ›´ãƒ•ãƒ©ã‚°ON
+                m_bChengeAns = true;
+
             }
             catch (System.Exception ex)
             {
@@ -1105,17 +1102,11 @@
                 DataGridView dgv = dgvMaster;
                 DataGridViewRow CurRow = dgv.CurrentRow;
 
-                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => x.Visible == true).ToArray();
-
                 if (CurRow == null) return;
-                if (rows.Count() == 0) return;
-                if(dgv.SelectedCells.Count == 0) return;
 
-
                 // è©²å½“è³‡æ��ã�®ã€Œå·¥äº‹è³‡æ��æƒ…å ±ã€�å­˜åœ¨ç¢ºèª�
                 // è²¸å‡ºæ—¥æŒ‡å®š
-                DateTime dtProcessdate = CommonMotions.cnvString(cmbProcessDate.SelectedValue).Equals("0") ?
-                                                DateTime.Now.Date : CommonMotions.cnvDate(cmbProcessDate.SelectedValue).Date;
+                DateTime dtProcessdate = CommonMotions.cnvDate(CurRow.Cells[(int)DispColumn.ProcessDate].Value);
                 int nMateriakItemCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.MaterialItemCode].Value);
 
                 List<ConstructionMaterialInfo> lcMi = new List<ConstructionMaterialInfo>();
@@ -1145,12 +1136,7 @@
                     return;
                 }
 
-                // é�žè¡¨ç¤º
-                int Cindex = CurRow.Index;
-                CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Deleted;
-                CurRow.Visible = false;
-
-                // è³‡æ��ç¨®é¡žå��ç§°è¨­å®š
+                // å‰Šé™¤è¡Œã�«è³‡æ��ç¨®é¡žå��ç§°ã�Œã�‚ã‚Œã�°æ¬¡è¡Œã�«è¨­å®š
                 string chkString = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.MaterialKindName].Value);
                 int NextRow = CurRow.Index + 1;
                 if (chkString.Length > 0)
@@ -1167,8 +1153,18 @@
                     }
                 }
 
+                // é�žè¡¨ç¤º
+                int Cindex = CurRow.Index;
                 // ãƒ‡ãƒ¼ã‚¿ã�Œç™»éŒ²ã�•ã‚Œã�¦ã�„ã�ªã�„å ´å�ˆã�¯è¡Œå‰Šé™¤
-                if (lcMi.Count == 0) dgv.Rows.RemoveAt(Cindex);
+                if (lcMi.Count == 0)
+                {
+                    dgv.Rows.RemoveAt(Cindex);
+                }
+                else
+                {
+                    CurRow.Visible = false;
+                    CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Deleted;
+                }
 
                 // â„–å†�æŽ¡ç•ª
                 LineReNumbering();
@@ -1179,6 +1175,10 @@
                 // ãƒœã‚¿ãƒ³åˆ¶å¾¡
                 setButtonEnable();
             }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
             finally
             {
                 cMi.close(); cMi = null;
@@ -1185,5 +1185,31 @@
             }
         }
         #endregion
+
+        #region å¤‰æ›´è¡Œã�®ã‚«ã‚¦ãƒ³ãƒˆã‚’å�–ã‚‹
+        /// <summary>
+        /// å¤‰æ›´è¡Œã�®ã‚«ã‚¦ãƒ³ãƒˆã‚’å�–ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private int GetChangeRowCount()
+        {
+            int nRet = 0;
+            try
+            {
+                DataGridView dgv = dgvMaster;
+                DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(
+                                                                            x => DataRowState.Unchanged != (DataRowState)x.Cells[(int)DispColumn.RowState].Value)
+                                                                        .ToArray();
+                nRet = Rows.Count();
+
+                return nRet;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return nRet;
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.cs	(revision 308)
@@ -56,10 +56,14 @@
             RentCount,
             MaterialCount,
             MaterialCountBefore,
+            ProcessDate,
             RepayPlanDate,
             CommentText,
         }
 
+        /// <summary>
+        /// èª­ã�¿å�–ã‚Šãƒ‡ãƒ¼ã‚¿
+        /// </summary>
         private enum DataColumn
         {
             MaterialKindCode = 0,
@@ -72,14 +76,32 @@
             MaterialCount,
             RepayPlanDate,
             CommentText,
+            ProcessDate,
             RepayCount,
             JunkCount,
             CompleteFlg,
         }
+
         /// <summary>
-        /// ãƒžã‚¹ã‚¿ãƒªã‚¹ãƒˆMAXãƒ©ã‚¤ãƒ³
+        /// ã‚°ãƒªãƒƒãƒ‰ã‚«ãƒ©ãƒ è¡¨ç¤ºå®šç¾©
         /// </summary>
-        //private const int s_ListMaxLineCount = 53;
+        private bool[] s_ColumnVisbleDef = new bool[]
+        {
+            false,
+            true,
+            false,
+            true,
+            false,
+            false,
+            true,
+            false,
+            true,
+            true,
+            false,
+            true,
+            true,
+            true,
+        };
         #endregion
 
         #region å¤‰æ•°
@@ -103,11 +125,6 @@
         private bool m_EndButton = false;
 
         /// <summary>
-        /// è²¸å‡ºæ—¥å¤‰æ›´å‰�å€¤
-        /// </summary>
-        private string m_ProcessPrev = "";
-
-        /// <summary>
         /// å�‚ç…§ãƒ•ãƒ©ã‚°
         /// </summary>
         private bool m_EditLock = false;
@@ -294,9 +311,12 @@
 
             if(m_EditLock) btnDataEntry.Enabled = false;
 
+            // è¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«
+            InitDisplayStyle();
+
             // åˆ�æœŸè¡¨ç¤º
             InitDataLoad();
-            
+
             // ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ä½¿ç”¨æ™‚
             if (m_DialogFlg)
             {
@@ -318,6 +338,35 @@
         }
         #endregion
 
+        #region ã‚»ãƒ«å…¥åŠ›é–‹å§‹æ™‚å‡¦ç�†
+        /// <summary>
+        /// å…¥åŠ›å‰�å€¤
+        /// </summary>
+        object m_BeforeValue = null;
+        int m_CheckCol = -1;
+        int m_CheckRow = -1;
+        /// <summary>
+        /// ã‚»ãƒ«å…¥åŠ›é–‹å§‹æ™‚å‡¦ç�†
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvMaster_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+        {
+            try
+            {
+                DataGridView dgv = dgvMaster;
+                // ã‚»ãƒ«å€¤å�–å¾—
+                m_BeforeValue = dgv.CurrentCell.Value;
+                m_CheckCol = e.ColumnIndex;
+                m_CheckRow = e.RowIndex;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ã‚»ãƒ«å€¤å¤‰åŒ–
         /// <summary>
         /// ã‚»ãƒ«å€¤å¤‰åŒ–
@@ -333,22 +382,25 @@
                 if (e.ColumnIndex == (int)DispColumn.RowState) return;
 
                 DataGridView dgv = dgvMaster;
-                
+
                 // nullå€¤ã�¯å‡¦ç�†ã�—ã�ªã�„
                 if (dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value == null) return;
 
+                // å€¤ã�®ãƒ�ã‚§ãƒƒã‚¯ï¼ˆå�Œã�˜å ´å�ˆã�¯å¤‰æ›´ãƒ•ãƒ©ã‚°ã‚’ONã�«ã�—ã�ªã�„ï¼‰
+                if (m_CheckCol != e.ColumnIndex || m_CheckRow != e.RowIndex) return;
+                int CurVal = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value);
+                if (CommonMotions.cnvInt(m_BeforeValue) == CurVal) return;
+
                 // è¿”å�´äºˆå®šæ—¥ã�®å‡¦ç�†
-                if (e.ColumnIndex == (int)DispColumn.RepayPlanDate)
-                {
-                    FormatRepayPlanDate(e);
-                }
+                if (e.ColumnIndex == (int)DispColumn.RepayPlanDate) FormatRepayPlanDate(e);
 
-                // è¡Œã�«å¤‰æ›´ãƒ•ãƒ©ã‚°ã‚’ONï¼ˆç·¨é›†ã�—ã�Ÿè¡Œã�¯å¤‰æ›´å‡ºæ�¥ã�ªã�„ï¼‰
-                if (DataRowState.Unchanged == (DataRowState)dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value)
-                    dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
-                
                 // å€¤ã�Œå¤‰ã‚�ã‚Œã�°ãƒ„ãƒ¼ãƒ«ãƒ�ãƒƒãƒ—ã‚’å¤‰æ›´ã�™ã‚‹
                 dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].ToolTipText = CommonMotions.cnvString(dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value);
+
+                // è¡Œã�«å¤‰æ›´ãƒ•ãƒ©ã‚°ã‚’ON
+                if ((DataRowState)dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value == DataRowState.Unchanged)
+                    dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
+
                 // å¤‰æ›´ãƒ•ãƒ©ã‚°ON
                 m_bChengeAns = true;
             }
@@ -369,6 +421,9 @@
         {
             try         
             {
+                // å¤‰æ›´ã�ªã�—ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (GetChangeRowCount() < 1) return;
+
                 //ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
                 if (!DispFeildCheck()) return;
 
@@ -384,7 +439,6 @@
                 CommonMotions.EntryEndMessage("è³‡æ��è²¸å‡º");
 
                 m_bChengeAns = false;
-                LoadComboBox();
 
                 this.Refresh();
 
@@ -443,41 +497,10 @@
         /// <param name="e"></param>
         private void dgvMaster_CellClick(object sender, DataGridViewCellEventArgs e)
         {
-            setButtonEnable();
+            setButtonEnable(dgvMaster.CurrentRow);
         }
         #endregion
 
-        #region æ—¥ä»˜ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�®å¤‰æ›´
-        /// <summary>
-        /// æ—¥ä»˜ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�®å¤‰æ›´
-        /// </summary>
-        private void cmbProcessDate_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            // é�¸æŠžç„¡ã�—ã�¯å‡¦ç�†ã�—ã�ªã�„
-            string strKey = CommonMotions.cnvString(cmbProcessDate.SelectedValue);
-            if (strKey.Length == 0) return;
-
-            string strProcessdate = strKey.Equals("0") ? DateTime.Now.Date.ToString("yyyy/MM/dd") : strKey;
-
-            if (m_bChengeAns)
-            {
-                if (MessageBox.Show("ãƒ‡ãƒ¼ã‚¿ã�«å¤‰æ›´ã�Œã�‚ã‚Šã�¾ã�™ã€�ç™»éŒ²ã�›ã�šã�«å¯¾è±¡ã‚’å¤‰æ›´ã�—ã�¦ã‚ˆã‚�ã�—ã�„ã�§ã�™ã�‹ï¼Ÿã€‚",
-                                    "ãƒ‡ãƒ¼ã‚¿å¤‰æ›´ç¢ºèª�",
-                                    MessageBoxButtons.YesNo,
-                                    MessageBoxIcon.Warning) == DialogResult.No)
-                {
-                    cmbProcessDate.SelectedIndexChanged -= new System.EventHandler(this.cmbProcessDate_SelectedIndexChanged);
-                    cmbProcessDate.SelectedValue = m_ProcessPrev;
-                    cmbProcessDate.SelectedIndexChanged += new System.EventHandler(this.cmbProcessDate_SelectedIndexChanged);
-                    return;
-                }
-            }
-
-            // ã‚°ãƒªãƒƒãƒ‰ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-            DispGridData();
-        }
-        #endregion
-
         #region è³‡æ��é�¸æŠžæŠ¼ä¸‹
         /// <summary>
         /// è³‡æ��é�¸æŠžæŠ¼ä¸‹
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.designer.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.designer.cs	(revision 308)
@@ -31,7 +31,7 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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 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();
@@ -38,15 +38,17 @@
             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();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnEnd = new System.Windows.Forms.Button();
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.button6 = new System.Windows.Forms.Button();
             this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.label3 = new System.Windows.Forms.Label();
+            this.lblProcessDate = new System.Windows.Forms.Label();
+            this.lblLabel01 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.cmbProcessDate = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.lblDETAILSTRING = new System.Windows.Forms.Label();
             this.lblPerson = new System.Windows.Forms.Label();
             this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
@@ -65,6 +67,7 @@
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBoxEx2.SuspendLayout();
@@ -78,7 +81,7 @@
             this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(333, 8);
+            this.label1.Location = new System.Drawing.Point(415, 8);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(500, 20);
             this.label1.TabIndex = 0;
@@ -90,7 +93,7 @@
             this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnEnd.BackColor = System.Drawing.Color.Blue;
             this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1039, 502);
+            this.btnEnd.Location = new System.Drawing.Point(1203, 502);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
             this.btnEnd.TabIndex = 10;
@@ -103,7 +106,7 @@
             this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnDataEntry.BackColor = System.Drawing.Color.Green;
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(913, 502);
+            this.btnDataEntry.Location = new System.Drawing.Point(1077, 502);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
             this.btnDataEntry.TabIndex = 9;
@@ -127,18 +130,55 @@
             // groupBoxEx2
             // 
             this.groupBoxEx2.BorderColor = System.Drawing.Color.White;
+            this.groupBoxEx2.Controls.Add(this.label3);
+            this.groupBoxEx2.Controls.Add(this.lblProcessDate);
+            this.groupBoxEx2.Controls.Add(this.lblLabel01);
             this.groupBoxEx2.Controls.Add(this.label2);
-            this.groupBoxEx2.Controls.Add(this.label3);
             this.groupBoxEx2.Controls.Add(this.label4);
-            this.groupBoxEx2.Controls.Add(this.cmbProcessDate);
             this.groupBoxEx2.Controls.Add(this.lblDETAILSTRING);
             this.groupBoxEx2.Controls.Add(this.lblPerson);
-            this.groupBoxEx2.Location = new System.Drawing.Point(8, 36);
+            this.groupBoxEx2.Location = new System.Drawing.Point(5, 36);
             this.groupBoxEx2.Name = "groupBoxEx2";
-            this.groupBoxEx2.Size = new System.Drawing.Size(1150, 66);
+            this.groupBoxEx2.Size = new System.Drawing.Size(1320, 66);
             this.groupBoxEx2.TabIndex = 11;
             this.groupBoxEx2.TabStop = false;
             // 
+            // label3
+            // 
+            this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label3.ForeColor = System.Drawing.Color.Black;
+            this.label3.Location = new System.Drawing.Point(6, 36);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(120, 24);
+            this.label3.TabIndex = 9;
+            this.label3.Text = "ä»Šå›žè²¸å‡ºæ—¥";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblProcessDate
+            // 
+            this.lblProcessDate.BackColor = System.Drawing.Color.White;
+            this.lblProcessDate.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblProcessDate.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblProcessDate.ForeColor = System.Drawing.Color.Black;
+            this.lblProcessDate.Location = new System.Drawing.Point(134, 36);
+            this.lblProcessDate.Name = "lblProcessDate";
+            this.lblProcessDate.Size = new System.Drawing.Size(120, 24);
+            this.lblProcessDate.TabIndex = 10;
+            this.lblProcessDate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblLabel01
+            // 
+            this.lblLabel01.BackColor = System.Drawing.Color.White;
+            this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblLabel01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblLabel01.ForeColor = System.Drawing.Color.Black;
+            this.lblLabel01.Location = new System.Drawing.Point(134, 6);
+            this.lblLabel01.Name = "lblLabel01";
+            this.lblLabel01.Size = new System.Drawing.Size(120, 24);
+            this.lblLabel01.TabIndex = 8;
+            this.lblLabel01.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // label2
             // 
             this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
@@ -151,24 +191,12 @@
             this.label2.Text = "å·¥äº‹å��ç§°";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(6, 36);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(120, 24);
-            this.label3.TabIndex = 3;
-            this.label3.Text = "è²¸å‡ºæ—¥";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // label4
             // 
             this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(315, 36);
+            this.label4.Location = new System.Drawing.Point(262, 36);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(120, 24);
             this.label4.TabIndex = 5;
@@ -175,26 +203,14 @@
             this.label4.Text = "è²¸å‡ºæ‹…å½“è€…";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbProcessDate
-            // 
-            this.cmbProcessDate.BackColor = System.Drawing.Color.White;
-            this.cmbProcessDate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbProcessDate.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbProcessDate.FormattingEnabled = true;
-            this.cmbProcessDate.Location = new System.Drawing.Point(134, 36);
-            this.cmbProcessDate.Name = "cmbProcessDate";
-            this.cmbProcessDate.Size = new System.Drawing.Size(165, 24);
-            this.cmbProcessDate.TabIndex = 4;
-            this.cmbProcessDate.SelectedIndexChanged += new System.EventHandler(this.cmbProcessDate_SelectedIndexChanged);
-            // 
             // lblDETAILSTRING
             // 
             this.lblDETAILSTRING.BackColor = System.Drawing.Color.White;
             this.lblDETAILSTRING.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblDETAILSTRING.ForeColor = System.Drawing.Color.Black;
-            this.lblDETAILSTRING.Location = new System.Drawing.Point(134, 6);
+            this.lblDETAILSTRING.Location = new System.Drawing.Point(262, 6);
             this.lblDETAILSTRING.Name = "lblDETAILSTRING";
-            this.lblDETAILSTRING.Size = new System.Drawing.Size(1010, 24);
+            this.lblDETAILSTRING.Size = new System.Drawing.Size(1050, 24);
             this.lblDETAILSTRING.TabIndex = 2;
             this.lblDETAILSTRING.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -203,7 +219,7 @@
             this.lblPerson.BackColor = System.Drawing.Color.White;
             this.lblPerson.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblPerson.ForeColor = System.Drawing.Color.Black;
-            this.lblPerson.Location = new System.Drawing.Point(443, 36);
+            this.lblPerson.Location = new System.Drawing.Point(390, 36);
             this.lblPerson.Name = "lblPerson";
             this.lblPerson.Size = new System.Drawing.Size(160, 24);
             this.lblPerson.TabIndex = 6;
@@ -216,9 +232,9 @@
             this.groupBoxEx1.Controls.Add(this.btnMaterialRelease);
             this.groupBoxEx1.Controls.Add(this.btnMaterialSelect);
             this.groupBoxEx1.Controls.Add(this.dgvMaster);
-            this.groupBoxEx1.Location = new System.Drawing.Point(8, 110);
+            this.groupBoxEx1.Location = new System.Drawing.Point(5, 110);
             this.groupBoxEx1.Name = "groupBoxEx1";
-            this.groupBoxEx1.Size = new System.Drawing.Size(1150, 380);
+            this.groupBoxEx1.Size = new System.Drawing.Size(1320, 390);
             this.groupBoxEx1.TabIndex = 7;
             this.groupBoxEx1.TabStop = false;
             // 
@@ -227,7 +243,7 @@
             this.btnMaterialHistory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnMaterialHistory.BackColor = System.Drawing.Color.Khaki;
             this.btnMaterialHistory.ForeColor = System.Drawing.Color.Black;
-            this.btnMaterialHistory.Location = new System.Drawing.Point(8, 344);
+            this.btnMaterialHistory.Location = new System.Drawing.Point(8, 354);
             this.btnMaterialHistory.Name = "btnMaterialHistory";
             this.btnMaterialHistory.Size = new System.Drawing.Size(150, 30);
             this.btnMaterialHistory.TabIndex = 1;
@@ -240,7 +256,7 @@
             this.btnMaterialRelease.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnMaterialRelease.BackColor = System.Drawing.Color.Violet;
             this.btnMaterialRelease.ForeColor = System.Drawing.Color.Black;
-            this.btnMaterialRelease.Location = new System.Drawing.Point(993, 344);
+            this.btnMaterialRelease.Location = new System.Drawing.Point(1163, 354);
             this.btnMaterialRelease.Name = "btnMaterialRelease";
             this.btnMaterialRelease.Size = new System.Drawing.Size(150, 30);
             this.btnMaterialRelease.TabIndex = 2;
@@ -253,7 +269,7 @@
             this.btnMaterialSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnMaterialSelect.BackColor = System.Drawing.Color.DarkSeaGreen;
             this.btnMaterialSelect.ForeColor = System.Drawing.Color.Black;
-            this.btnMaterialSelect.Location = new System.Drawing.Point(835, 344);
+            this.btnMaterialSelect.Location = new System.Drawing.Point(1005, 354);
             this.btnMaterialSelect.Name = "btnMaterialSelect";
             this.btnMaterialSelect.Size = new System.Drawing.Size(150, 30);
             this.btnMaterialSelect.TabIndex = 3;
@@ -292,25 +308,27 @@
             this.Column4,
             this.Column5,
             this.Column12,
+            this.Column14,
             this.Column6,
             this.Column7});
             this.dgvMaster.EnableHeadersVisualStyles = false;
-            this.dgvMaster.Location = new System.Drawing.Point(8, 6);
+            this.dgvMaster.Location = new System.Drawing.Point(5, 6);
             this.dgvMaster.MultiSelect = false;
             this.dgvMaster.Name = "dgvMaster";
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvMaster.RowHeadersVisible = false;
             this.dgvMaster.RowHeadersWidth = 20;
             this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1135, 330);
+            this.dgvMaster.Size = new System.Drawing.Size(1310, 342);
             this.dgvMaster.TabIndex = 0;
+            this.dgvMaster.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvMaster_CellBeginEdit);
             this.dgvMaster.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellClick);
             this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellEnter);
             this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged);
@@ -321,7 +339,6 @@
             this.Column13.Name = "Column13";
             this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column13.Visible = false;
             // 
             // Column1
             // 
@@ -333,7 +350,7 @@
             this.Column1.ReadOnly = true;
             this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 40;
+            this.Column1.Width = 50;
             // 
             // Column11
             // 
@@ -342,7 +359,6 @@
             this.Column11.ReadOnly = true;
             this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column11.Visible = false;
             // 
             // Column2
             // 
@@ -365,7 +381,6 @@
             this.Column9.ReadOnly = true;
             this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic;
-            this.Column9.Visible = false;
             // 
             // Column8
             // 
@@ -374,7 +389,6 @@
             this.Column8.ReadOnly = true;
             this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column8.Visible = false;
             // 
             // Column3
             // 
@@ -386,7 +400,7 @@
             this.Column3.ReadOnly = true;
             this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 300;
+            this.Column3.Width = 340;
             // 
             // Column10
             // 
@@ -395,7 +409,6 @@
             this.Column10.ReadOnly = true;
             this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic;
-            this.Column10.Visible = false;
             // 
             // Column4
             // 
@@ -426,15 +439,26 @@
             this.Column12.Name = "Column12";
             this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column12.Visible = false;
             // 
+            // Column14
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
+            this.Column14.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column14.HeaderText = "è²¸å‡ºæ—¥";
+            this.Column14.Name = "Column14";
+            this.Column14.ReadOnly = true;
+            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column14.Width = 125;
+            // 
             // Column6
             // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column6.HeaderText = "è¿”å�´äºˆå®šæ—¥";
             this.Column6.Name = "Column6";
             this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -454,7 +478,7 @@
             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(1166, 537);
+            this.ClientSize = new System.Drawing.Size(1330, 537);
             this.Controls.Add(this.groupBoxEx2);
             this.Controls.Add(this.groupBoxEx1);
             this.Controls.Add(this.button6);
@@ -482,13 +506,11 @@
 
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label lblDETAILSTRING;
         private System.Windows.Forms.Label lblPerson;
         private System.Windows.Forms.Button btnEnd;
         private System.Windows.Forms.Button btnDataEntry;
-        private ComboBoxEX cmbProcessDate;
         private System.Windows.Forms.Button btnMaterialRelease;
         private System.Windows.Forms.Button btnMaterialSelect;
         private System.Windows.Forms.Button btnMaterialHistory;
@@ -496,6 +518,9 @@
         private DataGridViewEX dgvMaster;
         private GroupBoxEx groupBoxEx1;
         private GroupBoxEx groupBoxEx2;
+        private System.Windows.Forms.Label lblLabel01;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label lblProcessDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
@@ -507,6 +532,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
     }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.resx	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.resx	(revision 308)
@@ -144,4 +144,7 @@
   <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column14.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: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs	(revision 308)
@@ -44,6 +44,7 @@
                 strSQL.AppendFormat(" and DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
                 if (!IoConB.SelectAction(strSQL.ToString(), ref ConB)) return;
 
+                lblLabel01.Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
                 lblDETAILSTRING.Text = ConB.DetailString;
 
                 // æ‹…å½“ã�«ãƒ­ã‚°ã‚¤ãƒ³ãƒ¦ãƒ¼ã‚¶ãƒ¼å��ã‚’è¡¨ç¤º
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.designer.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.designer.cs	(revision 308)
@@ -46,6 +46,7 @@
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.button3 = new System.Windows.Forms.Button();
             this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.lblLabel01 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
@@ -87,7 +88,7 @@
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label1.Cursor = System.Windows.Forms.Cursors.Arrow;
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(383, 8);
+            this.label1.Location = new System.Drawing.Point(415, 8);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(500, 20);
             this.label1.TabIndex = 0;
@@ -99,7 +100,7 @@
             this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnEnd.BackColor = System.Drawing.Color.Blue;
             this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1138, 502);
+            this.btnEnd.Location = new System.Drawing.Point(1202, 502);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
             this.btnEnd.TabIndex = 10;
@@ -112,7 +113,7 @@
             this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnDataEntry.BackColor = System.Drawing.Color.Green;
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(1012, 502);
+            this.btnDataEntry.Location = new System.Drawing.Point(1076, 502);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
             this.btnDataEntry.TabIndex = 9;
@@ -136,6 +137,7 @@
             // groupBoxEx2
             // 
             this.groupBoxEx2.BorderColor = System.Drawing.Color.White;
+            this.groupBoxEx2.Controls.Add(this.lblLabel01);
             this.groupBoxEx2.Controls.Add(this.label2);
             this.groupBoxEx2.Controls.Add(this.label3);
             this.groupBoxEx2.Controls.Add(this.label4);
@@ -142,12 +144,24 @@
             this.groupBoxEx2.Controls.Add(this.lblRepaydate);
             this.groupBoxEx2.Controls.Add(this.lblDETAILSTRING);
             this.groupBoxEx2.Controls.Add(this.lblPerson);
-            this.groupBoxEx2.Location = new System.Drawing.Point(8, 36);
+            this.groupBoxEx2.Location = new System.Drawing.Point(5, 36);
             this.groupBoxEx2.Name = "groupBoxEx2";
-            this.groupBoxEx2.Size = new System.Drawing.Size(1250, 66);
+            this.groupBoxEx2.Size = new System.Drawing.Size(1320, 66);
             this.groupBoxEx2.TabIndex = 11;
             this.groupBoxEx2.TabStop = false;
             // 
+            // lblLabel01
+            // 
+            this.lblLabel01.BackColor = System.Drawing.Color.White;
+            this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblLabel01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblLabel01.ForeColor = System.Drawing.Color.Black;
+            this.lblLabel01.Location = new System.Drawing.Point(134, 6);
+            this.lblLabel01.Name = "lblLabel01";
+            this.lblLabel01.Size = new System.Drawing.Size(120, 24);
+            this.lblLabel01.TabIndex = 7;
+            this.lblLabel01.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // label2
             // 
             this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
@@ -169,7 +183,7 @@
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(120, 24);
             this.label3.TabIndex = 3;
-            this.label3.Text = "è¿”å�´æ—¥";
+            this.label3.Text = "ä»Šå›žè¿”å�´æ—¥";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label4
@@ -177,7 +191,7 @@
             this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(315, 36);
+            this.label4.Location = new System.Drawing.Point(262, 36);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(120, 24);
             this.label4.TabIndex = 5;
@@ -191,7 +205,7 @@
             this.lblRepaydate.ForeColor = System.Drawing.Color.Black;
             this.lblRepaydate.Location = new System.Drawing.Point(134, 36);
             this.lblRepaydate.Name = "lblRepaydate";
-            this.lblRepaydate.Size = new System.Drawing.Size(165, 24);
+            this.lblRepaydate.Size = new System.Drawing.Size(120, 24);
             this.lblRepaydate.TabIndex = 4;
             this.lblRepaydate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -200,9 +214,9 @@
             this.lblDETAILSTRING.BackColor = System.Drawing.Color.White;
             this.lblDETAILSTRING.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblDETAILSTRING.ForeColor = System.Drawing.Color.Black;
-            this.lblDETAILSTRING.Location = new System.Drawing.Point(134, 6);
+            this.lblDETAILSTRING.Location = new System.Drawing.Point(262, 6);
             this.lblDETAILSTRING.Name = "lblDETAILSTRING";
-            this.lblDETAILSTRING.Size = new System.Drawing.Size(1110, 24);
+            this.lblDETAILSTRING.Size = new System.Drawing.Size(1050, 24);
             this.lblDETAILSTRING.TabIndex = 2;
             this.lblDETAILSTRING.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -211,7 +225,7 @@
             this.lblPerson.BackColor = System.Drawing.Color.White;
             this.lblPerson.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblPerson.ForeColor = System.Drawing.Color.Black;
-            this.lblPerson.Location = new System.Drawing.Point(443, 36);
+            this.lblPerson.Location = new System.Drawing.Point(390, 36);
             this.lblPerson.Name = "lblPerson";
             this.lblPerson.Size = new System.Drawing.Size(160, 24);
             this.lblPerson.TabIndex = 6;
@@ -225,9 +239,9 @@
             this.groupBoxEx1.Controls.Add(this.label5);
             this.groupBoxEx1.Controls.Add(this.tglAllReturn);
             this.groupBoxEx1.Controls.Add(this.dgvMaster);
-            this.groupBoxEx1.Location = new System.Drawing.Point(8, 110);
+            this.groupBoxEx1.Location = new System.Drawing.Point(5, 110);
             this.groupBoxEx1.Name = "groupBoxEx1";
-            this.groupBoxEx1.Size = new System.Drawing.Size(1250, 380);
+            this.groupBoxEx1.Size = new System.Drawing.Size(1320, 380);
             this.groupBoxEx1.TabIndex = 7;
             this.groupBoxEx1.TabStop = false;
             // 
@@ -317,7 +331,7 @@
             this.Column15,
             this.Column16});
             this.dgvMaster.EnableHeadersVisualStyles = false;
-            this.dgvMaster.Location = new System.Drawing.Point(10, 6);
+            this.dgvMaster.Location = new System.Drawing.Point(5, 6);
             this.dgvMaster.MultiSelect = false;
             this.dgvMaster.Name = "dgvMaster";
             dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -331,7 +345,7 @@
             this.dgvMaster.RowHeadersVisible = false;
             this.dgvMaster.RowHeadersWidth = 20;
             this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1230, 342);
+            this.dgvMaster.Size = new System.Drawing.Size(1310, 342);
             this.dgvMaster.TabIndex = 0;
             this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellEnter);
             this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged);
@@ -346,7 +360,7 @@
             this.Column1.ReadOnly = true;
             this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 40;
+            this.Column1.Width = 50;
             // 
             // Column8
             // 
@@ -364,7 +378,7 @@
             this.Column2.Name = "Column2";
             this.Column2.ReadOnly = true;
             this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 150;
+            this.Column2.Width = 115;
             // 
             // Column9
             // 
@@ -388,7 +402,7 @@
             this.Column3.ReadOnly = true;
             this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 270;
+            this.Column3.Width = 300;
             // 
             // Column11
             // 
@@ -406,6 +420,7 @@
             this.Column14.ReadOnly = true;
             this.Column14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column14.Width = 125;
             // 
             // Column4
             // 
@@ -419,7 +434,7 @@
             this.Column4.ReadOnly = true;
             this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column4.Width = 80;
+            this.Column4.Width = 90;
             // 
             // Column5
             // 
@@ -433,7 +448,7 @@
             this.Column5.ReadOnly = true;
             this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 80;
+            this.Column5.Width = 90;
             // 
             // Column17
             // 
@@ -446,7 +461,7 @@
             this.Column17.ReadOnly = true;
             this.Column17.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column17.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column17.Width = 80;
+            this.Column17.Width = 90;
             // 
             // Column6
             // 
@@ -457,7 +472,7 @@
             this.Column6.Name = "Column6";
             this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 80;
+            this.Column6.Width = 90;
             // 
             // Column13
             // 
@@ -468,7 +483,7 @@
             this.Column13.Name = "Column13";
             this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column13.Width = 80;
+            this.Column13.Width = 90;
             // 
             // Column12
             // 
@@ -502,7 +517,7 @@
             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(1266, 537);
+            this.ClientSize = new System.Drawing.Size(1330, 537);
             this.Controls.Add(this.groupBoxEx2);
             this.Controls.Add(this.groupBoxEx1);
             this.Controls.Add(this.button3);
@@ -563,5 +578,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column15;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column16;
+        private System.Windows.Forms.Label lblLabel01;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudget.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudget.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudget.cs	(revision 308)
@@ -239,14 +239,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆ
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
             DispData();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs	(revision 308)
@@ -286,14 +286,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.cs	(revision 308)
@@ -312,14 +312,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqList.cs	(revision 308)
@@ -287,14 +287,6 @@
         {
             if (m_initDataLoad) return;
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
-            SetcmbDepartment();
-            SetcmbPersons();
-            cmbDepartment.SelectedValue = DepCode;
-            cmbConstructionPerson.SelectedValue = PerCode;
-
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 308)
@@ -661,12 +661,6 @@
 
         #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>
@@ -696,11 +690,6 @@
                 }
                 // ƒ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)
             {
@@ -726,6 +715,7 @@
             {
                 if (CurRow == null) return;
 
+                int CurVal = 0;
                 // ƒZƒ‹’l‚Ìƒ`ƒFƒbƒN
                 switch (e.ColumnIndex)
                 {
@@ -732,13 +722,12 @@
                     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;
-                        }
+                        if (m_CheckCol != e.ColumnIndex || m_CheckRow != e.RowIndex) return;
+                        CurVal = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value);
                         break;
                 }
+                // ’l‚Ìƒ`ƒFƒbƒN�i“¯‚¶�ê�‡‚Í•Ï�Xƒtƒ‰ƒO‚ðON‚É‚µ‚È‚¢�j
+                if (CommonMotions.cnvInt(m_BeforeValue) == CurVal) return;
 
                 // •Ï�Xƒtƒ‰ƒO
                 CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
@@ -779,122 +768,97 @@
         }
         #endregion
 
-        #region �~ƒ{ƒ^ƒ“
+        #region ƒtƒH�[ƒ€KeyDown
         /// <summary>
-        /// �~ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// EntryƒL�[‚Å‚ÌˆÚ“®�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FrmRequestSummaryList_FormClosing(object sender, FormClosingEventArgs e)
+        private void FrmRequestSummaryList_KeyDown(object sender, KeyEventArgs e)
         {
-            if (m_bChengeAns)
+            //EnterƒL�[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚é‚©Šm”F
+            //Alt‚©CtrlƒL�[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚éŽž‚Í–³Ž‹‚·‚é
+            if ((e.KeyCode == Keys.Enter) && !e.Alt && !e.Control)
             {
-                if (MessageBox.Show("ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É�I—¹‚µ‚Ä‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "�I—¹Šm”F"
-                                , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
-                {
-                    e.Cancel = true;
-                    return;
-                }
+                //‚ ‚½‚©‚àTabƒL�[‚ª‰Ÿ‚³‚ê‚½‚©‚Ì‚æ‚¤‚É‚·‚é
+                //Shift‚ª‰Ÿ‚³‚ê‚Ä‚¢‚éŽž‚Í‘O‚ÌƒRƒ“ƒgƒ��[ƒ‹‚ÌƒtƒH�[ƒJƒX‚ðˆÚ“®
+                this.ProcessTabKey(!e.Shift);
+
+                e.Handled = true;
+                //.NET Framework 2.0ˆÈ�~
+                e.SuppressKeyPress = true;
             }
-
-            // �I—¹ŽžƒTƒuƒtƒH�[ƒ€ƒNƒ��[ƒY
-            TerminatingProcess();
-
-            // ‘Oƒvƒ�ƒZƒX‚É–ß‚é
-            if (m_CloseingProcessOff) ClsExcute.BackProcess();
         }
         #endregion
 
-        #region �I—¹ƒ{ƒ^ƒ“
+        #region ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// <summary>
-        /// �I—¹ƒ{ƒ^ƒ“ƒNƒŠƒbƒN
+        /// ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
+        private void DataGridView_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
-            if (m_FrmLedger != null)
-            {
-                m_FrmLedger.Close();
-                m_FrmLedger.Dispose();
-                m_FrmLedger = null;
-            }
-
-            this.Close();
+            // ƒ_ƒuƒ‹ƒNƒŠƒbƒN�ˆ—�
+            GridDoubleClick(sender, e);
         }
         #endregion
 
-        #region “o˜^ƒ{ƒ^ƒ“
+        #region ƒZƒ‹•Ï�XŒãƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¢�ê�‡ƒRƒ~ƒbƒg‚·‚é
         /// <summary>
-        /// “o˜^ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// ƒZƒ‹•Ï�XŒãƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¢�ê�‡ƒRƒ~ƒbƒg‚·‚é
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnDataEntry_Click(object sender, EventArgs e)
+        private void DataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
         {
-            try
-            {
-                DataGridView dgv = getShowingView();
+            DataGridView dgv = (DataGridView)sender;
 
-                // �ˆ—�‚µ‚È‚¢
-                if ((m_Select_DataCount == 0 && dgv.Rows.Count == 0)
-                    || (m_EditLock))
-                {
-                    return;
-                }
-
-                //ƒf�[ƒ^ƒ`ƒFƒbƒN
-                if (!DispFeildCheck()) return;
-
-                if (MessageBox.Show("•\Ž¦’†‚Ìƒf�[ƒ^‚ð“o˜^‚µ‚Ü‚·�B", "“o˜^Šm”F", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
-
-                // ƒf�[ƒ^“o˜^
-                if (!DataEntryProcess()) return;
-
-                // ƒf�[ƒ^•\Ž¦
-                DispGridData();
-
-                // �I—¹ƒ�ƒbƒZ�[ƒW•\Ž¦
-                string strProcName = string.Empty;
-                if (m_Labourkind == (int)CommonDefine.LabourKinds.Labor)
-                {
-                    strProcName = "ŽèŠÔŽx•¥ƒf�[ƒ^";
-                }
-                else
-                {
-                    strProcName = "‹ÆŽÒŽx•¥ƒf�[ƒ^";
-                }
-                CommonMotions.EntryEndMessage(strProcName);
-
-            }
-            catch (System.Exception ex)
+            if (dgv.CurrentCellAddress.X == (int)DispColumn.KyoryokuUmu && dgv.IsCurrentCellDirty)
             {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                //ƒRƒ~ƒbƒg‚·‚é
+                dgv.CommitEdit(DataGridViewDataErrorContexts.Commit);
+                m_bChengeAns = true;
             }
 
         }
         #endregion
 
-        #region ƒtƒH�[ƒ€KeyDown
+        #region ƒZƒ‹“ü—ÍŠJŽnŽž�ˆ—�
         /// <summary>
-        /// EntryƒL�[‚Å‚ÌˆÚ“®�ˆ—�
+        /// “ü—Í‘O’l
         /// </summary>
+        object m_BeforeValue = null;
+        int m_CheckCol = -1;
+        int m_CheckRow = -1;
+        /// <summary>
+        /// ƒZƒ‹“ü—ÍŠJŽnŽž�ˆ—�
+        /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FrmRequestSummaryList_KeyDown(object sender, KeyEventArgs e)
+        private void DataGridView_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
         {
-            //EnterƒL�[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚é‚©Šm”F
-            //Alt‚©CtrlƒL�[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚éŽž‚Í–³Ž‹‚·‚é
-            if ((e.KeyCode == Keys.Enter) && !e.Alt && !e.Control)
-            {
-                //‚ ‚½‚©‚àTabƒL�[‚ª‰Ÿ‚³‚ê‚½‚©‚Ì‚æ‚¤‚É‚·‚é
-                //Shift‚ª‰Ÿ‚³‚ê‚Ä‚¢‚éŽž‚Í‘O‚ÌƒRƒ“ƒgƒ��[ƒ‹‚ÌƒtƒH�[ƒJƒX‚ðˆÚ“®
-                this.ProcessTabKey(!e.Shift);
 
-                e.Handled = true;
-                //.NET Framework 2.0ˆÈ�~
-                e.SuppressKeyPress = true;
-            }
+            DataGridView dgv = (DataGridView)sender;
+
+            // “ü—ÍƒJƒ‰ƒ€ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+            if (e.ColumnIndex < (int)DispColumn.SomuSeikyu) return;
+            if ((int)DispColumn.KyoryokuUmu <= e.ColumnIndex) return;
+
+            ////Œ»�ê–¢“ü—Í‚ÍŒ»�ê‚É�¿‹�‹àŠz“ü—Í‚³‚¹‚È‚¢
+            //if (CommonMotions.cnvInt(dgv.Rows[e.RowIndex].Cells[m_Genba_Column].Value) == 0)
+            //{
+            //    e.Cancel = true;
+            //    return;
+            //}
+
+            dgv[e.ColumnIndex, e.RowIndex].Value = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value);
+            dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = SystemColors.ControlText;
+
+            // ƒZƒ‹’lŽæ“¾
+            m_BeforeValue = dgv.CurrentCell.Value;
+            m_CheckCol = e.ColumnIndex;
+            m_CheckRow = e.RowIndex;
         }
         #endregion
 
@@ -980,66 +944,6 @@
         }
         #endregion
 
-        #region ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒN
-        /// <summary>
-        /// ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒN
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DataGridView_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // ƒ_ƒuƒ‹ƒNƒŠƒbƒN�ˆ—�
-            GridDoubleClick(sender, e);
-        }
-        #endregion
-
-        #region ƒZƒ‹•Ï�XŒãƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¢�ê�‡ƒRƒ~ƒbƒg‚·‚é
-        /// <summary>
-        /// ƒZƒ‹•Ï�XŒãƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¢�ê�‡ƒRƒ~ƒbƒg‚·‚é
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
-        {
-            DataGridView dgv = (DataGridView)sender;
-
-            if (dgv.CurrentCellAddress.X == (int)DispColumn.KyoryokuUmu && dgv.IsCurrentCellDirty)
-            {
-                //ƒRƒ~ƒbƒg‚·‚é
-                dgv.CommitEdit(DataGridViewDataErrorContexts.Commit);
-                m_bChengeAns = true;
-            }
-
-        }
-        #endregion
-
-        #region ƒZƒ‹“ü—ÍŠJŽnŽž�ˆ—�
-        /// <summary>
-        /// ƒZƒ‹“ü—ÍŠJŽnŽž�ˆ—�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DataGridView_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
-        {
-
-            DataGridView dgv = (DataGridView)sender;
-
-            // “ü—ÍƒJƒ‰ƒ€ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-            if (e.ColumnIndex < (int)DispColumn.SomuSeikyu) return;
-            if ((int)DispColumn.KyoryokuUmu <= e.ColumnIndex) return;
-
-            ////Œ»�ê–¢“ü—Í‚ÍŒ»�ê‚É�¿‹�‹àŠz“ü—Í‚³‚¹‚È‚¢
-            //if (CommonMotions.cnvInt(dgv.Rows[e.RowIndex].Cells[m_Genba_Column].Value) == 0)
-            //{
-            //    e.Cancel = true;
-            //    return;
-            //}
-
-            dgv[e.ColumnIndex, e.RowIndex].Value = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value);
-            dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = SystemColors.ControlText;
-        }
-        #endregion
-
         #region ƒZƒ‹“ü—ÍŠ®—¹Œã�ˆ—�
         /// <summary>
         /// ƒZƒ‹“ü—ÍŠ®—¹Œã�ˆ—�
@@ -1189,6 +1093,102 @@
         }
         #endregion
 
+        #region �~ƒ{ƒ^ƒ“
+        /// <summary>
+        /// �~ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmRequestSummaryList_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (m_bChengeAns)
+            {
+                if (MessageBox.Show("ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É�I—¹‚µ‚Ä‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "�I—¹Šm”F"
+                                , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                {
+                    e.Cancel = true;
+                    return;
+                }
+            }
+
+            // �I—¹ŽžƒTƒuƒtƒH�[ƒ€ƒNƒ��[ƒY
+            TerminatingProcess();
+
+            // ‘Oƒvƒ�ƒZƒX‚É–ß‚é
+            if (m_CloseingProcessOff) ClsExcute.BackProcess();
+        }
+        #endregion
+
+        #region �I—¹ƒ{ƒ^ƒ“
+        /// <summary>
+        /// �I—¹ƒ{ƒ^ƒ“ƒNƒŠƒbƒN
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnEnd_Click(object sender, EventArgs e)
+        {
+            if (m_FrmLedger != null)
+            {
+                m_FrmLedger.Close();
+                m_FrmLedger.Dispose();
+                m_FrmLedger = null;
+            }
+
+            this.Close();
+        }
+        #endregion
+
+        #region “o˜^ƒ{ƒ^ƒ“
+        /// <summary>
+        /// “o˜^ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnDataEntry_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                DataGridView dgv = getShowingView();
+
+                // �ˆ—�‚µ‚È‚¢
+                if ((m_Select_DataCount == 0 && dgv.Rows.Count == 0)
+                    || (m_EditLock))
+                {
+                    return;
+                }
+
+                //ƒf�[ƒ^ƒ`ƒFƒbƒN
+                if (!DispFeildCheck()) return;
+
+                if (MessageBox.Show("•\Ž¦’†‚Ìƒf�[ƒ^‚ð“o˜^‚µ‚Ü‚·�B", "“o˜^Šm”F", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
+
+                // ƒf�[ƒ^“o˜^
+                if (!DataEntryProcess()) return;
+
+                // ƒf�[ƒ^•\Ž¦
+                DispGridData();
+
+                // �I—¹ƒ�ƒbƒZ�[ƒW•\Ž¦
+                string strProcName = string.Empty;
+                if (m_Labourkind == (int)CommonDefine.LabourKinds.Labor)
+                {
+                    strProcName = "ŽèŠÔŽx•¥ƒf�[ƒ^";
+                }
+                else
+                {
+                    strProcName = "‹ÆŽÒŽx•¥ƒf�[ƒ^";
+                }
+                CommonMotions.EntryEndMessage(strProcName);
+
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+
+        }
+        #endregion
+
         #region ‹ÆŽÒ�í�œƒ{ƒ^ƒ“
         /// <summary>
         /// ‹ÆŽÒ�í�œƒ{ƒ^ƒ“
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 308)
@@ -5438,6 +5438,503 @@
         }
         #endregion
 
+        #region ƒf�[ƒ^“o˜^
+        /// <summary>
+        /// ƒf�[ƒ^“o˜^
+        /// </summary>
+        private bool DataEntryProcess2()
+        {
+
+            IOBillingData IoBd = new IOBillingData();
+            IOBillingDataDetail IoBdD = new IOBillingDataDetail();
+            IOPaymentDataDetail IoPdD = new IOPaymentDataDetail();
+            IOPaymentApprovalInfo IoPaI = new IOPaymentApprovalInfo();
+            IOBillingPaymentSummary IoBps = new IOBillingPaymentSummary();
+            IOConstructionLedgerDetail IoDetail = new IOConstructionLedgerDetail();
+            IOConstructionLedgerExcute IoExec = new IOConstructionLedgerExcute();
+
+            DataGridView dgv = getShowingView();
+
+            List<BillingData> BdList = new List<BillingData>();
+            List<BillingDataDetail> BdDList = new List<BillingDataDetail>();
+            List<PaymentDataDetail> PdDList = new List<PaymentDataDetail>();
+            List<BillingPaymentSummary> BpsList = new List<BillingPaymentSummary>();
+            ArrayList CleEntryList = new ArrayList();
+
+            BillingData BdWork = new BillingData();
+            BillingDataDetail BdDWork;
+            PaymentDataDetail PdDWork;
+            BillingPaymentSummary BpsWork = new BillingPaymentSummary();
+
+            int iCompanyCode = 0, iSeqNo = 0, iLineCount = 0, iLineMax = 0;
+            int iTantoShoninCount = 0;
+            bool bBdData = false;
+            bool bDeleteData = false;
+            bool bMakeBpsData = false;
+            bool bDeleteBpsData = false;
+
+            string strBdWhere = "";
+            string strBdDWhere = "";
+            string strPdDWhere = "";
+            string strBpsWhere = "";
+
+            StringBuilder strWhere = new StringBuilder();
+            StringBuilder MaxLineNoSql = new StringBuilder();
+            try
+            {
+                // ƒvƒ�ƒOƒŒƒX•\Ž¦�§Œä
+                ProgressBarCtrl(true);
+
+                // ˆê’UƒZƒ‹‚Ì’l•Ï�XƒCƒxƒ“ƒg‚ð–³Œø‚É‚·‚é
+                dgv.CellValueChanged -= DataGridView_CellValueChanged;
+
+                DataProgressBar.Maximum = dgv.RowCount + 6;
+                DataProgressBar.Value = 0;
+
+                int TargetDate = m_Select_TargetDate;
+
+                IoBd.connect(); IoBd.beginTran();
+                IoBdD.connect(); IoBdD.beginTran();
+                IoPdD.connect(); IoPdD.beginTran();
+                IoPaI.connect(); IoPaI.beginTran();
+                IoBps.connect(); IoBps.beginTran();
+                IoDetail.connect(); IoDetail.beginTran();
+                IoExec.connect(); IoExec.beginTran();
+
+                // �í�œ�ˆ—�ŽÀ�sƒtƒ‰ƒO
+                bool bError = false;
+                bDeleteData = CheckDataDelete(IoBdD, ref  BdDList, bError);
+                if (bError) return false;
+
+                DataProgressBar.Value++;
+                DataProgressBar.Update();
+
+                try
+                {
+
+                    // �í�œ
+                    if (bDeleteData == true)
+                    {
+                        if (!DataDeleteProcess(IoBd, IoBdD, IoPdD, IoPaI, TargetDate))
+                        {
+                            // RollBack
+                            DataEntryRollBack(IoBd, IoBdD, IoPdD, IoPaI, IoBps, IoDetail, IoExec);
+                            return false;
+                        }
+                    }
+                    DataProgressBar.Value++;
+                    DataProgressBar.Update();
+
+                    // •K—v�s’Š�o ‹ÆŽÒƒR�[ƒh�A˜A”Ô�A�s”Ô�†�¸�‡
+                    DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
+                                                                                        && (cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Added
+                                                                                        || cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Modified))
+                                                                             .OrderBy(x => x.Cells[m_Company_Column].Value)
+                                                                             .ThenBy(x => x.Cells[(int)DispColumn.GroupSeqNo].Value)
+                                                                             .ThenBy(x => x.Cells[(int)DispColumn.LineCount].Value)
+                                                                             .ToArray();
+
+                    iCompanyCode = 0;
+                    iSeqNo = 0;
+                    iLineCount = 0;
+                    iLineMax = 0;
+
+                    int NowCompanyCode = 0;
+                    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);
+
+                        // ‹ÆŽÒƒR�[ƒh�A‚Ü‚½‚Í˜A”Ô‚ªˆÙ‚È‚é�ê�‡
+                        if (iCompanyCode != NowCompanyCode || iSeqNo != NowSeqNo)
+                        {
+
+                            if (bBdData == true)
+                            {
+                                int lSoumuBillGoukei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
+                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo)
+                                                                                       .Sum(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.SomuSeikyu].Value));
+                                // ƒf�[ƒ^‚Ì’l‚ÆƒOƒŠƒbƒhƒrƒ…�[‚Ì’l‚ðƒ`ƒFƒbƒN
+                                if (BdWork.BillPrice != lSoumuBillGoukei)
+                                {
+                                    // ƒ�ƒbƒN
+                                    if (!IoBd.RowLock(iCompanyCode, TargetDate, iSeqNo, false))
+                                    {
+                                        throw new Exception("‹Æ–±�¿‹�ƒf�[ƒ^�F‘¼‚Ìƒ†�[ƒU‚Å•Ò�W’†‚Ì‚½‚ß�A�ˆ—�‚Å‚«‚Ü‚¹‚ñ�B");
+                                    }
+                                    BdWork.BillPrice = lSoumuBillGoukei;
+                                    // �X�V�i‹Æ–±�¿‹�ƒf�[ƒ^�j
+                                    if (!IoBd.UpdateAction(strBdWhere, BdWork, false))
+                                    {
+                                        throw new Exception("‹Æ–±�¿‹�ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                                    }
+                                }
+                            }
+
+                            // ‹ÆŽÒ�¿‹�ƒf�[ƒ^
+                            bBdData = false;
+                            strBdWhere = IoBd.CreatePrimarykeyString(NowCompanyCode, TargetDate, NowSeqNo);
+                            BdList.Clear();
+
+                            // ƒf�[ƒ^Šm”F
+                            if (!IoBd.SelectAction(strBdWhere, ref BdList, false))
+                            {
+                                throw new Exception("‹ÆŽÒ�¿‹�ƒf�[ƒ^�F“o˜^Šm”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
+
+                            BdWork = new BillingData();
+
+                            // �V‹K�i‹Æ–±�¿‹�ƒf�[ƒ^�j
+                            if (BdList.Count == 0)
+                            {
+                                iLineMax = 0; // �V‹K‚È‚Ì‚Å0‚ð�Ý’è
+                                BdWork.CompanyCode = NowCompanyCode;
+                                BdWork.TargetDate = TargetDate;
+                                BdWork.SeqNo = iSeqNo != 0 ? iSeqNo : NowSeqNo;
+                                BdWork.BillPrice = GetSeqGoukei(dgv, BdWork.CompanyCode, BdWork.SeqNo, DispColumn.SomuSeikyu);
+
+                                BdList.Clear();
+                                BdList.Add(BdWork);
+
+                                if (!IoBd.InsertAction(BdList, false))
+                                {
+                                    throw new Exception("‹ÆŽÒ�¿‹�ƒf�[ƒ^�F’Ç‰Á�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                                }
+                            }
+                            else
+                            {
+                                // �s”Ô�†‚Ì�Å‘å‚ð�Ý’è
+                                MaxLineNoSql.Clear();
+                                MaxLineNoSql.AppendFormat(" where COMPANYCODE = {0}", iCompanyCode != 0 ? iCompanyCode : NowCompanyCode);
+                                MaxLineNoSql.AppendFormat(" and TARGETDATE = {0}", TargetDate);
+                                iLineMax = SelectMaxLineNo(IoBdD, MaxLineNoSql.ToString(), false);
+                                bBdData = true;
+                                BdWork.BillPrice = BdList[0].BillPrice;
+                            }
+
+
+                            // ‹ÆŽÒƒR�[ƒh‚ª•Ï‚í‚éŽž‚Ì‚Ý
+                            if (iCompanyCode != NowCompanyCode)
+                            {
+                                // ‹ÆŽÒ�¿‹�Žx•¥ƒTƒ}ƒŠ�[ƒf�[ƒ^-----------------------------------------------
+                                if (bMakeBpsData == true)
+                                {
+                                    BillingPaymentSummary_DataEntry(dgv,
+                                                                    iCompanyCode != 0 ? iCompanyCode : NowCompanyCode,
+                                                                    bDeleteBpsData,
+                                                                    iTantoShoninCount,
+                                                                    IoBps,
+                                                                    BpsList,
+                                                                    BpsWork,
+                                                                    strBpsWhere);
+                                }
+                                bMakeBpsData = false;
+                                bDeleteBpsData = false;
+                                iTantoShoninCount = 0;
+
+                            }
+
+                            iCompanyCode = NowCompanyCode;
+                            iSeqNo = NowSeqNo;
+                        }
+
+                        // �sƒJƒEƒ“ƒgŽæ“¾
+                        iLineCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.LineCount].Value);
+
+                        // �V‹K“o˜^‚Ì‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^‚Å�s”Ô�†‚ª0‚È‚Ì‚Å�Å‘å�s”Ô�†‚ð�Ý’è‚·‚é
+                        if (iLineCount == 0)
+                        {
+                            r.Cells[(int)DispColumn.LineCount].Value = ++iLineMax;
+                            iLineCount = iLineMax;
+                        }
+
+                        // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^--------------------------------------------------------------
+                        strBdDWhere = IoBdD.CreatePrimarykeyString(NowCompanyCode, TargetDate, NowSeqNo, iLineCount);
+
+                        // ƒf�[ƒ^Šm”F
+                        BdDList.Clear();
+                        if (!IoBdD.SelectAction(strBdDWhere, ref BdDList, false))
+                        {
+                            throw new Exception("‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�F“o˜^Šm”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                        }
+
+                        string strOverComment = "�yŽx•¥‹àŠz’´‰ß�z";
+                        // Žx•¥‹àŠz’´‰ßƒ`ƒFƒbƒN
+                        if (!ClsChangeLedgerData.OverExecAmount(CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value),
+                                                                CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerLineNo].Value),
+                                                                CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiSeikyu].Value),
+                                                                m_Select_TargetDate,
+                                                                NowCompanyCode))
+                        {
+                            if (CommonMotions.cnvString(r.Cells[(int)DispColumn.Bikou].Value).IndexOf(strOverComment) >= 0)
+                            {
+                                strOverComment = string.Empty;
+                            }
+                            r.Cells[(int)DispColumn.Bikou].Value = strOverComment + CommonMotions.cnvString(r.Cells[(int)DispColumn.Bikou].Value);
+                        }
+                        else
+                        {
+                            if (CommonMotions.cnvString(r.Cells[(int)DispColumn.Bikou].Value).IndexOf(strOverComment) >= 0)
+                            {
+                                r.Cells[(int)DispColumn.Bikou].Value = r.Cells[(int)DispColumn.Bikou].Value.ToString().Replace(strOverComment, "");
+                            }
+                        }
+
+                        // ƒf�[ƒ^ƒZƒbƒg
+                        BdDWork = new BillingDataDetail();
+                        BdDWork.ConstructionCode = CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value);
+                        BdDWork.ConstructionRowCnt = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerLineNo].Value);
+                        BdDWork.ConstructionColCnt = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerColNo].Value);
+
+                        string sName = CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].Value);
+                        BdDWork.FieldName = sName != "" ? sName : CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].ToolTipText);
+
+                        BdDWork.BillPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.SomuSeikyu].Value);
+                        BdDWork.HighwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.SomuKosoku].Value);
+                        BdDWork.HardwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.SomuKanamono].Value);
+                        BdDWork.IndsWasteTax = CommonMotions.cnvLong(r.Cells[(int)DispColumn.SomuSannhaiZei].Value);
+                        BdDWork.Note = CommonMotions.cnvString(r.Cells[(int)DispColumn.Bikou].Value);
+                        if (BdDList.Count == 0)
+                        {
+                            // �V‹K�i‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�j
+                            BdDWork.CompanyCode = NowCompanyCode;
+                            BdDWork.TargetDate = TargetDate;
+                            BdDWork.SeqNo = NowSeqNo;
+                            BdDWork.LineCount = iLineCount;
+
+                            BdDList.Clear();
+                            BdDList.Add(BdDWork);
+
+                            if (!IoBdD.InsertAction(BdDList, false))
+                            {
+                                throw new Exception("‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�F’Ç‰Á�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
+                        }
+                        else
+                        {
+                            // �X�V�i‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�j
+                            // ƒ�ƒbƒN
+                            if (!IoBdD.RowLock(iCompanyCode, TargetDate, iSeqNo, iLineCount, false))
+                            {
+                                throw new Exception("‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�F:‘¼‚Ìƒ†�[ƒU‚Å•Ò�W’†‚Ì‚½‚ß�A�ˆ—�‚Å‚«‚Ü‚¹‚ñ�B");
+                            }
+
+                            // ƒf�[ƒ^�X�V
+                            if (!IoBdD.UpdateAction(strBdDWhere, BdDWork, false))
+                            {
+                                throw new Exception("‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
+                        }
+
+
+                        // Žx•¥–¾�×ƒf�[ƒ^-----------------------------------------------------------------
+
+                        strPdDWhere = IoPdD.CreatePrimarykeyString(NowCompanyCode, TargetDate, NowSeqNo, iLineCount);
+                        // ƒf�[ƒ^Šm”F
+                        PdDList.Clear();
+                        if (!IoPdD.SelectAction(strPdDWhere, ref PdDList, false))
+                        {
+                            throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F“o˜^Šm”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                        }
+
+                        // ƒf�[ƒ^ƒZƒbƒg
+                        PdDWork = new PaymentDataDetail();
+                        PdDWork.BillPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSeikyu].Value);
+                        PdDWork.DiscountPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiNebiki].Value);
+                        PdDWork.OffsetPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSousai].Value);
+                        PdDWork.NextCoPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.JikaiKurikosi].Value);
+                        PdDWork.HighwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiKosoku].Value);
+                        PdDWork.HardwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiKanamono].Value);
+                        PdDWork.IndsWasteTax = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSannhaiZei].Value);
+                        PdDWork.CnstrPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KyoryokuKin].Value);
+                        PdDWork.CnstrPriceExist = CommonMotions.cnvInt(r.Cells[(int)DispColumn.KyoryokuUmu].Value);
+                        //PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
+
+                        if (PdDList.Count == 0)
+                        {
+                            // �V‹K�iŽx•¥–¾�×ƒf�[ƒ^�j
+                            PdDWork.CompanyCode = NowCompanyCode;
+                            PdDWork.TargetDate = TargetDate;
+                            PdDWork.SeqNo = NowSeqNo;
+                            PdDWork.LineCount = iLineCount;
+
+                            // ’S“–�³”F
+                            if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
+                            {
+                                PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
+                                if (r.Cells[(int)DispColumn.TantoDate].Value == null)
+                                {
+                                    PdDWork.ApprovalDate = DateTime.Now;
+                                }
+                                else
+                                {
+                                    PdDWork.ApprovalDate = CommonMotions.cnvDate(r.Cells[(int)DispColumn.TantoDate].Value);
+                                }
+                            }
+                            else
+                            {
+                                PdDWork.ApprovalDate = DateTime.MinValue;
+                            }
+                            PdDWork.ApprovalEndFlg = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ApprovalEndFlg].Value); // �Å�I�³”F”»’è•K—v
+
+                            PdDList.Clear();
+                            PdDList.Add(PdDWork);
+
+                            if (!IoPdD.InsertAction(PdDList, false))
+                            {
+                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
+
+                        }
+                        else
+                        {
+                            // �X�V�iŽx•¥–¾�×ƒf�[ƒ^�j
+                            // ’S“–�³”F
+                            if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
+                            {
+                                if (PdDList[0].ApprovalPersonCode != 0)
+                                {
+                                    PdDWork.ApprovalPersonCode = PdDList[0].ApprovalPersonCode;
+                                    PdDWork.ApprovalDate = PdDList[0].ApprovalDate;
+                                }
+                                else
+                                {
+                                    PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
+                                    PdDWork.ApprovalDate = DateTime.Now;
+                                }
+                            }
+                            else
+                            {
+                                PdDWork.ApprovalDate = DateTime.MinValue;
+                            }
+                            PdDWork.ApprovalEndFlg = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ApprovalEndFlg].Value); //�Å�I�³”F
+
+
+                            // ƒ�ƒbƒN
+                            if (!IoPdD.RowLock(iCompanyCode, TargetDate, iSeqNo, iLineCount, false))
+                            {
+                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F‘¼‚Ìƒ†�[ƒU‚Å•Ò�W’†‚Ì‚½‚ß�A�ˆ—�‚Å‚«‚Ü‚¹‚ñ�B");
+                            }
+
+                            // ƒf�[ƒ^�X�V
+                            if (!IoPdD.UpdateAction(strPdDWhere, PdDWork, false))
+                            {
+                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
+
+                        }
+
+                        // ----- �HŽ–�Ú�×‘ä’ ‚ÌŽx•¥‹àŠz‚ÌˆêŠ‡“o˜^ƒŠƒXƒg‚Ö’Ç‰Á�i�s’PˆÊ‚Å’Ç‰Á�j
+                        CreateLedgerData(r, ref CleEntryList);
+
+                        DataProgressBar.Value++;
+                        DataProgressBar.Update();
+                    }
+
+                    // �X�V�i‹Æ–±�¿‹�ƒf�[ƒ^�j�ã‹Lƒ‹�[ƒv‚Ì�ÅŒã1Œ�
+                    if (bBdData == true)
+                    {
+                        int lSoumuBillGoukei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
+                                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo)
+                                                                               .Sum(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.SomuSeikyu].Value));
+                        // ƒf�[ƒ^‚Ì’l‚ÆƒOƒŠƒbƒhƒrƒ…�[‚Ì’l‚ðƒ`ƒFƒbƒN
+                        if (BdWork.BillPrice != lSoumuBillGoukei)
+                        {
+                            // ƒ�ƒbƒN
+                            if (!IoBd.RowLock(iCompanyCode, TargetDate, iSeqNo, false))
+                            {
+                                throw new Exception("‹Æ–±�¿‹�ƒf�[ƒ^�F‘¼‚Ìƒ†�[ƒU‚Å•Ò�W’†‚Ì‚½‚ß�A�ˆ—�‚Å‚«‚Ü‚¹‚ñ�B");
+                            }
+
+                            // ƒf�[ƒ^“o˜^
+                            BdWork.BillPrice = lSoumuBillGoukei;
+                            if (!IoBd.UpdateAction(strBdWhere, BdWork, false))
+                            {
+                                throw new Exception("‹Æ–±�¿‹�ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
+                        }
+                    }
+
+                    DataProgressBar.Value++;
+                    DataProgressBar.Update();
+
+                    // ‹ÆŽÒ�¿‹�Žx•¥ƒTƒ}ƒŠ�[ƒf�[ƒ^
+                    if (bMakeBpsData == true)
+                    {
+                        BillingPaymentSummary_DataEntry(dgv
+                                                        , iCompanyCode
+                                                        , bDeleteBpsData
+                                                        , iTantoShoninCount
+                                                        , IoBps
+                                                        , BpsList
+                                                        , BpsWork
+                                                        , strBpsWhere);
+                    }
+                    DataProgressBar.Value++;
+                    DataProgressBar.Update();
+
+                    // �HŽ–�Ú�×‘ä’ Žx•¥‚¢ƒf�[ƒ^ˆêŠ‡“o˜^
+                    if (CleEntryList.Count > 0)
+                    {
+                        if (!ClsChangeLedgerData.EntryExecuteData(IoDetail, IoExec, CleEntryList))
+                        {
+                            DataEntryRollBack(IoBd, IoBdD, IoPdD, IoPaI, IoBps, IoDetail, IoExec);
+                            MessageBox.Show("�HŽ–�Ú�×‘ä’ Žx•¥‚¢ƒf�[ƒ^ˆêŠ‡“o˜^", "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            return false;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    DataEntryRollBack(IoBd, IoBdD, IoPdD, IoPaI, IoBps, IoDetail, IoExec);
+                    MessageBox.Show(ex.Message, "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                m_bChengeAns = false;
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                DataEntryRollBack(IoBd, IoBdD, IoPdD, IoPaI, IoBps, IoDetail, IoExec);
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                IoBd.commit();
+                IoBdD.commit();
+                IoPdD.commit();
+                IoPaI.commit();
+                IoBps.commit();
+                IoDetail.commit();
+                IoExec.commit();
+
+                IoBd.close(); IoBd = null;
+                IoBdD.close(); IoBdD = null;
+                IoPdD.close(); IoPdD = null;
+                IoPaI.close(); IoPaI = null;
+                IoBps.close(); IoBps = null;
+                IoDetail.close(); IoDetail = null;
+                IoExec.close(); IoExec = null;
+
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                DataProgressBar.Value = DataProgressBar.Maximum;
+                DataProgressBar.Update();
+
+                // ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰�Ä“o˜^
+                dgv.CellValueChanged += DataGridView_CellValueChanged;
+
+                // ƒvƒ�ƒOƒŒƒX•\Ž¦�§Œä
+                ProgressBarCtrl(false);
+            }
+
+        }
+        #endregion
+
         #region �HŽ–‘ä’ �X�Vƒf�[ƒ^�ì�¬
         /// <summary>
         /// �HŽ–‘ä’ �X�Vƒf�[ƒ^�ì�¬
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.cs	(revision 308)
@@ -317,25 +317,35 @@
 
                 // æŠ½å‡º
                 StringBuilder sql = new StringBuilder();
-                sql.AppendLine("select   DATE_FORMAT(Mri.PROCESSDATE, '%Y/%m/%d') as PROCESSDATE ");
-                sql.AppendLine("		,ifnull(P.PERSONNAME,'') as PERSONNAME ");
-                sql.AppendLine("        ,case Mri.RECKIND ");
-                sql.AppendLine("			when 0 then 'è²¸å‡º' ");
-                sql.AppendLine("			when 1 then 'è¿”å�´' ");
-                sql.AppendLine("			when 2 then 'è¿½åŠ ' ");
-                sql.AppendLine("			when 3 then 'ç ´æ£„' ");
-                sql.AppendLine("		 end as RECKIND ");
-                sql.AppendLine("        ,ifnull(Cbid.DETAILSTRING,'') as DETAILSTRING ");
-                sql.AppendLine("        ,Mri.MATERIALCOUNT ");
-                sql.AppendLine("        ,case Mri.RECKIND when 0 then ifnull(DATE_FORMAT(Mri.REPAYPLANDATE, '%Y/%m/%d'),'') else '' end as REPAYPLANDATE ");
-                sql.AppendLine("        ,ifnull(Mri.COMMENTTEXT,'') as COMMENTTEXT ");
-                sql.AppendLine("from MaterialRecordInfo as Mri 	left join MaterialInfo as Mi on Mri.MATERIALITEMCODE = Mi.MATERIALITEMCODE  ");
-                sql.AppendLine("								left join personinchargemaster as P on Mri.PERSONCODE = P.PERSONCODE ");
-                sql.AppendLine("                                left join ConstructionBaseInfoDetail as Cbid on Mri.CONSTRUCTIONCODE = Cbid.CONSTRUCTIONCODE and Cbid.DETAILNO = 2 ");
-                sql.AppendFormat("where Mri.MaterialItemCode = {0} ", MaterialItemCode);
-                sql.AppendLine("order by Mri.PROCESSDATE desc,Mri.SEQNO desc ");
-                sql.AppendLine("limit 20");
 
+                sql.Append("SELECT");
+                sql.Append(" DATE_FORMAT(Mri.PROCESSDATE, '%Y/%m/%d') AS PROCESSDATE,");
+                sql.Append(" IFNULL(P.PERSONNAME, '') AS PERSONNAME,");
+                sql.Append(" CASE Mri.RECKIND");
+                sql.Append(" WHEN 0 THEN 'è²¸å‡º'");
+                sql.Append(" WHEN 1 THEN 'è¿”å�´'");
+                sql.Append(" WHEN 2 THEN 'è¿½åŠ '");
+                sql.Append(" WHEN 3 THEN 'ç ´æ£„'");
+                sql.Append(" END AS RECKIND,");
+                sql.Append(" IFNULL(Cbid.DETAILSTRING, '') AS DETAILSTRING,");
+                sql.Append(" Mri.MATERIALCOUNT,");
+                sql.Append(" CASE Mri.RECKIND");
+                sql.Append(" WHEN 0 THEN");
+                sql.Append(" IFNULL(DATE_FORMAT(Mri.REPAYPLANDATE, '%Y/%m/%d'), '')");
+                sql.Append(" ELSE ''");
+                sql.Append(" END AS REPAYPLANDATE,");
+                sql.Append(" IFNULL(Mri.COMMENTTEXT, '') AS COMMENTTEXT");
+                sql.Append(" FROM");
+                sql.Append(" MaterialRecordInfo AS Mri");
+                sql.Append(" LEFT JOIN MaterialInfo AS Mi ON Mri.MATERIALITEMCODE = Mi.MATERIALITEMCODE");
+                sql.Append(" LEFT JOIN personinchargemaster AS P ON Mri.PERSONCODE = P.PERSONCODE");
+                sql.Append(" LEFT JOIN ConstructionBaseInfoDetail AS Cbid");
+                sql.Append(" ON Mri.CONSTRUCTIONCODE = Cbid.CONSTRUCTIONCODE");
+                sql.AppendFormat(" AND Cbid.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                sql.AppendFormat(" WHERE Mri.MaterialItemCode = {0}", MaterialItemCode);
+                sql.Append(" And Mri.PROCESSDATE >= date_sub(Now(),interval '1' YEAR)");
+                sql.Append(" ORDER BY Mri.ConstructionCode DESC , Mri.PROCESSDATE DESC , Mri.RECKIND DESC");
+
                 if (!IoM.ExecuteReader(sql.ToString(), ref arData)) return false;
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
                 int icnt = 0;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.designer.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.designer.cs	(revision 308)
@@ -83,7 +83,7 @@
             this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(385, 8);
+            this.label1.Location = new System.Drawing.Point(390, 8);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(500, 20);
@@ -134,7 +134,7 @@
             this.lblMaterialItem.Location = new System.Drawing.Point(478, 6);
             this.lblMaterialItem.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblMaterialItem.Name = "lblMaterialItem";
-            this.lblMaterialItem.Size = new System.Drawing.Size(200, 24);
+            this.lblMaterialItem.Size = new System.Drawing.Size(700, 24);
             this.lblMaterialItem.TabIndex = 5;
             this.lblMaterialItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -156,7 +156,7 @@
             this.lblMaterialCount.BackColor = System.Drawing.Color.White;
             this.lblMaterialCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblMaterialCount.ForeColor = System.Drawing.Color.Black;
-            this.lblMaterialCount.Location = new System.Drawing.Point(822, 6);
+            this.lblMaterialCount.Location = new System.Drawing.Point(134, 32);
             this.lblMaterialCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblMaterialCount.Name = "lblMaterialCount";
             this.lblMaterialCount.Size = new System.Drawing.Size(86, 24);
@@ -168,7 +168,7 @@
             this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(694, 6);
+            this.label8.Location = new System.Drawing.Point(6, 32);
             this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(120, 24);
@@ -181,7 +181,7 @@
             this.lblRentCount.BackColor = System.Drawing.Color.White;
             this.lblRentCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblRentCount.ForeColor = System.Drawing.Color.Black;
-            this.lblRentCount.Location = new System.Drawing.Point(1052, 6);
+            this.lblRentCount.Location = new System.Drawing.Point(478, 32);
             this.lblRentCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblRentCount.Name = "lblRentCount";
             this.lblRentCount.Size = new System.Drawing.Size(88, 24);
@@ -193,7 +193,7 @@
             this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label10.ForeColor = System.Drawing.Color.Black;
-            this.label10.Location = new System.Drawing.Point(924, 6);
+            this.label10.Location = new System.Drawing.Point(350, 32);
             this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(120, 24);
@@ -237,10 +237,9 @@
             this.dgvMaster.RowHeadersVisible = false;
             this.dgvMaster.RowHeadersWidth = 20;
             this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 21;
-            this.dgvMaster.ScrollBars = System.Windows.Forms.ScrollBars.None;
+            this.dgvMaster.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
             this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1250, 449);
+            this.dgvMaster.Size = new System.Drawing.Size(1250, 429);
             this.dgvMaster.TabIndex = 10;
             // 
             // Column1
@@ -344,7 +343,7 @@
             this.groupBoxEx1.Controls.Add(this.label8);
             this.groupBoxEx1.Location = new System.Drawing.Point(5, 36);
             this.groupBoxEx1.Name = "groupBoxEx1";
-            this.groupBoxEx1.Size = new System.Drawing.Size(1270, 36);
+            this.groupBoxEx1.Size = new System.Drawing.Size(1270, 62);
             this.groupBoxEx1.TabIndex = 12;
             this.groupBoxEx1.TabStop = false;
             // 
@@ -352,9 +351,9 @@
             // 
             this.groupBoxEx2.BorderColor = System.Drawing.Color.White;
             this.groupBoxEx2.Controls.Add(this.dgvMaster);
-            this.groupBoxEx2.Location = new System.Drawing.Point(5, 80);
+            this.groupBoxEx2.Location = new System.Drawing.Point(5, 104);
             this.groupBoxEx2.Name = "groupBoxEx2";
-            this.groupBoxEx2.Size = new System.Drawing.Size(1270, 460);
+            this.groupBoxEx2.Size = new System.Drawing.Size(1270, 440);
             this.groupBoxEx2.TabIndex = 13;
             this.groupBoxEx2.TabStop = false;
             // 
@@ -401,6 +400,8 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label lblRentCount;
         private System.Windows.Forms.Label label10;
+        private GroupBoxEx groupBoxEx1;
+        private GroupBoxEx groupBoxEx2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
@@ -409,8 +410,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
-        private GroupBoxEx groupBoxEx1;
-        private GroupBoxEx groupBoxEx2;
 
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialList.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialList.cs	(revision 308)
@@ -326,23 +326,25 @@
 
                 // æŠ½å‡º
                 StringBuilder sql = new StringBuilder();
-                sql.AppendLine("select   Mk.MATERIALKINDNAME ");
-                sql.AppendLine("		,Mim.MaterialItemCode ");
-                sql.AppendLine("		,Mim.MaterialItemName ");
-                sql.AppendLine("        ,ifnull(Mi.MaterialCount,'0') as MaterialCount ");
-                sql.AppendLine("        ,ifnull(Mi.RentCount,'0') as RentCount ");
-                sql.AppendLine("        ,DATE_FORMAT(Mim.EntryDate, '%Y/%m/%d') as EntryDate ");
-                sql.AppendLine("from MaterialItemMaster as Mim 	left join MaterialInfo as Mi on Mim.MATERIALITEMCODE = Mi.MATERIALITEMCODE ");
-                sql.AppendLine("								left join materialkindmaster as Mk on Mim.MATERIALKINDCODE = Mk.MATERIALKINDCODE ");
-                sql.AppendLine("where Mim.DELETEFLG <> 1 ");
+                sql.AppendLine("Select");
+                sql.AppendLine(" Mk.MATERIALKINDNAME ");
+                sql.AppendLine(",Mim.MaterialItemCode ");
+                sql.AppendLine(",Mim.MaterialItemName ");
+                sql.AppendLine(",ifnull(Mi.MaterialCount, 0) as MaterialCount ");
+                sql.AppendLine(",ifnull(Mi.RentCount, 0) as RentCount ");
+                sql.AppendLine(",DATE_FORMAT(Mim.EntryDate, '%Y/%m/%d') as EntryDate ");
+                sql.AppendLine(" From MaterialItemMaster as Mim");
+                sql.AppendLine("      left join MaterialInfo as Mi on Mim.MATERIALITEMCODE = Mi.MATERIALITEMCODE ");
+                sql.AppendLine("      left join materialkindmaster as Mk on Mim.MATERIALKINDCODE = Mk.MATERIALKINDCODE ");
+                sql.AppendLine(" Where Mim.DELETEFLG <> 1 ");
 
                 // æ�¡ä»¶è¿½åŠ 
                 //if (strMaterialKindCode.Length == 1 && strMaterialKindCode != "0") 
                 if (strMaterialKindCode != "0")
                 {
-                    sql.AppendFormat("and	  Mim.MATERIALKINDCODE = {0} ",strMaterialKindCode);
+                    sql.AppendFormat(" And Mim.MATERIALKINDCODE = {0} ",strMaterialKindCode);
                 }
-                sql.AppendLine("order by Mk.Displayorder,Mim.Displayorder");
+                sql.AppendLine(" order by Mk.Displayorder,Mim.Displayorder");
 
                 if (!mi.ExecuteReader(sql.ToString(), ref arData)) return false;
 
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 307)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 308)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.24")]
-[assembly: AssemblyFileVersion("1.0.1.24")]
+[assembly: AssemblyVersion("1.0.1.25")]
+[assembly: AssemblyFileVersion("1.0.1.25")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
