Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs	(revision 483)
@@ -226,7 +226,6 @@
         /// </summary>
         public static string s_ExecCurrentDirName = @"C:\Users\Default\Desktop\";
         public static string s_SaveExecl = @"SaveExcel";
-        public static string s_ExecExcelDirName = @"è¦‹ç©�ã‚‚ã‚Šã‚¨ã‚¯ã‚»ãƒ«ãƒ‡ãƒ¼ã‚¿";
         #endregion
 
         #region ãƒ¯ãƒ¼ãƒ‰ä½¿ç”¨æ™‚ãƒ‘ã‚¹
@@ -1207,5 +1206,19 @@
         /// </summary>
         public static string[] Type2YearString = new string[] { "å¯¾è±¡å¹´", "å¹´" };
         #endregion
+
+        #region æœ‰çµ¦å�–å¾—æ—¥æ•°ãƒ†ãƒ¼ãƒ–ãƒ«
+        /// <summary>
+        /// æœ‰çµ¦å�–å¾—æ—¥æ•°ãƒ†ãƒ¼ãƒ–ãƒ«
+        /// å¹´åº¦ï¼š1å¹´ç›®ã€€ã€€ï¼š10æ—¥
+        /// ã€€ã€€ã€€2å¹´ç›®ã€€ã€€ï¼š11æ—¥
+        /// ã€€ã€€ã€€3å¹´ç›®ã€€ã€€ï¼š12æ—¥
+        /// ã€€ã€€ã€€4å¹´ç›®ã€€ã€€ï¼š14æ—¥
+        /// ã€€ã€€ã€€5å¹´ç›®ã€€ã€€ï¼š16æ—¥
+        /// ã€€ã€€ã€€6å¹´ç›®ã€€ã€€ï¼š18æ—¥
+        /// ã€€ã€€ã€€7å¹´ç›®ä»¥é™�ï¼š20æ—¥
+        /// </summary>
+        public static List<decimal> PaidHolidayTable = new List<decimal> { 10, 11, 12, 14, 16, 18, 20 };
+        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 483)
@@ -2959,13 +2959,13 @@
 
         #region TimeSpanã�‹ã‚‰å¹´æ•°ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
-        /// TimeSpanã�‹ã‚‰å¹´æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// TimeSpanã�‹ã‚‰å¹´æ•°ã‚’å�–å¾—ã�™ã‚‹ï¼ˆåˆ‡ã‚Šä¸Šã�’ï¼‰
         /// </summary>
         /// <param name="timespan"></param>
         /// <returns></returns>
         public static int GetTimeSpanYears(this TimeSpan timespan)
         {
-            return (int)((double)timespan.Days / 365.2425);
+            return CommonMotions.cnvRoundUp((double)timespan.Days / 365.2425);
         }
         #endregion
 
@@ -3411,7 +3411,7 @@
                 strSQL.AppendFormat("  And DATE('{0}') <= DATE(Ledger.ConstructionEnd)", dtDefaultStart.ToShortDateString());
                 strSQL.Append(" Inner Join constructionledgerdetail As LDetail");
                 strSQL.Append("       On LDetail.ConstructionCode = Base.ConstructionCode");
-                strSQL.AppendFormat(" And LDetail.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL.AppendFormat(" And LDetail.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.AppendFormat(" And LDetail.CompanyCode = {0}", PersonCode);
                 strSQL.AppendFormat(" And LDetail.SalaryFlg = {0}", (int)CommonDefine.SalaryDevision.DaysInput);
                 strSQL.Append(" Where");
@@ -3478,7 +3478,7 @@
                 strSQL.Append("       On Ledger.ConstructionCode = Base.ConstructionCode");
                 strSQL.Append(" Inner Join constructionledgerdetail As LDetail");
                 strSQL.Append("       On LDetail.ConstructionCode = Base.ConstructionCode");
-                strSQL.AppendFormat(" And LDetail.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL.AppendFormat(" And LDetail.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.AppendFormat(" And LDetail.CompanyCode = {0}", PersonCode);
                 strSQL.AppendFormat(" And LDetail.SalaryFlg = {0}", (int)CommonDefine.SalaryDevision.DaysInput);
                 strSQL.Append(" Where");
@@ -3719,7 +3719,7 @@
                     strSQL.AppendFormat("  And DATE('{0}') <= DATE(Ledger.ConstructionEnd)", dtDefaultStart.ToShortDateString());
                     strSQL.Append(" Inner Join constructionledgerdetail As LDetail");
                     strSQL.Append("       On LDetail.ConstructionCode = Base.ConstructionCode");
-                    strSQL.AppendFormat("  And LDetail.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                    strSQL.AppendFormat("  And LDetail.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                     strSQL.AppendFormat("  And LDetail.ComponentCode = {0}", nDepCode);
                     strSQL.AppendFormat("  And LDetail.CompanyCode = {0}", nPersonCode);
                     strSQL.AppendFormat("  And LDetail.SalaryFlg = {0}", (int)CommonDefine.SalaryDevision.DaysInput);
@@ -3757,7 +3757,7 @@
                     strSQL.Append("       On Ledger.ConstructionCode = Base.ConstructionCode");
                     strSQL.Append(" Inner Join constructionledgerdetail As LDetail");
                     strSQL.Append("       On LDetail.ConstructionCode = Base.ConstructionCode");
-                    strSQL.AppendFormat("  And LDetail.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                    strSQL.AppendFormat("  And LDetail.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                     strSQL.AppendFormat("  And LDetail.ComponentCode = {0}", nDepCode);
                     strSQL.AppendFormat("  And LDetail.CompanyCode = {0}", nPersonCode);
                     strSQL.AppendFormat("  And LDetail.SalaryFlg = {0}", (int)CommonDefine.SalaryDevision.DaysInput);
@@ -4025,6 +4025,7 @@
                     strSQL.Append(", A.DISPLAYORDER");
                     strSQL.Append(", 1");
                     strSQL.Append(" From DEPARTMENTMASTER As A");
+                    strSQL.AppendFormat(" Where DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
                     return;
                 }
 
@@ -4185,9 +4186,11 @@
                 }
                 else
                 {
-                    strSQL.AppendFormat(" AND ((DATE(AB.STARTDATE) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
-                    strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(AB.CompDate)", dtDefaultStart.ToShortDateString());
-                    strSQL.AppendFormat(" OR DATE('{0}') = DATE(AB.CompDate)))", DateTime.MinValue.ToShortDateString());
+                    strSQL.AppendFormat(" AND DATE('{0}') <= DATE(AB.CompDate)", dtDefaultEnd.ToShortDateString());
+
+                    //strSQL.AppendFormat(" AND ((DATE(AB.STARTDATE) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
+                    //strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(AB.CompDate)", dtDefaultStart.ToShortDateString());
+                    //strSQL.AppendFormat(" OR DATE('{0}') = DATE(AB.CompDate)))", DateTime.MinValue.ToShortDateString());
                 }
 
                 if (bNowSeason)
@@ -4443,27 +4446,26 @@
                     strSQL.Append(", A.NAMECODE");
                     strSQL.Append(", B.DEPARTMENTCODE");
                     strSQL.Append(", A.DeleteFlg");
-                    strSQL.Append(" FROM");
-                    strSQL.Append(" DIVISIONMASTER AS A");
+                    strSQL.Append(" FROM DIVISIONMASTER AS A");
 
-                    strSQL.Append(" LEFT JOIN (");
-                    strSQL.Append("SELECT");
-                    strSQL.Append(" BB.NAMECODE");
-                    strSQL.Append(", BB.DEPARTMENTCODE");
-                    strSQL.Append(", BB.EXPENSESRAITO");
-                    strSQL.Append(", BB.EXPENSESPERIOD");
-                    strSQL.Append(", BB.DisplayOrder");
-                    strSQL.Append(" FROM");
-                    strSQL.Append(" DEPARTMENTEXPENSESMASTER AS BB) AS B");
-                    strSQL.Append(" ON A.NAMECODE = B.NAMECODE");
+                    strSQL.Append(" LEFT JOIN (SELECT");
+                    strSQL.Append("                BB.NAMECODE");
+                    strSQL.Append("              , BB.DEPARTMENTCODE");
+                    strSQL.Append("              , BB.EXPENSESRAITO");
+                    strSQL.Append("              , BB.EXPENSESPERIOD");
+                    strSQL.Append("              , BB.DisplayOrder");
+                    strSQL.Append("            FROM DEPARTMENTEXPENSESMASTER AS BB) AS B");
+                    strSQL.Append("      ON A.NAMECODE = B.NAMECODE");
                     strSQL.AppendFormat(" AND B.EXPENSESPERIOD = {0}", Preiod);
                     if(DepartmentCode > 0) strSQL.AppendFormat(" AND B.DEPARTMENTCODE = {0}", DepartmentCode);
 
                     strSQL.Append(" LEFT JOIN departmentmaster AS C");
-                    strSQL.Append(" On C.DepartmentCode = B.DEPARTMENTCODE");
+                    strSQL.Append("      On C.DepartmentCode = B.DEPARTMENTCODE");
 
-                    strSQL.AppendFormat(" WHERE A.DIVISIONCODE = {0}", (int)DivisionMaster.DivisionMasterCodeDef.ConstructionExpenses);
+                    strSQL.Append(" WHERE");
+                    strSQL.AppendFormat(" A.DIVISIONCODE = {0}", (int)DivisionMaster.DivisionMasterCodeDef.ConstructionExpenses);
                     strSQL.AppendFormat(" AND A.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                    strSQL.Append(" And B.EXPENSESRAITO > 0.00");
 
                     strSQL.Append(" ORDER BY A.DISPLAYORDER, C.DISPLAYORDER");
                 }
@@ -4475,8 +4477,7 @@
                     strSQL.Append(", B.NAMECODE");
                     strSQL.Append(", B.DEPARTMENTCODE");
                     strSQL.Append(", B.DeleteFlg");
-                    strSQL.Append(" FROM");
-                    strSQL.Append(" DEPARTMENTEXPENSESMASTER AS B");
+                    strSQL.Append(" FROM DEPARTMENTEXPENSESMASTER AS B");
 
                     strSQL.Append(" INNER JOIN departmentmaster AS C");
                     strSQL.Append("        On C.DepartmentCode = B.DEPARTMENTCODE");
@@ -4485,8 +4486,11 @@
                     strSQL.AppendFormat("  ON D.DIVISIONCODE = {0}", (int)DivisionMaster.DivisionMasterCodeDef.ConstructionExpenses);
                     strSQL.Append("        And D.NameCode = B.NameCode");
 
-                    strSQL.AppendFormat(" WHERE B.EXPENSESPERIOD = {0}", Preiod);
+                    strSQL.Append(" WHERE");
+                    strSQL.AppendFormat(" B.EXPENSESPERIOD = {0}", Preiod);
                     if (DepartmentCode > 0) strSQL.AppendFormat(" AND B.DEPARTMENTCODE = {0}", DepartmentCode);
+                    strSQL.Append(" And B.EXPENSESRAITO > 0.00");
+
                     strSQL.Append(" ORDER BY D.DeleteFlg, C.DISPLAYORDER, B.DISPLAYORDER");
                 }
 
@@ -4695,6 +4699,14 @@
             IOMHolidayCalender CalDB = new IOMHolidayCalender();
             try
             {
+                // å½“æœˆä»¥å‰�ã�¯ç¿Œæœˆï¼‘æ—¥ã‚’ã‚»ãƒƒãƒˆã�—ã�¦æŠœã�‘ã‚‹
+                if(WorktDate.Year < DateTime.Today.Year
+                    || WorktDate.Month < DateTime.Today.Month)
+                {
+                    DateTime dtTarget = new DateTime(WorktDate.Year, WorktDate.Month, 1).AddMonths(1);
+                    return dtTarget;
+                }
+
                 StringBuilder strSQL = new StringBuilder();
 
                 strSQL.Append("SELECT t1.d, DATE_FORMAT(C.HOLIDAY, '%Y/%m/%d') HOLIDAY FROM");
@@ -4707,13 +4719,15 @@
                 strSQL.AppendFormat(" AND A2.month = {0}", WorktDate.Month);
                 strSQL.Append("       AND CAST(CONCAT(A1.years, '/', A2.month, '/', A3.days) as DATE) IS NOT NULL) as t1");
                 strSQL.Append("      LEFT JOIN HOLIDAYCALENDERMASTER C ON C.HOLIDAY = t1.d");
+                strSQL.Append(" Where");
+                strSQL.AppendFormat(" DATE(t1.d) <= DATE('{0}')", DateTime.Today.ToShortDateString());
                 strSQL.Append(" ORDER BY t1.d Desc");
 
                 ArrayList arList = new ArrayList();
                 CalDB.ExecuteReader(strSQL.ToString(), ref arList);
 
+                DateTime dtRet = DateTime.MinValue;
                 int nPrevCount = 0;
-                DateTime dtRet = DateTime.MinValue;
                 foreach(object[] objCalender in arList)
                 {
                     // ã�¾ã�šä»Šæ—¥ã‚’æŽ¢ã�™
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs	(revision 483)
@@ -54,7 +54,7 @@
         /// å·¥äº‹è©³ç´°å�°å¸³å†�è¨ˆç®—å‡¦ç�†ï¼ˆç·�æ”¯æ‰•é¡�ãƒ»ç²—åˆ©ãƒ»çµ¦ä¸Žãƒ»ç´”åˆ©ç›Šã�Œå¯¾è±¡ï¼‰
         /// </summary>
         /// <param name="ConstrCode"></param>
-        private static bool LedgerRecalculate(IOConstructionLedgerExcute LedgerExcuteDB, List<int> ConstrCodeList)
+        public static bool LedgerRecalculate(IOConstructionLedgerExcute LedgerExcuteDB, List<int> ConstrCodeList)
         {
             try
             {
@@ -61,14 +61,6 @@
                 StringBuilder strSQL = new StringBuilder();
                 bool bRet = true;
 
-                // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                List<int> GroupCodeList1 = new List<int>();
-                List<int> GroupCodeList2 = new List<int>();
-                List<int> GroupCodeList3 = new List<int>();
-                List<int> GroupCodeList4 = new List<int>();
-                // é›†è¨ˆã‚³ãƒ¼ãƒ‰ä¸€è¦§ä½œæˆ�
-                SetGroupCodeList(ref GroupCodeList1, ref GroupCodeList2, ref GroupCodeList3, ref GroupCodeList4);
-
                 foreach (int ConstrCode in ConstrCodeList)
                 {
                     // å·¥äº‹å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚°ãƒ«ãƒ¼ãƒ—ã�”ã�¨ã�®å�ˆè¨ˆé‡‘é¡�ã‚’å�–å¾—ã�™ã‚‹
@@ -86,21 +78,41 @@
                     if (InData.Count == 0) continue;
 
                     // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                    int Payment = CalcGetTotal(InData, GroupCodeList1);                             // ----- æ”¯æ‰•é¡�
+                    decimal Payment = InData.Cast<object[]>()                                                                                   // ----- æ”¯æ‰•é¡�
+                                            .Where(x => CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.Expenses              // 1:çµŒè²»
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts      // 2:æ–½å·¥è²»
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts    // 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts          // 4:è³¼å…¥å“�
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee        // 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts           // 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts        // 7:å®¿æ³Šè²»
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts)          // 8:å‡¦åˆ†è²»ç­‰
+                                            .Sum(y=>CommonMotions.cnvDecimal(y[1]));
 
-                    int PExpenses = CalcGetTotal(InData, GroupCodeList2);                           // ----- äººä»¶è²»
+                    decimal PExpenses = InData.Cast<object[]>()                                                                                 // ----- äººä»¶è²»
+                                            .Where(x => CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.Instructor            // 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
+                                                    || CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.Assistant)             // 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
+                                            .Sum(y => CommonMotions.cnvDecimal(y[1]));
 
-                    int Allowance = CalcGetTotal(InData, GroupCodeList3);                           // ----- çµ¦ä¸Ž
+                    decimal Allowance = InData.Cast<object[]>()                                                                                 // ----- çµ¦ä¸Ž
+                                            .Where(x => CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.Payroll)              // 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
+                                            .Sum(y => CommonMotions.cnvDecimal(y[1]));
 
-                    int Billing = CalcGetTotal(InData, GroupCodeList4);                             // ----- è«‹æ±‚é¡�
+                    decimal Compensation = InData.Cast<object[]>()                                                                              // ----- è£œå¡«
+                                            .Where(x => CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.Compensation)         // 12:è£œå¡«é‡‘é¡�ï¼ˆé‡‘é¡�ã�Œãƒžã‚¤ãƒŠã‚¹ã�§å…¥ã�£ã�¦ã�„ã‚‹ï¼‰
+                                            .Sum(y => CommonMotions.cnvDecimal(y[1]));
 
+                    decimal Billing = InData.Cast<object[]>()                                                                                   // ----- è«‹æ±‚é¡�
+                                            .Where(x => CommonMotions.cnvInt(x[0]) == (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount)        // 14:è«‹æ±‚é‡‘é¡�
+                                            .Sum(y => CommonMotions.cnvDecimal(y[1]));
+
                     // ----- å·¥äº‹è©³ç´°å�°å¸³æ›´æ–°
                     strSQL.Clear();
                     strSQL.Append("UPDATE CONSTRUCTIONLEDGER SET");
                     strSQL.AppendFormat(" TOTALPAYMENT = {0}", Payment);
-                    strSQL.AppendFormat(", GROSSPROFIT = {0}", (Billing - Payment));
+                    strSQL.AppendFormat(", GROSSPROFIT = {0}", (Billing - (Payment + Compensation)));
                     strSQL.AppendFormat(", Allowance = {0}", Allowance);
-                    strSQL.AppendFormat(", NETPROFIT = {0}", (Billing - (Payment + Allowance + PExpenses)));
+                    strSQL.AppendFormat(", NETPROFIT = {0}", (Billing - ((Payment + Compensation) + Allowance + PExpenses)));
                     strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", ConstrCode);
                     if (!LedgerExcuteDB.ExecuteNonQuery(strSQL.ToString(), false))
                     {
@@ -118,80 +130,10 @@
         }
         #endregion
 
-        #region é›†è¨ˆç”¨ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+        #region æ‹…å½“è€…è³¼å…¥å“�ãƒ‡ãƒ¼ã‚¿ç•ªå�·ã‚ˆã‚Šå·¥äº‹è©³ç´°å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
-        /// é›†è¨ˆç”¨ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+        /// æ‹…å½“è€…è³¼å…¥å“�ãƒ‡ãƒ¼ã‚¿ç•ªå�·ã‚ˆã‚Šå·¥äº‹è©³ç´°å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
         /// </summary>
-        private static void SetGroupCodeList(ref List<int> GroupCodeList1, ref List<int> GroupCodeList2,
-                                                ref List<int> GroupCodeList3, ref List<int> GroupCodeList4)
-        {
-            try
-            {
-                // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                // ----- æ”¯æ‰•é¡�ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.Expenses);               // 1:çµŒè²»
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.ConstructionCosts);      // 2:æ–½å·¥è²»
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.TransportationCosts);    // 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.PurchaseCosts);          // 4:è³¼å…¥å“�
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.VehicleLeaseFee);        // 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.ParkingCosts);           // 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.RoomChargeCosts);        // 7:å®¿æ³Šè²»
-                GroupCodeList1.Add((int)FrmConstructionLedger.DataGroup.DisposeCosts);           // 8:å‡¦åˆ†è²»ç­‰
-
-                // ----- äººä»¶è²»ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
-                GroupCodeList2.Add((int)FrmConstructionLedger.DataGroup.Instructor);             // 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
-                GroupCodeList2.Add((int)FrmConstructionLedger.DataGroup.Assistant);              // 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
-
-                // ----- çµ¦ä¸Žã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
-                GroupCodeList3.Add((int)FrmConstructionLedger.DataGroup.Payroll);                // 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
-
-                // ----- è«‹æ±‚é¡�ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
-                GroupCodeList4.Add((int)FrmConstructionLedger.DataGroup.BillingAmount);          // 14:è«‹æ±‚é‡‘é¡�
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region é…�åˆ—ãƒªã‚¹ãƒˆã‚ˆã‚ŠæŒ‡å®šã�•ã‚Œã�Ÿå�ˆè¨ˆã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// é…�åˆ—ãƒªã‚¹ãƒˆã‚ˆã‚ŠæŒ‡å®šã�•ã‚Œã�Ÿå�ˆè¨ˆã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        private static int CalcGetTotal(ArrayList InData, List<int> GroupCodeList)
-        {
-            try
-            {
-                int iRetVal = 0;
-
-                int GrpNo = -1;
-                foreach (int GroupCode in GroupCodeList)
-                {
-                    foreach (object[] CurRec in InData)
-                    {
-                        GrpNo = CommonMotions.cnvInt(CurRec[0]);
-
-                        if (GroupCode != GrpNo) continue;
-
-                        iRetVal += CommonMotions.cnvInt(CurRec[1]);
-                    }
-                }
-
-                return iRetVal;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return 0;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹è©³ç´°å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
         /// <param name="TargetData"></param>
         /// <returns></returns>
         public static int GetConstructionLedgerGroupNo(int TargetData)
@@ -202,27 +144,27 @@
             {
                 case (int)CostDataOfPerson.DataNoDef.Transport:
                     // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    GroupNo = (int)FrmConstructionLedger.DataGroup.TransportationCosts;
+                    GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts;
                     break;
                 case (int)CostDataOfPerson.DataNoDef.Purchase:
                     // è³¼å…¥å“�
-                    GroupNo = (int)FrmConstructionLedger.DataGroup.PurchaseCosts;
+                    GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts;
                     break;
                 case (int)CostDataOfPerson.DataNoDef.Lease:
                     // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    GroupNo = (int)FrmConstructionLedger.DataGroup.VehicleLeaseFee;
+                    GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee;
                     break;
                 case (int)CostDataOfPerson.DataNoDef.StoragePlace:
                     // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    GroupNo = (int)FrmConstructionLedger.DataGroup.ParkingCosts;
+                    GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts;
                     break;
                 case (int)CostDataOfPerson.DataNoDef.Lodging:
                     // å®¿æ³Šè²»
-                    GroupNo = (int)FrmConstructionLedger.DataGroup.RoomChargeCosts;
+                    GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts;
                     break;
                 case (int)CostDataOfPerson.DataNoDef.DisposalCost:
                     // å‡¦åˆ†è²»
-                    GroupNo = (int)FrmConstructionLedger.DataGroup.DisposeCosts;
+                    GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts;
                     break;
             }
             return GroupNo;
@@ -229,24 +171,6 @@
         }
         #endregion
 
-        #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šæ”¯æ‰•é‡‘é¡�ã‚°ãƒªãƒƒãƒ‰ã�®å…ˆé ­ã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šæ”¯æ‰•é‡‘é¡�ã‚°ãƒªãƒƒãƒ‰ã�®å…ˆé ­ã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        public static int GetLedgerColumnCount()
-        {
-            try
-            {
-                return (Enum.GetNames(typeof(FrmConstructionLedger.GridColumn)).Length - 1);
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return 0;
-            }
-        }
-        #endregion
-
         #region å¯¾è±¡å¹´æœˆã�‹ã‚‰å·¥äº‹è©³ç´°å�°å¸³ã�®ã‚°ãƒªãƒƒãƒ‰ã‚«ãƒ©ãƒ ä½�ç½®ã‚’ç®—å‡ºã�™ã‚‹
         /// <summary>
         /// å¯¾è±¡å¹´æœˆã�‹ã‚‰å·¥äº‹è©³ç´°å�°å¸³ã�®ã‚°ãƒªãƒƒãƒ‰ã‚«ãƒ©ãƒ ä½�ç½®ã‚’ç®—å‡ºã�™ã‚‹
@@ -313,9 +237,9 @@
                     DetailSQL.AppendFormat(" AND OperatingFlg = {0}", (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing);      // å¯¾å¿œä¸­ãƒ•ãƒ©ã‚°
                     DetailSQL.AppendFormat(" AND SALARYFLG != {0}", (int)CommonDefine.SalaryDevision.Noting);                       // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                     DetailSQL.AppendFormat(" AND GROUPCOUNT IN ({0},{1},{2})",
-                                                                    (int)FrmConstructionLedger.DataGroup.Instructor,        // æŒ‡å°Žå“¡çµ¦æ–™
-                                                                    (int)FrmConstructionLedger.DataGroup.Assistant,         // å‰¯æ‹…å½“è€…çµ¦æ–™
-                                                                    (int)FrmConstructionLedger.DataGroup.Payroll);          // æ‹…å½“è€…çµ¦æ–™è¡Œ
+                                                                    (int)ConstructionLedgerDetail.GroupCountDef.Instructor,        // æŒ‡å°Žå“¡çµ¦æ–™
+                                                                    (int)ConstructionLedgerDetail.GroupCountDef.Assistant,         // å‰¯æ‹…å½“è€…çµ¦æ–™
+                                                                    (int)ConstructionLedgerDetail.GroupCountDef.Payroll);          // æ‹…å½“è€…çµ¦æ–™è¡Œ
 
                     if (!LedgerDeDB.SelectAction(DetailSQL.ToString(), ref DetailList, false) || DetailList.Count == 0) continue;
 
@@ -428,15 +352,15 @@
                 // æ”¯æ‰•çµ¦ä¸Žè¨ˆç®—
                 switch (CurRec.GroupCount)
                 {
-                    case (int)FrmConstructionLedger.DataGroup.Instructor:       // æŒ‡å°Žå“¡çµ¦æ–™
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:       // æŒ‡å°Žå“¡çµ¦æ–™
                         SumSaraly = CommonMotions.cnvRound((double)CommonDefine.InstructorMonthryCost / MonthDayCnt);
                         SumSaraly *= (ts.Days + 1);
                         break;
-                    case (int)FrmConstructionLedger.DataGroup.Assistant:        // å‰¯æ‹…å½“è€…çµ¦æ–™
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:        // å‰¯æ‹…å½“è€…çµ¦æ–™
                         SumSaraly = CommonMotions.cnvRound((double)CommonDefine.AssistantMonthryCost / MonthDayCnt);
                         SumSaraly *= (ts.Days + 1);
                         break;
-                    case (int)FrmConstructionLedger.DataGroup.Payroll:          // æ‹…å½“è€…çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:          // æ‹…å½“è€…çµ¦æ–™è¡Œ
                         // ç¯„å›²çµ¦ä¸Žå�–å¾—
                         SumSaraly = CommonMotions.CalcElapsedSalary(PersonDB, StartDate, CompDate, CurRec.CompanyCode, false);
                         break;
@@ -491,100 +415,6 @@
         }
         #endregion
 
-        #region æ—¥ä»˜æŒ‡å®šæ™‚ã�®çµ¦ä¸Žæ›¸è¾¼ã�¿
-        /// <summary>
-        /// æ—¥ä»˜æŒ‡å®šæ™‚ã�®çµ¦ä¸Žæ›¸è¾¼ã�¿
-        /// </summary>
-        private static bool CalcSalaryDevisionDaysInput(IOConstructionLedgerExcute LedgerExDB,
-                                                        IOMPersonInCharge PersonDB,
-                                                        ConstructionLedger LedgerRec,
-                                                        ConstructionLedgerDetail CurRec)
-        {
-            IOProcessApproval AppDB = new IOProcessApproval();
-            try
-            {
-                StringBuilder strSQL = new StringBuilder();
-
-
-
-                // æœˆæœ«æ—¥ã‚ˆã‚Šæœˆæ—¥æ•°ã‚’å�–å¾—ã�™ã‚‹
-                int MonthDayCnt = DateTimeUtil.EndOfMonth(LedgerRec.ConstructionStart).Day;
-                int OneDaySalary = 0;
-                int nSalaryDays = 0;
-                // æ”¯æ‰•çµ¦ä¸Žè¨ˆç®—
-                switch (CurRec.GroupCount)
-                {
-                    case (int)FrmConstructionLedger.DataGroup.Instructor:       // æŒ‡å°Žå“¡çµ¦æ–™
-                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.InstructorMonthryCost / MonthDayCnt);
-                        break;
-                    case (int)FrmConstructionLedger.DataGroup.Assistant:        // å‰¯æ‹…å½“è€…çµ¦æ–™
-                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.AssistantMonthryCost / MonthDayCnt);
-                        OneDaySalary *= CurRec.SalaryDays;
-                        break;
-                    case (int)FrmConstructionLedger.DataGroup.Payroll:          // æ‹…å½“è€…çµ¦æ–™è¡Œ
-                        // çµ¦ä¸Žå�–å¾—
-                        OneDaySalary = CommonMotions.CalcElapsedSalary(PersonDB
-                                                                        , LedgerRec.ConstructionStart
-                                                                        , LedgerRec.ConstructionStart
-                                                                        , CurRec.CompanyCode
-                                                                        , false);
-                        break;
-                }
-
-
-                OneDaySalary *= nSalaryDays;
-
-                // å·¥äº‹äºˆç®—ã�Œæ‰¿èª�ã�•ã‚Œã�Ÿæœˆã�®ä½�ç½®ã�«æ›¸ã��
-                strSQL.Clear();
-                strSQL.Append(AppDB.CreatePrimarykeyString(CurRec.SourceCode,
-                                                            3,                                      // å·¥äº‹äºˆç®—æ‰¿èª�ç•ªå�·(ClsExecuteã�Œç„¡ã�„ã�Ÿã‚�)
-                                                            (int)CommonDefine.s_Default_OrderNo,
-                                                            1));                                    // å…ˆé ­ãƒ¬ã‚³ãƒ¼ãƒ‰
-                strSQL.AppendFormat(" AND ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
-                ProcessApproval AppRec = new ProcessApproval();
-                if (!AppDB.SelectAction(strSQL.ToString(), ref AppRec)) return false;
-
-                // å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã�®ã‚­ãƒ¼éƒ¨å¹´æœˆæ—¥ã�¯é–‹å§‹æœˆã�®1æ—¥
-                DateTime ParaDate = new DateTime(LedgerRec.ConstructionStart.Year
-                                                , LedgerRec.ConstructionStart.Month, 1);
-                // å�°å¸³ã‚«ãƒ©ãƒ ä½�ç½®
-                int Columncnt = Enum.GetNames(typeof(FrmConstructionLedger.GridColumn)).Length - 1;
-
-                // å¢—æ¸›ãƒ‡ãƒ¼ã‚¿ã�¯æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã‚’æ—¥ä»˜ã�¨ã�—ã�¦ä½¿ç”¨ã�™ã‚‹
-                if ((CurRec.SourceCode % 10) > 1)
-                {
-                    DateTime dtStart = LedgerRec.ConstructionStart;
-                    // å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚«ãƒ©ãƒ å¯¾è±¡ã�®å¹´æœˆã‚’å�–å¾—ã�™ã‚‹
-                    DateTime wrkDate = GetConstructionLedgerStartDate(LedgerExDB, CurRec.ConstructionCode, false);
-                    if (wrkDate.Date != DateTime.MinValue.Date) dtStart = wrkDate;
-
-                    // æ‰¿èª�æ—¥ä»˜ã‚ˆã‚ŠæŒ�ã�£ã�¦ã��ã‚‹
-                    Columncnt = CalcTargetMonthToColumn(LedgerExDB, false, LedgerRec.ConstructionCode, AppRec.PetitionApprovalDate);
-                    ParaDate = new DateTime(AppRec.PetitionApprovalDate.Year
-                                            , AppRec.PetitionApprovalDate.Month, 1);
-                }
-
-                // æ”¯æ‰•ã�„ãƒ‡ãƒ¼ã‚¿æ›¸è¾¼ã�¿
-                if (!AddOrSetSalary(LedgerExDB
-                                , CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount, Columncnt, OneDaySalary, ParaDate))
-                {
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                AppDB.close(); AppDB = null;
-            }
-        }
-        #endregion
-
         #region æ—¥æ¬¡å‡¦ç�†ã�§ã�®æ—¥å½“ã�®åŠ ç®—ã‚’åˆ¤å®šã�™ã‚‹
         /// <summary>
         /// æ—¥æ¬¡å‡¦ç�†ã�§ã�®æ—¥å½“ã�®åŠ ç®—ã‚’åˆ¤å®šã�™ã‚‹
@@ -686,7 +516,7 @@
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("Select ConstructionCode, (MAX(DetailCount) + 1) As NewNo From constructionledgerdetail");
                 strSQL.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                strSQL.AppendFormat(" And GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" And GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
 
                 ArrayList arList = new ArrayList();
                 if (!DetailDB.ExecuteReader(strSQL.ToString(), ref arList, bConnect)) return 0;
@@ -704,9 +534,147 @@
         }
         #endregion
 
-        // -----------------------------------
-        // ãƒ•ãƒ«ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³æœ¬ä½“ã�®ã�¿ â†“â†“â†“
-        // -----------------------------------
+        #region å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šæœ€å°�ã‚«ãƒ©ãƒ ã�®å¯¾è±¡å¹´æœˆæ—¥ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šæœ€å°�ã‚«ãƒ©ãƒ ã�®å¯¾è±¡å¹´æœˆæ—¥ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        public static DateTime GetConstructionLedgerStartDate(IOConstructionLedgerExcute LedgerExcuteDB, int ConstrCode, bool bTableConnect = true)
+        {
+            try
+            {
+                // å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚«ãƒ©ãƒ å¯¾è±¡ã�®å¹´æœˆã‚’å�–å¾—ã�™ã‚‹
+                StringBuilder strCol = new StringBuilder();
+                strCol.Append("SELECT MIN(ColumnCount), TargetMonth From constructionledgerexcute");
+                strCol.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
+                ArrayList arrCol = new ArrayList();
+                if (!LedgerExcuteDB.ExecuteReader(strCol.ToString(), ref arrCol, bTableConnect)) return DateTime.MinValue;
+
+                if (arrCol.Count < 1) return DateTime.MinValue;
+
+                // å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã�Œå­˜åœ¨ã�—ã�Ÿå ´å�ˆã�¯æœ€å°�ã�®ã‚«ãƒ©ãƒ ã�®å¹´æœˆã‚¹ã‚¿ãƒ¼ãƒˆã�«ã�™ã‚‹
+                object[] wrkCol = (object[])arrCol[0];
+                return CommonMotions.cnvDate(wrkCol[1]);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return DateTime.MinValue;
+            }
+        }
+        #endregion
+
+        #region æ—¥ä»˜æŒ‡å®šæ™‚ã�®çµ¦ä¸Žæ›¸è¾¼ã�¿
+        /// <summary>
+        /// æ—¥ä»˜æŒ‡å®šæ™‚ã�®çµ¦ä¸Žæ›¸è¾¼ã�¿
+        /// </summary>
+        private static bool CalcSalaryDevisionDaysInput(IOConstructionLedgerExcute LedgerExDB,
+                                                        IOMPersonInCharge PersonDB,
+                                                        ConstructionLedger LedgerRec,
+                                                        ConstructionLedgerDetail CurRec)
+        {
+            IOProcessApproval AppDB = new IOProcessApproval();
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+
+
+
+                // æœˆæœ«æ—¥ã‚ˆã‚Šæœˆæ—¥æ•°ã‚’å�–å¾—ã�™ã‚‹
+                int MonthDayCnt = DateTimeUtil.EndOfMonth(LedgerRec.ConstructionStart).Day;
+                int OneDaySalary = 0;
+                int nSalaryDays = 0;
+                // æ”¯æ‰•çµ¦ä¸Žè¨ˆç®—
+                switch (CurRec.GroupCount)
+                {
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:       // æŒ‡å°Žå“¡çµ¦æ–™
+                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.InstructorMonthryCost / MonthDayCnt);
+                        break;
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:        // å‰¯æ‹…å½“è€…çµ¦æ–™
+                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.AssistantMonthryCost / MonthDayCnt);
+                        OneDaySalary *= CurRec.SalaryDays;
+                        break;
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:          // æ‹…å½“è€…çµ¦æ–™è¡Œ
+                        // çµ¦ä¸Žå�–å¾—
+                        OneDaySalary = CommonMotions.CalcElapsedSalary(PersonDB
+                                                                        , LedgerRec.ConstructionStart
+                                                                        , LedgerRec.ConstructionStart
+                                                                        , CurRec.CompanyCode
+                                                                        , false);
+                        break;
+                }
+
+
+                OneDaySalary *= nSalaryDays;
+
+                // å·¥äº‹äºˆç®—ã�Œæ‰¿èª�ã�•ã‚Œã�Ÿæœˆã�®ä½�ç½®ã�«æ›¸ã��
+                strSQL.Clear();
+                strSQL.Append(AppDB.CreatePrimarykeyString(CurRec.SourceCode,
+                                                            3,                                      // å·¥äº‹äºˆç®—æ‰¿èª�ç•ªå�·(ClsExecuteã�Œç„¡ã�„ã�Ÿã‚�)
+                                                            (int)CommonDefine.s_Default_OrderNo,
+                                                            1));                                    // å…ˆé ­ãƒ¬ã‚³ãƒ¼ãƒ‰
+                strSQL.AppendFormat(" AND ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+                ProcessApproval AppRec = new ProcessApproval();
+                if (!AppDB.SelectAction(strSQL.ToString(), ref AppRec)) return false;
+
+                // å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã�®ã‚­ãƒ¼éƒ¨å¹´æœˆæ—¥ã�¯é–‹å§‹æœˆã�®1æ—¥
+                DateTime ParaDate = new DateTime(LedgerRec.ConstructionStart.Year
+                                                , LedgerRec.ConstructionStart.Month, 1);
+                // å�°å¸³ã‚«ãƒ©ãƒ ä½�ç½®
+                int Columncnt = Enum.GetNames(typeof(FrmConstructionLedger.GridColumn)).Length - 1;
+
+                // å¢—æ¸›ãƒ‡ãƒ¼ã‚¿ã�¯æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã‚’æ—¥ä»˜ã�¨ã�—ã�¦ä½¿ç”¨ã�™ã‚‹
+                if ((CurRec.SourceCode % 10) > 1)
+                {
+                    DateTime dtStart = LedgerRec.ConstructionStart;
+                    // å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚«ãƒ©ãƒ å¯¾è±¡ã�®å¹´æœˆã‚’å�–å¾—ã�™ã‚‹
+                    DateTime wrkDate = GetConstructionLedgerStartDate(LedgerExDB, CurRec.ConstructionCode, false);
+                    if (wrkDate.Date != DateTime.MinValue.Date) dtStart = wrkDate;
+
+                    // æ‰¿èª�æ—¥ä»˜ã‚ˆã‚ŠæŒ�ã�£ã�¦ã��ã‚‹
+                    Columncnt = CalcTargetMonthToColumn(LedgerExDB, false, LedgerRec.ConstructionCode, AppRec.PetitionApprovalDate);
+                    ParaDate = new DateTime(AppRec.PetitionApprovalDate.Year
+                                            , AppRec.PetitionApprovalDate.Month, 1);
+                }
+
+                // æ”¯æ‰•ã�„ãƒ‡ãƒ¼ã‚¿æ›¸è¾¼ã�¿
+                if (!AddOrSetSalary(LedgerExDB
+                                , CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount, Columncnt, OneDaySalary, ParaDate))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                AppDB.close(); AppDB = null;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šæ”¯æ‰•é‡‘é¡�ã‚°ãƒªãƒƒãƒ‰ã�®å…ˆé ­ã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šæ”¯æ‰•é‡‘é¡�ã‚°ãƒªãƒƒãƒ‰ã�®å…ˆé ­ã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        public static int GetLedgerColumnCount()
+        {
+            try
+            {
+                return (Enum.GetNames(typeof(FrmConstructionLedger.GridColumn)).Length - 1);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
         #region å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’æ–°è¦�ä½œæˆ�ã�™ã‚‹
         /// <summary>
         /// å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’æ–°è¦�ä½œæˆ�ã�™ã‚‹
@@ -1039,35 +1007,6 @@
         }
         #endregion
 
-        #region å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šæœ€å°�ã‚«ãƒ©ãƒ ã�®å¯¾è±¡å¹´æœˆæ—¥ã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šæœ€å°�ã‚«ãƒ©ãƒ ã�®å¯¾è±¡å¹´æœˆæ—¥ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        public static DateTime GetConstructionLedgerStartDate(IOConstructionLedgerExcute LedgerExcuteDB, int ConstrCode, bool bTableConnect = true)
-        {
-            try
-            {
-                // å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚«ãƒ©ãƒ å¯¾è±¡ã�®å¹´æœˆã‚’å�–å¾—ã�™ã‚‹
-                StringBuilder strCol = new StringBuilder();
-                strCol.Append("SELECT MIN(ColumnCount), TargetMonth From constructionledgerexcute");
-                strCol.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                ArrayList arrCol = new ArrayList();
-                if (!LedgerExcuteDB.ExecuteReader(strCol.ToString(), ref arrCol, bTableConnect)) return DateTime.MinValue;
-
-                if (arrCol.Count < 1) return DateTime.MinValue;
-
-                // å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã�Œå­˜åœ¨ã�—ã�Ÿå ´å�ˆã�¯æœ€å°�ã�®ã‚«ãƒ©ãƒ ã�®å¹´æœˆã‚¹ã‚¿ãƒ¼ãƒˆã�«ã�™ã‚‹
-                object[] wrkCol = (object[])arrCol[0];
-                return CommonMotions.cnvDate(wrkCol[1]);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return DateTime.MinValue;
-            }
-        }
-        #endregion
-
         #region çµ�å�ˆå·¥äº‹ä½œæˆ�å‡¦ç�†
         /// <summary>
         /// çµ�å�ˆå·¥äº‹ä½œæˆ�å‡¦ç�†
@@ -1196,14 +1135,15 @@
 
                 StringBuilder strSQL = new StringBuilder();
 
-                int GroupNo = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
 
+                double decParcent = (100.0 - CommonMotions.SystemMasterData.StatutoryWelfareRate) / 100.0;
                 strSQL.Append("Select");
                 strSQL.Append(" A.ConstructionCode,");
                 strSQL.Append(" A.CompanyCode,");
                 strSQL.Append(" A.ExecutionAmount,");
                 strSQL.Append(" SUM(ifnull(B.PaymentAmount, 0)), ");
-                strSQL.Append(" Round((Ifnull(Odr.OrdersLinePrice, 0) / (100.0 - ifnull(Odr2.StatutoryWelfareRate, 0))) * 100.0, 0) As OrderPrice");
+                strSQL.AppendFormat(" Round((Ifnull(Odr.OrdersLinePrice, 0) / {0}), 0) As OrderPrice", decParcent);
 
                 strSQL.Append(" From constructionledgerdetail AS A");
 
@@ -1218,10 +1158,6 @@
                 strSQL.Append("           And Odr.SourceDetailCnt = A.DetailCount");
                 strSQL.AppendFormat("     And Odr.GroupCount = {0}", (int)PurchaseOrderDetail.GroupCountDef.Detail);
                 strSQL.Append("           And A.DetailCount > 0");
-                strSQL.Append("      LEFT JOIN PurchaseOrderDetail As Odr2");
-                strSQL.Append("           ON Odr2.ConstructionCode = Odr.ConstructionCode");
-                strSQL.Append("           And Odr2.SeqNo = Odr.SeqNo");
-                strSQL.AppendFormat("     And Odr2.GroupCount = {0}", (int)PurchaseOrderDetail.GroupCountDef.StatutoryWelfare);
 
                 strSQL.AppendFormat(" WHERE A.ConstructionCode = {0}", ConstrCode);
                 strSQL.AppendFormat(" AND A.GroupCount = {0}", GroupNo);
@@ -1236,12 +1172,19 @@
                 int ExecValue = CommonMotions.cnvInt(objRec[2]);
                 int PaymentValue = CommonMotions.cnvInt(objRec[3]);
                 int OrderValue = CommonMotions.cnvInt(objRec[4]);
+                // ç™ºæ³¨é‡‘é¡�ã�Œç„¡ã�‘ã‚Œã�°äºˆç®—é‡‘é¡�ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                if (OrderValue <= 0) OrderValue = ExecValue;
 
-                //// ç™»éŒ²å€¤+å…¥åŠ›å€¤ã�Œå®Ÿè¡Œé‡‘é¡�ã‚’è¶…ã�ˆã�Ÿå ´å�ˆã�¯falseã‚’è¿”ã�™
-                //if (ExecValue < (PaymentValue + CurrentValue)) return false;
                 // ç™»éŒ²å€¤+å…¥åŠ›å€¤ã�Œç™ºæ³¨é‡‘é¡�ã‚’è¶…ã�ˆã�Ÿå ´å�ˆã�¯falseã‚’è¿”ã�™
-                if (OrderValue < (PaymentValue + CurrentValue)) return false;
+                if (OrderValue < (PaymentValue + CurrentValue))
+                {
+                    // å…¥åŠ›å€¤ã�Œï¼�ã�®å ´å�ˆã�¯ã‚¨ãƒ©ãƒ¼ã�«ã�—ã�ªã�„
+                    if (CurrentValue == 0) return true;
 
+                    // äºˆç®—ã�Œãƒ—ãƒ©ã‚¹ã�®å ´å�ˆã�¯è¶…é�Žï¼ˆãƒžã‚¤ãƒŠã‚¹æ™‚ã�«ã�¯è¶…é�Žã�«ã�—ã�ªã�„ï¼‰
+                    if (ExecValue > 0) return false;
+                }
+
                 return true;
             }
             catch (System.Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsConvertCode.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsConvertCode.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsConvertCode.cs	(revision 483)
@@ -77,6 +77,9 @@
                     case (int)ClsExcute.ApprovalListNo.GoOut:                               // 23:å¤–ã€€å‡ºâž�5:å¤–ã€€å‡º
                         nAppNo = (int)AttendanceDailyData.WorkKindFlgDef.GoOut;
                         break;
+                    case (int)ClsExcute.ApprovalListNo.UniqueDay:                           // 25:ç‰¹æ®Šä¼‘æš‡âž�12:ç‰¹æ®Šä¼‘
+                        nAppNo = (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay;
+                        break;
                 }
 
                 return nAppNo;
@@ -130,6 +133,9 @@
                     case (int)AttendanceDailyData.WorkKindFlgDef.CompensatoryHoliday:       // 10:ä»£ã€€ä¼‘âž�18:ä»£ã€€ä¼‘
                         nAppNo = (int)ClsExcute.ApprovalListNo.CompensatoryHoliday;
                         break;
+                    case (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay:                 // 12:ç‰¹æ®Šä¼‘âž�18:ç‰¹æ®Šä¼‘æš‡ä¼‘
+                        nAppNo = (int)ClsExcute.ApprovalListNo.UniqueDay;
+                        break;
                 }
 
                 return nAppNo;
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 483)
@@ -101,6 +101,7 @@
             WorkingPrint = 54,                  // 54:å‡ºå‹¤ç®¡ç�†æ—¥å ±å�°åˆ·
             OnHandVolume = 55,                  // 55:æ‰‹æŒ�å·¥äº‹é«˜ä¸€è¦§
             DRNoticeCalender = 56,              // 56:å‹¤æ€ å±Šã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
+            PurchaseOrderList = 57,             // 57:æ³¨æ–‡æ›¸å…¥åŠ›ä¸€è¦§
         }
         #endregion
 
@@ -281,6 +282,7 @@
                                                                                 { (int)ProcessExecuteNo.WorkingPrint,           "å‡ºå‹¤ç®¡ç�†æ—¥å ±ï¼�å�°åˆ·" },
                                                                                 { (int)ProcessExecuteNo.OnHandVolume,           "æ‰‹æŒ�å·¥äº‹é«˜ï¼�å�°åˆ·" },
                                                                                 { (int)ProcessExecuteNo.DRNoticeCalender,       "å‹¤æ€ å±Šã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼ï¼�è¡¨ç¤º" },
+                                                                                { (int)ProcessExecuteNo.PurchaseOrderList,      "æ³¨æ–‡æ›¸å…¥åŠ›ä¸€è¦§ï¼�è¡¨ç¤º" },
                                                                                 };
 
         #endregion
@@ -347,9 +349,9 @@
                                                                                 };
         #endregion
 
-        #region æ‰¿èª�å‡¦ç�†å®šç¾©
+        #region æ‰¿èª�å‡¦ç�†å®šç¾©ä¸€è¦§
         /// <summary>
-        /// æ‰¿èª�ä¸€è¦§
+        /// æ‰¿èª�å‡¦ç�†å®šç¾©ä¸€è¦§
         /// </summary>
         public enum ApprovalListNo
         {
@@ -453,6 +455,10 @@
             /// 24:è«‹æ±‚å�–æ¶ˆ
             /// </summary>
             OrderRequestCancel,
+            /// <summary>
+            /// 25:ç‰¹æ®Šä¼‘æš‡
+            /// </summary>
+            UniqueDay,
         }
         #endregion
 
@@ -504,7 +510,8 @@
                                                                                 { (int)ApprovalListNo.Late,                         "é�…åˆ»æ‰¿èª�" },
                                                                                 { (int)ApprovalListNo.LeaveEarly,                   "æ—©é€€æ‰¿èª�" },
                                                                                 { (int)ApprovalListNo.GoOut,                        "å¤–å‡ºæ‰¿èª�" },
-                                                                                { (int)ApprovalListNo.OrderRequestCancel,           "è«‹æ±‚å�–æ¶ˆ" },
+                                                                                { (int)ApprovalListNo.OrderRequestCancel,           "è«‹æ±‚å�–æ¶ˆæ‰¿èª�" },
+                                                                                { (int)ApprovalListNo.UniqueDay,                    "ç‰¹æ®Šä¼‘æš‡æ‰¿èª�" },
                                                                                 };
 
         #endregion
@@ -859,10 +866,14 @@
                             ProcessExecuteNo_OnHandVolume(m_ProcControlPara[NowPoint]);
                             break;
 
-                        case (int)ProcessExecuteNo.DRNoticeCalender:                      // 56:å‹¤æ€ å±Šã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
+                        case (int)ProcessExecuteNo.DRNoticeCalender:                    // 56:å‹¤æ€ å±Šã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼
                             ProcessExecuteNo_DRWorkCalender(m_ProcControlPara[NowPoint]);
                             break;
 
+                        case (int)ProcessExecuteNo.PurchaseOrderList:                   // 57:æ³¨æ–‡æ›¸å…¥åŠ›ä¸€è¦§
+                            ProcessExecuteNo_PurchaseOrderList(m_ProcControlPara[NowPoint]);
+                            break;
+
                         #endregion
 
                         #region ãƒžã‚¹ã‚¿ãƒ¡ãƒ³ãƒ†
@@ -1232,8 +1243,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1273,8 +1282,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1315,8 +1322,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1395,8 +1400,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1442,7 +1445,7 @@
                     frm.DirectFlg = CurrentPara.BoolExecParameter[0];
                     if (CurrentPara.BoolExecParameter.Count > 1)
                     {
-                        /// æ–°è¦�ç”³è«‹ãƒ•ãƒ©ã‚°
+                        // æ–°è¦�ç”³è«‹ãƒ•ãƒ©ã‚°
                         frm.NewApprovalFlg = CurrentPara.BoolExecParameter[1];
                     }
                 }
@@ -1458,8 +1461,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1501,8 +1502,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1661,8 +1660,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1707,8 +1704,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1803,8 +1798,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -1848,8 +1841,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -2098,8 +2089,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -2444,8 +2433,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
@@ -2515,13 +2502,13 @@
                 }
 
                 // æ¬¡èµ·å‹•ãƒ—ãƒ­ã‚»ã‚¹ã‚»ãƒƒãƒˆ
-                frm.ExecuteFlg = CurrentPara.IntExecParameter[0];
-                frm.ExecuteSubFlg = CurrentPara.IntExecParameter[1];
-                frm.RequestMonth = CurrentPara.IntExecParameter[2];
-                frm.OrderersDivision = CurrentPara.IntExecParameter[3];
-                frm.OrderersCode = CurrentPara.IntExecParameter[4];
+                if (CurrentPara.IntExecParameter.Count > 0) frm.ExecuteFlg = CurrentPara.IntExecParameter[0];
+                if (CurrentPara.IntExecParameter.Count > 1) frm.ExecuteSubFlg = CurrentPara.IntExecParameter[1];
+                if (CurrentPara.IntExecParameter.Count > 2) frm.RequestMonth = CurrentPara.IntExecParameter[2];
+                if (CurrentPara.IntExecParameter.Count > 3) frm.OrderersDivision = CurrentPara.IntExecParameter[3];
+                if (CurrentPara.IntExecParameter.Count > 4) frm.OrderersCode = CurrentPara.IntExecParameter[4];
 
-                frm.OrderersName = CurrentPara.StringExecParameter[0];
+                if (CurrentPara.StringExecParameter.Count > 0) frm.OrderersName = CurrentPara.StringExecParameter[0];
 
                 frm.EditFlg = true;
 
@@ -3290,14 +3277,56 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
-                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
             }
         }
         #endregion
 
+        #region æ³¨æ–‡æ›¸å…¥åŠ›ä¸€è¦§
+        /// <summary>
+        /// æ³¨æ–‡æ›¸å…¥åŠ›ä¸€è¦§
+        /// </summary>
+        /// <returns></returns>
+        public static void ProcessExecuteNo_PurchaseOrderList(ProcessParameter CurrentPara)
+        {
+            // æ³¨æ–‡æ›¸å…¥åŠ›ä¸€è¦§
+            FrmOrderEntryList frm = new FrmOrderEntryList();
+            int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderList;
+            try
+            {
+                // è‡ªåˆ†ã�®ãƒ�ãƒ³ãƒ‰ãƒ«ã‚’ãƒªã‚¹ãƒˆã�¸ã‚»ãƒƒãƒˆã�™ã‚‹
+                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = ProcessNo;
+                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = (Form)frm;
+
+                // èµ·å‹•ãƒ»ç·¨é›†ãƒ•ãƒ©ã‚°
+                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
+                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
+                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
+
+                // ----- ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                // å·¥äº‹ç•ªå�·
+                frm.ConstructionCode = CurrentPara.IntExecParameter[0];
+
+                // æ–°è¦�ç”³è«‹ãƒ•ãƒ©ã‚°
+                if (CurrentPara.BoolExecParameter.Count > 0)
+                    frm.NewApprovalFlg = CurrentPara.BoolExecParameter[0];
+
+                // ãƒ•ã‚©ãƒ¼ãƒ è¡¨ç¤º
+                frm.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                BackProcess();
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
         #endregion
 
+        #endregion
+
         #region ãƒžã‚¹ã‚¿ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹
         // ----------------- ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹èµ·å‹•
         #region ç®¡ç�†ãƒžã‚¹ã‚¿
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMoveDepOfInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMoveDepOfInfo.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMoveDepOfInfo.cs	(revision 483)
@@ -491,9 +491,9 @@
                 }
                 strSQL.Append(" )");
 
-                strSQL.AppendFormat(" And GroupCount in ({0}, {1}, {2})",(int)FrmConstructionLedger.DataGroup.Instructor
-                                                                        , (int)FrmConstructionLedger.DataGroup.Assistant
-                                                                        , (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL.AppendFormat(" And GroupCount in ({0}, {1}, {2})",(int)ConstructionLedgerDetail.GroupCountDef.Instructor
+                                                                        , (int)ConstructionLedgerDetail.GroupCountDef.Assistant
+                                                                        , (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.AppendFormat(" And CompanyCode = {0}", PersonCode);
 
                 if (!LedgerDB.ExecuteNonQuery(strSQL.ToString(), false)) return false;
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsOtherProc.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsOtherProc.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsOtherProc.cs	(revision 483)
@@ -811,7 +811,7 @@
         /// <summary>
         /// èµ·å‹•ãƒ•ã‚©ãƒ¼ãƒ ç™»éŒ²
         /// </summary>
-        private static void ExecFormEntry(int ProcessNo, int CurProcNo, Form CurForm)
+        public static void ExecFormEntry(int ProcessNo, int CurProcNo, Form CurForm)
         {
             try
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs	(revision 483)
@@ -376,9 +376,11 @@
                 WriteData.MessageColor = CheckRec.ForeColor;                                                // èƒŒæ™¯è‰²ã‚»ãƒƒãƒˆ
 
                 // æŽ²ç¤ºæ�¿å¯¾è±¡è€…ãƒ†ãƒ¼ãƒ–ãƒ«
-                MessageBoardTerget DetailTbl = new MessageBoardTerget();
-                DetailTbl.ToCode = ConstructionPersonCode;                                                  // å¯¾è±¡è€…ã‚³ãƒ¼ãƒ‰
-                DetailTbl.ToName = ConstructionPersonName;	                                                // å¯¾è±¡è€…
+                MessageBoardTerget DetailTbl = new MessageBoardTerget
+                {
+                    ToCode = ConstructionPersonCode,                                                  // å¯¾è±¡è€…ã‚³ãƒ¼ãƒ‰
+                    ToName = ConstructionPersonName                                                 // å¯¾è±¡è€…
+                };
                 WriteDetail.Add(DetailTbl);
 
                 // ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒ•ãƒ©ã‚°ã‚’è‡ªå‹•ã�«è¨­å®šã�™ã‚‹
@@ -692,9 +694,8 @@
                 strSQL.Append(" Where");
                 strSQL.AppendFormat(" B1.ConstructionCode = {0}", nConstrCode);
 
-                // ----- å®šç¾©ã�ŒClsExcuteã‚¯ãƒ©ã‚¹ã�«ã�‚ã‚‹ã�Ÿã‚�ãƒžã‚¸ãƒƒã‚¯ãƒŠãƒ³ãƒ�ãƒ¼
-                // ----- ï¼“ã�¯å·¥äº‹äºˆç®—æ‰¿èª�ã�Œæ‰¿èª�ã�•ã‚Œã�¦ã�„ã‚Œã�°ï¼¯ï¼«
-                strSQL.Append(" And B1.ApprovalCode = 3");
+                // ----- å·¥äº‹äºˆç®—æ‰¿èª�ã�Œæ‰¿èª�ã�•ã‚Œã�¦ã�„ã‚Œã�°ï¼¯ï¼«
+                strSQL.AppendFormat(" And B1.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
                 strSQL.Append(" And B1.SeqNo = 1");
                 strSQL.AppendFormat(" And B1.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
 
@@ -930,9 +931,11 @@
                 WriteData.MessageColor = CheckRec.ForeColor;                                                // èƒŒæ™¯è‰²ã‚»ãƒƒãƒˆ
 
                 // æŽ²ç¤ºæ�¿å¯¾è±¡è€…ãƒ†ãƒ¼ãƒ–ãƒ«
-                MessageBoardTerget DetailTbl = new MessageBoardTerget();
-                DetailTbl.ToCode = SalesPersonCode;                                                     // å¯¾è±¡è€…ã‚³ãƒ¼ãƒ‰
-                DetailTbl.ToName = SalesPersonName;	                                                    // å¯¾è±¡è€…
+                MessageBoardTerget DetailTbl = new MessageBoardTerget
+                {
+                    ToCode = SalesPersonCode,                                                     // å¯¾è±¡è€…ã‚³ãƒ¼ãƒ‰
+                    ToName = SalesPersonName                                                        // å¯¾è±¡è€…
+                };
                 if (ConstructionPersonCode != 0)
                 {
                     DetailTbl.ToCode = ConstructionPersonCode;                                          // å¯¾è±¡è€…ã‚³ãƒ¼ãƒ‰
@@ -1078,10 +1081,12 @@
         {
             try
             {
-                ConstructionBaseInfoDetail work = new ConstructionBaseInfoDetail();
-                work.ConstructionCode = ConstrCode;
-                work.DetailNo = (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment;
-                work.DetailString = strMsg;
+                ConstructionBaseInfoDetail work = new ConstructionBaseInfoDetail
+                {
+                    ConstructionCode = ConstrCode,
+                    DetailNo = (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment,
+                    DetailString = strMsg
+                };
 
                 if (!DetailDB.InsertAction(work, false)) return false;
 
@@ -1397,12 +1402,14 @@
                         return false;
                     }
 
-                    BizPeriodHistory BizHisRec = new BizPeriodHistory();
-                    BizHisRec.PeriodYear = nData;               // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
-                    BizHisRec.PeriodFlag = nPeriodFlag;         // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+                    BizPeriodHistory BizHisRec = new BizPeriodHistory
+                    {
+                        PeriodYear = nData,               // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
+                        PeriodFlag = nPeriodFlag,         // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
 
-                    BizHisRec.BeginDate = dtData[0];            // æœŸé¦–æ—¥
-                    BizHisRec.CompleteDate = dtData[1];         // æœŸæœ«æ—¥
+                        BeginDate = dtData[0],            // æœŸé¦–æ—¥
+                        CompleteDate = dtData[1]         // æœŸæœ«æ—¥
+                    };
 
                     if (BizHisList.Count < 1)
                     {
@@ -1664,22 +1671,26 @@
                 if (!SystemDB.SelectAction(strSQL.ToString(), ref SysRec)) return false;
 
                 // æœŸæœ«ã�®ã�¿å‡¦ç�†ã‚’è¡Œã�†
-                if ((int)SystemMaster.ConstrNoBaseDef.BusinessPeriod == SysRec.ConstructionNoBase)
+                int nYear = DateTime.Today.Year;
+                int nMonth = DateTime.Today.Month;
+                if (CommonMotions.BasePeriodYear())
                 {
                     // æœŸã‚’é�¸æŠžã�—ã�¦ã�„ã‚‹å ´å�ˆ
-                    if (DateTime.Today.AddDays(-1).Date != SysRec.BusinessCompDate.Date) return true;
+                    if (DateTime.Today.Date != SysRec.BusinessCompDate.Date) return true;
+                    nMonth = (SysRec.BusinessCompDate.Month + 1);
                 }
                 else
                 {
                     // å¹´ã‚’é�¸æŠžã�—ã�¦ã�„ã‚‹å ´å�ˆ
-                    if (DateTime.Today.AddDays(-1).Date != SysRec.ConstrBeginDate.Date) return true;
+                    if (DateTime.Today.Date != SysRec.ConstrCompDate.Date) return true;
+                    nMonth = (SysRec.ConstrCompDate.Month + 1);
                 }
 
                 DateDB.connect();DateDB.beginTran();
 
                 // å½“æœˆã�®25æ—¥é–‹å§‹ã€�ç¿Œæœˆ5æ—¥ã�®ãƒ‡ãƒ¼ã‚¿ã‚’1å¹´åˆ†ä½œæˆ�ã�™ã‚‹
-                DateTime dtWrkYM = new DateTime(2019, 4, 1);
-                DateTime dtWrkYM2 = new DateTime(2019, 4, 1);
+                DateTime dtWrkYM = new DateTime(nYear, nMonth, 1);
+                DateTime dtWrkYM2 = new DateTime(nYear, nMonth, 1);
                 DateTime[] dateTime = new DateTime[2];
                 ClosingDateOfMonth DateRec = new ClosingDateOfMonth();
                 for (int ix = 0; ix < 12; ix++)
@@ -1765,8 +1776,10 @@
             try
             {
                 // å®šæ•°å�–å¾—
-                List<decimal> PaidHolidayTable = new List<decimal> { 10, 11, 12, 14, 16, 18, 20 };
+                //List<decimal> PaidHolidayTable = new List<decimal> { 10, 11, 12, 14, 16, 18, 20 };    2020/4/20 Commondefineã�¸ç§»å‹•
+                // å�Šå¹´å¾Œ
                 int nAddMonth = 6;
+                // åŠ ç®—å¹´
                 int nAddYear = 1;
 
                 StringBuilder strSQL = new StringBuilder();
@@ -1801,7 +1814,7 @@
                         // ãƒ«ãƒ¼ãƒ—ã‚«ã‚¦ãƒ³ãƒˆã�®æœ€çµ‚å›žã�¯ç„¡æ�¡ä»¶ã�«å‡¦ç�†ã�™ã‚‹
                         // å¹´ã�Œä»Šå¹´ã�®æ™‚ã�«å‡¦ç�†ã‚’è¡Œã�†
                         DateTime dtWork = dtTarget.AddYears((ix * nAddYear));
-                        if (ix < (PaidHolidayTable.Count - 1)
+                        if (ix < (CommonDefine.PaidHolidayTable.Count - 1)
                             && dtWork.Year != DateTime.Today.Year) continue;
 
                         // å½“å¹´æ®‹æ—¥æ•°å�–å¾—
@@ -1812,12 +1825,12 @@
                         if (nZen < 0)
                         {
                             strSQL.Append(" SET PaidVacationDaysPrev = 0");
-                            strSQL.AppendFormat(", PaidVacationDays = {0}", (PaidHolidayTable[ix] + nZen));
+                            strSQL.AppendFormat(", PaidVacationDays = {0}", (CommonDefine.PaidHolidayTable[ix] + nZen));
                         }
                         else
                         {
                             strSQL.Append(" SET PaidVacationDaysPrev = PaidVacationDays");
-                            strSQL.AppendFormat(", PaidVacationDays = {0}", PaidHolidayTable[ix]);
+                            strSQL.AppendFormat(", PaidVacationDays = {0}", CommonDefine.PaidHolidayTable[ix]);
                         }
                         strSQL.Append("      , UpdateDate = NOW()");
                         strSQL.AppendFormat(" Where PersonCode = {0}", nManNo);
Index: trunk/src/ProcessManagement/ProcessManagement/Common/ProductDefine.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/ProductDefine.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/ProductDefine.cs	(revision 483)
@@ -183,7 +183,7 @@
         /// <summary>
         /// è£½å“�ç¨®åˆ¥
         /// </summary>
-        private static int m_ProductType = (int)ProductTypeDef.ProductsModelType3;
+        private static int m_ProductType = (int)ProductTypeDef.ProductsModelType1;
         #endregion
 
         #region æ›´æ–°æ©Ÿèƒ½å®Ÿè£…
@@ -204,7 +204,7 @@
         /// <summary>
         /// ï¼¤ï¼¢ã‚µãƒ¼ãƒ�ãƒ¼ã‚¿ã‚¤ãƒ—
         /// </summary>
-        private static int m_StorageType = (int)StorageTypeDef.VPS;
+        private static int m_StorageType = (int)StorageTypeDef.Internal_LAN;
         #endregion
 
         #region ãƒ�ãƒƒãƒ�å‡¦ç�†èµ·å‹•ã‚¿ã‚¤ãƒ—
@@ -211,7 +211,7 @@
         /// <summary>
         /// ãƒ�ãƒƒãƒ�å‡¦ç�†èµ·å‹•ã‚¿ã‚¤ãƒ—
         /// </summary>
-        private static int m_BatchProcessing = (int)BatchProcessingDef.Server;
+        private static int m_BatchProcessing = (int)BatchProcessingDef.Loacl;
         #endregion
 
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingCostDataLink.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingCostDataLink.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingCostDataLink.cs	(revision 483)
@@ -0,0 +1,574 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+using log4net;
+using MySql.Data.MySqlClient;
+
+using ProcessManagement.DB.MySql;
+using ProcessManagement.DB.Core;
+using ProcessManagement.DataModel;
+
+using ProcessManagement.Common;
+
+namespace ProcessManagement.DB.IOAccess
+{
+    /// <summary>
+    /// æ¥­è€…è«‹æ±‚éƒ¨ç½²å‡ºç´�ãƒªãƒ³ã‚¯ãƒ‡ãƒ¼ã‚¿ã‚¯ãƒ©ã‚¹
+    /// </summary>
+    public class IOBillingCostDataLink: MySqlProcess
+    {
+        #region å®šç¾©éƒ¨
+        /// <summary>
+        /// log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
+        /// </summary>
+        public enum NameColumn
+        {
+            CompanyCode = 0,
+            TargetDate,
+            SeqNoB,
+            LineCount,
+            LabourKind,
+            YearNumber,
+            CostType,
+            TargetType,
+            TargetCode,
+            SeqNoC,
+            EntryDate,
+            UpdateDate,
+        }
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        /// <param name="ConnectionString"></param>
+        public IOBillingCostDataLink()
+            : base(DBCommon.Instance.DBConnectString)
+        {
+        }
+
+        #endregion
+
+        #region æ‰¿èª�ãƒ‡ãƒ¼ã‚¿æ¤œç´¢æ–‡å­—åˆ—ä½œæˆ�
+        /// <summary>
+        /// æ‰¿èª�ãƒ‡ãƒ¼ã‚¿æ¤œç´¢æ–‡å­—åˆ—ä½œæˆ�
+        /// </summary>
+        private string CreateSelectSQL()
+        {
+            StringBuilder strcmd = new StringBuilder();
+            strcmd.Append("SELECT");
+
+            bool bColFirst = true;
+            string strWork = string.Empty;
+            foreach (var gender in Enum.GetValues(typeof(NameColumn)))
+            {
+                strWork = gender.ToString();
+                if (!bColFirst) strcmd.Append(",");
+                if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                {
+                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
+                }
+                else
+                {
+                    strcmd.AppendFormat(" {0}", strWork);
+                }
+                bColFirst = false;
+            }
+
+            strcmd.Append(" FROM BillingCostDataLink");
+
+            return strcmd.ToString();
+        }
+        #endregion
+
+        #region æ¤œç´¢ï¼ˆè¤‡æ•°ï¼‰
+        /// <summary>
+        /// æ¤œç´¢ï¼ˆè¤‡æ•°ï¼‰
+        /// </summary>
+        public bool SelectAction(string AddSQLString, ref List<BillingCostDataLink> data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    BillingCostDataLink work = new BillingCostDataLink();
+                    Reader2Struct(objwrk, ref work);
+                    data.Add(work);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+
+        }
+        #endregion
+
+        #region æ¤œç´¢ï¼ˆ1ä»¶ï¼‰
+        /// <summary>
+        /// æ¤œç´¢ï¼ˆ1ä»¶ï¼‰
+        /// </summary>
+        public bool SelectAction(string AddSQLString, ref BillingCostDataLink data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                object[] objwrk = (object[])arData[0];
+                Reader2Struct(objwrk, ref data);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+
+        }
+        #endregion
+
+        #region æ–°è¦�ç™»éŒ²ï¼ˆ1ä»¶ï¼‰
+        /// <summary>
+        /// æ–°è¦�ç™»éŒ²ï¼ˆ1ä»¶ï¼‰
+        /// </summary>
+        public bool InsertAction(BillingCostDataLink work, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Clear();
+                strcmd.Append("INSERT INTO BillingCostDataLink");
+
+                strcmd.Append("(");
+                bool bFirst = true;
+                foreach (var gender in Enum.GetValues(typeof(NameColumn)))
+                {
+                    if (!bFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bFirst = false;
+                }
+                strcmd.Append(") VALUES (");
+
+                strcmd.AppendFormat("  {0}", work.CompanyCode);
+                strcmd.AppendFormat(", {0}", work.TargetDate);
+                strcmd.AppendFormat(", {0}", work.SeqNoB);
+                strcmd.AppendFormat(", {0}", work.LineCount);
+                strcmd.AppendFormat(", {0}", work.LabourKind);
+                strcmd.AppendFormat(", {0}", work.YearNumber);
+                strcmd.AppendFormat(", {0}", work.CostType);
+                strcmd.AppendFormat(", {0}", work.TargetType);
+                strcmd.AppendFormat(", {0}", work.TargetCode);
+                strcmd.AppendFormat(", {0}", work.SeqNoC);
+
+                strcmd.Append(", NOW()");
+                strcmd.Append(", NOW()");
+                strcmd.Append(")");
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ–°è¦�ç™»éŒ²ï¼ˆè¤‡æ•°ï¼‰
+        /// <summary>
+        /// æ–°è¦�ç™»éŒ²ï¼ˆè¤‡æ•°ï¼‰
+        /// </summary>
+        public bool InsertAction(List<BillingCostDataLink> data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Clear();
+                strcmd.Append("INSERT INTO BillingCostDataLink");
+
+                strcmd.Append("(");
+                bool bFirst = true;
+                foreach (var gender in Enum.GetValues(typeof(NameColumn)))
+                {
+                    if (!bFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bFirst = false;
+                }
+                strcmd.Append(") VALUES");
+
+                bool bDataFirst = true;
+                foreach (BillingCostDataLink work in data)
+                {
+                    if (bDataFirst) strcmd.Append(" (");
+                    else strcmd.Append(", (");
+
+                    strcmd.AppendFormat("  {0}", work.CompanyCode);
+                    strcmd.AppendFormat(", {0}", work.TargetDate);
+                    strcmd.AppendFormat(", {0}", work.SeqNoB);
+                    strcmd.AppendFormat(", {0}", work.LineCount);
+                    strcmd.AppendFormat(", {0}", work.LabourKind);
+                    strcmd.AppendFormat(", {0}", work.YearNumber);
+                    strcmd.AppendFormat(", {0}", work.CostType);
+                    strcmd.AppendFormat(", {0}", work.TargetType);
+                    strcmd.AppendFormat(", {0}", work.TargetCode);
+                    strcmd.AppendFormat(", {0}", work.SeqNoC);
+
+                    strcmd.Append(", NOW()");
+                    strcmd.Append(", NOW()");
+                    strcmd.Append(")");
+
+                    bDataFirst = false;
+                }
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ›´æ–°ç™»éŒ²
+        /// <summary>
+        /// æ›´æ–°ç™»éŒ²
+        /// </summary>
+        public bool UpdateAction(string AddSQLString, BillingCostDataLink data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Append("UPDATE BillingCostDataLink");
+
+                strcmd.Append(" SET");
+
+                strcmd.AppendFormat(" CompanyCode = {0}", data.CompanyCode);
+                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
+                strcmd.AppendFormat(", SeqNoB = {0}", data.SeqNoB);
+                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
+                strcmd.AppendFormat(", LabourKind = {0}", data.LabourKind);
+                strcmd.AppendFormat(", YearNumber = {0}", data.YearNumber);
+                strcmd.AppendFormat(", CostType = {0}", data.CostType);
+                strcmd.AppendFormat(", TargetType = {0}", data.TargetType);
+                strcmd.AppendFormat(", TargetCode = {0}", data.TargetCode);
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNoC);
+
+                strcmd.Append(", UpdateDate = NOW()");
+                strcmd.Append(AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1é …ç›®æ›´æ–°å‡¦ç�†
+        /// <summary>
+        /// 1é …ç›®ã�®æ›´æ–°ã‚’è¡Œã�†
+        /// </summary>
+        /// <returns></returns>
+        public bool UpdateFeild(int CompanyCode, int TargetDate, int SeqNo, int LineCount, int FeildNo, object value, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.Append("UPDATE BillingCostDataLink");
+
+                strcmd.Append(" SET");
+                switch (FeildNo)
+                {
+                    case (int)NameColumn.CompanyCode:
+                        strcmd.AppendFormat(" CompanyCode = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.TargetDate:
+                        strcmd.AppendFormat(" TargetDate = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.SeqNoB:
+                        strcmd.AppendFormat(" SeqNoB = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.LineCount:
+                        strcmd.AppendFormat(" LineCount = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.LabourKind:
+                        strcmd.AppendFormat(" LabourKind = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.YearNumber:
+                        strcmd.AppendFormat(" YearNumber = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.CostType:
+                        strcmd.AppendFormat(" CostType = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.TargetType:
+                        strcmd.AppendFormat(" TargetType = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.TargetCode:
+                        strcmd.AppendFormat(" TargetCode = {0}", (int)value);
+                        break;
+                    case (int)NameColumn.SeqNoC:
+                        strcmd.AppendFormat(" SeqNoC = {0}", (int)value);
+                        break;
+                }
+
+                strcmd.Append(", UpdateDate = NOW()");
+                strcmd.Append(CreatePrimarykeyString(CompanyCode, TargetDate, SeqNo, LineCount));
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region å‰Šé™¤
+        /// <summary>
+        /// å‰Šé™¤
+        /// </summary>
+        public bool DeleteAction(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.AppendFormat("{0}{1}", "DELETE FROM BillingCostDataLink", AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ§‹é€ ä½“è¨­å®š
+        /// <summary>
+        /// æ§‹é€ ä½“è¨­å®š
+        /// </summary>
+        /// <param name="objwrk"></param>
+        /// <param name="wrk"></param>
+        public void Reader2Struct(object[] objwrk, ref BillingCostDataLink wrk)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                wrk.CompanyCode = int.Parse(objwrk[(int)NameColumn.CompanyCode].ToString());
+                wrk.TargetDate = int.Parse(objwrk[(int)NameColumn.TargetDate].ToString());
+                wrk.SeqNoB = int.Parse(objwrk[(int)NameColumn.SeqNoB].ToString());
+                wrk.LineCount= int.Parse(objwrk[(int)NameColumn.LineCount].ToString());
+                wrk.LabourKind= int.Parse(objwrk[(int)NameColumn.LabourKind].ToString());
+                wrk.YearNumber = int.Parse(objwrk[(int)NameColumn.YearNumber].ToString());
+                wrk.CostType = int.Parse(objwrk[(int)NameColumn.CostType].ToString());
+                wrk.TargetType = int.Parse(objwrk[(int)NameColumn.TargetType].ToString());
+                wrk.TargetCode = int.Parse(objwrk[(int)NameColumn.TargetCode].ToString());
+                wrk.SeqNoC = int.Parse(objwrk[(int)NameColumn.SeqNoC].ToString());
+
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)NameColumn.UpdateDate].ToString());
+            }
+            catch (MySqlException myex)
+            {
+                logger.ErrorFormat("ï¼­ï½™ï¼³ï¼±ï¼¬ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), myex.Message);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ãƒ—ãƒ©ã‚¤ãƒžãƒªã‚­ãƒ¼æ–‡å­—åˆ—ä½œæˆ�
+        /// <summary>
+        /// ãƒ—ãƒ©ã‚¤ãƒžãƒªã‚­ãƒ¼æ–‡å­—åˆ—ä½œæˆ�
+        /// </summary>
+        public string CreatePrimarykeyString(int CompanyCode, int TargetDate,int SeqNo = -1, int LineCount = -1, int LabourKind = -1)
+        {
+            StringBuilder strWork = new StringBuilder();
+            try
+            {
+                strWork.AppendFormat(" Where CompanyCode = {0}", CompanyCode);
+                strWork.AppendFormat(" And TargetDate = {0}", TargetDate);
+                if (SeqNo >= 0) strWork.AppendFormat(" And SeqNoB = {0}", SeqNo);
+                if (LineCount >= 0) strWork.AppendFormat(" And LineCount = {0}", LineCount);
+                if (LabourKind >= 0) strWork.AppendFormat(" And LabourKind = {0}", LabourKind);
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
+            }
+
+            return strWork.ToString();
+        }
+        #endregion
+
+        #region è¡Œãƒ­ãƒƒã‚¯
+        /// <summary>
+        /// è¡Œãƒ­ãƒƒã‚¯
+        /// </summary>
+        /// <param name="MaterialItemCode"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public bool RowLock(int CompanyCode, int TargetDate, int SeqNo, int LineCount, int LabourKind, bool bConnect = true)
+        {
+            //ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                strcmd.Append("Select * From BillingCostDataLink");
+                strcmd.Append(CreatePrimarykeyString(CompanyCode, TargetDate, SeqNo, LineCount, LabourKind));
+                strcmd.Append(" For Update;");
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼šï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ¥­è€…è«‹æ±‚æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æœ€å¤§é€£ç•ªå�·å�–å¾—
+        /// <summary>
+        /// æ¥­è€…è«‹æ±‚æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã�®æœ€å¤§é€£ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="AddSQLString"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public int SelectMaxSeqNo(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+            int iRet = 0;
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.AppendFormat("SELECT IFNULL(MAX(SeqNo), 0) FROM BillingCostDataLink {0}", AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    if (objwrk[0].ToString().Equals("null"))
+                        iRet = 0;
+                    else
+                        iRet = CommonMotions.cnvInt(objwrk[0]);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+            }
+            return iRet;
+        }
+        #endregion
+
+        #region æ¥­è€…è«‹æ±‚æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æœ€å¤§è¡Œç•ªå�·å�–å¾—
+        /// <summary>
+        /// æ¥­è€…è«‹æ±‚æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã�®æœ€å¤§è¡Œç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="AddSQLString"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public int SelectMaxLinecount(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+            int iRet = 0;
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.AppendFormat("SELECT IFNULL(MAX(LINECOUNT), 0) FROM BillingCostDataLink {0}", AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    if (objwrk[0].ToString().Equals("null"))
+                        iRet = 0;
+                    else
+                        iRet = CommonMotions.cnvInt(objwrk[0]);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+            }
+            return iRet;
+        }
+        #endregion
+
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs	(revision 483)
@@ -369,7 +369,7 @@
                         strcmd.AppendFormat(" LineCount = {0}", (int)value);
                         break;
                     case (int)NameColumn.LabourKind:
-                        strcmd.AppendFormat(" PaymentKind = {0}", (int)value);
+                        strcmd.AppendFormat(" LabourKind = {0}", (int)value);
                         break;
                     case (int)NameColumn.ConstructionCode:
                         strcmd.AppendFormat(" ConstructionCode = {0}", (int)value);
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 483)
@@ -90,6 +90,7 @@
             InspectExecuteDate,
             RevCompleteDate,
             ExpectedOrder,
+            EvaluationScore,
             EntryDate,
             UpdateDate,
         }
@@ -345,6 +346,7 @@
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.InspectExecuteDate.ToShortDateString());
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.RevCompleteDate.ToShortDateString());
                 strcmd.AppendFormat(", {0}", data.ExpectedOrder);
+                strcmd.AppendFormat(", {0}", data.EvaluationScore);
 
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.EntryDate);
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.UpdateDate);
@@ -457,6 +459,7 @@
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.InspectExecuteDate.ToShortDateString());
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.RevCompleteDate.ToShortDateString());
                     strcmd.AppendFormat(", {0}", work.ExpectedOrder);
+                    strcmd.AppendFormat(", {0}", work.EvaluationScore);
 
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
@@ -561,6 +564,7 @@
                 strcmd.AppendFormat(", InspectExecuteDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.InspectExecuteDate.ToShortDateString());
                 strcmd.AppendFormat(", RevCompleteDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.RevCompleteDate.ToShortDateString());
                 strcmd.AppendFormat(", ExpectedOrder = {0}", data.ExpectedOrder);
+                strcmd.AppendFormat(", EvaluationScore = {0}", data.EvaluationScore);
 
                 strcmd.Append(", UpdateDate = NOW()");
                 strcmd.Append(AddSQLString);
@@ -684,7 +688,8 @@
                 wrk.InspectExecuteDate = DateTime.Parse(objwrk[(int)TableColumn.InspectExecuteDate].ToString());
                 wrk.RevCompleteDate = DateTime.Parse(objwrk[(int)TableColumn.RevCompleteDate].ToString());
                 wrk.ExpectedOrder = int.Parse(objwrk[(int)TableColumn.ExpectedOrder].ToString());
-                
+                wrk.EvaluationScore = decimal.Parse(objwrk[(int)TableColumn.EvaluationScore].ToString());
+
                 wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
                 wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
             }
@@ -891,6 +896,9 @@
                     case (int)TableColumn.ExpectedOrder:
                         strcmd.AppendFormat(" ExpectedOrder = {0}", ((int)value).ToString());
                         break;
+                    case (int)TableColumn.EvaluationScore:
+                        strcmd.AppendFormat(" EvaluationScore = {0}", ((decimal)value).ToString());
+                        break;
                 }
 
                 strcmd.Append(", UpdateDate = NOW()");
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOCostDataOfCompensation.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOCostDataOfCompensation.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOCostDataOfCompensation.cs	(revision 483)
@@ -0,0 +1,467 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Collections;
+
+using log4net;
+using MySql.Data.MySqlClient;           // Data Provider for MySql
+
+using ProcessManagement.DB.MySql;
+using ProcessManagement.DB.Core;
+using ProcessManagement.DataModel;
+using ProcessManagement.Common;
+
+namespace ProcessManagement.DB.IOAccess
+{
+    /// <summary>
+    /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ï¼¤ï¼¢ã‚¢ã‚¯ã‚»ã‚¹
+    /// </summary>
+    public class IOCostDataOfCompensation : MySqlProcess
+    {
+        #region å®šç¾©éƒ¨
+        /// <summary>
+        /// log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
+        /// </summary>
+        public enum TableColumn
+        {
+            YearNumber = 0,     // å¹´åº¦
+            CostType,           // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+            TargetType,         // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+            TargetCode,         // å…ˆã‚³ãƒ¼ãƒ‰
+            SeqNo,              // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+            PersonCode,         // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+            FromCodeType,       // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+            FromCode,           // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+            SendDate,           // å¯¾è±¡æ—¥ä»˜
+            EntryPrice,         // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+            EntryTax,           // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+            Content,            // æ”¯æ‰•å†…å®¹
+            BikoComment,        // å‚™è€ƒ
+            LockFlg,            // ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+            EntryDate,
+            UpdateDate,
+        }
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        /// <param name="ConnectionString"></param>
+        public IOCostDataOfCompensation()
+            : base(DBCommon.Instance.DBConnectString)
+        {
+        }
+
+        #endregion
+
+        #region SQLä½œæˆ�
+        /// <summary>
+        /// SQLä½œæˆ�
+        /// </summary>
+        private string CreateSelectSQL()
+        {
+            // SQLä½œæˆ�
+            StringBuilder strcmd = new StringBuilder();
+            strcmd.Append("SELECT");
+
+            bool bColFirst = true;
+            string strWork = string.Empty;
+            foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+            {
+                strWork = gender.ToString();
+                if (!bColFirst) strcmd.Append(",");
+                if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                {
+                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
+                }
+                else if (strWork.Equals("SendDate"))
+                {
+                    strcmd.AppendFormat(" DATE({0})", strWork);
+                }
+                else
+                {
+                    strcmd.AppendFormat(" {0}", strWork);
+                }
+                bColFirst = false;
+            }
+
+            strcmd.Append(" FROM CostDataOfCompensation");
+
+            return strcmd.ToString();
+        }
+        #endregion
+
+        #region è¤‡æ•°èª­è¾¼ã�¿å‡¦ç�†
+        public bool SelectAction(string AddSQLString, ref List<CostDataOfCompensation> data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    CostDataOfCompensation work = new CostDataOfCompensation();
+                    Reader2Struct(objwrk, ref work);
+                    data.Add(work);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1ä»¶èª­è¾¼ã�¿å‡¦ç�†
+        public bool SelectAction(string AddSQLString, ref CostDataOfCompensation data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+                if (arData.Count == 0) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    Reader2Struct(objwrk, ref data);
+                    break;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1ä»¶è¿½åŠ å‡¦ç�†
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
+        /// </summary>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool InsertAction(CostDataOfCompensation work, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO CostDataOfCompensation");
+                strcmd.Append(" (");
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bColFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bColFirst = false;
+                }
+                strcmd.Append(") VALUES (");
+
+                strcmd.AppendFormat("  {0}", work.YearNumber);                                  // å¹´åº¦
+                strcmd.AppendFormat(", {0}", work.CostType);                                    // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                strcmd.AppendFormat(", {0}", work.TargetType);                                  // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(", {0}", work.TargetCode);                                  // å…ˆã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", {0}", work.SeqNo);                                       // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+                strcmd.AppendFormat(", {0}", work.PersonCode);                                  // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", {0}", work.FromCodeType);                                // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(", {0}", work.FromCode);                                    // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", DATE('{0}')", work.SendDate.Date);                       // å¯¾è±¡æ—¥ä»˜
+                strcmd.AppendFormat(", {0}", work.EntryPrice);                                  // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+                strcmd.AppendFormat(", {0}", work.EntryTax);                                    // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+                strcmd.AppendFormat(", '{0}'", work.Content);                                   // æ”¯æ‰•å†…å®¹
+                strcmd.AppendFormat(", '{0}'", work.BikoComment);                               // å‚™è€ƒ
+                strcmd.AppendFormat(", {0}", work.LockFlg);                                     // ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
+                strcmd.Append(")");
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region è¤‡æ•°è¿½åŠ å‡¦ç�†
+        public bool InsertAction(List<CostDataOfCompensation> data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO CostDataOfCompensation");
+                strcmd.Append(" (");
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bColFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bColFirst = false;
+                }
+                strcmd.Append(") VALUES");
+
+                bool bDataFirst = true;
+                foreach (CostDataOfCompensation work in data)
+                {
+                    if (bDataFirst) strcmd.Append(" (");
+                    else strcmd.Append(", (");
+
+                    strcmd.AppendFormat("  {0}", work.YearNumber);                                  // å¹´åº¦
+                    strcmd.AppendFormat(", {0}", work.CostType);                                    // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                    strcmd.AppendFormat(", {0}", work.TargetType);                                  // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                    strcmd.AppendFormat(", {0}", work.TargetCode);                                  // å…ˆã‚³ãƒ¼ãƒ‰
+                    strcmd.AppendFormat(", {0}", work.SeqNo);                                       // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+                    strcmd.AppendFormat(", {0}", work.PersonCode);                                  // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+                    strcmd.AppendFormat(", {0}", work.FromCodeType);                                // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                    strcmd.AppendFormat(", {0}", work.FromCode);                                    // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+                    strcmd.AppendFormat(", DATE('{0}')", work.SendDate.Date);                       // å¯¾è±¡æ—¥ä»˜
+                    strcmd.AppendFormat(", {0}", work.EntryPrice);                                  // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+                    strcmd.AppendFormat(", {0}", work.EntryTax);                                    // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+                    strcmd.AppendFormat(", '{0}'", work.Content);                                   // æ”¯æ‰•å†…å®¹
+                    strcmd.AppendFormat(", '{0}'", work.BikoComment);                               // å‚™è€ƒ
+                    strcmd.AppendFormat(", {0}", work.LockFlg);                                     // ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
+                    strcmd.Append(")");
+
+                    bDataFirst = false;
+                }
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ›´æ–°å‡¦ç�†
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// </summary>
+        /// <param name="AddSQLString">æ›´æ–°æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool UpdateAction(string AddSQLString, CostDataOfCompensation data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Append("UPDATE CostDataOfCompensation");
+
+                strcmd.Append(" SET");
+
+                strcmd.AppendFormat("  YearNumber = {0}", data.YearNumber);                                         // å¹´åº¦
+                strcmd.AppendFormat(", CostType = {0}", data.CostType);                                             // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                strcmd.AppendFormat(", TargetType = {0}", data.TargetType);                                         // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(", TargetCode = {0}", data.TargetCode);                                         // å…ˆã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);                                                   // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+                strcmd.AppendFormat(", PersonCode = {0}", data.PersonCode);                                         // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", FromCodeType = {0}", data.FromCodeType);                                     // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(", FromCode = {0}", data.FromCode);                                             // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", SendDate = DATE('{0}')", data.SendDate.Date);                                // å¯¾è±¡æ—¥ä»˜
+                strcmd.AppendFormat(", EntryPrice = {0}", data.EntryPrice);                                         // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+                strcmd.AppendFormat(", EntryTax = {0}", data.EntryTax);                                             // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+                strcmd.AppendFormat(", Content = '{0}'", data.Content);                                             // æ”¯æ‰•å†…å®¹
+                strcmd.AppendFormat(", BikoComment = '{0}'", data.BikoComment);                                         // å‚™è€ƒ
+                strcmd.AppendFormat(", LockFlg = {0}", data.LockFlg);                                               // ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+
+                strcmd.Append(", UpdateDate = NOW()");
+                strcmd.Append(AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region å‰Šé™¤å‡¦ç�†
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿å‰Šé™¤
+        /// </summary>
+        /// <param name="AddSQLString">å‰Šé™¤æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool DeleteAction(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.AppendFormat("{0}{1}", "DELETE FROM CostDataOfCompensation", AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆå‡¦ç�†
+        /// <summary>
+        /// MySQLDataReaderã‚ˆã‚Šæ§‹é€ ä½“ã�¸ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// </summary>
+        /// <param name="reader">MySQLDataReader</param>
+        /// <param name="wrk">æ§‹é€ ä½“</param>
+        public void Reader2Struct(object[] objwrk, ref CostDataOfCompensation wrk)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                wrk.YearNumber = int.Parse(objwrk[(int)TableColumn.YearNumber].ToString());                     // å¹´åº¦
+                wrk.CostType = int.Parse(objwrk[(int)TableColumn.CostType].ToString());                         // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                wrk.TargetType = int.Parse(objwrk[(int)TableColumn.TargetType].ToString());                     // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                wrk.TargetCode = int.Parse(objwrk[(int)TableColumn.TargetCode].ToString());                     // å…ˆã‚³ãƒ¼ãƒ‰
+                wrk.SeqNo = int.Parse(objwrk[(int)TableColumn.SeqNo].ToString());                               // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+                wrk.PersonCode = int.Parse(objwrk[(int)TableColumn.PersonCode].ToString());                     // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+                wrk.FromCodeType = int.Parse(objwrk[(int)TableColumn.FromCodeType].ToString());                 // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                wrk.FromCode = int.Parse(objwrk[(int)TableColumn.FromCode].ToString());                         // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+                wrk.SendDate = DateTime.Parse(objwrk[(int)TableColumn.SendDate].ToString());                    // å¯¾è±¡æ—¥ä»˜
+                wrk.EntryPrice = decimal.Parse(objwrk[(int)TableColumn.EntryPrice].ToString());                 // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+                wrk.EntryTax = decimal.Parse(objwrk[(int)TableColumn.EntryTax].ToString());                     // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+                wrk.Content = objwrk[(int)TableColumn.Content].ToString();                                      // æ”¯æ‰•å†…å®¹
+                wrk.BikoComment = objwrk[(int)TableColumn.BikoComment].ToString();                              // å‚™è€ƒ
+                wrk.LockFlg = int.Parse(objwrk[(int)TableColumn.LockFlg].ToString());                           // ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
+            }
+            catch (MySqlException myex)
+            {
+                logger.ErrorFormat("ï¼­ï½™ï¼³ï¼±ï¼¬ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), myex.Message);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ¤œç´¢æ–‡å­—åˆ—ä½œæˆ�å‡¦ç�†
+        /// <summary>
+        /// ä¸»ã‚­ãƒ¼æ¤œç´¢ã�®æ–‡å­—åˆ—ã‚’è¿”ã�™
+        /// </summary>
+        /// <returns></returns>
+        public string CreatePrimarykeyString(int YearNumber
+                                                , int CostType = 0
+                                                , int TargetType = 0
+                                                , int TargetCode = 0
+                                                , int SeqNo = 0)
+        {
+            StringBuilder strWork = new StringBuilder();
+            try
+            {
+                strWork.AppendFormat(" WHERE YearNumber = {0}", YearNumber);
+                if (CostType != 0)
+                    strWork.AppendFormat(" AND CostType = {0}", CostType);
+                if (TargetType != 0)
+                    strWork.AppendFormat(" AND TargetType = {0}", TargetType);
+                if (TargetCode != 0)
+                    strWork.AppendFormat(" AND TargetCode = {0}", TargetCode);
+                if (SeqNo != 0)
+                    strWork.AppendFormat(" AND SeqNo = {0}", SeqNo);
+
+                return strWork.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region è¿½åŠ ç•ªå�·ã�®æœ€å¤§å€¤ã‚’å�–å¾—
+        /// <summary>
+        /// è¿½åŠ ç•ªå�·ã�®æœ€å¤§å€¤ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="AddSQLString"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public int SelectMaxAddDataCount(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+            int iRet = 0;
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.AppendFormat("SELECT IFNULL(MAX(SeqNo), 0) FROM CostDataOfCompensation{0}", AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    if (objwrk[0].ToString().Equals("null"))
+                        iRet = 0;
+                    else
+                        iRet = int.Parse(objwrk[0].ToString());
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+            }
+            return iRet;
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMCostDataTargetTypeExpenses.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMCostDataTargetTypeExpenses.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMCostDataTargetTypeExpenses.cs	(revision 483)
@@ -0,0 +1,361 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Collections;
+
+using log4net;
+using MySql.Data.MySqlClient;           // Data Provider for MySql
+
+using ProcessManagement.DB.MySql;
+using ProcessManagement.DB.Core;
+using ProcessManagement.DataModel;
+using ProcessManagement.Common;
+
+namespace ProcessManagement.DB.IOAccess
+{
+    /// <summary>
+    /// å‡ºç´�å¯¾è±¡çµŒè²»å¯¾å¿œãƒžã‚¹ã‚¿ï¼¤ï¼¢ã‚¢ã‚¯ã‚»ã‚¹
+    /// </summary>
+    public class IOMCostDataTargetTypeExpenses : MySqlProcess
+    {
+        #region å®šç¾©éƒ¨
+        /// <summary>
+        /// log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
+        /// </summary>
+        public enum TableColumn
+        {
+            CostType,
+            TargetType,
+            ExpensesCode,
+            EntryDate,
+            UpdateDate,
+        }
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        /// <param name="ConnectionString"></param>
+        public IOMCostDataTargetTypeExpenses()
+            : base(DBCommon.Instance.DBConnectString)
+        {
+        }
+
+        #endregion
+
+        #region SQLä½œæˆ�
+        /// <summary>
+        /// SQLä½œæˆ�
+        /// </summary>
+        private string CreateSelectSQL()
+        {
+            // SQLä½œæˆ�
+            StringBuilder strcmd = new StringBuilder();
+            strcmd.Append("SELECT");
+
+            bool bColFirst = true;
+            string strWork = string.Empty;
+            foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+            {
+                strWork = gender.ToString();
+                if (!bColFirst) strcmd.Append(",");
+                if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                {
+                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
+                }
+                else
+                {
+                    strcmd.AppendFormat(" {0}", strWork);
+                }
+                bColFirst = false;
+            }
+
+            strcmd.Append(" FROM CostDataTargetTypeExpenses");
+
+            return strcmd.ToString();
+        }
+        #endregion
+
+        #region è¤‡æ•°èª­è¾¼ã�¿å‡¦ç�†
+        public bool SelectAction(string AddSQLString, ref List<CostDataTargetTypeExpenses> data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    CostDataTargetTypeExpenses work = new CostDataTargetTypeExpenses();
+                    Reader2Struct(objwrk, ref work);
+                    data.Add(work);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1ä»¶èª­è¾¼ã�¿å‡¦ç�†
+        public bool SelectAction(string AddSQLString, ref CostDataTargetTypeExpenses data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+                if (arData.Count == 0) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    Reader2Struct(objwrk, ref data);
+                    break;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1ä»¶è¿½åŠ å‡¦ç�†
+        /// <summary>
+        /// å‡ºç´�å¯¾è±¡çµŒè²»å¯¾å¿œãƒžã‚¹ã‚¿è¿½åŠ 
+        /// </summary>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool InsertAction(CostDataTargetTypeExpenses work, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO CostDataTargetTypeExpenses");
+                strcmd.Append(" (");
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bColFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bColFirst = false;
+                }
+                strcmd.Append(") VALUES (");
+
+                strcmd.AppendFormat("  {0}", work.CostType);                                // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                strcmd.AppendFormat(", {0}", work.TargetType);                              // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(", {0}", work.ExpensesCode);                            // çµŒè²»ã‚³ãƒ¼ãƒ‰
+
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
+                strcmd.Append(")");
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region è¤‡æ•°è¿½åŠ å‡¦ç�†
+        public bool InsertAction(List<CostDataTargetTypeExpenses> data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO CostDataTargetTypeExpenses");
+                strcmd.Append(" (");
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bColFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bColFirst = false;
+                }
+                strcmd.Append(") VALUES");
+
+                bool bDataFirst = true;
+                foreach (CostDataTargetTypeExpenses work in data)
+                {
+                    if (bDataFirst) strcmd.Append(" (");
+                    else strcmd.Append(", (");
+
+                    strcmd.AppendFormat("  {0}", work.CostType);                                // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                    strcmd.AppendFormat(", {0}", work.TargetType);                              // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                    strcmd.AppendFormat(", {0}", work.ExpensesCode);                            // çµŒè²»ã‚³ãƒ¼ãƒ‰
+
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
+                    strcmd.Append(")");
+
+                    bDataFirst = false;
+                }
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ›´æ–°å‡¦ç�†
+        /// <summary>
+        /// å‡ºç´�å¯¾è±¡çµŒè²»å¯¾å¿œãƒžã‚¹ã‚¿æ›´æ–°
+        /// </summary>
+        /// <param name="AddSQLString">æ›´æ–°æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool UpdateAction(string AddSQLString, CostDataTargetTypeExpenses data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Append("UPDATE CostDataTargetTypeExpenses");
+
+                strcmd.Append(" SET");
+
+                strcmd.AppendFormat("  CostType = {0}", data.CostType);                 // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                strcmd.AppendFormat(", TargetType = {0}", data.TargetType);             // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(", ExpensesCode = {0}", data.ExpensesCode);         // çµŒè²»ã‚³ãƒ¼ãƒ‰
+
+                strcmd.Append(", UpdateDate = NOW()");
+                strcmd.Append(AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region å‰Šé™¤å‡¦ç�†
+        /// <summary>
+        /// å‡ºç´�å¯¾è±¡çµŒè²»å¯¾å¿œãƒžã‚¹ã‚¿å‰Šé™¤
+        /// </summary>
+        /// <param name="AddSQLString">å‰Šé™¤æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool DeleteAction(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.AppendFormat("{0}{1}", "DELETE FROM CostDataTargetTypeExpenses", AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆå‡¦ç�†
+        /// <summary>
+        /// MySQLDataReaderã‚ˆã‚Šæ§‹é€ ä½“ã�¸ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// </summary>
+        /// <param name="reader">MySQLDataReader</param>
+        /// <param name="wrk">æ§‹é€ ä½“</param>
+        public void Reader2Struct(object[] objwrk, ref CostDataTargetTypeExpenses wrk)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                wrk.CostType = int.Parse(objwrk[(int)TableColumn.CostType].ToString());             // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+                wrk.TargetType = int.Parse(objwrk[(int)TableColumn.TargetType].ToString());         // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                wrk.ExpensesCode = int.Parse(objwrk[(int)TableColumn.ExpensesCode].ToString());     // çµŒè²»ã‚³ãƒ¼ãƒ‰
+
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
+            }
+            catch (MySqlException myex)
+            {
+                logger.ErrorFormat("ï¼­ï½™ï¼³ï¼±ï¼¬ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), myex.Message);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ¤œç´¢æ–‡å­—åˆ—ä½œæˆ�å‡¦ç�†
+        /// <summary>
+        /// ä¸»ã‚­ãƒ¼æ¤œç´¢ã�®æ–‡å­—åˆ—ã‚’è¿”ã�™
+        /// </summary>
+        /// <returns></returns>
+        public string CreatePrimarykeyString(int CostType, int TargetType = 0, int ExpensesCode = 0)
+        {
+            StringBuilder strWork = new StringBuilder();
+            try
+            {
+                strWork.AppendFormat(" Where CostType = {0}", CostType);
+                if (TargetType != 0)
+                    strWork.AppendFormat(" And TargetType = {0}", TargetType);
+                if (ExpensesCode != 0)
+                    strWork.AppendFormat(" And ExpensesCode = {0}", ExpensesCode);
+
+                return strWork.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
+                return string.Empty;
+            }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMCostDataType.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMCostDataType.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMCostDataType.cs	(revision 483)
@@ -0,0 +1,359 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Collections;
+
+using log4net;
+using MySql.Data.MySqlClient;           // Data Provider for MySql
+
+using ProcessManagement.DB.MySql;
+using ProcessManagement.DB.Core;
+using ProcessManagement.DataModel;
+using ProcessManagement.Common;
+
+namespace ProcessManagement.DB.IOAccess
+{
+    /// <summary>
+    /// éƒ¨ç½²å‡ºç´�å��ç§°ãƒžã‚¹ã‚¿ï¼¤ï¼¢ã‚¢ã‚¯ã‚»ã‚¹
+    /// </summary>
+    public class IOMCostDataType : MySqlProcess
+    {
+        #region å®šç¾©éƒ¨
+        /// <summary>
+        /// log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
+        /// </summary>
+        public enum TableColumn
+        {
+            CostType,
+            TargetType,
+            CostDataTypeName,
+            EntryDate,
+            UpdateDate,
+        }
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        /// <param name="ConnectionString"></param>
+        public IOMCostDataType()
+            : base(DBCommon.Instance.DBConnectString)
+        {
+        }
+
+        #endregion
+
+        #region SQLä½œæˆ�
+        /// <summary>
+        /// SQLä½œæˆ�
+        /// </summary>
+        private string CreateSelectSQL()
+        {
+            // SQLä½œæˆ�
+            StringBuilder strcmd = new StringBuilder();
+            strcmd.Append("SELECT");
+
+            bool bColFirst = true;
+            string strWork = string.Empty;
+            foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+            {
+                strWork = gender.ToString();
+                if (!bColFirst) strcmd.Append(",");
+                if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                {
+                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
+                }
+                else
+                {
+                    strcmd.AppendFormat(" {0}", strWork);
+                }
+                bColFirst = false;
+            }
+
+            strcmd.Append(" FROM CostDataType");
+
+            return strcmd.ToString();
+        }
+        #endregion
+
+        #region è¤‡æ•°èª­è¾¼ã�¿å‡¦ç�†
+        public bool SelectAction(string AddSQLString, ref List<CostDataType> data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                // SQLä½œæˆ�
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    CostDataType work = new CostDataType();
+                    Reader2Struct(objwrk, ref work);
+                    data.Add(work);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1ä»¶èª­è¾¼ã�¿å‡¦ç�†
+        public bool SelectAction(string AddSQLString, ref CostDataType data, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            ArrayList arData = new ArrayList();
+
+            try
+            {
+                strcmd.Append(CreateSelectSQL());
+                strcmd.Append(AddSQLString);
+
+                // SQLå®Ÿè¡Œ
+                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
+                if (arData.Count == 0) return false;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                foreach (object[] objwrk in arData)
+                {
+                    Reader2Struct(objwrk, ref data);
+                    break;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region 1ä»¶è¿½åŠ å‡¦ç�†
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�å��ç§°ãƒžã‚¹ã‚¿è¿½åŠ 
+        /// </summary>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool InsertAction(CostDataType work, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO CostDataType");
+                strcmd.Append(" (");
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bColFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bColFirst = false;
+                }
+                strcmd.Append(") VALUES (");
+
+                strcmd.AppendFormat("  {0}", work.CostType);                                // å‡ºç´�ã‚¿ã‚¤ãƒ—ã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(", {0}", work.TargetType);                                  // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(",'{0}'", work.CostDataTypeName);                           // å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°
+
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
+                strcmd.Append(")");
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region è¤‡æ•°è¿½åŠ å‡¦ç�†
+        public bool InsertAction(List<CostDataType> data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO CostDataType");
+                strcmd.Append(" (");
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bColFirst) strcmd.Append(", ");
+                    strcmd.Append(gender.ToString());
+                    bColFirst = false;
+                }
+                strcmd.Append(") VALUES");
+
+                bool bDataFirst = true;
+                foreach (CostDataType work in data)
+                {
+                    if (bDataFirst) strcmd.Append(" (");
+                    else strcmd.Append(", (");
+
+                    strcmd.AppendFormat("  {0}", work.CostType);                                // å‡ºç´�ã‚¿ã‚¤ãƒ—ã‚³ãƒ¼ãƒ‰
+                    strcmd.AppendFormat(", {0}", work.TargetType);                                  // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                    strcmd.AppendFormat(",'{0}'", work.CostDataTypeName);                           // å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°
+
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
+                    strcmd.Append(")");
+
+                    bDataFirst = false;
+                }
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region æ›´æ–°å‡¦ç�†
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�å��ç§°ãƒžã‚¹ã‚¿æ›´æ–°
+        /// </summary>
+        /// <param name="AddSQLString">æ›´æ–°æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool UpdateAction(string AddSQLString, CostDataType data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Append("UPDATE CostDataType");
+
+                strcmd.Append(" SET");
+
+                strcmd.AppendFormat(" CostType = {0}", data.CostType);              // å‡ºç´�ã‚¿ã‚¤ãƒ—ã‚³ãƒ¼ãƒ‰
+                strcmd.AppendFormat(",TargetType = {0}", data.TargetType);                  // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                strcmd.AppendFormat(",CostDataTypeName = '{0}'", data.CostDataTypeName);    // å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°
+
+                strcmd.Append(", UpdateDate = NOW()");
+                strcmd.Append(AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region å‰Šé™¤å‡¦ç�†
+        /// <summary>
+        /// éƒ¨ç½²å‡ºç´�å��ç§°ãƒžã‚¹ã‚¿å‰Šé™¤
+        /// </summary>
+        /// <param name="AddSQLString">å‰Šé™¤æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool DeleteAction(string AddSQLString, bool bConnect = true)
+        {
+            // ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.AppendFormat("{0}{1}", "DELETE FROM CostDataType", AddSQLString);
+
+                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆå‡¦ç�†
+        /// <summary>
+        /// MySQLDataReaderã‚ˆã‚Šæ§‹é€ ä½“ã�¸ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// </summary>
+        /// <param name="reader">MySQLDataReader</param>
+        /// <param name="wrk">æ§‹é€ ä½“</param>
+        public void Reader2Struct(object[] objwrk, ref CostDataType wrk)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                wrk.CostType = int.Parse(objwrk[(int)TableColumn.CostType].ToString());     // å‡ºç´�ã‚¿ã‚¤ãƒ—ã‚³ãƒ¼ãƒ‰
+                wrk.TargetType = int.Parse(objwrk[(int)TableColumn.TargetType].ToString());         // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                wrk.CostDataTypeName = objwrk[(int)TableColumn.CostDataTypeName].ToString();        // å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°
+
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
+            }
+            catch (MySqlException myex)
+            {
+                logger.ErrorFormat("ï¼­ï½™ï¼³ï¼±ï¼¬ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), myex.Message);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ¤œç´¢æ–‡å­—åˆ—ä½œæˆ�å‡¦ç�†
+        /// <summary>
+        /// ä¸»ã‚­ãƒ¼æ¤œç´¢ã�®æ–‡å­—åˆ—ã‚’è¿”ã�™
+        /// </summary>
+        /// <returns></returns>
+        public string CreatePrimarykeyString(int CostType, int TargetType = 0)
+        {
+            StringBuilder strWork = new StringBuilder();
+            try
+            {
+                strWork.AppendFormat(" WHERE CostType = {0}", CostType);
+                if (TargetType != 0)
+                    strWork.AppendFormat(" AND TargetType = {0}", TargetType);
+
+                return strWork.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
+                return string.Empty;
+            }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/AttendanceDailyData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/AttendanceDailyData.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/AttendanceDailyData.cs	(revision 483)
@@ -66,6 +66,10 @@
             /// 11:ä¼‘ã€€æ—¥
             /// </summary>
             Holiday,
+            /// <summary>
+            /// 12:ç‰¹æ®Šä¼‘
+            /// </summary>
+            UniqueDay,
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/BillingCostDataLink.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/BillingCostDataLink.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/BillingCostDataLink.cs	(revision 483)
@@ -0,0 +1,139 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProcessManagement.DataModel
+{
+    public class BillingCostDataLink
+    {
+        #region å®šæ•°
+
+        #endregion
+
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+        private int m_CompanyCode = 0;                  // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
+        private int m_TargetDate = 0;                   // å¯¾è±¡å¹´æœˆ
+        private int m_SeqNoB = 0;                       // é€£ç•ª
+        private int m_LineCount = 0;                    // è¡Œç•ªå�·
+        private int m_LabourKind = 0;                   // æ”¯æ‰•æ¥­è€…åŒºåˆ†
+        private int m_YearNumber = 0;                   // å¹´åº¦
+        private int m_CostType = 0;                     // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+        private int m_TargetType = 0;                   // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        private int m_TargetCode = 0;                   // å…ˆã‚³ãƒ¼ãƒ‰
+        private int m_SeqNoC = 0;                       // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+        private DateTime m_EntryDate = DateTime.Now;    // ç™»éŒ²æ—¥ä»˜
+        private DateTime m_UpdateDate = DateTime.Now;   // æ›´æ–°æ—¥ä»˜
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int CompanyCode
+        {
+            get { return m_CompanyCode; }
+            set { m_CompanyCode = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡å¹´æœˆ
+        /// </summary>
+        public int TargetDate
+        {
+            get { return m_TargetDate; }
+            set { m_TargetDate = value; }
+        }
+
+        /// <summary>
+        /// é€£ç•ª
+        /// </summary>
+        public int SeqNoB
+        {
+            get { return m_SeqNoB; }
+            set { m_SeqNoB = value; }
+        }
+
+        /// <summary>
+        /// è¡Œç•ªå�·
+        /// </summary>
+        public int LineCount
+        {
+            get { return m_LineCount; }
+            set { m_LineCount = value; }
+        }
+
+        /// <summary>
+        /// æ”¯æ‰•æ¥­è€…åŒºåˆ†
+        /// </summary>
+        public int LabourKind
+        {
+            get { return m_LabourKind; }
+            set { m_LabourKind = value; }
+        }
+
+        /// <summary>
+        /// å¹´åº¦
+        /// </summary>
+        public int YearNumber
+        {
+            get { return m_YearNumber; }
+            set { m_YearNumber = value; }
+        }
+        /// <summary>
+        /// å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public int CostType
+        {
+            get { return m_CostType; }
+            set { m_CostType = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int TargetType
+        {
+            get { return m_TargetType; }
+            set { m_TargetType = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int TargetCode
+        {
+            get { return m_TargetCode; }
+            set { m_TargetCode = value; }
+        }
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+        /// </summary>
+        public int SeqNoC
+        {
+            get { return m_SeqNoC; }
+            set { m_SeqNoC = value; }
+        }
+
+        /// <summary>
+        /// ç™»éŒ²æ—¥ä»˜
+        /// </summary>
+        public DateTime EntryDate
+        {
+            set { m_EntryDate = value; }
+            get { return m_EntryDate; }
+        }
+        /// <summary>
+        /// æ›´æ–°æ—¥ä»˜
+        /// </summary>
+        public DateTime UpdateDate
+        {
+            set { m_UpdateDate = value; }
+            get { return m_UpdateDate; }
+        }
+
+        #endregion
+
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs	(revision 483)
@@ -312,6 +312,7 @@
         private DateTime    m_InspectExecuteDate = DateTime.MinValue;           // æ¤œæŸ»å®Ÿè¡Œæ—¥
         private DateTime    m_RevCompleteDate = DateTime.MinValue;              // æ¤œæŸ»æ˜¯æ­£å®Œäº†æ—¥
         private int         m_ExpectedOrder = -1;                               // å�—æ³¨æœŸå¾…åº¦
+        private decimal     m_EvaluationScore = 0;                              // è©•ä¾¡ç‚¹æ•°
 
         private DateTime    m_EntryDate = DateTime.Now;                         // ç™»éŒ²æ—¥ä»˜
         private DateTime    m_UpdateDate = DateTime.Now;                        // æ›´æ–°æ—¥ä»˜
@@ -783,6 +784,14 @@
             set { m_ExpectedOrder = value; }
         }
         /// <summary>
+        /// è©•ä¾¡ç‚¹æ•°
+        /// </summary>
+        public decimal EvaluationScore
+        {
+            get { return m_EvaluationScore; }
+            set { m_EvaluationScore = value; }
+        }
+        /// <summary>
         /// ç™»éŒ²æ—¥ä»˜
         /// </summary>
         public DateTime EntryDate
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBudgetDetail.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBudgetDetail.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBudgetDetail.cs	(revision 483)
@@ -12,6 +12,83 @@
     {
         #region å®šæ•°
 
+        #region ãƒ‡ãƒ¼ã‚¿ã‚°ãƒ«ãƒ¼ãƒ—
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿ã‚°ãƒ«ãƒ¼ãƒ—
+        /// </summary>
+        public enum GroupCountDef
+        {
+            /// <summary>
+            /// 0:ç©ºç™½
+            /// </summary>
+            Empty = 0,
+            /// <summary>
+            /// 1:çµŒè²»
+            /// </summary>
+            Expenses,
+            /// <summary>
+            /// 2:å…±é€šä»®è¨­è²»
+            /// </summary>
+            CommonTempCosts,
+            /// <summary>
+            /// 3:å¤–æ³¨è²»
+            /// </summary>
+            OutSourceCosts,
+            /// <summary>
+            /// 4:è‡ªç¤¾æ–½å·¥
+            /// </summary>
+            MyConstruction,
+            /// <summary>
+            /// 5:è³¼å…¥å“�
+            /// </summary>
+            PurchaseCosts,
+            /// <summary>
+            /// 6:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+            /// </summary>
+            VehicleLeaseFee,
+            /// <summary>
+            /// 7:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
+            /// </summary>
+            TransportationCosts,
+            /// <summary>
+            /// 8:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+            /// </summary>
+            ParkingCosts,
+            /// <summary>
+            /// 9:å®¿æ³Šè²»
+            /// </summary>
+            RoomChargeCosts,
+            /// <summary>
+            /// 10:å‡¦åˆ†è²»ç­‰
+            /// </summary>
+            DisposeCosts,
+            /// <summary>
+            /// 11:ç²—åˆ©ç›Š
+            /// </summary>
+            GrossProfit,
+            /// <summary>
+            /// 12:æŒ‡å°Žå“¡çµ¦ä¸Ž
+            /// </summary>
+            InstructorCosts,
+            /// <summary>
+            /// 13:å‰¯æ‹…å½“çµ¦ä¸ŽçµŒè²»
+            /// </summary>
+            AssistantCosts,
+            /// <summary>
+            /// 14:çµ¦ä¸ŽçµŒè²»
+            /// </summary>
+            PayrollExpenses,
+            /// <summary>
+            /// 15:ç´”åˆ©ç›Š
+            /// </summary>
+            NetIncome,
+            /// <summary>
+            /// 16:å�ˆè¨ˆé‡‘é¡�
+            /// </summary>
+            AllTotal,
+        }
+        #endregion
+
         #region å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ï¼šå�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
         /// <summary>
         /// å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs	(revision 483)
@@ -12,6 +12,111 @@
     {
         #region å®šæ•°
 
+        #region ãƒ‡ãƒ¼ã‚¿ã‚°ãƒ«ãƒ¼ãƒ—
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿ã‚°ãƒ«ãƒ¼ãƒ—
+        /// </summary>
+        public enum GroupCountDef
+        {
+            /// <summary>
+            /// 0:ç©ºç™½
+            /// </summary>
+            Empty = 0,
+            /// <summary>
+            /// 1:çµŒè²»
+            /// </summary>
+            Expenses,
+            /// <summary>
+            /// 2:æ–½å·¥è²»
+            /// </summary>
+            ConstructionCosts,
+            /// <summary>
+            /// 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
+            /// </summary>
+            TransportationCosts,
+            /// <summary>
+            /// 4:è³¼å…¥å“�
+            /// </summary>
+            PurchaseCosts,
+            /// <summary>
+            /// 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+            /// </summary>
+            VehicleLeaseFee,
+            /// <summary>
+            /// 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+            /// </summary>
+            ParkingCosts,
+            /// <summary>
+            /// 7:å®¿æ³Šè²»
+            /// </summary>
+            RoomChargeCosts,
+            /// <summary>
+            /// 8:å‡¦åˆ†è²»ç­‰
+            /// </summary>
+            DisposeCosts,
+            /// <summary>
+            /// 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
+            /// </summary>
+            Instructor,
+            /// <summary>
+            /// 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
+            /// </summary>
+            Assistant,
+            /// <summary>
+            /// 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
+            /// </summary>
+            Payroll,
+            /// <summary>
+            /// 12:è£œå¡«é‡‘é¡�
+            /// </summary>
+            Compensation,
+            /// <summary>
+            /// 13:ç´”åˆ©ç›Š
+            /// </summary>
+            NetIncome,
+            /// <summary>
+            /// 14:å�ˆè¨ˆé‡‘é¡�
+            /// </summary>
+            AllTotal,
+            /// <summary>
+            /// 15:è«‹æ±‚é‡‘é¡�
+            /// </summary>
+            BillingAmount,
+            /// <summary>
+            /// 16:ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
+            /// </summary>
+            CurrentProfit,
+            /// <summary>
+            /// 17:å…¥é‡‘é‡‘é¡�
+            /// </summary>
+            DepositAmount,
+        }
+        #endregion
+
+        #region ã‚°ãƒ«ãƒ¼ãƒ—å��ç§°å®šç¾©
+        /// <summary>
+        /// ã‚°ãƒ«ãƒ¼ãƒ—å��ç§°å®šç¾©
+        /// </summary>
+        public static string[] GroupNameDef = new string[] { ""
+                                                            , "çµŒã€€ã€€ã€€ã€€ã€€è²»"
+                                                            , "æ–½ã€€ã€€å·¥ã€€ã€€è²»"
+                                                            , "äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰"
+                                                            , "è³¼ã€€ã€€å…¥ã€€ã€€å“�"
+                                                            , "è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£"
+                                                            , "é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´"
+                                                            , "å®¿ã€€ã€€æ³Šã€€ã€€è²»"
+                                                            , "å‡¦ã€€åˆ†ã€€è²»ã€€ç­‰"
+                                                            , "æŒ‡ å°Ž å“¡ çµ¦ ä¸Ž"
+                                                            , "å‰¯ æ‹… å½“ è€… çµ¦ ä¸Ž"
+                                                            , "æ‹… å½“ è€… çµ¦ ä¸Ž"
+                                                            , "è£œã€€å¡«ã€€é‡‘ã€€é¡�"
+                                                            , "ç´”ã€€ã€€åˆ©ã€€ã€€ç›Š"
+                                                            , "å�ˆã€€è¨ˆã€€é‡‘ã€€é¡�"
+                                                            , "è«‹æ±‚é‡‘é¡�ï¼ˆç¨Žåˆ¥ï¼‰"
+                                                            , "ç�¾åœ¨åˆ©ç›Šé‡‘é¡�"
+                                                            , "å…¥é‡‘é‡‘é¡�ï¼ˆç¨Žåˆ¥ï¼‰"};
+        #endregion
+
         #region å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ï¼šå�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
         /// <summary>
         /// å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataOfCompensation.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataOfCompensation.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataOfCompensation.cs	(revision 483)
@@ -0,0 +1,307 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ProcessManagement.DataModel
+{
+    /// <summary>
+    /// éƒ¨ç½²å‡ºç´�ãƒ‡ãƒ¼ã‚¿
+    /// </summary>
+    public class CostDataOfCompensation
+    {
+        #region å®šæ•°
+
+        #region ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—å®šç¾©
+        /// <summary>
+        /// ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—å®šç¾©
+        /// </summary>
+        public enum TargetTypeDef
+        {
+            None = 0,
+            /// <summary>
+            /// 1:å·¥äº‹ã‚³ãƒ¼ãƒ‰
+            /// </summary>
+            Construction,
+            /// <summary>
+            /// 2:éƒ¨ç½²ã‚³ãƒ¼ãƒ‰
+            /// </summary>
+            Department,
+            /// <summary>
+            /// 3:ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
+            /// </summary>
+            Company,
+        }
+        #endregion
+
+        #region å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°å®šç¾©
+        /// <summary>
+        /// å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°å®šç¾©
+        /// </summary>
+        public enum CostTypeDef
+        {
+            /// <summary>
+            /// 0:ç„¡
+            /// </summary>
+            None = 0,
+            /// <summary>
+            /// 1:è£œå¡«
+            /// </summary>
+            Type1,
+            /// <summary>
+            /// 2:è³¼å…¥
+            /// </summary>
+            Type2,
+            /// <summary>
+            /// 3:å�°å¸³é–‰éŽ–å·¥äº‹
+            /// </summary>
+            Type3,
+            /// <summary>
+            /// 4:è‡ªç¤¾å·¥äº‹
+            /// </summary>
+            Type4,
+            /// <summary>
+            /// 5:ç‘•ç–µå·¥äº‹
+            /// </summary>
+            Type5,
+            /// <summary>
+            /// 6:è²©å£²
+            /// </summary>
+            Type6,
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿å…¥åŠ›ãƒ­ãƒƒã‚¯å®šç¾©
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿å…¥åŠ›ãƒ­ãƒƒã‚¯å®šç¾©
+        /// </summary>
+        public enum LockFlgDef
+        {
+            /// <summary>
+            /// 0:ãƒ­ãƒƒã‚¯ç„¡
+            /// </summary>
+            Free = 0,
+            /// <summary>
+            /// 1:ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+            /// </summary>
+            Locked
+        }
+        #endregion
+
+        #region è‡ªç¤¾ã‚³ãƒ¼ãƒ‰å®šç¾©
+        /// <summary>
+        /// è‡ªç¤¾ã‚³ãƒ¼ãƒ‰å®šç¾©
+        /// </summary>
+        public static decimal OwnCompany = 999999999;
+        #endregion
+
+        #endregion
+
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+        private int         m_YearNumber = 0;                   // å¹´åº¦
+        private int         m_CostType = 0;                     // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+        private int         m_TargetType = 0;                   // å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        private int         m_TargetCode = 0;                   // å…ˆã‚³ãƒ¼ãƒ‰
+        private int         m_SeqNo = 0;                        // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+
+        private int         m_PersonCode = 0;                   // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+        private int         m_FromCodeType = 0;                 // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        private int         m_FromCode = 0;                     // ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+        private DateTime    m_SendDate = DateTime.Now;          // å¯¾è±¡æ—¥ä»˜
+
+        private decimal     m_EntryPrice = 0;                   // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+        private decimal     m_EntryTax = 0;                     // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+
+        private string      m_Content = string.Empty;           // æ”¯æ‰•å†…å®¹
+        private string      m_BikoComment = string.Empty;       // å‚™è€ƒ
+
+        private int         m_LockFlg = 0;                      // ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+
+        private DateTime    m_EntryDate = DateTime.Now;         // ç™»éŒ²æ—¥ä»˜
+        private DateTime    m_UpdateDate = DateTime.Now;        // æ›´æ–°æ—¥ä»˜
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å¹´åº¦
+        /// </summary>
+        public int YearNumber
+        {
+            get { return m_YearNumber; }
+            set { m_YearNumber = value; }
+        }
+        /// <summary>
+        /// å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public int CostType
+        {
+            get { return m_CostType; }
+            set { m_CostType = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int TargetType
+        {
+            get { return m_TargetType; }
+            set { m_TargetType = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int TargetCode
+        {
+            get { return m_TargetCode; }
+            set { m_TargetCode = value; }
+        }
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+        /// </summary>
+        public int SeqNo
+        {
+            get { return m_SeqNo; }
+            set { m_SeqNo = value; }
+        }
+        /// <summary>
+        /// ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int PersonCode
+        {
+            get { return m_PersonCode; }
+            set { m_PersonCode = value; }
+        }
+        /// <summary>
+        /// ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int FromCodeType
+        {
+            get { return m_FromCodeType; }
+            set { m_FromCodeType = value; }
+        }
+        /// <summary>
+        /// ç›¸æ‰‹å…ˆã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int FromCode
+        {
+            get { return m_FromCode; }
+            set { m_FromCode = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡æ—¥ä»˜
+        /// </summary>
+        public DateTime SendDate
+        {
+            get { return m_SendDate; }
+            set { m_SendDate = value; }
+        }
+        /// <summary>
+        /// é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+        /// </summary>
+        public decimal EntryPrice
+        {
+            get { return m_EntryPrice; }
+            set { m_EntryPrice = value; }
+        }
+        /// <summary>
+        /// é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+        /// </summary>
+        public decimal EntryTax
+        {
+            get { return m_EntryTax; }
+            set { m_EntryTax = value; }
+        }
+        /// <summary>
+        /// æ”¯æ‰•å†…å®¹
+        /// </summary>
+        public string Content
+        {
+            get { return m_Content; }
+            set { m_Content = value; }
+        }
+        /// <summary>
+        /// å‚™è€ƒ
+        /// </summary>
+        public string BikoComment
+        {
+            get { return m_BikoComment; }
+            set { m_BikoComment = value; }
+        }
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯
+        /// </summary>
+        public int LockFlg
+        {
+            get { return m_LockFlg; }
+            set { m_LockFlg = value; }
+        }
+        /// <summary>
+        /// ç™»éŒ²æ—¥ä»˜
+        /// </summary>
+        public DateTime EntryDate
+        {
+            get { return m_EntryDate; }
+            set { m_EntryDate = value; }
+        }
+        /// <summary>
+        /// æ›´æ–°æ—¥ä»˜
+        /// </summary>
+        public DateTime UpdateDate
+        {
+            get { return m_UpdateDate; }
+            set { m_UpdateDate = value; }
+        }
+
+        #endregion
+
+        #region ãƒ¡ã‚½ãƒƒãƒ‰
+        
+        #region å‡ºç´�é‡‘é¡�ã‚’ã‚¿ã‚¤ãƒ—ã�«ã‚ˆã‚Šï¼‹ï¼�ã�™ã‚‹
+        /// <summary>
+        /// å‡ºç´�é‡‘é¡�ã‚’ã‚¿ã‚¤ãƒ—ã�«ã‚ˆã‚Šï¼‹ï¼�ã�™ã‚‹
+        /// </summary>
+        public static decimal GetPublicCostData(int CostType, decimal InData, bool Payment = true)
+        {
+            decimal decWork = 1;
+            // ----- ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+            if (Payment)
+            {
+                // æ”¯æ‰•ã�„ãƒ™ãƒ¼ã‚¹ã�§ã�¿ã�Ÿå ´å�ˆ
+                switch (CostType)
+                {
+                    case (int)CostTypeDef.Type1: // è£œå¡«
+                    case (int)CostTypeDef.Type6: // è²©å£²
+                        decWork = -1;
+                        break;
+                    case (int)CostTypeDef.Type2: // è³¼å…¥
+                    case (int)CostTypeDef.Type3: // å�°å¸³é–‰éŽ–å·¥äº‹
+                    case (int)CostTypeDef.Type4: // è‡ªç¤¾å·¥äº‹
+                    case (int)CostTypeDef.Type5: // ç‘•ç–µå·¥äº‹
+                        break;
+                }
+            }
+            else
+            {
+                // å£²ä¸Šã�’ãƒ™ãƒ¼ã‚¹ã�§ã�¿ã�Ÿå ´å�ˆ
+                switch (CostType)
+                {
+                    case (int)CostTypeDef.Type1: // è£œå¡«
+                    case (int)CostTypeDef.Type6: // è²©å£²
+                        break;
+                    case (int)CostTypeDef.Type2: // è³¼å…¥
+                    case (int)CostTypeDef.Type3: // å�°å¸³é–‰éŽ–å·¥äº‹
+                    case (int)CostTypeDef.Type4: // è‡ªç¤¾å·¥äº‹
+                    case (int)CostTypeDef.Type5: // ç‘•ç–µå·¥äº‹
+                        decWork = -1;
+                        break;
+                }
+            }
+            return (InData * decWork);
+        }
+        #endregion
+
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataOfDepartment.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataOfDepartment.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataOfDepartment.cs	(revision 483)
@@ -13,6 +13,7 @@
         #region å®šæ•°
 
         #region å‡ºç´�ãƒ•ãƒ©ã‚°å®šç¾©
+
         /// <summary>
         /// å‡ºç´�ãƒ•ãƒ©ã‚°å®šç¾©
         /// </summary>
@@ -36,62 +37,20 @@
         #endregion
 
         #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
-        /// <summary>
-        /// éƒ¨ç½²ã‚³ãƒ¼ãƒ‰
-        /// </summary>
-        private int         m_DepartmentCode = 0;
-        /// <summary>
-        /// å·¥äº‹æœŸæ•°ãƒ»å¹´æ•°
-        /// </summary>
-        private int         m_ConstrYear = 0;
-        /// <summary>
-        /// ãƒ‡ãƒ¼ã‚¿ç•ªå�·
-        /// </summary>
-        private int         m_SeqNo = 0;
-        /// <summary>
-        /// å¯¾è±¡æ—¥ä»˜
-        /// </summary>
-        private DateTime    m_CostDate = DateTime.Now;
-        /// <summary>
-        /// å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰
-        /// </summary>
-        private int         m_SuppliersCode = 0;
-        /// <summary>
-        /// éƒ¨ç½²å��
-        /// </summary>
-        private string      m_DepartmentName = string.Empty;
-        /// <summary>
-        /// æ”¯æ‰•å…ˆå��ç§°
-        /// </summary>
-        private string      m_SuppliersName = string.Empty;
-        /// <summary>
-        /// æ”¯æ‰•å†…å®¹
-        /// </summary>
-        private string      m_PaymentContent = string.Empty;
-        /// <summary>
-        /// å‡ºç´�ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private int         m_SendReceiveFlg = 0;
-        /// <summary>
-        /// é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
-        /// </summary>
-        private double      m_EntryPrice = 0;
-        /// <summary>
-        /// é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
-        /// </summary>
-        private double      m_EntryTax = 0;
-        /// <summary>
-        /// å‚™è€ƒ
-        /// </summary>
-        private string      m_Coment = string.Empty;
-        /// <summary>
-        /// ç™»éŒ²æ—¥ä»˜
-        /// </summary>
-        private DateTime    m_EntryDate = DateTime.Now;
-        /// <summary>
-        /// æ›´æ–°æ—¥ä»˜
-        /// </summary>
-        private DateTime    m_UpdateDate = DateTime.Now;
+        private int         m_DepartmentCode = 0;               // éƒ¨ç½²ã‚³ãƒ¼ãƒ‰
+        private int         m_ConstrYear = 0;                   // å·¥äº‹æœŸæ•°ãƒ»å¹´æ•°
+        private int         m_SeqNo = 0;                        // ãƒ‡ãƒ¼ã‚¿ç•ªå�·
+        private DateTime    m_CostDate = DateTime.Now;          // å¯¾è±¡æ—¥ä»˜
+        private int         m_SuppliersCode = 0;                // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰
+        private string      m_DepartmentName = string.Empty;    // éƒ¨ç½²å��
+        private string      m_SuppliersName = string.Empty;     // æ”¯æ‰•å…ˆå��ç§°
+        private string      m_PaymentContent = string.Empty;    // æ”¯æ‰•å†…å®¹
+        private int         m_SendReceiveFlg = 0;               // å‡ºç´�ãƒ•ãƒ©ã‚°
+        private double      m_EntryPrice = 0;                   // é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
+        private double      m_EntryTax = 0;                     // é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
+        private string      m_Coment = string.Empty;            // å‚™è€ƒ
+        private DateTime    m_EntryDate = DateTime.Now;         // ç™»éŒ²æ—¥ä»˜
+        private DateTime    m_UpdateDate = DateTime.Now;        // æ›´æ–°æ—¥ä»˜
         #endregion
 
         #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
@@ -98,6 +57,7 @@
         #endregion
 
         #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+
         /// <summary>
         /// æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
         /// </summary>
@@ -106,6 +66,7 @@
             get { return m_DepartmentCode; }
             set { m_DepartmentCode = value; }
         }
+
         /// <summary>
         /// å·¥äº‹æœŸæ•°ãƒ»å¹´æ•°
         /// </summary>
@@ -114,6 +75,7 @@
             get { return m_ConstrYear; }
             set { m_ConstrYear = value; }
         }
+
         /// <summary>
         /// ãƒ‡ãƒ¼ã‚¿ç•ªå�·
         /// </summary>
@@ -122,6 +84,7 @@
             get { return m_SeqNo; }
             set { m_SeqNo = value; }
         }
+
         /// <summary>
         /// å¯¾è±¡æ—¥ä»˜
         /// </summary>
@@ -130,6 +93,7 @@
             get { return m_CostDate; }
             set { m_CostDate = value; }
         }
+
         /// <summary>
         /// å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰
         /// </summary>
@@ -138,6 +102,7 @@
             get { return m_SuppliersCode; }
             set { m_SuppliersCode = value; }
         }
+
         /// <summary>
         /// éƒ¨ç½²å��
         /// </summary>
@@ -146,6 +111,7 @@
             get { return m_DepartmentName; }
             set { m_DepartmentName = value; }
         }
+
         /// <summary>
         /// æ”¯æ‰•å…ˆå��ç§°
         /// </summary>
@@ -154,6 +120,7 @@
             get { return m_SuppliersName; }
             set { m_SuppliersName = value; }
         }
+
         /// <summary>
         /// æ”¯æ‰•å†…å®¹
         /// </summary>
@@ -162,6 +129,7 @@
             get { return m_PaymentContent; }
             set { m_PaymentContent = value; }
         }
+
         /// <summary>
         /// å‡ºç´�ãƒ•ãƒ©ã‚°
         /// </summary>
@@ -170,6 +138,7 @@
             get { return m_SendReceiveFlg; }
             set { m_SendReceiveFlg = value; }
         }
+
         /// <summary>
         /// é‡‘é¡�ï¼ˆç¨ŽæŠœï¼‰
         /// </summary>
@@ -178,6 +147,7 @@
             get { return m_EntryPrice; }
             set { m_EntryPrice = value; }
         }
+
         /// <summary>
         /// é‡‘é¡�ï¼ˆç¨Žè¾¼ï¼‰
         /// </summary>
@@ -186,6 +156,7 @@
             get { return m_EntryTax; }
             set { m_EntryTax = value; }
         }
+
         /// <summary>
         /// å‚™è€ƒ
         /// </summary>
@@ -203,6 +174,7 @@
             set { m_EntryDate = value; }
             get { return m_EntryDate; }
         }
+
         /// <summary>
         /// æ›´æ–°æ—¥ä»˜
         /// </summary>
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataTargetTypeExpenses.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataTargetTypeExpenses.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataTargetTypeExpenses.cs	(revision 483)
@@ -0,0 +1,73 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ProcessManagement.DataModel
+{
+    /// <summary>
+    /// å‡ºç´�å¯¾è±¡çµŒè²»å¯¾å¿œå��ç§°ãƒžã‚¹ã‚¿
+    /// </summary>
+    public class CostDataTargetTypeExpenses
+    {
+        #region å®šæ•°
+
+        #endregion
+
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+        private int         m_CostType = 0;                     // å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+        private int         m_TargetType = 0;                   // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        private int         m_ExpensesCode = 0;                 // å¯¾è±¡çµŒè²»ã‚³ãƒ¼ãƒ‰
+
+        private DateTime    m_EntryDate = DateTime.Now;         // ç™»éŒ²æ—¥ä»˜
+        private DateTime    m_UpdateDate = DateTime.Now;        // æ›´æ–°æ—¥ä»˜
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å‡ºç´�ã‚¿ã‚¤ãƒ—ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public int CostType
+        {
+            get { return m_CostType; }
+            set { m_CostType = value; }
+        }
+        /// <summary>
+        /// å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int TargetType
+        {
+            get { return m_TargetType; }
+            set { m_TargetType = value; }
+        }
+        /// <summary>
+        /// å¯¾è±¡çµŒè²»ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int ExpensesCode
+        {
+            get { return m_ExpensesCode; }
+            set { m_ExpensesCode = value; }
+        }
+        /// <summary>
+        /// ç™»éŒ²æ—¥ä»˜
+        /// </summary>
+        public DateTime EntryDate
+        {
+            get { return m_EntryDate; }
+            set { m_EntryDate = value; }
+        }
+        /// <summary>
+        /// æ›´æ–°æ—¥ä»˜
+        /// </summary>
+        public DateTime UpdateDate
+        {
+            get { return m_UpdateDate; }
+            set { m_UpdateDate = value; }
+        }
+
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataType.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataType.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/CostDataType.cs	(revision 483)
@@ -0,0 +1,73 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ProcessManagement.DataModel
+{
+    /// <summary>
+    /// å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°ãƒžã‚¹ã‚¿
+    /// </summary>
+    public class CostDataType
+    {
+        #region å®šæ•°
+
+        #endregion
+
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+        private int         m_CostType = 0;                     // å‡ºç´�ã‚¿ã‚¤ãƒ—ã‚³ãƒ¼ãƒ‰
+        private int         m_TargetType = 0;                   // å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        private string      m_CostDataTypeName = string.Empty;  // å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°
+
+        private DateTime    m_EntryDate = DateTime.Now;         // ç™»éŒ²æ—¥ä»˜
+        private DateTime    m_UpdateDate = DateTime.Now;        // æ›´æ–°æ—¥ä»˜
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å‡ºç´�ã‚¿ã‚¤ãƒ—ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int CostType
+        {
+            get { return m_CostType; }
+            set { m_CostType = value; }
+        }
+        /// <summary>
+        /// å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int TargetType
+        {
+            get { return m_TargetType; }
+            set { m_TargetType = value; }
+        }
+        /// <summary>
+        /// å‡ºç´�ã‚¿ã‚¤ãƒ—å��ç§°
+        /// </summary>
+        public string CostDataTypeName
+        {
+            get { return m_CostDataTypeName; }
+            set { m_CostDataTypeName = value; }
+        }
+        /// <summary>
+        /// ç™»éŒ²æ—¥ä»˜
+        /// </summary>
+        public DateTime EntryDate
+        {
+            get { return m_EntryDate; }
+            set { m_EntryDate = value; }
+        }
+        /// <summary>
+        /// æ›´æ–°æ—¥ä»˜
+        /// </summary>
+        public DateTime UpdateDate
+        {
+            get { return m_UpdateDate; }
+            set { m_UpdateDate = value; }
+        }
+
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/CustomControls/DataGridViewEX.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/CustomControls/DataGridViewEX.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/CustomControls/DataGridViewEX.cs	(revision 483)
@@ -71,7 +71,7 @@
             try
             {
                 // ƒRƒ�ƒ“ƒg‚ÉƒtƒH�[ƒJƒX‚ª‚ ‚éŽž‚Í�ˆ—�‚µ‚È‚¢
-                Form frmParent = FindForm();
+                //Form frmParent = FindForm();
                 //if (frmParent.ActiveControl.GetType().Equals(typeof(MoveTextBox))
                 //    || frmParent.ActiveControl.GetType().Equals(typeof(ShapeContainer))
                 //    || frmParent.ActiveControl.GetType().Equals(typeof(LineShape))) return false;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 483)
@@ -218,7 +218,7 @@
         /// <param name="e"></param>
         private async void FrmApprovalList_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
       
             // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
             InitFormLoad();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 483)
@@ -145,8 +145,8 @@
                 {
                     if (m_ApprovalCode != (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval)
                     {   // ’�•¶�‘�\�¿ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-                        return; 
-}
+                        return;
+                    }
                     else
                     {
                         // ƒvƒ�ƒZƒX‚ðˆê‚ÂŒ¸‚ç‚·
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs	(revision 483)
@@ -647,46 +647,42 @@
             IOSubConMailQueue QueDB = new IOSubConMailQueue();
             try
             {
-                StringBuilder strSQL = new StringBuilder();
-                // æ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—ï¼³ï¼±ï¼¬ä½œæˆ�å‡¦ç�†
-                GetReqSumDataSQL(ref strSQL);
+                FreeDB.connect(); FreeDB.beginTran();
 
-                ArrayList Arlist = new ArrayList();
-                if (!FreeDB.ExecuteReader(strSQL.ToString(), ref Arlist)) return false;
+                int nLabourKind = 0;
+                if (m_ApprovalCode == (int)ClsExcute.ApprovalListNo.FeePayment)
+                {
+                    // 11:æ‰‹é–“æ”¯æ‰•
+                    nLabourKind = (int)SubContractorMaster.PaymentKindDef.Labor;
+                }
+                else if (m_ApprovalCode == (int)ClsExcute.ApprovalListNo.SubConstrPayment)
+                {
+                    // 12:æ¥­è€…æ”¯æ‰•
+                    nLabourKind = (int)SubContractorMaster.PaymentKindDef.Normal;
+                }
 
-                FreeDB.connect(); FreeDB.beginTran();
-                foreach (object[] CurRec in Arlist)
+                int SetValue = 0;
+                if (bApproval)
                 {
-                    strSQL.Clear();
-                    strSQL.Append(" Update PaymentDataDetail");
-                    strSQL.Append(" Set");
+                    // æ‰¿èª�æ™‚
+                    SetValue = (int)PaymentDataDetail.ApprovalEndFlgDef.Approval;
+                }
+                else
+                {
+                    // ä¿�ç•™ç­‰å�–æ¶ˆã�—æ™‚
+                    SetValue = (int)PaymentDataDetail.ApprovalEndFlgDef.UnKown;
+                }
 
-                    if (bApproval)
-                    {
-                        // æ‰¿èª�æ™‚
-                        strSQL.AppendFormat(" APPROVALENDFLG = {0}", (int)PaymentDataDetail.ApprovalEndFlgDef.Approval);
-                    }
-                    else
-                    {
-                        // ä¿�ç•™ç­‰å�–æ¶ˆã�—æ™‚
-                        strSQL.AppendFormat(" APPROVALENDFLG = {0}", (int)PaymentDataDetail.ApprovalEndFlgDef.UnKown);
-                    }
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(" Update PaymentDataDetail");
 
-                    strSQL.Append("       , UPDATEDATE = Now()");
-                    strSQL.AppendFormat(" Where COMPANYCODE = {0}", CommonMotions.cnvInt(CurRec[0]));
-                    strSQL.AppendFormat(" And TARGETDATE = {0}", CommonMotions.cnvInt(CurRec[1]));
-                    strSQL.AppendFormat(" And SEQNO = {0}", CommonMotions.cnvInt(CurRec[2]));
-                    strSQL.AppendFormat(" And LINECOUNT = {0}", CommonMotions.cnvInt(CurRec[3]));
-                    strSQL.AppendFormat(" And LABOURKIND = {0}", CommonMotions.cnvInt(CurRec[4]));
-                    if (!FreeDB.ExecuteNonQuery(strSQL.ToString(), false))
-                    {
-                        FreeDB.rollback();
-                        return false;
-                    }
-                }
+                strSQL.AppendFormat(" Set APPROVALENDFLG = {0}", SetValue);
+                strSQL.Append("       , UPDATEDATE = Now()");
 
-                // æ‹…å½“è€…æ‰¿èª�å¾Œé‡‘é¡�ï¼�ã�®ãƒ‡ãƒ¼ã‚¿ã‚‚æ‰¿èª�æ¸ˆã�«ã�™ã‚‹
-                if(!PaymentDataDetailUpdate2(FreeDB, bApproval))
+                strSQL.AppendFormat(" Where TARGETDATE = {0}", m_OrderDate);
+                strSQL.AppendFormat(" And LABOURKIND = {0}", nLabourKind);
+                strSQL.AppendFormat(" And APPROVALPERSONCODE = {0}", m_PersonCode);
+                if (!FreeDB.ExecuteNonQuery(strSQL.ToString(), false))
                 {
                     FreeDB.rollback();
                     return false;
@@ -812,7 +808,10 @@
             try
             {
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("Update paymentdatadetail as Pdd, BillingDataDetail as Bdd, ConstructionBaseInfo as Cbi");
+                strSQL.Append("Update PaymentDataDetail as Pdd");
+                strSQL.Append("     , BillingDataDetail as Bdd");
+                strSQL.Append("     , ConstructionBaseInfo as Cbi");
+                strSQL.Append("     , chgchargedep as Ccd");
 
                 int nAppFlg = 0;
                 if (bApproval)
@@ -832,6 +831,7 @@
 
                 strSQL.AppendFormat(" Where Pdd.TargetDate = {0}", nYM);
                 strSQL.AppendFormat(" And Pdd.LABOURKIND = {0}", nLabourKinds);
+
                 strSQL.Append("       And Bdd.COMPANYCODE = Pdd.COMPANYCODE");
                 strSQL.Append("       And Bdd.TARGETDATE = Pdd.TARGETDATE");
                 strSQL.Append("       And Bdd.SEQNO = Pdd.SEQNO");
@@ -838,14 +838,17 @@
                 strSQL.Append("       And Bdd.LINECOUNT = Pdd.LINECOUNT");
                 strSQL.Append("       And Bdd.LABOURKIND = Pdd.LABOURKIND");
                 strSQL.AppendFormat(" And Bdd.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+
+                strSQL.AppendFormat(" And Ccd.PersonCode = {0}", m_PersonCode);
+                strSQL.AppendFormat(" And Ccd.DepartmentCode = {0}", m_CurDepCode);
+
                 strSQL.Append("       And Cbi.ConstructionCode = Bdd.ConstructionCode");
-                strSQL.AppendFormat(" And Cbi.ConstrDepCode = {0}", m_CurDepCode);
-                strSQL.AppendFormat(" And Cbi.ConstructionPersonCode = {0}", m_PersonCode);
-
+                //strSQL.Append("       And Cbi.ConstrDepCode = Ccd.DepartmentCode");
+                strSQL.Append("       And Cbi.ConstructionPersonCode = Ccd.PersonCode");
                 int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("é�ž å�— æ³¨")).Key;
                 strSQL.AppendFormat(" And Cbi.ConstructionStatusFlg != {0}", iStatus);
 
-                strSQL.Append(" And (Pdd.BILLPRICE = 0 Or Pdd.HIGHWPRICE = 0 Or Pdd.HARDWPRICE = 0 Or Pdd.INDSWASTETAX = 0)");
+                strSQL.Append(" And (Pdd.BILLPRICE = 0)");
                 if (!FreeDB.ExecuteNonQuery(strSQL.ToString(), false)) return false;
 
                 bRet = true;
@@ -877,6 +880,8 @@
                         break;
                 }
 
+                // å�”åŠ›ä¼šç¤¾ã�®æœˆæ¯Žã�®è«‹æ±‚ãƒ‡ãƒ¼ã‚¿ã�§å…¨ä½“æ•°ã�¨æ‰¿èª�æ•°ã�Œå�Œã�˜ã‚‚ã�®ã‚’é�¸æŠžã�™ã‚‹
+                // ï¼ˆé‡‘é¡�ã�ŒALL0ã�®å ´å�ˆã�¯é™¤å¤–ã�™ã‚‹ï¼‰
                 strSQL.Append("Select");
                 strSQL.Append(" A.COMPANYCODE");
                 strSQL.Append(", A.TARGETDATE");
@@ -901,6 +906,17 @@
                 strSQL.Append("  Where");
                 strSQL.AppendFormat(" A1.TARGETDATE = {0}", m_OrderDate);
                 strSQL.AppendFormat(" And A1.LABOURKIND = {0}", nLabourKind);
+
+                // â€»æ”¯æ‰•é€šçŸ¥æ›¸å�°åˆ·å¯¾è±¡ã�®å¤‰æ›´å¾Œ '>'ã‚’'!='ã�¸å¤‰æ›´ã�™ã‚‹
+                strSQL.Append("  And ((A1.BILLPRICE > 0)");
+                strSQL.Append("   Or (A1.OFFSETPRICE > 0)");
+                strSQL.Append("   Or (A1.NEXTCOPRICE > 0)");
+                strSQL.Append("   Or (A1.HIGHWPRICE > 0)");
+                strSQL.Append("   Or (A1.HARDWPRICE > 0)");
+                strSQL.Append("   Or (A1.INDSWASTETAX > 0)");
+                strSQL.Append("   Or (A1.CNSTRPRICE > 0)");
+                strSQL.Append("   Or (A1.DISCOUNTPRICE > 0))");
+
                 strSQL.Append("  Group By A1.COMPANYCODE, A1.TARGETDATE) As A");
 
                 strSQL.Append(" Inner Join(Select");
@@ -916,10 +932,21 @@
                 strSQL.Append("             And B2.LINECOUNT = B1.LINECOUNT");
                 strSQL.Append("             And B2.LABOURKIND = B1.LABOURKIND");
                 strSQL.Append("             And B2.DELETEFLG = 0");
-                strSQL.Append("  Where");
+                strSQL.Append(" Where");
                 strSQL.AppendFormat(" B1.TARGETDATE = {0}", m_OrderDate);
                 strSQL.AppendFormat(" And B1.LABOURKIND = {0}", nLabourKind);
                 strSQL.Append("       And B1.APPROVALENDFLG = 1");
+
+                // â€»æ”¯æ‰•é€šçŸ¥æ›¸å�°åˆ·å¯¾è±¡ã�®å¤‰æ›´å¾Œ '>'ã‚’'!='ã�¸å¤‰æ›´ã�™ã‚‹
+                strSQL.Append(" And ((B1.BILLPRICE > 0)");
+                strSQL.Append("  Or (B1.OFFSETPRICE > 0)");
+                strSQL.Append("  Or (B1.NEXTCOPRICE > 0)");
+                strSQL.Append("  Or (B1.HIGHWPRICE > 0)");
+                strSQL.Append("  Or (B1.HARDWPRICE > 0)");
+                strSQL.Append("  Or (B1.INDSWASTETAX > 0)");
+                strSQL.Append("  Or (B1.CNSTRPRICE > 0)");
+                strSQL.Append("  Or (B1.DISCOUNTPRICE > 0))");
+
                 strSQL.Append("  Group By B1.COMPANYCODE, B1.TARGETDATE) As B");
                 strSQL.Append(" On B.COMPANYCODE = A.COMPANYCODE");
                 strSQL.Append(" And B.TARGETDATE = A.TARGETDATE");
@@ -929,11 +956,12 @@
                 strSQL.AppendFormat(" A.TARGETDATE = {0}", m_OrderDate);
                 strSQL.AppendFormat(" And A.LABOURKIND = {0}", nLabourKind);
                 strSQL.Append("       And B.SelCnt = A.AllCnt");
-                strSQL.Append("       And Not Exists(Select * From subconmailqueue As C");
-                strSQL.Append("                      Where C.CompanyCode = B.CompanyCode");
-                strSQL.AppendFormat("                And C.MailDelivery = {0}", (int)SubContrMailDelivery.MailDeliveryDef.PaymentNotice);
-                strSQL.AppendFormat("                And C.Argument0 = '{0}'", OrderMonth);
-                strSQL.AppendFormat("                And C.Argument1 = '{0}')", LabourKindName);
+
+                strSQL.Append(" And Not Exists(Select * From subconmailqueue As C");
+                strSQL.Append("                Where C.CompanyCode = B.CompanyCode");
+                strSQL.AppendFormat("          And C.MailDelivery = {0}", (int)SubContrMailDelivery.MailDeliveryDef.PaymentNotice);
+                strSQL.AppendFormat("          And C.Argument0 = '{0}'", OrderMonth);
+                strSQL.AppendFormat("          And C.Argument1 = '{0}')", LabourKindName);
             }
             catch (Exception ex)
             {
@@ -1791,46 +1819,65 @@
                 LinkRec.OrderNo = NoticeRec.OrderNo;
 
                 decimal dWork = 0;
-                if (ManRec.PaidVacationDays >= (decimal)NoticeRec.NoticePeriod)
-                {   
-                    // ä»Šå¹´åº¦ã�Œæœ‰çµ¦å�–å¾—æ—¥ä»¥ä¸Šã�®å ´å�ˆ
-                    LinkRec.CurrentYear = (decimal)NoticeRec.NoticePeriod;
-                    ManRec.PaidVacationDays -= (decimal)NoticeRec.NoticePeriod;
-                }
-                else if (ManRec.PaidVacationDays > 0)
+                decimal decNoticePeriod = (decimal)NoticeRec.NoticePeriod;
+                if (ManRec.PaidVacationDays >= decNoticePeriod)
                 {
-                    // ä»Šå¹´åº¦ã�¯æœ‰çµ¦å�–å¾—æ—¥ã‚ˆã‚Šå°�ã�•ã�„ã�Œæ•°å€¤ã�Œã�‚ã‚‹å ´å�ˆ
-                    dWork = (decimal)NoticeRec.NoticePeriod - ManRec.PaidVacationDays;  // ã�¾ã�šå‰�å¹´åº¦åˆ†ã‚’è¨ˆç®—
-                    LinkRec.CurrentYear = (decimal)NoticeRec.NoticePeriod - dWork;      // ä»Šå¹´åº¦ã�®æ¸›ç®—åˆ†
-                    ManRec.PaidVacationDays = 0;                                        // ä»Šå¹´åº¦ã�¯ï¼�ã�¸å¤‰æ›´
+                    // ----- ä»Šå¹´åº¦ã�Œæœ‰çµ¦å�–å¾—æ—¥ä»¥ä¸Šã�®å ´å�ˆ
+                    // æ‹…å½“è€…æœ‰çµ¦æ®‹è¨ˆç®—
+                    ManRec.PaidVacationDays -= decNoticePeriod;
+                    // æœ‰çµ¦ä¼‘æš‡æ¶ˆåŒ–ç´�ä»˜ãƒ‡ãƒ¼ã‚¿
+                    LinkRec.CurrentYear = decNoticePeriod;
                 }
                 else
                 {
-                    // æœ‰çµ¦æ®‹ã�Œï¼�ã�®å ´å�ˆ
-                    dWork = (decimal)NoticeRec.NoticePeriod;
+                    // ----- ä»Šå¹´åº¦ã�Œæœ‰çµ¦å�–å¾—æ—¥æœªæº€ã�®å ´å�ˆ
+                    if (ManRec.PaidVacationDays >= 0)
+                    {
+                        // ----- ä»Šå¹´åº¦ã�¯æœ‰çµ¦å�–å¾—æ—¥ã‚ˆã‚Šå°�ã�•ã�„ã�Œæ•°å€¤ã�Œã�‚ã‚‹å ´å�ˆ
+                        if ((ManRec.PaidVacationDays + ManRec.PaidVacationDaysPrev) >= decNoticePeriod)
+                        {
+                            // ----- ä»Šå¹´åº¦ï¼‹å‰�å¹´åº¦ã�®ä¸¡æ–¹ã�§è³„ã�ˆã‚‹å ´å�ˆ
+                            dWork = decNoticePeriod - ManRec.PaidVacationDays;          // ä»Šå¹´åº¦åˆ†ã�§è¶³ã‚Šã�ªã�„å·®åˆ†ã‚’è¨ˆç®—
+                            // æœ‰çµ¦ä¼‘æš‡æ¶ˆåŒ–ç´�ä»˜ãƒ‡ãƒ¼ã‚¿
+                            LinkRec.CurrentYear = ManRec.PaidVacationDays;              // ä»Šå¹´åº¦ã‚’ã�™ã�¹ã�¦ä½¿ã�†
+                            LinkRec.PreviousYear = dWork;                               // å‰�å¹´åº¦ã�«å·®åˆ†ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                            // æ‹…å½“è€…æœ‰çµ¦æ®‹è¨ˆç®—
+                            ManRec.PaidVacationDays = 0;                                // ä»Šå¹´åº¦ã�¯ï¼�ã�¸å¤‰æ›´
+                            ManRec.PaidVacationDaysPrev -= dWork;                       // å‰�å¹´åº¦ã‚ˆã‚Šæ®‹ã‚Šã‚’æ¸›ç®—
+                        }
+                        else
+                        {
+                            // ----- ä»Šå¹´åº¦ï¼‹å‰�å¹´åº¦ã�®ä¸¡æ–¹ã�§è³„ã�ˆã�ªã�„å ´å�ˆ
+                            dWork = decNoticePeriod - ManRec.PaidVacationDaysPrev;      // å‰�å¹´åº¦åˆ†ã�§è¶³ã‚Šã�ªã�„å·®åˆ†ã‚’è¨ˆç®—
+                            // æœ‰çµ¦ä¼‘æš‡æ¶ˆåŒ–ç´�ä»˜ãƒ‡ãƒ¼ã‚¿
+                            LinkRec.CurrentYear = dWork;                                // ä»Šå¹´åº¦ã�«å·®åˆ†ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                            LinkRec.PreviousYear = ManRec.PaidVacationDaysPrev;         // å‰�å¹´åº¦ã‚’ã�™ã�¹ã�¦ä½¿ã�†
+                            // æ‹…å½“è€…æœ‰çµ¦æ®‹è¨ˆç®—
+                            ManRec.PaidVacationDays -= dWork;                           // ä»Šå¹´åº¦ã�¯å·®åˆ†ã‚’ãƒžã‚¤ãƒŠã‚¹
+                            ManRec.PaidVacationDaysPrev = 0;                            // å‰�å¹´åº¦ã�¯ï¼�ã�¸å¤‰æ›´
+                        }
+                    }
+                    else if (ManRec.PaidVacationDays <= 0 && ManRec.PaidVacationDaysPrev > 0)
+                    {
+                        // ----- ä»Šå¹´åº¦ã�¯æ—¥æ•°ã�Œ0ä»¥ä¸‹ã� ã�Œå‰�å¹´åº¦ã�«æ•°å€¤ã�Œã�‚ã‚‹å ´å�ˆ
+                        dWork = decNoticePeriod - ManRec.PaidVacationDaysPrev;      // å‰�å¹´åº¦åˆ†ã�§è¶³ã‚Šã�ªã�„å·®åˆ†ã‚’è¨ˆç®—
+                        // æœ‰çµ¦ä¼‘æš‡æ¶ˆåŒ–ç´�ä»˜ãƒ‡ãƒ¼ã‚¿
+                        LinkRec.CurrentYear = dWork;                                // ä»Šå¹´åº¦ã�«å·®åˆ†ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                        LinkRec.PreviousYear = ManRec.PaidVacationDaysPrev;         // å‰�å¹´åº¦ã‚’ã�™ã�¹ã�¦ä½¿ã�†
+                        // æ‹…å½“è€…æœ‰çµ¦æ®‹è¨ˆç®—
+                        ManRec.PaidVacationDays -= dWork;                           // ä»Šå¹´åº¦ã�¯å·®åˆ†ã‚’ãƒžã‚¤ãƒŠã‚¹
+                        ManRec.PaidVacationDaysPrev = 0;                            // å‰�å¹´åº¦ã�¯ï¼�ã�¸å¤‰æ›´
+                    }
+                    else
+                    {
+                        // ----- ä»Šå¹´åº¦ãƒ»å‰�å¹´åº¦æœ‰çµ¦æ®‹ã�Œï¼�æœªæº€ã�®å ´å�ˆ
+                        // æœ‰çµ¦ä¼‘æš‡æ¶ˆåŒ–ç´�ä»˜ãƒ‡ãƒ¼ã‚¿
+                        LinkRec.CurrentYear = decNoticePeriod;                      // ä»Šå¹´åº¦ã�«å…¨ã�¦ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                        // æ‹…å½“è€…æœ‰çµ¦æ®‹è¨ˆç®—
+                        ManRec.PaidVacationDays -= decNoticePeriod;                 // ä»Šå¹´åº¦ã‚ˆã‚Šãƒžã‚¤ãƒŠã‚¹
+                    }
                 }
-                // å�–å¾—æ®‹ã�Œç„¡ã�‘ã‚Œã�°æ›´æ–°
-                if (dWork == 0) goto MasterUpdate;
 
-                // æœ‰çµ¦å�–å¾—æ•°ã�®ã‚»ãƒƒãƒˆ
-                LinkRec.PreviousYear = dWork;
-                // ----- å‰�å¹´åº¦ã‚’å¯¾è±¡ã�¨ã�™ã‚‹
-                // å‰�å¹´åº¦æœ‰çµ¦æ®‹ã�Œè¶³ã‚Šã�ªã�„å ´å�ˆ
-                if (ManRec.PaidVacationDaysPrev < dWork)
-                {
-                    // å‰�å¹´åº¦ã�®è¶³ã‚‰ã�šã‚’å½“å¹´åº¦ã‚ˆã‚Šæ¸›ç®—ã�™ã‚‹
-                    ManRec.PaidVacationDays = (ManRec.PaidVacationDaysPrev - dWork);
-                    // å‰�å¹´åº¦ã‚’ï¼�ã�«ã�™ã‚‹
-                    ManRec.PaidVacationDaysPrev = 0;
-                }
-                else
-                {
-                    // å‰�å¹´åº¦ã‚ˆã‚Šæœ‰çµ¦å�–å¾—æ—¥ã‚’å�–å¾—ã�™ã‚‹
-                    ManRec.PaidVacationDaysPrev -= dWork;
-                }
-
-                MasterUpdate:
-
                 // æ‹…å½“è€…ãƒžã‚¹ã‚¿æ›´æ–°
                 if (!ManDB.UpdateAction(strSQL.ToString(), ManRec, false))
                 {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 483)
@@ -759,20 +759,9 @@
                 string strPersonPosion = string.Empty;
                 string strDepartment = string.Empty;
                 string EntryDate = DateTime.Now.ToShortDateString();
-                // ç”³è«‹ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append(pAppDB.CreatePrimarykeyString(m_PersonCode, m_ApprovalCode, m_OrderDate, m_OrderNo, 1));
-                PersonApproval pRec = new PersonApproval();
-                if (!pAppDB.SelectAction(strSQL.ToString(), ref pRec))
-                {
-                    // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯ç”³è«‹ç„¡
-                    // ----- ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    pRec.PersonCode = CommonMotions.LoginUserData.PersonCode;                                                   // ç”³è«‹è€…ã‚³ãƒ¼ãƒ‰
-                    pRec.ApprovalStatus = (int)CommonDefine.ApprovalStatus.Undecided;                                           // æ‰¿èª�çŠ¶æ…‹
-                }
 
                 // ç”³è«‹è€…å��å�–å¾—
-                strSQL.Clear();
+                StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("SELECT IFNULL(C.APPROVALSTATUS, -1)");
                 strSQL.Append(", DATE_FORMAT(C.APPROVALLIMITDATES,'%Y/%m/%d')");
                 strSQL.Append(", C.INPUTCOMMENT");
@@ -795,7 +784,7 @@
                 strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER D ON D.PersonCode = C.PersonCodeApproval");
                 strSQL.Append(" LEFT JOIN DEPARTMENTMASTER E ON E.DEPARTMENTCODE = D.DEPARTMENTCODE");
 
-                strSQL.AppendFormat(" WHERE A.PersonCode = {0}", pRec.PersonCode);
+                strSQL.AppendFormat(" WHERE A.PersonCode = {0}", m_PersonCode);
 
                 ArrayList pAppRec = new ArrayList();
                 if (!pAppDB.ExecuteReader(strSQL.ToString(), ref pAppRec)) return;
@@ -1458,31 +1447,31 @@
             IOAllFreeSQL FreeDB = new IOAllFreeSQL();
             try
             {
-                StringBuilder strSQL = new StringBuilder();
-                // æ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—ï¼³ï¼±ï¼¬ä½œæˆ�å‡¦ç�†
-                GetReqSumDataSQL(ref strSQL);
+                FreeDB.connect(); FreeDB.beginTran();
 
-                ArrayList Arlist = new ArrayList();
-                if (!FreeDB.ExecuteReader(strSQL.ToString(), ref Arlist)) return false;
+                int nLabourKind = 0;
+                if (m_ApprovalCode == (int)ClsExcute.ApprovalListNo.FeePayment)
+                {
+                    // 11:æ‰‹é–“æ”¯æ‰•
+                    nLabourKind = (int)SubContractorMaster.PaymentKindDef.Labor;
+                }
+                else if (m_ApprovalCode == (int)ClsExcute.ApprovalListNo.SubConstrPayment)
+                {
+                    // 12:æ¥­è€…æ”¯æ‰•
+                    nLabourKind = (int)SubContractorMaster.PaymentKindDef.Normal;
+                }
 
-                FreeDB.connect(); FreeDB.beginTran();
-                foreach(object[] CurRec in Arlist)
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(" Update PaymentDataDetail");
+                strSQL.Append(" Set APPROVALDATE = DATE(Now())");
+                strSQL.Append("   , UPDATEDATE = Now()");
+                strSQL.AppendFormat(" Where TARGETDATE = {0}", m_OrderDate);
+                strSQL.AppendFormat(" And LABOURKIND = {0}", nLabourKind);
+                strSQL.AppendFormat(" And APPROVALPERSONCODE = {0}", m_PersonCode);
+                if (!FreeDB.ExecuteNonQuery(strSQL.ToString(), false))
                 {
-                    strSQL.Clear();
-                    strSQL.Append(" Update PaymentDataDetail");
-                    strSQL.AppendFormat(" Set APPROVALPERSONCODE = {0}", m_PersonCode);
-                    strSQL.Append("       , APPROVALDATE = DATE(Now())");
-                    strSQL.Append("       , UPDATEDATE = Now()");
-                    strSQL.AppendFormat(" Where COMPANYCODE = {0}", CommonMotions.cnvInt(CurRec[0]));
-                    strSQL.AppendFormat(" And TARGETDATE = {0}", CommonMotions.cnvInt(CurRec[1]));
-                    strSQL.AppendFormat(" And SEQNO = {0}", CommonMotions.cnvInt(CurRec[2]));
-                    strSQL.AppendFormat(" And LINECOUNT = {0}", CommonMotions.cnvInt(CurRec[3]));
-                    strSQL.AppendFormat(" And LABOURKIND = {0}", CommonMotions.cnvInt(CurRec[4]));
-                    if (!FreeDB.ExecuteNonQuery(strSQL.ToString(), false))
-                    {
-                        FreeDB.rollback();
-                        return false;
-                    }
+                    FreeDB.rollback();
+                    return false;
                 }
 
                 FreeDB.commit();
@@ -1507,7 +1496,6 @@
         private void GetReqSumDataSQL(ref StringBuilder strRetSQL)
         {
             FrmReqSumList frm = new FrmReqSumList();
-            //IOAllFreeSQL FreeDB = new IOAllFreeSQL();
             try
             {
                 int[] ApprovalPara = new int[4];
@@ -1525,9 +1513,8 @@
                 // å¯¾è±¡å¹´æœˆã‚»ãƒƒãƒˆ
                 ApprovalPara[1] = m_OrderDate;
 
-                int nTargetCount = CommonMotions.ConvDate2YearOrPeriod(new DateTime(CommonMotions.cnvTruncate(m_OrderDate / 100)
-                                                                                                    , m_OrderDate % 100
-                                                                                                    , 1));
+                DateTime wkDate = new DateTime(CommonMotions.cnvTruncate(m_OrderDate / 100), m_OrderDate % 100, 1);
+                int nTargetCount = CommonMotions.ConvDate2YearOrPeriod(wkDate);
                 // å¯¾è±¡éƒ¨ç½²ã‚»ãƒƒãƒˆ
                 ApprovalPara[2] = m_CurDepCode;
 
@@ -1550,7 +1537,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-                //FreeDB.close(); FreeDB = null;
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs	(revision 483)
@@ -188,7 +188,7 @@
             {
                 StringBuilder sql = new StringBuilder();
                 sql.Append(BCLDB.CreatePrimarykeyString(m_ConstructionCode
-                                                        , (int)FrmConstructionLedger.DataGroup.BillingAmount));
+                                                        , (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount));
                 List<BeforeCreatingLedger> ReadList = new List<BeforeCreatingLedger>();
                 if (!BCLDB.SelectAction(sql.ToString(), ref ReadList)) return false;
                 // ãƒ‡ãƒ¼ã‚¿ç„¡ã�—ã�¯å‰�å�—ã�‘é‡‘ç„¡ã�—
@@ -438,7 +438,7 @@
                 List<ConstructionLedgerDetail> lstDetail = new List<ConstructionLedgerDetail>();
                 sql.Clear();
                 sql.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode
-                                                            , (int)FrmConstructionLedger.DataGroup.BillingAmount));
+                                                            , (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount));
                 if (!DetailDB.SelectAction(sql.ToString(), ref lstDetail))
                 {
                     return (bRet = false);
@@ -447,7 +447,7 @@
                 // å½“è©²æœˆã�®è«‹æ±‚é‡‘é¡�ã�®ãƒ¬ã‚³ãƒ¼ãƒ‰ã�Œã�‚ã‚‹ã�‹å�–å¾—ã�—ã�¦ã�¿ã‚‹
                 sql.Clear();
                 sql.Append(ExcuteDB.CreatePrimarykeyString(m_ConstructionCode
-                                                            , (int)FrmConstructionLedger.DataGroup.BillingAmount
+                                                            , (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount
                                                             , lstDetail[0].LineCount));
                 sql.AppendFormat(" AND DATE(TargetMonth) = DATE('{0}') ", dt.ToShortDateString());
 
@@ -503,6 +503,14 @@
                     return (bRet = false);
                 }
 
+                // å·¥äº‹è©³ç´°å�°å¸³å�ˆè¨ˆå†�è¨ˆç®—
+                List<int> CodeList = new List<int>();
+                CodeList.Add(m_ConstructionCode);
+                if (!ClsChangeLedgerData.LedgerRecalculate(ExcuteDB, CodeList))
+                {
+                    return false;
+                }
+
                 return true;
             }
             catch (Exception ex)
@@ -550,7 +558,7 @@
                 BeforeCreatingLedger BclRec = new BeforeCreatingLedger
                 {
                     ConstructionCode = m_ConstructionCode,
-                    GroupCount = (int)FrmConstructionLedger.DataGroup.BillingAmount,
+                    GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount,
                     TargetMonth = nRequestMonth,
                     PaymentAmount = lAmount
                 };
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 483)
@@ -1423,7 +1423,7 @@
                     case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval:                   // 7:è­°äº‹éŒ²æ‰¿èª�
                         iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.Proceedings;
                         break;
-                    case (int)ClsExcute.ApprovalListNo.SafetyPatrolApproval:                            // 13:å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«
+                    case (int)ClsExcute.ApprovalListNo.SafetyPatrolApproval:                    // 13:å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«
                         iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SafetyPatrol;
                         break;
                 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 483)
@@ -34,25 +34,6 @@
         #endregion
 
         #region ’è�”
-        #region •\Ž¦ƒJƒ‰ƒ€
-        /// <summary>
-        /// •\Ž¦ƒJƒ‰ƒ€
-        /// </summary>
-        private enum DispColumn
-        {
-            No = 0,
-            SalesDepartment,
-            SalesPerson,
-            ConstructionDepartment,
-            ConstructionPerson,
-            ConstructionName,
-            Status,
-            OtherStatus,
-            ConstructionPeriod,
-            ConstructionCode,
-            OrderNo,
-        }
-        #endregion
 
         #endregion
 
@@ -172,7 +153,7 @@
         private void btnDataEntry_Click(object sender, EventArgs e)
         {
             // Še�ˆ—�‹N“®
-            SubProcessExecute(0, 0, true);
+            SubProcessExecute(true);
 
             // �‰Šú•\Ž¦
             //InitDataLoad();
@@ -192,6 +173,18 @@
         }
         #endregion
 
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
+        /// <summary>
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnStageUp_Click(object sender, EventArgs e)
+        {
+            StageUpProcess();
+        }
+        #endregion
+
         #region ƒtƒH�[ƒ€ƒ��[ƒh
         /// <summary>
         /// �‰ŠúƒtƒH�[ƒ€ƒ��[ƒh
@@ -213,12 +206,25 @@
         /// <param name="e"></param>
         private async void FrmConstructionList_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
             // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
             InitFormLoad();
         }
         #endregion
 
+        #region ƒOƒŠƒbƒhƒ\�[ƒg�ˆ—�
+        /// <summary>
+        /// ƒOƒŠƒbƒhƒ\�[ƒg�ˆ—�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvMaster_Sorted(object sender, EventArgs e)
+        {
+            // ƒOƒŠƒbƒh‚Ì”Ô�†‚ð�U‚è‚È‚¨‚·
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
         #region ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// <summary>
         /// ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒN
@@ -227,15 +233,18 @@
         /// <param name="e"></param>
         private void dgvMaster_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
+            // ƒf�[ƒ^‚ª‚È‚¢�ê�‡‚Í”²‚¯‚é
             if (e.RowIndex < 0) return;
-            // ƒf�[ƒ^‚ª‚È‚¢�ê�‡‚Í”²‚¯‚é
             if (dgvMaster.RowCount == 0) return;
-            if (CommonMotions.chkCellBlank(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionName].Value)) return;
 
+            DataGridViewEX dgv = dgvMaster;
+            DataGridViewRow CurRow = dgv.CurrentRow;
+            int nPoint = (int)DispColumn.ConstructionName;
+            // �HŽ––¼�Ì‚ª–³‚¯‚ê‚Î”²‚¯‚é
+            if (CommonMotions.chkCellBlank(CurRow.Cells[nPoint].Value)) return;
+
             // Še�ˆ—�‹N“®
-            int ConstrCode = CommonMotions.cnvIntFromStringCode(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-");
-            int OrderNo = CommonMotions.cnvInt(dgvMaster.CurrentRow.Cells[(int)DispColumn.OrderNo].Value);
-            SubProcessExecute(ConstrCode, OrderNo);
+            SubProcessExecute();
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 483)
@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmConstructionList));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -49,6 +50,7 @@
             this.btnDataCopy = new System.Windows.Forms.Button();
             this.ProgressBar = new System.Windows.Forms.ProgressBar();
             this.btnHelp = new System.Windows.Forms.Button();
+            this.btnStageUp = new System.Windows.Forms.Button();
             this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.lblEstimateType03 = new System.Windows.Forms.Label();
             this.lblEstimateType02 = new System.Windows.Forms.Label();
@@ -86,10 +88,11 @@
             // 
             this.btnDataEntry.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
             this.btnDataEntry.BackColor = System.Drawing.Color.PaleGreen;
+            this.btnDataEntry.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataEntry.ForeColor = System.Drawing.Color.Black;
-            this.btnDataEntry.Location = new System.Drawing.Point(440, 619);
+            this.btnDataEntry.Location = new System.Drawing.Point(460, 619);
             this.btnDataEntry.Name = "btnDataEntry";
-            this.btnDataEntry.Size = new System.Drawing.Size(400, 30);
+            this.btnDataEntry.Size = new System.Drawing.Size(360, 30);
             this.btnDataEntry.TabIndex = 7;
             this.btnDataEntry.Text = "æ–°è¦�å·¥äº‹ã‚’ç™»éŒ²";
             this.btnDataEntry.UseVisualStyleBackColor = false;
@@ -150,11 +153,11 @@
             // 
             this.btnDataCopy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnDataCopy.BackColor = System.Drawing.Color.DarkOrange;
-            this.btnDataCopy.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDataCopy.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataCopy.ForeColor = System.Drawing.Color.Black;
-            this.btnDataCopy.Location = new System.Drawing.Point(865, 619);
+            this.btnDataCopy.Location = new System.Drawing.Point(860, 619);
             this.btnDataCopy.Name = "btnDataCopy";
-            this.btnDataCopy.Size = new System.Drawing.Size(260, 30);
+            this.btnDataCopy.Size = new System.Drawing.Size(250, 30);
             this.btnDataCopy.TabIndex = 30;
             this.btnDataCopy.Text = "æ—¢å­˜å·¥äº‹ã�‹ã‚‰ã‚³ãƒ”ãƒ¼ç™»éŒ²";
             this.btnDataCopy.UseVisualStyleBackColor = false;
@@ -184,6 +187,23 @@
             this.btnHelp.UseVisualStyleBackColor = false;
             this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
             // 
+            // btnStageUp
+            // 
+            this.btnStageUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnStageUp.BackColor = System.Drawing.Color.White;
+            this.btnStageUp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnStageUp.ForeColor = System.Drawing.Color.Black;
+            this.btnStageUp.Image = ((System.Drawing.Image)(resources.GetObject("btnStageUp.Image")));
+            this.btnStageUp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnStageUp.Location = new System.Drawing.Point(10, 618);
+            this.btnStageUp.Name = "btnStageUp";
+            this.btnStageUp.Size = new System.Drawing.Size(120, 32);
+            this.btnStageUp.TabIndex = 130;
+            this.btnStageUp.Text = "ã€€ä¸Šã�«æˆ»ã‚‹";
+            this.btnStageUp.UseVisualStyleBackColor = false;
+            this.btnStageUp.Visible = false;
+            this.btnStageUp.Click += new System.EventHandler(this.btnStageUp_Click);
+            // 
             // grpExample1
             // 
             this.grpExample1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -194,9 +214,9 @@
             this.grpExample1.Controls.Add(this.lblEstimateType01);
             this.grpExample1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             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.Location = new System.Drawing.Point(145, 616);
             this.grpExample1.Name = "grpExample1";
-            this.grpExample1.Size = new System.Drawing.Size(330, 38);
+            this.grpExample1.Size = new System.Drawing.Size(300, 38);
             this.grpExample1.TabIndex = 33;
             this.grpExample1.TabStop = false;
             this.grpExample1.Text = "æ–½å·¥çŠ¶æ…‹å¤‰æ›´ã‚ˆã‚Š1ã‚«æœˆçµŒé�Ž";
@@ -206,11 +226,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.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(224, 14);
+            this.lblEstimateType03.Location = new System.Drawing.Point(204, 14);
             this.lblEstimateType03.Name = "lblEstimateType03";
-            this.lblEstimateType03.Size = new System.Drawing.Size(100, 20);
+            this.lblEstimateType03.Size = new System.Drawing.Size(90, 20);
             this.lblEstimateType03.TabIndex = 0;
             this.lblEstimateType03.Text = "äºˆç®—å�–ã‚Šæ¡ˆä»¶";
             this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -219,10 +239,11 @@
             // 
             this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange;
             this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEstimateType02.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblEstimateType02.ForeColor = System.Drawing.Color.Black;
-            this.lblEstimateType02.Location = new System.Drawing.Point(116, 14);
+            this.lblEstimateType02.Location = new System.Drawing.Point(106, 14);
             this.lblEstimateType02.Name = "lblEstimateType02";
-            this.lblEstimateType02.Size = new System.Drawing.Size(100, 20);
+            this.lblEstimateType02.Size = new System.Drawing.Size(90, 20);
             this.lblEstimateType02.TabIndex = 0;
             this.lblEstimateType02.Text = "å…¥æœ­æ¡ˆä»¶";
             this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -231,10 +252,11 @@
             // 
             this.lblEstimateType01.BackColor = System.Drawing.Color.OrangeRed;
             this.lblEstimateType01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEstimateType01.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             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(100, 20);
+            this.lblEstimateType01.Size = new System.Drawing.Size(90, 20);
             this.lblEstimateType01.TabIndex = 0;
             this.lblEstimateType01.Text = "å·¥äº‹æ¡ˆä»¶";
             this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -444,6 +466,7 @@
             this.dgvMaster.TabIndex = 5;
             this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
             this.dgvMaster.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvMaster_ColumnHeaderMouseClick);
+            this.dgvMaster.Sorted += new System.EventHandler(this.dgvMaster_Sorted);
             // 
             // Column1
             // 
@@ -570,6 +593,7 @@
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1280, 657);
+            this.Controls.Add(this.btnStageUp);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.grpExample1);
             this.Controls.Add(this.btnDataCopy);
@@ -639,5 +663,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.Button btnStageUp;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.resx	(revision 483)
@@ -117,6 +117,18 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnStageUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVDhP7ZI9
+        zkRQFIY1EpVeIxKFDahZgEql19uAfUgswRLEClQqvcRPIiQKUWnu5J45904MZsg35fckrzjHe5+QEMiP
+        +Rf+nZ0wyzKiqipO99kIx3EkgiBA0jTF7T02QiZj6fsen1yHC3Vd3wlp7gInbNs+lNGIogjFM+q6hl4Q
+        BDCDcBgGGCiSJEFhmiaY53kmy7LA/RFRFEHfcRyYd99kWRYUkiTBzWfom9F+GIYw74RxHENBlmXcfIZ2
+        adq2fc5wfYOVXNfFzTGGYUBP0zTcnAjLsuRS0zRx+6JpGqIoCu+s64pPToSUoij4ARYqf991XYcnnpwK
+        GZ7n7SQ0vu9jY8tXIaOqKpLnOf+dzrgsvMqPhYQ8AEeNfa7rogIhAAAAAElFTkSuQmCC
+</value>
+  </data>
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 483)
@@ -32,6 +32,27 @@
     partial class FrmConstructionList
     {
         #region ’è�”
+
+        #region •\Ž¦ƒJƒ‰ƒ€
+        /// <summary>
+        /// •\Ž¦ƒJƒ‰ƒ€
+        /// </summary>
+        private enum DispColumn
+        {
+            No = 0,
+            SalesDepartment,
+            SalesPerson,
+            ConstructionDepartment,
+            ConstructionPerson,
+            ConstructionName,
+            Status,
+            OtherStatus,
+            ConstructionPeriod,
+            ConstructionCode,
+            OrderNo,
+        }
+        #endregion
+
         #region Žæ“¾SQL
         /// <summary>
         /// Žæ“¾SQLŒÅ’è•”
@@ -183,9 +204,6 @@
                 // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
                 InitCombBox();
 
-                // •\Ž¦ƒXƒ^ƒCƒ‹‚Ì•Ï�X
-                //InitDisplayStyle();
-
                 // ƒ�ƒOƒCƒ“ŽÒ‚ÌƒZƒbƒg
                 InitDepPersonCode();
 
@@ -226,11 +244,12 @@
         /// �HŽ–ˆê——‚æ‚è‹N“®‚·‚éƒvƒ�ƒZƒX‘I‘ð�ˆ—�
         /// </summary>
         /// <param name="para_ConstructionCode"></param>
-        private void SubProcessExecute(int para_ConstructionCode = 0, int para_OrderNo = 0, bool bNewDataFlg = false)
+        private void SubProcessExecute(bool bNewDataFlg = false)
         {
             try
             {
                 DataGridViewEX dgv = dgvMaster;
+                DataGridViewRow CurRow = dgv.CurrentRow;
 
                 int NowPoint = ClsExcute.GetNowProcessPoint();
                 // Œ»�Ý�Ý’è’lƒNƒŠƒA
@@ -250,7 +269,7 @@
                 ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(dgv.FirstDisplayedScrollingRowIndex);
 
                 // Œ»�Ý“ª�s
-                ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(dgv.CurrentRow.Index);
+                ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(CurRow.Index);
 
                 // ƒ\�[ƒg�ó‘Ô
                 if (dgv.SortedColumn != null)
@@ -262,26 +281,36 @@
                 // ----- ‹N“®ƒpƒ‰ƒ��[ƒ^ƒZƒbƒg
                 // ŽŸ‹N“®ƒvƒ�ƒZƒXƒZƒbƒg
                 NowPoint = ClsExcute.NextProcess(m_ExecuteFlg);
+
+                // �V‹Kƒf�[ƒ^�ì�¬Žž‚Íƒtƒ‰ƒO‚ð—§‚Ä‚é
+                if (bNewDataFlg)
+                {
+                    // ˆê‚Â–Ú‚Ìƒtƒ‰ƒO‚ÍƒRƒs�[ƒf�[ƒ^�ì�¬‚ÉŽg—p‚µ‚Ä‚¢‚é‚½‚ßƒ_ƒ~�[‚ð—§‚Ä‚é
+                    ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
+                    // “ñ‚Â–Ú‚É�V‹Kƒf�[ƒ^�ì�¬ƒtƒ‰ƒO‚ðƒZƒbƒg‚·‚é
+                    ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(bNewDataFlg);
+                    // �HŽ–”Ô�†‚Ìƒ_ƒ~�[‚ðƒZƒbƒg‚·‚é
+                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0);
+
+                    return;
+                }
+
+                // ‘I‘ð�sƒf�[ƒ^Žæ“¾
+                int ConstrCode = CommonMotions.cnvIntFromStringCode(CurRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-");
+                int OrderNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.OrderNo].Value);
+
                 // ‘I‘ð�HŽ–”Ô�†ƒZƒbƒg
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_ConstructionCode);
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(ConstrCode);
                 // ’�•¶�‘ˆó�ü‚ÍŽó•t”Ô�†‚ðƒZƒbƒg‚·‚é
                 switch (m_ExecuteFlg)
                 {
                     case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:
-                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_OrderNo);
+                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(OrderNo);
                         break;
 
                     default:
                         break;
                 }
-                // �V‹Kƒf�[ƒ^�ì�¬Žž‚Íƒtƒ‰ƒO‚ð—§‚Ä‚é
-                if (bNewDataFlg)
-                {
-                    // ˆê‚Â–Ú‚Ìƒtƒ‰ƒO‚ÍƒRƒs�[ƒf�[ƒ^�ì�¬‚ÉŽg—p‚µ‚Ä‚¢‚é‚½‚ßƒ_ƒ~�[‚ð—§‚Ä‚é
-                    ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
-                    // “ñ‚Â–Ú‚É�V‹Kƒf�[ƒ^�ì�¬ƒtƒ‰ƒO‚ðƒZƒbƒg‚·‚é
-                    ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(bNewDataFlg);
-                }
             }
             catch (Exception ex)
             {
@@ -897,8 +926,6 @@
                 wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                 wrkFormat.Append(s_SQLPart3_2[4]);
 
-                wrkFormat.Append(", constructionbudget E");
-
                 if (CommonMotions.BasePeriodYear()) { for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]); }
                 else { for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5_1[i]); }
 
@@ -1321,8 +1348,10 @@
 
                 strSQL.AppendFormat(" WHERE A1.CONSTRUCTIONCODE = {0}", ParentCode);
                 strSQL.AppendFormat("  And A1.SOURCECODE = {0}", SourceCode);
-                strSQL.AppendFormat("  AND A1.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat("  AND A1.GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.Append("        AND A1.COMPANYCODE > 0");
+                strSQL.Append("        And A1.ExecutionAmount > -1");
+                strSQL.AppendFormat("  And A1.InvalidLine = {0}", (int)ConstructionLedgerDetail.InvalidLineDef.ValidData);
                 strSQL.AppendFormat("  And (A1.PurchaseOrderFlg > {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld);
                 strSQL.AppendFormat("  And A1.PurchaseOrderFlg <> {0})", (int)ConstructionLedgerDetail.PurOrderFlgDef.NotMakingData);
 
@@ -1436,38 +1465,31 @@
                 int ino = 1;
                 int StatusFlg = -1;
                 bool initFlg = true;
-                string FlgString = string.Empty;
-                string strSalesDepName = string.Empty;
-                string strSalesName = string.Empty;
-                string strConstDepName = string.Empty;
-                string strConstName = string.Empty;
                 string strStatus = string.Empty;
-                string strConstrName = string.Empty;
-                int ConstrCode = 0;
-                int OrderNo = 0;
                 foreach (object[] objwrk in arData)
                 {
-                    FlgString = string.Empty;
-                    ConstrCode = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONCODE]);
-                    strConstrName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME]);
-                    OrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]);
+                    string FlgString = string.Empty;
+                    int ConstrCode = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONCODE]);
+                    string strConstrName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME]);
+                    int OrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]);
 
                     // ----- ‹N“®�ˆ—�–ˆ‚Ì“®�ì
                     SetPlusStatus(OrderDB, objwrk, ref FlgString, ref strConstrName);
 
                     // ƒXƒe�[ƒ^ƒXƒtƒ‰ƒO‚ªˆá‚¦‚Î1�sŠJ‚¯‚é
-                    if (StatusFlg != CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONSTATUSFLG]))
+                    int nWorkFlg = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONSTATUSFLG]);
+                    if (StatusFlg != nWorkFlg)
                     {
-                        StatusFlg = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONSTATUSFLG]);
+                        StatusFlg = nWorkFlg;
                         strStatus = CommonDefine.ProjectsStatus[StatusFlg];
                         if (!initFlg) dgv.Rows.Add(1);
                         initFlg = false;
                     }
 
-                    strSalesDepName = CommonMotions.cnvString(objwrk[(int)GetData.SALESDEPNAME]);
-                    strSalesName = CommonMotions.cnvString(objwrk[(int)GetData.SALESNAME]);
-                    strConstDepName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTDEPNAME]);
-                    strConstName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTNAME]);
+                    string strSalesDepName = CommonMotions.cnvString(objwrk[(int)GetData.SALESDEPNAME]);
+                    string strSalesName = CommonMotions.cnvString(objwrk[(int)GetData.SALESNAME]);
+                    string strConstDepName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTDEPNAME]);
+                    string strConstName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTNAME]);
 
                     int nYear = 0;
                     if (CommonMotions.BasePeriodYear())
@@ -1475,21 +1497,23 @@
                     else
                         nYear = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONYEAR]);
 
-                    int RowCnt = dgv.Rows.Add((ino++)
-                                                    , strSalesDepName
-                                                    , strSalesName
-                                                    , strConstDepName
-                                                    , strConstName
-                                                    , strConstrName
-                                                    , strStatus
-                                                    , FlgString
-                                                    , nYear
-                                                    , CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8)
-                                                    , OrderNo
-                                                    );
+                    int RowCnt = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[RowCnt];
 
+                    CurRow.Cells[(int)DispColumn.No].Value = (ino++);
+                    CurRow.Cells[(int)DispColumn.SalesDepartment].Value = strSalesDepName;
+                    CurRow.Cells[(int)DispColumn.SalesPerson].Value = strSalesName;
+                    CurRow.Cells[(int)DispColumn.ConstructionDepartment].Value = strConstDepName;
+                    CurRow.Cells[(int)DispColumn.ConstructionPerson].Value = strConstName;
+                    CurRow.Cells[(int)DispColumn.ConstructionName].Value = strConstrName;
+                    CurRow.Cells[(int)DispColumn.Status].Value = strStatus;
+                    CurRow.Cells[(int)DispColumn.OtherStatus].Value = FlgString;
+                    CurRow.Cells[(int)DispColumn.ConstructionPeriod].Value = nYear;
+                    CurRow.Cells[(int)DispColumn.ConstructionCode].Value = CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8);
+                    CurRow.Cells[(int)DispColumn.OrderNo].Value = OrderNo;
+
                     // ƒZƒ‹�F‚ð•Ï‚¦‚é
-                    CellColorChenge(dgv.Rows[RowCnt], objwrk);
+                    CellColorChenge(CurRow, objwrk);
 
                     // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                     ProgressBar.Value = (ino - 1);
@@ -1783,6 +1807,7 @@
                 btnEnd.Visible = !bDisp;
                 btnDataCopy.Visible = !bDisp;
                 btnDataUpDate.Visible = !bDisp;
+                btnStageUp.Visible = !bDisp;
 
                 numUDConstPro.Enabled = !bDisp;
                 cmbDepartment.Enabled = !bDisp;
@@ -1792,6 +1817,18 @@
 
                 if (m_DataAddtionButton) btnDataEntry.Visible = !bDisp;
 
+                // ‘S‘Î�Û•\Ž¦Žž‚Í�ã‚É�ã‚ª‚éƒ{ƒ^ƒ“‚ð•\Ž¦‚µ‚È‚¢
+                if (!bDisp && GetDepartmentCode() > 0)
+                    btnStageUp.Visible = true;
+                else
+                    btnStageUp.Visible = false;
+
+                // �HŽ–�î•ñˆÈŠO‚ÍƒRƒs�[ƒ{ƒ^ƒ“‚ð•\Ž¦‚µ‚È‚¢
+                if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo)
+                    btnDataCopy.Visible = true;
+                else
+                    btnDataCopy.Visible = false;
+
                 this.Update();
             }
             catch (Exception ex)
@@ -1840,6 +1877,15 @@
                     foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
                         wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
                 }
+
+                // ----- ƒAƒbƒvƒ{ƒ^ƒ“•\Ž¦�§Œä
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+                if (DepartmentCode == 0)
+                    btnStageUp.Visible = false;
+                else
+                    btnStageUp.Visible = true;
+
                 dgvMaster.Focus();
             }
             catch (Exception ex)
@@ -2541,5 +2587,63 @@
         }
         #endregion
 
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+        /// <summary>
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+        /// </summary>
+        private void StageUpProcess()
+        {
+            try
+            {
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+                // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int PersonCode = GetConstructionPersonCode();
+
+                if (DepartmentCode == 0 && PersonCode == 0) return;
+
+                if (DepartmentCode > 0 && PersonCode > 0)
+                {
+                    cmbConstructionPerson.SelectedValue = 0;
+                    return;
+                }
+
+                if (DepartmentCode > 0 && PersonCode == 0)
+                {
+                    cmbDepartment.SelectedValue = 0;
+                    return;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ƒOƒŠƒbƒh‚Ì”Ô�†‚ð�U‚è‚È‚¨‚·
+        /// <summary>
+        /// ƒOƒŠƒbƒh‚Ì”Ô�†‚ð�U‚è‚È‚¨‚·
+        /// </summary>
+        private void ReNumberGrid(DataGridView dgv)
+        {
+            try
+            {
+                long lNo = 1;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    int nDispNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.No].Value);
+                    if (nDispNo < 1) continue;
+
+                    CurRow.Cells[(int)DispColumn.No].Value = lNo++;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs	(revision 483)
@@ -577,7 +577,7 @@
                 else
                 {
                     if (!BudgetDetailDataSet(frm, BudgetDDB, TotalOrdersPrice,
-                                                        (int)FrmConstructionBudget.DataGroup.PayrollExpenses,
+                                                        (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses,
                                                         objRec, BudgetRec,
                                                         TargetParson1, StartDate, EndDate,
                                                         TyingDataFlag)) return false;
@@ -592,7 +592,7 @@
                 else
                 {
                     if (!BudgetDetailDataSet(frm, BudgetDDB, TotalOrdersPrice,
-                                                        (int)FrmConstructionBudget.DataGroup.AssistantCosts,
+                                                        (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts,
                                                         objRec, BudgetRec,
                                                         TargetParson2, StartDate, EndDate,
                                                         TyingDataFlag)) return false;
@@ -607,7 +607,7 @@
                 else
                 {
                     if (!BudgetDetailDataSet(frm, BudgetDDB, TotalOrdersPrice,
-                                                        (int)FrmConstructionBudget.DataGroup.InstructorCosts,
+                                                        (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts,
                                                         objRec, BudgetRec,
                                                         TargetParson3, StartDate, EndDate,
                                                         TyingDataFlag)) return false;
@@ -830,7 +830,7 @@
             {
                 // ‚Ü‚¸�í�œ
                 StringBuilder strDelete = new StringBuilder();
-                strDelete.Append(BudgetDDB.CreatePrimarykeyString(m_ConstructionCode, (int)FrmConstructionBudget.DataGroup.Expenses));
+                strDelete.Append(BudgetDDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBudgetDetail.GroupCountDef.Expenses));
                 BudgetDDB.DeleteAction(strDelete.ToString(), false);
 
                 int icnt = 1;
@@ -843,7 +843,7 @@
                     // �HŽ–”Ô�†
                     work.ConstructionCode = m_ConstructionCode;
                     // ƒOƒ‹�[ƒv”Ô�†
-                    work.GroupCount = (int)FrmConstructionBudget.DataGroup.Expenses;
+                    work.GroupCount = (int)ConstructionBudgetDetail.GroupCountDef.Expenses;
                     // �s”Ô�†
                     work.LineCount = ++icnt;
                     // Œo”ï–¼�ÌƒR�[ƒh
@@ -916,7 +916,7 @@
                 switch (GroupCode)
                 {
                     // �HŽ–’S“–ŽÒ
-                    case (int)FrmConstructionBudget.DataGroup.PayrollExpenses:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses:
                         //ConstructorCode = BudgetRec.CreatorCode;
                         ConstructorCode = CommonMotions.cnvInt(objRec[(int)ReadParentOrder.ConstrPersonCode]);
                         MonthryCost = CommonMotions.cnvDouble(objRec[(int)ReadParentOrder.ConstrPersonSalary]);
@@ -924,7 +924,7 @@
                         break;
 
                     // �HŽ–•›’S“–ŽÒ
-                    case (int)FrmConstructionBudget.DataGroup.AssistantCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts:
                         //ConstructorCode = BudgetRec.AssistantCode;
                         ConstructorCode = CommonMotions.cnvInt(objRec[(int)ReadParentOrder.AssistPersonCode]);
                         MonthryCost = CommonDefine.AssistantMonthryCost;
@@ -933,7 +933,7 @@
                         break;
 
                     // �HŽ–Žw“±ˆõ
-                    case (int)FrmConstructionBudget.DataGroup.InstructorCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts:
                         //ConstructorCode = BudgetRec.InstructorCode;
                         ConstructorCode = CommonMotions.cnvInt(objRec[(int)ReadParentOrder.InstrPersonCode]);
                         MonthryCost = CommonDefine.InstructorMonthryCost;
@@ -980,7 +980,7 @@
                 }
 
                 // ’S“–ŽÒ‚Ì�ê�‡‚Ì‚Ý
-                if (GroupCode == (int)FrmConstructionBudget.DataGroup.PayrollExpenses)
+                if (GroupCode == (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses)
                 {
                     ArrayList ExpensesList = new ArrayList();
                     ExpensesList.Add(new object[] { CommonMotions.cnvString(objRec[(int)ReadParentOrder.ExpensesName1]),
@@ -1019,7 +1019,6 @@
                                         bool TyingDataFlag,
                                         ArrayList ParentData,
                                         int ProcConstrCode,
-                                        FrmConstructionLedger frm,
                                         ref int ConstrCode)
         {
             try
@@ -1042,20 +1041,20 @@
                 // ----- �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�ˆ—�
                 // �HŽ–’S“–ŽÒ
                 bool bChgParson1 = false;
-                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, frm, TotalOrdersPrice,
-                                                    (int)FrmConstructionLedger.DataGroup.Payroll,
+                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, TotalOrdersPrice,
+                                                    (int)ConstructionLedgerDetail.GroupCountDef.Payroll,
                                                     objRec, LedgerRec, ref bChgParson1)) return false;
 
                 // �HŽ–•›’S“–ŽÒ
                 bool bChgParson2 = false;
-                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, frm, TotalOrdersPrice,
-                                                    (int)FrmConstructionLedger.DataGroup.Assistant,
+                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, TotalOrdersPrice,
+                                                    (int)ConstructionLedgerDetail.GroupCountDef.Assistant,
                                                     objRec, LedgerRec, ref bChgParson2)) return false;
 
                 // �HŽ–Žw“±ˆõ
                 bool bChgParson3 = false;
-                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, frm, TotalOrdersPrice,
-                                                    (int)FrmConstructionLedger.DataGroup.Instructor,
+                if (!LedgerDetailDataSalarySet(LedgerDDB, LedgerEDB, ProcConstrCode, TotalOrdersPrice,
+                                                    (int)ConstructionLedgerDetail.GroupCountDef.Instructor,
                                                     objRec, LedgerRec, ref bChgParson3)) return false;
 
                 // ----- �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�ˆ—�
@@ -1087,6 +1086,14 @@
                                             false)) return false;
                 }
 
+                // ’S“–ŽÒ‚Ì�X�V‚ª‚ ‚ê‚Î�ÄŒvŽZ‚ð�s‚¤
+                if (bChgParson1 || bChgParson2 || bChgParson3)
+                {
+                    List<int> CodeList = new List<int>();
+                    CodeList.Add(ProcConstrCode);
+
+                    if (!ClsChangeLedgerData.LedgerRecalculate(LedgerEDB, CodeList)) return false;
+                }
                 return true;
             }
             catch (Exception ex)
@@ -1128,7 +1135,7 @@
         /// <returns></returns>
         private bool LedgerDetailDataSalarySet(IOConstructionLedgerDetail LedgerDDB
                                                     , IOConstructionLedgerExcute LedgerEDB
-                                                    , int ProcConstrCode, FrmConstructionLedger frm
+                                                    , int ProcConstrCode
                                                     , int TotalOrdersPrice, int GroupCode
                                                     , object[] objRec, ConstructionLedger LedgerRec, ref bool bChangeCode)
         {
@@ -1163,13 +1170,13 @@
                 switch (GroupCode)
                 {
                     // �HŽ–’S“–ŽÒ
-                    case (int)FrmConstructionLedger.DataGroup.Payroll:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                         ConstructorCode = TargetParson1;
                         DepartmentCode = TargetDepment1;
                         MonthryCost = CommonMotions.cnvDouble(objRec[(int)ReadParentOrder.ConstrPersonSalary]);
                         break;
                     // �HŽ–•›’S“–ŽÒ
-                    case (int)FrmConstructionLedger.DataGroup.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                         ConstructorCode = TargetParson2;
                         DepartmentCode = TargetDepment2;
                         MonthryCost = CommonDefine.AssistantMonthryCost;
@@ -1176,7 +1183,7 @@
                         break;
 
                     // �HŽ–Žw“±ˆõ
-                    case (int)FrmConstructionLedger.DataGroup.Instructor:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                         ConstructorCode = TargetParson3;
                         DepartmentCode = TargetDepment3;
                         MonthryCost = CommonDefine.InstructorMonthryCost;
@@ -1233,8 +1240,7 @@
                 NewDetailRec.GroupCount = GroupCode;                                                // ƒOƒ‹�[ƒv”Ô�†
                 NewDetailRec.LineCount = 9990;                                                      // �s”Ô�†
                 
-                frm.GetTitileParametar = GroupCode;
-                NewDetailRec.FirstString = frm.GetTitleString;                                      // �€–Ú–¼�Ì
+                NewDetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupCode];        // �€–Ú–¼�Ì
 
                 NewDetailRec.SecondString = string.Empty;                                           // �HŽ–“à—e
                 NewDetailRec.ComponentCode = DepartmentCode;                                        // ’S“–ŽÒ•”��ƒR�[ƒh
@@ -1258,7 +1264,7 @@
                 if (NewDetailRec.SalaryFlg == (int)CommonDefine.SalaryDevision.DaysInput)
                 {
                     // �HŽ–’S“–ŽÒ‚Ì‚Ýƒf�[ƒ^�ì�¬
-                    if (GroupCode == (int)FrmConstructionLedger.DataGroup.Payroll)
+                    if (GroupCode == (int)ConstructionLedgerDetail.GroupCountDef.Payroll)
                     {
                         ConstructionLedgerExcute ExecRec = new ConstructionLedgerExcute();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.Designer.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.Designer.cs	(revision 483)
@@ -0,0 +1,229 @@
+ï»¿namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmConstrProgDiag
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            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.btnEnd = new System.Windows.Forms.Button();
+            this.btnSelect = new System.Windows.Forms.Button();
+            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.chkBoxAll = new System.Windows.Forms.CheckBox();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnEnd
+            // 
+            this.btnEnd.BackColor = System.Drawing.Color.Blue;
+            this.btnEnd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnEnd.ForeColor = System.Drawing.Color.White;
+            this.btnEnd.Location = new System.Drawing.Point(772, 214);
+            this.btnEnd.Name = "btnEnd";
+            this.btnEnd.Size = new System.Drawing.Size(120, 30);
+            this.btnEnd.TabIndex = 3;
+            this.btnEnd.Text = "çµ‚ã€€äº†";
+            this.btnEnd.UseVisualStyleBackColor = false;
+            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.BackColor = System.Drawing.Color.Green;
+            this.btnSelect.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnSelect.ForeColor = System.Drawing.Color.White;
+            this.btnSelect.Location = new System.Drawing.Point(644, 214);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(120, 30);
+            this.btnSelect.TabIndex = 2;
+            this.btnSelect.Text = "é�¸ã€€æŠž";
+            this.btnSelect.UseVisualStyleBackColor = false;
+            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+            // 
+            // dgvMaster
+            // 
+            this.dgvMaster.AllowUserToAddRows = false;
+            this.dgvMaster.AllowUserToDeleteRows = false;
+            this.dgvMaster.AllowUserToResizeColumns = false;
+            this.dgvMaster.AllowUserToResizeRows = false;
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            this.dgvMaster.ColumnHeadersHeight = 24;
+            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column1,
+            this.Column5,
+            this.Column3,
+            this.Column2});
+            this.dgvMaster.EnableHeadersVisualStyles = false;
+            this.dgvMaster.Location = new System.Drawing.Point(12, 60);
+            this.dgvMaster.Name = "dgvMaster";
+            this.dgvMaster.RowHeadersVisible = false;
+            this.dgvMaster.RowHeadersWidth = 20;
+            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvMaster.RowTemplate.Height = 24;
+            this.dgvMaster.Size = new System.Drawing.Size(880, 146);
+            this.dgvMaster.TabIndex = 0;
+            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.LemonChiffon;
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Location = new System.Drawing.Point(12, 6);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(880, 50);
+            this.panel1.TabIndex = 5;
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.Black;
+            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.label1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label1.ForeColor = System.Drawing.Color.White;
+            this.label1.Location = new System.Drawing.Point(40, 6);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(800, 36);
+            this.label1.TabIndex = 5;
+            this.label1.Text = "é–¢é€£å·¥äº‹ã�®ä¸­ã�§å·¥äº‹é€²æ�—çŠ¶æ…‹ã‚’å�Œã�˜ã�«ã�™ã‚‹å·¥äº‹ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // chkBoxAll
+            // 
+            this.chkBoxAll.AutoSize = true;
+            this.chkBoxAll.Location = new System.Drawing.Point(847, 66);
+            this.chkBoxAll.Name = "chkBoxAll";
+            this.chkBoxAll.Size = new System.Drawing.Size(15, 14);
+            this.chkBoxAll.TabIndex = 8;
+            this.chkBoxAll.UseVisualStyleBackColor = true;
+            this.chkBoxAll.CheckedChanged += new System.EventHandler(this.chkBoxAll_CheckedChanged);
+            // 
+            // Column1
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "â„–";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 60;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column5.Frozen = true;
+            this.Column5.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Visible = false;
+            this.Column5.Width = 120;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "å¢—ã€€æ¸›ã€€å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 760;
+            // 
+            // Column2
+            // 
+            this.Column2.HeaderText = "";
+            this.Column2.Name = "Column2";
+            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Column2.Width = 40;
+            // 
+            // FrmConstrProgDiag
+            // 
+            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(904, 251);
+            this.Controls.Add(this.chkBoxAll);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.dgvMaster);
+            this.Controls.Add(this.btnSelect);
+            this.Controls.Add(this.btnEnd);
+            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.KeyPreview = true;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrmConstrProgDiag";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "å·¥äº‹æ¡ˆä»¶é€²æ�—å�ŒæœŸé�¸æŠž";
+            this.Load += new System.EventHandler(this.FrmCostStructureDiag_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
+            this.panel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnEnd;
+        private System.Windows.Forms.Button btnSelect;
+        private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvMaster;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
+        private System.Windows.Forms.CheckBox chkBoxAll;
+    }
+}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.cs	(revision 483)
@@ -0,0 +1,388 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.Forms.ControlsAction;
+using System.Collections;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    public partial class FrmConstrProgDiag : Form
+    {
+        #region ãƒ­ã‚°ä½¿ç”¨å®šç¾©
+        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// è¡¨ç¤ºã‚«ãƒ©ãƒ 
+        /// </summary>
+        private enum GridColumn
+        {
+            DisplayOrder = 0,
+            ConstructionCode,
+            ConstructionName,
+            Check,
+        }
+
+        /// <summary>
+        /// æ‹…å½“è€…æ¤œç´¢ä½�ç½®
+        /// </summary>
+        public enum PersonChargePoint
+        {
+            /// <summary>
+            /// å–¶æ¥­æ‹…å½“
+            /// </summary>
+            Sales = 0,
+            /// <summary>
+            /// å·¥äº‹æ‹…å½“è€…
+            /// </summary>
+            Construction,
+        }
+        #endregion
+
+        #region å¤‰æ•°
+
+        #region å·¥äº‹ç•ªå�·
+        /// <summary>
+        /// å·¥äº‹ç•ªå�·
+        /// </summary>
+        private int m_ConstructionCode = 0;
+        #endregion
+
+        #region å¯¾è±¡ãƒªã‚¹ãƒˆ
+        /// <summary>
+        /// å¯¾è±¡ãƒªã‚¹ãƒˆ
+        /// </summary>
+        private List<int> m_TergetList = new List<int>();
+        #endregion
+        
+        #endregion
+        
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å·¥äº‹ç•ªå�·
+        /// </summary>
+        public int ConstructionCode
+        {
+            get { return m_ConstructionCode; }
+            set { m_ConstructionCode = value; }
+        }
+
+        /// <summary>
+        /// å¯¾è±¡ãƒªã‚¹ãƒˆ
+        /// </summary>
+        public List<int> TergetList
+        {
+            get { return m_TergetList; }
+            set { m_TergetList = value; }
+        }
+        #endregion
+
+        #region ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
+        /// </summary>
+        public FrmConstrProgDiag()
+        {
+            InitializeComponent();
+        }
+        #endregion
+
+        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmCostStructureDiag_Load(object sender, EventArgs e)
+        {
+            // ãƒ•ã‚©ãƒ¼ãƒ ã‚µã‚¤ã‚ºå›ºå®š
+            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
+
+            // åˆ�æœŸè¡¨ç¤º
+            InitDataLoad();
+        }
+        #endregion
+
+        #region çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// <summary>
+        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnEnd_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+        #endregion
+
+        #region é�¸æŠžãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// <summary>
+        /// é�¸æŠžãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSelect_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                DataGridViewEX dgv = dgvMaster;
+
+                m_TergetList.Clear();
+
+                // é�¸æŠž
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    // ç©ºæ¬„ãƒ�ã‚§ãƒƒã‚¯
+                    if (!BlanckRowCheck(CurRow)) continue;
+
+                    if (!CommonMotions.cnvBool(CurRow.Cells[(int)GridColumn.Check].Value)) continue;
+
+                    m_TergetList.Add(CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ConstructionCode].Value));
+                }
+
+                // é�¸æŠžç„¡ã�—ã�¯å‡¦ç�†ã�—ã�ªã�„ã€‚
+                if (m_TergetList.Count < 1)
+                {
+                    MessageBox.Show("é�¸æŠžã�•ã‚Œã�Ÿãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+
+                DialogResult = DialogResult.OK;
+
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ã‚»ãƒ«ã�®ãƒ€ãƒ–ãƒ«ã‚¯ãƒªãƒƒã‚¯æ™‚
+        /// <summary>
+        /// ã‚»ãƒ«ã�®ãƒ€ãƒ–ãƒ«ã‚¯ãƒªãƒƒã‚¯æ™‚
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvMaster_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            try
+            {
+                DataGridViewEX dgv = dgvMaster;
+                DataGridViewRow CurRow = dgv.CurrentRow;
+
+                // ç©ºç™½ãƒ�ã‚§ãƒƒã‚¯
+                if (!BlanckRowCheck(CurRow)) return;
+                // ã‚°ãƒªãƒƒãƒ‰ã‚¯ãƒªãƒƒã‚¯ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (e.RowIndex < 0) return;
+
+                CurRow.Cells[(int)GridColumn.Check].Value = true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ä¸€æ‹¬ãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// ä¸€æ‹¬ãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void chkBoxAll_CheckedChanged(object sender, EventArgs e)
+        {
+            // ã�™ã�¹ã�¦ã�®è¡Œã�®ãƒ�ã‚§ãƒƒã‚¯çŠ¶æ…‹ã‚’åˆ‡ã‚Šæ›¿ã�ˆã‚‹
+            foreach (DataGridViewRow row in this.dgvMaster.Rows)
+            {
+                // ç©ºæ¬„ãƒ�ã‚§ãƒƒã‚¯
+                if (!BlanckRowCheck(row)) continue;
+
+                row.Cells[(int)GridColumn.Check].Value = chkBoxAll.Checked;
+            }
+        }
+        #endregion
+
+        #region åˆ�æœŸè¡¨ç¤ºå‡¦ç�†
+        /// <summary>
+        /// åˆ�æœŸè¡¨ç¤ºå‡¦ç�†
+        /// </summary>
+        private void InitDataLoad()
+        {
+            try
+            {
+                // ä¸€è¦§è¡¨ç¤º
+                DisplayConstruction();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å‡¦ç�†ãƒªã‚¹ãƒˆ
+        /// <summary>
+        /// å‡¦ç�†ãƒªã‚¹ãƒˆ
+        /// </summary>
+        private ArrayList m_BaseList = new ArrayList();
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿å�–å¾—
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿å�–å¾—
+        /// </summary>
+        /// <returns></returns>
+        private bool ExecuteProcess()
+        {
+            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
+            try
+            {
+
+                int ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+
+                int nAppCode = ClsExcute.AppovalList.First(x => x.Value.Equals("å·¥äº‹äºˆç®—æ›¸æ‰¿èª�")).Key;
+
+                int[] nStatArrary = new int[] { CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥æº–å‚™")).Key,
+                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥é–‹å§‹")).Key,
+                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥å®Œäº†")).Key,
+                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("è«‹æ±‚æº–å‚™")).Key,
+                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("è«‹æ±‚ç¢ºèª�")).Key };
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.CONSTRUCTIONCODE");
+                strSQL.Append(", B.DETAILSTRING");
+                strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
+
+                strSQL.Append(" Inner Join constructionbaseinfodetail As B");
+                strSQL.Append("        On B.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat("  And B.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+
+                strSQL.Append(" Inner Join processapproval As D");
+                strSQL.Append("        On D.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat("  And D.ApprovalCode = {0}", nAppCode);
+                strSQL.Append("        And D.SeqNo = 1");
+                strSQL.AppendFormat("  And D.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+
+                strSQL.Append(" Where");
+                strSQL.AppendFormat(" A.ConstructionCode = {0}", ParentCode);
+                strSQL.Append("    Or A.ConstructionCode in (Select C.FluctuationCode From constructionlink As C");
+                strSQL.AppendFormat("                        Where C.ConstructionCode = {0})", ParentCode);
+                strSQL.AppendFormat(" And A.ConstructionStatusFlg in ({0},{1},{2},{3},{4})"
+                                                                    , nStatArrary[0], nStatArrary[1], nStatArrary[2]
+                                                                    , nStatArrary[3], nStatArrary[4]);
+                strSQL.Append(" ORDER BY A.CONSTRUCTIONCODE");
+
+                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref m_BaseList)) return false;
+                if (m_BaseList.Count < 1)
+                {   // ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
+                    return false;
+                }
+                else if (m_BaseList.Count == 1)
+                {
+                    // 1ä»¶ã�—ã�‹ã�ªã�„å ´å�ˆã�¯ä¸€è¦§ã‚’è¡¨ç¤ºã�—ã�ªã�„
+                    object[] Once = (object[])m_BaseList[0];
+                    // å·¥äº‹ç•ªå�·å�–å¾—
+                    m_ConstructionCode = CommonMotions.cnvInt(Once[0]);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                BaseDB.close(); BaseDB = null;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
+        /// <summary>
+        /// å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
+        /// </summary>
+        private void DisplayConstruction()
+        {
+            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
+            try
+            {
+                dgvMaster.Rows.Clear();
+
+                // ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                if (!ExecuteProcess())
+                {
+                    this.DialogResult = DialogResult.OK;
+                    this.Close();
+                    return;
+                }
+
+                // è¦�ç´ è¡¨ç¤º
+                int i = 0;
+                foreach (object[] wrk in m_BaseList)
+                {
+                    // è‡ªåˆ†ã�¯è¡¨ç¤ºã�—ã�ªã�„
+                    if (m_ConstructionCode == CommonMotions.cnvInt(wrk[0])) continue;
+                    // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
+                    dgvMaster.Rows.Add((i + 1),
+                                        CommonMotions.cnvInt(wrk[0]),
+                                        CommonMotions.cnvString(wrk[1]),
+                                        false);
+
+                    dgvMaster.Rows[i++].Cells[(int)GridColumn.ConstructionName].ToolTipText = CommonMotions.cnvString(wrk[1]);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                BaseDB.close(); BaseDB = null;
+            }
+        }
+        #endregion
+
+        #region ã‚°ãƒªãƒƒãƒ‰ç©ºè¡Œãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ç©ºè¡Œãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <param name="row"></param>
+        /// <returns></returns>
+        private bool BlanckRowCheck(DataGridViewRow row)
+        {
+            try
+            {
+                // ç©ºæ¬„ãƒ�ã‚§ãƒƒã‚¯
+                if (CommonMotions.chkObjectIsNull(row.Cells[(int)GridColumn.ConstructionCode].Value)) return false;
+                if (CommonMotions.cnvString(row.Cells[(int)GridColumn.ConstructionName].Value).Length == 0) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.resx	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstrProgDiag.resx	(revision 483)
@@ -0,0 +1,132 @@
+ï»¿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 483)
@@ -1064,6 +1064,12 @@
                 if (!DataEntryProcess(true)) return;
 
                 CommonMotions.EntryEndMessage("�HŽ–�î•ñƒf�[ƒ^");
+
+                // “o˜^Žž‚Í�Ä•`‰æ‚Ìˆ×Œ»�Ý�HŽ–”Ô�†‚ðƒZƒbƒg‚·‚é
+                int NowPoint = ClsExcute.GetNowProcessPoint();
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter[0] = m_ConstructionCode;
+                // ƒvƒ�ƒZƒXƒJƒEƒ“ƒ^‚ð•Ï�X‚µ‚È‚¢
+                m_CloseingProcessOn = false;
                 
                 // �I—¹
                 this.Close();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs	(revision 483)
@@ -57,11 +57,6 @@
             this.BasePanel = new System.Windows.Forms.Panel();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.panel10 = new System.Windows.Forms.Panel();
-            this.dgvPayment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label92 = new System.Windows.Forms.Label();
             this.label93 = new System.Windows.Forms.Label();
             this.label98 = new System.Windows.Forms.Label();
@@ -79,10 +74,6 @@
             this.txtInput07 = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.comboBoxEX5 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.comboBoxEX1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbSalesSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbSalesPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label110 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -89,7 +80,6 @@
             this.rdbEstimateType2 = new System.Windows.Forms.RadioButton();
             this.rdbEstimateType3 = new System.Windows.Forms.RadioButton();
             this.rdbEstimateType1 = new System.Windows.Forms.RadioButton();
-            this.cmbConstructionType = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput08 = new System.Windows.Forms.TextBox();
             this.btnSerchZip = new System.Windows.Forms.Button();
             this.label20 = new System.Windows.Forms.Label();
@@ -122,9 +112,7 @@
             this.label44 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.cmbOrdersDivision = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.btnOrderer = new System.Windows.Forms.Button();
-            this.cmbDisplayOrderers = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput05 = new System.Windows.Forms.TextBox();
             this.panel4 = new System.Windows.Forms.Panel();
             this.label106 = new System.Windows.Forms.Label();
@@ -134,24 +122,16 @@
             this.label97 = new System.Windows.Forms.Label();
             this.label39 = new System.Windows.Forms.Label();
             this.label30 = new System.Windows.Forms.Label();
-            this.txtInput28 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label27 = new System.Windows.Forms.Label();
-            this.txtInput25 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.lblTransferDate = new System.Windows.Forms.Label();
             this.label36 = new System.Windows.Forms.Label();
-            this.cmbTransferConstruction = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput26 = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
             this.txtInput01 = new System.Windows.Forms.TextBox();
             this.label33 = new System.Windows.Forms.Label();
-            this.txtInput27 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput02 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label24 = new System.Windows.Forms.Label();
-            this.txtInput06 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label22 = new System.Windows.Forms.Label();
-            this.txtInput12 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label12 = new System.Windows.Forms.Label();
-            this.txtInput13 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label15 = new System.Windows.Forms.Label();
             this.label38 = new System.Windows.Forms.Label();
             this.label68 = new System.Windows.Forms.Label();
@@ -162,17 +142,12 @@
             this.label23 = new System.Windows.Forms.Label();
             this.label70 = new System.Windows.Forms.Label();
             this.label71 = new System.Windows.Forms.Label();
-            this.textBoxEX2 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX1 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput03 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label62 = new System.Windows.Forms.Label();
             this.label72 = new System.Windows.Forms.Label();
             this.label73 = new System.Windows.Forms.Label();
             this.label61 = new System.Windows.Forms.Label();
             this.label55 = new System.Windows.Forms.Label();
-            this.txtInput38 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label54 = new System.Windows.Forms.Label();
-            this.txtInput34 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label66 = new System.Windows.Forms.Label();
             this.label56 = new System.Windows.Forms.Label();
             this.label75 = new System.Windows.Forms.Label();
@@ -192,9 +167,6 @@
             this.btnFluctuation = new System.Windows.Forms.Button();
             this.rdbExistsFluctuation = new System.Windows.Forms.RadioButton();
             this.rdbNotFluctuation = new System.Windows.Forms.RadioButton();
-            this.comboBoxEX4 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.comboBoxEX3 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbConstrSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label46 = new System.Windows.Forms.Label();
             this.txtInput32 = new System.Windows.Forms.TextBox();
             this.label47 = new System.Windows.Forms.Label();
@@ -203,16 +175,8 @@
             this.label41 = new System.Windows.Forms.Label();
             this.label50 = new System.Windows.Forms.Label();
             this.label88 = new System.Windows.Forms.Label();
-            this.textBoxEX3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX7 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput35 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label25 = new System.Windows.Forms.Label();
-            this.txtInput04 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label42 = new System.Windows.Forms.Label();
-            this.textBoxEX5 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX4 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput29 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput30 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label81 = new System.Windows.Forms.Label();
             this.label82 = new System.Windows.Forms.Label();
             this.label77 = new System.Windows.Forms.Label();
@@ -221,9 +185,6 @@
             this.label67 = new System.Windows.Forms.Label();
             this.label79 = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
-            this.cmbConstrInst = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.comboBoxEX2 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbConstrPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label113 = new System.Windows.Forms.Label();
             this.label76 = new System.Windows.Forms.Label();
             this.label112 = new System.Windows.Forms.Label();
@@ -240,19 +201,6 @@
             this.label116 = new System.Windows.Forms.Label();
             this.btnLink = new System.Windows.Forms.Button();
             this.label74 = new System.Windows.Forms.Label();
-            this.dgvPurchaseOrder = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dgvLink = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label85 = new System.Windows.Forms.Label();
             this.label84 = new System.Windows.Forms.Label();
             this.label83 = new System.Windows.Forms.Label();
@@ -270,24 +218,15 @@
             this.btnBillDate = new System.Windows.Forms.Button();
             this.label104 = new System.Windows.Forms.Label();
             this.label94 = new System.Windows.Forms.Label();
-            this.dgvBillingDate = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.BillingGridColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BillingGridColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BillingGridColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BillingGridColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label124 = new System.Windows.Forms.Label();
             this.label90 = new System.Windows.Forms.Label();
             this.label89 = new System.Windows.Forms.Label();
             this.label129 = new System.Windows.Forms.Label();
             this.label125 = new System.Windows.Forms.Label();
-            this.textBoxEX9 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX8 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX6 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label126 = new System.Windows.Forms.Label();
             this.label87 = new System.Windows.Forms.Label();
             this.label86 = new System.Windows.Forms.Label();
             this.label60 = new System.Windows.Forms.Label();
-            this.txtInput36 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label127 = new System.Windows.Forms.Label();
             this.textBox4 = new System.Windows.Forms.TextBox();
             this.textBox2 = new System.Windows.Forms.TextBox();
@@ -296,8 +235,6 @@
             this.label29 = new System.Windows.Forms.Label();
             this.lblLastUpdate = new System.Windows.Forms.Label();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.cmbConstructionYear = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbConstructionPeriod = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.btnOtherProc = new System.Windows.Forms.Button();
             this.lblJointLabel = new System.Windows.Forms.Label();
             this.btnPA = new System.Windows.Forms.Button();
@@ -310,9 +247,11 @@
             this.btnApprovalList = new System.Windows.Forms.Button();
             this.rdbStatusHikitugiFlg = new System.Windows.Forms.RadioButton();
             this.lblConstructionCodelabel = new System.Windows.Forms.Label();
+            this.cmbConstructionYear = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label2 = new System.Windows.Forms.Label();
             this.txtInput33 = new System.Windows.Forms.TextBox();
             this.label48 = new System.Windows.Forms.Label();
+            this.cmbConstructionPeriod = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label28 = new System.Windows.Forms.Label();
             this.lblConstructionCode = new System.Windows.Forms.Label();
             this.label16 = new System.Windows.Forms.Label();
@@ -336,10 +275,70 @@
             this.rdbStatus1 = new System.Windows.Forms.RadioButton();
             this.rdbStatus0 = new System.Windows.Forms.RadioButton();
             this.label49 = new System.Windows.Forms.Label();
+            this.dgvPayment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.comboBoxEX5 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.comboBoxEX1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbSalesSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbSalesPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbConstructionType = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbOrdersDivision = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDisplayOrderers = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.txtInput28 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput25 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.cmbTransferConstruction = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.txtInput27 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput02 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput06 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput12 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput13 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX2 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX1 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput03 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput38 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput34 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.comboBoxEX4 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.comboBoxEX3 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbConstrSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.textBoxEX3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX7 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput35 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput04 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX5 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX4 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput29 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput30 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.cmbConstrInst = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.comboBoxEX2 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbConstrPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.dgvPurchaseOrder = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgvLink = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgvBillingDate = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.BillingGridColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BillingGridColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BillingGridColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BillingGridColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.textBoxEX9 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX8 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX6 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput36 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.BasePanel.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel10.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
@@ -348,15 +347,16 @@
             this.panel7.SuspendLayout();
             this.pnlFluctuation.SuspendLayout();
             this.panel8.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvPurchaseOrder)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvLink)).BeginInit();
             this.panel9.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvBillingDate)).BeginInit();
             this.pnlProgress.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trkProgress)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numProgress)).BeginInit();
             this.groupBoxEx1.SuspendLayout();
             this.panel5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPurchaseOrder)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvLink)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvBillingDate)).BeginInit();
             this.SuspendLayout();
             // 
             // label1
@@ -485,85 +485,6 @@
             this.panel10.Size = new System.Drawing.Size(650, 994);
             this.panel10.TabIndex = 185;
             // 
-            // dgvPayment
-            // 
-            this.dgvPayment.AllowUserToAddRows = false;
-            this.dgvPayment.AllowUserToDeleteRows = false;
-            this.dgvPayment.AllowUserToResizeColumns = false;
-            this.dgvPayment.AllowUserToResizeRows = false;
-            this.dgvPayment.BackgroundColor = System.Drawing.Color.White;
-            this.dgvPayment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPayment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvPayment.ColumnHeadersHeight = 24;
-            this.dgvPayment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvPayment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn4});
-            this.dgvPayment.EnableHeadersVisualStyles = false;
-            this.dgvPayment.Location = new System.Drawing.Point(129, 1);
-            this.dgvPayment.Name = "dgvPayment";
-            this.dgvPayment.RowHeadersVisible = false;
-            this.dgvPayment.RowHeadersWidth = 20;
-            this.dgvPayment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvPayment.RowTemplate.Height = 24;
-            this.dgvPayment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvPayment.Size = new System.Drawing.Size(484, 122);
-            this.dgvPayment.TabIndex = 168;
-            this.dgvPayment.TabStop = false;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridViewTextBoxColumn1.HeaderText = "";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn1.Width = 120;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dataGridViewTextBoxColumn2.HeaderText = "";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn2.Width = 121;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle4;
-            this.dataGridViewTextBoxColumn3.HeaderText = "";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn3.Width = 120;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle5;
-            this.dataGridViewTextBoxColumn4.HeaderText = "";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn4.Width = 120;
-            // 
             // label92
             // 
             this.label92.BackColor = System.Drawing.Color.Beige;
@@ -829,50 +750,6 @@
             this.label8.Text = "å·¥äº‹å ´æ‰€";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // comboBoxEX5
-            // 
-            this.comboBoxEX5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX5.FormattingEnabled = true;
-            this.comboBoxEX5.Location = new System.Drawing.Point(129, 754);
-            this.comboBoxEX5.Name = "comboBoxEX5";
-            this.comboBoxEX5.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX5.TabIndex = 22;
-            this.comboBoxEX5.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // comboBoxEX1
-            // 
-            this.comboBoxEX1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX1.FormattingEnabled = true;
-            this.comboBoxEX1.Location = new System.Drawing.Point(129, 724);
-            this.comboBoxEX1.Name = "comboBoxEX1";
-            this.comboBoxEX1.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX1.TabIndex = 20;
-            this.comboBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbSalesSubPerson
-            // 
-            this.cmbSalesSubPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbSalesSubPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbSalesSubPerson.FormattingEnabled = true;
-            this.cmbSalesSubPerson.Location = new System.Drawing.Point(384, 754);
-            this.cmbSalesSubPerson.Name = "cmbSalesSubPerson";
-            this.cmbSalesSubPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbSalesSubPerson.TabIndex = 23;
-            this.cmbSalesSubPerson.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbSalesPerson
-            // 
-            this.cmbSalesPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbSalesPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbSalesPerson.FormattingEnabled = true;
-            this.cmbSalesPerson.Location = new System.Drawing.Point(384, 724);
-            this.cmbSalesPerson.Name = "cmbSalesPerson";
-            this.cmbSalesPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbSalesPerson.TabIndex = 21;
-            this.cmbSalesPerson.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label110
             // 
             this.label110.BackColor = System.Drawing.Color.CornflowerBlue;
@@ -950,17 +827,6 @@
             this.rdbEstimateType1.UseVisualStyleBackColor = false;
             this.rdbEstimateType1.CheckedChanged += new System.EventHandler(this.valueChange);
             // 
-            // cmbConstructionType
-            // 
-            this.cmbConstructionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionType.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionType.FormattingEnabled = true;
-            this.cmbConstructionType.Location = new System.Drawing.Point(129, 602);
-            this.cmbConstructionType.Name = "cmbConstructionType";
-            this.cmbConstructionType.Size = new System.Drawing.Size(372, 27);
-            this.cmbConstructionType.TabIndex = 19;
-            this.cmbConstructionType.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput08
             // 
             this.txtInput08.ImeMode = System.Windows.Forms.ImeMode.Disable;
@@ -1349,26 +1215,6 @@
             this.label5.Text = "ç™ºã€€æ³¨ã€€è€…";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbOrdersDivision
-            // 
-            this.cmbOrdersDivision.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbOrdersDivision.AutoCompleteCustomSource.AddRange(new string[] {
-            "æ ªå¼�ä¼šç¤¾",
-            "æœ‰é™�ä¼šç¤¾",
-            "å�ˆå��ä¼šç¤¾",
-            "å�ˆè³‡ä¼šç¤¾",
-            "å�ˆå�Œä¼šç¤¾"});
-            this.cmbOrdersDivision.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbOrdersDivision.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbOrdersDivision.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbOrdersDivision.FormattingEnabled = true;
-            this.cmbOrdersDivision.Location = new System.Drawing.Point(129, 154);
-            this.cmbOrdersDivision.Name = "cmbOrdersDivision";
-            this.cmbOrdersDivision.Size = new System.Drawing.Size(505, 27);
-            this.cmbOrdersDivision.TabIndex = 5;
-            this.cmbOrdersDivision.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // btnOrderer
             // 
             this.btnOrderer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1384,19 +1230,6 @@
             this.btnOrderer.Visible = false;
             this.btnOrderer.Click += new System.EventHandler(this.btnOrderer_Click);
             // 
-            // cmbDisplayOrderers
-            // 
-            this.cmbDisplayOrderers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbDisplayOrderers.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDisplayOrderers.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDisplayOrderers.FormattingEnabled = true;
-            this.cmbDisplayOrderers.Location = new System.Drawing.Point(129, 184);
-            this.cmbDisplayOrderers.Name = "cmbDisplayOrderers";
-            this.cmbDisplayOrderers.Size = new System.Drawing.Size(374, 27);
-            this.cmbDisplayOrderers.TabIndex = 6;
-            this.cmbDisplayOrderers.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput05
             // 
             this.txtInput05.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -1561,21 +1394,6 @@
             this.label30.Text = "ç¨Žè¾¼\r\nå�—æ³¨æ±ºå®šé‡‘é¡�";
             this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput28
-            // 
-            this.txtInput28.BackColor = System.Drawing.Color.White;
-            this.txtInput28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput28.ForeColor = System.Drawing.Color.Black;
-            this.txtInput28.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput28.Location = new System.Drawing.Point(128, 104);
-            this.txtInput28.MaxLength = 10;
-            this.txtInput28.Name = "txtInput28";
-            this.txtInput28.Size = new System.Drawing.Size(274, 34);
-            this.txtInput28.TabIndex = 3;
-            this.txtInput28.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput28.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput28.Validated += new System.EventHandler(this.txtInput25_Validated);
-            // 
             // label27
             // 
             this.label27.BackColor = System.Drawing.Color.MidnightBlue;
@@ -1589,21 +1407,6 @@
             this.label27.Text = "ç¨Žåˆ¥\r\nå�—æ³¨æ±ºå®šé‡‘é¡�";
             this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput25
-            // 
-            this.txtInput25.BackColor = System.Drawing.Color.White;
-            this.txtInput25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput25.ForeColor = System.Drawing.Color.Black;
-            this.txtInput25.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput25.Location = new System.Drawing.Point(128, 64);
-            this.txtInput25.MaxLength = 10;
-            this.txtInput25.Name = "txtInput25";
-            this.txtInput25.Size = new System.Drawing.Size(274, 34);
-            this.txtInput25.TabIndex = 2;
-            this.txtInput25.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput25.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput25.Validated += new System.EventHandler(this.txtInput25_Validated);
-            // 
             // lblTransferDate
             // 
             this.lblTransferDate.BackColor = System.Drawing.SystemColors.Window;
@@ -1626,17 +1429,6 @@
             this.label36.Text = "éƒ¨ç½²å¼•ç¶™æ—¥";
             this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbTransferConstruction
-            // 
-            this.cmbTransferConstruction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbTransferConstruction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbTransferConstruction.FormattingEnabled = true;
-            this.cmbTransferConstruction.Location = new System.Drawing.Point(128, 843);
-            this.cmbTransferConstruction.Name = "cmbTransferConstruction";
-            this.cmbTransferConstruction.Size = new System.Drawing.Size(300, 27);
-            this.cmbTransferConstruction.TabIndex = 14;
-            this.cmbTransferConstruction.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput26
             // 
             this.txtInput26.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -1687,30 +1479,6 @@
             this.label33.Text = "è¦‹ç©�æ��å‡ºæœŸé™�";
             this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput27
-            // 
-            this.txtInput27.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput27.Location = new System.Drawing.Point(128, 33);
-            this.txtInput27.MaxLength = 10;
-            this.txtInput27.Name = "txtInput27";
-            this.txtInput27.Size = new System.Drawing.Size(120, 26);
-            this.txtInput27.TabIndex = 1;
-            this.txtInput27.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput27.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput27.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput02
-            // 
-            this.txtInput02.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput02.Location = new System.Drawing.Point(128, 182);
-            this.txtInput02.MaxLength = 10;
-            this.txtInput02.Name = "txtInput02";
-            this.txtInput02.Size = new System.Drawing.Size(120, 26);
-            this.txtInput02.TabIndex = 4;
-            this.txtInput02.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput02.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput02.Validated += new System.EventHandler(this.txtInput02_TextChanged);
-            // 
             // label24
             // 
             this.label24.BackColor = System.Drawing.Color.LightBlue;
@@ -1723,18 +1491,6 @@
             this.label24.Text = "è¦‹ç©�æ��å‡ºæ—¥";
             this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput06
-            // 
-            this.txtInput06.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput06.Location = new System.Drawing.Point(128, 212);
-            this.txtInput06.MaxLength = 10;
-            this.txtInput06.Name = "txtInput06";
-            this.txtInput06.Size = new System.Drawing.Size(120, 26);
-            this.txtInput06.TabIndex = 5;
-            this.txtInput06.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput06.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput06.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label22
             // 
             this.label22.BackColor = System.Drawing.Color.LightBlue;
@@ -1747,18 +1503,6 @@
             this.label22.Text = "è¦‹ç©�æœ‰åŠ¹æœŸé™�";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput12
-            // 
-            this.txtInput12.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput12.Location = new System.Drawing.Point(128, 302);
-            this.txtInput12.MaxLength = 10;
-            this.txtInput12.Name = "txtInput12";
-            this.txtInput12.Size = new System.Drawing.Size(120, 26);
-            this.txtInput12.TabIndex = 6;
-            this.txtInput12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput12.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput12.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label12
             // 
             this.label12.BackColor = System.Drawing.Color.LightBlue;
@@ -1771,18 +1515,6 @@
             this.label12.Text = "å·¥äº‹æœŸé–“ã€€é–‹å§‹";
             this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput13
-            // 
-            this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput13.Location = new System.Drawing.Point(128, 332);
-            this.txtInput13.MaxLength = 10;
-            this.txtInput13.Name = "txtInput13";
-            this.txtInput13.Size = new System.Drawing.Size(120, 26);
-            this.txtInput13.TabIndex = 7;
-            this.txtInput13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput13.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput13.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label15
             // 
             this.label15.BackColor = System.Drawing.Color.LightBlue;
@@ -1905,42 +1637,6 @@
             this.label71.Text = "é�žå�—æ³¨æ—¥";
             this.label71.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX2
-            // 
-            this.textBoxEX2.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX2.Location = new System.Drawing.Point(128, 562);
-            this.textBoxEX2.MaxLength = 10;
-            this.textBoxEX2.Name = "textBoxEX2";
-            this.textBoxEX2.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX2.TabIndex = 10;
-            this.textBoxEX2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX2.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX1
-            // 
-            this.textBoxEX1.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX1.Location = new System.Drawing.Point(128, 502);
-            this.textBoxEX1.MaxLength = 10;
-            this.textBoxEX1.Name = "textBoxEX1";
-            this.textBoxEX1.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX1.TabIndex = 8;
-            this.textBoxEX1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX1.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput03
-            // 
-            this.txtInput03.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput03.Location = new System.Drawing.Point(128, 532);
-            this.txtInput03.MaxLength = 10;
-            this.txtInput03.Name = "txtInput03";
-            this.txtInput03.Size = new System.Drawing.Size(120, 26);
-            this.txtInput03.TabIndex = 9;
-            this.txtInput03.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput03.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput03.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label62
             // 
             this.label62.BackColor = System.Drawing.Color.Black;
@@ -2006,18 +1702,6 @@
             this.label55.Text = "â€»ã€Œæ–½å·¥é–‹å§‹äºˆå®šæ—¥ã€�ã�¯ã�Šã�Šã‚ˆã��ã�®å·¥äº‹é–‹å§‹æ—¥(ç�¾å ´ç�€æ‰‹æ™‚æœŸ)ã‚’\r\nã€Œå�—æ³¨æ—¥ã€�å…¥åŠ›æ™‚ã�«å…¥åŠ›ã�—ã�¦ä¸‹ã�•ã�„";
             this.label55.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // txtInput38
-            // 
-            this.txtInput38.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput38.Location = new System.Drawing.Point(128, 632);
-            this.txtInput38.MaxLength = 10;
-            this.txtInput38.Name = "txtInput38";
-            this.txtInput38.Size = new System.Drawing.Size(120, 26);
-            this.txtInput38.TabIndex = 11;
-            this.txtInput38.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput38.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput38.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label54
             // 
             this.label54.BackColor = System.Drawing.Color.LightBlue;
@@ -2031,18 +1715,6 @@
             this.label54.Text = "å�—æ³¨æ™‚æ–½å·¥å®Œäº†äºˆå®šæ—¥";
             this.label54.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput34
-            // 
-            this.txtInput34.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput34.Location = new System.Drawing.Point(128, 662);
-            this.txtInput34.MaxLength = 10;
-            this.txtInput34.Name = "txtInput34";
-            this.txtInput34.Size = new System.Drawing.Size(120, 26);
-            this.txtInput34.TabIndex = 12;
-            this.txtInput34.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput34.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput34.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label66
             // 
             this.label66.BackColor = System.Drawing.Color.Black;
@@ -2321,42 +1993,6 @@
             this.rdbNotFluctuation.UseVisualStyleBackColor = true;
             this.rdbNotFluctuation.CheckedChanged += new System.EventHandler(this.rdbFluctuation_CheckedChanged);
             // 
-            // comboBoxEX4
-            // 
-            this.comboBoxEX4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBoxEX4.FormattingEnabled = true;
-            this.comboBoxEX4.Location = new System.Drawing.Point(129, 93);
-            this.comboBoxEX4.Name = "comboBoxEX4";
-            this.comboBoxEX4.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX4.TabIndex = 4;
-            this.comboBoxEX4.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // comboBoxEX3
-            // 
-            this.comboBoxEX3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBoxEX3.FormattingEnabled = true;
-            this.comboBoxEX3.Location = new System.Drawing.Point(129, 63);
-            this.comboBoxEX3.Name = "comboBoxEX3";
-            this.comboBoxEX3.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX3.TabIndex = 2;
-            this.comboBoxEX3.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbConstrSubPerson
-            // 
-            this.cmbConstrSubPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstrSubPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstrSubPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbConstrSubPerson.FormattingEnabled = true;
-            this.cmbConstrSubPerson.Location = new System.Drawing.Point(384, 63);
-            this.cmbConstrSubPerson.Name = "cmbConstrSubPerson";
-            this.cmbConstrSubPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbConstrSubPerson.TabIndex = 3;
-            this.cmbConstrSubPerson.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label46
             // 
             this.label46.BackColor = System.Drawing.Color.Black;
@@ -2461,47 +2097,6 @@
             this.label88.Text = "æ¤œæŸ»äºˆå®šæ—¥";
             this.label88.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX3
-            // 
-            this.textBoxEX3.Enabled = false;
-            this.textBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.textBoxEX3.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX3.Location = new System.Drawing.Point(129, 273);
-            this.textBoxEX3.MaxLength = 10;
-            this.textBoxEX3.Name = "textBoxEX3";
-            this.textBoxEX3.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX3.TabIndex = 10;
-            this.textBoxEX3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX3.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX3.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX7
-            // 
-            this.textBoxEX7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.textBoxEX7.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX7.Location = new System.Drawing.Point(129, 363);
-            this.textBoxEX7.MaxLength = 10;
-            this.textBoxEX7.Name = "textBoxEX7";
-            this.textBoxEX7.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX7.TabIndex = 13;
-            this.textBoxEX7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX7.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX7.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput35
-            // 
-            this.txtInput35.Enabled = false;
-            this.txtInput35.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput35.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput35.Location = new System.Drawing.Point(129, 303);
-            this.txtInput35.MaxLength = 10;
-            this.txtInput35.Name = "txtInput35";
-            this.txtInput35.Size = new System.Drawing.Size(120, 26);
-            this.txtInput35.TabIndex = 11;
-            this.txtInput35.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput35.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput35.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label25
             // 
             this.label25.BackColor = System.Drawing.Color.LightGreen;
@@ -2515,20 +2110,6 @@
             this.label25.Text = "æ–½å·¥å®Œäº†æ—¥";
             this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput04
-            // 
-            this.txtInput04.Enabled = false;
-            this.txtInput04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput04.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput04.Location = new System.Drawing.Point(129, 333);
-            this.txtInput04.MaxLength = 10;
-            this.txtInput04.Name = "txtInput04";
-            this.txtInput04.Size = new System.Drawing.Size(120, 26);
-            this.txtInput04.TabIndex = 12;
-            this.txtInput04.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput04.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput04.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label42
             // 
             this.label42.BackColor = System.Drawing.Color.Black;
@@ -2541,62 +2122,6 @@
             this.label42.Text = "â€»ã€Œç�€å·¥ã€�ãƒ»ã€Œå®Œæˆ�ã€�ã�¯å¥‘ç´„æ›¸ã�«åŸºã�¥ã��è¨˜å…¥ã�—ã�¦ä¸‹ã�•ã�„\r\nï¼ˆå½“ç¤¾ã€�ç™ºçµ¦ã�®å¥‘ç´„æ›¸ãƒ»æ–½å·¥è¨ˆç”»æ›¸ã�«è¨˜è¼‰ã�•ã‚Œã�¾ã�™ï¼‰";
             this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX5
-            // 
-            this.textBoxEX5.BackColor = System.Drawing.SystemColors.Window;
-            this.textBoxEX5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.textBoxEX5.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX5.Location = new System.Drawing.Point(393, 183);
-            this.textBoxEX5.MaxLength = 10;
-            this.textBoxEX5.Name = "textBoxEX5";
-            this.textBoxEX5.ReadOnly = true;
-            this.textBoxEX5.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX5.TabIndex = 9;
-            this.textBoxEX5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX5.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX5.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX4
-            // 
-            this.textBoxEX4.BackColor = System.Drawing.SystemColors.Window;
-            this.textBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.textBoxEX4.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX4.Location = new System.Drawing.Point(393, 153);
-            this.textBoxEX4.MaxLength = 10;
-            this.textBoxEX4.Name = "textBoxEX4";
-            this.textBoxEX4.ReadOnly = true;
-            this.textBoxEX4.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX4.TabIndex = 8;
-            this.textBoxEX4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX4.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX4.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput29
-            // 
-            this.txtInput29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.txtInput29.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput29.Location = new System.Drawing.Point(189, 153);
-            this.txtInput29.MaxLength = 10;
-            this.txtInput29.Name = "txtInput29";
-            this.txtInput29.Size = new System.Drawing.Size(120, 26);
-            this.txtInput29.TabIndex = 6;
-            this.txtInput29.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput29.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput29.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput30
-            // 
-            this.txtInput30.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.txtInput30.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput30.Location = new System.Drawing.Point(189, 183);
-            this.txtInput30.MaxLength = 10;
-            this.txtInput30.Name = "txtInput30";
-            this.txtInput30.Size = new System.Drawing.Size(120, 26);
-            this.txtInput30.TabIndex = 7;
-            this.txtInput30.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput30.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput30.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label81
             // 
             this.label81.BackColor = System.Drawing.Color.LightGreen;
@@ -2694,42 +2219,6 @@
             this.label31.Text = "å·¥äº‹æŒ‡å°Ž";
             this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbConstrInst
-            // 
-            this.cmbConstrInst.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstrInst.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstrInst.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbConstrInst.FormattingEnabled = true;
-            this.cmbConstrInst.Location = new System.Drawing.Point(384, 93);
-            this.cmbConstrInst.Name = "cmbConstrInst";
-            this.cmbConstrInst.Size = new System.Drawing.Size(255, 27);
-            this.cmbConstrInst.TabIndex = 5;
-            this.cmbConstrInst.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // comboBoxEX2
-            // 
-            this.comboBoxEX2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBoxEX2.FormattingEnabled = true;
-            this.comboBoxEX2.Location = new System.Drawing.Point(129, 33);
-            this.comboBoxEX2.Name = "comboBoxEX2";
-            this.comboBoxEX2.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX2.TabIndex = 0;
-            this.comboBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbConstrPerson
-            // 
-            this.cmbConstrPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstrPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstrPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbConstrPerson.FormattingEnabled = true;
-            this.cmbConstrPerson.Location = new System.Drawing.Point(384, 33);
-            this.cmbConstrPerson.Name = "cmbConstrPerson";
-            this.cmbConstrPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbConstrPerson.TabIndex = 1;
-            this.cmbConstrPerson.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label113
             // 
             this.label113.BackColor = System.Drawing.Color.LightGreen;
@@ -2948,203 +2437,6 @@
             this.label74.Text = "å¢—æ¸›å·¥äº‹";
             this.label74.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dgvPurchaseOrder
-            // 
-            this.dgvPurchaseOrder.AllowUserToAddRows = false;
-            this.dgvPurchaseOrder.AllowUserToDeleteRows = false;
-            this.dgvPurchaseOrder.AllowUserToResizeColumns = false;
-            this.dgvPurchaseOrder.AllowUserToResizeRows = false;
-            this.dgvPurchaseOrder.BackgroundColor = System.Drawing.Color.White;
-            this.dgvPurchaseOrder.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPurchaseOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
-            this.dgvPurchaseOrder.ColumnHeadersHeight = 24;
-            this.dgvPurchaseOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvPurchaseOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column7,
-            this.Column8,
-            this.Column9,
-            this.Column10});
-            this.dgvPurchaseOrder.EnableHeadersVisualStyles = false;
-            this.dgvPurchaseOrder.Location = new System.Drawing.Point(128, 123);
-            this.dgvPurchaseOrder.Name = "dgvPurchaseOrder";
-            this.dgvPurchaseOrder.RowHeadersVisible = false;
-            this.dgvPurchaseOrder.RowHeadersWidth = 20;
-            this.dgvPurchaseOrder.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvPurchaseOrder.RowTemplate.Height = 24;
-            this.dgvPurchaseOrder.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvPurchaseOrder.Size = new System.Drawing.Size(484, 170);
-            this.dgvPurchaseOrder.TabIndex = 166;
-            this.dgvPurchaseOrder.TabStop = false;
-            this.dgvPurchaseOrder.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPurchaseOrder_CellDoubleClick);
-            // 
-            // Column7
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column7.HeaderText = "";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column7.Width = 120;
-            // 
-            // Column8
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column8.HeaderText = "";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column8.Width = 121;
-            // 
-            // Column9
-            // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle9;
-            this.Column9.HeaderText = "";
-            this.Column9.Name = "Column9";
-            this.Column9.ReadOnly = true;
-            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column9.Width = 120;
-            // 
-            // Column10
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle10;
-            this.Column10.HeaderText = "";
-            this.Column10.Name = "Column10";
-            this.Column10.ReadOnly = true;
-            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column10.Width = 120;
-            // 
-            // dgvLink
-            // 
-            this.dgvLink.AllowUserToAddRows = false;
-            this.dgvLink.AllowUserToDeleteRows = false;
-            this.dgvLink.AllowUserToResizeColumns = false;
-            this.dgvLink.AllowUserToResizeRows = false;
-            this.dgvLink.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvLink.BackgroundColor = System.Drawing.Color.White;
-            this.dgvLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvLink.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
-            this.dgvLink.ColumnHeadersHeight = 24;
-            this.dgvLink.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvLink.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column0,
-            this.Column1,
-            this.Column5,
-            this.Column3,
-            this.Column2,
-            this.Column4,
-            this.Column6});
-            this.dgvLink.EnableHeadersVisualStyles = false;
-            this.dgvLink.Location = new System.Drawing.Point(1, 369);
-            this.dgvLink.Name = "dgvLink";
-            this.dgvLink.RowHeadersVisible = false;
-            this.dgvLink.RowHeadersWidth = 20;
-            this.dgvLink.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvLink.RowTemplate.Height = 24;
-            this.dgvLink.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvLink.Size = new System.Drawing.Size(637, 164);
-            this.dgvLink.TabIndex = 166;
-            this.dgvLink.TabStop = false;
-            this.dgvLink.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLink_CellDoubleClick);
-            // 
-            // Column0
-            // 
-            this.Column0.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.Column0.Name = "Column0";
-            this.Column0.ReadOnly = true;
-            this.Column0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column0.Visible = false;
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle12;
-            this.Column1.HeaderText = "å¢—æ¸›æ—¥";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 120;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle13;
-            this.Column5.HeaderText = "è¦‹ç©�é‡‘é¡�";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 120;
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle14;
-            this.Column3.HeaderText = "è¦‹ç©�ç¨Žè¾¼é‡‘é¡�";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 120;
-            // 
-            // Column2
-            // 
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle15;
-            this.Column2.HeaderText = "å�—æ³¨é‡‘é¡�";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 120;
-            // 
-            // Column4
-            // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle16;
-            this.Column4.HeaderText = "å�—æ³¨ç¨Žè¾¼é‡‘é¡�";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column4.Width = 120;
-            // 
-            // Column6
-            // 
-            this.Column6.HeaderText = "å·¥äº‹å��ç§°";
-            this.Column6.Name = "Column6";
-            this.Column6.ReadOnly = true;
-            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 300;
-            // 
             // label85
             // 
             this.label85.BackColor = System.Drawing.Color.PaleGreen;
@@ -3374,86 +2666,6 @@
             this.label94.Text = "æ˜¯æ­£å®Œäº†\r\nã‚³ãƒ¡ãƒ³ãƒˆ";
             this.label94.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dgvBillingDate
-            // 
-            this.dgvBillingDate.AllowUserToAddRows = false;
-            this.dgvBillingDate.AllowUserToDeleteRows = false;
-            this.dgvBillingDate.AllowUserToResizeColumns = false;
-            this.dgvBillingDate.AllowUserToResizeRows = false;
-            this.dgvBillingDate.BackgroundColor = System.Drawing.Color.White;
-            this.dgvBillingDate.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvBillingDate.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
-            this.dgvBillingDate.ColumnHeadersHeight = 24;
-            this.dgvBillingDate.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvBillingDate.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.BillingGridColumn1,
-            this.BillingGridColumn2,
-            this.BillingGridColumn3,
-            this.BillingGridColumn4});
-            this.dgvBillingDate.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
-            this.dgvBillingDate.EnableHeadersVisualStyles = false;
-            this.dgvBillingDate.Location = new System.Drawing.Point(129, 91);
-            this.dgvBillingDate.Name = "dgvBillingDate";
-            this.dgvBillingDate.RowHeadersVisible = false;
-            this.dgvBillingDate.RowHeadersWidth = 20;
-            this.dgvBillingDate.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvBillingDate.RowTemplate.Height = 24;
-            this.dgvBillingDate.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvBillingDate.Size = new System.Drawing.Size(484, 170);
-            this.dgvBillingDate.TabIndex = 167;
-            this.dgvBillingDate.TabStop = false;
-            // 
-            // BillingGridColumn1
-            // 
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.BillingGridColumn1.DefaultCellStyle = dataGridViewCellStyle18;
-            this.BillingGridColumn1.HeaderText = "";
-            this.BillingGridColumn1.Name = "BillingGridColumn1";
-            this.BillingGridColumn1.ReadOnly = true;
-            this.BillingGridColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.BillingGridColumn1.Width = 120;
-            // 
-            // BillingGridColumn2
-            // 
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.BillingGridColumn2.DefaultCellStyle = dataGridViewCellStyle19;
-            this.BillingGridColumn2.HeaderText = "";
-            this.BillingGridColumn2.Name = "BillingGridColumn2";
-            this.BillingGridColumn2.ReadOnly = true;
-            this.BillingGridColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.BillingGridColumn2.Width = 121;
-            // 
-            // BillingGridColumn3
-            // 
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.BillingGridColumn3.DefaultCellStyle = dataGridViewCellStyle20;
-            this.BillingGridColumn3.HeaderText = "";
-            this.BillingGridColumn3.Name = "BillingGridColumn3";
-            this.BillingGridColumn3.ReadOnly = true;
-            this.BillingGridColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.BillingGridColumn3.Width = 120;
-            // 
-            // BillingGridColumn4
-            // 
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle21.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.BillingGridColumn4.DefaultCellStyle = dataGridViewCellStyle21;
-            this.BillingGridColumn4.HeaderText = "";
-            this.BillingGridColumn4.Name = "BillingGridColumn4";
-            this.BillingGridColumn4.ReadOnly = true;
-            this.BillingGridColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.BillingGridColumn4.Width = 120;
-            // 
             // label124
             // 
             this.label124.BackColor = System.Drawing.Color.Moccasin;
@@ -3514,43 +2726,6 @@
             this.label125.Text = "è«‹æ±‚æ›¸éƒµé€�æ—¥";
             this.label125.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX9
-            // 
-            this.textBoxEX9.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX9.Location = new System.Drawing.Point(129, 340);
-            this.textBoxEX9.MaxLength = 10;
-            this.textBoxEX9.Name = "textBoxEX9";
-            this.textBoxEX9.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX9.TabIndex = 4;
-            this.textBoxEX9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX9.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX9.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX8
-            // 
-            this.textBoxEX8.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX8.Location = new System.Drawing.Point(129, 307);
-            this.textBoxEX8.MaxLength = 10;
-            this.textBoxEX8.Name = "textBoxEX8";
-            this.textBoxEX8.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX8.TabIndex = 3;
-            this.textBoxEX8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX8.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX8.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX6
-            // 
-            this.textBoxEX6.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX6.Location = new System.Drawing.Point(334, 307);
-            this.textBoxEX6.MaxLength = 10;
-            this.textBoxEX6.Name = "textBoxEX6";
-            this.textBoxEX6.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX6.TabIndex = 2;
-            this.textBoxEX6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX6.Visible = false;
-            this.textBoxEX6.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX6.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label126
             // 
             this.label126.BackColor = System.Drawing.Color.Moccasin;
@@ -3598,18 +2773,6 @@
             this.label60.Text = "è«‹æ±‚æº–å‚™é–‹å§‹æ—¥";
             this.label60.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput36
-            // 
-            this.txtInput36.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput36.Location = new System.Drawing.Point(129, 49);
-            this.txtInput36.MaxLength = 10;
-            this.txtInput36.Name = "txtInput36";
-            this.txtInput36.Size = new System.Drawing.Size(120, 26);
-            this.txtInput36.TabIndex = 1;
-            this.txtInput36.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput36.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput36.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label127
             // 
             this.label127.BackColor = System.Drawing.Color.Moccasin;
@@ -3702,29 +2865,6 @@
             this.lblLastUpdate.Text = "2015å¹´12æœˆ31æ—¥";
             this.lblLastUpdate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbConstructionYear
-            // 
-            this.cmbConstructionYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionYear.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionYear.FormattingEnabled = true;
-            this.cmbConstructionYear.Location = new System.Drawing.Point(639, 12);
-            this.cmbConstructionYear.Name = "cmbConstructionYear";
-            this.cmbConstructionYear.Size = new System.Drawing.Size(115, 24);
-            this.cmbConstructionYear.TabIndex = 1;
-            this.toolTip1.SetToolTip(this.cmbConstructionYear, "å·¥äº‹ã�®ç�€å·¥é–‹å§‹å¹´åº¦ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
-            this.cmbConstructionYear.Visible = false;
-            // 
-            // cmbConstructionPeriod
-            // 
-            this.cmbConstructionPeriod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionPeriod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionPeriod.FormattingEnabled = true;
-            this.cmbConstructionPeriod.Location = new System.Drawing.Point(385, 12);
-            this.cmbConstructionPeriod.Name = "cmbConstructionPeriod";
-            this.cmbConstructionPeriod.Size = new System.Drawing.Size(115, 24);
-            this.cmbConstructionPeriod.TabIndex = 0;
-            this.toolTip1.SetToolTip(this.cmbConstructionPeriod, "å£²ã‚Šä¸Šã�’è¨ˆä¸Šã‚’è¡Œã�†å–¶æ¥­æœŸã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
-            // 
             // btnOtherProc
             // 
             this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -3896,6 +3036,18 @@
             this.lblConstructionCodelabel.Text = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.lblConstructionCodelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // cmbConstructionYear
+            // 
+            this.cmbConstructionYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionYear.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionYear.FormattingEnabled = true;
+            this.cmbConstructionYear.Location = new System.Drawing.Point(639, 12);
+            this.cmbConstructionYear.Name = "cmbConstructionYear";
+            this.cmbConstructionYear.Size = new System.Drawing.Size(115, 24);
+            this.cmbConstructionYear.TabIndex = 1;
+            this.toolTip1.SetToolTip(this.cmbConstructionYear, "å·¥äº‹ã�®ç�€å·¥é–‹å§‹å¹´åº¦ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
+            this.cmbConstructionYear.Visible = false;
+            // 
             // label2
             // 
             this.label2.BackColor = System.Drawing.Color.RoyalBlue;
@@ -3934,6 +3086,17 @@
             this.label48.Text = "å·¥äº‹å��ç§°";
             this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // cmbConstructionPeriod
+            // 
+            this.cmbConstructionPeriod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionPeriod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionPeriod.FormattingEnabled = true;
+            this.cmbConstructionPeriod.Location = new System.Drawing.Point(385, 12);
+            this.cmbConstructionPeriod.Name = "cmbConstructionPeriod";
+            this.cmbConstructionPeriod.Size = new System.Drawing.Size(115, 24);
+            this.cmbConstructionPeriod.TabIndex = 0;
+            this.toolTip1.SetToolTip(this.cmbConstructionPeriod, "å£²ã‚Šä¸Šã�’è¨ˆä¸Šã‚’è¡Œã�†å–¶æ¥­æœŸã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
+            // 
             // label28
             // 
             this.label28.BackColor = System.Drawing.Color.RoyalBlue;
@@ -4317,6 +3480,843 @@
             this.label49.Text = "â€»å·¥äº‹å��ç§°ã�¯ä¸‹è¨˜ã�®å·¥äº‹å��ç§°ã�®é …ç›®ã�¨é€£å‹•ã�—ã�¦è¨˜å…¥ã�•ã‚Œã�¾ã�™";
             this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // dgvPayment
+            // 
+            this.dgvPayment.AllowUserToAddRows = false;
+            this.dgvPayment.AllowUserToDeleteRows = false;
+            this.dgvPayment.AllowUserToResizeColumns = false;
+            this.dgvPayment.AllowUserToResizeRows = false;
+            this.dgvPayment.BackgroundColor = System.Drawing.Color.White;
+            this.dgvPayment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPayment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvPayment.ColumnHeadersHeight = 24;
+            this.dgvPayment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvPayment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn4});
+            this.dgvPayment.EnableHeadersVisualStyles = false;
+            this.dgvPayment.Location = new System.Drawing.Point(129, 1);
+            this.dgvPayment.Name = "dgvPayment";
+            this.dgvPayment.RowHeadersVisible = false;
+            this.dgvPayment.RowHeadersWidth = 20;
+            this.dgvPayment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvPayment.RowTemplate.Height = 24;
+            this.dgvPayment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvPayment.Size = new System.Drawing.Size(484, 122);
+            this.dgvPayment.TabIndex = 168;
+            this.dgvPayment.TabStop = false;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dataGridViewTextBoxColumn1.HeaderText = "";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn1.Width = 120;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dataGridViewTextBoxColumn2.HeaderText = "";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn2.Width = 121;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dataGridViewTextBoxColumn3.HeaderText = "";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 120;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle5;
+            this.dataGridViewTextBoxColumn4.HeaderText = "";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn4.Width = 120;
+            // 
+            // comboBoxEX5
+            // 
+            this.comboBoxEX5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX5.FormattingEnabled = true;
+            this.comboBoxEX5.Location = new System.Drawing.Point(129, 754);
+            this.comboBoxEX5.Name = "comboBoxEX5";
+            this.comboBoxEX5.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX5.TabIndex = 22;
+            this.comboBoxEX5.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // comboBoxEX1
+            // 
+            this.comboBoxEX1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX1.FormattingEnabled = true;
+            this.comboBoxEX1.Location = new System.Drawing.Point(129, 724);
+            this.comboBoxEX1.Name = "comboBoxEX1";
+            this.comboBoxEX1.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX1.TabIndex = 20;
+            this.comboBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbSalesSubPerson
+            // 
+            this.cmbSalesSubPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSalesSubPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbSalesSubPerson.FormattingEnabled = true;
+            this.cmbSalesSubPerson.Location = new System.Drawing.Point(384, 754);
+            this.cmbSalesSubPerson.Name = "cmbSalesSubPerson";
+            this.cmbSalesSubPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbSalesSubPerson.TabIndex = 23;
+            this.cmbSalesSubPerson.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbSalesPerson
+            // 
+            this.cmbSalesPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSalesPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbSalesPerson.FormattingEnabled = true;
+            this.cmbSalesPerson.Location = new System.Drawing.Point(384, 724);
+            this.cmbSalesPerson.Name = "cmbSalesPerson";
+            this.cmbSalesPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbSalesPerson.TabIndex = 21;
+            this.cmbSalesPerson.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbConstructionType
+            // 
+            this.cmbConstructionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionType.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionType.FormattingEnabled = true;
+            this.cmbConstructionType.Location = new System.Drawing.Point(129, 602);
+            this.cmbConstructionType.Name = "cmbConstructionType";
+            this.cmbConstructionType.Size = new System.Drawing.Size(372, 27);
+            this.cmbConstructionType.TabIndex = 19;
+            this.cmbConstructionType.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbOrdersDivision
+            // 
+            this.cmbOrdersDivision.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbOrdersDivision.AutoCompleteCustomSource.AddRange(new string[] {
+            "æ ªå¼�ä¼šç¤¾",
+            "æœ‰é™�ä¼šç¤¾",
+            "å�ˆå��ä¼šç¤¾",
+            "å�ˆè³‡ä¼šç¤¾",
+            "å�ˆå�Œä¼šç¤¾"});
+            this.cmbOrdersDivision.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbOrdersDivision.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbOrdersDivision.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbOrdersDivision.FormattingEnabled = true;
+            this.cmbOrdersDivision.Location = new System.Drawing.Point(129, 154);
+            this.cmbOrdersDivision.Name = "cmbOrdersDivision";
+            this.cmbOrdersDivision.Size = new System.Drawing.Size(505, 27);
+            this.cmbOrdersDivision.TabIndex = 5;
+            this.cmbOrdersDivision.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbDisplayOrderers
+            // 
+            this.cmbDisplayOrderers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbDisplayOrderers.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDisplayOrderers.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDisplayOrderers.FormattingEnabled = true;
+            this.cmbDisplayOrderers.Location = new System.Drawing.Point(129, 184);
+            this.cmbDisplayOrderers.Name = "cmbDisplayOrderers";
+            this.cmbDisplayOrderers.Size = new System.Drawing.Size(374, 27);
+            this.cmbDisplayOrderers.TabIndex = 6;
+            this.cmbDisplayOrderers.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // txtInput28
+            // 
+            this.txtInput28.BackColor = System.Drawing.Color.White;
+            this.txtInput28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput28.ForeColor = System.Drawing.Color.Black;
+            this.txtInput28.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput28.Location = new System.Drawing.Point(128, 104);
+            this.txtInput28.MaxLength = 10;
+            this.txtInput28.Name = "txtInput28";
+            this.txtInput28.Size = new System.Drawing.Size(274, 34);
+            this.txtInput28.TabIndex = 3;
+            this.txtInput28.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput28.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput28.Validated += new System.EventHandler(this.txtInput25_Validated);
+            // 
+            // txtInput25
+            // 
+            this.txtInput25.BackColor = System.Drawing.Color.White;
+            this.txtInput25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput25.ForeColor = System.Drawing.Color.Black;
+            this.txtInput25.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput25.Location = new System.Drawing.Point(128, 64);
+            this.txtInput25.MaxLength = 10;
+            this.txtInput25.Name = "txtInput25";
+            this.txtInput25.Size = new System.Drawing.Size(274, 34);
+            this.txtInput25.TabIndex = 2;
+            this.txtInput25.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput25.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput25.Validated += new System.EventHandler(this.txtInput25_Validated);
+            // 
+            // cmbTransferConstruction
+            // 
+            this.cmbTransferConstruction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTransferConstruction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbTransferConstruction.FormattingEnabled = true;
+            this.cmbTransferConstruction.Location = new System.Drawing.Point(128, 843);
+            this.cmbTransferConstruction.Name = "cmbTransferConstruction";
+            this.cmbTransferConstruction.Size = new System.Drawing.Size(300, 27);
+            this.cmbTransferConstruction.TabIndex = 14;
+            this.cmbTransferConstruction.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // txtInput27
+            // 
+            this.txtInput27.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput27.Location = new System.Drawing.Point(128, 33);
+            this.txtInput27.MaxLength = 10;
+            this.txtInput27.Name = "txtInput27";
+            this.txtInput27.Size = new System.Drawing.Size(120, 26);
+            this.txtInput27.TabIndex = 1;
+            this.txtInput27.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput27.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput27.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput02
+            // 
+            this.txtInput02.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput02.Location = new System.Drawing.Point(128, 182);
+            this.txtInput02.MaxLength = 10;
+            this.txtInput02.Name = "txtInput02";
+            this.txtInput02.Size = new System.Drawing.Size(120, 26);
+            this.txtInput02.TabIndex = 4;
+            this.txtInput02.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput02.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput02.Validated += new System.EventHandler(this.txtInput02_TextChanged);
+            // 
+            // txtInput06
+            // 
+            this.txtInput06.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput06.Location = new System.Drawing.Point(128, 212);
+            this.txtInput06.MaxLength = 10;
+            this.txtInput06.Name = "txtInput06";
+            this.txtInput06.Size = new System.Drawing.Size(120, 26);
+            this.txtInput06.TabIndex = 5;
+            this.txtInput06.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput06.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput06.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput12
+            // 
+            this.txtInput12.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput12.Location = new System.Drawing.Point(128, 302);
+            this.txtInput12.MaxLength = 10;
+            this.txtInput12.Name = "txtInput12";
+            this.txtInput12.Size = new System.Drawing.Size(120, 26);
+            this.txtInput12.TabIndex = 6;
+            this.txtInput12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput12.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput12.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput13
+            // 
+            this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput13.Location = new System.Drawing.Point(128, 332);
+            this.txtInput13.MaxLength = 10;
+            this.txtInput13.Name = "txtInput13";
+            this.txtInput13.Size = new System.Drawing.Size(120, 26);
+            this.txtInput13.TabIndex = 7;
+            this.txtInput13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput13.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput13.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX2
+            // 
+            this.textBoxEX2.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX2.Location = new System.Drawing.Point(128, 562);
+            this.textBoxEX2.MaxLength = 10;
+            this.textBoxEX2.Name = "textBoxEX2";
+            this.textBoxEX2.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX2.TabIndex = 10;
+            this.textBoxEX2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX2.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX1
+            // 
+            this.textBoxEX1.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX1.Location = new System.Drawing.Point(128, 502);
+            this.textBoxEX1.MaxLength = 10;
+            this.textBoxEX1.Name = "textBoxEX1";
+            this.textBoxEX1.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX1.TabIndex = 8;
+            this.textBoxEX1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX1.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput03
+            // 
+            this.txtInput03.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput03.Location = new System.Drawing.Point(128, 532);
+            this.txtInput03.MaxLength = 10;
+            this.txtInput03.Name = "txtInput03";
+            this.txtInput03.Size = new System.Drawing.Size(120, 26);
+            this.txtInput03.TabIndex = 9;
+            this.txtInput03.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput03.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput03.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput38
+            // 
+            this.txtInput38.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput38.Location = new System.Drawing.Point(128, 632);
+            this.txtInput38.MaxLength = 10;
+            this.txtInput38.Name = "txtInput38";
+            this.txtInput38.Size = new System.Drawing.Size(120, 26);
+            this.txtInput38.TabIndex = 11;
+            this.txtInput38.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput38.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput38.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput34
+            // 
+            this.txtInput34.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput34.Location = new System.Drawing.Point(128, 662);
+            this.txtInput34.MaxLength = 10;
+            this.txtInput34.Name = "txtInput34";
+            this.txtInput34.Size = new System.Drawing.Size(120, 26);
+            this.txtInput34.TabIndex = 12;
+            this.txtInput34.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput34.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput34.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // comboBoxEX4
+            // 
+            this.comboBoxEX4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBoxEX4.FormattingEnabled = true;
+            this.comboBoxEX4.Location = new System.Drawing.Point(129, 93);
+            this.comboBoxEX4.Name = "comboBoxEX4";
+            this.comboBoxEX4.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX4.TabIndex = 4;
+            this.comboBoxEX4.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // comboBoxEX3
+            // 
+            this.comboBoxEX3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBoxEX3.FormattingEnabled = true;
+            this.comboBoxEX3.Location = new System.Drawing.Point(129, 63);
+            this.comboBoxEX3.Name = "comboBoxEX3";
+            this.comboBoxEX3.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX3.TabIndex = 2;
+            this.comboBoxEX3.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbConstrSubPerson
+            // 
+            this.cmbConstrSubPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstrSubPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstrSubPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstrSubPerson.FormattingEnabled = true;
+            this.cmbConstrSubPerson.Location = new System.Drawing.Point(384, 63);
+            this.cmbConstrSubPerson.Name = "cmbConstrSubPerson";
+            this.cmbConstrSubPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbConstrSubPerson.TabIndex = 3;
+            this.cmbConstrSubPerson.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // textBoxEX3
+            // 
+            this.textBoxEX3.Enabled = false;
+            this.textBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.textBoxEX3.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX3.Location = new System.Drawing.Point(129, 273);
+            this.textBoxEX3.MaxLength = 10;
+            this.textBoxEX3.Name = "textBoxEX3";
+            this.textBoxEX3.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX3.TabIndex = 10;
+            this.textBoxEX3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX3.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX3.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX7
+            // 
+            this.textBoxEX7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.textBoxEX7.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX7.Location = new System.Drawing.Point(129, 363);
+            this.textBoxEX7.MaxLength = 10;
+            this.textBoxEX7.Name = "textBoxEX7";
+            this.textBoxEX7.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX7.TabIndex = 13;
+            this.textBoxEX7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX7.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX7.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput35
+            // 
+            this.txtInput35.Enabled = false;
+            this.txtInput35.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput35.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput35.Location = new System.Drawing.Point(129, 303);
+            this.txtInput35.MaxLength = 10;
+            this.txtInput35.Name = "txtInput35";
+            this.txtInput35.Size = new System.Drawing.Size(120, 26);
+            this.txtInput35.TabIndex = 11;
+            this.txtInput35.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput35.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput35.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput04
+            // 
+            this.txtInput04.Enabled = false;
+            this.txtInput04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput04.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput04.Location = new System.Drawing.Point(129, 333);
+            this.txtInput04.MaxLength = 10;
+            this.txtInput04.Name = "txtInput04";
+            this.txtInput04.Size = new System.Drawing.Size(120, 26);
+            this.txtInput04.TabIndex = 12;
+            this.txtInput04.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput04.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput04.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX5
+            // 
+            this.textBoxEX5.BackColor = System.Drawing.SystemColors.Window;
+            this.textBoxEX5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.textBoxEX5.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX5.Location = new System.Drawing.Point(393, 183);
+            this.textBoxEX5.MaxLength = 10;
+            this.textBoxEX5.Name = "textBoxEX5";
+            this.textBoxEX5.ReadOnly = true;
+            this.textBoxEX5.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX5.TabIndex = 9;
+            this.textBoxEX5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX5.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX5.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX4
+            // 
+            this.textBoxEX4.BackColor = System.Drawing.SystemColors.Window;
+            this.textBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.textBoxEX4.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX4.Location = new System.Drawing.Point(393, 153);
+            this.textBoxEX4.MaxLength = 10;
+            this.textBoxEX4.Name = "textBoxEX4";
+            this.textBoxEX4.ReadOnly = true;
+            this.textBoxEX4.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX4.TabIndex = 8;
+            this.textBoxEX4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX4.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX4.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput29
+            // 
+            this.txtInput29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.txtInput29.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput29.Location = new System.Drawing.Point(189, 153);
+            this.txtInput29.MaxLength = 10;
+            this.txtInput29.Name = "txtInput29";
+            this.txtInput29.Size = new System.Drawing.Size(120, 26);
+            this.txtInput29.TabIndex = 6;
+            this.txtInput29.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput29.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput29.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput30
+            // 
+            this.txtInput30.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.txtInput30.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput30.Location = new System.Drawing.Point(189, 183);
+            this.txtInput30.MaxLength = 10;
+            this.txtInput30.Name = "txtInput30";
+            this.txtInput30.Size = new System.Drawing.Size(120, 26);
+            this.txtInput30.TabIndex = 7;
+            this.txtInput30.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput30.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput30.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // cmbConstrInst
+            // 
+            this.cmbConstrInst.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstrInst.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstrInst.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstrInst.FormattingEnabled = true;
+            this.cmbConstrInst.Location = new System.Drawing.Point(384, 93);
+            this.cmbConstrInst.Name = "cmbConstrInst";
+            this.cmbConstrInst.Size = new System.Drawing.Size(255, 27);
+            this.cmbConstrInst.TabIndex = 5;
+            this.cmbConstrInst.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // comboBoxEX2
+            // 
+            this.comboBoxEX2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBoxEX2.FormattingEnabled = true;
+            this.comboBoxEX2.Location = new System.Drawing.Point(129, 33);
+            this.comboBoxEX2.Name = "comboBoxEX2";
+            this.comboBoxEX2.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX2.TabIndex = 0;
+            this.comboBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbConstrPerson
+            // 
+            this.cmbConstrPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstrPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstrPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstrPerson.FormattingEnabled = true;
+            this.cmbConstrPerson.Location = new System.Drawing.Point(384, 33);
+            this.cmbConstrPerson.Name = "cmbConstrPerson";
+            this.cmbConstrPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbConstrPerson.TabIndex = 1;
+            this.cmbConstrPerson.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // dgvPurchaseOrder
+            // 
+            this.dgvPurchaseOrder.AllowUserToAddRows = false;
+            this.dgvPurchaseOrder.AllowUserToDeleteRows = false;
+            this.dgvPurchaseOrder.AllowUserToResizeColumns = false;
+            this.dgvPurchaseOrder.AllowUserToResizeRows = false;
+            this.dgvPurchaseOrder.BackgroundColor = System.Drawing.Color.White;
+            this.dgvPurchaseOrder.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPurchaseOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            this.dgvPurchaseOrder.ColumnHeadersHeight = 24;
+            this.dgvPurchaseOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvPurchaseOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column7,
+            this.Column8,
+            this.Column9,
+            this.Column10});
+            this.dgvPurchaseOrder.EnableHeadersVisualStyles = false;
+            this.dgvPurchaseOrder.Location = new System.Drawing.Point(128, 123);
+            this.dgvPurchaseOrder.Name = "dgvPurchaseOrder";
+            this.dgvPurchaseOrder.RowHeadersVisible = false;
+            this.dgvPurchaseOrder.RowHeadersWidth = 20;
+            this.dgvPurchaseOrder.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvPurchaseOrder.RowTemplate.Height = 24;
+            this.dgvPurchaseOrder.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvPurchaseOrder.Size = new System.Drawing.Size(484, 170);
+            this.dgvPurchaseOrder.TabIndex = 166;
+            this.dgvPurchaseOrder.TabStop = false;
+            this.dgvPurchaseOrder.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPurchaseOrder_CellDoubleClick);
+            // 
+            // Column7
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column7.HeaderText = "";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column7.Width = 120;
+            // 
+            // Column8
+            // 
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column8.HeaderText = "";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column8.Width = 121;
+            // 
+            // Column9
+            // 
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle9;
+            this.Column9.HeaderText = "";
+            this.Column9.Name = "Column9";
+            this.Column9.ReadOnly = true;
+            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column9.Width = 120;
+            // 
+            // Column10
+            // 
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column10.HeaderText = "";
+            this.Column10.Name = "Column10";
+            this.Column10.ReadOnly = true;
+            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column10.Width = 120;
+            // 
+            // dgvLink
+            // 
+            this.dgvLink.AllowUserToAddRows = false;
+            this.dgvLink.AllowUserToDeleteRows = false;
+            this.dgvLink.AllowUserToResizeColumns = false;
+            this.dgvLink.AllowUserToResizeRows = false;
+            this.dgvLink.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dgvLink.BackgroundColor = System.Drawing.Color.White;
+            this.dgvLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvLink.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            this.dgvLink.ColumnHeadersHeight = 24;
+            this.dgvLink.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvLink.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column0,
+            this.Column1,
+            this.Column5,
+            this.Column3,
+            this.Column2,
+            this.Column4,
+            this.Column6});
+            this.dgvLink.EnableHeadersVisualStyles = false;
+            this.dgvLink.Location = new System.Drawing.Point(1, 369);
+            this.dgvLink.Name = "dgvLink";
+            this.dgvLink.RowHeadersVisible = false;
+            this.dgvLink.RowHeadersWidth = 20;
+            this.dgvLink.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvLink.RowTemplate.Height = 24;
+            this.dgvLink.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvLink.Size = new System.Drawing.Size(637, 164);
+            this.dgvLink.TabIndex = 166;
+            this.dgvLink.TabStop = false;
+            this.dgvLink.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvLink_CellDoubleClick);
+            // 
+            // Column0
+            // 
+            this.Column0.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.Column0.Name = "Column0";
+            this.Column0.ReadOnly = true;
+            this.Column0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column0.Visible = false;
+            // 
+            // Column1
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle12;
+            this.Column1.HeaderText = "å¢—æ¸›æ—¥";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 120;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle13;
+            this.Column5.HeaderText = "è¦‹ç©�é‡‘é¡�";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Width = 120;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle14;
+            this.Column3.HeaderText = "è¦‹ç©�ç¨Žè¾¼é‡‘é¡�";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 120;
+            // 
+            // Column2
+            // 
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle15;
+            this.Column2.HeaderText = "å�—æ³¨é‡‘é¡�";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column2.Width = 120;
+            // 
+            // Column4
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle16;
+            this.Column4.HeaderText = "å�—æ³¨ç¨Žè¾¼é‡‘é¡�";
+            this.Column4.Name = "Column4";
+            this.Column4.ReadOnly = true;
+            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column4.Width = 120;
+            // 
+            // Column6
+            // 
+            this.Column6.HeaderText = "å·¥äº‹å��ç§°";
+            this.Column6.Name = "Column6";
+            this.Column6.ReadOnly = true;
+            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column6.Width = 300;
+            // 
+            // dgvBillingDate
+            // 
+            this.dgvBillingDate.AllowUserToAddRows = false;
+            this.dgvBillingDate.AllowUserToDeleteRows = false;
+            this.dgvBillingDate.AllowUserToResizeColumns = false;
+            this.dgvBillingDate.AllowUserToResizeRows = false;
+            this.dgvBillingDate.BackgroundColor = System.Drawing.Color.White;
+            this.dgvBillingDate.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvBillingDate.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
+            this.dgvBillingDate.ColumnHeadersHeight = 24;
+            this.dgvBillingDate.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvBillingDate.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.BillingGridColumn1,
+            this.BillingGridColumn2,
+            this.BillingGridColumn3,
+            this.BillingGridColumn4});
+            this.dgvBillingDate.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.dgvBillingDate.EnableHeadersVisualStyles = false;
+            this.dgvBillingDate.Location = new System.Drawing.Point(129, 91);
+            this.dgvBillingDate.Name = "dgvBillingDate";
+            this.dgvBillingDate.RowHeadersVisible = false;
+            this.dgvBillingDate.RowHeadersWidth = 20;
+            this.dgvBillingDate.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvBillingDate.RowTemplate.Height = 24;
+            this.dgvBillingDate.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvBillingDate.Size = new System.Drawing.Size(484, 170);
+            this.dgvBillingDate.TabIndex = 167;
+            this.dgvBillingDate.TabStop = false;
+            // 
+            // BillingGridColumn1
+            // 
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.BillingGridColumn1.DefaultCellStyle = dataGridViewCellStyle18;
+            this.BillingGridColumn1.HeaderText = "";
+            this.BillingGridColumn1.Name = "BillingGridColumn1";
+            this.BillingGridColumn1.ReadOnly = true;
+            this.BillingGridColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.BillingGridColumn1.Width = 120;
+            // 
+            // BillingGridColumn2
+            // 
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.BillingGridColumn2.DefaultCellStyle = dataGridViewCellStyle19;
+            this.BillingGridColumn2.HeaderText = "";
+            this.BillingGridColumn2.Name = "BillingGridColumn2";
+            this.BillingGridColumn2.ReadOnly = true;
+            this.BillingGridColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.BillingGridColumn2.Width = 121;
+            // 
+            // BillingGridColumn3
+            // 
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.BillingGridColumn3.DefaultCellStyle = dataGridViewCellStyle20;
+            this.BillingGridColumn3.HeaderText = "";
+            this.BillingGridColumn3.Name = "BillingGridColumn3";
+            this.BillingGridColumn3.ReadOnly = true;
+            this.BillingGridColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.BillingGridColumn3.Width = 120;
+            // 
+            // BillingGridColumn4
+            // 
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle21.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.BillingGridColumn4.DefaultCellStyle = dataGridViewCellStyle21;
+            this.BillingGridColumn4.HeaderText = "";
+            this.BillingGridColumn4.Name = "BillingGridColumn4";
+            this.BillingGridColumn4.ReadOnly = true;
+            this.BillingGridColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.BillingGridColumn4.Width = 120;
+            // 
+            // textBoxEX9
+            // 
+            this.textBoxEX9.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX9.Location = new System.Drawing.Point(129, 340);
+            this.textBoxEX9.MaxLength = 10;
+            this.textBoxEX9.Name = "textBoxEX9";
+            this.textBoxEX9.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX9.TabIndex = 4;
+            this.textBoxEX9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX9.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX9.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX8
+            // 
+            this.textBoxEX8.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX8.Location = new System.Drawing.Point(129, 307);
+            this.textBoxEX8.MaxLength = 10;
+            this.textBoxEX8.Name = "textBoxEX8";
+            this.textBoxEX8.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX8.TabIndex = 3;
+            this.textBoxEX8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX8.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX8.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX6
+            // 
+            this.textBoxEX6.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX6.Location = new System.Drawing.Point(334, 307);
+            this.textBoxEX6.MaxLength = 10;
+            this.textBoxEX6.Name = "textBoxEX6";
+            this.textBoxEX6.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX6.TabIndex = 2;
+            this.textBoxEX6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX6.Visible = false;
+            this.textBoxEX6.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX6.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput36
+            // 
+            this.txtInput36.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput36.Location = new System.Drawing.Point(129, 49);
+            this.txtInput36.MaxLength = 10;
+            this.txtInput36.Name = "txtInput36";
+            this.txtInput36.Size = new System.Drawing.Size(120, 26);
+            this.txtInput36.TabIndex = 1;
+            this.txtInput36.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput36.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput36.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
             // FrmConstructionBaseInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -4351,7 +4351,6 @@
             this.tableLayoutPanel2.ResumeLayout(false);
             this.panel10.ResumeLayout(false);
             this.panel10.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.panel2.ResumeLayout(false);
@@ -4367,11 +4366,8 @@
             this.pnlFluctuation.ResumeLayout(false);
             this.pnlFluctuation.PerformLayout();
             this.panel8.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvPurchaseOrder)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvLink)).EndInit();
             this.panel9.ResumeLayout(false);
             this.panel9.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvBillingDate)).EndInit();
             this.pnlProgress.ResumeLayout(false);
             this.pnlProgress.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trkProgress)).EndInit();
@@ -4380,6 +4376,10 @@
             this.groupBoxEx1.PerformLayout();
             this.panel5.ResumeLayout(false);
             this.panel5.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPurchaseOrder)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvLink)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvBillingDate)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 483)
@@ -3903,7 +3903,7 @@
                     // ‘ä’ Œ‹�‡Œã‚ÌƒXƒe�[ƒ^ƒX•Ï�X“¯Šú�ˆ—��iŽ©“®•Û‘¶Žž‚Í�ˆ—�‚µ‚È‚¢�j
                     if (MsgOn)
                     {
-                        if (!SyncFluctuationData(cbiDB, iStatus)) return false;
+                        if (!SyncFluctuationData(cbiDB, work)) return false;
                     }
                 }
                 else
@@ -3936,13 +3936,12 @@
         /// ‘�Œ¸�HŽ–‚ÌƒXƒe�[ƒ^ƒX•Ï�X“¯Šú�ˆ—�
         /// </summary>
         /// <returns></returns>
-        private bool SyncFluctuationData(IOConstructionBaseInfo cbiDB, int nStatus)
+        private bool SyncFluctuationData(IOConstructionBaseInfo cbiDB, ConstructionBaseInfo NowRec)
         {
             FrmConstrProgDiag frm = new FrmConstrProgDiag();
             try
             {
                 int[] nStatArrary = new int[] {CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Ž{�H�€”õ")).Key,
-                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Ž{�H�€”õ")).Key,
                                                 CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Ž{�HŠJŽn")).Key,
                                                 CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Ž{�HŠ®—¹")).Key,
                                                 CommonDefine.ProjectsStatus.First(x => x.Value.Equals("�¿‹��€”õ")).Key,
@@ -3951,7 +3950,7 @@
                 bool bAns = false;
                 for (int i = 0; i < nStatArrary.Length; i++)
                 {
-                    if (nStatArrary[i] != nStatus) continue;
+                    if (nStatArrary[i] != NowRec.ConstructionStatusFlg) continue;
 
                     bAns = true;
                     break;
@@ -3960,8 +3959,6 @@
 
                 // “¯Šúƒf�[ƒ^‘I‘ð
                 frm.ConstructionCode = m_ConstructionCode;
-                // �ˆ—�‚ð‹N“®‚·‚é‚©‚Ìƒ`ƒFƒbƒN‚ð�s‚¤
-                if (!frm.ChkExec) return true;
 
                 DialogResult drRwt = frm.ShowDialog();
                 if (drRwt == DialogResult.Cancel) return true;
@@ -3973,11 +3970,11 @@
                     // ƒXƒe�[ƒ^ƒX•Ï�X
                     if (!(bRet = cbiDB.UpdateFeild(nCode
                                             , (int)IOConstructionBaseInfo.TableColumn.ConstructionStatusFlg
-                                            , nStatus
+                                            , NowRec.ConstructionStatusFlg
                                             , false))) break;
 
                     // ƒXƒe�[ƒ^ƒX“¯ŠúŽž“ú•tƒZƒbƒg
-                    if (!(bRet = SetSyncDate(cbiDB, nCode))) break;
+                    if (!(bRet = SetSyncDate(cbiDB, nCode, NowRec))) break;
                 }
 
                 return bRet;
@@ -3998,7 +3995,7 @@
         /// <summary>
         /// ƒXƒe�[ƒ^ƒX“¯ŠúŽž“ú•tƒZƒbƒg
         /// </summary>
-        private bool SetSyncDate(IOConstructionBaseInfo cbiDB, int ConstrCode)
+        private bool SetSyncDate(IOConstructionBaseInfo cbiDB, int ConstrCode, ConstructionBaseInfo ConstrRec)
         {
             try
             {
@@ -4018,49 +4015,60 @@
                     case (int)CommonDefine.StatNumArray.Status3:                                    // 3, ‰¼ Žó ’�
                         strSet.AppendFormat(" ProvisionalOrderDate = DATE('{0}')", wrkDate);        // ‰¼Žó’�“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (ProvisionalOrderDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status4:                                    // 4, Žó�@�@’�
                         strSet.AppendFormat(" OrderDate = DATE('{0}')", wrkDate);                   // Žó’�“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (OrderDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status5:                                    // 5, •”��ˆøŒp
                         strSet.AppendFormat(" TransferConstructionDate = DATE('{0}')", wrkDate);    // •”��ˆøŒp“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (TransferConstructionDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status6:                                    // 6, Ž{�H�€”õ
                         strSet.AppendFormat(" PreparationStartDate = DATE('{0}')", wrkDate);        // Ž{�H�€”õŠJŽn“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (PreparationStartDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status7:                                    // 7, Ž{�HŠJŽn
                         strSet.AppendFormat(" ConstructionStartingDate = DATE('{0}')", wrkDate);    // Ž{�HŠJŽn“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (ConstructionStartingDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status8:                                    // 8, Ž{�HŠ®—¹
                         strSet.AppendFormat(" ConstructionCompletionDate = DATE('{0}')", wrkDate);  // Ž{�HŠ®—¹“ú‚Ì�Ý’è
+
+                        // ŒŸ�¸—\’è“ú‚Ì�Ý’è
+                        if (ConstrRec.InspectPlanningDate.Date != DateTime.MinValue.Date)
+                            strSet.AppendFormat(", InspectPlanningDate = DATE('{0}')", ConstrRec.InspectPlanningDate.Date);
+
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (ConstructionCompletionDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status9:                                    // 9, �¿‹��€”õ
                         strSet.AppendFormat(" BillingStartDate = DATE('{0}')", wrkDate);            // �¿‹��€”õŠJŽn“ú‚Ì�Ý’è
+
+                        // ŒŸ�¸ŽÀ�s“ú‚Ì�Ý’è
+                        if (ConstrRec.InspectExecuteDate.Date != DateTime.MinValue.Date)
+                            strSet.AppendFormat(", InspectExecuteDate = DATE('{0}')", ConstrRec.InspectExecuteDate.Date);
+
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (BillingStartDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status10:                                   // 10, �¿‹�Šm”F
                         strSet.AppendFormat(" BillingDate = DATE('{0}')", wrkDate);                 // �¿‹�Šm”F“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (BillingDate) = DATE ('0001/01/01')");
                         break;
+
                     case (int)CommonDefine.StatNumArray.Status11:                                   // 11, ”ñ Žó ’�
                         strSet.AppendFormat(" NonOrderDate = DATE('{0}')", wrkDate);                // ”ñŽó’�“ú‚Ì�Ý’è
                         strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
-                        //strWhere.Append("       And DATE (NonOrderDate) = DATE ('0001/01/01')");
                         break;
+
                 }
+
                 if (strSet.Length < 1) return true;
 
                 StringBuilder strSQL = new StringBuilder();
@@ -4531,8 +4539,6 @@
 
             IORecordKey RecDB = new IORecordKey();                                      // ƒŒƒR�[ƒh”Ô�†ŠÇ—�
 
-            FrmConstructionLedger frm = new FrmConstructionLedger();                    // �HŽ–�Ú�×‘ä’ “ü—Í
-
             try
             {
                 //ƒf�[ƒ^ƒ`ƒFƒbƒN
@@ -4626,6 +4632,7 @@
                     return false;
                 }
 
+                // ’S“–ŽÒ“™‚Ì•Ï�X�ˆ—�
                 if (!ChgConstrChargeDataEntry(ChgMenDB, LinkDB))
                 {
                     MessageBox.Show("�HŽ–Šî–{�î•ñ�i’S“–ŽÒ�jƒf�[ƒ^“o˜^ƒGƒ‰�[‚Å‚·�B", "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -4695,7 +4702,7 @@
 
                 // �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�X�V
                 if (!LedgerDataChange(LedgerDB, LedgerDDB, LedgerEDB,
-                                        TotalOrdersPrice, TyingDataFlag, ParentData, ProcConstrCode, frm, ref ProcConstrCode))
+                                        TotalOrdersPrice, TyingDataFlag, ParentData, ProcConstrCode, ref ProcConstrCode))
                 {
                     MessageBox.Show("�HŽ–�Ú�×‘ä’ ƒf�[ƒ^�X�VƒGƒ‰�[‚Å‚·�B", "�X�VƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     RollBackCommitProc(true,
@@ -4767,26 +4774,6 @@
                                     mbdDB, mbtDB, mbhDB, RecDB,
                                     ChgMenDB, LinkDB, ReqHeadDB);
 
-                // ‘ä’ ‚ª‘¶�Ý‚·‚ê‚Î�ÄŒvŽZ‚·‚é
-                if (ClsChangeLedgerData.CheckExistenceLedger(m_ConstructionCode))
-                {
-                    // �HŽ–ƒR�[ƒh‚ÌƒZƒbƒg
-                    frm.ConstructionCode = ProcConstrCode;
-
-                    // Œ©‚¦‚È‚¢‰æ–Ê‚ð�o‚·
-                    frm.WindowState = FormWindowState.Minimized;
-                    frm.ShowInTaskbar = false;
-                    // ƒtƒH�[ƒ€”ñ•\Ž¦
-                    frm.OnVisible = false;
-                    frm.Show();
-
-                    // �ÄŒvŽZ�ˆ—�
-                    bool bret = frm.RecalculateLedger;
-
-                    // ‰æ–Ê‚ð•Â‚¶‚é
-                    frm.Close();
-                }
-
                 // “o˜^�¬Œ÷‚Í•Ï‰»ƒtƒ‰ƒOƒNƒŠƒA
                 m_bChengeAns = false;
 
@@ -4823,8 +4810,6 @@
                 LinkDB.close(); LinkDB = null;
 
                 ReqHeadDB.close(); ReqHeadDB = null;
-
-                frm.Dispose(); frm = null;
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs	(revision 483)
@@ -42,83 +42,6 @@
 
         #region ’è�”
 
-        #region ƒf�[ƒ^ƒOƒ‹�[ƒv
-        /// <summary>
-        /// ƒf�[ƒ^ƒOƒ‹�[ƒv
-        /// </summary>
-        public enum DataGroup
-        {
-            /// <summary>
-            /// 0:‹ó”’
-            /// </summary>
-            Empty = 0,
-            /// <summary>
-            /// 1:Œo”ï
-            /// </summary>
-            Expenses,
-            /// <summary>
-            /// 2:‹¤’Ê‰¼�Ý”ï
-            /// </summary>
-            CommonTempCosts,
-            /// <summary>
-            /// 3:ŠO’�”ï
-            /// </summary>
-            OutSourceCosts,
-            /// <summary>
-            /// 4:Ž©ŽÐŽ{�H
-            /// </summary>
-            MyConstruction,
-            /// <summary>
-            /// 5:�w“ü•i
-            /// </summary>
-            PurchaseCosts,
-            /// <summary>
-            /// 6:ŽÔ—¼ƒŠ�[ƒX‘ã
-            /// </summary>
-            VehicleLeaseFee,
-            /// <summary>
-            /// 7:Œð’Ê”ï�i’Ê�s—¿�E“dŽÔ‘ã�j
-            /// </summary>
-            TransportationCosts,
-            /// <summary>
-            /// 8:’“ŽÔ�ê�EŽ‘�Þ’u‚«�ê
-            /// </summary>
-            ParkingCosts,
-            /// <summary>
-            /// 9:�h”‘”ï
-            /// </summary>
-            RoomChargeCosts,
-            /// <summary>
-            /// 10:�ˆ•ª”ï“™
-            /// </summary>
-            DisposeCosts,
-            /// <summary>
-            /// 11:‘e—˜‰v
-            /// </summary>
-            GrossProfit,
-            /// <summary>
-            /// 12:Žw“±ˆõ‹‹—^
-            /// </summary>
-            InstructorCosts,
-            /// <summary>
-            /// 13:•›’S“–‹‹—^Œo”ï
-            /// </summary>
-            AssistantCosts,
-            /// <summary>
-            /// 14:‹‹—^Œo”ï
-            /// </summary>
-            PayrollExpenses,
-            /// <summary>
-            /// 15:�ƒ—˜‰v
-            /// </summary>
-            NetIncome,
-            /// <summary>
-            /// 16:�‡Œv‹àŠz
-            /// </summary>
-            AllTotal,
-        }
-        #endregion
-
         #region ƒOƒŠƒbƒh•\Ž¦ƒJƒ‰ƒ€
         /// <summary>
         /// •\Ž¦ƒJƒ‰ƒ€
@@ -740,7 +663,7 @@
         {
             try
             {
-                await Task.Delay(500);
+                await Task.Delay(100);
 
                 // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
                 InitFormLoad();
@@ -836,9 +759,9 @@
                 DataGridViewRow CurRow = dgv.CurrentRow;
                 // ‹¤’Ê‰¼�Ý”ï�EŠO’�”ï�EŽ©ŽÐŽ{�H‚Ì‚Ý�ˆ—�‚·‚é
                 int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
-                if (GroupNo != (int)FrmConstructionBudget.DataGroup.CommonTempCosts
-                    && GroupNo != (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                    && GroupNo != (int)FrmConstructionBudget.DataGroup.MyConstruction) return;
+                if (GroupNo != (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts
+                    && GroupNo != (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                    && GroupNo != (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction) return;
                 
                 // ‹¦—Í‰ïŽÐƒR�[ƒh�E–¼�Ì‚ðƒNƒŠƒA‚·‚é
                 CurRow.Cells[(int)(int)GridColumn.CompanyType].Value = 0;
@@ -964,14 +887,14 @@
                     switch (GroupNo)
                     {
                         // Ž©ŽÐŽ{�HƒOƒ‹�[ƒv�EŠO’�”ïƒOƒ‹�[ƒv�E‹¤’Ê‰¼�ÝƒOƒ‹�[ƒvˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-                        case (int)FrmConstructionBudget.DataGroup.CommonTempCosts:
-                        case (int)FrmConstructionBudget.DataGroup.OutSourceCosts:
-                        case (int)FrmConstructionBudget.DataGroup.MyConstruction:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction:
                             // ‹¦—Í‰ïŽÐ‘I‘ð
                             ShowSubConstructorDiag();
                             break;
                         // �w“ü•i
-                        case (int)FrmConstructionBudget.DataGroup.PurchaseCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts:
                             // Žd“ü�æ‘I‘ð
                             ShowSuppliersDiag();
                             break;
@@ -984,9 +907,9 @@
                     switch (GroupNo)
                     {
                         // Ž©ŽÐŽ{�H�EŠO’�”ïƒOƒ‹�[ƒvˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-                        case (int)FrmConstructionBudget.DataGroup.CommonTempCosts:
-                        case (int)FrmConstructionBudget.DataGroup.OutSourceCosts:
-                        case (int)FrmConstructionBudget.DataGroup.MyConstruction:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction:
                             // Œð�Â•¶Žš—ñ‚ðƒZƒbƒg‚·‚é
                             SetNegotiateString(e.RowIndex);
                             break;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 483)
@@ -817,7 +817,7 @@
                 dgv.Rows[rowcnt].ReadOnly = true;
 
                 // è‡ªç¤¾æ–½å·¥ã�¯ã‚¿ã‚¤ãƒˆãƒ«è¡Œã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º
-                if (TitleNo == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                if (TitleNo == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {
                     SetCustomTitle(dgv.Rows[rowcnt]);
                 }
@@ -888,7 +888,7 @@
 
                 // å¤–æ³¨è²»è¡Œã‚’å�–å¾—(ç™ºæ³¨å¸Œæœ›é‡‘é¡�)
                 DataGridViewEX dgv = dgvAllDisplay;
-                long lRet = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.OutSourceCosts)
+                long lRet = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts)
                                                                 .Sum(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.HopePrice].Value));
 
                 return lRet;
@@ -918,7 +918,7 @@
 
                 // è‡ªç¤¾æ–½å·¥ã‚¿ã‚¤ãƒˆãƒ«ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
                 int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
-                if (GroupNo != (int)FrmConstructionBudget.DataGroup.MyConstruction) return;
+                if (GroupNo != (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction) return;
                 if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != 1) return;
 
                 // ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�ï½žæ§‹æˆ�æ¯”çŽ‡ã‚’çµ�å�ˆ
@@ -976,39 +976,39 @@
                 
                 switch (GroupNo)
                 {
-                    case (int)FrmConstructionBudget.DataGroup.CommonTempCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts:
                         // å…±é€šä»®è¨­ã�®ã‚»ãƒ«ãƒ­ãƒƒã‚¯è§£é™¤
                         CurRow.Cells[(int)GridColumn.TextName].ReadOnly = false;
                         break;
-                    case (int)FrmConstructionBudget.DataGroup.OutSourceCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts:
                         // å¤–æ³¨è²»ã�®ã‚»ãƒ«ãƒ­ãƒƒã‚¯è§£é™¤
                         CurRow.Cells[(int)GridColumn.TextName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.ItemName].ReadOnly = false;
                         break;
-                    case (int)FrmConstructionBudget.DataGroup.MyConstruction:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction:
                         // è‡ªç¤¾æ–½å·¥ã�®å…¥åŠ›ãƒ­ãƒƒã‚¯è§£é™¤
                         CurRow.Cells[(int)GridColumn.TextName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.ItemName].ReadOnly = false;
                         break;
-                    case (int)FrmConstructionBudget.DataGroup.PurchaseCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts:
                         // è³¼å…¥å“�ã�®å…¥åŠ›ãƒ­ãƒƒã‚¯è§£é™¤
                         CurRow.Cells[(int)GridColumn.TextName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.ItemName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.CompanyName].ReadOnly = false;
                         break;
-                    case (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee:
                         // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)FrmConstructionBudget.DataGroup.TransportationCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts:
                         // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    case (int)FrmConstructionBudget.DataGroup.ParkingCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts:
                         // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)FrmConstructionBudget.DataGroup.RoomChargeCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts:
                         // å®¿æ³Šè²»
                         CurRow.Cells[(int)GridColumn.ItemName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.TextName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.CompanyName].ReadOnly = false;
                         break;
-                    case (int)FrmConstructionBudget.DataGroup.DisposeCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts:
                         // å‡¦åˆ†è²»ã�®å…¥åŠ›ãƒ­ãƒƒã‚¯è§£é™¤
                         CurRow.Cells[(int)GridColumn.ItemName].ReadOnly = false;
                         CurRow.Cells[(int)GridColumn.TextName].ReadOnly = false;
@@ -1300,7 +1300,7 @@
                 double OrdersPrice = CommonMotions.cnvDouble(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text.Replace("\\", ""));
 
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.Expenses, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.Expenses]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.Expenses, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.Expenses]);
 
                 // é–¢é€£å·¥äº‹ã�¯ä¼šç¤¾çµŒè²»ï¼•ï¼…ã� ã�‘ã�«ã�™ã‚‹
                 GetBudgetExpensesList();
@@ -1315,11 +1315,11 @@
 
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.Expenses;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.Expenses;
 
                     // çµŒè²»å��ç§°ã‚»ãƒƒãƒˆ
                     string strVallue = CommonMotions.cnvString(wrkExpense[(int)CommonMotions.ExpensesArray.ExpensesName]);
-                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.Expenses, icnt);
+                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.Expenses, icnt);
                     RowData[(int)GridColumn.FixFlg] = "*";
                     RowData[(int)GridColumn.ComponentCode] = CommonMotions.cnvInt(wrkExpense[(int)CommonMotions.ExpensesArray.NameCode]);
                     RowData[(int)GridColumn.ItemName] = string.Format("{0}({1}%)", strVallue, dExpenses.ToString("0.00"));
@@ -1353,9 +1353,10 @@
                 // ä¸€èˆ¬ç®¡ç�†è²»ã�®è¡¨ç¤º
                 nPlusRow = SetNormalManagement();
                 // æŒ¿å…¥è¡Œåˆ†è¡Œã‚«ã‚¦ãƒ³ãƒˆã‚’ã�šã‚‰ã�™
-                for (int i = 0; i < m_CostsRowCount.Count(); i++)
+                for (int i = 0; i < m_CostsRowCount.Length; i++)
                 {
-                    m_CostsRowCount[i] += nPlusRow;
+                    if (m_CostsRowCount[i] > 0)
+                        m_CostsRowCount[i] += nPlusRow;
                 }
 
                 // ç�¾å ´ç®¡ç�†è²»ã�®è¡¨ç¤º
@@ -1364,7 +1365,8 @@
                 // æŒ¿å…¥è¡Œåˆ†è¡Œã‚«ã‚¦ãƒ³ãƒˆã‚’ã�šã‚‰ã�™
                 for (int i = (int)CostsRowLine.InstructorRowLine; i <= (int)CostsRowLine.AllTotalRowLine; i++)
                 {
-                    m_CostsRowCount[i] += nPlusRow;
+                    if (m_CostsRowCount[i] > 0)
+                        m_CostsRowCount[i] += nPlusRow;
                 }
 
                 // ç´”åˆ©ç›Šè¨ˆç®—
@@ -1885,8 +1887,8 @@
                 object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.AllTotal;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.AllTotal];
+                RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.AllTotal;
+                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.AllTotal];
 
                 // è¡Œã‚»ãƒƒãƒˆ
                 CreateDataRow(RowData, true);
@@ -2028,17 +2030,17 @@
             switch (DetailRec.GroupCount)
             {
                 // çµŒè²»
-                case (int)FrmConstructionBudget.DataGroup.Expenses:
+                case (int)ConstructionBudgetDetail.GroupCountDef.Expenses:
                 // å…±é€šä»®è¨­è²»
-                case (int)FrmConstructionBudget.DataGroup.CommonTempCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts:
                 // å¤–æ³¨è²»
-                case (int)FrmConstructionBudget.DataGroup.OutSourceCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts:
                     // è¡Œæ•°ã‚’é€€é�¿ã�™ã‚‹
                     m_CostsRowCount[(int)CostsRowLine.OutSourceCostsLine] = (dgv.RowCount - 1);
                     bReturnFlg = false;
                     break;
                 // è‡ªç¤¾æ–½å·¥
-                case (int)FrmConstructionBudget.DataGroup.MyConstruction:
+                case (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction:
                     // ç©ºç™½è¡Œ
                     AddEmptyRow();
                     // è¡Œæ•°ã‚’é€€é�¿ã�™ã‚‹
@@ -2046,7 +2048,7 @@
                     bReturnFlg = false;
                     break;
                 // è³¼å…¥å“�
-                case (int)FrmConstructionBudget.DataGroup.PurchaseCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts:
                     // ç©ºç™½è¡Œ
                     AddEmptyRow();
                     // è¡Œæ•°ã‚’é€€é�¿ã�™ã‚‹
@@ -2054,27 +2056,27 @@
                     bReturnFlg = false;
                     break;
                 // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                case (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee:
+                case (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee:
                     // ç©ºç™½è¡Œã‚’é–‹ã�‘ã‚‹
                     AddEmptyRow();
                     bReturnFlg = true;
                     break;
                 // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                case (int)FrmConstructionBudget.DataGroup.TransportationCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts:
                 // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                case (int)FrmConstructionBudget.DataGroup.ParkingCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts:
                 // å®¿æ³Šè²»
-                case (int)FrmConstructionBudget.DataGroup.RoomChargeCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts:
                     bReturnFlg = true;
                     break;
                 // å‡¦åˆ†è²»ç­‰
-                case (int)FrmConstructionBudget.DataGroup.DisposeCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts:
                     // è¡Œæ•°ã‚’é€€é�¿ã�™ã‚‹
                     m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine] = dgv.RowCount;
                     bReturnFlg = true;
                     break;
                 // ç²—åˆ©ç›Š
-                case (int)FrmConstructionBudget.DataGroup.GrossProfit:
+                case (int)ConstructionBudgetDetail.GroupCountDef.GrossProfit:
                     // ç©ºè¡Œã‚’å…¥ã‚Œã‚‹
                     AddEmptyRow();
                     m_CostsRowCount[(int)CostsRowLine.GrossProfitRowLine] = dgv.RowCount;
@@ -2081,7 +2083,7 @@
                     bReturnFlg = true;
                     break;
                 // æŒ‡å°Žå“¡çµ¦ä¸Ž
-                case (int)FrmConstructionBudget.DataGroup.InstructorCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts:
                     // ç©ºç™½è¡Œ
                     AddEmptyRow();
                     m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] = dgv.RowCount;
@@ -2089,17 +2091,17 @@
                     //InitDispDataTitle_InstructorCosts(DetailRec);
                     break;
                 // å‰¯æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
-                case (int)FrmConstructionBudget.DataGroup.AssistantCosts:
+                case (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts:
                     m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] = dgv.RowCount;
                     bReturnFlg = true;
                     break;
                 // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
-                case (int)FrmConstructionBudget.DataGroup.PayrollExpenses:
+                case (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses:
                     m_CostsRowCount[(int)CostsRowLine.ConstructorRowLine] = dgv.RowCount;
                     bReturnFlg = true;
                     break;
                 // ç´”åˆ©ç›Š
-                case (int)FrmConstructionBudget.DataGroup.NetIncome:
+                case (int)ConstructionBudgetDetail.GroupCountDef.NetIncome:
                     m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine] = dgv.RowCount;
                     bReturnFlg = true;
                     break;
@@ -2139,7 +2141,7 @@
                 if (DetailList.Count == 0) return false;
 
                 DataGridViewEX dgv = dgvAllDisplay;
-                int GroupNo = (int)FrmConstructionBudget.DataGroup.Expenses;
+                int GroupNo = (int)ConstructionBudgetDetail.GroupCountDef.Expenses;
                 int icnt = 1;
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
                 CreateTitleRow(GroupNo, s_GroupTitle[GroupNo]);
@@ -2149,7 +2151,7 @@
                     if (GroupNo != DetailRec.GroupCount)
                     {
                         // æŒ‡å°Žå“¡é‡‘é¡�ã‚ˆã‚Šå‰�ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã�¯å¿…ã�šé€£ç•ªã�«ã�™ã‚‹ï¼ˆã‚°ãƒ«ãƒ¼ãƒ—ã‚¿ã‚¤ãƒˆãƒ«ã�ŒæŠœã�‘ã‚‹ã�®ã‚’é˜²æ­¢ã�™ã‚‹ã�Ÿã‚�ï¼‰
-                        if ((GroupNo + 1) != DetailRec.GroupCount && DetailRec.GroupCount < (int)FrmConstructionBudget.DataGroup.InstructorCosts)
+                        if ((GroupNo + 1) != DetailRec.GroupCount && DetailRec.GroupCount < (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts)
                         {
                             // ç�¾åœ¨ãƒ¬ã‚³ãƒ¼ãƒ‰ã�®ç•ªå�·ã�¾ã�§ã‚°ãƒ«ãƒ¼ãƒ—ã‚¿ã‚¤ãƒˆãƒ«ã‚’è¡¨ç¤ºã�™ã‚‹
                             for (int i = (GroupNo + 1); i < DetailRec.GroupCount; i++)
@@ -2170,15 +2172,15 @@
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ----- ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     // ç•ªå�·ã‚»ãƒƒãƒˆ
-                    if (DetailRec.GroupCount < (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee)
+                    if (DetailRec.GroupCount < (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee)
                     {
                         RowData[(int)GridColumn.No] = string.Format("{0}-{1}", DetailRec.GroupCount, icnt);
                     }
-                    else if (DetailRec.GroupCount < (int)FrmConstructionBudget.DataGroup.InstructorCosts)
+                    else if (DetailRec.GroupCount < (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts)
                     {
                         RowData[(int)GridColumn.No] = string.Format("{0}", DetailRec.GroupCount);
                     }
-                    else if ((int)FrmConstructionBudget.DataGroup.InstructorCosts <= DetailRec.GroupCount)
+                    else if ((int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts <= DetailRec.GroupCount)
                     {
 
                     }
@@ -2192,9 +2194,9 @@
                     RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode;
                     RowData[(int)GridColumn.CompanyName] = DetailRec.CompanyName;
                     // å…±é€šä»®è¨­è²»ãƒ»å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ã�®ã�¿ç©�ç®—é‡‘é¡�ã�Œã�‚ã‚‹
-                    if (DetailRec.GroupCount == (int)FrmConstructionBudget.DataGroup.CommonTempCosts ||
-                        DetailRec.GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts ||
-                        DetailRec.GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                    if (DetailRec.GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts ||
+                        DetailRec.GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts ||
+                        DetailRec.GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                     {
                         RowData[(int)GridColumn.EstimatePrice] = DetailRec.EstimatePrice.ToString("#,0");
                         RowData[(int)GridColumn.NegotiationPrice] = DetailRec.NegotiationPrice.ToString("#,0");
@@ -2211,7 +2213,7 @@
                     double BetweenTimes = CommonMotions.cnvDouble(m_DspLabelCtrl[(int)DspLblCtrlName.BetweenTimes].Text);
                     switch (DetailRec.GroupCount)
                     {
-                        case (int)FrmConstructionBudget.DataGroup.Expenses:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.Expenses:
                             // çµŒè²»
                             if (CalculateExpenss(DetailRec, ref RowData))
                             {
@@ -2218,7 +2220,7 @@
                                 CreateDataRow(RowData, true);
                             }
                             break;
-                        case (int)FrmConstructionBudget.DataGroup.PayrollExpenses:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses:
                             // æ‹…å½“è€…çµ¦ä¸Ž
                             if (DetailRec.EstimatePrice != 0)
                                 RowData[(int)GridColumn.TextName] = string.Format(CommonDefine.s_SalaryCostMonthlyFormat,
@@ -2226,7 +2228,7 @@
                                                                                     (m_CreatorMonthryCost * CommonDefine.s_SalaryCorrection).ToString("#,0"));
                             CreateDataRow(RowData, false);
                             break;
-                        case (int)FrmConstructionBudget.DataGroup.AssistantCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts:
                             // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
                             if (DetailRec.EstimatePrice != 0)
                                 RowData[(int)GridColumn.TextName] = string.Format(CommonDefine.s_SalaryCostMonthlyFormat,
@@ -2234,7 +2236,7 @@
                                                                                 m_AssistantMonthryCost.ToString("#,0"));
                             CreateDataRow(RowData, false);
                             break;
-                        case (int)FrmConstructionBudget.DataGroup.InstructorCosts:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts:
                             // æŒ‡å°Žå“¡çµ¦ä¸Ž
                             if (DetailRec.EstimatePrice != 0)
                                 RowData[(int)GridColumn.TextName] = string.Format(CommonDefine.s_SalaryCostMonthlyFormat,
@@ -2242,11 +2244,11 @@
                                                                                 m_InstructorMonthryCost.ToString("#,0"));
                             CreateDataRow(RowData, false);
                             break;
-                        case (int)FrmConstructionBudget.DataGroup.GrossProfit:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.GrossProfit:
                             // ç²—åˆ©ç›Šè¡Œè¨ˆç®—
                             CreateGrossProfit(true);
                             break;
-                        case (int)FrmConstructionBudget.DataGroup.NetIncome:
+                        case (int)ConstructionBudgetDetail.GroupCountDef.NetIncome:
                             // ç´”åˆ©ç›Šè¨ˆç®—
                             CreateNetIncome(true);
                             break;
@@ -2343,7 +2345,7 @@
             try
             {
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.CommonTempCosts, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.CommonTempCosts]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts]);
 
                 // ãƒ‡ãƒ¼ã‚¿èª­è¾¼
                 List<EstimateBudgetDetail> DetailList = new List<EstimateBudgetDetail>();
@@ -2359,9 +2361,9 @@
                 {
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.CommonTempCosts, icnt);
+                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts, icnt);
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.CommonTempCosts;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts;
                     RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode;
                     RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode;
                     RowData[(int)GridColumn.ItemName] = DetailRec.FirstString;
@@ -2405,7 +2407,7 @@
             try
             {
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.CommonTempCosts, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.CommonTempCosts]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts]);
 
                 // ãƒ‡ãƒ¼ã‚¿èª­è¾¼
                 StringBuilder strSQL = new StringBuilder();
@@ -2424,9 +2426,9 @@
                 {
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.CommonTempCosts, icnt);
+                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts, icnt);
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.CommonTempCosts;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts;
                     RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode;
                     RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode;
                     RowData[(int)GridColumn.ItemName] = DetailRec.ItemName;
@@ -2472,7 +2474,7 @@
             try
             {
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.OutSourceCosts, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.OutSourceCosts]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts]);
 
                 // å¤–æ³¨è²»ã�®è¡Œã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 m_CostsRowCount[(int)CostsRowLine.OutSourceCostsLine] = dgvAllDisplay.RowCount - 1;
@@ -2511,9 +2513,9 @@
                     DetailDB.Reader2Struct(objRec, ref DetailRec);
                     
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.OutSourceCosts, icnt);
+                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts, icnt);
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.OutSourceCosts;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts;
                     RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode;
                     RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode;
                     RowData[(int)GridColumn.ItemName] = DetailRec.SecondString;
@@ -2566,7 +2568,7 @@
             try
             {
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.OutSourceCosts, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.OutSourceCosts]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts]);
 
                 // å¤–æ³¨è²»ã�®è¡Œã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 m_CostsRowCount[(int)CostsRowLine.OutSourceCostsLine] = dgvAllDisplay.RowCount - 1;
@@ -2682,8 +2684,8 @@
             object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
             // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
             RowData[(int)GridColumn.FixFlg] = "*";
-            RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.OutSourceCosts, icnt);
-            RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.OutSourceCosts;
+            RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts, icnt);
+            RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts;
             RowData[(int)GridColumn.ItemName] = ItemName;
             RowData[(int)GridColumn.TextName] = ComponentName;
             RowData[(int)GridColumn.CompanyType] = (int)CommonDefine.CodeDataType.Subconstractor;
@@ -2731,7 +2733,7 @@
             try
             {
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.MyConstruction, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.MyConstruction]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.MyConstruction, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.MyConstruction]);
 
                 // è‡ªç¤¾æ–½å·¥ã�®è¡Œã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 m_CostsRowCount[(int)CostsRowLine.MyConstructionLine] = dgvAllDisplay.RowCount - 1;
@@ -2748,9 +2750,9 @@
                 {
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.MyConstruction, icnt);
+                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction, icnt);
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.MyConstruction;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction;
                     RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode;
                     RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode;
                     RowData[(int)GridColumn.ItemName] = DetailRec.FirstString;
@@ -2794,7 +2796,7 @@
             try
             {
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.MyConstruction, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.MyConstruction]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.MyConstruction, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.MyConstruction]);
 
                 // è‡ªç¤¾æ–½å·¥ã�®è¡Œã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 m_CostsRowCount[(int)CostsRowLine.MyConstructionLine] = dgvAllDisplay.RowCount - 1;
@@ -2822,8 +2824,8 @@
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.MyConstruction, icnt);
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.MyConstruction;
+                    RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction, icnt);
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction;
                     RowData[(int)GridColumn.ComponentCode] = CommonMotions.cnvInt(wrkrec[3]);
                     RowData[(int)GridColumn.ItemCode] = CommonMotions.cnvInt(wrkrec[4]);
                     RowData[(int)GridColumn.ItemName] = CommonMotions.cnvString(wrkrec[1]).Trim();
@@ -2895,11 +2897,11 @@
                 object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.No] = (int)FrmConstructionBudget.DataGroup.DisposeCosts;
-                RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.DisposeCosts;
+                RowData[(int)GridColumn.No] = (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts;
+                RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts;
 
                 RowData[(int)GridColumn.ComponentCode] = CompomentCode;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.DisposeCosts];
+                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts];
                 RowData[(int)GridColumn.EstimatePrice] = EstimatePrice.ToString("#,0");
                 RowData[(int)GridColumn.NegotiationPrice] = NegoPrice.ToString("#,0");
                 RowData[(int)GridColumn.HopePrice] = NegoPrice.ToString("#,0");
@@ -2961,13 +2963,13 @@
                 object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.No] = (int)FrmConstructionBudget.DataGroup.DisposeCosts;
-                RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.DisposeCosts;
+                RowData[(int)GridColumn.No] = (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts;
+                RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts;
 
                 RowData[(int)GridColumn.ComponentCode] = CompomentCode;
                 RowData[(int)GridColumn.ItemCode] = string.Empty;
 
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.DisposeCosts];
+                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts];
                 RowData[(int)GridColumn.EstimatePrice] = EstimatePrice.ToString("#,0");
                 RowData[(int)GridColumn.NegotiationPrice] = EstimatePrice.ToString("#,0");
                 RowData[(int)GridColumn.HopePrice] = EstimatePrice.ToString("#,0");
@@ -3033,7 +3035,7 @@
             IOEstimateBudgetDetail DetailDB = new IOEstimateBudgetDetail();
             try
             {
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.PurchaseCosts, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.PurchaseCosts]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts]);
 
                 string strSQL = DetailDB.CreatePrimarykeyString(m_ConstructionCode);
                 strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)FrmEstimateBudget.GroupName.PurchasePrice);
@@ -3043,8 +3045,8 @@
                 object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.PurchaseCosts, 1);
-                RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.PurchaseCosts;
+                RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts, 1);
+                RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts;
                 RowData[(int)GridColumn.ItemName] = DetailRec.FirstString;
                 RowData[(int)GridColumn.CompanyType] = 0;
                 RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode;
@@ -3077,13 +3079,13 @@
         {
             try
             {
-                CreateTitleRow((int)FrmConstructionBudget.DataGroup.PurchaseCosts, s_GroupTitle[(int)FrmConstructionBudget.DataGroup.PurchaseCosts]);
+                CreateTitleRow((int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts, s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts]);
 
                 object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.PurchaseCosts, 1);
-                RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.PurchaseCosts;
+                RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts, 1);
+                RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts;
                 RowData[(int)GridColumn.ItemName] = "è³¼ã€€ã€€å…¥ã€€ã€€å“�ã€€ã€€";
                 RowData[(int)GridColumn.EstimatePrice] = "0";
                 RowData[(int)GridColumn.NegotiationPrice] = "0";
@@ -3108,7 +3110,7 @@
         private void SetOtherInputData()
         {
             // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£->å®¿æ³Šè²»ã�¾ã�§ã�®è¡Œã‚’ä½œæˆ�ã�™ã‚‹
-            for (int i = (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee; i <= (int)FrmConstructionBudget.DataGroup.RoomChargeCosts; i++)
+            for (int i = (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee; i <= (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts; i++)
             {
                 object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
@@ -3267,7 +3269,7 @@
                 if (CreateRowLine)
                 {
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
-                    string title1 = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.AssistantCosts];
+                    string title1 = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts];
                     string title2 = string.Empty;
                     if (!CommonMotions.chkObjectIsNull(m_DspLabelLocalData[(int)DspLblCtrlName.AssistantName]))
                     {
@@ -3276,7 +3278,7 @@
                     }
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.AssistantCosts;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts;
                     RowData[(int)GridColumn.ItemName] = string.Format("{0}{1}", title1, title2);
                     RowData[(int)GridColumn.TextName] = Content;
                     RowData[(int)GridColumn.CompanyType] = CodeType;
@@ -3413,7 +3415,7 @@
                 if (CreateRowLine)
                 {
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
-                    string title1 = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.InstructorCosts];
+                    string title1 = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts];
                     string title2 = string.Empty;
                     if (!CommonMotions.chkObjectIsNull(m_DspLabelLocalData[(int)DspLblCtrlName.InstructorName]))
                     {
@@ -3422,7 +3424,7 @@
                     }
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.InstructorCosts;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts;
                     RowData[(int)GridColumn.ItemName] = string.Format("{0}{1}", title1, title2);
                     RowData[(int)GridColumn.TextName] = Content;
                     RowData[(int)GridColumn.CompanyType] = CodeType;
@@ -3514,8 +3516,8 @@
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.GrossProfit;
-                    RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.GrossProfit];
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.GrossProfit;
+                    RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.GrossProfit];
                     RowData[(int)GridColumn.EstimatePrice] = "";
                     RowData[(int)GridColumn.NegotiationPrice] = "";
                     RowData[(int)GridColumn.HopePrice] = HopeValue.ToString("#,0");
@@ -3730,11 +3732,11 @@
                 if (CreateRowLine)
                 {
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
-                    string title1 = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.PayrollExpenses];
+                    string title1 = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses];
                     string title2 = m_DspLabelLocalData[(int)DspLblCtrlName.CreatorName];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.PayrollExpenses;
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses;
                     RowData[(int)GridColumn.ItemName] = string.Format("{0}ã€�{1}æ°�ã€‘", title1, title2);
                     RowData[(int)GridColumn.TextName] = Content;
                     RowData[(int)GridColumn.CompanyType] = CodeType;
@@ -3871,8 +3873,8 @@
                     object[] RowData = new object[Enum.GetNames(typeof(GridColumn)).Length];
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.NetIncome;
-                    RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)FrmConstructionBudget.DataGroup.NetIncome];
+                    RowData[(int)GridColumn.GroupCount] = (int)ConstructionBudgetDetail.GroupCountDef.NetIncome;
+                    RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)ConstructionBudgetDetail.GroupCountDef.NetIncome];
                     RowData[(int)GridColumn.EstimatePrice] = "";
                     RowData[(int)GridColumn.NegotiationPrice] = "";
                     RowData[(int)GridColumn.HopePrice] = HopeValue.ToString("#,0");
@@ -3964,9 +3966,9 @@
                 bool DispFlg = false;
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {   // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®å ´å�ˆã�¯è¡¨ç¤º
                     DispFlg = true;
                 }
@@ -3976,9 +3978,9 @@
                     {
                         DataGridViewRow wrkRow = dgv.Rows[dgv.CurrentRow.Index - 1];
                         GroupCount = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value);
-                        if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                            || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                            || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                        if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                            || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                            || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                         {
                             DispFlg = true;
                         }
@@ -4013,9 +4015,9 @@
                 int GroupCount = 0;
                 GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {   // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®å ´å�ˆã�¯ä¸‹ã�«è¿½åŠ 
                     InsertCnt = CurRow.Index + 1;
                 }
@@ -4023,9 +4025,9 @@
                 {   // ç©ºç™½è¡Œã�§å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã�®ã�™ã��å¾Œã�¯å¯¾è±¡ã�¨ã�™ã‚‹ï¼ˆä¸Šã�«è¿½åŠ ï¼‰
                     DataGridViewRow wrkRow = dgv.Rows[dgv.CurrentRow.Index - 1];
                     GroupCount = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value);
-                    if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                        || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                        || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                    if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                        || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                        || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                     {
                         InsertCnt = CurRow.Index;
                     }
@@ -4039,7 +4041,7 @@
 
                 int GroupLineNo = 0;
                 // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—è¡Œç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts)
                 {
                     int iCnt = 1;
                     int StLineCnt = m_CostsRowCount[(int)CostsRowLine.OutSourceCostsLine] + 1;
@@ -4051,7 +4053,7 @@
                         iCnt++;
                     }
                 }
-                else if (GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                else if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {
                     int iCnt = 1;
                     int StLineCnt = m_CostsRowCount[(int)CostsRowLine.MyConstructionLine] + 1;
@@ -4063,7 +4065,7 @@
                         iCnt++;
                     }
                 }
-                else if (GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts)
+                else if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts)
                 {
                     int iCnt = 1;
                     int StLineCnt = m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine] + 1;
@@ -4140,9 +4142,9 @@
                 // ã‚°ãƒ«ãƒ¼ãƒ—ã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {   // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®å ´å�ˆã�¯å‰Šé™¤
                     RemoveCnt = CurRow.Index;
                     // ã‚¿ã‚¤ãƒˆãƒ«ã�®å ´å�ˆã�¯å‰Šé™¤ç„¡
@@ -4157,7 +4159,7 @@
 
                 int GroupLineNo = 0;
                 // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—è¡Œç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts)
                 {
                     int iCnt = 1;
                     int StLineCnt = m_CostsRowCount[(int)CostsRowLine.OutSourceCostsLine] + 1;
@@ -4169,7 +4171,7 @@
                         iCnt++;
                     }
                 }
-                else if (GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                else if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {
                     int iCnt = 1;
                     int StLineCnt = m_CostsRowCount[(int)CostsRowLine.MyConstructionLine] + 1;
@@ -4181,7 +4183,7 @@
                         iCnt++;
                     }
                 }
-                else if (GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts)
+                else if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts)
                 {
                     int iCnt = 1;
                     int StLineCnt = m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine] + 1;
@@ -4240,9 +4242,9 @@
                 // ã‚°ãƒ«ãƒ¼ãƒ—ã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {   // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®å ´å�ˆã�¯ä¸Šã�«è¿½åŠ 
                     UpCnt = CurRow.Index;
                     // ï¼‘è¡Œä¸Šã‚’å�–å¾—ã�™ã‚‹
@@ -4291,9 +4293,9 @@
                 // ã‚°ãƒ«ãƒ¼ãƒ—ã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                if (GroupCount == (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                    || GroupCount == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                if (GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                    || GroupCount == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                 {   // å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®å ´å�ˆã�¯ä¸Šã�«è¿½åŠ 
                     DownCnt = CurRow.Index;
                     // ï¼‘è¡Œä¸‹ã‚’å�–å¾—ã�™ã‚‹
@@ -4528,11 +4530,11 @@
                 foreach (DataGridViewRow wrkRow in dgv.Rows)
                 {
                     // å�ˆè¨ˆé‡‘é¡�ã�¯æ›¸ã��è¾¼ã�¾ã�ªã�„
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)FrmConstructionBudget.DataGroup.AllTotal) break;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionBudgetDetail.GroupCountDef.AllTotal) break;
 
                     // è¡¨ç¤ºè¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                     int nGroupCode = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value);
-                    if (nGroupCode < (int)DataGroup.Expenses) continue;
+                    if (nGroupCode < (int)ConstructionBudgetDetail.GroupCountDef.Expenses) continue;
 
                     // ãƒ‡ãƒ¼ã‚¿å®šç¾©
                     ConstructionBudgetDetail work = new ConstructionBudgetDetail();
@@ -4679,7 +4681,7 @@
 
                     // è¡¨ç¤ºè¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                     int nGroupCode = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value);
-                    if (nGroupCode < (int)DataGroup.Expenses) continue;
+                    if (nGroupCode < (int)ConstructionBudgetDetail.GroupCountDef.Expenses) continue;
 
                     bAns = true;
                     // å®Ÿè¡Œé‡‘é¡�è¡Œæ¯Žã�®ãƒ�ã‚§ãƒƒã‚¯
@@ -4696,9 +4698,9 @@
                     }
 
                     // å…±é€šä»®è¨­è²»ãƒ»å¤–æ³¨è²»ãƒ»è‡ªç¤¾æ–½å·¥ã�®ã�¿ç©�ç®—é‡‘é¡�ã�Œã�‚ã‚‹
-                    if (nGroupCode == (int)FrmConstructionBudget.DataGroup.CommonTempCosts ||
-                        nGroupCode == (int)FrmConstructionBudget.DataGroup.OutSourceCosts ||
-                        nGroupCode == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                    if (nGroupCode == (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts ||
+                        nGroupCode == (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts ||
+                        nGroupCode == (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction)
                     {
                         // äº¤æ¸‰é‡‘é¡�è¡Œæ¯Žã�®ãƒ�ã‚§ãƒƒã‚¯
                         if (!CommonMotions.chkNumeric(wrkRow.Cells[(int)GridColumn.NegotiationPrice].Value))
@@ -5186,7 +5188,7 @@
                     DataGridViewRow CurRow = dgv.Rows[i];
                     int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
                     int ComponentCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ComponentCode].Value);
-                    if (GroupNo != (int)DataGroup.Expenses) continue;
+                    if (GroupNo != (int)ConstructionBudgetDetail.GroupCountDef.Expenses) continue;
                     if (ComponentCode == 0) continue;
 
                     // çµŒè²»ã‚’å�–å¾—ã�™ã‚‹
@@ -5225,7 +5227,7 @@
                 {
                     DataGridViewRow CurRow = dgv.Rows[i];
                     int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
-                    if (GroupNo != (int)DataGroup.Expenses) continue;
+                    if (GroupNo != (int)ConstructionBudgetDetail.GroupCountDef.Expenses) continue;
                     int ComponentCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ComponentCode].Value);
                     if (ComponentCode == 0) continue;
 
@@ -5256,8 +5258,8 @@
             try
             {
                 int ErrorRowl = 0;
-                int nStart = (int)DataGroup.CommonTempCosts;
-                int nComp = (int)DataGroup.DisposeCosts;
+                int nStart = (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts;
+                int nComp = (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts;
                 int nHopeCount = (int)GridColumn.HopePrice;
                 int nExecCount = (int)GridColumn.ExecPrice;
                 bool diffValue = false;
@@ -5358,11 +5360,11 @@
                 strSQL.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
                 strSQL.AppendFormat(" And GroupCount In ({0}, {1}, {2})"
                                             // 2:å…±é€šä»®è¨­è²»
-                                            , (int)FrmConstructionBudget.DataGroup.CommonTempCosts
+                                            , (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts
                                             // 3:å¤–æ³¨è²»
-                                            , (int)FrmConstructionBudget.DataGroup.OutSourceCosts
+                                            , (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
                                             // 4:è‡ªç¤¾æ–½å·¥
-                                            , (int)FrmConstructionBudget.DataGroup.MyConstruction);
+                                            , (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction);
                 strSQL.Append(" And CompanyCode > 0");
                 List<ConstructionBudgetDetail> DataList = new List<ConstructionBudgetDetail>();
                 if (!DetalDB.SelectAction(strSQL.ToString(), ref DataList)) return false;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs	(revision 483)
@@ -41,82 +41,6 @@
         #endregion
 
         #region ’è�”
-        #region ƒf�[ƒ^ƒOƒ‹�[ƒv
-        /// <summary>
-        /// ƒf�[ƒ^ƒOƒ‹�[ƒv
-        /// </summary>
-        public enum DataGroup
-        {
-            /// <summary>
-            /// 0:‹ó”’
-            /// </summary>
-            Empty = 0,
-            /// <summary>
-            /// 1:Œo”ï
-            /// </summary>
-            Expenses,
-            /// <summary>
-            /// 2:Ž{�H”ï
-            /// </summary>
-            ConstructionCosts,
-            /// <summary>
-            /// 3:Œð’Ê”ï�i’Ê�s—¿�E“dŽÔ‘ã�j
-            /// </summary>
-            TransportationCosts,
-            /// <summary>
-            /// 4:�w“ü•i
-            /// </summary>
-            PurchaseCosts,
-            /// <summary>
-            /// 5:ŽÔ—¼ƒŠ�[ƒX‘ã
-            /// </summary>
-            VehicleLeaseFee,
-            /// <summary>
-            /// 6:’“ŽÔ�ê�EŽ‘�Þ’u‚«�ê
-            /// </summary>
-            ParkingCosts,
-            /// <summary>
-            /// 7:�h”‘”ï
-            /// </summary>
-            RoomChargeCosts,
-            /// <summary>
-            /// 8:�ˆ•ª”ï“™
-            /// </summary>
-            DisposeCosts,
-            /// <summary>
-            /// 9:Žw“±ˆõ‹‹—¿�s
-            /// </summary>
-            Instructor,
-            /// <summary>
-            /// 10:•›’S“–ŽÒ‹‹—¿�s
-            /// </summary>
-            Assistant,
-            /// <summary>
-            /// 11:’S“–ŽÒ‹‹—¿�s
-            /// </summary>
-            Payroll,
-            /// <summary>
-            /// 12:�ƒ—˜‰v
-            /// </summary>
-            NetIncome,
-            /// <summary>
-            /// 13:�‡Œv‹àŠz
-            /// </summary>
-            AllTotal,
-            /// <summary>
-            /// 14:�¿‹�‹àŠz
-            /// </summary>
-            BillingAmount,
-            /// <summary>
-            /// 15:Œ»�Ý—˜‰v‹àŠz
-            /// </summary>
-            CurrentProfit,
-            /// <summary>
-            /// 16:“ü‹à‹àŠz
-            /// </summary>
-            DepositAmount,
-        }
-        #endregion
 
         #region ƒOƒŠƒbƒh•\Ž¦ƒJƒ‰ƒ€
         /// <summary>
@@ -251,6 +175,61 @@
         }
         #endregion
 
+        #region ƒ^ƒCƒgƒ‹ƒtƒ‰ƒO’è‹`
+        /// <summary>
+        /// ƒ^ƒCƒgƒ‹ƒtƒ‰ƒO’è‹`
+        /// </summary>
+        private enum TitleFlgDef
+        {
+            /// <summary>
+            /// 0:’Ê�í�s
+            /// </summary>
+            None = 0,
+            /// <summary>
+            /// 1:ƒ^ƒCƒgƒ‹�s
+            /// </summary>
+            Title,
+        }
+        #endregion
+
+        #region �‡Œv�sƒtƒ‰ƒO’è‹`
+        /// <summary>
+        /// �‡Œv�sƒtƒ‰ƒO’è‹`
+        /// </summary>
+        private enum TotalFlgDef
+        {
+            /// <summary>
+            /// 0:’Ê�í�s
+            /// </summary>
+            None = 0,
+            /// <summary>
+            /// 1:�‡Œv�s
+            /// </summary>
+            Total,
+            /// <summary>
+            /// 2:‘��‡Œv�s
+            /// </summary>
+            AllTotal,
+        }
+        #endregion
+
+        #region ‹ó”’�sƒtƒ‰ƒO’è‹`
+        /// <summary>
+        /// ‹ó”’�sƒtƒ‰ƒO’è‹`
+        /// </summary>
+        private enum BlankFlgDef
+        {
+            /// <summary>
+            /// 0:’Ê�í�s
+            /// </summary>
+            None = 0,
+            /// <summary>
+            /// 1:‹ó”’�s
+            /// </summary>
+            Blank,
+        }
+        #endregion
+
         #region Žx•¥—“�‡Œv�EŽÀ�Ñ
         /// <summary>
         /// Žx•¥—“�‡Œv�EŽÀ�Ñ
@@ -311,7 +290,7 @@
             /// <summary>
             /// �HŽ–’S“–ŽÒ–¼
             /// </summary>
-            CreatorName,
+            ConstrName,
             /// <summary>
             /// •›’S“–ŽÒ
             /// </summary>
@@ -321,6 +300,10 @@
             /// </summary>
             InstructorName,
             /// <summary>
+            /// �ì�¬ŽÒ
+            /// </summary>
+            CreaterName,
+            /// <summary>
             /// �ì�¬“ú
             /// </summary>
             CreateDate,
@@ -386,23 +369,6 @@
         /// <summary>
         /// ƒOƒŠƒbƒh�€–Ú�sƒ^ƒCƒgƒ‹
         /// </summary>
-        private static string[] s_GroupTitle = new string[] { ""
-                                                            , "Œo�@�@�@�@�@”ï"
-                                                            , "Ž{�@�@�H�@�@”ï"
-                                                            , "Œð’Ê”ï�i’Ê�s—¿�E“dŽÔ‘ã�j"
-                                                            , "�w�@�@“ü�@�@•i"
-                                                            , "ŽÔ—¼ƒŠ�[ƒX‘ã"
-                                                            , "’“ŽÔ�ê�EŽ‘�Þ’u‚«�ê"
-                                                            , "�h�@�@”‘�@�@”ï"
-                                                            , "�ˆ�@•ª�@”ï�@“™"
-                                                            , "Žw “± ˆõ ‹‹ —^"
-                                                            , "•› ’S “– ŽÒ ‹‹ —^"
-                                                            , "’S “– ŽÒ ‹‹ —^"
-                                                            , "�ƒ�@�@—˜�@�@‰v"
-                                                            , "�‡�@Œv�@‹à�@Šz"
-                                                            , "�¿‹�‹àŠz�i�Å•Ê�j"
-                                                            , "Œ»�Ý—˜‰v‹àŠz"
-                                                            , "“ü‹à‹àŠz�i�Å•Ê�j"};
         private static string s_PersonnelExpensesGroup = "�l�@�@Œ��@�@”ï";
         #endregion
 
@@ -467,23 +433,27 @@
             /// </summary>
             PayrollRowLine,
             /// <summary>
-            /// 11:�ƒ—˜‰v
+            /// 11:•â“U‹àŠz
             /// </summary>
+            CompensationLine,
+            /// <summary>
+            /// 12:�ƒ—˜‰v
+            /// </summary>
             NetIncomeRowLine,
             /// <summary>
-            /// 12:�‡Œv‹àŠz
+            /// 13:�‡Œv‹àŠz
             /// </summary>
             AllTotalRowLine,
             /// <summary>
-            /// 13:�¿‹�‹àŠz
+            /// 14:�¿‹�‹àŠz
             /// </summary>
             BillingAmountRowLine,
             /// <summary>
-            /// 14:Œ»�Ý—˜‰v‹àŠz
+            /// 15:Œ»�Ý—˜‰v‹àŠz
             /// </summary>
             CurrentProfitRowLine,
             /// <summary>
-            /// 15:“ü‹à‹àŠz
+            /// 16:“ü‹à‹àŠz
             /// </summary>
             DepositAmountRowLine,
         }
@@ -756,14 +726,6 @@
         }
 
         /// <summary>
-        /// �HŽ–�Ú�×‘ä’ ‚Ì�ÄŒvŽZ�ˆ—�
-        /// </summary>
-        public bool RecalculateLedger
-        {
-            get { return NonDspLedgerRecalculate(); }
-        }
-
-        /// <summary>
         /// �HŽ–�Ú�×‘ä’ ƒf�[ƒ^•Û‘¶
         /// </summary>
         public bool SaveLedgerData
@@ -814,13 +776,6 @@
         {
             set { m_GetTitileParametar = value; }
         }
-        /// <summary>
-        /// ƒOƒŠƒbƒh�€–Úƒ^ƒCƒgƒ‹Žæ“¾
-        /// </summary>
-        public string GetTitleString
-        {
-            get { return s_GroupTitle[m_GetTitileParametar]; }
-        }
 
         /// <summary>
         /// ‘Î�ÛƒR�[ƒhƒŠƒXƒg
@@ -1113,7 +1068,7 @@
 
             int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
             // Ž{�H”ï‚Ì‚Ý�ˆ—�‚·‚é
-            if (GroupNo != (int)FrmConstructionLedger.DataGroup.ConstructionCosts) return;
+            if (GroupNo != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts) return;
 
             // ‹¦—Í‰ïŽÐ–¼‚Ì‚Ý�ˆ—�‚·‚é
             if (CurCell.ColumnIndex != (int)GridColumn.CompanyName) return;
@@ -1139,6 +1094,7 @@
             {
                 // �I—¹Žž‚Í�ˆ—�‚µ‚È‚¢
                 if (!this.Visible) return;
+                if (ActiveControl == btnEnd) return;
                 if (ActiveControl != null)
                 {
                     if (ActiveControl.Name.Equals(btnEnd.Name)) return;
@@ -1150,7 +1106,7 @@
                 if (dgv.CurrentCell.ReadOnly) return;
 
                 // �ÄŒvŽZ�ˆ—�
-                RowReCalculate(CurRow, e.RowIndex, e.ColumnIndex);
+                RowReCalculate(CurRow, e.ColumnIndex);
 
             }
             catch (System.Exception ex)
@@ -1173,7 +1129,7 @@
 
             int nGroupData = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
             // Ž{�H”ïˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-            if (nGroupData != (int)DataGroup.ConstructionCosts) return;
+            if (nGroupData != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts) return;
             // –³Œø�sƒ`ƒFƒbƒNˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
             if (dgv.CurrentCellAddress.X != (int)GridColumn.InvalidLine) return;
 
@@ -1183,7 +1139,7 @@
             InvalidLineOnOff();
 
             // �ÄŒvŽZ�ˆ—�
-            RowReCalculate(CurRow, dgv.CurrentCellAddress.Y, dgv.CurrentCellAddress.X);
+            RowReCalculate(CurRow, dgv.CurrentCellAddress.X);
         }
         #endregion
 
@@ -1264,12 +1220,15 @@
         /// <param name="e"></param>
         private void dgvAllDisplay_SelectionChanged(object sender, EventArgs e)
         {
-            DataGridViewEX dgv = dgvAllDisplay;
+            if (m_BeforeGridRow < 0) return;
+
             // �s‘I‘ð�F‚ðŒ³‚É–ß‚·
-            if (m_BeforeGridRow != -1) DefaultRowChangeColor(m_BeforeGridRow);
+            DefaultRowChangeColor(m_BeforeGridRow);
 
             // ‘I‘ð�s�”‚ð‘Þ”ð
+            DataGridViewEX dgv = dgvAllDisplay;
             m_BeforeGridRow = dgv.CurrentRow.Index;
+            
             // �s‘I‘ð�F‚ð�Ý’è
             SelectRowChangeColor(m_BeforeGridRow);
         }
@@ -1286,7 +1245,7 @@
             DataGridViewEX dgv = dgvAllDisplay;
 
             // ƒ^ƒCƒgƒ‹‚Í�ˆ—�‚µ‚È‚¢
-            if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) return;
+            if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) return;
 
             // �¿‹��ˆ—�˜AŒg
             if (m_ReqSumDialogFlag)
@@ -1306,18 +1265,18 @@
                     int GroupNo = CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.GroupCount].Value);
                     switch (GroupNo)
                     {
-                        case (int)DataGroup.ConstructionCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:
                             // ----- Ž{�H”ï
                             // ‹¦—Í‰ïŽÐ‘I‘ð
                             ShowSubConstructorDiag();
                             break;
 
-                        case (int)DataGroup.TransportationCosts:    // ----- 3:Œð’Ê”ï�i’Ê�s—¿�E“dŽÔ‘ã�j
-                        case (int)DataGroup.PurchaseCosts:          // ----- 4:�w“ü•i
-                        case (int)DataGroup.VehicleLeaseFee:        // ----- 5:ŽÔ—¼ƒŠ�[ƒX‘ã
-                        case (int)DataGroup.ParkingCosts:           // ----- 6:’“ŽÔ�ê�EŽ‘�Þ’u‚«�ê
-                        case (int)DataGroup.RoomChargeCosts:        // ----- 7:�h”‘”ï
-                        case (int)DataGroup.DisposeCosts:           // ----- 8:�ˆ•ª”ï“™
+                        case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:    // ----- 3:Œð’Ê”ï�i’Ê�s—¿�E“dŽÔ‘ã�j
+                        case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:          // ----- 4:�w“ü•i
+                        case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:        // ----- 5:ŽÔ—¼ƒŠ�[ƒX‘ã
+                        case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:           // ----- 6:’“ŽÔ�ê�EŽ‘�Þ’u‚«�ê
+                        case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:        // ----- 7:�h”‘”ï
+                        case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:           // ----- 8:�ˆ•ª”ï“™
                             EventArgs eWork = new EventArgs();
                             ProcessExecute_TAndPCosts(sender, eWork);
                             break;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 483)
@@ -87,6 +87,17 @@
             this.btnLineDel = new System.Windows.Forms.Button();
             this.btnLineAdd = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.lblCellTotal = new System.Windows.Forms.Label();
+            this.btnDispDown = new System.Windows.Forms.Button();
+            this.btnDispUp = new System.Windows.Forms.Button();
+            this.btnOtherProc = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.btnSelect = new System.Windows.Forms.Button();
+            this.btnCreate = new System.Windows.Forms.Button();
+            this.DataProgressBar = new System.Windows.Forms.ProgressBar();
+            this.btnHelp = new System.Windows.Forms.Button();
+            this.label24 = new System.Windows.Forms.Label();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column30 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -118,20 +129,10 @@
             this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lblCellTotal = new System.Windows.Forms.Label();
-            this.btnDispDown = new System.Windows.Forms.Button();
-            this.btnDispUp = new System.Windows.Forms.Button();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.btnSelect = new System.Windows.Forms.Button();
-            this.btnCreate = new System.Windows.Forms.Button();
-            this.DataProgressBar = new System.Windows.Forms.ProgressBar();
             this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.lblReqSumType03 = new System.Windows.Forms.Label();
             this.lblReqSumType01 = new System.Windows.Forms.Label();
             this.lblReqSumType02 = new System.Windows.Forms.Label();
-            this.btnHelp = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.pnlGroup2.SuspendLayout();
             this.pnlGroup1.SuspendLayout();
@@ -738,11 +739,11 @@
             // 
             this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label4.ForeColor = System.Drawing.Color.White;
-            this.label4.Location = new System.Drawing.Point(1070, 8);
+            this.label4.Location = new System.Drawing.Point(1004, 8);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(114, 25);
+            this.label4.Size = new System.Drawing.Size(50, 25);
             this.label4.TabIndex = 35;
-            this.label4.Text = "å�°å¸³ä½œæˆ�æ—¥";
+            this.label4.Text = "ä½œæˆ�";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label2
@@ -751,7 +752,7 @@
             this.label2.BackColor = System.Drawing.Color.White;
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(1184, 8);
+            this.label2.Location = new System.Drawing.Point(1174, 8);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(120, 25);
             this.label2.TabIndex = 36;
@@ -798,6 +799,149 @@
             this.panel2.Size = new System.Drawing.Size(1290, 450);
             this.panel2.TabIndex = 36;
             // 
+            // lblCellTotal
+            // 
+            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblCellTotal.AutoSize = true;
+            this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
+            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
+            this.lblCellTotal.Location = new System.Drawing.Point(100, 430);
+            this.lblCellTotal.Name = "lblCellTotal";
+            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
+            this.lblCellTotal.TabIndex = 36;
+            // 
+            // btnDispDown
+            // 
+            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDispDown.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
+            this.btnDispDown.Name = "btnDispDown";
+            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
+            this.btnDispDown.TabIndex = 42;
+            this.btnDispDown.TabStop = false;
+            this.btnDispDown.Text = "â–¼";
+            this.btnDispDown.UseVisualStyleBackColor = true;
+            this.btnDispDown.Visible = false;
+            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
+            // 
+            // btnDispUp
+            // 
+            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDispUp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
+            this.btnDispUp.Name = "btnDispUp";
+            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
+            this.btnDispUp.TabIndex = 41;
+            this.btnDispUp.TabStop = false;
+            this.btnDispUp.Text = "â–²";
+            this.btnDispUp.UseVisualStyleBackColor = true;
+            this.btnDispUp.Visible = false;
+            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
+            // 
+            // btnOtherProc
+            // 
+            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
+            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
+            this.btnOtherProc.Name = "btnOtherProc";
+            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
+            this.btnOtherProc.TabIndex = 95;
+            this.btnOtherProc.TabStop = false;
+            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
+            this.btnOtherProc.UseVisualStyleBackColor = false;
+            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.Location = new System.Drawing.Point(1300, 540);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(37, 35);
+            this.button1.TabIndex = 100;
+            this.button1.Text = "â—‹";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Visible = false;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.Location = new System.Drawing.Point(1300, 581);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(37, 35);
+            this.button2.TabIndex = 101;
+            this.button2.Text = "ï¼‘";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Visible = false;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSelect.BackColor = System.Drawing.Color.Green;
+            this.btnSelect.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnSelect.ForeColor = System.Drawing.Color.White;
+            this.btnSelect.Location = new System.Drawing.Point(546, 657);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(120, 30);
+            this.btnSelect.TabIndex = 102;
+            this.btnSelect.Text = "é�¸ã€€æŠž";
+            this.btnSelect.UseVisualStyleBackColor = false;
+            this.btnSelect.Visible = false;
+            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+            // 
+            // btnCreate
+            // 
+            this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCreate.BackColor = System.Drawing.Color.White;
+            this.btnCreate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnCreate.ForeColor = System.Drawing.Color.Green;
+            this.btnCreate.Location = new System.Drawing.Point(420, 657);
+            this.btnCreate.Name = "btnCreate";
+            this.btnCreate.Size = new System.Drawing.Size(120, 30);
+            this.btnCreate.TabIndex = 103;
+            this.btnCreate.Text = "æ–°ã€€è¦�";
+            this.btnCreate.UseVisualStyleBackColor = false;
+            this.btnCreate.Visible = false;
+            this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click);
+            // 
+            // DataProgressBar
+            // 
+            this.DataProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.DataProgressBar.Location = new System.Drawing.Point(7, 655);
+            this.DataProgressBar.Name = "DataProgressBar";
+            this.DataProgressBar.Size = new System.Drawing.Size(1330, 36);
+            this.DataProgressBar.TabIndex = 105;
+            this.DataProgressBar.Visible = false;
+            // 
+            // btnHelp
+            // 
+            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnHelp.BackColor = System.Drawing.Color.Black;
+            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHelp.ForeColor = System.Drawing.Color.White;
+            this.btnHelp.Location = new System.Drawing.Point(1313, 0);
+            this.btnHelp.Name = "btnHelp";
+            this.btnHelp.Size = new System.Drawing.Size(30, 30);
+            this.btnHelp.TabIndex = 114;
+            this.btnHelp.TabStop = false;
+            this.btnHelp.Text = "ï¼Ÿ";
+            this.btnHelp.UseVisualStyleBackColor = false;
+            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            // 
+            // label24
+            // 
+            this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label24.BackColor = System.Drawing.Color.White;
+            this.label24.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label24.ForeColor = System.Drawing.Color.Black;
+            this.label24.Location = new System.Drawing.Point(1054, 8);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(120, 25);
+            this.label24.TabIndex = 115;
+            this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // dgvAllDisplay
             // 
             this.dgvAllDisplay.AllowUserToAddRows = false;
@@ -1150,122 +1294,6 @@
             this.Column28.ReadOnly = true;
             this.Column28.Visible = false;
             // 
-            // lblCellTotal
-            // 
-            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblCellTotal.AutoSize = true;
-            this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
-            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
-            this.lblCellTotal.Location = new System.Drawing.Point(100, 430);
-            this.lblCellTotal.Name = "lblCellTotal";
-            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
-            this.lblCellTotal.TabIndex = 36;
-            // 
-            // btnDispDown
-            // 
-            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDispDown.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
-            this.btnDispDown.Name = "btnDispDown";
-            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
-            this.btnDispDown.TabIndex = 42;
-            this.btnDispDown.TabStop = false;
-            this.btnDispDown.Text = "â–¼";
-            this.btnDispDown.UseVisualStyleBackColor = true;
-            this.btnDispDown.Visible = false;
-            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
-            // 
-            // btnDispUp
-            // 
-            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDispUp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
-            this.btnDispUp.Name = "btnDispUp";
-            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
-            this.btnDispUp.TabIndex = 41;
-            this.btnDispUp.TabStop = false;
-            this.btnDispUp.Text = "â–²";
-            this.btnDispUp.UseVisualStyleBackColor = true;
-            this.btnDispUp.Visible = false;
-            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
-            // 
-            // btnOtherProc
-            // 
-            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
-            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
-            this.btnOtherProc.Name = "btnOtherProc";
-            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
-            this.btnOtherProc.TabIndex = 95;
-            this.btnOtherProc.TabStop = false;
-            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
-            this.btnOtherProc.UseVisualStyleBackColor = false;
-            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.Location = new System.Drawing.Point(1300, 540);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(37, 35);
-            this.button1.TabIndex = 100;
-            this.button1.Text = "â—‹";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Visible = false;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // button2
-            // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button2.Location = new System.Drawing.Point(1300, 581);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(37, 35);
-            this.button2.TabIndex = 101;
-            this.button2.Text = "ï¼‘";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Visible = false;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSelect.BackColor = System.Drawing.Color.Green;
-            this.btnSelect.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnSelect.ForeColor = System.Drawing.Color.White;
-            this.btnSelect.Location = new System.Drawing.Point(546, 657);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(120, 30);
-            this.btnSelect.TabIndex = 102;
-            this.btnSelect.Text = "é�¸ã€€æŠž";
-            this.btnSelect.UseVisualStyleBackColor = false;
-            this.btnSelect.Visible = false;
-            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-            // 
-            // btnCreate
-            // 
-            this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCreate.BackColor = System.Drawing.Color.White;
-            this.btnCreate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnCreate.ForeColor = System.Drawing.Color.Green;
-            this.btnCreate.Location = new System.Drawing.Point(420, 657);
-            this.btnCreate.Name = "btnCreate";
-            this.btnCreate.Size = new System.Drawing.Size(120, 30);
-            this.btnCreate.TabIndex = 103;
-            this.btnCreate.Text = "æ–°ã€€è¦�";
-            this.btnCreate.UseVisualStyleBackColor = false;
-            this.btnCreate.Visible = false;
-            this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click);
-            // 
-            // DataProgressBar
-            // 
-            this.DataProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.DataProgressBar.Location = new System.Drawing.Point(7, 655);
-            this.DataProgressBar.Name = "DataProgressBar";
-            this.DataProgressBar.Size = new System.Drawing.Size(1330, 36);
-            this.DataProgressBar.TabIndex = 105;
-            this.DataProgressBar.Visible = false;
-            // 
             // grpExample1
             // 
             this.grpExample1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1319,21 +1347,6 @@
             this.lblReqSumType02.Text = "é�¸ æŠž æ¸ˆ";
             this.lblReqSumType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // btnHelp
-            // 
-            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnHelp.BackColor = System.Drawing.Color.Black;
-            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1313, 0);
-            this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Size = new System.Drawing.Size(30, 30);
-            this.btnHelp.TabIndex = 114;
-            this.btnHelp.TabStop = false;
-            this.btnHelp.Text = "ï¼Ÿ";
-            this.btnHelp.UseVisualStyleBackColor = false;
-            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
-            // 
             // FrmConstructionLedger
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1340,6 +1353,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1344, 692);
+            this.Controls.Add(this.label24);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.btnCreate);
             this.Controls.Add(this.btnSelect);
@@ -1481,5 +1495,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column26;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column28;
         private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.Label label24;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 483)
@@ -127,6 +127,7 @@
                 // ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®è¡¨ç¤ºåˆ¶å¾¡
                 DispProgressBar(false);
 
+                this.Update();
             }
             catch (System.Exception ex)
             {
@@ -310,11 +311,12 @@
 
             m_DspLabelCtrl[(int)DspLblCtrlName.OrdersName] = lblLabel06;
 
-            m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName] = lblLabel04;
+            m_DspLabelCtrl[(int)DspLblCtrlName.ConstrName] = lblLabel04;
             m_DspLabelCtrl[(int)DspLblCtrlName.AssistantName] = label21;
             m_DspLabelCtrl[(int)DspLblCtrlName.InstructorName] = label12;
 
             m_DspLabelCtrl[(int)DspLblCtrlName.CreateDate] = label2;
+            m_DspLabelCtrl[(int)DspLblCtrlName.CreaterName] = label24;
             m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice] = label6;
             m_DspLabelCtrl[(int)DspLblCtrlName.StartingDate] = label8;
             m_DspLabelCtrl[(int)DspLblCtrlName.CompleteDate] = label11;
@@ -527,12 +529,14 @@
                 bool bLedgerExist = LedgerDB.SelectAction(strSQL, ref LedgerRec);
 
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
+                m_DspLabelCtrl[(int)DspLblCtrlName.CreaterName].Text = LedgerRec.CreatorName;                                                       // ä½œæˆ�è€…
+                m_HeaderToolTip.SetToolTip(m_DspLabelCtrl[(int)DspLblCtrlName.CreaterName], LedgerRec.CreatorName);
                 m_DspLabelCtrl[(int)DspLblCtrlName.CreateDate].Text = LedgerRec.CreateDate.ToShortDateString();                                 // ä½œæˆ�æ—¥
 
                 m_DspLabelCtrl[(int)DspLblCtrlName.ConstCode].Text = CommonMotions.cnvStringCodeFromInt(m_ConstructionCode, "-", 8);            // å·¥äº‹ã‚³ãƒ¼ãƒ‰
 
                 // å�—æ³¨é‡‘é¡�ã‚’ã��ã�®ã�¾ã�¾æŒ�ã�£ã�¦ã��ã‚‹ã�‹ã€�é›†è¨ˆã�™ã‚‹ã�‹
-                int OrdersPrice = 0;
+                long OrdersPrice = 0;
                 if (LedgerRec.IntegrationFlg == (int)CommonDefine.LedgerIntegration.Normal)
                 {
                     // çµ�å�ˆå·¥äº‹åˆ¤å®š
@@ -585,15 +589,20 @@
                 m_DspLabelCtrl[(int)DspLblCtrlName.OrdersName].Text = OrderRec.DetailString;                                                    // ç™ºæ³¨è€…å��ç§°
 
                 // å·¥äº‹æ‹…å½“è€…å�–å¾—
-                int PersonCode = LedgerRec.CreatorCode;
-                if (PersonCode == 0) PersonCode = m_ConstructionBaseInfo.ConstructionPersonCode;
+                int PersonCode = m_ConstructionBaseInfo.ConstructionPersonCode;
                 strSQL = picDB.CreatePrimarykeyString(PersonCode);
                 PersonInChargeMaster personRec = new PersonInChargeMaster();
                 picDB.SelectAction(strSQL, ref personRec);
 
-                m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName].Text = personRec.PersonName;                                                    // ä½œæˆ�è€…
-                m_HeaderToolTip.SetToolTip(m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName], personRec.PersonName);
+                m_DspLabelCtrl[(int)DspLblCtrlName.ConstrName].Text = personRec.PersonName;                                                     // å·¥äº‹æ‹…å½“è€…
+                m_HeaderToolTip.SetToolTip(m_DspLabelCtrl[(int)DspLblCtrlName.ConstrName], personRec.PersonName);
 
+                if (LedgerRec.CreatorName.Length < 1)
+                {
+                    m_DspLabelCtrl[(int)DspLblCtrlName.CreaterName].Text = personRec.PersonName;                                                // ä½œæˆ�è€…
+                    m_HeaderToolTip.SetToolTip(m_DspLabelCtrl[(int)DspLblCtrlName.CreaterName], personRec.PersonName);
+                }
+
                 // å‰¯æ‹…å½“å�–å¾—
                 PersonCode = m_ConstructionBaseInfo.ConstrSubPersonCode;
                 pnlGroup2.Visible = false;
@@ -693,7 +702,7 @@
                 if (DetailRec.CompanyCode == 0) DetailRec.SalaryFlg = (int)CommonDefine.SalaryDevision.Noting;
                 switch (DetailRec.GroupCount)
                 {
-                    case (int)DataGroup.Payroll:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                         // æ‹…å½“è€…çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                         rdbWork[0] = radioButton1;
                         rdbWork[1] = radioButton2;
@@ -700,7 +709,7 @@
                         rdbWork[2] = radioButton3;
                         txtWork = textBox1;
                         break;
-                    case (int)DataGroup.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                         // å‰¯æ‹…å½“è€…çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                         rdbWork[0] = radioButton4;
                         rdbWork[1] = radioButton5;
@@ -737,12 +746,12 @@
         /// çµ�å�ˆå·¥äº‹ãƒ‡ãƒ¼ã‚¿å�ˆè¨ˆå�–å¾—
         /// </summary>
         /// <returns></returns>
-        private int GetJoinTotal()
+        private long GetJoinTotal()
         {
             IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
             try
             {
-                int OrdersPrice = 0;
+                long OrdersPrice = 0;
 
                 string strSQL = "SELECT SUM(B.ORDERSDECISIONPRICE) + SUM(E.ORDERSDECISIONPRICE)";
                 strSQL += " FROM CONSTRUCTIONLINK A";
@@ -790,12 +799,12 @@
         /// å·¥äº‹å¢—æ¸›ã‚’å�«ã‚€ãƒ‡ãƒ¼ã‚¿å�ˆè¨ˆå�–å¾—
         /// </summary>
         /// <returns></returns>
-        private int GetOrderPraiceTotal()
+        private long GetOrderPraiceTotal()
         {
             IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
             try
             {
-                int OrdersPrice = 0;
+                long OrdersPrice = 0;
                 if (m_ConstructionBaseInfo.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Standard)
                 {
                     // å·¥äº‹å¢—æ¸›ã�®å¤‰æ›´ã�Œã�ªã�„å ´å�ˆã�¯å·¥äº‹æƒ…å ±ã�®å�—æ³¨é‡‘é¡�ã‚ˆã‚ŠæŒ�ã�£ã�¦ã��ã‚‹
@@ -818,7 +827,7 @@
                     BaseDB.ExecuteReader(strSQL, ref DatArray);
                     object[] objRet = (object[])DatArray[0];
 
-                    OrdersPrice = CommonMotions.cnvInt(objRet[0]);
+                    OrdersPrice = CommonMotions.cnvLong(objRet[0]);
                 }
                 return OrdersPrice;
             }
@@ -971,27 +980,59 @@
         }
         #endregion
 
+        #region å†�è¨ˆç®—ç­‰ã�®å¯¾è±¡ã‚°ãƒ«ãƒ¼ãƒ—
+        /// <summary>
+        /// å†�è¨ˆç®—ç­‰ã�®å¯¾è±¡ã‚°ãƒ«ãƒ¼ãƒ—
+        /// </summary>
+        private int[] s_GetGrouptArray = new int[]
+                {
+                     (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts     // 2:æ–½å·¥è²»
+                    , (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts   // 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
+                    , (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts         // 4:è³¼å…¥å“�
+                    , (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee       // 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+                    , (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts          // 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+                    , (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts       // 7:å®¿æ³Šè²»
+                    , (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts          // 8:å‡¦åˆ†è²»ç­‰
+                    , (int)ConstructionLedgerDetail.GroupCountDef.Instructor            // 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
+                    , (int)ConstructionLedgerDetail.GroupCountDef.Assistant             // 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
+                    , (int)ConstructionLedgerDetail.GroupCountDef.Payroll               // 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
+
+                };
+        #endregion
+
         #region æ”¯æ‰•å�¯èƒ½é¡�ãƒ»æ”¯æ‰•è£œå¡«æž ã�®å†�è¨ˆç®—
         /// <summary>
         /// æ”¯æ‰•å�¯èƒ½é¡�ãƒ»æ”¯æ‰•è£œå¡«æž ã�®å†�è¨ˆç®—
         /// </summary>
-        private void RowAllCalcPayResult()
+        private void RowAllCalcPayResult(bool bSetBurdens = true)
         {
             try
             {
                 DataGridViewEX dgv = dgvAllDisplay;
                 int GridColCnt = dgv.ColumnCount;
+                int Burdens = GridColCnt + (int)ColPayTotal.PaymentBurdens;
+                int Results = GridColCnt + (int)ColPayTotal.Results;
 
+                int nGroupNo = (int)GridColumn.GroupCount;
+                List<DataGridViewRow> TargetList = dgv.Rows.Cast<DataGridViewRow>()
+                                                                .Where(x => CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[0]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[1]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[2]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[3]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[4]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[5]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[6]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[7]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[8]
+                                                                            || CommonMotions.cnvInt(x.Cells[nGroupNo].Value) == s_GetGrouptArray[9])
+                                                                .ToList();
                 // ã‚°ãƒªãƒƒãƒ‰ã�®å…¨è¡Œã‚’å¯¾è±¡ã�«ã�™ã‚‹
-                foreach (DataGridViewRow CurRow in dgv.Rows)
+                foreach (DataGridViewRow CurRow in TargetList)
                 {
                     // æ˜Žç´°ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
-                    if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TotalFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) != (int)TotalFlgDef.None) continue;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != (int)TitleFlgDef.None) continue;
 
-                    if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TitleFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != 0) continue;
-
                     // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                     if (BlankLine(CurRow.Index)) continue;
 
@@ -998,24 +1039,24 @@
                     // ç„¡åŠ¹è¡Œã�¯é‡‘é¡�ã‚’ï¼�ã�«ã�—ã�¦å‡¦ç�†ã�—ã�ªã�„
                     if (CommonMotions.cnvBool(CurRow.Cells[(int)GridColumn.InvalidLine].Value))
                     {
-                        int PaymentBurdens = GridColCnt + (int)ColPayTotal.PaymentBurdens;
-                        CurRow.Cells[PaymentBurdens].Value = 0;
+                        CurRow.Cells[Burdens].Value = 0;
                         continue;
                     }
 
-                    for (int ix = ((int)GridColumn.Payment + 1); ix < dgv.ColumnCount; ix++)
+                    for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
                     {
                         // ç©ºç™½ã‚«ãƒ©ãƒ ã�¯å‡¦ç�†ã�—ã�ªã�„
                         if (CommonMotions.cnvString(CurRow.Cells[ix].Value).Length == 0) continue;
 
                         // è¡Œã�®è¨ˆç®—
-                        RowReCalculate(CurRow, CurRow.Index, ix);
+                        RowReCalculate(CurRow, ix);
                     }
-                    // æ”¯æ‰•å�¯èƒ½é¡�ã‚’æ”¯æ‰•è£œå¡«æž ã�¸ã‚»ãƒƒãƒˆã�™ã‚‹
-                    int Burdens = GridColCnt + (int)ColPayTotal.PaymentBurdens;
-                    int Results = GridColCnt + (int)ColPayTotal.Results;
+                    // åˆ�æœŸæ™‚ã�¯æ”¯æ‰•å�¯èƒ½é¡�ã‚»ãƒƒãƒˆã‚’è¡Œã‚�ã�ªã�„
+                    if (!bSetBurdens) continue;
+
+                    // ----- æ”¯æ‰•å�¯èƒ½é¡�ã‚’æ”¯æ‰•è£œå¡«æž ã�¸ã‚»ãƒƒãƒˆã�™ã‚‹
                     // æ®‹é‡‘ã�Œç„¡ã�‘ã‚Œã�°æ¬¡ã�®è¡Œã�¸ç§»å‹•ã�™ã‚‹
-                    if (CommonMotions.cnvInt(CurRow.Cells[Results].Value) < 1) continue;
+                    if (CommonMotions.cnvLong(CurRow.Cells[Results].Value) < 1) continue;
                     // æ®‹é‡‘ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                     CurRow.Cells[Burdens].Value = CommonMotions.cnvInt(CurRow.Cells[Results].Value).ToString("#,0");
                 }
@@ -1312,7 +1353,7 @@
                 SetData[(int)GridColumn.FixFlg] = "*";
                 SetData[(int)GridColumn.GroupCount] = TitleNo;
                 SetData[(int)GridColumn.ItemName] = TitleName;
-                SetData[(int)GridColumn.TitleFlg] = "1";
+                SetData[(int)GridColumn.TitleFlg] = (int)TitleFlgDef.Title;
 
                 // è¡Œãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 dgv.Rows[rowcnt].SetValues(SetData);
@@ -1354,15 +1395,18 @@
                 // è¡Œãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 CurRow.SetValues(SetData);
                 // ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
-                CurRow.Cells[(int)GridColumn.TitleFlg].Value = "0";
-                CurRow.Cells[(int)GridColumn.TotalFlg].Value = "0";
-                CurRow.Cells[(int)GridColumn.BlankFlg].Value = "0";
+                CurRow.Cells[(int)GridColumn.TitleFlg].Value = (int)TitleFlgDef.None;
+                CurRow.Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.None;
+                CurRow.Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.None;
 
                 // æ˜Žç´°ä»¥å¤–ã�¯ãƒ�ã‚§ãƒƒã‚¯ã‚’ã�•ã�›ã�ªã�„
                 CurRow.Cells[(int)GridColumn.InvalidLine].ReadOnly = true;
                 int nGroup = CommonMotions.cnvInt(SetData[(int)GridColumn.GroupCount]);
-                if (nGroup == (int)DataGroup.ConstructionCosts)
+                if (nGroup == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                     CurRow.Cells[(int)GridColumn.InvalidLine].ReadOnly = false;
+
+                // è¡Œã‚’ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè‰²ã�«ã�™ã‚‹
+                DefaultRowChangeColor(rowcnt);
             }
             catch (System.Exception ex)
             {
@@ -1385,7 +1429,7 @@
                 // è¡Œè¿½åŠ 
                 int rowcnt = dgv.Rows.Add(1);
                 // ãƒ•ãƒ©ã‚°ON
-                dgv.Rows[rowcnt].Cells[(int)GridColumn.BlankFlg].Value = 1;
+                dgv.Rows[rowcnt].Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.Blank;
                 // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
                 for (int i = 0; i < colcnt; i++)
                 {
@@ -1414,7 +1458,7 @@
                 DataGridViewRow CurRow = dgv.Rows[CurrentRow];
 
                 // ç·�å�ˆè¨ˆã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) == 2) return;
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) == (int)TotalFlgDef.AllTotal) return;
 
                 // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
                 for (int i = 0; i < dgv.ColumnCount; i++)
@@ -1422,11 +1466,6 @@
                     dgv.Rows[m_BeforeGridRow].Cells[i].Style.BackColor = s_RowBackSelectColor;
                     dgv.Rows[m_BeforeGridRow].Cells[i].Style.ForeColor = s_RowForeSelectColor;
                 }
-                // å¢—æ¸›ãƒ‡ãƒ¼ã‚¿ã�¯è‰²ã‚’ä»˜ã�‘ã‚‹
-                //if (CommonMotions.cnvInt(dgv.Rows[m_BeforeGridRow].Cells[(int)GridColumn.FluctuationFlg].Value) != 0)
-                //{
-                //    dgv.Rows[m_BeforeGridRow].Cells[(int)GridColumn.No].Style.BackColor = Color.Red;
-                //}
             }
             catch (System.Exception ex)
             {
@@ -1447,9 +1486,9 @@
                 DataGridViewEX dgv = dgvAllDisplay;
                 foreach (DataGridViewRow wrkRow in dgv.Rows)
                 {
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.BlankFlg].Value) == 1) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != (int)TotalFlgDef.None) continue;
 
                     // è¡Œã�®è‰²ã‚’ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè‰²ã�¸å¤‰æ›´
                     DefaultRowChangeColor(wrkRow.Index);
@@ -1499,19 +1538,19 @@
                     // å…¥é‡‘é‡‘é¡�
 
                 }
-                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.BlankFlg].Value) == 1)
+                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank)
                 {   // ãƒ–ãƒ©ãƒ³ã‚¯è¡Œ
                     SetBackColor = Color.White;
                 }
-                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == 1)
+                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title)
                 {   // ã‚¿ã‚¤ãƒˆãƒ«è¡Œ
                     SetBackColor = s_TitleRowBackColor;
                 }
-                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) == 1)
+                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) == (int)TotalFlgDef.Total)
                 {   // å�ˆè¨ˆè¡Œ
 
                 }
-                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) == 2)
+                else if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) == (int)TotalFlgDef.AllTotal)
                 {   // ç·�å�ˆè¨ˆ
                     SetForeColor = Color.White;
                     SetBackColor = Color.Black;
@@ -1526,8 +1565,8 @@
                     if (m_ReqSumDialogFlag)
                     {
                         int nGroupCnt = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
-                        if (nGroupCnt == (int)DataGroup.Empty
-                            || nGroupCnt == (int)DataGroup.NetIncome)                    // 12:ç´”åˆ©ç›Š
+                        if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.Empty
+                            || nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.NetIncome)                    // 12:ç´”åˆ©ç›Š
                         {
                             // æ˜Žç´°è¡Œè‰²ã‚»ãƒƒãƒˆ
                             SetDetailRowColor(CurRow);
@@ -1598,19 +1637,19 @@
                         case (int)GridColumn.No:
                             SetBackColor = Color.White;
                             // å¢—æ¸›å·¥äº‹ãƒ•ãƒ©ã‚°ã�ŒONã�®å ´å�ˆã�¯è‰²ã‚’å¤‰ã�ˆã‚‹
-                            int nFluctuation = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.FluctuationFlg].Value);
-                            if (nFluctuation != 0)
+                            int nSourceCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.SourceCode].Value);
+                            if (nSourceCode != m_ConstructionCode)
                             {
                                 int nGroup = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
                                 switch (nGroup)
                                 {
-                                    case (int)DataGroup.Instructor:
-                                    case (int)DataGroup.Assistant:
-                                    case (int)DataGroup.Payroll:
+                                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
+                                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
+                                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                                         // äººä»¶è²»ã�¯è‰²ã‚’ä»˜ã�‘ã�ªã�„
                                         break;
                                     default:
-                                        int nIndex = m_SourceCodeList.IndexOf(CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.SourceCode].Value));
+                                        int nIndex = m_SourceCodeList.IndexOf(nSourceCode);
                                         if (nIndex >= 0) SetBackColor = CommonDefine.DefineColorList[nIndex];
                                         break;
                                 }
@@ -1623,7 +1662,7 @@
                             // æ”¯æ‰•å�¯èƒ½é¡�ã�®ã‚«ãƒ©ãƒ ä½�ç½®ã�¯ãƒžã‚¤ãƒŠã‚¹ã�¯èµ¤å­—ã�«ã�™ã‚‹
                             if (i == ResultCols || i == OrverCols)
                             {
-                                int ResultValue = CommonMotions.cnvInt(CurRow.Cells[ResultCols].Value);
+                                long ResultValue = CommonMotions.cnvLong(CurRow.Cells[ResultCols].Value);
                                 // æ”¯æ‰•å�¯èƒ½é¡�ãƒ»æ”¯æ‰•è¶…é�Žé¡�ã�Œãƒžã‚¤ãƒŠã‚¹ã�«ã�ªã�£ã�Ÿã‚‰æ–‡å­—ã‚’èµ¤ã�«ã�™ã‚‹
                                 if (ResultValue < 0) SetForeColor = Color.Red;
                             }
@@ -1696,12 +1735,14 @@
                 }
 
                 // ----- åˆ�æœŸæ™‚å†�è¨ˆç®—ã�®ç‚ºè¿½åŠ 
+                // å…¨è¡Œå†�è¨ˆç®—å‡¦ç�†
+                RowAllCalcPayResult(false);
                 // è«‹æ±‚é‡‘é¡�è¨ˆç®—
                 CalculateBillingAmount();
                 // ç´”åˆ©ç›Šè¨ˆç®—
                 //CalculateNetIncome();
                 // å�ˆè¨ˆè¨ˆç®—
-                CreateAllTotal(false);
+                SetAllTotal(false);
                 /// ç�¾åœ¨åˆ©ç›Šè¨ˆç®—
                 CalculateCurrentProfit();
 
@@ -1777,7 +1818,7 @@
                 CreateNetIncome();
 
                 // å�ˆè¨ˆé‡‘é¡�
-                CreateAllTotal(true);
+                SetAllTotal(true);
 
                 // è«‹æ±‚é‡‘é¡�ä½œæˆ�
                 CreateBillingAmount();
@@ -1812,18 +1853,18 @@
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode));
                 strSQL.AppendFormat(" AND GROUPCOUNT IN ({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11})",
-                                                            (int)FrmConstructionBudget.DataGroup.CommonTempCosts,       // å…±é€šä»®è¨­
-                                                            (int)FrmConstructionBudget.DataGroup.OutSourceCosts,        // å¤–æ³¨è²»
-                                                            (int)FrmConstructionBudget.DataGroup.MyConstruction,        // è‡ªç¤¾æ–½å·¥
-                                                            (int)FrmConstructionBudget.DataGroup.TransportationCosts,   // äº¤é€šè²»è¡¨ç¤º
-                                                            (int)FrmConstructionBudget.DataGroup.PurchaseCosts,         // è³¼å…¥å“�
-                                                            (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee,       // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                                                            (int)FrmConstructionBudget.DataGroup.ParkingCosts,          // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                                                            (int)FrmConstructionBudget.DataGroup.RoomChargeCosts,       // å®¿æ³Šè²»
-                                                            (int)FrmConstructionBudget.DataGroup.DisposeCosts,          // å‡¦åˆ†è²»ç­‰
-                                                            (int)FrmConstructionBudget.DataGroup.InstructorCosts,       // æŒ‡å°Žå“¡çµ¦ä¸Ž
-                                                            (int)FrmConstructionBudget.DataGroup.AssistantCosts,        // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
-                                                            (int)FrmConstructionBudget.DataGroup.PayrollExpenses        // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts,       // å…±é€šä»®è¨­
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts,        // å¤–æ³¨è²»
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction,        // è‡ªç¤¾æ–½å·¥
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts,   // äº¤é€šè²»è¡¨ç¤º
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts,         // è³¼å…¥å“�
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee,       // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts,          // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts,       // å®¿æ³Šè²»
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts,          // å‡¦åˆ†è²»ç­‰
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts,       // æŒ‡å°Žå“¡çµ¦ä¸Ž
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts,        // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
+                                                            (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses        // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
                                                             );
 
                 strSQL.Append(" ORDER BY GroupCount ASC, LineCount ASC");
@@ -1965,10 +2006,10 @@
             try
             {
                 DataGridViewEX dgv = dgvAllDisplay;
-                int GroupNo = (int)DataGroup.Expenses;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Expenses;
 
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow(GroupNo, s_GroupTitle[GroupNo]);
+                CreateTitleRow(GroupNo, ConstructionLedgerDetail.GroupNameDef[GroupNo]);
 
                 // è¡Œä½�ç½®å�–å¾—
                 m_CostsRowCount[(int)CostsRowLine.ExpensesRowLine] = dgv.RowCount - 1;
@@ -2063,7 +2104,7 @@
                 // çµŒè²»ã‚³ãƒ¼ãƒ‰å�–å¾—
                 int nExpensesCode = CommonMotions.cnvInt(ObjCurRec[(int)ExpRecDef.ComponentCode]);
                 // çµŒè²»é‡‘é¡�å�–å¾—
-                int nValue = CommonMotions.cnvInt(ObjCurRec[(int)ExpRecDef.ExecutionAmount]);
+                long nValue = CommonMotions.cnvLong(ObjCurRec[(int)ExpRecDef.ExecutionAmount]);
                 // çµŒè²»çŽ‡å�–å¾—
                 double dExpenses = CommonMotions.cnvDouble(ObjCurRec[(int)ExpRecDef.AmountConfigRate]);
                 // çµŒè²»å��ç§°å�–å¾—
@@ -2072,7 +2113,7 @@
                 DataGridViewEX dgv = dgvAllDisplay;
                 object[] RowSetData = new object[dgv.Columns.Count];
 
-                int GroupNo = (int)DataGroup.Expenses;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Expenses;
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowSetData[(int)GridColumn.No] = string.Format("{0}-{1}", GroupNo, ++nDataCnt);
                 RowSetData[(int)GridColumn.FixFlg] = "*";
@@ -2142,11 +2183,9 @@
                 ArrayList arList = new ArrayList();
                 if (!edDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
 
-                int nRetVal = 0;
-                foreach (object[] curRec in arList)
-                {
-                    nRetVal = CommonMotions.cnvInt(curRec[0]);
-                }
+                long nRetVal = 0;
+                object[] curRec = (object[])arList[0];
+                nRetVal = CommonMotions.cnvLong(curRec[0]);
 
                 int nSetRow = m_CostsRowCount[(int)CostsRowLine.ExpensesRowLine] - 1;
                 if (nSetRow < 0) nSetRow = 0;
@@ -2201,11 +2240,9 @@
                 ArrayList arList = new ArrayList();
                 if (!edDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
 
-                int nRetVal = 0;
-                foreach (object[] curRec in arList)
-                {
-                    nRetVal = CommonMotions.cnvInt(curRec[0]);
-                }
+                long nRetVal = 0;
+                object[] curRec = (object[])arList[0];
+                nRetVal = CommonMotions.cnvLong(curRec[0]);
 
                 int nSetRow = 0;
                 if (m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] > 0)           // 8:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
@@ -2243,7 +2280,7 @@
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("SELECT B.NAMESTRING, A.AMOUNTCONFIGRATE, A.COMPONENTCODE");
                 strSQL.Append(" FROM CONSTRUCTIONBUDGETDETAIL A, DIVISIONMASTER B");
-                strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)FrmConstructionBudget.DataGroup.Expenses, 0, "A"));
+                strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBudgetDetail.GroupCountDef.Expenses, 0, "A"));
                 strSQL.AppendFormat(" AND B.DIVISIONCODE = {0}", DivCode);
                 strSQL.Append(" AND B.NAMECODE = A.COMPONENTCODE");
                 strSQL.Append(" ORDER BY A.LINECOUNT");
@@ -2286,16 +2323,16 @@
             {
                 List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
                 bool bExists = SetBudgetDataFromList(FromData, ref DetailList,
-                                                (int)FrmConstructionBudget.DataGroup.CommonTempCosts,       // å…±é€šä»®è¨­
-                                                (int)FrmConstructionBudget.DataGroup.OutSourceCosts,        // å¤–æ³¨è²»
-                                                (int)FrmConstructionBudget.DataGroup.MyConstruction);       // è‡ªç¤¾æ–½å·¥
+                                                (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts,       // å…±é€šä»®è¨­
+                                                (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts,        // å¤–æ³¨è²»
+                                                (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction);       // è‡ªç¤¾æ–½å·¥
                 if (DetailList.Count == 0) return;
 
                 DataGridViewEX dgv = dgvAllDisplay;
-                int GroupNo = (int)DataGroup.ConstructionCosts;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
                 int icnt = 0;
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow(GroupNo, s_GroupTitle[GroupNo]);
+                CreateTitleRow(GroupNo, ConstructionLedgerDetail.GroupNameDef[GroupNo]);
 
                 // è¡Œä½�ç½®å�–å¾—
                 m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine] = dgv.RowCount - 1;
@@ -2355,22 +2392,22 @@
             try
             {
                 int icnt = 1;
-                int Block = (int)DataGroup.TransportationCosts;
+                int Block = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts;
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
-                CreateTitleRow(Block, s_GroupTitle[(int)DataGroup.PurchaseCosts] + "ã€€ã€€ç­‰");
+                CreateTitleRow(Block, ConstructionLedgerDetail.GroupNameDef[(int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts] + "ã€€ã€€ç­‰");
 
                 // äº¤é€šè²»è¡¨ç¤º
-                GetDispDataFromConstructionBudget(DetailList, Block, (int)FrmConstructionBudget.DataGroup.TransportationCosts, icnt++);
+                GetDispDataFromConstructionBudget(DetailList, Block, (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts, icnt++);
                 // è³¼å…¥å“�
                 DispPurchaseCostsFromConstructionBudget(DetailList, Block, icnt++);
                 // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                GetDispDataFromConstructionBudget(DetailList, Block, (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee, icnt++);
+                GetDispDataFromConstructionBudget(DetailList, Block, (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee, icnt++);
                 // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                GetDispDataFromConstructionBudget(DetailList, Block, (int)FrmConstructionBudget.DataGroup.ParkingCosts, icnt++);
+                GetDispDataFromConstructionBudget(DetailList, Block, (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts, icnt++);
                 // å®¿æ³Šè²»
-                GetDispDataFromConstructionBudget(DetailList, Block, (int)FrmConstructionBudget.DataGroup.RoomChargeCosts, icnt++);
+                GetDispDataFromConstructionBudget(DetailList, Block, (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts, icnt++);
                 // å‡¦åˆ†è²»ç­‰
-                GetDispDataFromConstructionBudget(DetailList, Block, (int)FrmConstructionBudget.DataGroup.DisposeCosts, icnt++);
+                GetDispDataFromConstructionBudget(DetailList, Block, (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts, icnt++);
 
             }
             catch (Exception ex)
@@ -2393,9 +2430,10 @@
                 double Estimateprice = 0;
                 double ExecutionAmount = 0;
                 double AmountConfigRate = 0;
-                SumBudgetDataFromList(FromData, ref Estimateprice, ref ExecutionAmount, ref AmountConfigRate, (int)FrmConstructionBudget.DataGroup.PurchaseCosts);
+                SumBudgetDataFromList(FromData, ref Estimateprice, ref ExecutionAmount, ref AmountConfigRate
+                                    , (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts);
                 DataGridViewEX dgv = dgvAllDisplay;
-                int GroupNo = (int)DataGroup.PurchaseCosts;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts;
                 object[] wrkobj = new object[] { Estimateprice, ExecutionAmount, AmountConfigRate };
 
                 // è¡Œä½�ç½®å�–å¾—
@@ -2406,9 +2444,9 @@
                 RowData[(int)GridColumn.No] = string.Format("{0}-{1}", BlockCnt, icnt);
                 RowData[(int)GridColumn.FixFlg] = "*";
                 RowData[(int)GridColumn.GroupCount] = GroupNo;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[GroupNo];
-                RowData[(int)GridColumn.EstimatePrice] = CommonMotions.cnvInt(wrkobj[0]).ToString("#,0");
-                RowData[(int)GridColumn.ExecPrice] = CommonMotions.cnvInt(wrkobj[1]).ToString("#,0");
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
+                RowData[(int)GridColumn.EstimatePrice] = CommonMotions.cnvLong(wrkobj[0]).ToString("#,0");
+                RowData[(int)GridColumn.ExecPrice] = CommonMotions.cnvLong(wrkobj[1]).ToString("#,0");
                 RowData[(int)GridColumn.Percent] = CommonMotions.cnvDouble(wrkobj[2]).ToString("0.00");
                 RowData[(int)GridColumn.IndependentFlg] = "1";
                 RowData[(int)GridColumn.FluctuationFlg] = "0";
@@ -2419,7 +2457,7 @@
                 RowData[TotalPoint] = "0";
                 // å®Ÿç¸¾æ¬„ä½�ç½®å�–å¾—
                 int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
-                RowData[ResultPoint] = CommonMotions.cnvInt(wrkobj[1]).ToString("#,0");
+                RowData[ResultPoint] = CommonMotions.cnvLong(wrkobj[1]).ToString("#,0");
 
                 // è¡Œã‚»ãƒƒãƒˆ
                 CreateDataRow(RowData);
@@ -2461,41 +2499,41 @@
                 switch (GroupNo)
                 {
                     // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee:
                         m_CostsRowCount[(int)CostsRowLine.VehicleLeaseFeeRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.VehicleLeaseFee;
-                        DetailRec.FirstString = s_GroupTitle[(int)DataGroup.VehicleLeaseFee];
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee;
+                        DetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                         break;
                     // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    case (int)FrmConstructionBudget.DataGroup.TransportationCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts:
                         m_CostsRowCount[(int)CostsRowLine.TransportationCostsRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.TransportationCosts;
-                        DetailRec.FirstString = s_GroupTitle[(int)DataGroup.TransportationCosts];
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts;
+                        DetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                         break;
                     // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)FrmConstructionBudget.DataGroup.ParkingCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts:
                         m_CostsRowCount[(int)CostsRowLine.ParkingCostsRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.ParkingCosts;
-                        DetailRec.FirstString = s_GroupTitle[(int)DataGroup.ParkingCosts];
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts;
+                        DetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                         break;
                     // å®¿æ³Šè²»
-                    case (int)FrmConstructionBudget.DataGroup.RoomChargeCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts:
                         m_CostsRowCount[(int)CostsRowLine.RoomChargeCostsRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.RoomChargeCosts;
-                        DetailRec.FirstString = s_GroupTitle[(int)DataGroup.RoomChargeCosts];
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts;
+                        DetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                         break;
                     // å‡¦åˆ†è²»ç­‰
-                    case (int)FrmConstructionBudget.DataGroup.DisposeCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts:
                         m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.DisposeCosts;
-                        DetailRec.FirstString = s_GroupTitle[(int)DataGroup.DisposeCosts];
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts;
+                        DetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                         break;
                     // æŒ‡å°Žå“¡è²»ç”¨
-                    case (int)FrmConstructionBudget.DataGroup.InstructorCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts:
                         // æŒ‡å°Žå“¡è¡Œã�¯è¤‡æ•°ã�‚ã‚‹å ´å�ˆã�Œã�‚ã‚‹
                         if (m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] == 0)
                             m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.Instructor;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Instructor;
 
                         // æŒ‡å°Žå“¡è¡Œã�«ã‚³ãƒ¼ãƒ‰ãƒ»å��å‰�ã‚’å…¥ã‚Œã‚‹
                         SetFirstStringName(GroupNo, ref DetailRec);
@@ -2507,11 +2545,11 @@
                         if (CheckLeaderOrUser()) DetailRec.SecondString = string.Empty;
                         break;
                     // å‰¯æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)FrmConstructionBudget.DataGroup.AssistantCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts:
                         // å‰¯æ‹…å½“è€…è¡Œã�¯è¤‡æ•°ã�‚ã‚‹å ´å�ˆã�Œã�‚ã‚‹
                         if (m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] == 0)
                             m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.Assistant;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Assistant;
 
                         // å‰¯æ‹…å½“è¡Œã�«ã‚³ãƒ¼ãƒ‰ãƒ»å��å‰�ã‚’å…¥ã‚Œã‚‹
                         SetFirstStringName(GroupNo, ref DetailRec);
@@ -2523,11 +2561,11 @@
                         if (!CheckLeaderOrUser()) DetailRec.SecondString = string.Empty;
                         break;
                     // æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)FrmConstructionBudget.DataGroup.PayrollExpenses:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses:
                         // æ‹…å½“è€…ã�¯è¤‡æ•°ã�‚ã‚‹å ´å�ˆã�Œã�‚ã‚‹
                         if (m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] == 0)
                             m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] = dgv.RowCount;
-                        GroupNo = (int)DataGroup.Payroll;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Payroll;
 
                         // æ‹…å½“è€…è¡Œã�«ã‚³ãƒ¼ãƒ‰ãƒ»å��å‰�ã‚’å…¥ã‚Œã‚‹
                         SetFirstStringName(GroupNo, ref DetailRec);
@@ -2588,7 +2626,7 @@
         {
             try
             {
-                int GroupNo = (int)DataGroup.TransportationCosts + 1;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts + 1;
                 int icnt = 1;
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
                 CreateTitleRow(GroupNo, s_PersonnelExpensesGroup);
@@ -2601,9 +2639,9 @@
                     case (int)ProductDefine.ProductTypeDef.ProductsModelType2_2:
                         // ----- è£½å“�ç‰ˆï¼ˆæ‰¿èª�ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰
                         // æŒ‡å°Žå“¡çµ¦ä¸Ž
-                        GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.InstructorCosts, icnt++);
+                        GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts, icnt++);
                         // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
-                        GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.AssistantCosts, icnt++);
+                        GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts, icnt++);
                         break;
                     case (int)ProductDefine.ProductTypeDef.ProductsModelType1:
                         // ----- è£½å“�ç‰ˆï¼ˆä¸€äººè¦ªæ–¹ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰
@@ -2613,7 +2651,7 @@
                 }
 
                 // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
-                GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.PayrollExpenses, icnt++);
+                GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses, icnt++);
 
                 // ç�¾å ´ç®¡ç�†è²»ã‚»ãƒƒãƒˆ
                 GetEstimateFieldManage();
@@ -2652,13 +2690,13 @@
 
                     switch (GroupNo)
                     {
-                        case (int)DataGroup.Payroll:                                                    // æ‹…å½“è€…
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:                                                    // æ‹…å½“è€…
                             SalaryFlg = BudgetRec.SalaryFlg;                                            // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                             SalaryDays = BudgetRec.SalaryDays;                                          // çµ¦ä¸ŽæŒ¯åˆ†æ—¥æ•°
                             RowData[(int)GridColumn.SalaryOnRegist] = BudgetRec.CreatorCosts;           // ç™»éŒ²æ™‚æœˆé¡�çµ¦ä¸Ž
                             break;
 
-                        case (int)DataGroup.Assistant:                                                  // å‰¯æ‹…å½“è€…
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:                                                  // å‰¯æ‹…å½“è€…
                             if (BudgetRec.AssistantCode == 0)                                           // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                                 SalaryFlg = (int)CommonDefine.SalaryDevision.Noting;
                             else
@@ -2666,7 +2704,7 @@
                             SalaryDays = BudgetRec.A_SalaryDays;                                        // çµ¦ä¸ŽæŒ¯åˆ†æ—¥æ•°
                             RowData[(int)GridColumn.SalaryOnRegist] = BudgetRec.AssistantCosts;         // ç™»éŒ²æ™‚æœˆé¡�çµ¦ä¸Ž
                             break;
-                        case (int)DataGroup.Instructor:                                                 // æŒ‡å°Žå“¡
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:                                                 // æŒ‡å°Žå“¡
                             if (BudgetRec.InstructorCode == 0)                                          // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                                 SalaryFlg = (int)CommonDefine.SalaryDevision.Noting;
                             else
@@ -2710,7 +2748,7 @@
         /// <param name="TotalValue">å�ˆè¨ˆé‡‘é¡�</param>
         /// <param name="ResultValue">å®Ÿç¸¾é‡‘é¡�</param>
         /// <param name="MTotal">æœˆæ¯Žå�ˆè¨ˆ</param>
-        private void GetDetailTotal(ref int EstimateValue, ref int ExecValue, ref double PercentValue, ref int TotalValue, ref int ResultValue, ref int[] MTotal)
+        private void GetDetailTotal(ref long EstimateValue, ref long ExecValue, ref double PercentValue, ref long TotalValue, ref long ResultValue, ref long[] MTotal)
         {
             try
             {
@@ -2720,7 +2758,6 @@
                 // æ”¯æ‰•å�¯èƒ½é¡�æ¬„ä½�ç½®å�–å¾—
                 int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
 
-
                 DataGridViewRow[] WorkRow = null;
                 // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿å�–å¾—ï¼ˆã‚°ãƒ«ãƒ¼ãƒ—ã�Œç´”åˆ©ç›Šã‚ˆã‚Šå°�ã�•ã�„ã‚‚ã�®ï¼‰
                 int nGrpNo = (int)GridColumn.GroupCount;
@@ -2733,23 +2770,20 @@
                 }
                 else
                 {
-                    WorkRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) < (int)DataGroup.NetIncome)
+                    WorkRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) < (int)ConstructionLedgerDetail.GroupCountDef.NetIncome)
                                                                                         .ToArray();
                 }
 
-                EstimateValue = WorkRow.Sum(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.EstimatePrice].Value));   // ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�
+                EstimateValue = WorkRow.Sum(y => CommonMotions.cnvLong(y.Cells[(int)GridColumn.EstimatePrice].Value));  // ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�
 
-                //ExecValue = WorkRow.Sum(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.ExecPrice].Value));           // å®Ÿè¡Œé‡‘é¡�
-                //PercentValue = WorkRow.Sum(y => CommonMotions.cnvDouble(y.Cells[(int)GridColumn.Percent].Value));       // æ§‹æˆ�æ¯”çŽ‡
-
                 ExecValue = WorkRow.Where(x => !CommonMotions.cnvBool(x.Cells[(int)GridColumn.InvalidLine].Value))
-                                    .Sum(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.ExecPrice].Value));          // å®Ÿè¡Œé‡‘é¡�
+                                    .Sum(y => CommonMotions.cnvLong(y.Cells[(int)GridColumn.ExecPrice].Value));         // å®Ÿè¡Œé‡‘é¡�
 
                 PercentValue = WorkRow.Where(x => !CommonMotions.cnvBool(x.Cells[(int)GridColumn.InvalidLine].Value))
                                     .Sum(y => CommonMotions.cnvDouble(y.Cells[(int)GridColumn.Percent].Value));         // æ§‹æˆ�æ¯”çŽ‡
 
-                TotalValue = WorkRow.Sum(y => CommonMotions.cnvInt(y.Cells[TotalPoint].Value));                         // å�ˆè¨ˆé‡‘é¡�
-                ResultValue = WorkRow.Sum(y => CommonMotions.cnvInt(y.Cells[ResultPoint].Value));                       // å®Ÿç¸¾é‡‘é¡�
+                TotalValue = WorkRow.Sum(y => CommonMotions.cnvLong(y.Cells[TotalPoint].Value));                        // å�ˆè¨ˆé‡‘é¡�
+                ResultValue = WorkRow.Sum(y => CommonMotions.cnvLong(y.Cells[ResultPoint].Value));                      // å®Ÿç¸¾é‡‘é¡�
 
                 // æœˆæ¯Žã‚¯ãƒªã‚¢
                 Array.Clear(MTotal, 0, MTotal.Length);
@@ -2757,7 +2791,7 @@
                 int arrayCnt = 0;
                 for (int i = (int)GridColumn.Payment; i < dgv.ColumnCount; i++)
                 {
-                    MTotal[arrayCnt++] = WorkRow.Sum(y => CommonMotions.cnvInt(y.Cells[i].Value));
+                    MTotal[arrayCnt++] = WorkRow.Sum(y => CommonMotions.cnvLong(y.Cells[i].Value));
                 }
 
             }
@@ -2783,16 +2817,16 @@
                 {
                     int nGroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
                     // æ–½å·¥è²»ã�‹ã‚‰æ‹…å½“è€…çµ¦ä¸Žã�¾ã�§ã�®è¡Œã‚’åŠ ç®—ã�™ã‚‹
-                    if (nGroupNo < (int)DataGroup.Expenses || (int)DataGroup.Payroll < nGroupNo) continue;
+                    if (nGroupNo < (int)ConstructionLedgerDetail.GroupCountDef.Expenses || (int)ConstructionLedgerDetail.GroupCountDef.Payroll < nGroupNo) continue;
 
                     // ç„¡åŠ¹è¡Œã�¯é‡‘é¡�ã‚’åŠ ç®—ã�—ã�ªã�„
                     if (CommonMotions.cnvBool(CurRow.Cells[(int)GridColumn.InvalidLine].Value)) continue;
 
                     // æ³¨æ–‡æ›¸é‡‘é¡�å�–å¾—
-                    int nOrderVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderPrice].Value);
+                    long nOrderVal = CommonMotions.cnvLong(CurRow.Cells[(int)GridColumn.OrderPrice].Value);
 
                     // å®Ÿè¡Œäºˆç®—é‡‘é¡�
-                    int nExecVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value);
+                    long nExecVal = CommonMotions.cnvLong(CurRow.Cells[(int)GridColumn.ExecPrice].Value);
 
                     // æ³¨æ–‡æ›¸é‡‘é¡�ã�Œã�‚ã‚Œã�°ã��ã‚Œã‚’ã€�ç„¡ã�‘ã‚Œã�°å®Ÿè¡Œäºˆç®—é‡‘é¡�ã‚’åŠ ç®—
                     if (nOrderVal != 0) lRet += nOrderVal;
@@ -2821,15 +2855,15 @@
                 DataGridViewEX dgv = dgvAllDisplay;
 
                 // å�—æ³¨é‡‘é¡�å�–å¾—
-                int OrdersPrice = CommonMotions.cnvInt(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text);
+                long OrdersPrice = CommonMotions.cnvLong(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text);
 
-                int EstimatePriceValue = 0;
-                int ExecPriceValue = 0;
+                long EstimatePriceValue = 0;
+                long ExecPriceValue = 0;
                 double PercentValue = 0;
-                int TotalValue = 0;
-                int ResultPriceValue = 0;
+                long TotalValue = 0;
+                long ResultPriceValue = 0;
                 int Colcnt = dgv.ColumnCount - (int)GridColumn.Payment;
-                int[] MTotal = new int[Colcnt];
+                long[] MTotal = new long[Colcnt];
 
                 // å�ˆè¨ˆå€¤å�–å¾—
                 GetDetailTotal(ref EstimatePriceValue, ref ExecPriceValue, ref PercentValue, ref TotalValue, ref ResultPriceValue, ref MTotal);
@@ -2837,15 +2871,16 @@
                 // å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�–å¾—
                 long lPurchasePrice = GetLoopBeginValue();
 
-                int EstimateValue = OrdersPrice - EstimatePriceValue;
-                int ExecValue = OrdersPrice - ExecPriceValue;
+                long EstimateValue = OrdersPrice - EstimatePriceValue;
+                long ExecValue = OrdersPrice - ExecPriceValue;
                 long POrderPrice = OrdersPrice - lPurchasePrice;
 
                 object[] RowData = new object[dgv.Columns.Count];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.GroupCount] = (int)DataGroup.NetIncome;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.NetIncome];
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.NetIncome;
+                RowData[(int)GridColumn.GroupCount] = GroupNo;
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                 RowData[(int)GridColumn.EstimatePrice] = EstimateValue.ToString("#,0");
                 RowData[(int)GridColumn.ExecPrice] = ExecValue.ToString("#,0");
                 RowData[(int)GridColumn.Percent] = CalculattionPercent((double)ExecValue).ToString("0.00");
@@ -2867,38 +2902,6 @@
         }
         #endregion
 
-        #region è¡¨ç¤ºæ˜Žç´°è¡Œã‚ˆã‚Šå¯¾è±¡è¡Œæ•°ã‚’è¿”ã�™
-        /// <summary>
-        /// è¡¨ç¤ºæ˜Žç´°è¡Œã‚ˆã‚Šå¯¾è±¡è¡Œæ•°ã‚’è¿”ã�™
-        /// </summary>
-        private int RowCountPoint(int nCode, ArrayList DetailList)
-        {
-            try
-            {
-                int nPo = 0;
-                int i = 0;
-                foreach (object[] CurObj in DetailList)
-                {
-                    // å�Œã�˜ã‚³ãƒ¼ãƒ‰ã�®è¡Œæ•°ã‚’å�–å¾—ã�™ã‚‹
-                    int nCurCode = CommonMotions.cnvInt(CurObj[(int)IOConstructionLedgerDetail.TableColumn.SourceCode]);
-                    if (nCurCode == nCode)
-                    {
-                        nPo = i;
-                        break;
-                    }
-                    i++;
-                }
-
-                return nPo;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return 0;
-            }
-        }
-        #endregion
-
         #region æŒ‡å®šã‚³ãƒ¼ãƒ‰ã�®ç™ºæ³¨é‡‘é¡�ï¼ˆæ³¨æ–‡æ›¸ã�Œç„¡ã�‘ã‚Œã�°å®Ÿè¡Œé‡‘é¡�ï¼‰ã‚’è¿”ã�™
         /// <summary>
         /// æŒ‡å®šã‚³ãƒ¼ãƒ‰ã�®ç™ºæ³¨é‡‘é¡�ï¼ˆæ³¨æ–‡æ›¸ã�Œç„¡ã�‘ã‚Œã�°å®Ÿè¡Œé‡‘é¡�ï¼‰ã‚’è¿”ã�™
@@ -2935,8 +2938,8 @@
 
                 strSQL.AppendFormat(" Where A.ConstructionCode = {0}", m_ConstructionCode);
                 strSQL.AppendFormat(" And A.SourceCode = {0}", nCode);
-                strSQL.AppendFormat(" And ({0} < A.GroupCount", (int)DataGroup.Expenses);
-                strSQL.AppendFormat(" And A.GroupCount < {0})", (int)DataGroup.Instructor);
+                strSQL.AppendFormat(" And ({0} < A.GroupCount", (int)ConstructionLedgerDetail.GroupCountDef.Expenses);
+                strSQL.AppendFormat(" And A.GroupCount < {0})", (int)ConstructionLedgerDetail.GroupCountDef.Instructor);
 
                 ArrayList arrayList = new ArrayList();
                 if (!cldDB.ExecuteReader(strSQL.ToString(), ref arrayList)) return 0;
@@ -2958,6 +2961,96 @@
         }
         #endregion
 
+        #region è£œå¡«é‡‘é¡�è¡Œä½œæˆ�
+        /// <summary>
+        /// è£œå¡«é‡‘é¡�è¡Œä½œæˆ�
+        /// </summary>
+        private void CreateCompensation(ArrayList DetailList)
+        {
+            try
+            {
+                DataGridViewEX dgv = dgvAllDisplay;
+
+                int nGroupCount = (int)ConstructionLedgerDetail.GroupCountDef.Compensation;
+
+                int DetailCnt = Enum.GetNames(typeof(IOConstructionLedgerDetail.TableColumn)).Length;
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                object[] RowData = new object[dgv.Columns.Count];
+                RowData[(int)GridColumn.FixFlg] = "*";
+                RowData[(int)GridColumn.GroupCount] = nGroupCount;
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[nGroupCount];
+                RowData[(int)GridColumn.SourceCode] = m_ConstructionCode;
+
+                // ----- æ”¯æ‰•ã�„ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                long TotalValue = 0;
+                int nGrpCol = (int)IOConstructionLedgerDetail.TableColumn.GroupCount;
+                List<object[]> objExcute = DetailList.Cast<object[]>()
+                                                    .Where(x => nGroupCount == CommonMotions.cnvInt(x[nGrpCol])
+                                                            && DateTime.MinValue.Date != CommonMotions.cnvDate(x[DetailCnt]).Date)
+                                                    .ToList();
+                if (objExcute.Count < 1) return;
+
+                foreach (object[] objExcuteRec in objExcute)
+                {
+                    DateTime ExcuteRec_TargetMonth = CommonMotions.cnvDate(objExcuteRec[DetailCnt]);        // å¯¾è±¡å¹´æœˆ
+                    long ExcuteRec_PaymentAmount = CommonMotions.cnvLong(objExcuteRec[DetailCnt + 1]);      // å¯¾è±¡é‡‘é¡�
+
+                    // å¹´æœˆã�Œæœ€å°�å€¤ã�¯ãƒ‡ãƒ¼ã‚¿ç„¡
+                    if (ExcuteRec_TargetMonth == DateTime.MinValue) continue;
+
+                    //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ˜ãƒƒãƒ€ãƒ¼ã‚ˆã‚ŠæŽ¢ã�™ï¼‰
+                    string CurMounth = YearMonthFormat(ExcuteRec_TargetMonth.Year, ExcuteRec_TargetMonth.Month);
+                    int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                    if (nIndex < 0) continue;
+
+                    // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                    RowData[nIndex] = ExcuteRec_PaymentAmount.ToString("#,0");
+
+                    int nGetField = (int)IOConstructionLedgerDetail.TableColumn.InvalidLine;
+                    int nInvalidLine = CommonMotions.cnvInt(objExcuteRec[nGetField]);
+
+                    // ç„¡åŠ¹è¡Œã�¯å�ˆè¨ˆã‚’åŠ ç®—ã�—ã�ªã�„
+                    if (nInvalidLine != (int)ConstructionLedgerDetail.InvalidLineDef.ValidData) continue;
+
+                    // æœ‰åŠ¹è¡Œã�¯å�ˆè¨ˆã‚’åŠ ç®—ã�™ã‚‹
+                    TotalValue += ExcuteRec_PaymentAmount;
+                }
+               
+                // å�ˆè¨ˆé‡‘é¡�è¡¨ç¤º
+                int GridColMax = dgv.ColumnCount;
+                int nTargetNo = GridColMax + (int)ColPayTotal.Totals;
+                RowData[nTargetNo] = TotalValue.ToString("#,0");
+
+                // è¡Œã‚»ãƒƒãƒˆ
+                CreateDataRow(RowData);
+
+                // è¡Œä½�ç½®å�–å¾—
+                int CurRowCnt = dgv.RowCount - 1;
+                // èª­ã�¿å�–ã‚Šå°‚ç”¨
+                dgv.Rows[CurRowCnt].ReadOnly = true;
+                // è¡Œä½�ç½®ã‚»ãƒƒãƒˆ
+                m_CostsRowCount[(int)CostsRowLine.CompensationLine] = CurRowCnt;
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
+
+                DataGridViewRow CurRow = dgv.Rows[CurRowCnt];
+                // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
+                for (int i = 0; i < dgv.ColumnCount; i++)
+                {
+                    CurRow.Cells[i].Style.BackColor = Color.DarkSlateGray;
+                    CurRow.Cells[i].Style.ForeColor = Color.WhiteSmoke;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ç´”åˆ©ç›Šä½œæˆ�ï¼ˆãƒ‡ãƒ¼ã‚¿å­˜åœ¨æ™‚ï¼‰
         /// <summary>
         /// ç´”åˆ©ç›Šä½œæˆ�ï¼ˆãƒ‡ãƒ¼ã‚¿å­˜åœ¨æ™‚ï¼‰
@@ -2978,10 +3071,10 @@
                 List<long> EstVal = new List<long>();
                 List<long> ExecVal = new List<long>();
                 List<long> PurVal = new List<long>();
+                int nTargetNo = (int)IOConstructionLedgerDetail.TableColumn.SourceCode;
                 foreach (int CurCode in m_SourceCodeList)
                 {
-                    int nCnt = RowCountPoint(CurCode, DetailList);
-                    object[] DetialObj = (object[])DetailList[nCnt];
+                    object[] DetialObj = DetailList.Cast<object[]>().Where(x => CommonMotions.cnvInt(x[nTargetNo]) == CurCode).First();
                     // å�—æ³¨é‡‘é¡�
                     long wrkOrderVal = CommonMotions.cnvLong(DetialObj[DetailCnt + (int)DetailReadOrder.OrdersPrice]);
                     OrderVal.Add(wrkOrderVal);
@@ -3020,8 +3113,9 @@
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     object[] RowData = new object[dgv.Columns.Count];
                     RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)DataGroup.NetIncome;
-                    if (nRowCnt < 1) RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.NetIncome];
+                    int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.NetIncome;
+                    RowData[(int)GridColumn.GroupCount] = GroupNo;
+                    if (nRowCnt < 1) RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
 
                     RowData[(int)GridColumn.EstimatePrice] = DispVal[0].ToString("#,0");
                     RowData[(int)GridColumn.ExecPrice] = DispVal[1].ToString("#,0");
@@ -3085,7 +3179,7 @@
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 object[] RowData = new object[dgv.Columns.Count];
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.GroupCount] = (int)DataGroup.NetIncome;
+                RowData[(int)GridColumn.GroupCount] = (int)ConstructionLedgerDetail.GroupCountDef.NetIncome;
                 RowData[(int)GridColumn.ItemName] = "ç´”ã€€åˆ©ã€€ç›Šã€€å�ˆã€€è¨ˆ";
                 RowData[(int)GridColumn.EstimatePrice] = DispVal[0].ToString("#,0");
                 RowData[(int)GridColumn.ExecPrice] = DispVal[1].ToString("#,0");
@@ -3117,14 +3211,14 @@
 
                 // æ”¯æ‰•å�¯èƒ½é¡�æ¬„å�–å¾—
                 int OverpaymentPoint = dgv.ColumnCount + (int)ColPayTotal.Overpayments;
-                int Overpayment = CommonMotions.cnvInt(dgv.Rows[TotalLine].Cells[OverpaymentPoint].Value);
+                long Overpayment = CommonMotions.cnvLong(dgv.Rows[TotalLine].Cells[OverpaymentPoint].Value);
 
                 // è£œæ­£æ¬„å�–å¾—
                 int BurdenPoint = dgv.ColumnCount + (int)ColPayTotal.PaymentBurdens;
-                int Burden = CommonMotions.cnvInt(dgv.Rows[TotalLine].Cells[BurdenPoint].Value);
+                long Burden = CommonMotions.cnvLong(dgv.Rows[TotalLine].Cells[BurdenPoint].Value);
 
                 // äºˆç®—è¶…é�Žé¡�ã‚»ãƒƒãƒˆ
-                int Budget = (Overpayment + Burden);
+                long Budget = (Overpayment + Burden);
                 m_DspLabelCtrl[(int)DspLblCtrlName.BudgetOverrun].Text = Budget.ToString("#,0");
                 // æ”¯æ‰•å�¯èƒ½é¡�ã�Œãƒžã‚¤ãƒŠã‚¹ã�®å ´å�ˆ
                 if (Budget < 0)
@@ -3147,19 +3241,19 @@
         /// <summary>
         /// å�ˆè¨ˆé‡‘é¡�ä½œæˆ�
         /// </summary>
-        private void CreateAllTotal(bool bCreateRow)
+        private void SetAllTotal(bool bCreateRow)
         {
             try
             {
                 DataGridViewEX dgv = dgvAllDisplay;
 
-                int EstimatePriceValue = 0;
-                int ExecPriceValue = 0;
+                long EstimatePriceValue = 0;
+                long ExecPriceValue = 0;
                 double PercentValue = 0;
-                int TotalValue = 0;
-                int ResultPriceValue = 0;
+                long TotalValue = 0;
+                long ResultPriceValue = 0;
                 int Colcnt = dgv.ColumnCount - (int)GridColumn.Payment;
-                int[] MTotal = new int[Colcnt];
+                long[] MTotal = new long[Colcnt];
 
                 // å�ˆè¨ˆå€¤å�–å¾—
                 GetDetailTotal(ref EstimatePriceValue, ref ExecPriceValue, ref PercentValue, ref TotalValue, ref ResultPriceValue, ref MTotal);
@@ -3168,65 +3262,14 @@
 
                 // ç´”åˆ©ç›Šå�–å¾—
                 int NetIncomeLine = m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine];
-                EstimatePriceValue += CommonMotions.cnvInt(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.EstimatePrice].Value);
-                ExecPriceValue += CommonMotions.cnvInt(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.ExecPrice].Value);
-                lPurchasePrice += CommonMotions.cnvInt(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.OrderPrice].Value);
+                EstimatePriceValue += CommonMotions.cnvLong(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.EstimatePrice].Value);
+                ExecPriceValue += CommonMotions.cnvLong(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.ExecPrice].Value);
+                lPurchasePrice += CommonMotions.cnvLong(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.OrderPrice].Value);
 
                 if (bCreateRow)
                 {
-                    // ç©ºç™½è¡Œ
-                    AddEmptyRow();
-
-                    object[] RowData = new object[dgv.Columns.Count];
-                    // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    RowData[(int)GridColumn.FixFlg] = "*";
-                    RowData[(int)GridColumn.GroupCount] = (int)DataGroup.AllTotal;
-                    RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.AllTotal];
-                    RowData[(int)GridColumn.EstimatePrice] = EstimatePriceValue.ToString("#,0");
-                    RowData[(int)GridColumn.ExecPrice] = ExecPriceValue.ToString("#,0");
-                    RowData[(int)GridColumn.Percent] = CalculattionPercent((double)ExecPriceValue).ToString("0.00");
-                    RowData[(int)GridColumn.OrderPrice] = lPurchasePrice.ToString("#,0");
-
-                    // æœˆæ¯Žå�ˆè¨ˆ
-                    int arrayCnt = 0;
-                    for (int i = (int)GridColumn.Payment; i < dgv.ColumnCount; i++)
-                    {
-                        RowData[i] = MTotal[arrayCnt++].ToString("#,0");
-                    }
-
-                    // å�ˆè¨ˆæ¬„ä½�ç½®å�–å¾—
-                    int TotalPoint = dgv.ColumnCount + (int)ColPayTotal.Totals;
-                    RowData[TotalPoint] = TotalValue.ToString("#,0");
-
-                    // å®Ÿç¸¾æ¬„ä½�ç½®å�–å¾—
-                    int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
-                    RowData[ResultPoint] = ResultPriceValue.ToString("#,0");
-
-                    // è¡Œã‚»ãƒƒãƒˆ
-                    CreateDataRow(RowData);
-
-                    // è¡Œä½�ç½®å�–å¾—
-                    int LineCnt = dgv.RowCount - 1;
-                    m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine] = LineCnt;
-
-                    // å�ˆè¨ˆè¡Œã�¯æ›¸è¾¼ã�¿ä¸�å�¯
-                    dgv.Rows[LineCnt].ReadOnly = true;
-
-                    // ç·�å�ˆè¨ˆãƒ•ãƒ©ã‚°ON
-                    dgv.Rows[LineCnt].Cells[(int)GridColumn.TotalFlg].Value = 2;
-
-                    // å·¥äº‹ä¾¡æ ¼è¨ˆã�¯è¡Œã‚’å¤§ã��ã��ã�™ã‚‹
-                    dgv.Rows[LineCnt].Height = dgv.RowTemplate.Height * 2;
-                    float FontSize = dgv.DefaultCellStyle.Font.Size;
-                    Font DrowFont = new Font(dgv.DefaultCellStyle.Font.FontFamily, FontSize * 2);
-                    dgv.Rows[LineCnt].Cells[(int)GridColumn.No].Style.Font = DrowFont;
-
-                    // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
-                    for (int i = 0; i < dgv.Columns.Count; i++)
-                    {
-                        dgv.Rows[LineCnt].Cells[i].Style.ForeColor = Color.White;
-                        dgv.Rows[LineCnt].Cells[i].Style.BackColor = Color.Black;
-                    }
+                    // å�ˆè¨ˆé‡‘é¡�è¡Œä½œæˆ�
+                    CreateAllTotal();
                 }
                 else
                 {
@@ -3261,6 +3304,97 @@
         }
         #endregion
 
+        #region å�ˆè¨ˆé‡‘é¡�è¡Œä½œæˆ�
+        /// <summary>
+        /// å�ˆè¨ˆé‡‘é¡�è¡Œä½œæˆ�
+        /// </summary>
+        private void CreateAllTotal()
+        {
+            try
+            {
+                DataGridViewEX dgv = dgvAllDisplay;
+
+                long EstimatePriceValue = 0;
+                long ExecPriceValue = 0;
+                double PercentValue = 0;
+                long TotalValue = 0;
+                long ResultPriceValue = 0;
+                int Colcnt = dgv.ColumnCount - (int)GridColumn.Payment;
+                long[] MTotal = new long[Colcnt];
+
+                // å�ˆè¨ˆå€¤å�–å¾—
+                GetDetailTotal(ref EstimatePriceValue, ref ExecPriceValue, ref PercentValue, ref TotalValue, ref ResultPriceValue, ref MTotal);
+                // å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�–å¾—
+                long lPurchasePrice = GetLoopBeginValue();
+
+                // ç´”åˆ©ç›Šå�–å¾—
+                int NetIncomeLine = m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine];
+                EstimatePriceValue += CommonMotions.cnvLong(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.EstimatePrice].Value);
+                ExecPriceValue += CommonMotions.cnvLong(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.ExecPrice].Value);
+                lPurchasePrice += CommonMotions.cnvLong(dgv.Rows[NetIncomeLine].Cells[(int)GridColumn.OrderPrice].Value);
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
+
+                object[] RowData = new object[dgv.Columns.Count];
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                RowData[(int)GridColumn.FixFlg] = "*";
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.AllTotal;
+                RowData[(int)GridColumn.GroupCount] = GroupNo;
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
+                RowData[(int)GridColumn.EstimatePrice] = EstimatePriceValue.ToString("#,0");
+                RowData[(int)GridColumn.ExecPrice] = ExecPriceValue.ToString("#,0");
+                RowData[(int)GridColumn.Percent] = CalculattionPercent((double)ExecPriceValue).ToString("0.00");
+                RowData[(int)GridColumn.OrderPrice] = lPurchasePrice.ToString("#,0");
+
+                // æœˆæ¯Žå�ˆè¨ˆ
+                int arrayCnt = 0;
+                for (int i = (int)GridColumn.Payment; i < dgv.ColumnCount; i++)
+                {
+                    RowData[i] = MTotal[arrayCnt++].ToString("#,0");
+                }
+
+                // å�ˆè¨ˆæ¬„ä½�ç½®å�–å¾—
+                int TotalPoint = dgv.ColumnCount + (int)ColPayTotal.Totals;
+                RowData[TotalPoint] = TotalValue.ToString("#,0");
+
+                // å®Ÿç¸¾æ¬„ä½�ç½®å�–å¾—
+                int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
+                RowData[ResultPoint] = ResultPriceValue.ToString("#,0");
+
+                // è¡Œã‚»ãƒƒãƒˆ
+                CreateDataRow(RowData);
+
+                // è¡Œä½�ç½®å�–å¾—
+                int LineCnt = dgv.RowCount - 1;
+                m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine] = LineCnt;
+
+                // å�ˆè¨ˆè¡Œã�¯æ›¸è¾¼ã�¿ä¸�å�¯
+                dgv.Rows[LineCnt].ReadOnly = true;
+
+                // ç·�å�ˆè¨ˆãƒ•ãƒ©ã‚°ON
+                dgv.Rows[LineCnt].Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.AllTotal;
+
+                // å·¥äº‹ä¾¡æ ¼è¨ˆã�¯è¡Œã‚’å¤§ã��ã��ã�™ã‚‹
+                dgv.Rows[LineCnt].Height = dgv.RowTemplate.Height * 2;
+                float FontSize = dgv.DefaultCellStyle.Font.Size;
+                Font DrowFont = new Font(dgv.DefaultCellStyle.Font.FontFamily, FontSize * 2);
+                dgv.Rows[LineCnt].Cells[(int)GridColumn.No].Style.Font = DrowFont;
+
+                // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
+                for (int i = 0; i < dgv.Columns.Count; i++)
+                {
+                    dgv.Rows[LineCnt].Cells[i].Style.ForeColor = Color.White;
+                    dgv.Rows[LineCnt].Cells[i].Style.BackColor = Color.Black;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ç�¾åœ¨åˆ©ç›Šè¨ˆç®—
         /// <summary>
         /// ç�¾åœ¨åˆ©ç›Šè¨ˆç®—
@@ -3277,22 +3411,22 @@
                 // å�ˆè¨ˆé‡‘é¡�è¡Œå�–å¾—
                 int AllTotalRow = m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine];
                 // å�ˆè¨ˆé‡‘é¡�å�–å¾—
-                int AllTotal = CommonMotions.cnvInt(dgv.Rows[AllTotalRow].Cells[TotalPoint].Value);
+                long AllTotal = CommonMotions.cnvLong(dgv.Rows[AllTotalRow].Cells[TotalPoint].Value);
 
                 // è«‹æ±‚é‡‘é¡�è¡Œæ•°å�–å¾—
                 int BillingAmountRow = m_CostsRowCount[(int)CostsRowLine.BillingAmountRowLine];
                 // è«‹æ±‚é‡‘é¡�è¡Œå�–å¾—
-                int BillingAmount = CommonMotions.cnvInt(dgv.Rows[BillingAmountRow].Cells[TotalPoint].Value);
+                long BillingAmount = CommonMotions.cnvLong(dgv.Rows[BillingAmountRow].Cells[TotalPoint].Value);
 
                 // ç�¾åœ¨åˆ©ç›Šé‡‘é¡�æ•°å�–å¾—
                 int LineCnt = m_CostsRowCount[(int)CostsRowLine.CurrentProfitRowLine];
 
-                int workTotal = 0;
-                int workBilling = 0;
+                long workTotal = 0;
+                long workBilling = 0;
                 for (int ix = (int)GridColumn.Payment; ix < TotalPoint; ix++)
                 {
-                    workTotal += CommonMotions.cnvInt(dgv.Rows[AllTotalRow].Cells[ix].Value);
-                    workBilling += CommonMotions.cnvInt(dgv.Rows[BillingAmountRow].Cells[ix].Value);
+                    workTotal += CommonMotions.cnvLong(dgv.Rows[AllTotalRow].Cells[ix].Value);
+                    workBilling += CommonMotions.cnvLong(dgv.Rows[BillingAmountRow].Cells[ix].Value);
 
                     dgv.Rows[LineCnt].Cells[ix].Value = (workBilling - workTotal).ToString("#,#");
                 }
@@ -3299,7 +3433,7 @@
 
                 // ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
                 if (AllTotal < 0) AllTotal *= -1;
-                int Total = BillingAmount - AllTotal;
+                long Total = BillingAmount - AllTotal;
                 dgv.Rows[LineCnt].Cells[TotalPoint].Value = Total.ToString("#,0");
             }
             catch (Exception ex)
@@ -3323,8 +3457,9 @@
                 object[] RowData = new object[dgv.Columns.Count];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.GroupCount] = (int)DataGroup.CurrentProfit;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.CurrentProfit];
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit;
+                RowData[(int)GridColumn.GroupCount] = GroupNo;
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                 RowData[(int)GridColumn.IndependentFlg] = "1";
                 RowData[(int)GridColumn.SourceCode] = m_ConstructionCode;
 
@@ -3333,11 +3468,11 @@
 
                 // å�ˆè¨ˆé‡‘é¡�å�–å¾—
                 int AllTotalRow = m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine];
-                int AllTotal = CommonMotions.cnvInt(dgv.Rows[AllTotalRow].Cells[TotalPoint].Value);
+                long AllTotal = CommonMotions.cnvLong(dgv.Rows[AllTotalRow].Cells[TotalPoint].Value);
 
                 // è«‹æ±‚é‡‘é¡�è¡Œæ•°å�–å¾—
                 int BillingAmountRow = m_CostsRowCount[(int)CostsRowLine.BillingAmountRowLine];
-                int BillingAmount = CommonMotions.cnvInt(dgv.Rows[BillingAmountRow].Cells[TotalPoint].Value);
+                long BillingAmount = CommonMotions.cnvLong(dgv.Rows[BillingAmountRow].Cells[TotalPoint].Value);
 
                 // ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
                 if (AllTotal < 0) AllTotal *= -1;
@@ -3350,12 +3485,12 @@
                 int LineCnt = dgv.RowCount - 1;
                 m_CostsRowCount[(int)CostsRowLine.CurrentProfitRowLine] = LineCnt;
 
-                int workTotal = 0;
-                int workBilling = 0;
+                long workTotal = 0;
+                long workBilling = 0;
                 for (int ix = (int)GridColumn.Payment; ix < TotalPoint; ix++)
                 {
-                    workTotal += CommonMotions.cnvInt(dgv.Rows[AllTotalRow].Cells[ix].Value);
-                    workBilling += CommonMotions.cnvInt(dgv.Rows[BillingAmountRow].Cells[ix].Value);
+                    workTotal += CommonMotions.cnvLong(dgv.Rows[AllTotalRow].Cells[ix].Value);
+                    workBilling += CommonMotions.cnvLong(dgv.Rows[BillingAmountRow].Cells[ix].Value);
 
                     dgv.Rows[LineCnt].Cells[ix].Value = (workBilling - workTotal).ToString("#,#");
                 }
@@ -3395,10 +3530,10 @@
                 int BillingAmountRow = m_CostsRowCount[(int)CostsRowLine.BillingAmountRowLine];
 
                 // æœˆæ¯Žå�ˆè¨ˆ
-                int Total = 0;
+                long Total = 0;
                 for (int i = (int)GridColumn.Payment; i < (dgv.ColumnCount + (int)ColPayTotal.Totals); i++)
                 {
-                    Total += CommonMotions.cnvInt(dgv.Rows[BillingAmountRow].Cells[i].Value);
+                    Total += CommonMotions.cnvLong(dgv.Rows[BillingAmountRow].Cells[i].Value);
                 }
 
                 dgv.Rows[BillingAmountRow].Cells[TotalPoint].Value = Total.ToString("#,0");
@@ -3427,8 +3562,9 @@
                 object[] RowData = new object[dgv.Columns.Count];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.GroupCount] = (int)DataGroup.BillingAmount;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.BillingAmount];
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount;
+                RowData[(int)GridColumn.GroupCount] = GroupNo;
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                 RowData[(int)GridColumn.IndependentFlg] = "1";
                 RowData[(int)GridColumn.FluctuationFlg] = "0";
                 RowData[(int)GridColumn.JoinTitleFlg] = "0";
@@ -3435,28 +3571,23 @@
                 RowData[(int)GridColumn.SourceCode] = m_ConstructionCode;
 
                 string strSQL = ExcuteDB.CreatePrimarykeyString(m_ConstructionCode,
-                                                                (int)DataGroup.BillingAmount);
+                                                                (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount);
                 strSQL += " ORDER BY ColumnCount ASC";
                 List<ConstructionLedgerExcute> ExcList = new List<ConstructionLedgerExcute>();
                 ExcuteDB.SelectAction(strSQL, ref ExcList);
 
                 // æœˆæ¯Žå�ˆè¨ˆ
-                //int arrayCnt = 0;
                 int TotalValue = 0;
                 foreach (ConstructionLedgerExcute ExcRec in ExcList)
                 {
                     //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
                     string CurMounth = YearMonthFormat(ExcRec.TargetMonth.Year, ExcRec.TargetMonth.Month);
-                    for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                    {
-                        // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                        if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                    int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                    if (nIndex < 0) continue;
 
-                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                        RowData[ix] = ExcRec.PaymentAmount.ToString("#,0");
-                        TotalValue += (int)ExcRec.PaymentAmount;
-                        break;
-                    }
+                    // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                    RowData[nIndex] = ExcRec.PaymentAmount.ToString("#,0");
+                    TotalValue += (int)ExcRec.PaymentAmount;
                 }
 
                 // å�ˆè¨ˆæ¬„ä½�ç½®å�–å¾—
@@ -3498,8 +3629,9 @@
                 object[] RowData = new object[dgv.Columns.Count];
                 // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 RowData[(int)GridColumn.FixFlg] = "*";
-                RowData[(int)GridColumn.GroupCount] = (int)DataGroup.DepositAmount;
-                RowData[(int)GridColumn.ItemName] = s_GroupTitle[(int)DataGroup.DepositAmount];
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount;
+                RowData[(int)GridColumn.GroupCount] = GroupNo;
+                RowData[(int)GridColumn.ItemName] = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                 RowData[(int)GridColumn.IndependentFlg] = "1";
                 RowData[(int)GridColumn.FluctuationFlg] = "0";
                 RowData[(int)GridColumn.JoinTitleFlg] = "0";
@@ -3506,28 +3638,23 @@
                 RowData[(int)GridColumn.SourceCode] = m_ConstructionCode;
 
                 string strSQL = ExcuteDB.CreatePrimarykeyString(m_ConstructionCode,
-                                                                (int)DataGroup.DepositAmount);
+                                                                (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
                 strSQL += " ORDER BY ColumnCount ASC";
                 List<ConstructionLedgerExcute> ExcList = new List<ConstructionLedgerExcute>();
                 ExcuteDB.SelectAction(strSQL, ref ExcList);
 
                 // æœˆæ¯Žå�ˆè¨ˆ
-                //int arrayCnt = 0;
                 int TotalValue = 0;
                 foreach (ConstructionLedgerExcute ExcRec in ExcList)
                 {
                     //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
                     string CurMounth = YearMonthFormat(ExcRec.TargetMonth.Year, ExcRec.TargetMonth.Month);
-                    for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                    {
-                        // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                        if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                    int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                    if (nIndex < 0) continue;
 
-                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                        RowData[ix] = ExcRec.PaymentAmount.ToString("#,0");
-                        TotalValue += (int)ExcRec.PaymentAmount;
-                        break;
-                    }
+                    // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                    RowData[nIndex] = ExcRec.PaymentAmount.ToString("#,0");
+                    TotalValue += (int)ExcRec.PaymentAmount;
                 }
 
                 // å�ˆè¨ˆæ¬„ä½�ç½®å�–å¾—
@@ -3569,44 +3696,44 @@
             {
                 switch (GroupNo)
                 {
-                    case (int)DataGroup.Expenses:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Expenses:
                         // çµŒè²»
-                        Block = (int)DataGroup.Expenses;
-                        CreateTitleRow(GroupNo, s_GroupTitle[GroupNo]);     // ã‚¿ã‚¤ãƒˆãƒ«è¡¨ç¤º
+                        Block = (int)ConstructionLedgerDetail.GroupCountDef.Expenses;
+                        CreateTitleRow(GroupNo, ConstructionLedgerDetail.GroupNameDef[GroupNo]);     // ã‚¿ã‚¤ãƒˆãƒ«è¡¨ç¤º
                         icnt = 1;
                         break;
-                    case (int)DataGroup.ConstructionCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:
                         // æ–½å·¥è²»
                         AddEmptyRow();                                      // ç©ºç™½è¡Œ
-                        Block = (int)DataGroup.ConstructionCosts;
-                        CreateTitleRow(GroupNo, s_GroupTitle[GroupNo]);     // ã‚¿ã‚¤ãƒˆãƒ«è¡¨ç¤º
+                        Block = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
+                        CreateTitleRow(GroupNo, ConstructionLedgerDetail.GroupNameDef[GroupNo]);     // ã‚¿ã‚¤ãƒˆãƒ«è¡¨ç¤º
                         icnt = 1;
                         break;
-                    case (int)DataGroup.TransportationCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:
                         // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
                         AddEmptyRow();                                      // ç©ºç™½è¡Œ
-                        string Titlestring = s_GroupTitle[(int)DataGroup.PurchaseCosts] + "ã€€ã€€ç­‰";
-                        Block = (int)DataGroup.TransportationCosts;
+                        string Titlestring = ConstructionLedgerDetail.GroupNameDef[(int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts] + "ã€€ã€€ç­‰";
+                        Block = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts;
                         CreateTitleRow(GroupNo, Titlestring);             // ã‚¿ã‚¤ãƒˆãƒ«è¡¨ç¤º
                         icnt = 1;
                         break;
 
-                    case (int)DataGroup.Instructor:             // æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
-                    case (int)DataGroup.Assistant:              // å‰¯æ‹…å½“è€…
-                    case (int)DataGroup.Payroll:                // çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:             // æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:              // å‰¯æ‹…å½“è€…
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:                // çµ¦æ–™è¡Œ
                         // æ—¢ã�«ã�‚ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯
                         if (CheckPaymentTitle()) break;
 
                         AddEmptyRow();                                      // ç©ºç™½è¡Œ
-                        Block = (int)DataGroup.TransportationCosts + 1;
+                        Block = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts + 1;
                         CreateTitleRow(Block, s_PersonnelExpensesGroup);     // ã‚¿ã‚¤ãƒˆãƒ«è¡¨ç¤º
                         icnt = 1;
                         break;
-                    case (int)DataGroup.PurchaseCosts:           // è³¼å…¥å“�
-                    case (int)DataGroup.VehicleLeaseFee:         // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)DataGroup.ParkingCosts:            // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)DataGroup.RoomChargeCosts:         // å®¿æ³Šè²»
-                    case (int)DataGroup.DisposeCosts:            // å‡¦åˆ†è²»ç­‰
+                    case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:           // è³¼å…¥å“�
+                    case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:         // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:            // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+                    case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:         // å®¿æ³Šè²»
+                    case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:            // å‡¦åˆ†è²»ç­‰
                         break;
                     default:
                         Block = 0;
@@ -3634,7 +3761,7 @@
                 foreach (DataGridViewRow CurRow in dgv.Rows)
                 {
                     int nNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.No].Value);
-                    if (nNo == ((int)DataGroup.TransportationCosts + 1))
+                    if (nNo == ((int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts + 1))
                     {
                         bRet = true;
                         break;
@@ -3662,7 +3789,7 @@
             {
                 switch (GroupNo)
                 {
-                    case (int)DataGroup.ConstructionCosts:       // æ–½å·¥è²»
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:       // æ–½å·¥è²»
                         if (DetailRec.JoinTitleFlg == 1) break;
                         // ãƒ–ãƒ©ãƒ³ã‚¯è¡Œã�¯æŽ¡ç•ªã�—ã�ªã�„
                         if (DetailRec.FirstString.Length == 0 && DetailRec.SecondString.Length == 0
@@ -3686,16 +3813,16 @@
                             RowData[(int)GridColumn.ChildFlg] = 1;
                         }
                         break;
-                    case (int)DataGroup.Expenses:                // çµŒè²»
-                    case (int)DataGroup.TransportationCosts:     // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    case (int)DataGroup.PurchaseCosts:           // è³¼å…¥å“�
-                    case (int)DataGroup.VehicleLeaseFee:         // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)DataGroup.ParkingCosts:            // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)DataGroup.RoomChargeCosts:         // å®¿æ³Šè²»
-                    case (int)DataGroup.DisposeCosts:            // å‡¦åˆ†è²»ç­‰
-                    case (int)DataGroup.Instructor:              // æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
-                    case (int)DataGroup.Payroll:                 // çµ¦æ–™è¡Œ
-                    case (int)DataGroup.Assistant:               // å‰¯æ‹…å½“è€…
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Expenses:                // çµŒè²»
+                    case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:     // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
+                    case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:           // è³¼å…¥å“�
+                    case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:         // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:            // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+                    case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:         // å®¿æ³Šè²»
+                    case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:            // å‡¦åˆ†è²»ç­‰
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:              // æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:                 // çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:               // å‰¯æ‹…å½“è€…
                         RowData[(int)GridColumn.No] = string.Format("{0}-{1}", Block, icnt++);
                         break;
                     default:
@@ -3824,7 +3951,7 @@
                 }
                 strcmd.Append(")");
 
-                strcmd.AppendFormat("       AND Bdd.GroupCount = {0}", (int)FrmConstructionBudget.DataGroup.Expenses);
+                strcmd.AppendFormat("       AND Bdd.GroupCount = {0}", (int)ConstructionBudgetDetail.GroupCountDef.Expenses);
                 strcmd.Append("             Group By Bdd.ConstructionCode) As Budget1 ON Budget1.ConstructionCode = A.SourceCode");
 
                 // æ–½å·¥è²»å�–å¾—
@@ -3842,9 +3969,9 @@
                 }
                 strcmd.Append(")");
 
-                strcmd.AppendFormat("       AND Bdd.GroupCount In ({0}, {1}, {2})", (int)FrmConstructionBudget.DataGroup.CommonTempCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.OutSourceCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.MyConstruction);
+                strcmd.AppendFormat("       AND Bdd.GroupCount In ({0}, {1}, {2})", (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction);
                 strcmd.Append("             Group By Bdd.ConstructionCode) As Budget2 ON Budget2.ConstructionCode = A.SourceCode");
 
                 // è«¸çµŒè²»å�–å¾—
@@ -3863,12 +3990,12 @@
                 strcmd.Append(")");
 
                 strcmd.AppendFormat("       AND Bdd.GroupCount In ({0}, {1}, {2}, {3}, {4}, {5})"
-                                                                                    , (int)FrmConstructionBudget.DataGroup.PurchaseCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee
-                                                                                    , (int)FrmConstructionBudget.DataGroup.TransportationCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.ParkingCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.RoomChargeCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.DisposeCosts);
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts);
                 strcmd.Append("             Group By Bdd.ConstructionCode) As Budget3 ON Budget3.ConstructionCode = A.SourceCode");
 
                 // äººä»¶è²»å�–å¾—
@@ -3892,9 +4019,9 @@
                 strcmd.Append(")");
 
                 strcmd.AppendFormat("       AND Bdd.GroupCount In ({0}, {1}, {2})"
-                                                                                    , (int)FrmConstructionBudget.DataGroup.InstructorCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.AssistantCosts
-                                                                                    , (int)FrmConstructionBudget.DataGroup.PayrollExpenses);
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts
+                                                                                    , (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses);
                 strcmd.Append("             Group By Bdd.ConstructionCode) As Budget4 ON Budget4.ConstructionCode = A.SourceCode");
 
                 strcmd.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
@@ -4018,6 +4145,33 @@
         }
         #endregion
 
+        #region å¢—æ¸›å·¥äº‹ç•ªå�·ãƒªã‚¹ãƒˆã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å¢—æ¸›å·¥äº‹ç•ªå�·ãƒªã‚¹ãƒˆã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        private void GetOtherConstrNo(ArrayList DetailList)
+        {
+            try
+            {
+                m_SourceCodeList.Clear();
+                int nTargetNo = (int)IOConstructionLedgerDetail.TableColumn.SourceCode;
+                var ObjList = DetailList.Cast<object[]>().Where(x => CommonMotions.cnvInt(x[nTargetNo]) > 0)
+                                                                    .GroupBy(y => CommonMotions.cnvInt(y[nTargetNo]))
+                                                                    .ToList();
+                foreach (var ObjCur in ObjList)
+                {
+                    int nKeyCode = CommonMotions.cnvInt(ObjCur.Key);
+                    m_SourceCodeList.Add(nKeyCode);
+                }
+                m_SourceCodeList.Sort();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—ã�™ã‚‹
         private int m_BeforeDispRowIndex = -1;
         /// <summary>
@@ -4054,14 +4208,7 @@
                 }
 
                 // å¢—æ¸›å·¥äº‹ç•ªå�·ãƒªã‚¹ãƒˆã‚’å�–å¾—ã�™ã‚‹
-                m_SourceCodeList.Clear();
-                foreach (object[] CurObj in DetailList)
-                {
-                    int wrkCode = CommonMotions.cnvInt(CurObj[(int)IOConstructionLedgerDetail.TableColumn.SourceCode]);
-                    if (wrkCode < 1) continue;
-                    if (m_SourceCodeList.IndexOf(wrkCode) < 0) m_SourceCodeList.Add(wrkCode);
-                }
-                m_SourceCodeList.Sort();
+                GetOtherConstrNo(DetailList);
 
                 // ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼åŠ ç®—
                 if (this.Visible) DataProgressBar.Value++;
@@ -4093,40 +4240,54 @@
                 int Block = 0;
                 int DetailCnt = Enum.GetNames(typeof(IOConstructionLedgerDetail.TableColumn)).Length;
 
-                ConstructionLedgerDetail SaveBillingData = new ConstructionLedgerDetail();
                 ConstructionLedgerDetail DetailRec = new ConstructionLedgerDetail();
-                int BreakCount = 0;
-                for (int iy = 0; iy < DetailList.Count; iy++)
+
+                // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã�®ã�¿ã‚’å�–å¾—
+                List<object[]> DispList = DetailList.Cast<object[]>().Where(x => CommonMotions.cnvInt(x[1]) != (int)ConstructionLedgerDetail.GroupCountDef.Compensation
+                                                                            && CommonMotions.cnvInt(x[1]) != (int)ConstructionLedgerDetail.GroupCountDef.NetIncome
+                                                                            && CommonMotions.cnvInt(x[1]) != (int)ConstructionLedgerDetail.GroupCountDef.AllTotal
+                                                                            && CommonMotions.cnvInt(x[1]) != (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit
+                                                                            && CommonMotions.cnvInt(x[1]) != (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount
+                                                                            && CommonMotions.cnvInt(x[1]) != (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount)
+                                                                        .ToList();
+
+                // å¾Œå�Šåˆ—ã�®ä½�ç½®å�–å¾—
+                int[] nTargetNo = new int[] { GridColMax + (int)ColPayTotal.Totals
+                                            , GridColMax + (int)ColPayTotal.Results
+                                            , GridColMax + (int)ColPayTotal.PaymentBurdens };
+                for (int iy = 0; iy < DispList.Count; iy++)
                 {
-                    object[] objCurRec = (object[])DetailList[iy];
+                    object[] objCurRec = (object[])DispList[iy];
                     DetailDB.Reader2Struct(objCurRec, ref DetailRec);
 
                     // ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼åŠ ç®—
                     if (this.Visible) DataProgressBar.Value++;
 
-                    // ------ èª­ã�¿é£›ã�°ã�—ãƒ‡ãƒ¼ã‚¿(2016/10/20ã€€ä½œæˆ�ã�•ã‚Œã�¦ã�„ã�ªã�„ã�‹ã�£ã�Ÿãƒ‡ãƒ¼ã‚¿è¡Œã‚’ãƒ«ãƒ¼ãƒ—å¤–ã�§ä½œæˆ�ã�™ã‚‹ã‚ˆã�†ã�«ã�—ã�Ÿ)
-                    // ç´”åˆ©ç›Šã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
-                    if (DetailRec.GroupCount == (int)DataGroup.NetIncome) continue;
-                    // å�ˆè¨ˆé‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
-                    if (DetailRec.GroupCount == (int)DataGroup.AllTotal) continue;
-                    // ç�¾åœ¨åˆ©ç›Šé‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
-                    if (DetailRec.GroupCount == (int)DataGroup.CurrentProfit) continue;
-                    // è«‹æ±‚é‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
-                    if (DetailRec.GroupCount == (int)DataGroup.BillingAmount) continue;
-                    // å…¥é‡‘é‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
-                    if (DetailRec.GroupCount == (int)DataGroup.DepositAmount) continue;
+                    // ------ èª­ã�¿é£›ã�°ã�—ãƒ‡ãƒ¼ã‚¿(2016/10/20ã€€ä½œæˆ�ã�•ã‚Œã�¦ã�„ã�ªã�„ã�‹ã�£ã�Ÿãƒ‡ãƒ¼ã‚¿è¡Œã‚’ãƒ«ãƒ¼ãƒ—å¤–ã�§ä½œæˆ�ã�™ã‚‹ã‚ˆã�†ã�«ã�—ã�Ÿ)â†‘â†‘â†‘â†‘
+                    #region èª­ã�¿é£›ã�°ã�—ãƒ‡ãƒ¼ã‚¿
+                    //// ç´”åˆ©ç›Šã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
+                    //if (DetailRec.GroupCount == (int)DataGroup.NetIncome) continue;
+                    //// å�ˆè¨ˆé‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
+                    //if (DetailRec.GroupCount == (int)DataGroup.AllTotal) continue;
+                    //// ç�¾åœ¨åˆ©ç›Šé‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
+                    //if (DetailRec.GroupCount == (int)DataGroup.CurrentProfit) continue;
+                    //// è«‹æ±‚é‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
+                    //if (DetailRec.GroupCount == (int)DataGroup.BillingAmount) continue;
+                    //// å…¥é‡‘é‡‘é¡�ã�¯èª­ã�¿è¾¼ã�¾ã�ªã�„
+                    //if (DetailRec.GroupCount == (int)DataGroup.DepositAmount) continue;
+                    #endregion
 
                     // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã�Œé�•ã�ˆã�°ã‚¿ã‚¤ãƒˆãƒ«è¡Œè¡¨ç¤º
                     if (GroupNo != DetailRec.GroupCount)
                     {
                         // ãƒ‡ãƒ¼ã‚¿ã�«æ–½å·¥è²»ã�Œç„¡ã�„å ´å�ˆã�Œã�‚ã‚‹ã�®ã�§ã��ã�®æ™‚ã�¯ã‚¿ã‚¤ãƒˆãƒ«ã� ã�‘ä½œã‚‹
-                        if (GroupNo == (int)DataGroup.Expenses
-                            && DetailRec.GroupCount != (int)DataGroup.ConstructionCosts)
+                        if (GroupNo == (int)ConstructionLedgerDetail.GroupCountDef.Expenses
+                            && DetailRec.GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                         {
                             // ã‚¿ã‚¤ãƒˆãƒ«ä½œæˆ�
-                            SetFirstTitle((int)DataGroup.ConstructionCosts, ref Block, ref icnt);
+                            SetFirstTitle((int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts, ref Block, ref icnt);
                             // è¡Œè¨­å®š
-                            SetGroupDataProperty((int)DataGroup.ConstructionCosts);
+                            SetGroupDataProperty((int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                         }
                         // æ™®é€šã�«ã‚¿ã‚¤ãƒˆãƒ«ã‚’è¡¨ç¤ºã�™ã‚‹
                         SetFirstTitle(DetailRec.GroupCount, ref Block, ref icnt);
@@ -4135,7 +4296,7 @@
 
                     // çµ�å�ˆå·¥äº‹ã�®ã‚¿ã‚¤ãƒˆãƒ«ã‚’è¡¨ç¤ºã�™ã‚‹æ™‚ã�¯å‰�ã�«ç©ºæ¬„ã‚’è¡¨ç¤ºã�™ã‚‹ï¼ˆ1ç•ªã�¯ã�˜ã‚�ä»¥å¤–ï¼‰
                     if (DetailRec.JoinTitleFlg == 1
-                        && CommonMotions.cnvInt(dgv.Rows[dgv.RowCount - 1].Cells[(int)GridColumn.TitleFlg].Value) == 0)
+                        && CommonMotions.cnvInt(dgv.Rows[dgv.RowCount - 1].Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.None)
                     {
                         AddEmptyRow();
                     }
@@ -4157,18 +4318,17 @@
                     // çµŒè²»ãƒ»æ–½å·¥è²»ãƒ»è³¼å…¥å“�ã�¯ç•ªå�·ã‚’æŒ¯ã‚‹
                     SetDisplayNo(DetailRec, GroupNo, ref Block, ref icnt, ref RowData, ref strParentNo, ref childNo);
 
-                    RowData[(int)GridColumn.DataLineCount] = DetailRec.LineCount;
-                    RowData[(int)GridColumn.GroupCount] = DetailRec.GroupCount;
-                    RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode;
-                    RowData[(int)GridColumn.ItemName] = DetailRec.FirstString;
-                    RowData[(int)GridColumn.TextName] = DetailRec.SecondString;
-                    RowData[(int)GridColumn.CompanyType] = DetailRec.CompanyType;
-                    RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode;
-                    RowData[(int)GridColumn.CompanyName] = DetailRec.CompanyName;
+                    RowData[(int)GridColumn.DataLineCount] = DetailRec.LineCount;       // è¡Œç•ªå�·
+                    RowData[(int)GridColumn.GroupCount] = DetailRec.GroupCount;         // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
+                    RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode;   // æ§‹æˆ�ã‚­ãƒ¼
+                    RowData[(int)GridColumn.ItemName] = DetailRec.FirstString;          // æ§‹æˆ�å��ç§°
+                    RowData[(int)GridColumn.TextName] = DetailRec.SecondString;         // å·¥ç¨®å��ç§°ãƒ»å�”åŠ›ä¼šç¤¾å��
+                    RowData[(int)GridColumn.CompanyType] = DetailRec.CompanyType;       // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                    RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode;       // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
+                    RowData[(int)GridColumn.CompanyName] = DetailRec.CompanyName;       // ä¼šç¤¾å��ç§°
+
                     // å��ç§°ãƒ»ä¼šç¤¾å��ã�Œå…¨ã�¦ã�ªã�„å ´å�ˆã�¯é‡‘é¡�ã‚¯ãƒªã‚¢
-                    if (DetailRec.FirstString.Length == 0
-                        && DetailRec.SecondString.Length == 0
-                        && DetailRec.CompanyName.Length == 0)
+                    if (DetailRec.FirstString.Length == 0 && DetailRec.SecondString.Length == 0 && DetailRec.CompanyName.Length == 0)
                     {
                         RowData[(int)GridColumn.EstimatePrice] = string.Empty;
                         RowData[(int)GridColumn.ExecPrice] = string.Empty;
@@ -4183,7 +4343,7 @@
                         // ----- ç™ºæ³¨é‡‘é¡�ã�®è¡¨ç¤º
                         float fSwRate = CommonMotions.cnvFloat(objCurRec[DetailCnt + (int)DetailReadOrder.StatutoryWelfareRate]);   // ç™ºæ³¨æ™‚æ³•å®šç¦�åˆ©è²»çŽ‡ã‚’å�–å¾—ã�™ã‚‹
                         int swValue = CommonMotions.cnvInt(objCurRec[DetailCnt + (int)DetailReadOrder.OrdersLinePrice]);            // ç™ºæ³¨é‡‘é¡�ã‚’å�–å¾—ã�™ã‚‹
-                        if (DetailRec.GroupCount == (int)FrmConstructionLedger.DataGroup.ConstructionCosts
+                        if (DetailRec.GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts
                             && swValue > 0)
                         {
                             float fRate = 100.0f - fSwRate;
@@ -4190,18 +4350,13 @@
                             RowData[(int)GridColumn.OrderPrice] = CommonMotions.cnvRound(((float)swValue / fRate) * 100.0f).ToString("#,#");
                         }
                     }
-                    // å¢—æ¸›å·¥äº‹ãƒ•ãƒ©ã‚°
-                    RowData[(int)GridColumn.FluctuationFlg] = DetailRec.FluctuationFlg;
-                    // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
-                    RowData[(int)GridColumn.SalaryFlg] = DetailRec.SalaryFlg;
-                    // çµ¦ä¸ŽæŒ¯åˆ†æ—¥æ•°
-                    RowData[(int)GridColumn.SalaryDays] = DetailRec.SalaryDays;
-                    // æ‹…å½“ä¸­ãƒ•ãƒ©ã‚°
-                    RowData[(int)GridColumn.OperatingFlg] = DetailRec.OperatingFlg;
-                    // å…ƒå·¥äº‹ç•ªå�·
-                    RowData[(int)GridColumn.SourceCode] = DetailRec.SourceCode;
-                    // å·¥äº‹å��ç§°ã‚¿ã‚¤ãƒˆãƒ«ãƒ•ãƒ©ã‚°
-                    RowData[(int)GridColumn.JoinTitleFlg] = DetailRec.JoinTitleFlg;
+
+                    RowData[(int)GridColumn.FluctuationFlg] = DetailRec.FluctuationFlg;     // å¢—æ¸›å·¥äº‹ãƒ•ãƒ©ã‚°
+                    RowData[(int)GridColumn.SalaryFlg] = DetailRec.SalaryFlg;               // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
+                    RowData[(int)GridColumn.SalaryDays] = DetailRec.SalaryDays;             // çµ¦ä¸ŽæŒ¯åˆ†æ—¥æ•°
+                    RowData[(int)GridColumn.OperatingFlg] = DetailRec.OperatingFlg;         // æ‹…å½“ä¸­ãƒ•ãƒ©ã‚°
+                    RowData[(int)GridColumn.SourceCode] = DetailRec.SourceCode;             // å…ƒå·¥äº‹ç•ªå�·
+                    RowData[(int)GridColumn.JoinTitleFlg] = DetailRec.JoinTitleFlg;         // å·¥äº‹å��ç§°ã‚¿ã‚¤ãƒˆãƒ«ãƒ•ãƒ©ã‚°
                     if (DetailRec.JoinTitleFlg == 1)
                     {
                         RowData[(int)GridColumn.EstimatePrice] = string.Empty;
@@ -4208,62 +4363,56 @@
                         RowData[(int)GridColumn.ExecPrice] = string.Empty;
                         RowData[(int)GridColumn.Percent] = string.Empty;
                     }
-                    // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
-                    RowData[(int)GridColumn.PurchaseOrderFlg] = DetailRec.PurchaseOrderFlg;
-                    // æ˜Žç´°ç•ªå�·
-                    RowData[(int)GridColumn.DetailNo] = DetailRec.DetailCount;
+                    RowData[(int)GridColumn.PurchaseOrderFlg] = DetailRec.PurchaseOrderFlg; // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
+                    RowData[(int)GridColumn.DetailNo] = DetailRec.DetailCount;              // æ˜Žç´°ç•ªå�·
 
                     // ----- æ”¯æ‰•ã�„ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                    double TotalValue = 0;
+                    long TotalValue = 0;
                     int nGrpCol = (int)IOConstructionLedgerDetail.TableColumn.GroupCount;
                     int nLineCol = (int)IOConstructionLedgerDetail.TableColumn.LineCount;
-                    for (int iz = iy; iz < DetailList.Count; iz++)
+                    List<object[]> objExcute = DispList.Cast<object[]>()
+                                                        .Where(x => DetailRec.GroupCount == CommonMotions.cnvInt(x[nGrpCol])
+                                                                    && DetailRec.LineCount == CommonMotions.cnvInt(x[nLineCol]))
+                                                        .ToList();
+                    foreach (object[] objExcuteRec in objExcute)
                     {
-                        object[] objExcuteRec = (object[])DetailList[iz];
-                        // ã‚°ãƒ«ãƒ¼ãƒ—ã�‹è¡Œç•ªå�·ã�Œé�•ã�ˆã�°æ¬¡ã�®å�°å¸³è¡Œã�¸
-                        if ((DetailRec.GroupCount != CommonMotions.cnvInt(objExcuteRec[nGrpCol]))
-                            || (DetailRec.LineCount != CommonMotions.cnvInt(objExcuteRec[nLineCol])))
-                        {
-                            iy = iz - 1;
-                            BreakCount = 0;
-                            break;
-                        }
+                        DateTime ExcuteRec_TargetMonth = CommonMotions.cnvDate(objExcuteRec[DetailCnt]);        // å¯¾è±¡å¹´æœˆ
+                        long ExcuteRec_PaymentAmount = CommonMotions.cnvLong(objExcuteRec[DetailCnt + 1]);      // å¯¾è±¡é‡‘é¡�
 
-                        DateTime ExcuteRec_TargetMonth = CommonMotions.cnvDate(objExcuteRec[DetailCnt]);
-                        double ExcuteRec_PaymentAmount = CommonMotions.cnvDouble(objExcuteRec[DetailCnt + 1]);
-
                         // å¹´æœˆã�Œæœ€å°�å€¤ã�¯ãƒ‡ãƒ¼ã‚¿ç„¡
-                        if (ExcuteRec_TargetMonth == DateTime.MinValue) break;
+                        if (ExcuteRec_TargetMonth == DateTime.MinValue) continue;
 
-                        //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
+                        //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ˜ãƒƒãƒ€ãƒ¼ã‚ˆã‚ŠæŽ¢ã�™ï¼‰
                         string CurMounth = YearMonthFormat(ExcuteRec_TargetMonth.Year, ExcuteRec_TargetMonth.Month);
-                        for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                        {
-                            // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                            if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                        int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                        if (nIndex < 0) continue;
 
-                            // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                            RowData[ix] = ExcuteRec_PaymentAmount.ToString("#,0");
-                            int wrkcnt = CommonMotions.cnvInt(objExcuteRec[DetailCnt + (int)DetailReadOrder.ExecColumnCount]);
+                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                        RowData[nIndex] = ExcuteRec_PaymentAmount.ToString("#,0");
 
-                            if (BreakCount != wrkcnt)
-                            {
-                                TotalValue += ExcuteRec_PaymentAmount;
-                                BreakCount = wrkcnt;
-                            }
-                            break;
-                        }
+                        int nGetField = (int)IOConstructionLedgerDetail.TableColumn.InvalidLine;
+                        int nInvalidLine = CommonMotions.cnvInt(objExcuteRec[nGetField]);
+
+                        // ç„¡åŠ¹è¡Œã�¯å�ˆè¨ˆã‚’åŠ ç®—ã�—ã�ªã�„
+                        if (nInvalidLine != (int)ConstructionLedgerDetail.InvalidLineDef.ValidData) continue;
+
+                        // æœ‰åŠ¹è¡Œã�¯å�ˆè¨ˆã‚’åŠ ç®—ã�™ã‚‹
+                        TotalValue += ExcuteRec_PaymentAmount;
                     }
 
+                    // æ˜Žç´°ã‚’å‡¦ç�†ã�—ã�Ÿåˆ†ã� ã�‘ã‚«ã‚¦ãƒ³ã‚¿ã‚’é€²ã‚�ã‚‹
+                    iy += (objExcute.Count - 1);
+
                     // å�ˆè¨ˆé‡‘é¡�è¡¨ç¤º
-                    RowData[GridColMax + (int)ColPayTotal.Totals] = TotalValue.ToString("#,0");
+                    RowData[nTargetNo[0]] = TotalValue.ToString("#,0");
 
                     // æ”¯æ‰•å�¯èƒ½é¡�è¡¨ç¤º
                     int ExecValue = 0;
                     // å®Ÿè¡Œé‡‘é¡�ã�Œãƒžã‚¤ãƒŠã‚¹ã�®å ´å�ˆã�¯è¡¨ç¤ºã�—ã�ªã�„ 2017/09/04
                     //if (GroupNo != (int)DataGroup.Expenses && DetailRec.ExecutionAmount > 0)
+
                     // è¨ˆç®—ã�Œå�ˆã‚�ã�ªã��ã�ªã‚‹ã�®ã�§çµŒè²»ä»¥å¤–ã�¯ãƒžã‚¤ãƒŠã‚¹ã�§ã‚‚è¨ˆç®—ã�™ã‚‹ 2017/10/13
-                    if (GroupNo != (int)DataGroup.Expenses)
+                    if (GroupNo != (int)ConstructionLedgerDetail.GroupCountDef.Expenses)
                     {   // çµŒè²»ä»¥å¤–ã�®æ™‚ã�®ã�¿æ”¯æ‰•å�¯èƒ½é¡�ã‚’è¨ˆç®—ã�™ã‚‹
                         int nCalVal = CommonMotions.cnvInt(RowData[(int)GridColumn.OrderPrice]);
                         if (nCalVal == 0) nCalVal = (int)DetailRec.ExecutionAmount;
@@ -4272,10 +4421,11 @@
 
                         ExecValue = nCalVal - (int)TotalValue;
                     }
-                    RowData[GridColMax + (int)ColPayTotal.Results] = ExecValue.ToString("#,0");
 
+                    // æ”¯æ‰•å�¯èƒ½é¡�
+                    RowData[nTargetNo[1]] = ExecValue.ToString("#,0");
                     // æ”¯æ‰•è£œå¡«é¡�
-                    RowData[GridColMax + (int)ColPayTotal.PaymentBurdens] = DetailRec.PaymentBurden.ToString("#,0");
+                    RowData[nTargetNo[2]] = DetailRec.PaymentBurden.ToString("#,0");
 
                     // *----------------------------------------------------------------*
                     // *----- æ‰¿èª�ç„¡ã�«å·¥äº‹è©³ç´°å�°å¸³ã�Œå‡ºæ�¥ã�Ÿã‚‚ã�®ã�¯ã€�çµŒè²»ã‚’å†�è¨ˆç®—ã�™ã‚‹ -----*
@@ -4282,7 +4432,7 @@
                     // *----------------------------------------------------------------*
                     if (LedgerRec.ComplateFlg != (int)ConstructionLedger.CompFlagDef.Complated
                         && NoneApp == true
-                        && DetailRec.GroupCount == (int)DataGroup.Expenses)
+                        && DetailRec.GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.Expenses)
                     {
                         CalculateExpenss(DetailRec, ref RowData);
                     }
@@ -4290,9 +4440,9 @@
                     // äººä»¶è²»è¡Œã�®é‡‘é¡�è¡¨ç¤º
                     switch (DetailRec.GroupCount)
                     {
-                        case (int)DataGroup.Instructor:
-                        case (int)DataGroup.Assistant:
-                        case (int)DataGroup.Payroll:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                             MakeConstrSalaryRow(DetailRec, ref RowData);
                             break;
                         default:
@@ -4303,107 +4453,8 @@
                     CreateDataRow(RowData);
 
                     DataGridViewRow CurRow = dgv.Rows[dgv.RowCount - 1];
-                    // ----- åˆ—ã�®ãƒ­ãƒƒã‚¯
-                    for (int i = (int)GridColumn.ItemName; i <= (int)GridColumn.CompanyName; i++)
-                    {
-                        CurRow.Cells[i].ReadOnly = true;
-                    }
-                    switch (DetailRec.GroupCount)
-                    {
-                        case (int)DataGroup.ConstructionCosts:       // æ–½å·¥è²»
-                            break;
-
-                        case (int)DataGroup.Assistant:               // å‰¯æ‹…å½“
-                        case (int)DataGroup.Payroll:                 // å·¥äº‹æ‹…å½“
-                            switch (ProductDefine.ProductType)
-                            {
-                                case (int)ProductDefine.ProductTypeDef.Originals:
-                                    // ã‚ªãƒªã‚¸ãƒŠãƒ«
-                                    // 16æœŸä»¥å‰�ã�¯è¡Œã‚’è¡¨ç¤ºã�—ã�ªã�„
-                                    if (m_ConstructionBaseInfo.ConstructionPeriod < 16) CurRow.Visible = false;
-                                    // ä¸€èˆ¬ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�¯è¡Œãƒ­ãƒƒã‚¯
-                                    if (!CheckLeaderOrUser()) CurRow.ReadOnly = true;
-                                    break;
-                                case (int)ProductDefine.ProductTypeDef.ProductsModelType1:
-                                    // è£½å“�ç‰ˆï¼ˆä¸€äººè¦ªæ–¹ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã�¯å‰¯æ‹…å½“ã‚’è¡Œãƒ­ãƒƒã‚¯
-                                    if (DetailRec.GroupCount == (int)DataGroup.Assistant) CurRow.ReadOnly = true;
-                                    break;
-                                case (int)ProductDefine.ProductTypeDef.ProductsModelType2_1:
-                                case (int)ProductDefine.ProductTypeDef.ProductsModelType2_2:
-                                    // è£½å“�ç‰ˆï¼ˆæ‰¿èª�ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰
-                                    break;
-                                default:
-                                    break;
-                            }
-                            // ãƒ˜ãƒƒãƒ€ãƒ¼ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹è¡¨ç¤º
-                            SalaryRadioButtonCheck(DetailRec);
-                            break;
-                        case (int)DataGroup.Instructor:              // æŒ‡å°Žå“¡
-                        case (int)DataGroup.NetIncome:               // ç´”åˆ©ç›Š
-                            switch (ProductDefine.ProductType)
-                            {
-                                case (int)ProductDefine.ProductTypeDef.Originals:
-                                    // ã‚ªãƒªã‚¸ãƒŠãƒ«
-                                    // 16æœŸä»¥å‰�ã�¯è¡Œã‚’è¡¨ç¤ºã�—ã�ªã�„
-                                    if (m_ConstructionBaseInfo.ConstructionPeriod < 16) CurRow.Visible = false;
-                                    // ä¸€èˆ¬ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�¯è¡Œãƒ­ãƒƒã‚¯
-                                    if (!CheckLeaderOrUser()) CurRow.ReadOnly = true;
-                                    break;
-                                case (int)ProductDefine.ProductTypeDef.ProductsModelType1:
-                                case (int)ProductDefine.ProductTypeDef.ProductsModelType2_1:
-                                case (int)ProductDefine.ProductTypeDef.ProductsModelType2_2:
-                                    // è¡Œãƒ­ãƒƒã‚¯
-                                    CurRow.ReadOnly = true;
-                                    break;
-                                default:
-                                    break;
-                            }
-                            break;
-                        case (int)DataGroup.TransportationCosts:    // 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                        case (int)DataGroup.PurchaseCosts:          // 4:è³¼å…¥å“�
-                        case (int)DataGroup.VehicleLeaseFee:        // 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                        case (int)DataGroup.ParkingCosts:           // 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                        case (int)DataGroup.RoomChargeCosts:        // 7:å®¿æ³Šè²»
-                        case (int)DataGroup.DisposeCosts:           // 8:å‡¦åˆ†è²»ç­‰
-                            switch (ProductDefine.ProductType)
-                            {
-                                case (int)ProductDefine.ProductTypeDef.Originals:
-                                    // ã‚ªãƒªã‚¸ãƒŠãƒ«
-                                    CurRow.ReadOnly = true;
-                                    // æ”¯æ‰•è£œå¡«æž ã�¯ãƒ­ãƒƒã‚¯ã�—ã�ªã�„
-                                    CurRow.Cells[dgv.ColumnCount + (int)ColPayTotal.PaymentBurdens].ReadOnly = false;
-                                    break;
-                                default:
-                                    break;
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-
-                    // æ”¯æ‰•å�¯èƒ½é¡�ãƒ»æ”¯æ‰•è¶…é�Žã�®ç·¨é›†
-                    SetOverPayment(dgv.RowCount - 1);
-
-                    // ã‚°ãƒ«ãƒ¼ãƒ—ã�”ã�¨ã�®å‡¦ç�†
-                    SetGroupDataProperty(DetailRec, ref SaveBillingData);
-
-                    // å¢—æ¸›ãƒ‡ãƒ¼ã‚¿ã�¯è‰²ã‚’ä»˜ã�‘ã‚‹
-                    if (DetailRec.FluctuationFlg != 0)
-                    {
-                        switch (DetailRec.GroupCount)
-                        {
-                            case (int)DataGroup.Instructor:
-                            case (int)DataGroup.Assistant:
-                            case (int)DataGroup.Payroll:
-                                // äººä»¶è²»ã�¯è‰²ã‚’ä»˜ã�‘ã�ªã�„
-                                break;
-                            default:
-                                DataGridViewRow ColorRow = dgv.Rows[dgv.RowCount - 1];
-                                int nIndex = m_SourceCodeList.IndexOf(DetailRec.SourceCode);
-                                if (nIndex >= 0) ColorRow.Cells[(int)GridColumn.No].Style.BackColor = CommonDefine.DefineColorList[nIndex];
-                                break;
-                        }
-                    }
+                    // ã‚°ãƒªãƒƒãƒ‰è¡Œã�®ãƒ­ãƒƒã‚¯ã‚’åˆ¶å¾¡ã�™ã‚‹
+                    SetGridRowLock(DetailRec, nTargetNo, ref CurRow);
                 }
 
                 // ç©ºç™½è¡Œ
@@ -4412,11 +4463,14 @@
                 // ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼åŠ ç®—
                 if (this.Visible) DataProgressBar.Value++;
 
+                // è£œå¡«é‡‘é¡�è¡Œä½œæˆ�
+                CreateCompensation(DetailList);
+
                 // ç´”åˆ©ç›Šä½œæˆ�
                 CreateNetIncome2(DetailList);
 
                 // å�ˆè¨ˆé‡‘é¡�
-                CreateAllTotal(true);
+                SetAllTotal(true);
 
                 // è«‹æ±‚é‡‘é¡�ä½œæˆ�
                 CreateBillingAmount();
@@ -4469,6 +4523,99 @@
         }
         #endregion
 
+        #region ã‚°ãƒªãƒƒãƒ‰è¡Œã�®ãƒ­ãƒƒã‚¯ã‚’åˆ¶å¾¡ã�™ã‚‹
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰è¡Œã�®ãƒ­ãƒƒã‚¯ã‚’åˆ¶å¾¡ã�™ã‚‹
+        /// </summary>
+        private void SetGridRowLock(ConstructionLedgerDetail DetailRec, int[] nTargetNo, ref DataGridViewRow CurRow)
+        {
+            try
+            {
+                // ----- åˆ—ã�®ãƒ­ãƒƒã‚¯
+                for (int i = (int)GridColumn.ItemName; i <= (int)GridColumn.CompanyName; i++)
+                {
+                    CurRow.Cells[i].ReadOnly = true;
+                }
+                switch (DetailRec.GroupCount)
+                {
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:       // æ–½å·¥è²»
+                        break;
+
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:               // å‰¯æ‹…å½“
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:                 // å·¥äº‹æ‹…å½“
+                        switch (ProductDefine.ProductType)
+                        {
+                            case (int)ProductDefine.ProductTypeDef.Originals:
+                                // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                                // 16æœŸä»¥å‰�ã�¯è¡Œã‚’è¡¨ç¤ºã�—ã�ªã�„
+                                if (m_ConstructionBaseInfo.ConstructionPeriod < 16) CurRow.Visible = false;
+                                // ä¸€èˆ¬ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�¯è¡Œãƒ­ãƒƒã‚¯
+                                if (!CheckLeaderOrUser()) CurRow.ReadOnly = true;
+                                break;
+                            case (int)ProductDefine.ProductTypeDef.ProductsModelType1:
+                                // è£½å“�ç‰ˆï¼ˆä¸€äººè¦ªæ–¹ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã�¯å‰¯æ‹…å½“ã‚’è¡Œãƒ­ãƒƒã‚¯
+                                if (DetailRec.GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.Assistant) CurRow.ReadOnly = true;
+                                break;
+                            case (int)ProductDefine.ProductTypeDef.ProductsModelType2_1:
+                            case (int)ProductDefine.ProductTypeDef.ProductsModelType2_2:
+                                // è£½å“�ç‰ˆï¼ˆæ‰¿èª�ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰
+                                break;
+                            default:
+                                break;
+                        }
+                        // ãƒ˜ãƒƒãƒ€ãƒ¼ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹è¡¨ç¤º
+                        SalaryRadioButtonCheck(DetailRec);
+                        break;
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:              // æŒ‡å°Žå“¡
+                    case (int)ConstructionLedgerDetail.GroupCountDef.NetIncome:               // ç´”åˆ©ç›Š
+                        switch (ProductDefine.ProductType)
+                        {
+                            case (int)ProductDefine.ProductTypeDef.Originals:
+                                // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                                // 16æœŸä»¥å‰�ã�¯è¡Œã‚’è¡¨ç¤ºã�—ã�ªã�„
+                                if (m_ConstructionBaseInfo.ConstructionPeriod < 16) CurRow.Visible = false;
+                                // ä¸€èˆ¬ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�¯è¡Œãƒ­ãƒƒã‚¯
+                                if (!CheckLeaderOrUser()) CurRow.ReadOnly = true;
+                                break;
+                            case (int)ProductDefine.ProductTypeDef.ProductsModelType1:
+                            case (int)ProductDefine.ProductTypeDef.ProductsModelType2_1:
+                            case (int)ProductDefine.ProductTypeDef.ProductsModelType2_2:
+                                // è¡Œãƒ­ãƒƒã‚¯
+                                CurRow.ReadOnly = true;
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:    // 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
+                    case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:          // 4:è³¼å…¥å“�
+                    case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:        // 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:           // 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
+                    case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:        // 7:å®¿æ³Šè²»
+                    case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:           // 8:å‡¦åˆ†è²»ç­‰
+                        switch (ProductDefine.ProductType)
+                        {
+                            case (int)ProductDefine.ProductTypeDef.Originals:
+                                // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                                CurRow.ReadOnly = true;
+                                // æ”¯æ‰•è£œå¡«æž ã�¯ãƒ­ãƒƒã‚¯ã�—ã�ªã�„
+                                CurRow.Cells[nTargetNo[2]].ReadOnly = false;
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region å�—æ³¨é‡‘é¡�ã‚ˆã‚Šæ¯”çŽ‡ã�«ã‚ˆã‚ŠçµŒè²»ã�«é‡‘é¡�ã‚’è¨­å®šã�™ã‚‹
         /// <summary>
         /// å�—æ³¨é‡‘é¡�ã‚ˆã‚Šæ¯”çŽ‡ã�«ã‚ˆã‚ŠçµŒè²»ã�«é‡‘é¡�ã‚’è¨­å®šã�™ã‚‹
@@ -4507,13 +4654,8 @@
                 DataGridViewEX dgv = dgvAllDisplay;
                 DateTime dtFMounth = CommonMotions.cnvDate(m_DspLabelCtrl[(int)DspLblCtrlName.StartingDate].Text);
                 string strFMounth = YearMonthFormat(dtFMounth.Year, dtFMounth.Month);
-                for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                {
-                    // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                    if (!strFMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
-                    PaymentPoint = ix;
-                    break;
-                }
+                int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => strFMounth.Equals(x.HeaderText)).First().Index;
+                if (nIndex >= 0) PaymentPoint = nIndex;
 
                 // è¨ˆä¸Šæœˆã‚’ç¢ºèª�ã�™ã‚‹
                 RowData[PaymentPoint] = dExpenss.ToString("#,0");
@@ -4560,13 +4702,13 @@
                 // æœˆé¡�çµ¦ä¸Žè¨ˆç®—
                 switch (DetailRec.GroupCount)
                 {
-                    case (int)DataGroup.Instructor:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                         Salary = CommonDefine.InstructorMonthryCost;
                         break;
-                    case (int)DataGroup.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                         Salary = CommonDefine.AssistantMonthryCost;
                         break;
-                    case (int)DataGroup.Payroll:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                         if (DetailRec.SalaryOnRegist != 0)
                             Salary = DetailRec.SalaryOnRegist * CommonDefine.s_SalaryCorrection;
                         else
@@ -4574,7 +4716,7 @@
                         break;
                 }
                 // æ—¥é¡�çµ¦ä¸Žå�–å¾—
-                string ItemText = s_GroupTitle[DetailRec.GroupCount];
+                string ItemText = ConstructionLedgerDetail.GroupNameDef[DetailRec.GroupCount];
                 string Content = string.Empty;
 
                 ItemText = ItemText + string.Format("ã€�{0}æ°�ã€‘", PersonRec.SealPrintName);    // é …ç›®å��ç§°ã‚»ãƒƒãƒˆ
@@ -4656,7 +4798,6 @@
         /// ï¼ˆã‚°ãƒ«ãƒ¼ãƒ—ã�”ã�¨ã�®ç‰¹æ®Šå‡¦ç�†ã€�æ–½å·¥è²»ã�—ã�‹ä½¿ç”¨ã�—ã�ªã�„ã�Œå°†æ�¥æ€§ã‚’è¦‹è¶Šã�—ã�¦ä½œæˆ�ï¼‰
         /// </summary>
         /// <param name="DetailRec"></param>
-        /// <param name="SaveBillingData"></param>
         private void SetGroupDataProperty(int GroupCount)
         {
             try
@@ -4666,7 +4807,7 @@
                 switch (GroupCount)
                 {
                     // æ–½å·¥è²»
-                    case (int)DataGroup.ConstructionCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:
                         // è¡Œä½�ç½®å�–å¾—
                         if (m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine] == 0)
                             m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine] = dgv.RowCount - 1;
@@ -4680,112 +4821,6 @@
         }
         #endregion
 
-        #region ã‚°ãƒ«ãƒ¼ãƒ—ã�”ã�¨ã�®å‡¦ç�†ã‚’è¡Œã�†
-        /// <summary>
-        /// ã‚°ãƒ«ãƒ¼ãƒ—ã�”ã�¨ã�®å‡¦ç�†ã‚’è¡Œã�†
-        /// </summary>
-        /// <param name="DetailRec"></param>
-        /// <param name="SaveBillingData"></param>
-        private void SetGroupDataProperty(ConstructionLedgerDetail DetailRec, ref ConstructionLedgerDetail SaveBillingData)
-        {
-            try
-            {
-                DataGridViewEX dgv = dgvAllDisplay;
-                // ã‚°ãƒ«ãƒ¼ãƒ—ã�”ã�¨ã�®å‡¦ç�†
-                switch (DetailRec.GroupCount)
-                {
-                    // çµŒè²»
-                    case (int)DataGroup.Expenses:
-                        if (m_CostsRowCount[(int)CostsRowLine.ExpensesRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.ExpensesRowLine] = dgv.RowCount - 2;
-                        break;
-                    // æ–½å·¥è²»
-                    case (int)DataGroup.ConstructionCosts:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine] = dgv.RowCount - 2;
-                        break;
-                    // è³¼å…¥å“�
-                    case (int)DataGroup.PurchaseCosts:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine] = dgv.RowCount - 2;
-                        break;
-                    // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)DataGroup.VehicleLeaseFee:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.VehicleLeaseFeeRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.VehicleLeaseFeeRowLine] = dgv.RowCount - 1;
-                        break;
-                    // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    case (int)DataGroup.TransportationCosts:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.TransportationCostsRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.TransportationCostsRowLine] = dgv.RowCount - 1;
-                        break;
-                    // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)DataGroup.ParkingCosts:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.ParkingCostsRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.ParkingCostsRowLine] = dgv.RowCount - 1;
-                        break;
-                    // å®¿æ³Šè²»
-                    case (int)DataGroup.RoomChargeCosts:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.RoomChargeCostsRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.RoomChargeCostsRowLine] = dgv.RowCount - 1;
-                        break;
-                    // å‡¦åˆ†è²»ç­‰
-                    case (int)DataGroup.DisposeCosts:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine] = dgv.RowCount - 1;
-                        break;
-                    // æŒ‡å°Žå“¡çµ¦æ–™
-                    case (int)DataGroup.Instructor:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] = dgv.RowCount - 1;
-                        break;
-                    // å‰¯æ‹…å½“è€…çµ¦æ–™
-                    case (int)DataGroup.Assistant:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] = dgv.RowCount - 1;
-                        break;
-                    // æ‹…å½“è€…çµ¦æ–™
-                    case (int)DataGroup.Payroll:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] = dgv.RowCount - 1;
-                        break;
-                    // ç´”åˆ©ç›Š
-                    case (int)DataGroup.NetIncome:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine] = dgv.RowCount - 1;
-                        break;
-
-                    // å�ˆè¨ˆé‡‘é¡�
-                    case (int)DataGroup.AllTotal:
-                        // è¡Œä½�ç½®å�–å¾—
-                        if (m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine] == 0)
-                            m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine] = dgv.RowCount - 1;
-                        break;
-
-                    // è«‹æ±‚é‡‘é¡�
-                    case (int)DataGroup.BillingAmount:
-                        SaveBillingData = DetailRec;
-                        break;
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
         #region è¡Œæ“�ä½œãƒœã‚¿ãƒ³ã�®è¡¨ç¤ºåˆ¶å¾¡
         /// <summary>
         /// è¡Œè¿½åŠ ãƒ»å‰Šé™¤ã�®ãƒœã‚¿ãƒ³è¡¨ç¤ºã‚’åˆ¶å¾¡ã�™ã‚‹
@@ -4802,8 +4837,8 @@
                 int GroupCount = 0;
 
                 // ã‚¿ã‚¤ãƒˆãƒ«ï¼�ç©ºç™½è¡Œã�¯1è¡Œå‰�ã‚’åˆ¤å®šã�™ã‚‹
-                if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.TitleFlg].Value) == 1
-                    && CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.BlankFlg].Value) == 1)
+                if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title
+                    && CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank)
                 {
                     // 1è¡Œå‰�ã�Œæ–½å·¥è¡Œã�‹åˆ¤å®šã�™ã‚‹
                     int ProvRowCount = CurRow.Index - 1;
@@ -4810,7 +4845,7 @@
                     if (ProvRowCount < 0) return;
                     DataGridViewRow ProvRow = dgv.Rows[ProvRowCount];
                     GroupCount = CommonMotions.cnvInt(ProvRow.Cells[(int)GridColumn.GroupCount].Value);
-                    if (GroupCount != (int)DataGroup.ConstructionCosts) return;
+                    if (GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts) return;
                 }
 
                 // è©²å½“è¡Œã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·å�–å¾—
@@ -4825,9 +4860,9 @@
                 // æ–½å·¥è²»ãƒ»äººä»¶è²»ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
                 switch (GroupCount)
                 {
-                    case (int)DataGroup.ConstructionCosts:
-                    case (int)DataGroup.Assistant:
-                    case (int)DataGroup.Instructor:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                         break;
                     default:
                         return;
@@ -4837,7 +4872,7 @@
                 string strFix = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn.FixFlg].Value);
 
                 // äººä»¶è²»ã�¯ä»¥ä¸‹ã�®ãƒœã‚¿ãƒ³ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                if (GroupCount == (int)DataGroup.Assistant || GroupCount == (int)DataGroup.Instructor)
+                if (GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.Assistant || GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.Instructor)
                 {
                     btnLineDel.Visible = false;
                     return;
@@ -4878,7 +4913,7 @@
                 int GroupCount = 0;
                 GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                if (GroupCount == (int)DataGroup.ConstructionCosts)
+                if (GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                 {
                     // æ–½å·¥è²»ã‚°ãƒ«ãƒ¼ãƒ—ã�®å ´å�ˆã�¯ä¸‹ã�«è¿½åŠ 
                     InsertCnt = CurRow.Index + 1;
@@ -4888,7 +4923,7 @@
                 {
                     // ç©ºç™½è¡Œã�§æ–½å·¥è²»ã�®ã�™ã��å¾Œã�¯å¯¾è±¡ã�¨ã�™ã‚‹
                     DataGridViewRow wrkRow = dgv.Rows[dgv.CurrentRow.Index - 1];
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.ConstructionCosts)
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                     {
                         // ç©ºç™½è¡Œã�¯ä¸Šã�«è¿½åŠ 
                         InsertCnt = CurRow.Index;
@@ -4935,15 +4970,15 @@
 
                 // è¨­å®šãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 DataGridViewRow SetData = dgv.Rows[InsertCnt];
-                SetData.Cells[(int)GridColumn.GroupCount].Value = (int)DataGroup.ConstructionCosts;
+                SetData.Cells[(int)GridColumn.GroupCount].Value = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
                 SetData.Cells[(int)GridColumn.EstimatePrice].Value = "";
                 SetData.Cells[(int)GridColumn.ExecPrice].Value = "0";
                 SetData.Cells[(int)GridColumn.Percent].Value = "0.00";
                 SetData.Cells[(int)GridColumn.SourceCode].Value = m_ConstructionCode;
                 // ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
-                SetData.Cells[(int)GridColumn.TitleFlg].Value = "0";
-                SetData.Cells[(int)GridColumn.TotalFlg].Value = "0";
-                SetData.Cells[(int)GridColumn.BlankFlg].Value = "0";
+                SetData.Cells[(int)GridColumn.TitleFlg].Value = (int)TitleFlgDef.None;
+                SetData.Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.None;
+                SetData.Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.None;
                 SetData.Cells[(int)GridColumn.JoinTitleFlg].Value = "0";
 
                 SetData.Cells[(int)GridColumn.IndependentFlg].Value = "1";
@@ -4956,7 +4991,7 @@
                 SetData.Cells[(int)GridColumn.ExecPrice].ReadOnly = false;
 
                 // æ˜Žç´°ç•ªå�·ã‚’ã‚»ãƒƒãƒˆ
-                int MaxCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.ConstructionCosts)
+                int MaxCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                                                                 .Max(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.DetailNo].Value)) + 1;
                 SetData.Cells[(int)GridColumn.DetailNo].Value = MaxCount;
 
@@ -4972,7 +5007,7 @@
                 //if (GroupCount == (int)GroupName_ConstructionLedger.ConstructionCosts)
                 //{
                 StLineCnt = m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine];
-                if (CommonMotions.cnvInt(dgv.Rows[StLineCnt].Cells[(int)GridColumn.TitleFlg].Value) == 1) StLineCnt++;
+                if (CommonMotions.cnvInt(dgv.Rows[StLineCnt].Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) StLineCnt++;
 
                 //}
                 //else if (GroupCount == (int)GroupName_ConstructionLedger.PurchaseCosts)
@@ -4986,7 +5021,7 @@
                 for (int i = StLineCnt; i < dgv.RowCount; i++)
                 {
                     if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.JoinTitleFlg].Value) == 1) continue;
-                    if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.BlankFlg].Value) == 1) break;
+                    if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) break;
 
                     dgv.Rows[i].Cells[(int)GridColumn.No].Value = string.Format("{0}-{1}", GroupCount, iCnt);
                     strParentNo = CommonMotions.cnvString(dgv.Rows[i].Cells[(int)GridColumn.No].Value);
@@ -5024,7 +5059,7 @@
                 for (int i = startLine; i < dgv.RowCount; i++, iCnt++)
                 {
                     if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.IndependentFlg].Value) == 1) break;
-                    if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.BlankFlg].Value) == 1) break;
+                    if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) break;
                     dgv.Rows[i].Cells[(int)GridColumn.No].Value = string.Format("{0}-{1}", strParentNo, iCnt);
                 }
             }
@@ -5050,9 +5085,10 @@
                 foreach (DataGridViewRow RowLine in dgv.Rows)
                 {
                     // æ˜Žç´°è¡Œä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
-                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.TitleFlg].Value) == 1) continue;
-                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.TotalFlg].Value) == 1) continue;
-                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.BlankFlg].Value) == 1) continue;
+                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) continue;
+                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.TotalFlg].Value) == (int)TotalFlgDef.Total) continue;
+                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.TotalFlg].Value) == (int)TotalFlgDef.AllTotal) continue;
+                    if (CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) continue;
 
                     CompNo = CommonMotions.cnvInt(RowLine.Cells[(int)GridColumn.GroupCount].Value);
                     // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã�Œ0ã�¯å‡¦ç�†ã�—ã�ªã�„
@@ -5063,63 +5099,63 @@
                     GroupNo = CompNo;
                     switch (GroupNo)
                     {
-                        case (int)DataGroup.Expenses:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Expenses:
                             // 1:çµŒè²»
                             m_CostsRowCount[(int)CostsRowLine.ExpensesRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.ConstructionCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:
                             // 2:æ–½å·¥è²»
                             m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.TransportationCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:
                             // 3:äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
                             m_CostsRowCount[(int)CostsRowLine.TransportationCostsRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.PurchaseCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:
                             // 4:è³¼å…¥å“�
                             m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.VehicleLeaseFee:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:
                             // 5:è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
                             m_CostsRowCount[(int)CostsRowLine.VehicleLeaseFeeRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.ParkingCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:
                             // 6:é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
                             m_CostsRowCount[(int)CostsRowLine.ParkingCostsRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.RoomChargeCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:
                             // 7:å®¿æ³Šè²»
                             m_CostsRowCount[(int)CostsRowLine.RoomChargeCostsRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.DisposeCosts:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:
                             // 8:å‡¦åˆ†è²»ç­‰
                             m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.Instructor:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                             // 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
                             m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.Assistant:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                             // 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
                             m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.Payroll:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                             // 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
                             m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.NetIncome:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.NetIncome:
                             // 12:ç´”åˆ©ç›Š
                             m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.AllTotal:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.AllTotal:
                             // 13:å�ˆè¨ˆé‡‘é¡�
                             m_CostsRowCount[(int)CostsRowLine.AllTotalRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.BillingAmount:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount:
                             // 14:è«‹æ±‚é‡‘é¡�
                             m_CostsRowCount[(int)CostsRowLine.BillingAmountRowLine] = RowLine.Index;
                             break;
-                        case (int)DataGroup.CurrentProfit:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit:
                             // 15:ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
                             m_CostsRowCount[(int)CostsRowLine.CurrentProfitRowLine] = RowLine.Index;
                             break;
@@ -5167,6 +5203,17 @@
                 DataGridViewEX dgv = dgvAllDisplay;
                 DataGridViewRow CurRow = dgv.CurrentRow;
 
+                // ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
+                int nOrderFlg = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.PurchaseOrderFlg].Value);
+                if(nOrderFlg != (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate)
+                {
+                    MessageBox.Show("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�Œä½œæˆ�ã�•ã‚Œã�¦ã�„ã�¾ã�™ã€�è¡Œå‰Šé™¤ã�§ã��ã�¾ã�›ã‚“ã€‚"
+                                    , "å‰Šé™¤ä¸�å�¯"
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return;
+                }
+
                 int RemoveCnt = 0;
                 // ã‚°ãƒ«ãƒ¼ãƒ—ã‚«ã‚¦ãƒ³ãƒˆã‚’å�–å¾—ã�™ã‚‹
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
@@ -5177,8 +5224,8 @@
                 // æ–½å·¥è²»ãƒ»äººä»¶è²»ã‚°ãƒ«ãƒ¼ãƒ—ã�®ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
                 switch (GroupCount)
                 {
-                    case (int)DataGroup.Assistant:
-                    case (int)DataGroup.Instructor:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                         if (TitleFlg == 1) return;
                         if (FixFlg.Equals("*"))
                         {
@@ -5188,7 +5235,7 @@
                             return;
                         }
                         break;
-                    case (int)DataGroup.ConstructionCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts:
                         break;
                     default:
                         return;
@@ -5200,9 +5247,9 @@
                 RemoveCnt = CurRow.Index;
 
                 // ã‚¿ã‚¤ãƒˆãƒ«ã�®å ´å�ˆã�¯å‰Šé™¤ç„¡
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) RemoveCnt = 0;
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) RemoveCnt = 0;
                 // ç©ºç™½è¡Œã�®å ´å�ˆã�¯å‰Šé™¤ç„¡
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.BlankFlg].Value) == 1) RemoveCnt = 0;
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) RemoveCnt = 0;
 
                 // é�¸æŠžè¡Œã�Œä¸�æ­£ã�ªã‚‰ã�°å‡¦ç�†ã�—ã�ªã�„
                 if (RemoveCnt == 0) return;
@@ -5216,15 +5263,15 @@
                 {   // ----- ç‹¬ç«‹ãƒ‡ãƒ¼ã‚¿ã�®å ´å�ˆ
                     // è¡Œç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
                     int StLineCnt = 0;
-                    if (GroupCount == (int)DataGroup.ConstructionCosts)
+                    if (GroupCount == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                     {
                         StLineCnt = m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine];
                     }
-                    else if (GroupCount != (int)DataGroup.Assistant && GroupCount != (int)DataGroup.Instructor)
+                    else if (GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.Assistant && GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.Instructor)
                     {
                         for (int i = RemoveCnt; i > 0; i--)
                         {
-                            if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.TitleFlg].Value) != 0)
+                            if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.TitleFlg].Value) != (int)TitleFlgDef.None)
                             {
                                 StLineCnt = i;
                                 break;
@@ -5237,7 +5284,7 @@
                     string strParentNo = string.Empty;
                     for (int i = StLineCnt; i < dgv.RowCount; i++)
                     {
-                        if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.BlankFlg].Value) == 1) break;
+                        if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) break;
                         if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.JoinTitleFlg].Value) == 1) break;
 
                         // å¾“å±žé …ç›®ã�Œã�‚ã‚‹è¡Œã�¯å­�è¡Œã‚’æŽ¡ç•ªã�™ã‚‹
@@ -5281,8 +5328,8 @@
 
                 // ã‚«ãƒ¬ãƒ³ãƒˆè¡Œã�Œå‰Šé™¤ä¸�å�¯ã�®å ´å�ˆã�¯ãƒœã‚¿ãƒ³ã‚’æ¶ˆã�™
                 btnLineDel.Visible = false;
-                if (CommonMotions.cnvString(dgv.CurrentRow.Cells[(int)GridColumn.FixFlg].Value).Equals("*")) return;    // å›ºå®šè¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.BlankFlg].Value) == 1) return;            // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (CommonMotions.cnvString(dgv.CurrentRow.Cells[(int)GridColumn.FixFlg].Value).Equals("*")) return;                // å›ºå®šè¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) return;   // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                 btnLineDel.Visible = true;
             }
             catch (System.Exception ex)
@@ -5334,7 +5381,7 @@
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
                 // æ–½å·¥è²»ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (GroupCount != (int)DataGroup.ConstructionCosts && GroupCount != (int)DataGroup.PurchaseCosts) return;
+                if (GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts && GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts) return;
 
                 // å¾“å±žãƒ•ãƒ©ã‚°ã‚’å�–å¾—ã�™ã‚‹
                 int ChildFlg = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ChildFlg].Value);
@@ -5351,11 +5398,11 @@
                     if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.IndependentFlg].Value) != 0) return;
                 }
 
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == 1)
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title)
                 {   // ã‚¿ã‚¤ãƒˆãƒ«ã�®å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
                     UpCnt = 0;
                 }
-                else if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == 1)
+                else if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title)
                 {   // ï¼‘è¡Œä¸Šã�Œã‚¿ã‚¤ãƒˆãƒ«ã�®å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
                     UpCnt = 0;
                 }
@@ -5393,7 +5440,7 @@
                 int GroupCount = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
                 // æ–½å·¥è²»ãƒ»è³¼å…¥å“�ã‚°ãƒ«ãƒ¼ãƒ—ã�®ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (GroupCount != (int)DataGroup.ConstructionCosts && GroupCount != (int)DataGroup.PurchaseCosts) return;
+                if (GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts && GroupCount != (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts) return;
 
                 // å¾“å±žãƒ•ãƒ©ã‚°ã‚’å�–å¾—ã�™ã‚‹
                 int ChildFlg = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ChildFlg].Value);
@@ -5409,7 +5456,7 @@
                     if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.IndependentFlg].Value) != 0) return;
                 }
 
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == 1)
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title)
                 {   // ã‚¿ã‚¤ãƒˆãƒ«ã�®å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
                     DownCnt = 0;
                 }
@@ -5569,14 +5616,14 @@
             {
                 DataGridViewEX dgv = dgvAllDisplay;
 
-                int EstimatePriceValue = 0;
-                int ExecPriceValue = 0;
+                long EstimatePriceValue = 0;
+                long ExecPriceValue = 0;
                 double PercentValue = 0;
-                int TotalValue = 0;
-                int ResultPriceValue = 0;
+                long TotalValue = 0;
+                long ResultPriceValue = 0;
 
                 int Colcnt = dgv.ColumnCount - (int)GridColumn.Payment;
-                int[] MTotal = new int[Colcnt];
+                long[] MTotal = new long[Colcnt];
 
                 // å�ˆè¨ˆå€¤å�–å¾—
                 GetDetailTotal(ref EstimatePriceValue, ref ExecPriceValue, ref PercentValue, ref TotalValue, ref ResultPriceValue, ref MTotal);
@@ -5594,7 +5641,7 @@
                 // ä½œæˆ�è€…ã‚³ãƒ¼ãƒ‰
                 work.CreatorCode = m_ConstructionBaseInfo.ConstructionPersonCode;
                 // ä½œæˆ�è€…å��
-                work.CreatorName = m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName].Text;
+                work.CreatorName = m_DspLabelCtrl[(int)DspLblCtrlName.ConstrName].Text;
                 // ä½œæˆ�æ—¥
                 work.CreateDate = CommonMotions.cnvDate(m_DspLabelCtrl[(int)DspLblCtrlName.CreateDate].Text);
                 // å·¥æœŸï¼ˆå�˜ä½�ãƒ»æœˆï¼‰
@@ -5622,17 +5669,17 @@
 
                 int nGrpNo = (int)GridColumn.GroupCount;
                 // ä¼šç¤¾çµŒè²»å�ˆè¨ˆ
-                work.CompanyExpenses = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)DataGroup.Expenses
+                work.CompanyExpenses = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Expenses
                                                                                     && CommonMotions.cnvInt(x.Cells[(int)GridColumn.ComponentCode].Value) == 3)
                                                                                     .ToArray()
                                                                                     .Sum(y => CommonMotions.cnvDouble(y.Cells[TotalPoint].Value));
                 // éƒ¨ç½²çµŒè²»å�ˆè¨ˆ
-                work.DepartmentExpenses = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)DataGroup.Expenses
+                work.DepartmentExpenses = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Expenses
                                                                                     && CommonMotions.cnvInt(x.Cells[(int)GridColumn.ComponentCode].Value) == 2)
                                                                                     .ToArray()
                                                                                     .Sum(y => CommonMotions.cnvDouble(y.Cells[TotalPoint].Value));
                 // å–¶æ¥­çµŒè²»å�ˆè¨ˆ
-                work.SalesExpenses = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)DataGroup.Expenses
+                work.SalesExpenses = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Expenses
                                                                                     && CommonMotions.cnvInt(x.Cells[(int)GridColumn.ComponentCode].Value) == 1)
                                                                                     .ToArray()
                                                                                     .Sum(y => CommonMotions.cnvDouble(y.Cells[TotalPoint].Value));
@@ -5651,7 +5698,7 @@
                 //}
 
                 // æ‹…å½“è€…çµ¦ä¸Ž
-                DataGridViewRow[] PayrollRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)DataGroup.Payroll)
+                DataGridViewRow[] PayrollRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Payroll)
                                                                                     .ToArray();
                 if (PayrollRow.Count() > 0)
                     work.Allowance = PayrollRow.Sum(y => CommonMotions.cnvDouble(y.Cells[TotalPoint].Value));
@@ -5658,7 +5705,7 @@
 
                 // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
                 double wrkAssist = 0;
-                DataGridViewRow[] AssistantRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)DataGroup.Assistant)
+                DataGridViewRow[] AssistantRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Assistant)
                                                                                     .ToArray();
                 if (AssistantRow.Count() > 0)
                     wrkAssist = AssistantRow.Sum(y => CommonMotions.cnvDouble(y.Cells[TotalPoint].Value));
@@ -5665,7 +5712,7 @@
 
                 // æŒ‡å°Žå“¡çµ¦ä¸Ž
                 double wrkInstr = 0;
-                DataGridViewRow[] InstructorRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)DataGroup.Instructor)
+                DataGridViewRow[] InstructorRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[nGrpNo].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Instructor)
                                                                                     .ToArray();
                 if (InstructorRow.Count() > 0)
                     wrkInstr = InstructorRow.Sum(y => CommonMotions.cnvDouble(y.Cells[TotalPoint].Value));
@@ -5760,7 +5807,7 @@
                 int nGroupCount = (int)GridColumn.GroupCount;
                 int nLineCnt = (int)GridColumn.DataLineCount;
                 DataGridViewRow[] RowList = dgv.Rows.Cast<DataGridViewRow>()
-                                                    .Where(x => CommonMotions.cnvInt(x.Cells[nGroupCount].Value) == (int)DataGroup.Expenses)
+                                                    .Where(x => CommonMotions.cnvInt(x.Cells[nGroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Expenses)
                                                     .OrderBy(y => CommonMotions.cnvInt(y.Cells[nLineCnt].Value))
                                                     .ToArray();
                 int nCnt = 1;
@@ -5834,7 +5881,6 @@
                 DetailDB.DeleteAction(DelSQL, false);
 
                 DataGridViewEX dgv = dgvAllDisplay;
-                int PaymentBurdenCol = dgv.ColumnCount + (int)ColPayTotal.PaymentBurdens;
                 int RowLineCnt = 0;
                 //int nOldLineCnt = 0;
                 //int nWrkCompanyCode = 0;
@@ -5857,10 +5903,10 @@
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     // æ˜Žç´°ãƒ�ã‚§ãƒƒã‚¯
                     if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.TotalFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != (int)TotalFlgDef.None) continue;
 
                     if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.TitleFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) continue;
 
                     /// é …ç›®å��ç§°ãƒ»æ¥­ç¨®å��ç§°ãƒ»äºˆå®šé‡‘é¡�ãƒ»å®Ÿè¡Œé‡‘é¡�
                     if (CommonMotions.chkCellBlank(wrkRow.Cells[(int)GridColumn.ItemName].Value)
@@ -5940,9 +5986,9 @@
                 switch (GroupCnt)
                 {
                     // 14:è«‹æ±‚é‡‘é¡�
-                    case (int)DataGroup.BillingAmount:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount:
                     // 15:ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
-                    case (int)DataGroup.CurrentProfit:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit:
                         NewRec.ExecutionAmount = CommonMotions.cnvDouble(wrkRow.Cells[TotalPoint].Value);
                         break;
                     default:
@@ -5956,7 +6002,7 @@
                 NewRec.AmountConfigRate = CommonMotions.cnvDouble(wrkRow.Cells[(int)GridColumn.Percent].Value);
 
                 // æ”¯æ‰•è£œå¡«é¡�
-                if (GroupCnt == (int)DataGroup.Expenses) NewRec.PaymentBurden = 0;
+                if (GroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.Expenses) NewRec.PaymentBurden = 0;
                 NewRec.PaymentBurden = CommonMotions.cnvDouble(wrkRow.Cells[PaymentBurdenCol].Value);
 
                 // å›ºå®šãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
@@ -5968,9 +6014,9 @@
 
                 switch (GroupCnt)
                 {
-                    case (int)DataGroup.Instructor:     // 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
-                    case (int)DataGroup.Assistant:      // 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
-                    case (int)DataGroup.Payroll:        // 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:     // 9:æŒ‡å°Žå“¡çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:      // 10:å‰¯æ‹…å½“è€…çµ¦æ–™è¡Œ
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:        // 11:æ‹…å½“è€…çµ¦æ–™è¡Œ
                         NewRec.SalaryFlg = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.SalaryFlg].Value);         // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
                         NewRec.SalaryDays = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.SalaryDays].Value);       // çµ¦ä¸ŽæŒ¯åˆ†æ—¥æ•°
                         NewRec.OperatingFlg = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.OperatingFlg].Value);   // æ‹…å½“ä¸­ãƒ•ãƒ©ã‚°
@@ -6040,19 +6086,19 @@
                 {
                     RowLineCnt++;
                     // ç´”åˆ©ç›Šã�¯æ›¸ã��è¾¼ã�¾ã�ªã�„
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.NetIncome) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.NetIncome) continue;
                     // å�ˆè¨ˆé‡‘é¡�ã�¯æ›¸ã��è¾¼ã�¾ã�ªã�„
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.AllTotal) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.AllTotal) continue;
                     // ç�¾åœ¨åˆ©ç›Šé‡‘é¡�ã�¯æ›¸ã��è¾¼ã�¾ã�ªã�„
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.CurrentProfit) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit) continue;
 
                     // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                     // æ˜Žç´°ãƒ�ã‚§ãƒƒã‚¯
                     if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.TotalFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != (int)TotalFlgDef.None) continue;
 
                     if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.TitleFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) == (int)TitleFlgDef.Title) continue;
 
                     // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                     if (BlankLine(wrkRow.Index)) continue;
@@ -6130,7 +6176,7 @@
 
                 strSQL.Append("Select DetailCount, PurchaseOrderFlg From constructionledgerdetail");
                 strSQL.AppendFormat(" Where ConstructionCode = {0}", m_ConstructionCode);
-                strSQL.AppendFormat(" And GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" And GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 ArrayList FlgData = new ArrayList();
                 if (!LedgerDB.ExecuteReader(strSQL.ToString(), ref FlgData)) return false;
                 if (FlgData.Count > 0)
@@ -6140,7 +6186,7 @@
                     {
                         int nDCount = CommonMotions.cnvInt(objRec[0]);
                         int nMakeFlg = CommonMotions.cnvInt(objRec[1]);
-                        int nData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.ConstructionCosts
+                        int nData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)GridColumn.DetailNo].Value) == nDCount
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)GridColumn.PurchaseOrderFlg].Value) != nMakeFlg)
                                                                     .Count();
@@ -6175,7 +6221,7 @@
                 strSQL.Clear();
                 strSQL.Append("Select Max(UpdateDate) From constructionledgerdetail");
                 strSQL.AppendFormat(" Where ConstructionCode = {0}", m_ConstructionCode);
-                strSQL.AppendFormat(" And GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" And GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 ArrayList arData = new ArrayList();
                 if (!LedgerDB.ExecuteReader(strSQL.ToString(), ref arData)) return false;
                 if (arData.Count < 1) return true;
@@ -6236,10 +6282,10 @@
                 {
                     // æ˜Žç´°ãƒ�ã‚§ãƒƒã‚¯
                     if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.TotalFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TotalFlg].Value) != (int)TotalFlgDef.None) continue;
 
                     if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridColumn.TitleFlg].Value)) continue;
-                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) != 0) continue;
+                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.TitleFlg].Value) != (int)TitleFlgDef.None) continue;
 
                     // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                     if (BlankLine(wrkRow.Index)) continue;
@@ -6553,7 +6599,7 @@
             // ----- ç©ºåˆ¤å®š
             // ãƒ–ãƒ©ãƒ³ã‚¯ãƒ•ãƒ©ã‚°
             if (CommonMotions.chkCellBlank(wrkRow.Cells[(int)GridColumn.BlankFlg].Value)) bRet = true;
-            if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.BlankFlg].Value) == 1) bRet = true;
+            if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.BlankFlg].Value) == (int)BlankFlgDef.Blank) bRet = true;
 
             return bRet;
         }
@@ -6643,12 +6689,12 @@
                 // åˆ©ç›Šè¨ˆã�Œå�ˆã‚�ã�ªã��ã�ªã‚‹ã�®ã�§è¨ˆç®—ã�™ã‚‹ 2017/10/13
                 // if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value) < 0) return;
 
-                int ResultValue = CommonMotions.cnvInt(CurRow.Cells[ResultCols].Value);
+                long ResultValue = CommonMotions.cnvLong(CurRow.Cells[ResultCols].Value);
                 // æ”¯æ‰•å�¯èƒ½é¡�ã�Œãƒžã‚¤ãƒŠã‚¹ã�«ã�ªã�£ã�Ÿã‚‰æ–‡å­—ã‚’èµ¤ã�«ã�™ã‚‹
                 if (ResultValue < 0)
                 {
                     CurRow.Cells[ResultCols].Style.ForeColor = Color.Red;
-                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value) > -1)
+                    if (CommonMotions.cnvLong(CurRow.Cells[(int)GridColumn.ExecPrice].Value) > -1)
                     {
                         CurRow.Cells[OverpaymentCols].Style.ForeColor = Color.Red;
                         CurRow.Cells[OverpaymentCols].Value = CurRow.Cells[ResultCols].Value;
@@ -6696,48 +6742,6 @@
         }
         #endregion
 
-        #region ç”»é�¢é�žè¡¨ç¤ºæ™‚ã�®å·¥äº‹è©³ç´°å�°å¸³ã‚’å†�è¨ˆç®—ã�™ã‚‹
-        /// <summary>
-        /// ç”»é�¢é�žè¡¨ç¤ºæ™‚ã�®å·¥äº‹è©³ç´°å�°å¸³ã‚’å†�è¨ˆç®—ã�™ã‚‹
-        /// </summary>
-        /// <returns></returns>
-        private bool NonDspLedgerRecalculate()
-        {
-            try
-            {
-                // åˆ�æœŸè¨­å®š
-                InitSettingLoad();
-
-                //ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå�–å¾—
-                SetDisplayObject();
-
-                // è¡¨ç¤ºã‚¯ãƒªã‚¢
-                ClearDisplay();
-
-                if (!GetBaseInfoData()) return false;
-
-                // ãƒ˜ãƒƒãƒ€ãƒ¼è¡¨ç¤º
-                if (!DispHeader()) return false;
-
-                // ã‚°ãƒªãƒƒãƒ‰è¡Œå‰Šé™¤
-                dgvAllDisplay.Rows.Clear();
-
-                // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºã‚’è¡Œã�†
-                if (!InitDispData()) return false;
-
-                // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-                if (!DataEntryProcess(false)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
         #region ç”»é�¢é�žè¡¨ç¤ºæ™‚ã�®å¤–éƒ¨ã�‹ã‚‰ã�®ãƒˆãƒªã‚¬ã�«ã‚ˆã‚Šå·¥äº‹è©³ç´°å�°å¸³ã‚’ä¿�å­˜ã�™ã‚‹
         /// <summary>
         /// ç”»é�¢é�žè¡¨ç¤ºæ™‚ã�®å¤–éƒ¨ã�‹ã‚‰ã�®ãƒˆãƒªã‚¬ã�«ã‚ˆã‚Šå·¥äº‹è©³ç´°å�°å¸³ã‚’ä¿�å­˜ã�™ã‚‹
@@ -6831,20 +6835,20 @@
             try
             {
                 // ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆæ–‡å­—ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                DetailRec.FirstString = s_GroupTitle[GroupNo];
+                DetailRec.FirstString = ConstructionLedgerDetail.GroupNameDef[GroupNo];
                 if (DetailRec.CompanyCode == 0)
                 {
                     switch (GroupNo)
                     {
-                        case (int)DataGroup.Instructor:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                             DetailRec.ComponentCode = m_ConstructionBaseInfo.ConstrInstrDepCode;
                             DetailRec.CompanyCode = m_ConstructionBaseInfo.ConstructionInstructor;
                             break;
-                        case (int)DataGroup.Assistant:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                             DetailRec.ComponentCode = m_ConstructionBaseInfo.ConstrSubDepCode;
                             DetailRec.CompanyCode = m_ConstructionBaseInfo.ConstrSubPersonCode;
                             break;
-                        case (int)DataGroup.Payroll:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                             DetailRec.ComponentCode = m_ConstructionBaseInfo.ConstrDepCode;
                             DetailRec.CompanyCode = m_ConstructionBaseInfo.ConstructionPersonCode;
                             break;
@@ -6862,7 +6866,7 @@
                 PersonInChargeMaster PersonRec = new PersonInChargeMaster();
                 if (!PersonDB.SelectAction(strSQL, ref PersonRec)) return;
 
-                DetailRec.FirstString = string.Format("{0}ã€�{1}æ°�ã€‘", s_GroupTitle[GroupNo], PersonRec.SealPrintName);
+                DetailRec.FirstString = string.Format("{0}ã€�{1}æ°�ã€‘", ConstructionLedgerDetail.GroupNameDef[GroupNo], PersonRec.SealPrintName);
                 DetailRec.ComponentCode = PersonRec.DepartmentCode;
 
             }
@@ -6904,13 +6908,13 @@
                 foreach (DataGridViewRow CurRow in dgvAllDisplay.Rows)
                 {
                     // çµŒè²»ã�¯åˆ¥å‡¦ç�†
-                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.Expenses)
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.Expenses)
                     {
                         ReCalculateExpensess(CurRow);
                         continue;
                     }
                     // è¡Œã�®å†�è¨ˆç®—
-                    RowReCalculate(CurRow, CurRow.Index, (int)GridColumn.ExecPrice);
+                    RowReCalculate(CurRow, (int)GridColumn.ExecPrice);
                 }
                 m_bChengeAns = true;
             }
@@ -6929,30 +6933,29 @@
         /// <summary>
         /// ã‚°ãƒªãƒƒãƒ‰è¡Œã�®å†�è¨ˆç®—
         /// </summary>
-        /// <param name="CurRow"></param>
-        /// <param name="RowIndex"></param>
-        /// <param name="ColumnIndex"></param>
-        private void RowReCalculate(DataGridViewRow CurRow, int RowIndex, int ColumnIndex)
+        private void RowReCalculate(DataGridViewRow CurRow, int ColumnIndex)
         {
             try
             {
                 DataGridViewEX dgv = dgvAllDisplay;
+                int nRowIndex = CurRow.Index;
 
                 // æ˜Žç´°ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
                 if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TotalFlg].Value)) return;
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) return;
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) != (int)TotalFlgDef.None) return;
 
                 if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TitleFlg].Value)) return;
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != 0) return;
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != (int)TitleFlgDef.None) return;
 
                 if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.JoinTitleFlg].Value)) return;
                 if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.JoinTitleFlg].Value) != 0) return;
 
                 // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (BlankLine(RowIndex)) return;
+                if (BlankLine(nRowIndex)) return;
 
                 // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·å�–å¾—
                 int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
+                int TotalPoint = dgv.ColumnCount + (int)ColPayTotal.Totals;
 
                 // å…¥åŠ›å€¤ç·¨é›†
                 switch (ColumnIndex)
@@ -6959,25 +6962,26 @@
                 {
                     case (int)GridColumn.EstimatePrice:
                         // äºˆå®šé‡‘é¡�
-                        CurRow.Cells[ColumnIndex].Value = CommonMotions.cnvInt(CurRow.Cells[ColumnIndex].Value).ToString("#,0");
+                        CurRow.Cells[ColumnIndex].Value = CommonMotions.cnvLong(CurRow.Cells[ColumnIndex].Value).ToString("#,0");
                         break;
                     case (int)GridColumn.ExecPrice:
                         // å®Ÿè¡Œé‡‘é¡�
-                        int execprice = CommonMotions.cnvInt(CurRow.Cells[ColumnIndex].Value);
+                        long execprice = CommonMotions.cnvLong(CurRow.Cells[ColumnIndex].Value);
                         CurRow.Cells[ColumnIndex].Value = execprice.ToString("#,0");
 
-                        if (GroupNo != (int)DataGroup.BillingAmount && GroupNo != (int)DataGroup.CurrentProfit)
-                        {
-                            // æ¯”çŽ‡è¨ˆç®—
-                            CurRow.Cells[(int)GridColumn.Percent].Value = CalculattionPercent(execprice).ToString("0.00");
-                        }
+                        // è«‹æ±‚é‡‘é¡�ãƒ»ç�¾åœ¨åˆ©ç›Šé¡�ã�¯æ¯”çŽ‡è¨ˆç®—ã‚’ã�—ã�ªã�„
+                        if (GroupNo == (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount
+                            || GroupNo == (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit) break;
+
+                        // æ¯”çŽ‡è¨ˆç®—
+                        CurRow.Cells[(int)GridColumn.Percent].Value = CalculattionPercent(execprice).ToString("0.00");
+
                         break;
                     default:
-                        // ã��ã�®ä»–
-                        if ((int)GridColumn.Payment <= ColumnIndex)
-                        {
-                            CurRow.Cells[ColumnIndex].Value = CommonMotions.cnvInt(CurRow.Cells[ColumnIndex].Value).ToString("#,0");
-                        }
+                        // ã��ã�®ä»– å…¥åŠ›ç¯„å›²ä»¥å¤–ã�¯è¨ˆç®—ã�—ã�ªã�„
+                        if (ColumnIndex < (int)GridColumn.Payment || TotalPoint <= ColumnIndex) break;
+
+                        CurRow.Cells[ColumnIndex].Value = CommonMotions.cnvLong(CurRow.Cells[ColumnIndex].Value).ToString("#,0");
                         break;
                 }
 
@@ -6998,10 +7002,10 @@
                 // æ”¯æ‰•ã�„å�ˆè¨ˆè¨ˆç®—
                 int nTotalCols = dgv.ColumnCount + (int)ColPayTotal.Totals;
                 // æ”¯æ‰•é‡‘é¡�ã�®å�ˆè¨ˆ
-                int RowTotal = 0;
+                long RowTotal = 0;
                 for (int i = (int)GridColumn.Payment; i < nTotalCols; i++)
                 {
-                    RowTotal += CommonMotions.cnvInt(CurRow.Cells[i].Value);
+                    RowTotal += CommonMotions.cnvLong(CurRow.Cells[i].Value);
                 }
 
                 // ã‚°ãƒ«ãƒ¼ãƒ—ã�«ã‚ˆã�£ã�¦æ”¯æ‰•è¨ˆç®—ã�®è¡¨ç¤ºç­‰ã‚’å¤‰æ›´ã�™ã‚‹
@@ -7009,29 +7013,31 @@
                 int nPaymentBurdens = dgv.ColumnCount + (int)ColPayTotal.PaymentBurdens;
                 switch (GroupNo)
                 {
-                    case (int)DataGroup.NetIncome:
-                    // ç´”åˆ©ç›Šã�¯æ”¯æ‰•é‡‘é¡�ç­‰ã‚’è¨ˆç®—ã�—ã�ªã�„
-                    case (int)DataGroup.BillingAmount:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Compensation:
+                        // è£œå¡«é‡‘é¡�ã�¯è¨ˆç®—ã�—ã�ªã�„
+                    case (int)ConstructionLedgerDetail.GroupCountDef.NetIncome:
+                        // ç´”åˆ©ç›Šã�¯æ”¯æ‰•é‡‘é¡�ç­‰ã‚’è¨ˆç®—ã�—ã�ªã�„
+                    case (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount:
                         // è«‹æ±‚é‡‘é¡�ã�¯æ”¯æ‰•é‡‘é¡�ç­‰ã‚’è¨ˆç®—ã�—ã�ªã�„
                         break;
-                    case (int)DataGroup.Expenses:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Expenses:
                         // çµŒè²»ã�¯æ”¯æ‰•ç·�é¡�ã�Œå…¨ã�¦
                         CurRow.Cells[nTotalCols].Value = RowTotal.ToString("#,0");
                         CurRow.Cells[nResultCols].Value = "0";
 
                         // æ”¯æ‰•å�¯èƒ½é¡�ãƒ»æ”¯æ‰•è¶…é�Žã�®ç·¨é›†
-                        SetOverPayment(CurRow.Index);
+                         SetOverPayment(CurRow.Index);
                         break;
                     default:
 
-                        int ExecPrice = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value);
+                        long ExecPrice = CommonMotions.cnvLong(CurRow.Cells[(int)GridColumn.ExecPrice].Value);
 
                         // æ–½å·¥è²»ã�¯æ³¨æ–‡æ›¸é‡‘é¡�ã�Œã�‚ã‚Œã�°æ³¨æ–‡æ›¸é‡‘é¡�ã‚ˆã‚Šè¨ˆç®—ã�™ã‚‹
-                        int OrderPrice = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderPrice].Value);
+                        long OrderPrice = CommonMotions.cnvLong(CurRow.Cells[(int)GridColumn.OrderPrice].Value);
                         if (OrderPrice > 0) ExecPrice = OrderPrice;
 
                         // å®Ÿç¸¾è¡¨ç¤º
-                        int ResultValue = (ExecPrice - RowTotal);
+                        long ResultValue = (ExecPrice - RowTotal);
 
                         CurRow.Cells[nTotalCols].Value = RowTotal.ToString("#,0");
                         CurRow.Cells[nResultCols].Value = ResultValue.ToString("#,0");
@@ -7057,7 +7063,7 @@
                 //CalculateNetIncome();
 
                 // å�ˆè¨ˆè¨ˆç®—
-                CreateAllTotal(false);
+                SetAllTotal(false);
 
                 /// ç�¾åœ¨åˆ©ç›Šè¨ˆç®—
                 CalculateCurrentProfit();
@@ -7080,6 +7086,9 @@
                 DataGridViewEX dgv = dgvAllDisplay;
                 DataGridViewRow CurRow = dgv.CurrentRow;
 
+                // ONã�®å ´å�ˆã�®ãƒ�ã‚§ãƒƒã‚¯
+                InvalidLineColumnCheck();
+
                 bool bReadFlg = false;
                 int nPaymentBurdens = dgv.ColumnCount + (int)ColPayTotal.PaymentBurdens;
                 // ç„¡åŠ¹è¡Œã�¯è£œå¡«åˆ—ã‚’0ã�«ã�™ã‚‹
@@ -7109,6 +7118,54 @@
         }
         #endregion
 
+        #region ç„¡åŠ¹è¡ŒONæ™‚ã�®ãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// ç„¡åŠ¹è¡ŒONæ™‚ã�®ãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <returns></returns>
+        private void InvalidLineColumnCheck()
+        {
+            try
+            {
+                DataGridViewEX dgv = dgvAllDisplay;
+                DataGridViewRow CurRow = dgv.CurrentRow;
+
+                // ONã�®å ´å�ˆã�®ãƒ�ã‚§ãƒƒã‚¯
+                if (!CommonMotions.cnvBool(CurRow.Cells[(int)GridColumn.InvalidLine].Value)) return;
+
+                // æ”¯æ‰•é‡‘é¡�é›†è¨ˆ
+                decimal dWork = 0;
+                int nLastPoint = dgv.ColumnCount + (int)ColPayTotal.Totals;
+                for (int ix = (int)GridColumn.Payment; ix < nLastPoint; ix++)
+                {
+                    dWork += CommonMotions.cnvLong(CurRow.Cells[ix].Value);
+                }
+
+                if (dWork == 0) return;
+
+                MessageBox.Show("æ”¯æ‰•é‡‘é¡�ã�Œå­˜åœ¨ã�™ã‚‹è¡Œã�¯ç„¡åŠ¹ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚"
+                                , "ç„¡åŠ¹ã‚¨ãƒ©ãƒ¼"
+                                , MessageBoxButtons.OK
+                                , MessageBoxIcon.Error);
+                // ãƒ�ã‚§ãƒƒã‚¯ã‚’OFFã�¸
+                dgv.CellValueChanged -= new DataGridViewCellEventHandler(dgvAllDisplay_CellValueChanged);
+                dgv.CurrentCellDirtyStateChanged -= new EventHandler(dgvAllDisplay_CurrentCellDirtyStateChanged);
+
+                CurRow.Cells[(int)GridColumn.InvalidLine].Value = false;
+                dgv.CommitEdit(DataGridViewDataErrorContexts.Commit);
+                dgv.RefreshEdit();
+
+                dgv.CellValueChanged += new DataGridViewCellEventHandler(dgvAllDisplay_CellValueChanged);
+                dgv.CurrentCellDirtyStateChanged += new EventHandler(dgvAllDisplay_CurrentCellDirtyStateChanged);
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region çµŒè²»å†�è¨ˆç®—å‡¦ç�†
         /// <summary>
         /// çµŒè²»å†�è¨ˆç®—å‡¦ç�†
@@ -7260,7 +7317,7 @@
                 //CalculateNetIncome();
 
                 // å�ˆè¨ˆé‡‘é¡�
-                CreateAllTotal(false);
+                SetAllTotal(false);
 
                 // è«‹æ±‚é‡‘é¡�è¨ˆç®—
                 CalculateBillingAmount();
@@ -7374,7 +7431,7 @@
                 strSQL.Append("        And C.NameCode = A.ComponentCode");
 
                 strSQL.AppendFormat(" Where A.ConstructionCode = {0}", ConstrCode);
-                strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionBudget.DataGroup.Expenses);       // çµŒè²»
+                strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)ConstructionBudgetDetail.GroupCountDef.Expenses);       // çµŒè²»
                 strSQL.Append(" ORDER BY A.GroupCount ASC, A.LineCount ASC");
 
             }
@@ -7406,7 +7463,7 @@
 
                 DataGridViewEX dgv = dgvAllDisplay;
 
-                int GroupNo = (int)DataGroup.Expenses;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Expenses;
                 // å�—æ³¨é‡‘é¡�å�–å¾—
                 double OrdersPrice = CommonMotions.cnvInt(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text);
 
@@ -7527,9 +7584,9 @@
                 // å·¥äº‹äºˆç®—æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append(DetailDB.CreatePrimarykeyString(m_AddingConstrCode));
-                strSQL.AppendFormat(" AND (GROUPCOUNT = {0}", (int)FrmConstructionBudget.DataGroup.CommonTempCosts);       // å…±é€šä»®è¨­
-                strSQL.AppendFormat(" OR GROUPCOUNT = {0}", (int)FrmConstructionBudget.DataGroup.OutSourceCosts);          // å¤–æ³¨è²»
-                strSQL.AppendFormat(" OR GROUPCOUNT = {0})", (int)FrmConstructionBudget.DataGroup.MyConstruction);         // è‡ªç¤¾æ–½å·¥
+                strSQL.AppendFormat(" AND (GROUPCOUNT = {0}", (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts);       // å…±é€šä»®è¨­
+                strSQL.AppendFormat(" OR GROUPCOUNT = {0}", (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts);          // å¤–æ³¨è²»
+                strSQL.AppendFormat(" OR GROUPCOUNT = {0})", (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction);         // è‡ªç¤¾æ–½å·¥
                 strSQL.Append(" ORDER BY GroupCount ASC, LineCount ASC");
                 List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
                 if (!DetailDB.SelectAction(strSQL.ToString(), ref DetailList)) return false;
@@ -7536,34 +7593,47 @@
                 if (DetailList.Count == 0) return false;
 
                 DataGridViewEX dgv = dgvAllDisplay;
-                int GroupNo = (int)DataGroup.ConstructionCosts;
-                int icnt = 0;
 
-                // è¡Œä½�ç½®å�–å¾—
-                int StartLine = m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine];
-
                 // ãƒ‡ãƒ¼ã‚¿æŒ¿å…¥ä½�ç½®æ¤œç´¢
                 int TargetLine = -1;
-                for (int i = StartLine; i < dgv.RowCount; i++)
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
+                int iy = 0;
+                bool bFit = false;
+                foreach(DataGridViewRow CurRow in dgv.Rows)
                 {
-                    DataGridViewRow GridRow = dgv.Rows[i];
-                    if (CommonMotions.cnvInt(GridRow.Cells[(int)GridColumn.GroupCount].Value) != GroupNo) break;
+                    int nGroupCodeVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
+                    if (nGroupCodeVal == GroupNo)
+                    {
+                        bFit = true;
+                    }
+                    else
+                    {
+                        if (bFit)
+                        {
+                            // è¡Œæ•°ã‚’é€€é�¿
+                            TargetLine = iy;
+                            break;
+                        }
+                    }
 
                     // é‡‘é¡�ã�Œå¤‰ã‚�ã�£ã�Ÿå�¯èƒ½æ€§ã�Œã�‚ã‚‹ã�®ã�§æ¯”çŽ‡è¨ˆç®—
-                    double execprice = CommonMotions.cnvDouble(GridRow.Cells[(int)GridColumn.ExecPrice].Value);
-                    GridRow.Cells[(int)GridColumn.Percent].Value = CalculattionPercent(execprice).ToString("0.00");
+                    double execprice = CommonMotions.cnvDouble(CurRow.Cells[(int)GridColumn.ExecPrice].Value);
+                    CurRow.Cells[(int)GridColumn.Percent].Value = CalculattionPercent(execprice).ToString("0.00");
 
-                    // å�Œã�˜å ´å�ˆã�¯è¡Œæ•°ã‚’é€€é�¿
-                    TargetLine = i;
+                    iy++;
                 }
 
                 // æ˜Žç´°ç•ªå�·ã‚’ã‚»ãƒƒãƒˆ
-                int MaxCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.ConstructionCosts)
-                                                                .Max(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.DetailNo].Value)) + 1;
+                int nGroupPoint = (int)GridColumn.GroupCount;
+                int nGroupCode = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
+                int MaxCount = dgv.Rows.Cast<DataGridViewRow>()
+                                            .Where(x => CommonMotions.cnvInt(x.Cells[nGroupPoint].Value) == nGroupCode)
+                                            .Max(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.DetailNo].Value)) + 1;
                 // ãƒ‡ãƒ¼ã‚¿å¢—æ¸›ç•ªå�·å�–å¾—
                 int FluctuationNo = (int)ConstructionLedgerDetail.FlucFlgDef.Fluctuates;
                 // æ¬¡ã�®è¡Œã�‹ã‚‰è¿½åŠ 
                 TargetLine++;
+                int icnt = 0;
                 // ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
                 foreach (ConstructionBudgetDetail DetailRec in DetailList)
                 {
@@ -7597,9 +7667,9 @@
                     int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
                     GridRow.Cells[ResultPoint].Value = DetailRec.ExecutionAmount.ToString("#,0");
 
-                    GridRow.Cells[(int)GridColumn.TitleFlg].Value = "0";
-                    GridRow.Cells[(int)GridColumn.TotalFlg].Value = "0";
-                    GridRow.Cells[(int)GridColumn.BlankFlg].Value = "0";
+                    GridRow.Cells[(int)GridColumn.TitleFlg].Value = (int)TitleFlgDef.None;
+                    GridRow.Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.None;
+                    GridRow.Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.None;
 
                     TargetLine++;
                 }
@@ -7631,18 +7701,18 @@
             try
             {
                 // äº¤é€šè²»è¡¨ç¤º
-                if (!SetAddData_ConstructionBudget((int)FrmConstructionBudget.DataGroup.TransportationCosts)) return false;
+                if (!SetAddData_ConstructionBudget((int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts)) return false;
                 // è³¼å…¥å“�
                 //if (!SetAddData_PurchaseCosts()) return false;
-                if (!SetAddData_ConstructionBudget((int)FrmConstructionBudget.DataGroup.PurchaseCosts)) return false;
+                if (!SetAddData_ConstructionBudget((int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts)) return false;
                 // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                if (!SetAddData_ConstructionBudget((int)FrmConstructionBudget.DataGroup.VehicleLeaseFee)) return false;
+                if (!SetAddData_ConstructionBudget((int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee)) return false;
                 // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                if (!SetAddData_ConstructionBudget((int)FrmConstructionBudget.DataGroup.ParkingCosts)) return false;
+                if (!SetAddData_ConstructionBudget((int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts)) return false;
                 // å®¿æ³Šè²»
-                if (!SetAddData_ConstructionBudget((int)FrmConstructionBudget.DataGroup.RoomChargeCosts)) return false;
+                if (!SetAddData_ConstructionBudget((int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts)) return false;
                 // å‡¦åˆ†è²»ç­‰
-                if (!SetAddData_ConstructionBudget((int)FrmConstructionBudget.DataGroup.DisposeCosts)) return false;
+                if (!SetAddData_ConstructionBudget((int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts)) return false;
 
                 return true;
             }
@@ -7667,7 +7737,7 @@
                 // å·¥äº‹äºˆç®—æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
                 string strSQL = "SELECT SUM(ESTIMATEPRICE), SUM(EXECUTIONAMOUNT), SUM(AMOUNTCONFIGRATE) FROM CONSTRUCTIONBUDGETDETAIL";
                 strSQL += DetailDB.CreatePrimarykeyString(m_AddingConstrCode);
-                strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)FrmConstructionBudget.DataGroup.PurchaseCosts);       // è³¼å…¥å“�
+                strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts);       // è³¼å…¥å“�
                 ArrayList DetailList = new ArrayList();
                 if (!DetailDB.ExecuteReader(strSQL, ref DetailList)) return false;
                 if (DetailList.Count == 0) return true;
@@ -7727,27 +7797,27 @@
                 switch (GroupNo)
                 {
                     // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.VehicleLeaseFeeRowLine];
                         break;
                     // è³¼å…¥å“�
-                    case (int)FrmConstructionBudget.DataGroup.PurchaseCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine];
                         break;
                     // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    case (int)FrmConstructionBudget.DataGroup.TransportationCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.TransportationCostsRowLine];
                         break;
                     // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)FrmConstructionBudget.DataGroup.ParkingCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.ParkingCostsRowLine];
                         break;
                     // å®¿æ³Šè²»
-                    case (int)FrmConstructionBudget.DataGroup.RoomChargeCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.RoomChargeCostsRowLine];
                         break;
                     // å‡¦åˆ†è²»ç­‰
-                    case (int)FrmConstructionBudget.DataGroup.DisposeCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine];
                         break;
 
@@ -7796,17 +7866,17 @@
                 ConstructionBudget BudgetRec = new ConstructionBudget();
                 if (!BudgetDB.SelectAction(strSQL.ToString(), ref BudgetRec)) return false;
 
-                int BlockNo = (int)DataGroup.TransportationCosts + 1;
+                int BlockNo = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts + 1;
                 int icnt = 1;
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
                 CreateTitleRow(BlockNo, s_PersonnelExpensesGroup);
 
                 // æŒ‡å°Žå“¡çµ¦ä¸Ž
-                if (!SetAddData_AddWorkingRow(BlockNo, (int)FrmConstructionBudget.DataGroup.InstructorCosts, icnt++, BudgetRec)) return false;
+                if (!SetAddData_AddWorkingRow(BlockNo, (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts, icnt++, BudgetRec)) return false;
                 // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
-                if (!SetAddData_AddWorkingRow(BlockNo, (int)FrmConstructionBudget.DataGroup.AssistantCosts, icnt++, BudgetRec)) return false;
+                if (!SetAddData_AddWorkingRow(BlockNo, (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts, icnt++, BudgetRec)) return false;
                 // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
-                if (!SetAddData_AddWorkingRow(BlockNo, (int)FrmConstructionBudget.DataGroup.PayrollExpenses, icnt++, BudgetRec)) return false;
+                if (!SetAddData_AddWorkingRow(BlockNo, (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses, icnt++, BudgetRec)) return false;
 
                 return true;
             }
@@ -7849,21 +7919,21 @@
                 switch (GroupNo)
                 {
                     // æŒ‡å°Žå“¡è²»ç”¨
-                    case (int)FrmConstructionBudget.DataGroup.InstructorCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.InstructorRowLine];
-                        GroupNo = (int)DataGroup.Instructor;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Instructor;
                         break;
 
                     // å‰¯æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)FrmConstructionBudget.DataGroup.AssistantCosts:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.AssistantRowLine];
-                        GroupNo = (int)DataGroup.Assistant;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Assistant;
                         break;
 
                     // æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)FrmConstructionBudget.DataGroup.PayrollExpenses:
+                    case (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.PayrollRowLine];
-                        GroupNo = (int)DataGroup.Payroll;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Payroll;
                         break;
                     default:
                         // ã��ã�®ä»–ã�®é …ç›®ï¼ˆã�“ã�“ã�«ã�¯æ�¥ã�ªã�„ã�Œå¿µã�®ã�Ÿã‚�ï¼‰
@@ -7906,17 +7976,17 @@
                 switch (GroupNo)
                 {
                     // æŒ‡å°Žå“¡è²»ç”¨
-                    case (int)DataGroup.Instructor:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                         nSalaryFlg = BudgetRec.I_SalaryFlg;
                         nSalaryDays = BudgetRec.I_SalaryDays;
                         break;
                     // å‰¯æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)DataGroup.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                         nSalaryFlg = BudgetRec.A_SalaryFlg;
                         nSalaryDays = BudgetRec.A_SalaryDays;
                         break;
                     // æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)DataGroup.Payroll:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                         nSalaryFlg = BudgetRec.SalaryFlg;
                         nSalaryDays = BudgetRec.SalaryDays;
                         break;
@@ -8021,9 +8091,9 @@
                     int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
                     RowData[ResultPoint] = DetailRec.ExecutionAmount.ToString("#,0");
 
-                    RowData[(int)GridColumn.TitleFlg] = "0";
-                    RowData[(int)GridColumn.TotalFlg] = "0";
-                    RowData[(int)GridColumn.BlankFlg] = "0";
+                    RowData[(int)GridColumn.TitleFlg] = (int)TitleFlgDef.None;
+                    RowData[(int)GridColumn.TotalFlg] = (int)TotalFlgDef.None;
+                    RowData[(int)GridColumn.BlankFlg] = (int)BlankFlgDef.None;
 
                     // æ”¯æ‰•é‡‘é¡�ã�®ã‚»ãƒƒãƒˆ
                     RowData[ColPoint] = DetailRec.ExecutionAmount.ToString("#,0");
@@ -8134,7 +8204,7 @@
                 //CalculateNetIncome();
 
                 // å�ˆè¨ˆé‡‘é¡�
-                CreateAllTotal(false);
+                SetAllTotal(false);
 
                 // è«‹æ±‚é‡‘é¡�è¨ˆç®—
                 CalculateBillingAmount();
@@ -8226,7 +8296,7 @@
             {
                 DataGridViewEX dgv = dgvAllDisplay;
 
-                int GroupNo = (int)DataGroup.Expenses;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Expenses;
                 // å�—æ³¨é‡‘é¡�å�–å¾—
                 double OrdersPrice = CommonMotions.cnvInt(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text);
 
@@ -8391,7 +8461,7 @@
                 string ConstrName = string.Empty;
                 if (arList.Count != 0) ConstrName = CommonMotions.cnvString(NameObj[0]);
 
-                int GroupNo = (int)DataGroup.ConstructionCosts;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
 
                 // è¡Œä½�ç½®å�–å¾—
                 int StartLine = m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine];
@@ -8414,9 +8484,9 @@
                 TitleRow.Cells[(int)GridColumn.FluctuationFlg].Value = FluctuationNo;
                 TitleRow.Cells[(int)GridColumn.SourceCode].Value = ConstrCode;
                 TitleRow.Cells[(int)GridColumn.JoinTitleFlg].Value = 1;
-                TitleRow.Cells[(int)GridColumn.TitleFlg].Value = "0";
-                TitleRow.Cells[(int)GridColumn.TotalFlg].Value = "0";
-                TitleRow.Cells[(int)GridColumn.BlankFlg].Value = "0";
+                TitleRow.Cells[(int)GridColumn.TitleFlg].Value = (int)TitleFlgDef.None;
+                TitleRow.Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.None;
+                TitleRow.Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.None;
 
                 switch (DataSource)
                 {
@@ -8457,7 +8527,7 @@
 
                 // è¡Œä½�ç½®å�–å¾—
                 int StartLine = m_CostsRowCount[(int)CostsRowLine.ConstructionCostLine];
-                int GroupNo = (int)DataGroup.ConstructionCosts;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
 
                 // ãƒ‡ãƒ¼ã‚¿æŒ¿å…¥ä½�ç½®æ¤œç´¢
                 int TargetLine = -1;
@@ -8498,14 +8568,14 @@
                 // å·¥äº‹äºˆç®—æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
                 List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
                 string strSQL = OuterBudgetDDB.CreatePrimarykeyString(ConstrCode);
-                strSQL += string.Format(" AND (GROUPCOUNT = {0}", (int)FrmConstructionBudget.DataGroup.CommonTempCosts);       // å…±é€šä»®è¨­
-                strSQL += string.Format(" OR GROUPCOUNT = {0}", (int)FrmConstructionBudget.DataGroup.OutSourceCosts);          // å¤–æ³¨è²»
-                strSQL += string.Format(" OR GROUPCOUNT = {0})", (int)FrmConstructionBudget.DataGroup.MyConstruction);         // è‡ªç¤¾æ–½å·¥
+                strSQL += string.Format(" AND (GROUPCOUNT = {0}", (int)ConstructionBudgetDetail.GroupCountDef.CommonTempCosts);       // å…±é€šä»®è¨­
+                strSQL += string.Format(" OR GROUPCOUNT = {0}", (int)ConstructionBudgetDetail.GroupCountDef.OutSourceCosts);          // å¤–æ³¨è²»
+                strSQL += string.Format(" OR GROUPCOUNT = {0})", (int)ConstructionBudgetDetail.GroupCountDef.MyConstruction);         // è‡ªç¤¾æ–½å·¥
                 strSQL += " ORDER BY GroupCount ASC, LineCount ASC";
                 if (!OuterBudgetDDB.SelectAction(strSQL, ref DetailList)) return false;
                 if (DetailList.Count == 0) return true;
 
-                int GroupNo = (int)DataGroup.ConstructionCosts;
+                int GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
                 int icnt = 0;
 
                 // è¡Œä½�ç½®å�–å¾—
@@ -8515,7 +8585,7 @@
                 int FluctuationNo = (int)ConstructionLedgerDetail.FlucFlgDef.Normal;
 
                 // æ˜Žç´°ç•ªå�·ã‚’ã‚»ãƒƒãƒˆ
-                int MaxCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)DataGroup.ConstructionCosts)
+                int MaxCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value) == (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                                                                 .Max(y => CommonMotions.cnvInt(y.Cells[(int)GridColumn.DetailNo].Value)) + 1;
 
                 // æ¬¡ã�®è¡Œã�‹ã‚‰è¿½åŠ 
@@ -8553,9 +8623,9 @@
                     int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
                     GridRow.Cells[ResultPoint].Value = DetailRec.ExecutionAmount.ToString("#,0");
 
-                    GridRow.Cells[(int)GridColumn.TitleFlg].Value = "0";
-                    GridRow.Cells[(int)GridColumn.TotalFlg].Value = "0";
-                    GridRow.Cells[(int)GridColumn.BlankFlg].Value = "0";
+                    GridRow.Cells[(int)GridColumn.TitleFlg].Value = (int)TitleFlgDef.None;
+                    GridRow.Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.None;
+                    GridRow.Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.None;
 
                     TargetLine++;
                 }
@@ -8584,7 +8654,7 @@
                 // å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
                 List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
                 string strSQL = OuterDetailDB.CreatePrimarykeyString(ConstrCode);
-                strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)DataGroup.ConstructionCosts);       // æ–½å·¥è²»
+                strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);       // æ–½å·¥è²»
                 strSQL += " ORDER BY GroupCount ASC, LineCount ASC";
                 if (!OuterDetailDB.SelectAction(strSQL, ref DetailList)) return false;
                 if (DetailList.Count == 0) return true;
@@ -8639,9 +8709,9 @@
                     // æ˜Žç´°è¡Œ
                     GridRow.Cells[(int)GridColumn.DetailNo].Value = DetailRec.DetailCount;
 
-                    GridRow.Cells[(int)GridColumn.TitleFlg].Value = "0";
-                    GridRow.Cells[(int)GridColumn.TotalFlg].Value = "0";
-                    GridRow.Cells[(int)GridColumn.BlankFlg].Value = "0";
+                    GridRow.Cells[(int)GridColumn.TitleFlg].Value = (int)TitleFlgDef.None;
+                    GridRow.Cells[(int)GridColumn.TotalFlg].Value = (int)TotalFlgDef.None;
+                    GridRow.Cells[(int)GridColumn.BlankFlg].Value = (int)BlankFlgDef.None;
                     // ----- æ”¯æ‰•ã�„ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                     double TotalValue = 0;
                     strSQL = OuterExcuteDB.CreatePrimarykeyString(ConstrCode, DetailRec.GroupCount, DetailRec.LineCount);
@@ -8652,16 +8722,12 @@
                     {
                         //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
                         string CurMounth = YearMonthFormat(ExcuteRec.TargetMonth.Year, ExcuteRec.TargetMonth.Month);
-                        for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                        {
-                            // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                            if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                        int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                        if (nIndex < 0) continue;
 
-                            // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                            GridRow.Cells[ix].Value = ExcuteRec.PaymentAmount.ToString("#,0");
-                            TotalValue += ExcuteRec.PaymentAmount;
-                            break;
-                        }
+                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                        GridRow.Cells[nIndex].Value = ExcuteRec.PaymentAmount.ToString("#,0");
+                        TotalValue += ExcuteRec.PaymentAmount;
                     }
 
                     // å�ˆè¨ˆé‡‘é¡�è¡¨ç¤º
@@ -8700,17 +8766,17 @@
             try
             {
                 // äº¤é€šè²»è¡¨ç¤º
-                if (!SetJoinData_ConstructionBudget((int)DataGroup.TransportationCosts, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_ConstructionBudget((int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts, ConstrCode, DataSource)) return false;
                 // è³¼å…¥å“�
-                if (!SetJoinData_ConstructionBudget((int)DataGroup.PurchaseCosts, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_ConstructionBudget((int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts, ConstrCode, DataSource)) return false;
                 // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                if (!SetJoinData_ConstructionBudget((int)DataGroup.VehicleLeaseFee, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_ConstructionBudget((int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee, ConstrCode, DataSource)) return false;
                 // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                if (!SetJoinData_ConstructionBudget((int)DataGroup.ParkingCosts, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_ConstructionBudget((int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts, ConstrCode, DataSource)) return false;
                 // å®¿æ³Šè²»
-                if (!SetJoinData_ConstructionBudget((int)DataGroup.RoomChargeCosts, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_ConstructionBudget((int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts, ConstrCode, DataSource)) return false;
                 // å‡¦åˆ†è²»ç­‰
-                if (!SetJoinData_ConstructionBudget((int)DataGroup.DisposeCosts, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_ConstructionBudget((int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts, ConstrCode, DataSource)) return false;
 
                 return true;
             }
@@ -8738,28 +8804,28 @@
                     switch (GroupNo)
                     {
                         // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                        case (int)DataGroup.VehicleLeaseFee:
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.VehicleLeaseFee;
+                        case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.VehicleLeaseFee;
                             break;
                         // è³¼å…¥å“�
-                        case (int)DataGroup.PurchaseCosts:
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.PurchaseCosts;
+                        case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.PurchaseCosts;
                             break;
                         // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                        case (int)DataGroup.TransportationCosts:
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.TransportationCosts;
+                        case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.TransportationCosts;
                             break;
                         // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                        case (int)DataGroup.ParkingCosts:
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.ParkingCosts;
+                        case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.ParkingCosts;
                             break;
                         // å®¿æ³Šè²»
-                        case (int)DataGroup.RoomChargeCosts:
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.RoomChargeCosts;
+                        case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.RoomChargeCosts;
                             break;
                         // å‡¦åˆ†è²»ç­‰
-                        case (int)DataGroup.DisposeCosts:
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.DisposeCosts;
+                        case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.DisposeCosts;
                             break;
                         default:
                             // ã��ã�®ä»–ã�®é …ç›®
@@ -8790,27 +8856,27 @@
                 switch (GroupNo)
                 {
                     // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    case (int)DataGroup.VehicleLeaseFee:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.VehicleLeaseFee:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.VehicleLeaseFeeRowLine];
                         break;
                     // è³¼å…¥å“�
-                    case (int)DataGroup.PurchaseCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.PurchaseCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.PurchaseCostsRowLine];
                         break;
                     // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    case (int)DataGroup.TransportationCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.TransportationCostsRowLine];
                         break;
                     // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    case (int)DataGroup.ParkingCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.ParkingCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.ParkingCostsRowLine];
                         break;
                     // å®¿æ³Šè²»
-                    case (int)DataGroup.RoomChargeCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.RoomChargeCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.RoomChargeCostsRowLine];
                         break;
                     // å‡¦åˆ†è²»ç­‰
-                    case (int)DataGroup.DisposeCosts:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.DisposeCosts:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.DisposeCostsRowLine];
                         break;
 
@@ -8845,17 +8911,13 @@
                     {
                         //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
                         string CurMounth = YearMonthFormat(ExcuteRec.TargetMonth.Year, ExcuteRec.TargetMonth.Month);
-                        for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                        {
-                            // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                            if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                        int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                        if (nIndex < 0) continue;
 
-                            // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                            int SourceValue = CommonMotions.cnvInt(RowData.Cells[ix].Value);
-                            RowData.Cells[ix].Value = (SourceValue + ExcuteRec.PaymentAmount).ToString("#,0");
-                            TotalValue += ExcuteRec.PaymentAmount;
-                            break;
-                        }
+                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                        long SourceValue = CommonMotions.cnvLong(RowData.Cells[nIndex].Value);
+                        RowData.Cells[nIndex].Value = (SourceValue + ExcuteRec.PaymentAmount).ToString("#,0");
+                        TotalValue += ExcuteRec.PaymentAmount;
                     }
                 }
 
@@ -8892,17 +8954,17 @@
         {
             try
             {
-                int BlockNo = (int)DataGroup.TransportationCosts + 1;
+                int BlockNo = (int)ConstructionLedgerDetail.GroupCountDef.TransportationCosts + 1;
                 int icnt = 1;
                 // ã‚°ãƒ«ãƒ¼ãƒ—å��è¡¨ç¤º
                 CreateTitleRow(BlockNo, s_PersonnelExpensesGroup);
 
                 // æŒ‡å°Žå“¡çµ¦ä¸Ž
-                if (!SetJoinData_AddWorkingRow(BlockNo, (int)DataGroup.Instructor, icnt++, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_AddWorkingRow(BlockNo, (int)ConstructionLedgerDetail.GroupCountDef.Instructor, icnt++, ConstrCode, DataSource)) return false;
                 // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
-                if (!SetJoinData_AddWorkingRow(BlockNo, (int)DataGroup.Assistant, icnt++, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_AddWorkingRow(BlockNo, (int)ConstructionLedgerDetail.GroupCountDef.Assistant, icnt++, ConstrCode, DataSource)) return false;
                 // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
-                if (!SetJoinData_AddWorkingRow(BlockNo, (int)DataGroup.Payroll, icnt++, ConstrCode, DataSource)) return false;
+                if (!SetJoinData_AddWorkingRow(BlockNo, (int)ConstructionLedgerDetail.GroupCountDef.Payroll, icnt++, ConstrCode, DataSource)) return false;
 
                 return true;
             }
@@ -8929,17 +8991,17 @@
                 {
                     switch (GroupNo)
                     {
-                        case (int)DataGroup.Instructor:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                             // æŒ‡å°Žå“¡çµ¦ä¸Ž
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.InstructorCosts;
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.InstructorCosts;
                             break;
-                        case (int)DataGroup.Assistant:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                             // å‰¯æ‹…å½“è€…çµ¦ä¸Ž
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.AssistantCosts;
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.AssistantCosts;
                             break;
-                        case (int)DataGroup.Payroll:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                             // æ‹…å½“è€…çµ¦ä¸ŽçµŒè²»
-                            SearchGroup = (int)FrmConstructionBudget.DataGroup.PayrollExpenses;
+                            SearchGroup = (int)ConstructionBudgetDetail.GroupCountDef.PayrollExpenses;
                             break;
                         default:
                             // ã��ã�®ä»–ã�®é …ç›®
@@ -8979,9 +9041,9 @@
                 switch (GroupNo)
                 {
                     // æŒ‡å°Žå“¡è²»ç”¨
-                    case (int)DataGroup.Instructor:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.InstructorRowLine];
-                        GroupNo = (int)DataGroup.Instructor;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Instructor;
 
                         // æŒ‡å°Žå“¡è¡Œã�«ã‚³ãƒ¼ãƒ‰ãƒ»å��å‰�ã‚’å…¥ã‚Œã‚‹
                         BudgetDRec.CompanyCode = DetailRec.CompanyCode;
@@ -8993,9 +9055,9 @@
                         break;
 
                     // å‰¯æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)DataGroup.Assistant:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.AssistantRowLine];
-                        GroupNo = (int)DataGroup.Assistant;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Assistant;
 
                         // å‰¯æ‹…å½“è¡Œã�«ã‚³ãƒ¼ãƒ‰ãƒ»å��å‰�ã‚’å…¥ã‚Œã‚‹
                         BudgetDRec.CompanyCode = DetailRec.CompanyCode;
@@ -9007,9 +9069,9 @@
                         break;
 
                     // æ‹…å½“è€…çµ¦ä¸Žè²»ç”¨
-                    case (int)DataGroup.Payroll:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.Payroll:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.PayrollRowLine];
-                        GroupNo = (int)DataGroup.Payroll;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.Payroll;
 
                         // æ‹…å½“è€…è¡Œã�«ã‚³ãƒ¼ãƒ‰ãƒ»å��å‰�ã‚’å…¥ã‚Œã‚‹
                         BudgetDRec.CompanyCode = DetailRec.CompanyCode;
@@ -9082,9 +9144,9 @@
                     int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
                     RowData[ResultPoint] = DetailRec.ExecutionAmount.ToString("#,0");
 
-                    RowData[(int)GridColumn.TitleFlg] = "0";
-                    RowData[(int)GridColumn.TotalFlg] = "0";
-                    RowData[(int)GridColumn.BlankFlg] = "0";
+                    RowData[(int)GridColumn.TitleFlg] = (int)TitleFlgDef.None;
+                    RowData[(int)GridColumn.TotalFlg] = (int)TotalFlgDef.None;
+                    RowData[(int)GridColumn.BlankFlg] = (int)BlankFlgDef.None;
 
                     dgv.Rows.Insert(TargetLine, RowData);
                 }
@@ -9106,17 +9168,13 @@
                     {
                         //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
                         string CurMounth = YearMonthFormat(ExcuteRec.TargetMonth.Year, ExcuteRec.TargetMonth.Month);
-                        for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                        {
-                            // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                            if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                        int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                        if (nIndex < 0) continue;
 
-                            // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                            int SourceValue = CommonMotions.cnvInt(ExecRow.Cells[ix].Value);
-                            ExecRow.Cells[ix].Value = (SourceValue + ExcuteRec.PaymentAmount).ToString("#,0");
-                            TotalValue += ExcuteRec.PaymentAmount;
-                            break;
-                        }
+                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                        long SourceValue = CommonMotions.cnvLong(ExecRow.Cells[nIndex].Value);
+                        ExecRow.Cells[nIndex].Value = (SourceValue + ExcuteRec.PaymentAmount).ToString("#,0");
+                        TotalValue += ExcuteRec.PaymentAmount;
                     }
                 }
 
@@ -9156,9 +9214,9 @@
                 if (DataSource == (int)DataCreateFlg.DataBudget) return true;
 
                 // è«‹æ±‚é‡‘é¡�
-                if (!SetJoinData_AddBillingRow((int)DataGroup.BillingAmount, ConstrCode)) return false;
+                if (!SetJoinData_AddBillingRow((int)ConstructionLedgerDetail.GroupCountDef.BillingAmount, ConstrCode)) return false;
                 // ç�¾åœ¨åˆ©ç›Šé¡�
-                if (!SetJoinData_AddBillingRow((int)DataGroup.CurrentProfit, ConstrCode)) return false;
+                if (!SetJoinData_AddBillingRow((int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit, ConstrCode)) return false;
 
                 return true;
             }
@@ -9194,15 +9252,15 @@
                 switch (GroupNo)
                 {
                     // è«‹æ±‚é‡‘é¡�
-                    case (int)DataGroup.BillingAmount:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.BillingAmountRowLine];
-                        GroupNo = (int)DataGroup.BillingAmount;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount;
                         break;
 
                     // ç�¾åœ¨åˆ©ç›Šé¡�
-                    case (int)DataGroup.CurrentProfit:
+                    case (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit:
                         TargetLine = m_CostsRowCount[(int)CostsRowLine.CurrentProfitRowLine];
-                        GroupNo = (int)DataGroup.CurrentProfit;
+                        GroupNo = (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit;
                         break;
 
                     default:
@@ -9231,17 +9289,13 @@
                 {
                     //ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’å�–å¾—ã�™ã‚‹ï¼ˆãƒ‡ãƒ¼ã‚¿ã�®ã‚«ãƒ©ãƒ æ•°ã�‹ã‚‰å¹´æœˆã�«å¤‰æ›´ã�™ã‚‹ï¼‰
                     string CurMounth = YearMonthFormat(ExcuteRec.TargetMonth.Year, ExcuteRec.TargetMonth.Month);
-                    for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                    {
-                        // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                        if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
+                    int nIndex = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+                    if (nIndex < 0) continue;
 
-                        // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                        int SourceValue = CommonMotions.cnvInt(ExecRow.Cells[ix].Value);
-                        ExecRow.Cells[ix].Value = (SourceValue + ExcuteRec.PaymentAmount).ToString("#,0");
-                        TotalValue += ExcuteRec.PaymentAmount;
-                        break;
-                    }
+                    // ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                    long SourceValue = CommonMotions.cnvLong(ExecRow.Cells[nIndex].Value);
+                    ExecRow.Cells[nIndex].Value = (SourceValue + ExcuteRec.PaymentAmount).ToString("#,0");
+                    TotalValue += ExcuteRec.PaymentAmount;
                 }
 
                 int GridColMax = dgv.ColumnCount;
@@ -9394,7 +9448,7 @@
                 DataGridViewEX dgv = dgvAllDisplay;
                 DataGridViewRow CurRow = dgv.CurrentRow;
                 // æ–½å·¥è²»ä»¥å¤–ã�®é�¸æŠžã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value) != (int)DataGroup.ConstructionCosts)
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value) != (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts)
                 {
                     return false;
                 }
@@ -9595,7 +9649,7 @@
                 SelectRow.Cells[m_TargetColumn].Value = m_AddingRequestPrice.ToString("#,0");
 
                 // å†�è¨ˆç®—å‡¦ç�†
-                RowReCalculate(SelectRow, SelectRow.Index, m_TargetColumn);
+                RowReCalculate(SelectRow, m_TargetColumn);
 
                 return true;
             }
@@ -9673,12 +9727,14 @@
 
                     int nGroupCnt = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
 
-                    // 0:ç©ºç™½/12:ç´”åˆ©ç›Š/13:å�ˆè¨ˆé‡‘é¡�/14:è«‹æ±‚é‡‘é¡�/15:ç�¾åœ¨åˆ©ç›Šé‡‘é¡�ã�¯è‰²ã‚’å¤‰ã�ˆã�ªã�„
-                    if (nGroupCnt == (int)DataGroup.Empty) continue;            // 0:ç©ºç™½
-                    if (nGroupCnt == (int)DataGroup.NetIncome) continue;        // 12:ç´”åˆ©ç›Š
-                    if (nGroupCnt == (int)DataGroup.AllTotal) continue;         // 13:å�ˆè¨ˆé‡‘é¡�
-                    if (nGroupCnt == (int)DataGroup.BillingAmount) continue;    // 14:è«‹æ±‚é‡‘é¡�
-                    if (nGroupCnt == (int)DataGroup.CurrentProfit) continue;    // 15:ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
+                    // ä»¥ä¸‹ã�¯è‰²ã‚’å¤‰ã�ˆã�ªã�„
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.Empty) continue;            // 0:ç©ºç™½
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.NetIncome) continue;        // 12:ç´”åˆ©ç›Š
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.AllTotal) continue;         // 13:å�ˆè¨ˆé‡‘é¡�
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount) continue;    // 14:è«‹æ±‚é‡‘é¡�
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.CurrentProfit) continue;    // 15:ç�¾åœ¨åˆ©ç›Šé‡‘é¡�
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount) continue;    // 16:å…¥é‡‘é‡‘é¡�
+                    if (nGroupCnt == (int)ConstructionLedgerDetail.GroupCountDef.Compensation) continue;     // 17:è£œå¡«é‡‘é¡�
 
                     // è«‹æ±‚ã�¾ã�¨ã‚�è¡Œè‰²å¤‰æ›´å‡¦ç�†
                     SetReqSumDialogRowColor(CurRow);
@@ -9894,15 +9950,10 @@
                 // å¯¾è±¡å¹´æœˆæ—¥å�–å¾—
                 DateTime dtTargetDate = new DateTime((m_ReqSumTargetMonth / 100), (m_ReqSumTargetMonth % 100), 1);
                 string CurMounth = YearMonthFormat(dtTargetDate.Year, dtTargetDate.Month);
+                
                 // å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                int nSetColumn = -1;
-                for (int ix = (int)GridColumn.Payment; ix < dgv.ColumnCount; ix++)
-                {
-                    // ã‚°ãƒªãƒƒãƒ‰ã�®å¯¾è±¡åˆ—ã‚’æŽ¢ã�™
-                    if (!CurMounth.Equals(dgv.Columns[ix].HeaderText)) continue;
-                    nSetColumn = ix;
-                    break;
-                }
+                int nSetColumn = dgv.Columns.Cast<DataGridViewColumn>().Where(x => CurMounth.Equals(x.HeaderText)).First().Index;
+
                 // å¯¾è±¡ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
                 if (nSetColumn < 0) return;
 
@@ -9987,7 +10038,7 @@
                 string strSQL = "SELECT A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, B.COMPANYCODE, C.CREATORCODE, C.CREATORNAME, C.SALARYFLG, C.SALARYDAYS, D.DETAILSTRING";
                 strSQL += " FROM CONSTRUCTIONLEDGER A, CONSTRUCTIONLEDGERDETAIL B, CONSTRUCTIONBUDGET C, CONSTRUCTIONBASEINFODETAIL D";
                 strSQL += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND B.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL += string.Format(" AND B.GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL += " AND B.COMPANYCODE <> 0";
                 strSQL += " AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                 strSQL += string.Format(" AND D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND D.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
@@ -10033,7 +10084,7 @@
                 strSQL = " SELECT A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, B.COMPANYCODE, C.INSTRUCTORCODE, C.INSTRUCTORNAME, C.I_SALARYFLG, C.I_SALARYDAYS, D.DETAILSTRING";
                 strSQL += " FROM CONSTRUCTIONLEDGER A, CONSTRUCTIONLEDGERDETAIL B, CONSTRUCTIONBUDGET C, CONSTRUCTIONBASEINFODETAIL D";
                 strSQL += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND B.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
+                strSQL += string.Format(" AND B.GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Instructor);
                 strSQL += " AND B.COMPANYCODE <> 0";
                 strSQL += " AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                 strSQL += string.Format(" AND D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND D.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
@@ -10084,7 +10135,7 @@
                 strSQL = " SELECT A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, B.COMPANYCODE, C.INSTRUCTORCODE, C.INSTRUCTORNAME, C.A_SALARYFLG, C.A_SALARYDAYS, D.DETAILSTRING";
                 strSQL += " FROM CONSTRUCTIONLEDGER A, CONSTRUCTIONLEDGERDETAIL B, CONSTRUCTIONBUDGET C, CONSTRUCTIONBASEINFODETAIL D";
                 strSQL += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND B.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
+                strSQL += string.Format(" AND B.GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Assistant);
                 strSQL += " AND B.COMPANYCODE <> 0";
                 strSQL += " AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                 strSQL += string.Format(" AND D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND D.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
@@ -10580,47 +10631,6 @@
         //}
         #endregion
 
-        #region ä¸€æ‹¬å†�è¨ˆç®—å‡¦ç�†
-        /// <summary>
-        /// ä¸€æ‹¬å†�è¨ˆç®—å‡¦ç�†
-        /// </summary>
-        private void ReCalculation()
-        {
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            FrmConstructionLedger frm = new FrmConstructionLedger();
-            try
-            {
-                string strSQL = "SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGER";
-                ArrayList arList = new ArrayList();
-                if (!LedgerDB.ExecuteReader(strSQL, ref arList)) return;
-
-                foreach (object[] objwrk in arList)
-                {
-                    // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
-                    frm.ConstructionCode = CommonMotions.cnvInt(objwrk[0]);
-
-                    // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
-                    frm.Hide();
-
-                    // å†�è¨ˆç®—å‡¦ç�†
-                    if (!frm.RecalculateLedger) break;
-
-                    // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                    frm.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                LedgerDB.close(); LedgerDB = null;
-                frm.Dispose(); frm = null;
-            }
-        }
-        #endregion
-
         #region æ³¨æ–‡æ›¸æ˜Žç´°æ›´æ–°å‡¦ç�†
         /// <summary>
         /// æ³¨æ–‡æ›¸æ˜Žç´°æ›´æ–°å‡¦ç�†
@@ -10752,7 +10762,7 @@
                                                 , m_ConstructionCode
                                                 , "2018/10"
                                                 , 100000
-                                                , (int)DataGroup.BillingAmount);
+                                                , (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount);
 
                 if (!bret)
                 {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CommonLedgerData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CommonLedgerData.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CommonLedgerData.cs	(revision 483)
@@ -187,9 +187,9 @@
                     strSQL.AppendFormat("            And Base.ConstructionYear = {0}", BusinessPeriod);
 
                 strSQL.AppendFormat(" Where LDetail.GroupCount IN ({0}, {1}, {2})"
-                                                                            , (int)FrmConstructionLedger.DataGroup.Instructor
-                                                                            , (int)FrmConstructionLedger.DataGroup.Assistant
-                                                                            , (int)FrmConstructionLedger.DataGroup.Payroll);
+                                                                            , (int)ConstructionLedgerDetail.GroupCountDef.Instructor
+                                                                            , (int)ConstructionLedgerDetail.GroupCountDef.Assistant
+                                                                            , (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.Append("       And LDetail.CompanyCode <> 0");
                 strSQL.AppendFormat(" And LDetail.OperatingFlg = {0}", (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing);
                 strSQL.Append("       Group By PersonCode");
@@ -215,9 +215,9 @@
                     strSQL.AppendFormat("            And Base.ConstructionYear = {0}", BusinessPeriod + 1);
 
                 strSQL.AppendFormat(" Where LDetail2.GroupCount IN ({0}, {1}, {2})"
-                                                                            , (int)FrmConstructionLedger.DataGroup.Instructor
-                                                                            , (int)FrmConstructionLedger.DataGroup.Assistant
-                                                                            , (int)FrmConstructionLedger.DataGroup.Payroll);
+                                                                            , (int)ConstructionLedgerDetail.GroupCountDef.Instructor
+                                                                            , (int)ConstructionLedgerDetail.GroupCountDef.Assistant
+                                                                            , (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.Append("       And LDetail2.CompanyCode <> 0");
                 strSQL.AppendFormat(" And LDetail2.OperatingFlg = {0}", (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing);
                 strSQL.Append("       Group By PersonCode");
@@ -341,7 +341,7 @@
                     strSQL.AppendFormat("     AND C.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
 
                     strSQL.Append(" Where");
-                    strSQL.AppendFormat("   A.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                    strSQL.AppendFormat("   A.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
 
                     if (DepartmentCode > 0)
                         strSQL.AppendFormat(" AND B.ComponentCode = {0}", DepartmentCode);
@@ -365,7 +365,7 @@
                     strSQL.AppendFormat("     AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
 
                     strSQL.Append(" Where");
-                    strSQL.AppendFormat(" A.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                    strSQL.AppendFormat(" A.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
 
                     if (DepartmentCode > 0)
                         strSQL.AppendFormat(" AND A.ComponentCode = {0}", DepartmentCode);
@@ -654,8 +654,8 @@
                 strSQL.Append("        On A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
                 strSQL.Append(" WHERE");
                 strSQL.AppendFormat(" B.GROUPCOUNT IN ({0}, {1})"
-                                    , (int)FrmConstructionLedger.DataGroup.Instructor
-                                    , (int)FrmConstructionLedger.DataGroup.Assistant);
+                                    , (int)ConstructionLedgerDetail.GroupCountDef.Instructor
+                                    , (int)ConstructionLedgerDetail.GroupCountDef.Assistant);
 
                 if (CommonMotions.BasePeriodYear())
                     strSQL.AppendFormat(" AND A.ConstructionPeriod = {0}", TargetYear);
@@ -680,10 +680,10 @@
                     int nValue = CommonMotions.cnvInt(wrkobj[1]);
                     switch (GrpCode)
                     {
-                        case (int)FrmConstructionLedger.DataGroup.Assistant:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Assistant:
                             CostValue[0] = nValue;
                             break;
-                        case (int)FrmConstructionLedger.DataGroup.Instructor:
+                        case (int)ConstructionLedgerDetail.GroupCountDef.Instructor:
                             CostValue[1] = nValue;
                             break;
                     }
@@ -733,9 +733,9 @@
                 strSQL.AppendFormat(" AND C.ConstructionStatusFlg != {0}", NotOrder);
                 strSQL.AppendFormat(" AND C.ConstrDepCode = {0}", DepartmentCode);
                 strSQL.Append(" WHERE");
-                strSQL.AppendFormat(" A.GroupCount IN({0}, {1}, {2})", (int)FrmConstructionLedger.DataGroup.Instructor
-                                                                        , (int)FrmConstructionLedger.DataGroup.Assistant
-                                                                        , (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL.AppendFormat(" A.GroupCount IN({0}, {1}, {2})", (int)ConstructionLedgerDetail.GroupCountDef.Instructor
+                                                                        , (int)ConstructionLedgerDetail.GroupCountDef.Assistant
+                                                                        , (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.AppendFormat(" AND B.ComponentCode != {0}", DepartmentCode);
                 if (PersonCode > 0) strSQL.AppendFormat(" AND C.ConstructionPersonCode = {0}", PersonCode);
                 strSQL.Append(" Group by A.GROUPCOUNT");
@@ -761,9 +761,9 @@
                 strSQL.AppendFormat(" AND C.ConstructionStatusFlg != {0}", NotOrder);
                 strSQL.AppendFormat(" AND C.ConstrDepCode != {0}", DepartmentCode);
                 strSQL.Append(" WHERE");
-                strSQL.AppendFormat(" A.GroupCount IN({0}, {1}, {2})", (int)FrmConstructionLedger.DataGroup.Instructor
-                                                                        , (int)FrmConstructionLedger.DataGroup.Assistant
-                                                                        , (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL.AppendFormat(" A.GroupCount IN({0}, {1}, {2})", (int)ConstructionLedgerDetail.GroupCountDef.Instructor
+                                                                        , (int)ConstructionLedgerDetail.GroupCountDef.Assistant
+                                                                        , (int)ConstructionLedgerDetail.GroupCountDef.Payroll);
                 strSQL.AppendFormat(" AND B.ComponentCode = {0}", DepartmentCode);
                 if (PersonCode > 0) strSQL.AppendFormat(" AND C.ConstructionPersonCode = {0}", PersonCode);
                 strSQL.Append(" Group by A.GROUPCOUNT");
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 483)
@@ -154,19 +154,31 @@
             /// <summary>
             /// 11:‘�Žx•¥Šz
             /// </summary>
-            TotalPayment = -4,
+            TotalPayment = -7,
             /// <summary>
             /// 12:‘e—˜
             /// </summary>
-            GrossProfit = -3,
+            GrossProfit = -6,
             /// <summary>
             /// 13:‹‹—^
             /// </summary>
-            Allowance = -2,
+            Allowance = -5,
             /// <summary>
             /// 14:�ƒ—˜‰v
             /// </summary>
-            NetProfit = -1,
+            NetProfit = -4,
+            /// <summary>
+            /// ƒL�[�€–Ú‚P
+            /// </summary>
+            KeyVal1 = -3,
+            /// <summary>
+            /// ƒL�[�€–Ú‚Q
+            /// </summary>
+            KeyVal2 = -2,
+            /// <summary>
+            /// ƒL�[�€–Ú‚R
+            /// </summary>
+            KeyVal3 = -1,
         }
         #endregion
 
@@ -551,6 +563,32 @@
         }
         #endregion
 
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
+        /// <summary>
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnStageUp_Click(object sender, EventArgs e)
+        {
+            // ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+            StageUpProcess();
+        }
+        #endregion
+
+        #region �Å�V‚Ì�ó‘Ô‚Öƒ{ƒ^ƒ“‰Ÿ‰º
+        /// <summary>
+        /// �Å�V‚Ì�ó‘Ô‚Öƒ{ƒ^ƒ“‰Ÿ‰º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnReLoadData_Click(object sender, EventArgs e)
+        {
+            // ƒf�[ƒ^•\Ž¦
+            DataDisplay();
+        }
+        #endregion
+
         #region ƒtƒH�[ƒ€ƒ��[ƒh
         /// <summary>
         /// �‰ŠúƒtƒH�[ƒ€ƒ��[ƒh
@@ -571,7 +609,7 @@
         /// <param name="e"></param>
         private async void FrmLedgerList_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
 
             // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
             InitFormLoad();
@@ -826,27 +864,16 @@
             if (dgv.RowCount == 0) return;
 
             // �‡Œv�s‚Í�ˆ—�‚µ‚È‚¢
-            string strWork = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.No].Value);
-            bool bTitle = false;
-            foreach (string strTitle in s_TotalTitleArray)
-            {
-                if (strWork.Equals(strTitle))
-                {
-                    bTitle = true;
-                    break;
-                }
-            }
+            string strWork = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.SelectionCode].Value);
+            if (strWork.Equals("*")) return;
 
             // �s‘I‘ð�F‚ðŒ³‚É–ß‚·
             if (m_BeforeGridRow >= 0) DefaultRowChangeColor(m_BeforeGridRow);
 
-            if (!bTitle)
-            {
-                // ‘I‘ð�s�”‚ð‘Þ”ð
-                m_BeforeGridRow = dgv.CurrentRow.Index;
-                // �s‘I‘ð�F‚ð�Ý’è
-                SelectRowChangeColor(m_BeforeGridRow);
-            }
+            // ‘I‘ð�s�”‚ð‘Þ”ð
+            m_BeforeGridRow = dgv.CurrentRow.Index;
+            // �s‘I‘ð�F‚ð�Ý’è
+            SelectRowChangeColor(m_BeforeGridRow);
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs	(revision 483)
@@ -31,6 +31,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLedgerList));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -51,27 +52,14 @@
             this.lblCellTotal = new System.Windows.Forms.Label();
             this.ProgressBar = new System.Windows.Forms.ProgressBar();
             this.btnLedgerStatus = new System.Windows.Forms.Button();
+            this.btnHelp = new System.Windows.Forms.Button();
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.btnReLoadData = new System.Windows.Forms.Button();
+            this.pnlPayroll = new System.Windows.Forms.Panel();
             this.pnlSelect = new System.Windows.Forms.Panel();
             this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.pnlPayroll = new System.Windows.Forms.Panel();
             this.label6 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
@@ -109,11 +97,29 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.btnHelp = new System.Windows.Forms.Button();
+            this.btnStageUp = new System.Windows.Forms.Button();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.groupBox1.SuspendLayout();
+            this.pnlPayroll.SuspendLayout();
             this.pnlSelect.SuspendLayout();
-            this.pnlPayroll.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
             this.SuspendLayout();
             // 
@@ -180,6 +186,21 @@
             this.btnLedgerStatus.Visible = false;
             this.btnLedgerStatus.Click += new System.EventHandler(this.btnLedgerStatus_Click);
             // 
+            // btnHelp
+            // 
+            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnHelp.BackColor = System.Drawing.Color.Black;
+            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHelp.ForeColor = System.Drawing.Color.White;
+            this.btnHelp.Location = new System.Drawing.Point(1309, 0);
+            this.btnHelp.Name = "btnHelp";
+            this.btnHelp.Size = new System.Drawing.Size(30, 30);
+            this.btnHelp.TabIndex = 113;
+            this.btnHelp.TabStop = false;
+            this.btnHelp.Text = "ï¼Ÿ";
+            this.btnHelp.UseVisualStyleBackColor = false;
+            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            // 
             // dgvMaster
             // 
             this.dgvMaster.AllowUserToAddRows = false;
@@ -216,7 +237,10 @@
             this.Column9,
             this.Column10,
             this.Column11,
-            this.Column12});
+            this.Column12,
+            this.Column16,
+            this.Column17,
+            this.Column18});
             dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window;
             dataGridViewCellStyle18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
@@ -227,7 +251,7 @@
             this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle18;
             this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgvMaster.EnableHeadersVisualStyles = false;
-            this.dgvMaster.Location = new System.Drawing.Point(5, 170);
+            this.dgvMaster.Location = new System.Drawing.Point(5, 190);
             this.dgvMaster.Name = "dgvMaster";
             this.dgvMaster.RowHeadersVisible = false;
             this.dgvMaster.RowHeadersWidth = 20;
@@ -234,7 +258,7 @@
             this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             this.dgvMaster.RowTemplate.Height = 21;
             this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1330, 446);
+            this.dgvMaster.Size = new System.Drawing.Size(1330, 424);
             this.dgvMaster.TabIndex = 5;
             this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
             this.dgvMaster.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dgvMaster_CellPainting);
@@ -242,177 +266,12 @@
             this.dgvMaster.Leave += new System.EventHandler(this.dgvMaster_Leave);
             this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
             // 
-            // Column1
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "â„–";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 50;
-            // 
-            // Column13
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column13.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column13.Frozen = true;
-            this.Column13.HeaderText = "æ¸ˆ";
-            this.Column13.Name = "Column13";
-            this.Column13.ReadOnly = true;
-            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column13.Width = 30;
-            // 
-            // Column14
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column14.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column14.Frozen = true;
-            this.Column14.HeaderText = "éƒ¨ç½²";
-            this.Column14.Name = "Column14";
-            this.Column14.ReadOnly = true;
-            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column2
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column2.Frozen = true;
-            this.Column2.HeaderText = "æ‹…å½“è€…å��";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Visible = false;
-            this.Column3.Width = 5;
-            // 
-            // Column4
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column4.Frozen = true;
-            this.Column4.HeaderText = "å·¥äº‹å��ç§°";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column4.Width = 210;
-            // 
-            // Column15
-            // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column15.DefaultCellStyle = dataGridViewCellStyle9;
-            this.Column15.Frozen = true;
-            this.Column15.HeaderText = "çŠ¶ã€€æ…‹";
-            this.Column15.Name = "Column15";
-            this.Column15.ReadOnly = true;
-            this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle10;
-            this.Column5.Frozen = true;
-            this.Column5.HeaderText = "å�—æ³¨é‡‘é¡�";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 120;
-            // 
-            // Column6
-            // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle11;
-            this.Column6.HeaderText = "ä¼šç¤¾çµŒè²»";
-            this.Column6.Name = "Column6";
-            this.Column6.ReadOnly = true;
-            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column7
-            // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle12;
-            this.Column7.HeaderText = "éƒ¨ç½²çµŒè²»";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column8
-            // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle13;
-            this.Column8.HeaderText = "å–¶æ¥­çµŒè²»";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column9
-            // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle14;
-            this.Column9.HeaderText = "ç·�æ”¯æ‰•é¡�";
-            this.Column9.Name = "Column9";
-            this.Column9.ReadOnly = true;
-            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column10
-            // 
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle15;
-            this.Column10.HeaderText = "ç²—ã€€åˆ©";
-            this.Column10.Name = "Column10";
-            this.Column10.ReadOnly = true;
-            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column11
-            // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column11.DefaultCellStyle = dataGridViewCellStyle16;
-            this.Column11.HeaderText = "çµ¦ã€€ä¸Ž";
-            this.Column11.Name = "Column11";
-            this.Column11.ReadOnly = true;
-            this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column11.Visible = false;
-            this.Column11.Width = 5;
-            // 
-            // Column12
-            // 
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle17;
-            this.Column12.HeaderText = "ç´”åˆ©ç›Š";
-            this.Column12.Name = "Column12";
-            this.Column12.ReadOnly = true;
-            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
             // groupBox1
             // 
             this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.groupBox1.BackColor = System.Drawing.Color.LimeGreen;
             this.groupBox1.BorderColor = System.Drawing.Color.White;
-            this.groupBox1.Controls.Add(this.pnlSelect);
+            this.groupBox1.Controls.Add(this.btnReLoadData);
             this.groupBox1.Controls.Add(this.pnlPayroll);
             this.groupBox1.Controls.Add(this.cmbDepartment);
             this.groupBox1.Controls.Add(this.label2);
@@ -425,52 +284,30 @@
             this.groupBox1.ForeColor = System.Drawing.Color.White;
             this.groupBox1.Location = new System.Drawing.Point(5, 38);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1330, 128);
+            this.groupBox1.Size = new System.Drawing.Size(1330, 148);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
-            // pnlSelect
+            // btnReLoadData
             // 
-            this.pnlSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlSelect.BackColor = System.Drawing.Color.PaleGoldenrod;
-            this.pnlSelect.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.pnlSelect.Controls.Add(this.radioButton2);
-            this.pnlSelect.Controls.Add(this.radioButton1);
-            this.pnlSelect.Location = new System.Drawing.Point(982, 9);
-            this.pnlSelect.Name = "pnlSelect";
-            this.pnlSelect.Size = new System.Drawing.Size(342, 26);
-            this.pnlSelect.TabIndex = 48;
+            this.btnReLoadData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnReLoadData.BackColor = System.Drawing.Color.SpringGreen;
+            this.btnReLoadData.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnReLoadData.ForeColor = System.Drawing.Color.Black;
+            this.btnReLoadData.Location = new System.Drawing.Point(1203, 7);
+            this.btnReLoadData.Name = "btnReLoadData";
+            this.btnReLoadData.Size = new System.Drawing.Size(120, 30);
+            this.btnReLoadData.TabIndex = 72;
+            this.btnReLoadData.TabStop = false;
+            this.btnReLoadData.Text = "æœ€æ–°çŠ¶æ…‹ã�«æ›´æ–°";
+            this.btnReLoadData.UseVisualStyleBackColor = false;
+            this.btnReLoadData.Click += new System.EventHandler(this.btnReLoadData_Click);
             // 
-            // radioButton2
-            // 
-            this.radioButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.ForeColor = System.Drawing.Color.Black;
-            this.radioButton2.Location = new System.Drawing.Point(174, 3);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(144, 19);
-            this.radioButton2.TabIndex = 1;
-            this.radioButton2.Text = "å…¨ã�¦ã�®è¨­å®šæ‹…å½“";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            // 
-            // radioButton1
-            // 
-            this.radioButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Checked = true;
-            this.radioButton1.ForeColor = System.Drawing.Color.Black;
-            this.radioButton1.Location = new System.Drawing.Point(23, 3);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(144, 19);
-            this.radioButton1.TabIndex = 0;
-            this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "å·¥äº‹æ‹…å½“è€…ã�®ã�¿";
-            this.radioButton1.UseVisualStyleBackColor = true;
-            // 
             // pnlPayroll
             // 
             this.pnlPayroll.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.pnlPayroll.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlPayroll.Controls.Add(this.pnlSelect);
             this.pnlPayroll.Controls.Add(this.label6);
             this.pnlPayroll.Controls.Add(this.label8);
             this.pnlPayroll.Controls.Add(this.label9);
@@ -502,9 +339,47 @@
             this.pnlPayroll.Controls.Add(this.lblPayroll);
             this.pnlPayroll.Location = new System.Drawing.Point(6, 37);
             this.pnlPayroll.Name = "pnlPayroll";
-            this.pnlPayroll.Size = new System.Drawing.Size(1318, 84);
+            this.pnlPayroll.Size = new System.Drawing.Size(1318, 104);
             this.pnlPayroll.TabIndex = 47;
             // 
+            // pnlSelect
+            // 
+            this.pnlSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlSelect.BackColor = System.Drawing.Color.PaleGoldenrod;
+            this.pnlSelect.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlSelect.Controls.Add(this.radioButton2);
+            this.pnlSelect.Controls.Add(this.radioButton1);
+            this.pnlSelect.Location = new System.Drawing.Point(994, 53);
+            this.pnlSelect.Name = "pnlSelect";
+            this.pnlSelect.Size = new System.Drawing.Size(316, 26);
+            this.pnlSelect.TabIndex = 48;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.ForeColor = System.Drawing.Color.Black;
+            this.radioButton2.Location = new System.Drawing.Point(162, 3);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(144, 19);
+            this.radioButton2.TabIndex = 1;
+            this.radioButton2.Text = "å…¨ã�¦ã�®è¨­å®šæ‹…å½“";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Checked = true;
+            this.radioButton1.ForeColor = System.Drawing.Color.Black;
+            this.radioButton1.Location = new System.Drawing.Point(10, 3);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(144, 19);
+            this.radioButton1.TabIndex = 0;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "å·¥äº‹æ‹…å½“è€…ã�®ã�¿";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
             // label6
             // 
             this.label6.BackColor = System.Drawing.Color.Ivory;
@@ -563,7 +438,7 @@
             this.label11.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.label11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(645, 34);
+            this.label11.Location = new System.Drawing.Point(645, 32);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(25, 16);
             this.label11.TabIndex = 48;
@@ -628,7 +503,7 @@
             this.label16.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.label16.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label16.ForeColor = System.Drawing.Color.Black;
-            this.label16.Location = new System.Drawing.Point(645, 59);
+            this.label16.Location = new System.Drawing.Point(645, 57);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(25, 16);
             this.label16.TabIndex = 31;
@@ -654,11 +529,11 @@
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label18.ForeColor = System.Drawing.Color.Red;
-            this.label18.Location = new System.Drawing.Point(942, 59);
+            this.label18.Location = new System.Drawing.Point(686, 80);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(345, 19);
             this.label18.TabIndex = 55;
-            this.label18.Text = "â€»å½“æœŸäººä»¶è²»ã�®ã�Šã�Šã‚ˆã��ã�®è¨ˆç®—ã�§ã�™";
+            this.label18.Text = "â€»å½“æœŸäººä»¶è²»ã�¯ã�Šã�Šã‚ˆã��ã�®è¨ˆç®—ã�§ã�™";
             // 
             // label19
             // 
@@ -718,7 +593,7 @@
             this.label24.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.label24.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label24.ForeColor = System.Drawing.Color.Black;
-            this.label24.Location = new System.Drawing.Point(338, 34);
+            this.label24.Location = new System.Drawing.Point(338, 32);
             this.label24.Name = "label24";
             this.label24.Size = new System.Drawing.Size(25, 16);
             this.label24.TabIndex = 31;
@@ -731,7 +606,7 @@
             this.label25.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.label25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label25.ForeColor = System.Drawing.Color.Black;
-            this.label25.Location = new System.Drawing.Point(338, 59);
+            this.label25.Location = new System.Drawing.Point(338, 57);
             this.label25.Name = "label25";
             this.label25.Size = new System.Drawing.Size(25, 16);
             this.label25.TabIndex = 47;
@@ -966,21 +841,209 @@
             this.label7.Text = "ç¬¬";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // btnHelp
+            // btnStageUp
             // 
-            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnHelp.BackColor = System.Drawing.Color.Black;
-            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1309, 0);
-            this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Size = new System.Drawing.Size(30, 30);
-            this.btnHelp.TabIndex = 113;
-            this.btnHelp.TabStop = false;
-            this.btnHelp.Text = "ï¼Ÿ";
-            this.btnHelp.UseVisualStyleBackColor = false;
-            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            this.btnStageUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnStageUp.BackColor = System.Drawing.Color.White;
+            this.btnStageUp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnStageUp.ForeColor = System.Drawing.Color.Black;
+            this.btnStageUp.Image = ((System.Drawing.Image)(resources.GetObject("btnStageUp.Image")));
+            this.btnStageUp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnStageUp.Location = new System.Drawing.Point(5, 621);
+            this.btnStageUp.Name = "btnStageUp";
+            this.btnStageUp.Size = new System.Drawing.Size(120, 32);
+            this.btnStageUp.TabIndex = 130;
+            this.btnStageUp.Text = "ã€€ä¸Šã�«æˆ»ã‚‹";
+            this.btnStageUp.UseVisualStyleBackColor = false;
+            this.btnStageUp.Visible = false;
+            this.btnStageUp.Click += new System.EventHandler(this.btnStageUp_Click);
             // 
+            // Column1
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "â„–";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 50;
+            // 
+            // Column13
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column13.DefaultCellStyle = dataGridViewCellStyle4;
+            this.Column13.Frozen = true;
+            this.Column13.HeaderText = "æ¸ˆ";
+            this.Column13.Name = "Column13";
+            this.Column13.ReadOnly = true;
+            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column13.Width = 30;
+            // 
+            // Column14
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column14.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column14.Frozen = true;
+            this.Column14.HeaderText = "éƒ¨ç½²";
+            this.Column14.Name = "Column14";
+            this.Column14.ReadOnly = true;
+            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column2
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column2.Frozen = true;
+            this.Column2.HeaderText = "æ‹…å½“è€…å��";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Visible = false;
+            this.Column3.Width = 5;
+            // 
+            // Column4
+            // 
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column4.Frozen = true;
+            this.Column4.HeaderText = "å·¥äº‹å��ç§°";
+            this.Column4.Name = "Column4";
+            this.Column4.ReadOnly = true;
+            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column4.Width = 210;
+            // 
+            // Column15
+            // 
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column15.DefaultCellStyle = dataGridViewCellStyle9;
+            this.Column15.Frozen = true;
+            this.Column15.HeaderText = "çŠ¶ã€€æ…‹";
+            this.Column15.Name = "Column15";
+            this.Column15.ReadOnly = true;
+            this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column5.Frozen = true;
+            this.Column5.HeaderText = "å�—æ³¨é‡‘é¡�";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Width = 120;
+            // 
+            // Column6
+            // 
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle11;
+            this.Column6.HeaderText = "ä¼šç¤¾çµŒè²»";
+            this.Column6.Name = "Column6";
+            this.Column6.ReadOnly = true;
+            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column7
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle12;
+            this.Column7.HeaderText = "éƒ¨ç½²çµŒè²»";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column8
+            // 
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle13;
+            this.Column8.HeaderText = "å–¶æ¥­çµŒè²»";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column9
+            // 
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle14;
+            this.Column9.HeaderText = "ç·�æ”¯æ‰•é¡�";
+            this.Column9.Name = "Column9";
+            this.Column9.ReadOnly = true;
+            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column10
+            // 
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle15;
+            this.Column10.HeaderText = "ç²—ã€€åˆ©";
+            this.Column10.Name = "Column10";
+            this.Column10.ReadOnly = true;
+            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column11
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column11.DefaultCellStyle = dataGridViewCellStyle16;
+            this.Column11.HeaderText = "çµ¦ã€€ä¸Ž";
+            this.Column11.Name = "Column11";
+            this.Column11.ReadOnly = true;
+            this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column11.Visible = false;
+            this.Column11.Width = 5;
+            // 
+            // Column12
+            // 
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle17;
+            this.Column12.HeaderText = "ç´”åˆ©ç›Š";
+            this.Column12.Name = "Column12";
+            this.Column12.ReadOnly = true;
+            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column16
+            // 
+            this.Column16.HeaderText = "Key1";
+            this.Column16.Name = "Column16";
+            this.Column16.ReadOnly = true;
+            this.Column16.Visible = false;
+            // 
+            // Column17
+            // 
+            this.Column17.HeaderText = "Key2";
+            this.Column17.Name = "Column17";
+            this.Column17.ReadOnly = true;
+            this.Column17.Visible = false;
+            // 
+            // Column18
+            // 
+            this.Column18.HeaderText = "Key3";
+            this.Column18.Name = "Column18";
+            this.Column18.ReadOnly = true;
+            this.Column18.Visible = false;
+            // 
             // FrmLedgerList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -988,6 +1051,7 @@
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1340, 657);
+            this.Controls.Add(this.btnStageUp);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.ProgressBar);
             this.Controls.Add(this.btnLedgerStatus);
@@ -1011,10 +1075,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
+            this.pnlPayroll.ResumeLayout(false);
+            this.pnlPayroll.PerformLayout();
             this.pnlSelect.ResumeLayout(false);
             this.pnlSelect.PerformLayout();
-            this.pnlPayroll.ResumeLayout(false);
-            this.pnlPayroll.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -1068,6 +1132,12 @@
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Button btnLedgerStatus;
         private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.Panel pnlSelect;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.Button btnStageUp;
+        private System.Windows.Forms.Button btnReLoadData;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
@@ -1083,9 +1153,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
-        private System.Windows.Forms.Panel pnlSelect;
-        private System.Windows.Forms.RadioButton radioButton2;
-        private System.Windows.Forms.RadioButton radioButton1;
-        private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column16;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column17;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column18;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.resx	(revision 483)
@@ -162,4 +162,25 @@
   <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnStageUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVDhP7ZI9
+        zkRQFIY1EpVeIxKFDahZgEql19uAfUgswRLEClQqvcRPIiQKUWnu5J45904MZsg35fckrzjHe5+QEMiP
+        +Rf+nZ0wyzKiqipO99kIx3EkgiBA0jTF7T02QiZj6fsen1yHC3Vd3wlp7gInbNs+lNGIogjFM+q6hl4Q
+        BDCDcBgGGCiSJEFhmiaY53kmy7LA/RFRFEHfcRyYd99kWRYUkiTBzWfom9F+GIYw74RxHENBlmXcfIZ2
+        adq2fc5wfYOVXNfFzTGGYUBP0zTcnAjLsuRS0zRx+6JpGqIoCu+s64pPToSUoij4ARYqf991XYcnnpwK
+        GZ7n7SQ0vu9jY8tXIaOqKpLnOf+dzrgsvMqPhYQ8AEeNfa7rogIhAAAAAElFTkSuQmCC
+</value>
+  </data>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 483)
@@ -359,7 +359,11 @@
         /// <summary>
         /// ƒOƒŠƒbƒh�sƒf�[ƒ^ƒZƒbƒg
         /// </summary>
-        private void GridDataSet(ArrayList wrkArray, ref int ino, ref long[] TotalArea, ref bool initFlg, ref int StatusFlg)
+        private void GridDataSet(List<object[]> wrkArray
+                                    , ref int ino
+                                    , ref long[] TotalArea
+                                    , ref bool initFlg
+                                    , ref int StatusFlg)
         {
             try
             {
@@ -392,14 +396,17 @@
                 string strStatus = CommonDefine.ProjectsStatus[CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionStatusflg])];
 
                 // �s�ì�¬‚ÆŒo”ï‚æ‚è‘O‚Ìƒf�[ƒ^‚ðƒZƒbƒg‚·‚é
-                int RowCnt = dgv.Rows.Add((ino++)
-                                    , FlgString
-                                    , CommonMotions.cnvString(objwrk[(int)DBGetData.DepartmentString])
-                                    , objwrk[(int)DBGetData.CreatorName].ToString()
-                                    , CommonMotions.cnvStringCodeFromInt(CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]), "-", 8)
-                                    , objwrk[(int)DBGetData.DetailString].ToString()
-                                    , strStatus
-                                    , CommonMotions.cnvInt(objwrk[(int)DBGetData.OrdersDecisionPrice]).ToString("#,0"));
+                int RowCnt = dgv.Rows.Add(1);
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.No].Value = (ino++);                                                                     //  1:‡‚
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.ComplateFlg].Value = FlgString;                                                          //  2:�Ïƒtƒ‰ƒO
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.Department].Value = CommonMotions.cnvString(objwrk[(int)DBGetData.DepartmentString]);    //  3:•”��
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.PersonName].Value = objwrk[(int)DBGetData.CreatorName].ToString();                       //  4:’S“–ŽÒ–¼
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionCode].Value =
+                                    CommonMotions.cnvStringCodeFromInt(CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]), "-", 8);  //  5:�HŽ–ƒR�[ƒh
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = objwrk[(int)DBGetData.DetailString].ToString();                   //  6:�HŽ––¼�Ì
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.ConstructionStatus].Value = strStatus;                                                   //  7:�HŽ–�i’»�ó‘Ô
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.OrdersDecisionPrice].Value =
+                                    CommonMotions.cnvInt(objwrk[(int)DBGetData.OrdersDecisionPrice]).ToString("#,0");                           //  8:Žó’�‹àŠz
 
                 // ƒOƒŠƒbƒhŒã”¼‚ðƒZƒbƒg‚·‚é
                 dgv.Rows[RowCnt].Cells[CalcLatterPoint((int)DCLatterHalf.TotalPayment)].Value = CommonMotions.cnvInt(objwrk[(int)DBGetData.TotalPayment]).ToString("#,0");
@@ -829,6 +836,7 @@
                 ProgressBar.Minimum = 0;
                 ProgressBar.Value = 0;
 
+                btnStageUp.Visible = !bDisp;
                 btnEnd.Visible = !bDisp;
                 //btnLedgerStatus.Visible = !bDisp;
 
@@ -836,6 +844,12 @@
                 cmbDepartment.Enabled = !bDisp;
                 cmbConstructionPerson.Enabled = !bDisp;
 
+                // ‘S‘Î�Û•\Ž¦Žž‚Í�ã‚É�ã‚ª‚éƒ{ƒ^ƒ“‚ð•\Ž¦‚µ‚È‚¢
+                if (!bDisp && GetDepartmentCode() > 0)
+                    btnStageUp.Visible = true;
+                else
+                    btnStageUp.Visible = false;
+
                 this.Update();
             }
             catch (Exception ex)
@@ -845,6 +859,102 @@
         }
         #endregion
 
+        #region ‘Î�Û‘ä’ �HŽ–‚ðŽæ“¾‚·‚é
+        /// <summary>
+        /// ‘Î�Û‘ä’ �HŽ–‚ðŽæ“¾‚·‚é
+        /// </summary>
+        private void GetTargetConstructionList(ArrayList arData, bool bGoing, ref List<int> ConstrCodeList)
+        {
+            try
+            {
+                int nCompFlg = -1;
+                if (bGoing)
+                    nCompFlg = (int)ConstructionLedger.CompFlagDef.Operateing;
+                else
+                    nCompFlg = (int)ConstructionLedger.CompFlagDef.Complated;
+
+                // ‘Î�Û”²‚«�o‚µ
+                List<object[]> ObjList = arData.Cast<object[]>()
+                                                .Where(x => CommonMotions.cnvInt(x[(int)DBGetData.ComplateFlg]) == nCompFlg)
+                                                .ToList();
+
+                // �d•¡‚µ‚È‚¢�HŽ–”Ô�†‚ð”²‚«�o‚·
+                foreach (object[] objwrk in ObjList)
+                {
+                    int nWrkCode = CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]);
+                    if (ConstrCodeList.Exists(x => x == nWrkCode)) continue;
+
+                    ConstrCodeList.Add(nWrkCode);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region Ž{�H’†�EŠ®—¹�Ï‚Ý‚Ì–¾�×�E�‡Œv‚ð•\Ž¦‚·‚é
+        /// <summary>
+        /// Ž{�H’†�EŠ®—¹�Ï‚Ý‚Ì–¾�×�E�‡Œv‚ð•\Ž¦‚·‚é
+        /// </summary>
+        private void DispDetailData(ArrayList arData
+                                    , List<int> ConstrCodeList
+                                    , int TotalTileNo
+                                    , ref int ino
+                                    , ref int StatusFlg
+                                    , ref bool initFlg
+                                    , ref long[] TotalArea)
+        {
+            try
+            {
+                DataGridViewEX dgv = dgvMaster;
+                ProgressBar prgber = ProgressBar;
+
+                // ‘Î�Û�HŽ–”Ô�†Žæ“¾
+                List<object[]> CurDataList = new List<object[]>();
+                foreach (int CurCode in ConstrCodeList)
+                {
+                    CurDataList.Clear();
+                    // ‘Î�Ûƒf�[ƒ^Žæ“¾
+                    CurDataList = arData.Cast<object[]>().Where(x => CommonMotions.cnvInt(x[(int)DBGetData.ConstructionCode]) == CurCode)
+                                                            .OrderBy(y => CommonMotions.cnvInt(y[(int)DBGetData.ExpDisplayOrder]))
+                                                            .ToList();
+
+                    // ƒOƒŠƒbƒh‚Öƒf�[ƒ^•\Ž¦
+                    GridDataSet(CurDataList, ref ino, ref TotalArea, ref initFlg, ref StatusFlg);
+                }
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
+
+                // �‡Œv�s•\Ž¦
+                int TotalRow = dgv.Rows.Add(1);
+                dgv.Rows[TotalRow].Cells[(int)DispColumn.No].Value = s_TotalTitleArray[TotalTileNo];
+                dgv.Rows[TotalRow].Cells[(int)DispColumn.SelectionCode].Value = "*";
+                // �s‚Ì�F‚ð•Ï‚¦‚é
+                SetRowColor(dgv.Rows[TotalRow], s_RowTotalBackColor, s_RowTotalForeColor);
+
+                // �”’l•\Ž¦
+                for (int i = (int)DCFirstHalf.OrdersDecisionPrice; i < dgv.ColumnCount; i++)
+                {
+                    // ƒwƒbƒ_�[•¶Žš‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î‹ó”’‚É‚·‚é
+                    if (dgv.Columns[i].HeaderText.Length < 1) continue;
+
+                    dgv.Rows[TotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
+                }
+                dgv.Rows.Add();       // ‹ó�s
+
+                prgber.Value++;
+                prgber.Update();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
         /// <summary>
         /// ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
@@ -871,8 +981,8 @@
                 // ƒvƒ�ƒOƒŒƒXƒo�[•\Ž¦�§Œä
                 DisplayControlProgressBar(true);
 
-                // ƒvƒ�ƒOƒŒƒXƒo�[‚ÌMAX‚É“K“–‚É10‚ðƒZƒbƒg‚·‚é
-                prgber.Maximum = 10;
+                // ƒvƒ�ƒOƒŒƒXƒo�[‚ÌMAX‚É“K“–‚É15‚ðƒZƒbƒg‚·‚é
+                prgber.Maximum = 15;
 
                 StringBuilder strSQL = new StringBuilder();
                 // SQL�ì�¬
@@ -899,124 +1009,87 @@
                 int StatusFlg = -1;
                 bool initFlg = true;
                 bool DataExists = false;
-                string strStatus = string.Empty;
+                //string strStatus = string.Empty;
+
                 // ----- Ž{�H’†ƒf�[ƒ^•\Ž¦
-                int nCompFlg = (int)ConstructionLedger.CompFlagDef.Complated;
                 List<int> ConstrCodeList = new List<int>();
-                foreach(object[] objwrk in arData)
-                {
-                    if (CommonMotions.cnvInt(objwrk[(int)DBGetData.ComplateFlg]) == nCompFlg) continue;
+                List<object[]> CurDataList = new List<object[]>();
 
-                    int nWrkCode = CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]);
-                    if (ConstrCodeList.Exists(x => x == nWrkCode)) continue;
+                // ‘Î�Û‘ä’ �HŽ–‚ðŽæ“¾‚·‚é
+                GetTargetConstructionList(arData, true, ref ConstrCodeList);
 
-                    ConstrCodeList.Add(CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]));
-                }
-                if (ConstrCodeList.Count() > 0)
-                {
-                    // ‘Î�Û�HŽ–”Ô�†Žæ“¾
-                    ArrayList CurDataList = new ArrayList();
-                    foreach (int CurCode in ConstrCodeList)
-                    {
-                        // ‘Î�Ûƒf�[ƒ^Žæ“¾
-                        CurDataList.Clear();
-                        foreach (object[] CurRow in arData)
-                        {
-                            if (CommonMotions.cnvInt(CurRow[(int)DBGetData.ConstructionCode]) != CurCode) continue;
-                            CurDataList.Add(CurRow);
-                        }
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
 
-                        // ƒOƒŠƒbƒh‚Öƒf�[ƒ^•\Ž¦
-                        GridDataSet(CurDataList, ref ino, ref TotalArea, ref initFlg, ref StatusFlg);
-                    }
-                    // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
-                    prgber.Value++;
-                    prgber.Update();
+                // ƒf�[ƒ^–³‚µ‚ÍŽŸ‚Ö�i‚Þ
+                if (ConstrCodeList.Count() < 1) goto DispDataProc01;
 
-                    // •\Ž¦ƒf�[ƒ^‚ª‚ ‚é‚©‚Ìƒ`ƒFƒbƒN
-                    // ----- �‡Œv•\Ž¦
-                    //dgv.Rows.Add();       // ‹ó�s
+                // –¾�×�sˆó�ü
+                DispDetailData(arData
+                                , ConstrCodeList
+                                , (int)RowTitleNum.Execution
+                                , ref ino
+                                , ref StatusFlg
+                                , ref initFlg
+                                , ref TotalArea);
 
-                    // �‡Œv�s•\Ž¦
-                    int TotalRow = dgv.Rows.Add(1);
-                    dgv.Rows[TotalRow].Cells[(int)DispColumn.No].Value = s_TotalTitleArray[(int)RowTitleNum.Execution];
-                    dgv.Rows[TotalRow].Cells[(int)DispColumn.SelectionCode].Value = "*";
-                    // �s‚Ì�F‚ð•Ï‚¦‚é
-                    SetRowColor(dgv.Rows[TotalRow], s_RowTotalBackColor, s_RowTotalForeColor);
+                DataExists = true;
 
-                    // �”’l•\Ž¦
-                    for (int i = (int)DCFirstHalf.OrdersDecisionPrice; i < dgv.ColumnCount; i++)
-                    {
-                        // ƒwƒbƒ_�[•¶Žš‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î‹ó”’‚É‚·‚é
-                        if (dgv.Columns[i].HeaderText.Length < 1) continue;
-
-                        dgv.Rows[TotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
-                    }
-                    dgv.Rows.Add();       // ‹ó�s
-
-                    DataExists = true;
-                }
                 // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                 prgber.Value++;
                 prgber.Update();
 
                 // ----- �Ïƒf�[ƒ^•\Ž¦
+                DispDataProc01:
+
                 bool bRowPrint = false;
                 long[] ComplateTotalArea = new long[TotalColCnt];
                 ConstrCodeList.Clear();
-                foreach (object[] objwrk in arData)
-                {
-                    if (CommonMotions.cnvInt(objwrk[(int)DBGetData.ComplateFlg]) != nCompFlg) continue;
+                StatusFlg = -1;
+                initFlg = true;
 
-                    int nWrkCode = CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]);
-                    if (ConstrCodeList.Exists(x => x == nWrkCode)) continue;
+                // ‘Î�Û‘ä’ �HŽ–‚ðŽæ“¾‚·‚é
+                GetTargetConstructionList(arData, false, ref ConstrCodeList);
 
-                    ConstrCodeList.Add(CommonMotions.cnvInt(objwrk[(int)DBGetData.ConstructionCode]));
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
+
+                // ƒf�[ƒ^–³‚µ‚ÍŽŸ‚Ö�i‚Þ
+                if (ConstrCodeList.Count() < 1) goto DispDataProc02;
+
+                // –¾�×�sˆó�ü
+                DispDetailData(arData
+                                , ConstrCodeList
+                                , (int)RowTitleNum.Completed
+                                , ref ino
+                                , ref StatusFlg
+                                , ref initFlg
+                                , ref ComplateTotalArea);
+
+                // �‡Œv‚ð‘��‡Œv‚É‘«‚·
+                for (int i = 0; i < ComplateTotalArea.Length; i++)
+                {
+                    TotalArea[i] += ComplateTotalArea[i];
                 }
-                if (ConstrCodeList.Count() > 0)
-                {
-                    // ‘Î�Û�HŽ–”Ô�†Žæ“¾
-                    ArrayList CurDataList = new ArrayList();
-                    foreach (int CurCode in ConstrCodeList)
-                    {
-                        CurDataList.Clear();
-                        foreach (object[] CurRow in arData)
-                        {
-                            if (CommonMotions.cnvInt(CurRow[(int)DBGetData.ConstructionCode]) != CurCode) continue;
-                            CurDataList.Add(CurRow);
-                        }
 
-                        // ƒOƒŠƒbƒh‚Öƒf�[ƒ^•\Ž¦
-                        GridDataSet(CurDataList, ref ino, ref ComplateTotalArea, ref initFlg, ref StatusFlg);
-                    }
-                    // �‡Œv‚ð‘��‡Œv‚É‘«‚·
-                    for (int i = 0; i < ComplateTotalArea.Length; i++)
-                    {
-                        TotalArea[i] += ComplateTotalArea[i];
-                    }
-                    // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
-                    prgber.Value++;
-                    prgber.Update();
+                bRowPrint = true;
 
-                    // �Ïƒf�[ƒ^‚ª‚ ‚ê‚Î�‡Œv•\Ž¦
-                    //dgv.Rows.Add();       // ‹ó�s
-                    int CompTotalRow = dgv.Rows.Add(1);
-                    dgv.Rows[CompTotalRow].Cells[(int)DispColumn.No].Value = s_TotalTitleArray[(int)RowTitleNum.Completed];
-                    dgv.Rows[CompTotalRow].Cells[(int)DispColumn.SelectionCode].Value = "*";
-                    // �s‚Ì�F‚ð•Ï‚¦‚é
-                    SetRowColor(dgv.Rows[CompTotalRow], s_RowTotalBackColor, s_RowTotalForeColor);
-                    // �”’l•\Ž¦
-                    for (int i = (int)DCFirstHalf.OrdersDecisionPrice; i < dgv.ColumnCount; i++)
-                    {
-                        // ƒwƒbƒ_�[•¶Žš‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î‹ó”’‚É‚·‚é
-                        if (dgv.Columns[i].HeaderText.Length < 1) continue;
+                // ----- �‡Œv�s‚ð•\Ž¦‚·‚é
+                DispDataProc02:
 
-                        dgv.Rows[CompTotalRow].Cells[i].Value = ComplateTotalArea[i].ToString("#,0");
-                    }
-                    dgv.Rows.Add();       // ‹ó�s
+                // ----- •”���o”[ƒf�[ƒ^‚Ì�‡Œv’l‚ð•\Ž¦‚·‚é
+                // �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+                GetCostDataType();
 
-                    bRowPrint = true;
+                // •”���o”[ƒf�[ƒ^Žæ“¾
+                if (GetCostDataOfCompensation())
+                {
+                    // •”��“™�o”[ƒf�[ƒ^•\Ž¦
+                    CreateCostData(ref TotalArea);
                 }
+
                 // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                 prgber.Value++;
                 prgber.Update();
@@ -1060,6 +1133,10 @@
                 List<SalaryClass> ArrarySalary = new List<SalaryClass>();
                 CommonLedgerData.GetElapsedSalaryAll(SalaryDB, (int)numUDConstPro.Value, ref TargetList, ref ArrarySalary);
 
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
+
                 // ‘Î�Û‚ÌŒo”ï‚ðŽæ“¾‚·‚é
                 List<PersonExpensesCost> ArraryCost = new List<PersonExpensesCost>();
                 CommonLedgerData.GetPersonExpensesCostValueAll(CostDB, (int)numUDConstPro.Value, TargetList, ArrarySalary, ref ArraryCost);
@@ -1094,7 +1171,7 @@
 
                 // ‘e—˜
                 TotalArea[CalcLatterPoint((int)DCLatterHalf.GrossProfit)] -= Expenses;                 // ‘e—˜-Œo”ï
-                
+
                 // �ƒ—˜‰v
                 TotalArea[CalcLatterPoint((int)DCLatterHalf.NetProfit)] -= Expenses;                   // �ƒ—˜‰v-Œo”ï
                 TotalArea[CalcLatterPoint((int)DCLatterHalf.NetProfit)] += Auxiliary;                  // �ƒ—˜‰v+•â�•�lŒ�”ï
@@ -1121,6 +1198,16 @@
                 prgber.Value = prgber.Maximum;
                 prgber.Update();
 
+                // ----- ƒAƒbƒvƒ{ƒ^ƒ“•\Ž¦�§Œä
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+                // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int PersonCode = GetConstructionPersonCode();
+                if (DepartmentCode == 0 && PersonCode == 0)
+                    btnStageUp.Visible = false;
+                else
+                    btnStageUp.Visible = true;
+
                 dgvMaster.Focus();
             }
             catch (Exception ex)
@@ -1145,6 +1232,439 @@
         }
         #endregion
 
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+        /// <summary>
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+        /// </summary>
+        private void StageUpProcess()
+        {
+            try
+            {
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+                // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int PersonCode = GetConstructionPersonCode();
+
+                if (DepartmentCode == 0 && PersonCode == 0) return;
+
+                if (DepartmentCode > 0 && PersonCode > 0)
+                {
+                    cmbConstructionPerson.SelectedValue = 0;
+                    return;
+                }
+
+                if (DepartmentCode > 0 && PersonCode == 0)
+                {
+                    cmbDepartment.SelectedValue = 0;
+                    return;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^ƒŠƒXƒg
+        /// <summary>
+        /// �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^ƒŠƒXƒg
+        /// </summary>
+        List<CostDataType> m_CostDataTypeList = new List<CostDataType>();
+        #endregion
+
+        #region �o”[‘Î�ÛŒo”ï‘Î‰žƒ}ƒXƒ^ƒŠƒXƒg
+        /// <summary>
+        /// �o”[‘Î�ÛŒo”ï‘Î‰žƒ}ƒXƒ^ƒŠƒXƒg
+        /// </summary>
+        List<CostDataTargetTypeExpenses> m_CostDataTargetTypeExpensesList = new List<CostDataTargetTypeExpenses>();
+        #endregion
+
+        #region �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+        /// <summary>
+        /// �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+        /// </summary>
+        private void GetCostDataType()
+        {
+            IOMCostDataType TypeDB = new IOMCostDataType();
+            IOMCostDataTargetTypeExpenses TypeExpDB = new IOMCostDataTargetTypeExpenses();
+            try
+            {
+                string strSQL = " Order By CostType, TargetType";
+                TypeDB.SelectAction(strSQL, ref m_CostDataTypeList);
+
+                strSQL = " Order By TargetType, ExpensesCode";
+                TypeExpDB.SelectAction(strSQL, ref m_CostDataTargetTypeExpensesList);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                TypeDB.close(); TypeDB = null;
+                TypeExpDB.close(); TypeExpDB = null;
+            }
+        }
+        #endregion
+
+        #region �‡ŒvŽž•”��“™�o”[ƒf�[ƒ^•\Ž¦
+        /// <summary>
+        /// �‡ŒvŽž•”��“™�o”[ƒf�[ƒ^•\Ž¦
+        /// </summary>
+        private void CreateCostData(ref long[] TotalArea)
+        {
+            try
+            {
+                // �o”[ƒ}ƒXƒ^‚ª–³‚¯‚ê‚Î�ˆ—�‚µ‚È‚¢
+                if (m_CostDataTypeList.Count < 1) return;
+
+                int DispCnt = 0;
+                int StartCode = (int)CostDataOfCompensation.CostTypeDef.Type1;
+                int EndCode = (int)CostDataOfCompensation.CostTypeDef.Type6;
+                for (int ix = StartCode; ix <= EndCode; ix++)
+                {
+                    DispCnt += SetRowCostData(ix, ref TotalArea);
+                }
+
+                // ‹ó�s
+                DataGridViewEX dgv = dgvMaster;
+                if (DispCnt > 0) dgv.Rows.Add(1);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^‚ð�s‚ÉƒZƒbƒg‚·‚é
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^‚ð�s‚ÉƒZƒbƒg‚·‚é
+        /// </summary>
+        private int SetRowCostData(int nCostType, ref long[] TotalArea)
+        {
+            try
+            {
+                int ArrayCnt = Enum.GetNames(typeof(CostDataOfCompensation.TargetTypeDef)).Length;
+                decimal[] decExpenses = new decimal[ArrayCnt];
+                decimal decInData = 0;
+
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+                // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int PersonCode = GetConstructionPersonCode();
+
+                int nTargetType = 0;
+                if (DepartmentCode == 0 && PersonCode == 0)
+                {
+                    // ----- ‘SŽÐ•\Ž¦
+                    nTargetType = (int)CostDataOfCompensation.TargetTypeDef.Company;
+                    // ‰ïŽÐ�WŒv
+                    decInData = m_CostDataList.Where(x => x.CostType == nCostType
+                                                        && x.TargetType == nTargetType)
+                                                .Sum(y => y.EntryPrice);
+
+                    // ”Ì”„Žû“ü‚ÍŒo”ï‚ð�WŒv•\Ž¦‚µ‚È‚¢
+                    if (nCostType != (int)CostDataOfCompensation.CostTypeDef.Type6)
+                    {
+                        for (int ix = (int)CostDataOfCompensation.TargetTypeDef.Construction; ix < ArrayCnt; ix++)
+                        {
+                            decExpenses[ix] = m_CostDataList.Where(x => x.CostType == nCostType && x.TargetCode == ix)
+                                                            .Sum(y => y.EntryPrice);
+                            // Œo”ï‚Í‘S‚Äƒ}ƒCƒiƒX
+                            decExpenses[ix] *= -1;
+                        }
+                    }
+                }
+                else if (DepartmentCode > 0 && PersonCode == 0)
+                {
+                    // ----- •”��•Ê•\Ž¦
+                    nTargetType = (int)CostDataOfCompensation.TargetTypeDef.Department;
+                    // •”���WŒv
+                    decInData = m_CostDataList.Where(x => x.CostType == nCostType
+                                                                && x.TargetType == nTargetType
+                                                                && x.TargetCode == DepartmentCode)
+                                                .Sum(y => y.EntryPrice);
+
+                    // ”Ì”„Žû“ü‚ÍŒo”ï‚ð�WŒv•\Ž¦‚µ‚È‚¢
+                    if (nCostType != (int)CostDataOfCompensation.CostTypeDef.Type6)
+                    {
+                        for (int ix = (int)CostDataOfCompensation.TargetTypeDef.Construction; ix < ArrayCnt; ix++)
+                        {
+                            decExpenses[ix] = m_CostDataList.Where(x => x.CostType == nCostType
+                                                                    && x.TargetType == ix
+                                                                    && x.TargetCode == DepartmentCode)
+                                                            .Sum(y => y.EntryPrice);
+
+                            // •â“U‚Ì‚Ý�HŽ–‚ð‰ÁŽZ‚·‚é
+                            if (ix == (int)CostDataOfCompensation.TargetTypeDef.Construction)
+                            {
+                                decExpenses[ix] += m_CostDataList2.Where(x => x.CostType == nCostType && x.TargetType == ix)
+                                                                .Sum(y => y.EntryPrice);
+                            }
+                            // Œo”ï‚Í‘S‚Äƒ}ƒCƒiƒX
+                            decExpenses[ix] *= -1;
+                        }
+                    }
+                }
+                else
+                {
+                    nTargetType = (int)CostDataOfCompensation.TargetTypeDef.Department;
+                    // ’S“–ŽÒ•Ê•\Ž¦‚Í‘�Žx•¥�E‘e—˜‰v�E�ƒ—˜‰v‚Ì‚Ý•\Ž¦‚·‚é
+                    decInData = m_CostDataList2.Where(x => x.CostType == nCostType).Sum(y => y.EntryPrice);
+                }
+
+                // ƒf�[ƒ^–³‚µ‚Í�ˆ—�‚µ‚È‚¢
+                if (decExpenses.Sum() == 0 && decInData == 0) return 0;
+
+                DataGridViewEX dgv = dgvMaster;
+                int RowIndex = dgv.Rows.Add(1);
+                DataGridViewRow CurRow = dgv.Rows[RowIndex];
+
+                // –¾�×‘Î�ÛŠOƒ}�[ƒN
+                CurRow.Cells[(int)DispColumn.SelectionCode].Value = "*";
+                // ƒ^ƒCƒgƒ‹ƒZƒbƒg
+                CostDataType CurRec = m_CostDataTypeList.Where(x => x.CostType == nCostType && x.TargetType == 0).First();
+                int nindex = CurRec.CostDataTypeName.IndexOf("�i");
+                if (nindex < 0) nindex = CurRec.CostDataTypeName.Length;
+                CurRow.Cells[(int)DCFirstHalf.No].Value = string.Format("�–{0}�–", CurRec.CostDataTypeName.Substring(0, nindex));
+
+                // ŒŸ�õƒL�[�€–Ú‚ðƒZƒbƒg‚·‚é
+                int nKetPo = CalcLatterPoint((int)DCLatterHalf.KeyVal1);
+                CurRow.Cells[nKetPo].Value = nCostType;
+                nKetPo = CalcLatterPoint((int)DCLatterHalf.KeyVal2);
+                CurRow.Cells[nKetPo].Value = nTargetType;
+                nKetPo = CalcLatterPoint((int)DCLatterHalf.KeyVal3);
+                CurRow.Cells[nKetPo].Value = DepartmentCode;
+
+                // �s‚Ì�F‚ð•Ï‚¦‚é
+                SetRowColor(CurRow, Color.DarkSlateGray, Color.WhiteSmoke);
+
+                // Œo”ï‚ÉŒv�ã‚·‚é
+                int nPoint = 0;
+                int GridFirstCnt = Enum.GetNames(typeof(DCFirstHalf)).Length - 1;
+                for (int ix = (int)CostDataOfCompensation.TargetTypeDef.Construction; ix < ArrayCnt; ix++)
+                {
+                    int nIndex = m_CostDataTargetTypeExpensesList.Where(x => x.CostType == nCostType && x.TargetType == ix).First().ExpensesCode;
+                    nPoint = GridFirstCnt + nIndex;
+
+                    // ‹àŠz•\Ž¦
+                    decimal decEx = CommonMotions.cnvDecimal(CurRow.Cells[nPoint].Value);
+                    CurRow.Cells[nPoint].Value = (decEx + decExpenses[ix]).ToString("#,#");
+                    // ‘��‡Œv‰ÁŽZ
+                    TotalArea[nPoint] += (long)decExpenses[ix];
+                }
+                bool[] bDisp = new bool[] { false, false, false };
+                // ”Ì”„Žû“ü‚Í‘�Žx•¥Šz‚ð•\Ž¦‚µ‚È‚¢
+                switch (nCostType)
+                {
+                    case (int)CostDataOfCompensation.CostTypeDef.Type1:     // 1:•â“U
+                        bDisp[0] = true;
+                        bDisp[1] = true;
+                        bDisp[2] = true;
+                        break;
+                    case (int)CostDataOfCompensation.CostTypeDef.Type2:     // 2:�w“ü
+                    case (int)CostDataOfCompensation.CostTypeDef.Type3:     // 3:‘ä’ •Â�½�HŽ–
+                    case (int)CostDataOfCompensation.CostTypeDef.Type4:     // 4:Ž©ŽÐ�HŽ–
+                    case (int)CostDataOfCompensation.CostTypeDef.Type5:     // 5:àêár�HŽ–
+                        break;
+                    case (int)CostDataOfCompensation.CostTypeDef.Type6:     // 6:”Ì”„
+                        bDisp[1] = true;
+                        bDisp[2] = true;
+                        break;
+                    default:
+                        break;
+                }
+
+                decimal decWk = 0;
+                if (bDisp[0])
+                {
+                    // ----- ‘�Žx•¥Šz
+                    decWk = CostDataOfCompensation.GetPublicCostData(nCostType, decInData);             // ƒf�[ƒ^ƒZƒbƒg
+                    nPoint = CalcLatterPoint((int)DCLatterHalf.TotalPayment);                           // ˆÊ’uŽæ“¾
+                    CurRow.Cells[nPoint].Value = decWk.ToString("#,#");                                 // ‹àŠz•\Ž¦
+                    TotalArea[nPoint] += (long)decWk;                                                   // ‘��‡Œv‰ÁŽZ
+                }
+                if (bDisp[1])
+                {
+                    // ----- ‘e—˜Šz
+                    decWk = CostDataOfCompensation.GetPublicCostData(nCostType, decInData, false);      // ƒf�[ƒ^ƒZƒbƒg
+                    nPoint = CalcLatterPoint((int)DCLatterHalf.GrossProfit);                            // ˆÊ’uŽæ“¾
+                    CurRow.Cells[nPoint].Value = decWk.ToString("#,#");                                 // ‹àŠz•\Ž¦
+                    TotalArea[nPoint] += (long)decWk;                                                   // ‘��‡Œv‰ÁŽZ
+                }
+                if (bDisp[2])
+                {
+                    // ----- �ƒ—˜Šz
+                    decWk = CostDataOfCompensation.GetPublicCostData(nCostType, decInData, false);      // ƒf�[ƒ^ƒZƒbƒg
+                    nPoint = CalcLatterPoint((int)DCLatterHalf.NetProfit);                              // ˆÊ’uŽæ“¾
+                    CurRow.Cells[nPoint].Value = decWk.ToString("#,#");                                 // ‹àŠz•\Ž¦
+                    TotalArea[nPoint] += (long)decWk;                                                   // ‘��‡Œv‰ÁŽZ
+                }
+
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^Žæ“¾ƒGƒŠƒA
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^Žæ“¾ƒGƒŠƒA
+        /// </summary>
+        List<CostDataOfCompensation> m_CostDataList = new List<CostDataOfCompensation>();
+        List<CostDataOfCompensation> m_CostDataList2 = new List<CostDataOfCompensation>();
+
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^Žæ“¾
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^Žæ“¾
+        /// </summary>
+        private bool GetCostDataOfCompensation()
+        {
+            IOCostDataOfCompensation CostDB = new IOCostDataOfCompensation();
+            try
+            {
+                // �o”[ƒ}ƒXƒ^‚ª–³‚¯‚ê‚Î�ˆ—�‚µ‚È‚¢
+                if (m_CostDataTypeList.Count < 1) return true;
+
+                m_CostDataList.Clear();
+                m_CostDataList2.Clear();
+          
+                // ‘Î�Û”N
+                int nTargetYear = (int)numUDConstPro.Value;
+                // ‘Î�Ûƒf�[ƒ^Žæ“¾
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(CostDB.CreatePrimarykeyString(nTargetYear));
+                if (!CostDB.SelectAction(strSQL.ToString(), ref m_CostDataList)) return false;
+
+                int nDepCode = GetDepartmentCode();
+                int nManCode = GetConstructionPersonCode();
+                if (nDepCode < 1)
+                {
+
+                }
+                else
+                {
+                    if (GetConstructionPersonCode() < 1)
+                    {
+                        // •”��‚Ì‘Î�Û�HŽ–‚ðŽæ“¾‚·‚é
+                        CostDataToDepartment(CostDB);
+                    }
+                    else
+                    {
+                        // ’S“–ŽÒ‚Ì‘Î�Û�HŽ–‚Ì‚Ý‚ðŽæ“¾‚·‚é
+                        CostDataOfConstruction(CostDB);
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                CostDB.close(); CostDB = null;
+            }
+        }
+        #endregion
+
+        #region •”���WŒvŽž�HŽ–ƒf�[ƒ^‚ðŽæ“¾‚·‚é
+        /// <summary>
+        /// •”���WŒvŽž�HŽ–ƒf�[ƒ^‚ðŽæ“¾‚·‚é
+        /// </summary>
+        private void CostDataToDepartment(IOCostDataOfCompensation CostDB)
+        {
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+
+                int nTargetYear = (int)numUDConstPro.Value; // ‘Î�Û”N
+                int DepartmentCode = GetDepartmentCode();   // •”��ƒR�[ƒh
+
+                // •”��‘I‘ðŽžˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (GetDepartmentCode() < 1) return;
+
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.*");
+                strSQL.Append(" FROM costdataofcompensation As A");
+                strSQL.Append("  Inner Join constructionbaseinfo As B");
+                strSQL.Append("        On B.ConstructionCode = A.TargetCode");
+                strSQL.AppendFormat(" WHERE A.YearNumber = {0}", nTargetYear);
+                strSQL.AppendFormat(" And A.TargetType = {0}", (int)CostDataOfCompensation.TargetTypeDef.Construction);
+                strSQL.AppendFormat(" And B.ConstrDepCode = {0}", DepartmentCode);
+
+                ArrayList ArData = new ArrayList();
+                if (!CostDB.ExecuteReader(strSQL.ToString(), ref ArData)) return;
+
+                foreach (object[] ObjRec in ArData)
+                {
+                    CostDataOfCompensation work = new CostDataOfCompensation();
+                    CostDB.Reader2Struct(ObjRec, ref work);
+
+                    m_CostDataList2.Add(work);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ’S“–ŽÒ‚Ì‘Î�Û�HŽ–‚Ì‚Ý‚ðŽæ“¾‚·‚é
+        /// <summary>
+        /// ’S“–ŽÒ‚Ì‘Î�Û�HŽ–‚Ì‚Ý‚ðŽæ“¾‚·‚é
+        /// </summary>
+        private void CostDataOfConstruction(IOCostDataOfCompensation CostDB)
+        {
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+
+                int nTargetYear = (int)numUDConstPro.Value; // ‘Î�Û”N
+                int DepartmentCode = GetDepartmentCode();   // •”��ƒR�[ƒh
+
+                // ’S“–ŽÒ‘I‘ðŽžˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                int nPersonCode = GetConstructionPersonCode();
+                if (nPersonCode < 1) return;
+
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.*");
+                strSQL.Append(" FROM costdataofcompensation As A");
+                strSQL.Append("  Inner Join constructionbaseinfo As B");
+                strSQL.Append("        On B.ConstructionCode = A.TargetCode");
+                strSQL.AppendFormat(" WHERE A.YearNumber = {0}", nTargetYear);
+                strSQL.AppendFormat(" And A.TargetType = {0}", (int)CostDataOfCompensation.TargetTypeDef.Construction);
+                strSQL.AppendFormat(" And B.ConstructionPersonCode = {0}", nPersonCode);
+                ArrayList ArData = new ArrayList();
+                if (!CostDB.ExecuteReader(strSQL.ToString(), ref ArData)) return;
+
+                foreach (object[] ObjRec in ArData)
+                {
+                    CostDataOfCompensation work = new CostDataOfCompensation();
+                    CostDB.Reader2Struct(ObjRec, ref work);
+
+                    m_CostDataList2.Add(work);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ‚c‚aŽæ“¾�‡”Ô
         /// <summary>
         /// ‚c‚aŽæ“¾�‡”Ô
@@ -2128,11 +2648,13 @@
         }
         #endregion
 
+        #region Žx•¥—“�ì�¬ƒGƒŠƒA
         /// <summary>
         /// Žx•¥—“�ì�¬ƒGƒŠƒA
         /// </summary>
         private List<DataGridViewColumn> m_GridExpColList = new List<DataGridViewColumn>();
         private List<DataGridViewCellStyle> m_GridExpCellStyleList = new List<DataGridViewCellStyle>();
+        #endregion
         #region ƒOƒŠƒbƒh‚ÉŒo”ï—“‚ð�ì�¬‚·‚é
         /// <summary>
         /// ƒOƒŠƒbƒh‚ÉŒo”ï—“‚ð�ì�¬‚·‚é
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.cs	(revision 483)
@@ -201,7 +201,7 @@
         /// <param name="e"></param>
         private async void FrmCopyTargetList_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
 
             InitFormLoad();
         }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.Designer.cs	(revision 483)
@@ -28,30 +28,30 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle 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();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnLineDel = new System.Windows.Forms.Button();
             this.btnLineAdd = new System.Windows.Forms.Button();
@@ -76,7 +76,6 @@
             this.btnWorkingList = new System.Windows.Forms.Button();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label6 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
@@ -89,6 +88,7 @@
             this.label4 = new System.Windows.Forms.Label();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.button12 = new System.Windows.Forms.Button();
             this.button11 = new System.Windows.Forms.Button();
             this.button9 = new System.Windows.Forms.Button();
             this.button7 = new System.Windows.Forms.Button();
@@ -104,25 +104,6 @@
             this.label13 = new System.Windows.Forms.Label();
             this.label48 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.label89 = new System.Windows.Forms.Label();
             this.label80 = new System.Windows.Forms.Label();
@@ -212,6 +193,29 @@
             this.label24 = new System.Windows.Forms.Label();
             this.label25 = new System.Windows.Forms.Label();
             this.label55 = new System.Windows.Forms.Label();
+            this.lblCellTotal = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.btnHelp = new System.Windows.Forms.Button();
+            this.btnNoneDisp = new System.Windows.Forms.Button();
+            this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvTransport02 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -225,10 +229,6 @@
             this.Column14 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewCheckBoxColumn3 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dgvTransport01 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.lblCellTotal = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.btnHelp = new System.Windows.Forms.Button();
-            this.btnNoneDisp = new System.Windows.Forms.Button();
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -240,13 +240,14 @@
             this.Column11 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewCheckBoxColumn7 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.panel3.SuspendLayout();
             this.pnlApproval.SuspendLayout();
             this.pnlApprovalButton.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
-            this.tabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvTransport02)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvTransport01)).BeginInit();
             this.SuspendLayout();
@@ -580,18 +581,6 @@
             this.label3.Text = "æ‹… å½“ è€…";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(121, 3);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(150, 27);
-            this.comboBox1.TabIndex = 0;
-            this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
-            // 
             // label6
             // 
             this.label6.BackColor = System.Drawing.Color.SandyBrown;
@@ -732,6 +721,7 @@
             // tabPage1
             // 
             this.tabPage1.BackColor = System.Drawing.Color.Black;
+            this.tabPage1.Controls.Add(this.button12);
             this.tabPage1.Controls.Add(this.button11);
             this.tabPage1.Controls.Add(this.button9);
             this.tabPage1.Controls.Add(this.button7);
@@ -755,6 +745,22 @@
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "å‡ºå‹¤æ—¥å ±";
             // 
+            // button12
+            // 
+            this.button12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.button12.BackColor = System.Drawing.Color.Gold;
+            this.button12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.button12.ForeColor = System.Drawing.Color.Black;
+            this.button12.Location = new System.Drawing.Point(1003, 471);
+            this.button12.Name = "button12";
+            this.button12.Size = new System.Drawing.Size(40, 28);
+            this.button12.TabIndex = 143;
+            this.button12.TabStop = false;
+            this.button12.Text = "ç‰¹æ®Šä¼‘";
+            this.button12.UseVisualStyleBackColor = false;
+            this.button12.Visible = false;
+            this.button12.Click += new System.EventHandler(this.Kindbutton_Click);
+            // 
             // button11
             // 
             this.button11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -928,7 +934,7 @@
             this.label14.BackColor = System.Drawing.Color.White;
             this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label14.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label14.Location = new System.Drawing.Point(1248, 469);
+            this.label14.Location = new System.Drawing.Point(1248, 472);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(70, 27);
             this.label14.TabIndex = 137;
@@ -941,7 +947,7 @@
             this.label13.BackColor = System.Drawing.Color.White;
             this.label13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label13.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label13.Location = new System.Drawing.Point(1178, 469);
+            this.label13.Location = new System.Drawing.Point(1178, 472);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(70, 27);
             this.label13.TabIndex = 137;
@@ -969,7 +975,7 @@
             this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(1078, 469);
+            this.label5.Location = new System.Drawing.Point(1078, 472);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(100, 27);
             this.label5.TabIndex = 130;
@@ -976,244 +982,6 @@
             this.label5.Text = "æ™‚é–“å¤–å�ˆè¨ˆ";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dgvAllDisplay
-            // 
-            this.dgvAllDisplay.AllowUserToAddRows = false;
-            this.dgvAllDisplay.AllowUserToDeleteRows = false;
-            this.dgvAllDisplay.AllowUserToResizeRows = false;
-            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
-            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvAllDisplay.ColumnHeadersHeight = 30;
-            this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column1,
-            this.Column4,
-            this.Column3,
-            this.Column23,
-            this.Column24,
-            this.Column16,
-            this.Column2,
-            this.Column17,
-            this.Column15,
-            this.Column5,
-            this.Column8,
-            this.Column7,
-            this.Column20,
-            this.Column21,
-            this.Column6,
-            this.Column18,
-            this.Column19,
-            this.Column22});
-            this.dgvAllDisplay.EnableHeadersVisualStyles = false;
-            this.dgvAllDisplay.Location = new System.Drawing.Point(8, 4);
-            this.dgvAllDisplay.Name = "dgvAllDisplay";
-            this.dgvAllDisplay.RowHeadersVisible = false;
-            this.dgvAllDisplay.RowHeadersWidth = 20;
-            this.dgvAllDisplay.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvAllDisplay.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.dgvAllDisplay.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Black;
-            this.dgvAllDisplay.RowTemplate.Height = 24;
-            this.dgvAllDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvAllDisplay.Size = new System.Drawing.Size(1310, 464);
-            this.dgvAllDisplay.TabIndex = 37;
-            this.dgvAllDisplay.TabStop = false;
-            this.dgvAllDisplay.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellDoubleClick);
-            this.dgvAllDisplay.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter);
-            this.dgvAllDisplay.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValidated);
-            this.dgvAllDisplay.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValueChanged);
-            this.dgvAllDisplay.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvAllDisplay_MouseUp);
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "æ—¥ä»˜";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 60;
-            // 
-            // Column4
-            // 
-            this.Column4.Frozen = true;
-            this.Column4.HeaderText = "å†…éƒ¨æ—¥ä»˜";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column4.Visible = false;
-            this.Column4.Width = 5;
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "æ›œæ—¥";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 80;
-            // 
-            // Column23
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
-            this.Column23.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column23.Frozen = true;
-            this.Column23.HeaderText = "äº¤";
-            this.Column23.Name = "Column23";
-            this.Column23.ReadOnly = true;
-            this.Column23.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column23.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column23.ToolTipText = "äº¤é€šè²»å…¥åŠ›æœ‰";
-            this.Column23.Width = 30;
-            // 
-            // Column24
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
-            this.Column24.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column24.Frozen = true;
-            this.Column24.HeaderText = "å±Š";
-            this.Column24.Name = "Column24";
-            this.Column24.ReadOnly = true;
-            this.Column24.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column24.ToolTipText = "ç”³è«‹ä¸­å±Šæœ‰";
-            this.Column24.Width = 30;
-            // 
-            // Column16
-            // 
-            this.Column16.Frozen = true;
-            this.Column16.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.Column16.Name = "Column16";
-            this.Column16.ReadOnly = true;
-            this.Column16.Visible = false;
-            // 
-            // Column2
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column2.HeaderText = "å‹¤å‹™å†…å®¹ï¼ˆç�¾å ´ï¼‰";
-            this.Column2.Name = "Column2";
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 310;
-            // 
-            // Column17
-            // 
-            this.Column17.HeaderText = "å‹¤å‹™åŒºåˆ†";
-            this.Column17.Name = "Column17";
-            this.Column17.ReadOnly = true;
-            this.Column17.Visible = false;
-            // 
-            // Column15
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column15.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column15.HeaderText = "å‹¤ã€€å‹™";
-            this.Column15.Name = "Column15";
-            this.Column15.ReadOnly = true;
-            this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Column15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column15.Width = 80;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column5.HeaderText = "é–‹å§‹æ™‚é–“";
-            this.Column5.Name = "Column5";
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column8
-            // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle9;
-            this.Column8.HeaderText = "çµ‚äº†æ™‚é–“";
-            this.Column8.Name = "Column8";
-            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column7
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle10;
-            this.Column7.HeaderText = "å‹¤å‹™æ™‚é–“";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column20
-            // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column20.DefaultCellStyle = dataGridViewCellStyle11;
-            this.Column20.HeaderText = "æ™‚é–“å¤–å°±æ¥­";
-            this.Column20.Name = "Column20";
-            this.Column20.ReadOnly = true;
-            this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column21
-            // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
-            this.Column21.DefaultCellStyle = dataGridViewCellStyle12;
-            this.Column21.HeaderText = "æ™‚é–“å¤–èª�å®š";
-            this.Column21.Name = "Column21";
-            this.Column21.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column21.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column6
-            // 
-            this.Column6.HeaderText = "æ™‚é–“å¤–èª�å®šç�†ç”±";
-            this.Column6.Name = "Column6";
-            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 200;
-            // 
-            // Column18
-            // 
-            this.Column18.HeaderText = "ä¼‘æ—¥ãƒ•ãƒ©ã‚°";
-            this.Column18.Name = "Column18";
-            this.Column18.ReadOnly = true;
-            this.Column18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column18.Visible = false;
-            // 
-            // Column19
-            // 
-            this.Column19.HeaderText = "å±Šé †åº�ç•ªå�·";
-            this.Column19.Name = "Column19";
-            this.Column19.Visible = false;
-            // 
-            // Column22
-            // 
-            this.Column22.HeaderText = "æ˜Žç´°ç•ªå�·";
-            this.Column22.Name = "Column22";
-            this.Column22.ReadOnly = true;
-            this.Column22.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column22.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column22.Visible = false;
-            // 
             // tabPage2
             // 
             this.tabPage2.BackColor = System.Drawing.Color.Black;
@@ -2476,6 +2244,297 @@
             this.label55.Text = "å�ˆã€€ã€€è¨ˆ";
             this.label55.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lblCellTotal
+            // 
+            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblCellTotal.AutoSize = true;
+            this.lblCellTotal.BackColor = System.Drawing.Color.Black;
+            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblCellTotal.ForeColor = System.Drawing.Color.White;
+            this.lblCellTotal.Location = new System.Drawing.Point(110, 665);
+            this.lblCellTotal.Name = "lblCellTotal";
+            this.lblCellTotal.Size = new System.Drawing.Size(0, 16);
+            this.lblCellTotal.TabIndex = 143;
+            // 
+            // label18
+            // 
+            this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label18.BackColor = System.Drawing.Color.White;
+            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label18.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label18.Location = new System.Drawing.Point(5, 4);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(60, 27);
+            this.label18.TabIndex = 139;
+            this.label18.Text = "999";
+            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label18.Visible = false;
+            // 
+            // btnHelp
+            // 
+            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnHelp.BackColor = System.Drawing.Color.Black;
+            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHelp.ForeColor = System.Drawing.Color.White;
+            this.btnHelp.Location = new System.Drawing.Point(1313, 0);
+            this.btnHelp.Name = "btnHelp";
+            this.btnHelp.Size = new System.Drawing.Size(30, 30);
+            this.btnHelp.TabIndex = 140;
+            this.btnHelp.TabStop = false;
+            this.btnHelp.Text = "ï¼Ÿ";
+            this.btnHelp.UseVisualStyleBackColor = false;
+            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            // 
+            // btnNoneDisp
+            // 
+            this.btnNoneDisp.BackColor = System.Drawing.Color.Red;
+            this.btnNoneDisp.ForeColor = System.Drawing.Color.White;
+            this.btnNoneDisp.Location = new System.Drawing.Point(71, 5);
+            this.btnNoneDisp.Name = "btnNoneDisp";
+            this.btnNoneDisp.Size = new System.Drawing.Size(33, 21);
+            this.btnNoneDisp.TabIndex = 141;
+            this.btnNoneDisp.Text = "è¦‹ã�ˆã�ªã�„";
+            this.btnNoneDisp.UseVisualStyleBackColor = false;
+            this.btnNoneDisp.Visible = false;
+            // 
+            // dgvAllDisplay
+            // 
+            this.dgvAllDisplay.AllowUserToAddRows = false;
+            this.dgvAllDisplay.AllowUserToDeleteRows = false;
+            this.dgvAllDisplay.AllowUserToResizeRows = false;
+            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
+            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
+            this.dgvAllDisplay.ColumnHeadersHeight = 30;
+            this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column1,
+            this.Column4,
+            this.Column3,
+            this.Column23,
+            this.Column24,
+            this.Column16,
+            this.Column2,
+            this.Column17,
+            this.Column15,
+            this.Column5,
+            this.Column8,
+            this.Column7,
+            this.Column20,
+            this.Column21,
+            this.Column6,
+            this.Column18,
+            this.Column19,
+            this.Column22});
+            this.dgvAllDisplay.EnableHeadersVisualStyles = false;
+            this.dgvAllDisplay.Location = new System.Drawing.Point(8, 4);
+            this.dgvAllDisplay.Name = "dgvAllDisplay";
+            this.dgvAllDisplay.RowHeadersVisible = false;
+            this.dgvAllDisplay.RowHeadersWidth = 20;
+            this.dgvAllDisplay.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvAllDisplay.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.dgvAllDisplay.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Black;
+            this.dgvAllDisplay.RowTemplate.Height = 24;
+            this.dgvAllDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvAllDisplay.Size = new System.Drawing.Size(1310, 464);
+            this.dgvAllDisplay.TabIndex = 37;
+            this.dgvAllDisplay.TabStop = false;
+            this.dgvAllDisplay.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellDoubleClick);
+            this.dgvAllDisplay.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter);
+            this.dgvAllDisplay.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValidated);
+            this.dgvAllDisplay.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValueChanged);
+            this.dgvAllDisplay.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvAllDisplay_MouseUp);
+            // 
+            // Column1
+            // 
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle26;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "æ—¥ä»˜";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 60;
+            // 
+            // Column4
+            // 
+            this.Column4.Frozen = true;
+            this.Column4.HeaderText = "å†…éƒ¨æ—¥ä»˜";
+            this.Column4.Name = "Column4";
+            this.Column4.ReadOnly = true;
+            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column4.Visible = false;
+            this.Column4.Width = 5;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle27;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "æ›œæ—¥";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 80;
+            // 
+            // Column23
+            // 
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle28.ForeColor = System.Drawing.Color.Black;
+            this.Column23.DefaultCellStyle = dataGridViewCellStyle28;
+            this.Column23.Frozen = true;
+            this.Column23.HeaderText = "äº¤";
+            this.Column23.Name = "Column23";
+            this.Column23.ReadOnly = true;
+            this.Column23.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column23.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column23.ToolTipText = "äº¤é€šè²»å…¥åŠ›æœ‰";
+            this.Column23.Width = 30;
+            // 
+            // Column24
+            // 
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle29.ForeColor = System.Drawing.Color.Black;
+            this.Column24.DefaultCellStyle = dataGridViewCellStyle29;
+            this.Column24.Frozen = true;
+            this.Column24.HeaderText = "å±Š";
+            this.Column24.Name = "Column24";
+            this.Column24.ReadOnly = true;
+            this.Column24.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column24.ToolTipText = "ç”³è«‹ä¸­å±Šæœ‰";
+            this.Column24.Width = 30;
+            // 
+            // Column16
+            // 
+            this.Column16.Frozen = true;
+            this.Column16.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.Column16.Name = "Column16";
+            this.Column16.ReadOnly = true;
+            this.Column16.Visible = false;
+            // 
+            // Column2
+            // 
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle30;
+            this.Column2.HeaderText = "å‹¤å‹™å†…å®¹ï¼ˆç�¾å ´ï¼‰";
+            this.Column2.Name = "Column2";
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column2.Width = 310;
+            // 
+            // Column17
+            // 
+            this.Column17.HeaderText = "å‹¤å‹™åŒºåˆ†";
+            this.Column17.Name = "Column17";
+            this.Column17.ReadOnly = true;
+            this.Column17.Visible = false;
+            // 
+            // Column15
+            // 
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column15.DefaultCellStyle = dataGridViewCellStyle31;
+            this.Column15.HeaderText = "å‹¤ã€€å‹™";
+            this.Column15.Name = "Column15";
+            this.Column15.ReadOnly = true;
+            this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Column15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column15.Width = 80;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle32.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle32;
+            this.Column5.HeaderText = "é–‹å§‹æ™‚é–“";
+            this.Column5.Name = "Column5";
+            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column8
+            // 
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle33.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle33;
+            this.Column8.HeaderText = "çµ‚äº†æ™‚é–“";
+            this.Column8.Name = "Column8";
+            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column7
+            // 
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle34.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle34;
+            this.Column7.HeaderText = "å‹¤å‹™æ™‚é–“";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column20
+            // 
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle35.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column20.DefaultCellStyle = dataGridViewCellStyle35;
+            this.Column20.HeaderText = "æ™‚é–“å¤–å°±æ¥­";
+            this.Column20.Name = "Column20";
+            this.Column20.ReadOnly = true;
+            this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column21
+            // 
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle36.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle36.ForeColor = System.Drawing.Color.Black;
+            this.Column21.DefaultCellStyle = dataGridViewCellStyle36;
+            this.Column21.HeaderText = "æ™‚é–“å¤–èª�å®š";
+            this.Column21.Name = "Column21";
+            this.Column21.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column21.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column6
+            // 
+            this.Column6.HeaderText = "æ™‚é–“å¤–èª�å®šç�†ç”±";
+            this.Column6.Name = "Column6";
+            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column6.Width = 200;
+            // 
+            // Column18
+            // 
+            this.Column18.HeaderText = "ä¼‘æ—¥ãƒ•ãƒ©ã‚°";
+            this.Column18.Name = "Column18";
+            this.Column18.ReadOnly = true;
+            this.Column18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column18.Visible = false;
+            // 
+            // Column19
+            // 
+            this.Column19.HeaderText = "å±Šé †åº�ç•ªå�·";
+            this.Column19.Name = "Column19";
+            this.Column19.Visible = false;
+            // 
+            // Column22
+            // 
+            this.Column22.HeaderText = "æ˜Žç´°ç•ªå�·";
+            this.Column22.Name = "Column22";
+            this.Column22.ReadOnly = true;
+            this.Column22.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column22.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column22.Visible = false;
+            // 
             // dgvTransport02
             // 
             this.dgvTransport02.AllowUserToAddRows = false;
@@ -2485,14 +2544,14 @@
             this.dgvTransport02.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.dgvTransport02.BackgroundColor = System.Drawing.Color.White;
             this.dgvTransport02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvTransport02.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle37.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvTransport02.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle37;
             this.dgvTransport02.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvTransport02.ColumnHeadersVisible = false;
             this.dgvTransport02.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -2527,10 +2586,10 @@
             // 
             // dataGridViewTextBoxColumn1
             // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle38.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle38.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle38;
             this.dataGridViewTextBoxColumn1.Frozen = true;
             this.dataGridViewTextBoxColumn1.HeaderText = "æ—¥";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
@@ -2541,9 +2600,9 @@
             // 
             // Column26
             // 
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
-            this.Column26.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle39.ForeColor = System.Drawing.Color.Black;
+            this.Column26.DefaultCellStyle = dataGridViewCellStyle39;
             this.Column26.Frozen = true;
             this.Column26.HeaderText = "å‡º";
             this.Column26.Name = "Column26";
@@ -2562,10 +2621,10 @@
             // 
             // dataGridViewTextBoxColumn2
             // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle40.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle40.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle40;
             this.dataGridViewTextBoxColumn2.Frozen = true;
             this.dataGridViewTextBoxColumn2.HeaderText = "äº‹å‹™æ‰€ç™º";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
@@ -2574,10 +2633,10 @@
             // 
             // dataGridViewTextBoxColumn3
             // 
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle41.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle41.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle41;
             this.dataGridViewTextBoxColumn3.Frozen = true;
             this.dataGridViewTextBoxColumn3.HeaderText = "äº‹å‹™æ‰€ç�€";
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
@@ -2586,10 +2645,10 @@
             // 
             // dataGridViewTextBoxColumn4
             // 
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle42.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle42.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle42;
             this.dataGridViewTextBoxColumn4.Frozen = true;
             this.dataGridViewTextBoxColumn4.HeaderText = "å½“æ—¥è¨ˆ";
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
@@ -2647,14 +2706,14 @@
             this.dgvTransport01.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.dgvTransport01.BackgroundColor = System.Drawing.Color.White;
             this.dgvTransport01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvTransport01.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle43.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvTransport01.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43;
             this.dgvTransport01.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvTransport01.ColumnHeadersVisible = false;
             this.dgvTransport01.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -2687,65 +2746,12 @@
             this.dgvTransport01.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvTransport_CellValueChanged);
             this.dgvTransport01.CurrentCellDirtyStateChanged += new System.EventHandler(this.dgvTransport_CurrentCellDirtyStateChanged);
             // 
-            // lblCellTotal
-            // 
-            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblCellTotal.AutoSize = true;
-            this.lblCellTotal.BackColor = System.Drawing.Color.Black;
-            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblCellTotal.ForeColor = System.Drawing.Color.White;
-            this.lblCellTotal.Location = new System.Drawing.Point(110, 665);
-            this.lblCellTotal.Name = "lblCellTotal";
-            this.lblCellTotal.Size = new System.Drawing.Size(0, 16);
-            this.lblCellTotal.TabIndex = 143;
-            // 
-            // label18
-            // 
-            this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label18.BackColor = System.Drawing.Color.White;
-            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label18.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label18.Location = new System.Drawing.Point(5, 4);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(60, 27);
-            this.label18.TabIndex = 139;
-            this.label18.Text = "999";
-            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label18.Visible = false;
-            // 
-            // btnHelp
-            // 
-            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnHelp.BackColor = System.Drawing.Color.Black;
-            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1313, 0);
-            this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Size = new System.Drawing.Size(30, 30);
-            this.btnHelp.TabIndex = 140;
-            this.btnHelp.TabStop = false;
-            this.btnHelp.Text = "ï¼Ÿ";
-            this.btnHelp.UseVisualStyleBackColor = false;
-            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
-            // 
-            // btnNoneDisp
-            // 
-            this.btnNoneDisp.BackColor = System.Drawing.Color.Red;
-            this.btnNoneDisp.ForeColor = System.Drawing.Color.White;
-            this.btnNoneDisp.Location = new System.Drawing.Point(71, 5);
-            this.btnNoneDisp.Name = "btnNoneDisp";
-            this.btnNoneDisp.Size = new System.Drawing.Size(33, 21);
-            this.btnNoneDisp.TabIndex = 141;
-            this.btnNoneDisp.Text = "è¦‹ã�ˆã�ªã�„";
-            this.btnNoneDisp.UseVisualStyleBackColor = false;
-            this.btnNoneDisp.Visible = false;
-            // 
             // dataGridViewTextBoxColumn5
             // 
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle44.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle44;
             this.dataGridViewTextBoxColumn5.Frozen = true;
             this.dataGridViewTextBoxColumn5.HeaderText = "æ—¥";
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
@@ -2756,9 +2762,9 @@
             // 
             // Column25
             // 
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle21.ForeColor = System.Drawing.Color.Black;
-            this.Column25.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle45.ForeColor = System.Drawing.Color.Black;
+            this.Column25.DefaultCellStyle = dataGridViewCellStyle45;
             this.Column25.Frozen = true;
             this.Column25.HeaderText = "å‡º";
             this.Column25.Name = "Column25";
@@ -2778,10 +2784,10 @@
             // 
             // dataGridViewTextBoxColumn6
             // 
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle46.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle46.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle46;
             this.dataGridViewTextBoxColumn6.Frozen = true;
             this.dataGridViewTextBoxColumn6.HeaderText = "äº‹å‹™æ‰€ç™º";
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
@@ -2790,10 +2796,10 @@
             // 
             // dataGridViewTextBoxColumn7
             // 
-            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle23.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle47.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle47.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle47;
             this.dataGridViewTextBoxColumn7.Frozen = true;
             this.dataGridViewTextBoxColumn7.HeaderText = "äº‹å‹™æ‰€ç�€";
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
@@ -2802,10 +2808,10 @@
             // 
             // dataGridViewTextBoxColumn8
             // 
-            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle24.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle48.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle48.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle48;
             this.dataGridViewTextBoxColumn8.Frozen = true;
             this.dataGridViewTextBoxColumn8.HeaderText = "å½“æ—¥è¨ˆ";
             this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
@@ -2854,6 +2860,18 @@
             this.dataGridViewCheckBoxColumn7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.dataGridViewCheckBoxColumn7.Width = 55;
             // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(121, 3);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(150, 27);
+            this.comboBox1.TabIndex = 0;
+            this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
+            // 
             // FrmDRWork
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -2887,8 +2905,8 @@
             this.pnlApprovalButton.ResumeLayout(false);
             this.tabControl1.ResumeLayout(false);
             this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
-            this.tabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvTransport02)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvTransport01)).EndInit();
             this.ResumeLayout(false);
@@ -3086,5 +3104,6 @@
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column11;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column12;
         private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn7;
+        private System.Windows.Forms.Button button12;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs	(revision 483)
@@ -180,7 +180,8 @@
                                                                 , "æŒ¯æ›¿"
                                                                 , "ä¼‘å‡º"
                                                                 , "ä»£ä¼‘"
-                                                                , "ä¼‘æ—¥" };
+                                                                , "ä¼‘æ—¥"
+                                                                , "ç‰¹æ®Š"};
         #endregion
 
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.resx	(revision 483)
@@ -171,6 +171,9 @@
   <metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -237,7 +240,4 @@
   <metadata name="dataGridViewCheckBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs	(revision 483)
@@ -235,6 +235,9 @@
         {
             try
             {
+                // ãƒœã‚¿ãƒ³ç­‰è¡¨ç¤ºã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«
+                DisplayObjectControl(false);
+
                 // è¡¨ç¤ºã‚¯ãƒªã‚¢
                 ClearDisplay();
 
@@ -262,6 +265,9 @@
                                                         , CommonMotions.cnvInt(comboBox1.SelectedValue)
                                                         , 1
                                                         , m_ApplPnlList);
+
+                // ãƒœã‚¿ãƒ³ç­‰è¡¨ç¤ºã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«
+                DisplayObjectControl(true);
             }
             catch (Exception ex)
             {
@@ -275,6 +281,42 @@
         }
         #endregion
 
+        #region ãƒœã‚¿ãƒ³ç­‰è¡¨ç¤ºã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«
+        /// <summary>
+        /// ãƒœã‚¿ãƒ³ç­‰è¡¨ç¤ºã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«
+        /// </summary>
+        private void DisplayObjectControl(bool bDisp)
+        {
+            try
+            {
+                panel3.Enabled = bDisp;
+
+                tabControl1.Enabled = bDisp;
+
+                if (button1.Visible) button1.Enabled = bDisp;
+                if (button2.Visible) button2.Enabled = bDisp;
+                if (button3.Visible) button3.Enabled = bDisp;
+                if (button4.Visible) button4.Enabled = bDisp;
+                if (button5.Visible) button5.Enabled = bDisp;
+                if (button6.Visible) button6.Enabled = bDisp;
+                if (button7.Visible) button7.Enabled = bDisp;
+                if (button8.Visible) button8.Enabled = bDisp;
+                if (button9.Visible) button9.Enabled = bDisp;
+                if (button10.Visible) button10.Enabled = bDisp;
+                if (button11.Visible) button11.Enabled = bDisp;
+                if (button12.Visible) button12.Enabled = bDisp;
+                if (btnLineAdd.Visible) btnLineAdd.Enabled = bDisp;
+                if (btnLineDel.Visible) btnLineDel.Enabled = bDisp;
+                if (btnDataEntry.Visible) btnDataEntry.Enabled = bDisp;
+                if (btnDataDelete.Visible) btnDataDelete.Enabled = bDisp;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region èª­è¾¼é †
         /// <summary>
         /// èª­è¾¼é †
@@ -614,10 +656,11 @@
                     int nAllAppStat = CommonMotions.cnvInt(CurRec[(int)ReadDataOrder.AllAppStat]);
                     if (nAllAppStat == (int)CommonDefine.ApprovalStatus.Approval) continue;
 
-                    // æŒ‡å®šæ—¥ã‚ˆã‚Šå‰�ã�¯ãƒ­ãƒƒã‚¯ã�™ã‚‹
                     if (bLock)
                     {
+                        // æŒ‡å®šæ—¥ã‚ˆã‚Šå‰�ã�¯ãƒ­ãƒƒã‚¯ã�™ã‚‹
                         if (DispDate.Date < dtLockDate.Date) CurRow.ReadOnly = true;
+
                         // æŒ‡å®šè€…ä»¥å¤–ã�¯ä¼‘æ—¥ãƒ­ãƒƒã‚¯
                         if (strHoliday.Length > 0) CurRow.ReadOnly = true;
                     }
@@ -775,6 +818,7 @@
                     case (int)AttendanceDailyData.WorkKindFlgDef.HolidayWork:           // ä¼‘æ—¥å‡ºå‹¤
                     case (int)AttendanceDailyData.WorkKindFlgDef.OutEarly:              // æ—©å‡º
                     case (int)AttendanceDailyData.WorkKindFlgDef.OverTime:              // æ®‹æ¥­æ™‚é–“
+                    case (int)AttendanceDailyData.WorkKindFlgDef.Holiday:               // ä¼‘æ—¥
 
                         strWorkingTime = string.Format("{0}:{1:00}", tsWorkingTime.Hours, tsWorkingTime.Minutes);
                         break;
@@ -796,9 +840,6 @@
                             strWorkingTime = string.Format("{0}:{1:00}", tsWorkingTime.Hours, tsWorkingTime.Minutes);
                         break;
 
-                    case (int)AttendanceDailyData.WorkKindFlgDef.Holiday:               // ä¼‘æ—¥
-                        break;
-
                     default:
                         break;
                 }
@@ -1735,16 +1776,16 @@
                     SetRowToStruct1(wrkRow, LineCnt, ref NewList);
 
                     // å±Šã�¯è¡Œã�Œå¤‰ã‚�ã�£ã�¦ã�„ã�Ÿã‚‰å¤‰æ›´ã�™ã‚‹
-                    int nOrderNo = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn01.NoticeOrderNo].Value);
-                    if (nOrderNo > 0)
-                    {
-                        // å‹¤æ€ å±Šå‡ºç´�ä»˜ã�‘ãƒ‡ãƒ¼ã‚¿å¤‰æ›´å‡¦ç�†
-                        if (!ChangeNoticeLink(LinkDB, wrkRow, LineCnt))
-                        {
-                            MessageBox.Show("å‹¤æ€ å±Šå‡ºç´�ä»˜ã�‘ãƒ‡ãƒ¼ã‚¿ã�®å¤‰æ›´ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                            return false;
-                        }
-                    }
+                    //int nOrderNo = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn01.NoticeOrderNo].Value);
+                    //if (nOrderNo > 0)
+                    //{
+                    //    // å‹¤æ€ å±Šå‡ºç´�ä»˜ã�‘ãƒ‡ãƒ¼ã‚¿å¤‰æ›´å‡¦ç�†
+                    //    if (!ChangeNoticeLink(LinkDB, wrkRow, LineCnt))
+                    //    {
+                    //        MessageBox.Show("å‹¤æ€ å±Šå‡ºç´�ä»˜ã�‘ãƒ‡ãƒ¼ã‚¿ã�®å¤‰æ›´ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    //        return false;
+                    //    }
+                    //}
                     LineCnt++;
                 }
 
@@ -2278,10 +2319,13 @@
                 CurRow.Cells[(int)GridColumn01.OverTimes].Value = string.Empty;
 
                 // é–‹å§‹æ™‚é–“å�–å¾—
+                string strStTime = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn01.StartTime].Value).Trim();
                 TimeSpan StartTime = CommonMotions.cnvTimeSpan(CurRow.Cells[(int)GridColumn01.StartTime].Value);
                 // çµ‚äº†æ™‚é–“å�–å¾—
+                string strCmpTime = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn01.Comptime].Value).Trim();
                 TimeSpan CompTime = CommonMotions.cnvTimeSpan(CurRow.Cells[(int)GridColumn01.Comptime].Value);
-                if (StartTime == TimeSpan.Zero || CompTime == TimeSpan.Zero) return;
+                if ((StartTime == TimeSpan.Zero && strStTime.Length < 1)
+                    || (CompTime == TimeSpan.Zero && strCmpTime.Length < 1)) return;
 
                 // ä½œæ¥­åŒºåˆ†ã�®å�–å¾—
                 int nWorkKind = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn01.WorkingKind].Value);
@@ -2629,7 +2673,8 @@
 
                 // å±Šå‡ºè¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                 int nKind = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn01.WorkingKind].Value);
-                if (nKind != (int)AttendanceDailyData.WorkKindFlgDef.Normal) return;
+                if (nKind != (int)AttendanceDailyData.WorkKindFlgDef.Normal
+                    && nKind != (int)AttendanceDailyData.WorkKindFlgDef.Holiday) return;
 
                 // ä½œæ¥­å†…å®¹åˆ—ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
                 if (CurCell.ColumnIndex != (int)GridColumn01.ActionResult) return;
@@ -2747,6 +2792,9 @@
                     case (int)AttendanceDailyData.WorkKindFlgDef.Holiday:               // ä¼‘æ—¥
                         btnWork = btnNoneDisp;
                         break;
+                    case (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay:             // ç‰¹æ®Šä¼‘
+                        btnWork = button12;
+                        break;
                     default:
                         break;
                 }
@@ -2917,6 +2965,8 @@
                 else if (btnWrk.Name.Equals("button10")) nFlag = (int)AttendanceDailyData.WorkKindFlgDef.HolidayWork;
                 // ä»£ä¼‘
                 else if (btnWrk.Name.Equals("button11")) nFlag = (int)AttendanceDailyData.WorkKindFlgDef.CompensatoryHoliday;
+                // ç‰¹æ®Šä¼‘
+                else if (btnWrk.Name.Equals("button12")) nFlag = (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay;
 
                 return nFlag;
             }
@@ -3103,6 +3153,7 @@
                 frm.ManNo = m_PersonCode;
                 frm.ExceNo = nWorkKind;
                 frm.DepNo = m_DepartmentCode;
+                frm.SubForm = true;
 
                 frm.ParentCode = (int)ClsExcute.ProcessExecuteNo.DRWork;
                 frm.SetDate = CommonMotions.cnvDate(CurRow.Cells[(int)GridColumn01.AttendanceDate].Value);
@@ -3116,7 +3167,6 @@
                 DateTime BaseDate = CommonMotions.cnvDate(CurRow.Cells[(int)GridColumn01.AttendanceDate].Value);
                 int nCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvDate(x.Cells[(int)GridColumn01.AttendanceDate].Value).Date == BaseDate.Date)
                                                             .Count();
-                frm.SubForm = true;
 
                 frm.ShowDialog();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalender.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalender.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalender.Designer.cs	(revision 483)
@@ -33,6 +33,12 @@
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnHelp = new System.Windows.Forms.Button();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.label3 = new System.Windows.Forms.Label();
+            this.cmbConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label4 = new System.Windows.Forms.Label();
+            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label2 = new System.Windows.Forms.Label();
             this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.lblNotice = new System.Windows.Forms.Label();
@@ -45,7 +51,7 @@
             this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.groupBox1.SuspendLayout();
             this.groupBoxEx1.SuspendLayout();
             this.groupBoxEx4.SuspendLayout();
             this.groupBoxEx3.SuspendLayout();
@@ -55,7 +61,7 @@
             // label1
             // 
             this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label1.ForeColor = System.Drawing.Color.Black;
@@ -139,16 +145,101 @@
             this.tableLayoutPanel1.Size = new System.Drawing.Size(980, 420);
             this.tableLayoutPanel1.TabIndex = 144;
             // 
+            // groupBox1
+            // 
+            this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.groupBox1.BackColor = System.Drawing.Color.Gainsboro;
+            this.groupBox1.BorderColor = System.Drawing.Color.Black;
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.cmbConstructionPerson);
+            this.groupBox1.Controls.Add(this.cmbDepartment);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.comboBox1);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.ForeColor = System.Drawing.Color.Black;
+            this.groupBox1.Location = new System.Drawing.Point(12, 82);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(980, 46);
+            this.groupBox1.TabIndex = 155;
+            this.groupBox1.TabStop = false;
+            // 
+            // label3
+            // 
+            this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label3.ForeColor = System.Drawing.Color.Black;
+            this.label3.Location = new System.Drawing.Point(645, 10);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(120, 27);
+            this.label3.TabIndex = 159;
+            this.label3.Text = "æ‹…ã€€å½“ã€€è€…";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label3.Visible = false;
+            // 
+            // cmbConstructionPerson
+            // 
+            this.cmbConstructionPerson.BackColor = System.Drawing.Color.White;
+            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionPerson.Font = new System.Drawing.Font("MS UI Gothic", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstructionPerson.FormattingEnabled = true;
+            this.cmbConstructionPerson.Location = new System.Drawing.Point(773, 9);
+            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
+            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 29);
+            this.cmbConstructionPerson.TabIndex = 158;
+            this.cmbConstructionPerson.Visible = false;
+            // 
+            // cmbDepartment
+            // 
+            this.cmbDepartment.BackColor = System.Drawing.Color.White;
+            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDepartment.Font = new System.Drawing.Font("MS UI Gothic", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbDepartment.FormattingEnabled = true;
+            this.cmbDepartment.IntegralHeight = false;
+            this.cmbDepartment.Location = new System.Drawing.Point(429, 9);
+            this.cmbDepartment.Name = "cmbDepartment";
+            this.cmbDepartment.Size = new System.Drawing.Size(200, 29);
+            this.cmbDepartment.TabIndex = 157;
+            this.cmbDepartment.Visible = false;
+            // 
+            // label4
+            // 
+            this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label4.ForeColor = System.Drawing.Color.Black;
+            this.label4.Location = new System.Drawing.Point(301, 10);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(120, 27);
+            this.label4.TabIndex = 160;
+            this.label4.Text = "éƒ¨ã€€ã€€ç½²";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label4.Visible = false;
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ ã‚´ã‚·ãƒƒã‚¯", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(135, 9);
+            this.comboBox1.MaxDropDownItems = 12;
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(150, 29);
+            this.comboBox1.TabIndex = 156;
+            // 
             // label2
             // 
-            this.label2.BackColor = System.Drawing.Color.SandyBrown;
+            this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(15, 100);
+            this.label2.Location = new System.Drawing.Point(7, 10);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(120, 27);
-            this.label2.TabIndex = 145;
+            this.label2.TabIndex = 155;
             this.label2.Text = "å¯¾è±¡å¹´æœˆ";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -158,7 +249,7 @@
             this.groupBoxEx1.BorderColor = System.Drawing.Color.Red;
             this.groupBoxEx1.Controls.Add(this.lblNotice);
             this.groupBoxEx1.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEx1.Location = new System.Drawing.Point(302, 45);
+            this.groupBoxEx1.Location = new System.Drawing.Point(302, 36);
             this.groupBoxEx1.Name = "groupBoxEx1";
             this.groupBoxEx1.Size = new System.Drawing.Size(400, 40);
             this.groupBoxEx1.TabIndex = 147;
@@ -182,7 +273,7 @@
             this.groupBoxEx4.Controls.Add(this.radioButton6);
             this.groupBoxEx4.Controls.Add(this.radioButton5);
             this.groupBoxEx4.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEx4.Location = new System.Drawing.Point(302, 45);
+            this.groupBoxEx4.Location = new System.Drawing.Point(302, 36);
             this.groupBoxEx4.Name = "groupBoxEx4";
             this.groupBoxEx4.Size = new System.Drawing.Size(400, 40);
             this.groupBoxEx4.TabIndex = 150;
@@ -221,7 +312,7 @@
             this.groupBoxEx3.Controls.Add(this.radioButton4);
             this.groupBoxEx3.Controls.Add(this.radioButton3);
             this.groupBoxEx3.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEx3.Location = new System.Drawing.Point(302, 45);
+            this.groupBoxEx3.Location = new System.Drawing.Point(302, 36);
             this.groupBoxEx3.Name = "groupBoxEx3";
             this.groupBoxEx3.Size = new System.Drawing.Size(400, 40);
             this.groupBoxEx3.TabIndex = 149;
@@ -260,7 +351,7 @@
             this.groupBoxEx2.Controls.Add(this.radioButton2);
             this.groupBoxEx2.Controls.Add(this.radioButton1);
             this.groupBoxEx2.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEx2.Location = new System.Drawing.Point(302, 45);
+            this.groupBoxEx2.Location = new System.Drawing.Point(302, 36);
             this.groupBoxEx2.Name = "groupBoxEx2";
             this.groupBoxEx2.Size = new System.Drawing.Size(400, 40);
             this.groupBoxEx2.TabIndex = 148;
@@ -292,18 +383,6 @@
             this.radioButton1.Text = "æœ‰çµ¦ä¼‘æš‡å±Š";
             this.radioButton1.UseVisualStyleBackColor = true;
             // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(143, 99);
-            this.comboBox1.MaxDropDownItems = 12;
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(160, 29);
-            this.comboBox1.TabIndex = 146;
-            // 
             // FrmDRWorkCalender
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -310,17 +389,16 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1004, 607);
-            this.Controls.Add(this.groupBoxEx1);
-            this.Controls.Add(this.groupBoxEx4);
-            this.Controls.Add(this.groupBoxEx3);
-            this.Controls.Add(this.groupBoxEx2);
-            this.Controls.Add(this.comboBox1);
-            this.Controls.Add(this.label2);
+            this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.btnDataEntry);
             this.Controls.Add(this.btnEnd);
             this.Controls.Add(this.label1);
+            this.Controls.Add(this.groupBoxEx1);
+            this.Controls.Add(this.groupBoxEx4);
+            this.Controls.Add(this.groupBoxEx3);
+            this.Controls.Add(this.groupBoxEx2);
             this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
             this.KeyPreview = true;
@@ -331,6 +409,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmDRWorkCalender_FormClosing);
             this.Load += new System.EventHandler(this.FrmDRWorkCalender_Load);
+            this.groupBox1.ResumeLayout(false);
             this.groupBoxEx1.ResumeLayout(false);
             this.groupBoxEx4.ResumeLayout(false);
             this.groupBoxEx4.PerformLayout();
@@ -349,8 +428,6 @@
         private System.Windows.Forms.Button btnDataEntry;
         private System.Windows.Forms.Button btnHelp;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private CustomControls.ComboBoxEX comboBox1;
-        private System.Windows.Forms.Label label2;
         private CustomControls.GroupBoxEx groupBoxEx1;
         private System.Windows.Forms.Label lblNotice;
         private CustomControls.GroupBoxEx groupBoxEx2;
@@ -362,5 +439,12 @@
         private CustomControls.GroupBoxEx groupBoxEx4;
         private System.Windows.Forms.RadioButton radioButton6;
         private System.Windows.Forms.RadioButton radioButton5;
+        private CustomControls.GroupBoxEx groupBox1;
+        private System.Windows.Forms.Label label3;
+        private CustomControls.ComboBoxEX cmbConstructionPerson;
+        private CustomControls.ComboBoxEX cmbDepartment;
+        private System.Windows.Forms.Label label4;
+        private CustomControls.ComboBoxEX comboBox1;
+        private System.Windows.Forms.Label label2;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalender.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalender.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalender.cs	(revision 483)
@@ -43,14 +43,14 @@
         private int m_ExceNo = 0;
 
         /// <summary>
-        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹ãƒ•ãƒ©ã‚°
+        /// æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
         /// </summary>
-        private bool m_CloseingProcessOn = true;
+        private int m_PersonCode = 0;
 
         /// <summary>
-        /// æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
+        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹ãƒ•ãƒ©ã‚°
         /// </summary>
-        private int m_PersonCode = 0;
+        private bool m_CloseingProcessOn = true;
 
         /// <summary>
         /// å‡¦ç�†å¯¾è±¡æ‹…å½“è€…ãƒ‡ãƒ¼ã‚¿
@@ -124,7 +124,8 @@
         private void FrmDRWorkCalender_FormClosing(object sender, FormClosingEventArgs e)
         {
             // å‰�ãƒ—ãƒ­ã‚»ã‚¹ã�«æˆ»ã‚‹
-            if(m_CloseingProcessOn) ClsExcute.BackProcess();
+            if (m_CloseingProcessOn)
+                ClsExcute.BackProcess();
         }
         #endregion
 
@@ -136,7 +137,6 @@
         /// <param name="e"></param>
         private void btnEnd_Click(object sender, EventArgs e)
         {
-            m_CloseingProcessOn = true;
             this.Close();
         }
         #endregion
@@ -149,6 +149,7 @@
         /// <param name="e"></param>
         private void btnDataEntry_Click(object sender, EventArgs e)
         {
+            m_CloseingProcessOn = false;
             this.Close();
         }
         #endregion
@@ -193,6 +194,7 @@
             // æ¬¡ãƒ—ãƒ­ã‚»ã‚¹èµ·å‹•
             if (SubProcessExecute(sender, e))
             {
+                m_CloseingProcessOn = false;
                 // ç”»é�¢ã‚¯ãƒ­ãƒ¼ã‚º
                 this.Close();
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalenderAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalenderAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkCalenderAux.cs	(revision 483)
@@ -687,9 +687,6 @@
                 // é�¸æŠžæ—¥ã‚»ãƒƒãƒˆ
                 ClsExcute.ProcControlPara[NowPoint].DateExecParameter.Add(dtSelDay);
 
-                // ã‚¯ãƒ­ãƒ¼ã‚ºå‡¦ç�†ã‚’OFFã�«ã�™ã‚‹ã€‚
-                m_CloseingProcessOn = false;
-
                 return true;
             }
             catch (Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.Designer.cs	(revision 483)
@@ -43,6 +43,8 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnEnd = new System.Windows.Forms.Button();
             this.btnPrint = new System.Windows.Forms.Button();
@@ -66,6 +68,8 @@
             this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBoxEx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
             this.SuspendLayout();
@@ -192,7 +196,7 @@
             dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
             dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvList.ColumnHeadersHeight = 40;
+            this.dgvList.ColumnHeadersHeight = 50;
             this.dgvList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.ApprovalColumn02,
@@ -208,8 +212,10 @@
             this.Column8,
             this.Column9,
             this.Column10,
-            this.Column11});
-            this.dgvList.Location = new System.Drawing.Point(10, 92);
+            this.Column11,
+            this.Column12,
+            this.Column13});
+            this.dgvList.Location = new System.Drawing.Point(10, 90);
             this.dgvList.MultiSelect = false;
             this.dgvList.Name = "dgvList";
             this.dgvList.RowHeadersVisible = false;
@@ -217,7 +223,7 @@
             this.dgvList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             this.dgvList.RowTemplate.Height = 24;
             this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvList.Size = new System.Drawing.Size(1220, 506);
+            this.dgvList.Size = new System.Drawing.Size(1220, 510);
             this.dgvList.TabIndex = 105;
             this.dgvList.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellDoubleClick);
             // 
@@ -253,7 +259,7 @@
             this.Column1.Name = "Column1";
             this.Column1.ReadOnly = true;
             this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 200;
+            this.Column1.Width = 210;
             // 
             // ApprovalColumn03
             // 
@@ -265,11 +271,12 @@
             this.ApprovalColumn03.Name = "ApprovalColumn03";
             this.ApprovalColumn03.ReadOnly = true;
             this.ApprovalColumn03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn03.Width = 200;
+            this.ApprovalColumn03.Width = 210;
             // 
             // Column2
             // 
             dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.Column2.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column2.HeaderText = "æ—¥ã€€å ±";
             this.Column2.Name = "Column2";
@@ -276,11 +283,12 @@
             this.Column2.ReadOnly = true;
             this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 80;
+            this.Column2.Width = 40;
             // 
             // Column3
             // 
             dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.Column3.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column3.HeaderText = "äº¤é€šè²»";
             this.Column3.Name = "Column3";
@@ -287,7 +295,7 @@
             this.Column3.ReadOnly = true;
             this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 80;
+            this.Column3.Width = 40;
             // 
             // Column5
             // 
@@ -300,7 +308,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 = 70;
             // 
             // Column7
             // 
@@ -331,8 +339,9 @@
             // Column4
             // 
             dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.Column4.DefaultCellStyle = dataGridViewCellStyle11;
-            this.Column4.HeaderText = "æ‰¿èª�";
+            this.Column4.HeaderText = "æ‰¿ã€€èª�";
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
             this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -376,12 +385,12 @@
             this.Column10.ReadOnly = true;
             this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column10.Width = 80;
+            this.Column10.Width = 70;
             // 
             // Column11
             // 
             dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
             this.Column11.DefaultCellStyle = dataGridViewCellStyle15;
             this.Column11.HeaderText = "å¹´é–“æœ‰çµ¦\né–‹å§‹æ—¥";
@@ -390,6 +399,30 @@
             this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
+            // Column12
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle16;
+            this.Column12.HeaderText = "å…¥ã€€åŠ›";
+            this.Column12.Name = "Column12";
+            this.Column12.ReadOnly = true;
+            this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column12.Width = 40;
+            // 
+            // Column13
+            // 
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column13.DefaultCellStyle = dataGridViewCellStyle17;
+            this.Column13.HeaderText = "ç¢ºã€€èª�";
+            this.Column13.Name = "Column13";
+            this.Column13.ReadOnly = true;
+            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column13.Width = 40;
+            // 
             // FrmDRWorkList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -412,6 +445,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPersonApprovalList_FormClosing);
             this.Load += new System.EventHandler(this.FrmPersonApprovalList_Load);
+            this.Shown += new System.EventHandler(this.FrmDRWorkList_Shown);
             this.groupBoxEx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvList)).EndInit();
             this.ResumeLayout(false);
@@ -443,5 +477,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.cs	(revision 483)
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 using log4net;
 using log4net.Appender;
@@ -59,6 +60,8 @@
             PrevYearLess,       // 11:æœ‰çµ¦å‰�å¹´æ®‹
             PaidHoriday,        // 12:æœ‰çµ¦å�–å¾—æ•°
             HoridayStartDate,   // 13:æœ‰çµ¦å�–å¾—é–‹å§‹æ—¥
+            Entry,              // 14:å…¥åŠ›ãƒ�ã‚§ãƒƒã‚¯
+            Check,              // 15:ç¢ºèª�ãƒ�ã‚§ãƒƒã‚¯
         }
         #endregion
 
@@ -174,7 +177,26 @@
 
                 // è¡¨ç¤ºåˆ�æœŸã‚¹ã‚¿ã‚¤ãƒ«ã‚»ãƒƒãƒˆ
                 SetInitStyle();
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
 
+        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰æ™‚å‡¦ç�†
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰æ™‚å‡¦ç�†
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private async void FrmDRWorkList_Shown(object sender, EventArgs e)
+        {
+            try
+            {
+                await Task.Delay(100);
+
                 // å¯¾è±¡å¹´åº¦ã�®ã‚»ãƒƒãƒˆ
                 SetActionMonthly();
 
@@ -181,12 +203,15 @@
                 // åˆ�æœŸè¡¨ç¤º
                 InitDataLoad();
 
-                m_initDataLoad = false;
             }
             catch (System.Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                m_initDataLoad = false;
+            }
         }
         #endregion
 
@@ -336,29 +361,6 @@
         }
         #endregion
 
-        #region å‡ºå‹¤æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—é †
-        /// <summary>
-        /// å‡ºå‹¤æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—é †
-        /// </summary>
-        private enum ReadPrintDataOrder
-        {
-            YMD = 0,        //  0:æ—¥å ±æ—¥ä»˜
-            Holiday,        //  1:ä¼‘æ—¥æ—¥ä»˜
-            ConstrCode,     //  2:å·¥äº‹ç•ªå�·
-            ActionResult,   //  3:è¡Œå‹•å±¥æ­´
-            StartTime,      //  4:é–‹å§‹æ™‚é–“
-            CompTime,       //  5:çµ‚äº†æ™‚é–“
-            WorkingKind,    //  6:å‹¤å‹™åŒºåˆ†
-            WorkingTime,    //  7:ç¨¼åƒ�æ™‚é–“
-            Certification,  //  8:å°±æ¥­å¤–æ™‚é–“
-            Comment,        //  9:æ™‚é–“å¤–èª�å®šç�†ç”±
-            NoticeOrder,    // 10:å±Šæ��å‡ºé †
-            SeqNo,          // 11:æ—¥å ±æ—¥ä»˜å†…ä¸¦ã�³é †
-            AllAppStat,     // 12:æ—¥å ±æ‰¿èª�çŠ¶æ…‹
-            RowAppStat,     // 13:å±Šå‡ºæ‰¿èª�çŠ¶æ…‹
-        }
-        #endregion
-
         #region ãƒ‡ãƒ¼ã‚¿å�–å¾—SQLä½œæˆ�
         /// <summary>
         /// ãƒ‡ãƒ¼ã‚¿å�–å¾—SQLä½œæˆ�
@@ -397,6 +399,8 @@
                 strSQL.Append(", ifnull(AttNN.SumDay, 0.0)");           // 13
                 strSQL.AppendFormat(", DATE_ADD(A.StartDate, INTERVAL {0} MONTH) As StartDate", nAddMonth);    // 14
                 strSQL.Append(", A.PaidDayOffFlg");                     // 15
+                strSQL.Append(", LastEntry.AttendanceDate");            // 16
+                strSQL.Append(", ifnull(OverCheck.OverCnt, 0)");        // 17
 
                 strSQL.Append(" FROM PERSONINCHARGEMASTER A");
 
@@ -404,10 +408,16 @@
                 strSQL.Append("         ON F.PersonCode = A.PersonCode");
 
                 // å½“æœˆåˆ¤å®š
+                string strSetWork = string.Empty;
                 if (nNowYM == nSelectYM)
-                    strSQL.AppendFormat("   AND (DATE(F.StartDate) <= DATE('{0}')", DateTime.Now.ToShortDateString());
+                {
+                    strSetWork = string.Format("'{0}'", DateTime.Now.ToShortDateString());
+                }
                 else
-                    strSQL.AppendFormat("   AND (DATE(F.StartDate) <= DATE('{0}')", dtSelectEnd.ToShortDateString());
+                {
+                    strSetWork = string.Format("'{0}'", dtSelectEnd.ToShortDateString());
+                }
+                strSQL.AppendFormat("   AND (DATE(F.StartDate) <= DATE({0})", strSetWork);
 
                 strSQL.AppendFormat("   AND DATE('{0}') <= DATE(F.CompDate))", dtFirstDay.ToShortDateString());
 
@@ -432,23 +442,38 @@
                 strSQL.AppendFormat("   AND E.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval);
 
                 strSQL.Append(" LEFT JOIN");
+                    strSQL.Append("       (Select ManHH.PersonCode");
                 // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
-                    strSQL.Append("       (Select HH.PersonCode, CAST(DATE_FORMAT(DATE_SUB(NOW(), interval 1 DAY), '%d') AS SIGNED) - HH.HCnt As HCount");
+                {
+                    strSQL.Append("             , CAST(DATE_FORMAT(DATE_SUB(NOW(), interval 1 DAY), '%d') AS SIGNED) - HH.HCnt As HCount");
+                }
                 else
-                    strSQL.AppendFormat(" (Select HH.PersonCode, {0} - HH.HCnt As HCount", dtSelectEnd.Day);
+                {
+                    strSQL.AppendFormat("       , {0} - HH.HCnt As HCount", dtSelectEnd.Day);
+                }
 
-                strSQL.Append("                   From (Select");
-                strSQL.Append("                               H.PersonCode");
-                strSQL.Append("                             , count(DISTINCT DATE(H.AttendanceDate)) As HCnt");
-                strSQL.Append("                         From attendancedailydata As H");
-                strSQL.AppendFormat("                   Where (DATE('{0}') <= DATE(H.AttendanceDate)", dtFirstDay.ToShortDateString());
+                strSQL.Append("                   From personinchargemaster As ManHH");
+                strSQL.Append("                   Left Join (Select");
+                strSQL.Append("                                   ManH.PersonCode");
+                strSQL.Append("                                 , Count(DISTINCT DATE(H.AttendanceDate)) As HCnt");
+                strSQL.Append("                              From personinchargemaster As ManH");
+                strSQL.Append("                              Left Join attendancedailydata As H");
+                strSQL.Append("                                   On H.PersonCode = ManH.PersonCode");
+                strSQL.AppendFormat("                             And (DATE('{0}') <= DATE(H.AttendanceDate)", dtFirstDay.ToShortDateString());
                 // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
-                    strSQL.Append("                             And DATE(H.AttendanceDate) < DATE(NOW()))");
+                {
+                    strSetWork = "NOW()";
+                }
                 else
-                    strSQL.AppendFormat("                       And DATE(H.AttendanceDate) <= DATE('{0}'))", dtSelectEnd.ToShortDateString());
-                strSQL.Append("                                 Group by H.PersonCode) As HH) As HHH");
+                {
+                    strSetWork = string.Format("'{0}'", dtSelectEnd.ToShortDateString());
+                }
+                strSQL.AppendFormat("                       And DATE(H.AttendanceDate) <= DATE({0}))", strSetWork);
+
+                strSQL.Append("                                 Group by ManH.PersonCode) As HH");
+                strSQL.Append("                        On HH.PersonCode = ManHH.PersonCode) As HHH");
                 strSQL.Append("          ON HHH.PersonCode = A.PersonCode");
 
                 strSQL.Append(" LEFT JOIN (Select OverSum.PersonCode");
@@ -458,9 +483,15 @@
                 strSQL.AppendFormat("      Where (DATE('{0}') <= DATE(OverSum.AttendanceDate)", dtFirstDay.ToShortDateString());
                 // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
-                    strSQL.Append("                                 And DATE(OverSum.AttendanceDate) < DATE(NOW()))");
+                {
+                    strSetWork = "NOW()";
+                }
                 else
-                    strSQL.AppendFormat("                           And DATE(OverSum.AttendanceDate) <= DATE('{0}'))", dtSelectEnd.ToShortDateString());
+                {
+                    strSetWork = string.Format("'{0}'", dtSelectEnd.ToShortDateString());
+                }
+                strSQL.AppendFormat("                           And DATE(OverSum.AttendanceDate) <= DATE({0}))", strSetWork);
+
                 strSQL.Append("                                 Group by PersonCode) As OverTime");
                 strSQL.Append("         On OverTime.PersonCode = A.PersonCode");
 
@@ -470,11 +501,18 @@
                 strSQL.AppendFormat("      Where (DATE('{0}') <= DATE(K.AttendanceDate)", dtFirstDay.ToShortDateString());
                 // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
-                    strSQL.Append("       And DATE(K.AttendanceDate) < DATE(NOW()))");
+                {
+                    strSetWork = "NOW()";
+                }
                 else
-                    strSQL.AppendFormat(" And DATE(K.AttendanceDate) <= DATE('{0}'))", dtSelectEnd.ToShortDateString());
-                strSQL.AppendFormat("     And (K.WorkKindFlg = {0} Or (K.WorkKindFlg = {1} And K.ConstructionCode < 0))"
+                {
+                    strSetWork = string.Format("'{0}'", dtSelectEnd.ToShortDateString());
+                }
+                strSQL.AppendFormat(" And DATE(K.AttendanceDate) <= DATE({0}))", strSetWork);
+
+                strSQL.AppendFormat("     And (K.WorkKindFlg = {0} Or K.WorkKindFlg = {1} Or (K.WorkKindFlg = {2} And K.ConstructionCode < 0))"
                                                     , (int)AttendanceDailyData.WorkKindFlgDef.Absence
+                                                    , (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay
                                                     , (int)AttendanceDailyData.WorkKindFlgDef.TransferHoliday);
                 strSQL.Append("           Group by K.PersonCode) As KK On KK.PersonCode = A.PersonCode");
 
@@ -484,9 +522,11 @@
 
 
                 string strBaseDate = "CURRENT_DATE()";
-                // å½“æœˆåˆ¤å®š
+                // å½“æœˆä»¥å¤–ã�®å ´å�ˆ
                 if (nNowYM != nSelectYM)
+                {
                     strBaseDate = string.Format("DATE(CONCAT('{0}','/', DATE_FORMAT(Man.StartDate, '%m/%d')))", dtFirstDay.ToString("yyyy"));
+                }
 
                 strSQL.Append("                Inner Join(Select Man.PersonCode");
                 // ----- åŸºæº–æ—¥ã�Œå…¥ç¤¾æ—¥ã�‹ã‚‰å�Šå¹´ã�®ä»Šå¹´æ¬¡ä»¥ä¸‹ã�‹ã�©ã�†ã�‹ã�®åˆ¤å®š
@@ -521,6 +561,15 @@
                 strSQL.Append("                            From personinchargemaster As Man) As ManX");
                 strSQL.Append("                On ManX.PersonCode = AttN.PersonCode");
 
+                strSQL.Append("                Inner Join PERSONAPPROVAL AttNApp");
+                strSQL.Append("                      ON AttNApp.PersonCode = AttN.PersonCode");
+                strSQL.AppendFormat("                AND AttNApp.ApprovalCode = {0}"
+                                                        , ClsConvertCode.ConvWorkingToAppNo((int)AttendanceDailyData.WorkKindFlgDef.PaidHolidays));
+                strSQL.Append("                      AND AttNApp.OrderDate = AttN.AttendanceMonth");
+                strSQL.Append("                      AND AttNApp.OrderNo = AttN.OrderNo");
+                strSQL.Append("                      AND AttNApp.SEQNO = 1");
+                strSQL.AppendFormat("                AND AttNApp.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+
                 strSQL.AppendFormat("     Where AttN.AttendanceNo = {0}", (int)AttendanceDailyData.WorkKindFlgDef.PaidHolidays);
 
                 strSQL.AppendFormat("     And (DATE(ManX.SDate) < DATE(AttN.FromDate)");
@@ -529,6 +578,40 @@
                 strSQL.Append("           Group by AttN.PersonCode) AS AttNN");
                 strSQL.Append("         On AttNN.PersonCode = A.PersonCode");
 
+                // å½“æœˆåˆ¤å®š
+                DateTime dtToday = DateTime.Today;
+                if (nNowYM == nSelectYM)
+                {
+                    dtToday = DateTime.Today;
+                }
+                else
+                {
+                    dtToday = dtSelectEnd;
+                }
+
+                strSQL.Append("                Left Join (Select * From attendancedailydata As LastDay");
+                strSQL.Append("                                    Inner Join (Select");
+                strSQL.Append("                                                   ManDB.PersonCode As ManNo");
+                strSQL.Append("                                                 , MAX(DATE (ManDB.AttendanceDate)) As ManDate");
+                strSQL.Append("                                                 , ManDB.SeqNo As ManSeq");
+                strSQL.Append("                                                From attendancedailydata As ManDB");
+                strSQL.AppendFormat("                                          Where ('{0}' <= DATE(AttendanceDate)", dtFirstDay.Date);
+                strSQL.AppendFormat("                                          And DATE(AttendanceDate) < '{0}')", dtToday.ToShortDateString());
+                strSQL.AppendFormat("                                          And Date(CompTime) != '{0}'", DateTime.MinValue.ToShortDateString());
+                strSQL.AppendFormat("                                          Group By PersonCode) As MaxDay");
+                strSQL.Append("                                           On MaxDay.ManNo = LastDay.PersonCode");
+                strSQL.Append("                                           And MaxDay.ManDate = DATE(LastDay.AttendanceDate)");
+                strSQL.Append("                                           And MaxDay.ManSeq = LastDay.SeqNo) As LastEntry");
+                strSQL.Append("                      On LastEntry.PersonCode = A.PersonCode");
+
+                strSQL.Append("                Left Join (Select PersonCode, Count(*) As OverCnt From attendancedailydata As CheckDB");
+                strSQL.AppendFormat("                     Where DATE (AttendanceDate) < '{0}'", DateTime.Today.ToShortDateString());
+                strSQL.AppendFormat("                       And (Date(StartTime) != '{0}'", DateTime.MinValue.ToShortDateString());
+                strSQL.AppendFormat("                       And Date(CompTime) != '{0}')", DateTime.MinValue.ToShortDateString());
+                strSQL.Append("                             And (Overtime > 0 And OvertimeWA = 0 And Length(WorkingComment) < 1)");
+                strSQL.Append("                           Group By PersonCode) As OverCheck");
+                strSQL.Append("                     On OverCheck.PersonCode = A.PersonCode");
+
                 strSQL.Append(" WHERE");
                 if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
                 {
@@ -541,30 +624,44 @@
 
                 // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
-                    strSQL.AppendFormat(" AND ((DATE(A.StartDate) <= DATE('{0}')", DateTime.Now.ToShortDateString());
+                {
+                    strSetWork = string.Format("{0}", DateTime.Now.ToShortDateString());
+                }
                 else
-                    strSQL.AppendFormat(" AND ((DATE(A.StartDate) <= DATE('{0}')", dtSelectEnd.ToShortDateString());
+                {
+                    strSetWork = string.Format("{0}", dtSelectEnd.ToShortDateString());
+                }
+                strSQL.AppendFormat(" AND ((DATE(A.StartDate) <= DATE('{0}')", strSetWork);
 
-                // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
                 {
-                    strSQL.AppendFormat("  AND (DATE('{0}') <= DATE(A.EndDate)", dtSelectEnd.ToShortDateString());
+                    strSetWork = string.Format("'{0}'", dtSelectEnd.ToShortDateString());
                 }
                 else
                 {
-                    strSQL.Append("  AND (DATE(NOW()) <= DATE(A.EndDate)");
+                    strSetWork = string.Format("A.EndDate");
                 }
+                strSQL.AppendFormat(" AND (DATE({0}) <= DATE(A.EndDate)", strSetWork);
+
                 strSQL.AppendFormat("   Or DATE('{0}') = DATE(A.EndDate)))", DateTime.MinValue.ToShortDateString());
 
                 // å½“æœˆåˆ¤å®š
                 if (nNowYM == nSelectYM)
-                    strSQL.AppendFormat("   Or (DATE(A.StartDate) <= DATE('{0}')", DateTime.Now.ToShortDateString());
+                {
+                    strSetWork = string.Format("{0}", DateTime.Now.ToShortDateString());
+                }
                 else
-                    strSQL.AppendFormat("   Or (DATE(A.StartDate) <= DATE('{0}')", dtSelectEnd.ToShortDateString());
+                {
+                    strSetWork = string.Format("{0}", dtSelectEnd.ToShortDateString());
+                }
+                strSQL.AppendFormat("   Or (DATE(A.StartDate) <= DATE('{0}')", strSetWork);
 
                 strSQL.AppendFormat("     AND (DATE('{0}') <= DATE(A.EndDate)", dtFirstDay.ToShortDateString());
                 strSQL.AppendFormat("     AND DATE(A.EndDate) <= DATE('{0}'))))", dtSelectEnd.ToShortDateString());
 
+                strSQL.Append("       And B.DEPARTMENTCODE is not null");
+                strSQL.Append("       And B.DEPARTMENTSTRING is not null");
+
                 // æ¤œç´¢SQLã�®ç¯„å›²éƒ¨åˆ†ã‚’ä½œæˆ�ã�™ã‚‹
                 CreateSecuritySQL(ref strSQL);
 
@@ -628,13 +725,22 @@
             {
                 DataGridViewEX dgv = dgvList;
 
-                DataGridViewColumn ColHeader011 = dgv.Columns[(int)DispColumn.PaidHoriday];     // 11:æœ‰çµ¦å�–å¾—æ•°
-                DataGridViewColumn ColHeader012 = dgv.Columns[(int)DispColumn.HoridayStartDate];// 12:æœ‰çµ¦å�–å¾—é–‹å§‹æ—¥
-                DataGridViewColumn ColHeader013 = dgv.Columns[(int)DispColumn.Approval];        // 13:æ‰¿èª�çŠ¶æ…‹
-                ColHeader011.HeaderCell.Style.Font = new Font("ï¼­ï¼³ æ˜Žæœ�", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-                ColHeader012.HeaderCell.Style.Font = new Font("ï¼­ï¼³ æ˜Žæœ�", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-                ColHeader013.HeaderCell.Style.Font = new Font("ï¼­ï¼³ æ˜Žæœ�", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+                for (int ix = (int)DispColumn.Report; ix < dgv.ColumnCount; ix++)
+                {
+                    Font font = null;
+                    switch (ix)
+                    {
+                        case (int)DispColumn.PaidHoriday:        // 12:æœ‰çµ¦å�–å¾—æ•°
+                            font = new Font("ï¼­ï¼³ æ˜Žæœ�", 9.0F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(128)));
+                            break;
+                        default:
+                            font = new Font("ï¼­ï¼³ æ˜Žæœ�", 10.5F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(128)));
+                            break;
 
+                    }
+                    dgv.Columns[ix].HeaderCell.Style.Font = font;
+                }
+
                 // å‹¤å‹™åŒºåˆ†è‰²é€€é�¿
                 SetWorkingColorList();
 
@@ -656,15 +762,16 @@
                     return;
                 }
 
-                DataGridViewColumn Col01 = dgv.Columns[(int)DispColumn.ToYearLess];     //  9:æœ‰çµ¦å½“å¹´æ®‹
-                DataGridViewColumn Col02 = dgv.Columns[(int)DispColumn.PrevYearLess];   // 10:æœ‰çµ¦å‰�å¹´æ®‹
+                DataGridViewColumn Col01 = dgv.Columns[(int)DispColumn.ToYearLess];         //  9:æœ‰çµ¦å½“å¹´æ®‹
+                DataGridViewColumn Col02 = dgv.Columns[(int)DispColumn.PrevYearLess];       // 10:æœ‰çµ¦å‰�å¹´æ®‹
+                DataGridViewColumn Col12 = dgv.Columns[(int)DispColumn.HoridayStartDate];   // 12:æœ‰çµ¦å�–å¾—é–‹å§‹æ—¥
 
                 Col01.Visible = false;
                 Col02.Visible = false;
-                ColHeader012.Visible = false;
+                Col12.Visible = false;
 
-                dgv.Columns[(int)DispColumn.DepName].Width += Col01.Width + (ColHeader012.Width / 2);       //  2:éƒ¨ç½²å��
-                dgv.Columns[(int)DispColumn.PersonName].Width += Col02.Width + (ColHeader012.Width / 2);    //  3:æ‹…å½“è€…å��
+                dgv.Columns[(int)DispColumn.DepName].Width += Col01.Width + (Col12.Width / 2);       //  2:éƒ¨ç½²å��
+                dgv.Columns[(int)DispColumn.PersonName].Width += Col02.Width + (Col12.Width / 2);    //  3:æ‹…å½“è€…å��
             }
             catch (System.Exception ex)
             {
@@ -690,9 +797,6 @@
                 ArrayList arData = new ArrayList();
                 if (!AttDayDB.ExecuteReader(strSQL.ToString(), ref arData)) return;
 
-                // é�¸æŠžå¹´æœˆã�®å�–å¾—
-                int nSelectYM = CommonMotions.cnvInt(comboBox1.SelectedValue);
-
                 string strDisp = string.Empty;
                 int DispNo = 1;
                 int DispLine = -1;
@@ -707,77 +811,9 @@
 
                     DispLine = dgv.Rows.Add(1);
                     DataGridViewRow CurRow = dgv.Rows[DispLine];
-                    CurRow.Cells[(int)DispColumn.PersonCode].Value = CommonMotions.cnvInt(objRec[2]);       // æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
-                    CurRow.Cells[(int)DispColumn.No].Value = DispNo++;
-                    CurRow.Cells[(int)DispColumn.DepName].Value = CommonMotions.cnvString(objRec[1]);       // éƒ¨ç½²å��
-                    CurRow.Cells[(int)DispColumn.PersonName].Value = CommonMotions.cnvString(objRec[3]);    // æ‹…å½“è€…å��
 
-                    CurRow.Cells[(int)DispColumn.Report].Value = "ä½œæˆ�";
-                    CurRow.Cells[(int)DispColumn.Report].Style.ForeColor = Color.Black;
-                    if (CommonMotions.cnvInt(objRec[(int)DispColumn.Report]) == 0)
-                    {
-                        CurRow.Cells[(int)DispColumn.Report].Value = "æœªä½œæˆ�";
-                        CurRow.Cells[(int)DispColumn.Report].Style.ForeColor = Color.Red;
-                    }
-
-                    CurRow.Cells[(int)DispColumn.Costs].Value = "ä½œæˆ�";
-                    CurRow.Cells[(int)DispColumn.Costs].Style.ForeColor = Color.Black;
-                    if (CommonMotions.cnvInt(objRec[(int)DispColumn.Costs]) == 0)
-                    {
-                        CurRow.Cells[(int)DispColumn.Costs].Value = "æœªä½œæˆ�";
-                        CurRow.Cells[(int)DispColumn.Costs].Style.ForeColor = Color.Red;
-                    }
-
-                    CurRow.Cells[(int)DispColumn.Approval].Value = "æœª";
-                    CurRow.Cells[(int)DispColumn.Approval].Style.ForeColor = Color.Red;
-                    if (CommonMotions.cnvInt(objRec[6]) == (int)CommonDefine.ApprovalStatus.Approval)
-                    {
-                        CurRow.Cells[(int)DispColumn.Approval].Value = "æ¸ˆ";
-                        CurRow.Cells[(int)DispColumn.Approval].Style.ForeColor = Color.Black;
-                    }
-
-                    CurRow.Cells[(int)DispColumn.Holiday].Value = CommonMotions.cnvInt(objRec[7])+ CommonMotions.cnvInt(objRec[10]);    // ä¼‘æ—¥æ•°
-
-                    string strOverTime = string.Empty;
-                    int nOverTime = CommonMotions.cnvInt(objRec[9]);
-                    int nOHour = CommonMotions.cnvTruncate(nOverTime / 60);
-                    int nOMinute = (nOverTime % 60);
-                    strOverTime = string.Format("{0}:{1:00}", nOHour, nOMinute);
-                    CurRow.Cells[(int)DispColumn.OverTimes].Value = strOverTime;                                    // æ™‚é–“å¤–å°±æ¥­
-
-                    string strOverTimeWA = string.Empty;
-                    int nWorkingTime = CommonMotions.cnvInt(objRec[8]);
-                    int nHour = CommonMotions.cnvTruncate(nWorkingTime / 60);
-                    int nMinute = (nWorkingTime % 60);
-                    strOverTimeWA = string.Format("{0}:{1:00}", nHour, nMinute);
-                    CurRow.Cells[(int)DispColumn.Certification].Value = strOverTimeWA;                              // æ®‹æ¥­èª�å®šæ™‚é–“
-
-                    // å½“æœˆä»¥å¤–ã�¯æœ‰çµ¦æ®‹æ•°ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                    CurRow.Cells[(int)DispColumn.ToYearLess].Value = CommonMotions.cnvDecimal(objRec[11]).ToString("0.0");      // å½“å¹´æœ‰çµ¦æ®‹
-                    CurRow.Cells[(int)DispColumn.PrevYearLess].Value = CommonMotions.cnvDecimal(objRec[12]).ToString("0.0");    // å‰�å¹´æœ‰çµ¦æ®‹
-                    CurRow.Cells[(int)DispColumn.PaidHoriday].Value = CommonMotions.cnvDecimal(objRec[13]).ToString("0.0");     // å½“å¹´æœ‰çµ¦å�–å¾—æ•°
-
-                    // å½“å¹´æœ‰çµ¦å�–å¾—é–‹å§‹æ—¥
-                    DateTime dtStart = CalcToStartDate(CommonMotions.cnvDate(objRec[14]));
-                    int nPaidDayOffFlg = CommonMotions.cnvInt(objRec[15]);
-                    if (dtStart.Date == DateTime.MinValue || nPaidDayOffFlg == (int)PersonInChargeMaster.PaidDayOffFlgDef.NotAvailable)
-                    {
-                        CurRow.Cells[(int)DispColumn.HoridayStartDate].Value = "ï¼�";
-                        CurRow.Cells[(int)DispColumn.ToYearLess].Value = "ï¼�";
-                        CurRow.Cells[(int)DispColumn.PrevYearLess].Value = "ï¼�";
-                    }
-                    else
-                    {
-                        CurRow.Cells[(int)DispColumn.HoridayStartDate].Value = dtStart.ToShortDateString();
-
-                        // é–‹å§‹å¹´æœˆã�®å�–å¾—
-                        int nSelCal = nSelectYM - 100;
-                        int nEntYM = CommonMotions.cnvInt(CommonMotions.cnvDate(objRec[14]).ToString("yyyyMM"));
-                        if (nSelCal <= nEntYM)
-                        {
-                            CurRow.Cells[(int)DispColumn.PrevYearLess].Value = "ï¼�";
-                        }
-                    }
+                    // è¡Œãƒ‡ãƒ¼ã‚¿ã�®ã‚»ãƒƒãƒˆ
+                    SetCurrentRow(objRec, CurRow, ref DispNo);
                 }
             }
             catch (System.Exception ex)
@@ -807,20 +843,254 @@
         }
         #endregion
 
+        #region è¡Œãƒ‡ãƒ¼ã‚¿ã�®ã‚»ãƒƒãƒˆ
+        /// <summary>
+        /// è¡Œãƒ‡ãƒ¼ã‚¿ã�®ã‚»ãƒƒãƒˆ
+        /// </summary>
+        private void SetCurrentRow(object[] objRec, DataGridViewRow CurRow,ref int DispNo)
+        {
+            try
+            {
+                // é�¸æŠžå¹´æœˆã�®å�–å¾—
+                int nSelectYM = CommonMotions.cnvInt(comboBox1.SelectedValue);
+
+                CurRow.Cells[(int)DispColumn.PersonCode].Value = CommonMotions.cnvInt(objRec[2]);       // æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
+                CurRow.Cells[(int)DispColumn.No].Value = DispNo++;
+                CurRow.Cells[(int)DispColumn.DepName].Value = CommonMotions.cnvString(objRec[1]);       // éƒ¨ç½²å��
+                CurRow.Cells[(int)DispColumn.PersonName].Value = CommonMotions.cnvString(objRec[3]);    // æ‹…å½“è€…å��
+
+                CurRow.Cells[(int)DispColumn.Report].Value = "ã€‡";
+                CurRow.Cells[(int)DispColumn.Report].Style.ForeColor = Color.Black;
+                if (CommonMotions.cnvInt(objRec[(int)DispColumn.Report]) == 0)
+                {
+                    CurRow.Cells[(int)DispColumn.Report].Value = "â€•";
+                    CurRow.Cells[(int)DispColumn.Report].Style.ForeColor = Color.Red;
+                }
+
+                CurRow.Cells[(int)DispColumn.Costs].Value = "ã€‡";
+                CurRow.Cells[(int)DispColumn.Costs].Style.ForeColor = Color.Black;
+                if (CommonMotions.cnvInt(objRec[(int)DispColumn.Costs]) == 0)
+                {
+                    CurRow.Cells[(int)DispColumn.Costs].Value = "â€•";
+                    CurRow.Cells[(int)DispColumn.Costs].Style.ForeColor = Color.Red;
+                }
+
+                CurRow.Cells[(int)DispColumn.Approval].Value = "æœª";
+                CurRow.Cells[(int)DispColumn.Approval].Style.ForeColor = Color.Red;
+                if (CommonMotions.cnvInt(objRec[6]) == (int)CommonDefine.ApprovalStatus.Approval)
+                {
+                    CurRow.Cells[(int)DispColumn.Approval].Value = "æ¸ˆ";
+                    CurRow.Cells[(int)DispColumn.Approval].Style.ForeColor = Color.Black;
+                }
+
+                int nNowYM = CommonMotions.cnvInt(DateTime.Today.ToString("yyyyMM"));
+                var wkData = (CommonMotions.cnvInt(objRec[7]) + CommonMotions.cnvInt(objRec[10])).ToString("0");
+                if (nNowYM < nSelectYM) wkData = "ï¼�";
+                CurRow.Cells[(int)DispColumn.Holiday].Value = wkData;                                           // ä¼‘æ—¥æ•°
+
+                string strOverTime = string.Empty;
+                int nOverTime = CommonMotions.cnvInt(objRec[9]);
+                int nOHour = CommonMotions.cnvTruncate(nOverTime / 60);
+                int nOMinute = (nOverTime % 60);
+                strOverTime = string.Format("{0}:{1:00}", nOHour, nOMinute);
+                CurRow.Cells[(int)DispColumn.OverTimes].Value = strOverTime;                                    // æ™‚é–“å¤–å°±æ¥­
+
+                string strOverTimeWA = string.Empty;
+                int nWorkingTime = CommonMotions.cnvInt(objRec[8]);
+                int nHour = CommonMotions.cnvTruncate(nWorkingTime / 60);
+                int nMinute = (nWorkingTime % 60);
+                strOverTimeWA = string.Format("{0}:{1:00}", nHour, nMinute);
+                CurRow.Cells[(int)DispColumn.Certification].Value = strOverTimeWA;                              // æ®‹æ¥­èª�å®šæ™‚é–“
+
+                // å½“æœˆä»¥å¤–ã�¯æœ‰çµ¦æ®‹æ•°ã‚’è¡¨ç¤ºã�—ã�ªã�„
+                decimal nToYear = CommonMotions.cnvDecimal(objRec[11]);
+                decimal nPrevYear = CommonMotions.cnvDecimal(objRec[12]);
+
+                CurRow.Cells[(int)DispColumn.ToYearLess].Value = nToYear.ToString("0.0");                               // å½“å¹´æœ‰çµ¦æ®‹
+                CurRow.Cells[(int)DispColumn.PrevYearLess].Value = nPrevYear.ToString("0.0");                           // å‰�å¹´æœ‰çµ¦æ®‹
+                CurRow.Cells[(int)DispColumn.PaidHoriday].Value = CommonMotions.cnvDecimal(objRec[13]).ToString("0.0"); // å½“å¹´æœ‰çµ¦å�–å¾—æ•°
+
+                // å½“å¹´æœ‰çµ¦å�–å¾—é–‹å§‹æ—¥
+                DateTime dtStart = CalcToStartDate(CommonMotions.cnvDate(objRec[14]), nSelectYM);
+                int nPaidDayOffFlg = CommonMotions.cnvInt(objRec[15]);
+                
+                if (nPaidDayOffFlg == (int)PersonInChargeMaster.PaidDayOffFlgDef.NotAvailable
+                    || (dtStart.Date == DateTime.MinValue && nToYear >= 0))
+                {
+                    // æœ‰çµ¦ä¼‘æš‡ã�Œç„¡ã�„å ´å�ˆã�¯è¡¨ç¤ºã�—ã�ªã�„
+                    CurRow.Cells[(int)DispColumn.HoridayStartDate].Value = "ï¼�";
+                    CurRow.Cells[(int)DispColumn.ToYearLess].Value = "ï¼�";
+                    CurRow.Cells[(int)DispColumn.PrevYearLess].Value = "ï¼�";
+                }
+                else
+                {
+                    // é–‹å§‹å¹´æœˆã�®ã‚»ãƒƒãƒˆ
+                    CurRow.Cells[(int)DispColumn.HoridayStartDate].Value = dtStart.ToShortDateString();
+
+                    // é�¸æŠžæœˆã‚’åŸºæº–ã�«è¡¨ç¤ºã�™ã‚‹ã�—ã�ªã�„ã�®åˆ¤å®š
+                    DateTime dtFirst = CommonMotions.cnvDate(objRec[14]);
+                    SetNextHoliday(nSelectYM, dtStart, dtFirst, CurRow);
+                }
+
+                // ----- ãƒ�ã‚§ãƒƒã‚¯é …ç›®ã�®ã‚»ãƒƒãƒˆ
+                // å½“æœˆåˆ¤å®š
+                DateTime dtToday = DateTime.Today;
+                // é�¸æŠžå¹´æœˆåˆ�æ—¥(DateTime)
+                DateTime dtFirstDay = new DateTime(CommonMotions.cnvTruncate(nSelectYM / 100), nSelectYM % 100, 1);
+                // é�¸æŠžå¹´æœˆã�®æœˆæœ«æ—¥(DateTime)
+                DateTime dtSelectEnd = dtFirstDay.EndOfMonth();
+                if (nNowYM == nSelectYM)
+                {
+                    dtToday = DateTime.Today;
+                }
+                else
+                {
+                    dtToday = dtSelectEnd;
+                }
+                // ãƒ­ãƒƒã‚¯æœŸé™�æ—¥ä»˜å�–å¾—
+                DateTime dtCheckDate = CommonMotions.GetPrevBusinessDate(dtToday, 3);
+                DateTime dtCheckDate2 = CommonMotions.GetPrevBusinessDate(dtToday, 2);
+
+                DataGridViewCell ColHeader014 = CurRow.Cells[(int)DispColumn.Entry];            // 14:å…¥åŠ›ãƒ�ã‚§ãƒƒã‚¯
+                ColHeader014.Value = "ã€‡";
+                ColHeader014.Style.ForeColor = Color.Black;
+
+                DateTime dtLast = CommonMotions.cnvDate(objRec[16]);
+                if (dtLast.Date < dtCheckDate2.Date)
+                {
+                    ColHeader014.Value = "Ã—";
+                    ColHeader014.Style.ForeColor = Color.DarkBlue;
+                    if (dtLast.Date < dtCheckDate.Date)
+                    {
+                        ColHeader014.Style.ForeColor = Color.Red;
+                    }
+                }
+
+                DataGridViewCell ColHeader015 = CurRow.Cells[(int)DispColumn.Check];            // 15:ç¢ºèª�ãƒ�ã‚§ãƒƒã‚¯
+                ColHeader015.Value = "ã€‡";
+                ColHeader015.Style.ForeColor = Color.Black;
+
+                int nOverCnt = CommonMotions.cnvInt(objRec[17]);
+                if (nOverCnt > 0)
+                {
+                    ColHeader015.Value = "Ã—";
+                    ColHeader015.Style.ForeColor = Color.Red;
+                }
+
+                // æœ‰çµ¦æ•°ã�®è‰²ã‚’å¤‰ã�ˆã‚‹
+                nToYear = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.ToYearLess].Value);
+                nPrevYear = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.PrevYearLess].Value);
+                if (nToYear >= 0)
+                    CurRow.Cells[(int)DispColumn.ToYearLess].Style.ForeColor = Color.Black;
+                else
+                    CurRow.Cells[(int)DispColumn.ToYearLess].Style.ForeColor = Color.Red;
+
+                if (nPrevYear >= 0)
+                    CurRow.Cells[(int)DispColumn.PrevYearLess].Style.ForeColor = Color.Black;
+                else
+                    CurRow.Cells[(int)DispColumn.PrevYearLess].Style.ForeColor = Color.Red;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region é�¸æŠžæœˆã�Œæœ‰çµ¦ã�®ç¿Œå¹´åº¦ã‚’è¶…ã�ˆã�Ÿæ™‚ã�®å‡¦ç�†
+        /// <summary>
+        /// é�¸æŠžæœˆã�Œæœ‰çµ¦ã�®ç¿Œå¹´åº¦ã‚’è¶…ã�ˆã�Ÿæ™‚ã�®å‡¦ç�†
+        /// </summary>
+        private void SetNextHoliday(int nSelectYM, DateTime dtStart, DateTime dtFirst, DataGridViewRow CurRow)
+        {
+            bool bNonDisp = false;
+            try
+            {
+                // æœ‰çµ¦å�–å¾—æ—¥ã�Œç„¡ã�„ã‚‚ã�®ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (dtStart == DateTime.MinValue.Date)
+                {
+                    bNonDisp = true;
+                    return;
+                }
+
+                // æ¯”è¼ƒå¹´æœˆæ—¥ã�®å�–å¾—
+                int nNowYM = CommonMotions.cnvInt(DateTime.Today.ToString("yyyyMM"));
+                int wkYear = CommonMotions.cnvTruncate(nSelectYM / 100);
+                DateTime dtCompDay = DateTime.Today;
+                if (nNowYM < nSelectYM) dtCompDay = new DateTime(wkYear, (nSelectYM % 100), 1);
+
+                // ç�¾åœ¨æœ‰çµ¦å�–å¾—æ—¥ã�®ä»¥å‰�ã�®æœˆã‚’é�¸æŠžã�—ã�Ÿå ´å�ˆã�¯æœ‰çµ¦é–¢ä¿‚ã�®è¡¨ç¤ºã‚’ã�—ã�ªã�„
+                int DispLimit = CommonMotions.cnvInt(dtStart.ToString("yyyyMM"));
+                if (nSelectYM < DispLimit)
+                {
+                    bNonDisp = true;
+                    return;
+                }
+
+                // æœ‰çµ¦å�–å¾—ä»˜ã�Œæ¯”è¼ƒæ—¥ã‚ˆã‚Šå°�ã�•ã�„å ´å�ˆã�¯ç�¾åœ¨è¡¨ç¤ºå†…å®¹ã�Œæ­£ã�—ã�„ã�®ã�§å‡¦ç�†ã�—ã�ªã�„
+                if (dtStart < dtCompDay.Date) return;
+
+                // çµŒé�Žå¹´æ•°ã�®å�–å¾—
+                //TimeSpan wkDiff = (dtCompDay - dtStart);
+                TimeSpan wkDiff = (dtStart - dtFirst);
+                int nDiffYear = wkDiff.GetTimeSpanYears();
+
+                // æœ‰çµ¦é…�åˆ—ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
+                int nTableCnt = nDiffYear - 1;
+                if (nTableCnt < 0) nTableCnt = 0;
+                else if (nTableCnt > (CommonDefine.PaidHolidayTable.Count - 1))
+                    nTableCnt = (CommonDefine.PaidHolidayTable.Count - 1);
+
+                // æœ‰çµ¦æ—¥æ•°ã�®ã‚»ãƒƒãƒˆ
+                decimal nToYear = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.ToYearLess].Value);
+                decimal nPrevYear = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.PrevYearLess].Value);
+                if (nToYear >= 0)
+                {
+                    CurRow.Cells[(int)DispColumn.ToYearLess].Value = CommonDefine.PaidHolidayTable[nTableCnt].ToString("0.0");
+                    CurRow.Cells[(int)DispColumn.PrevYearLess].Value = CurRow.Cells[(int)DispColumn.ToYearLess].Value;
+                }
+                else
+                {
+                    CurRow.Cells[(int)DispColumn.ToYearLess].Value = (CommonDefine.PaidHolidayTable[nTableCnt]+ nToYear).ToString("0.0");
+                    CurRow.Cells[(int)DispColumn.PrevYearLess].Value = "0.0";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                if (bNonDisp)
+                {
+                    CurRow.Cells[(int)DispColumn.ToYearLess].Value = "ï¼�";           // å½“å¹´æœ‰çµ¦æ®‹
+                    CurRow.Cells[(int)DispColumn.PrevYearLess].Value = "ï¼�";         // å‰�å¹´æœ‰çµ¦æ®‹
+                    CurRow.Cells[(int)DispColumn.HoridayStartDate].Value = "ï¼�";     // å¹´é–“æœ‰çµ¦æ‰€å¾—æ—¥
+                }
+            }
+        }
+        #endregion
+
         #region æ��ç¤ºæ—¥ä»˜ã�«å¹´ã‚’åŠ ç®—ã�—ã�¦å½“æ—¥ã‚ˆã‚Šå°�ã�•ã�„æœ€å¤§æ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
         /// æ��ç¤ºæ—¥ä»˜ã�«å¹´ã‚’åŠ ç®—ã�—ã�¦å½“æ—¥ã‚ˆã‚Šå°�ã�•ã�„æœ€å¤§æ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
         /// </summary>
-        private DateTime CalcToStartDate(DateTime BaseDate)
+        private DateTime CalcToStartDate(DateTime BaseDate,int nSelectYM)
         {
             DateTime dtCalcDate = DateTime.MinValue;
             try
             {
+                // æ¯”è¼ƒå¹´æœˆæ—¥ã�®å�–å¾—
+                int nNowYM = CommonMotions.cnvInt(DateTime.Today.ToString("yyyyMM"));
+                int wkYear = CommonMotions.cnvTruncate(nSelectYM / 100);
+                DateTime dtCompDay = DateTime.Today;
+                if (nNowYM < nSelectYM) dtCompDay = new DateTime(wkYear, (nSelectYM % 100), 1);
+
                 int nAddYear = 0;
                 while (true)
                 {
                     DateTime dtwork = BaseDate.AddYears(nAddYear);
-                    if (dtwork.Date > DateTime.Today.Date) break;
+                    if (dtwork.Date > dtCompDay.Date) break;
 
                     dtCalcDate = dtwork;
 
@@ -1119,6 +1389,8 @@
                 s_WorkKindColor[(int)AttendanceDailyData.WorkKindFlgDef.CompensatoryHoliday] = Color.Green;
                 // ä¼‘æ—¥
                 s_WorkKindColor[(int)AttendanceDailyData.WorkKindFlgDef.Holiday] = Color.Red;
+                // ç‰¹æ®Šä¼‘ï¼ˆ2020/5/6ã€€æ€¥é�½è¿½åŠ ï¼‰
+                s_WorkKindColor[(int)AttendanceDailyData.WorkKindFlgDef.UniqueDay] = Color.Gold;
             }
             catch (Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkList.resx	(revision 483)
@@ -159,4 +159,10 @@
   <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNotice.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNotice.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNotice.Designer.cs	(revision 483)
@@ -28,10 +28,10 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle 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.lblTitle = new System.Windows.Forms.Label();
             this.pnlDateType1 = new System.Windows.Forms.Panel();
@@ -297,14 +297,14 @@
             this.dgvConstr2.AllowUserToResizeRows = false;
             this.dgvConstr2.BackgroundColor = System.Drawing.Color.White;
             this.dgvConstr2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvConstr2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvConstr2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvConstr2.ColumnHeadersHeight = 30;
             this.dgvConstr2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvConstr2.ColumnHeadersVisible = false;
@@ -337,8 +337,8 @@
             // 
             // dataGridViewTextBoxColumn2
             // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle6;
             this.dataGridViewTextBoxColumn2.HeaderText = "å·¥äº‹å��ç§°";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -346,7 +346,7 @@
             // 
             // btnDataDelete
             // 
-            this.btnDataDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDataDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnDataDelete.BackColor = System.Drawing.Color.Red;
             this.btnDataDelete.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataDelete.ForeColor = System.Drawing.Color.White;
@@ -361,7 +361,7 @@
             // 
             // btnEnd
             // 
-            this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            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.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnEnd.ForeColor = System.Drawing.Color.White;
@@ -668,14 +668,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvConstr.BackgroundColor = System.Drawing.Color.White;
             this.dgvConstr.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvConstr.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvConstr.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvConstr.ColumnHeadersHeight = 30;
             this.dgvConstr.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvConstr.ColumnHeadersVisible = false;
@@ -708,8 +708,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column2.HeaderText = "å·¥äº‹å��ç§°";
             this.Column2.Name = "Column2";
             this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -777,7 +777,7 @@
             // 
             // btnDataEntry
             // 
-            this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            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.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
@@ -944,7 +944,7 @@
             // 
             // btnComment
             // 
-            this.btnComment.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnComment.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnComment.BackColor = System.Drawing.Color.SpringGreen;
             this.btnComment.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnComment.ForeColor = System.Drawing.Color.Black;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNotice.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNotice.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNotice.cs	(revision 483)
@@ -269,7 +269,10 @@
             }
 
             // çµ‚äº†ãƒœã‚¿ãƒ³ã�ŒONã�ªã‚‰ã�°å‰�ãƒ—ãƒ­ã‚»ã‚¹ã�«æˆ»ã‚‹
-            if (m_NowProcessRemove) ClsExcute.BackProcess();
+            if (m_NowProcessRemove)
+            {
+                if (!m_SubForm) ClsExcute.BackProcess();
+            }
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNoticeAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNoticeAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkNoticeAux.cs	(revision 483)
@@ -90,30 +90,30 @@
                 pnlDateType3.Visible = false;
                 switch (m_ExceNo)
                 {
-                    case (int)AttendanceDailyData.WorkKindFlgDef.OutEarly:               //  1:æ—©å‡º
-                    case (int)AttendanceDailyData.WorkKindFlgDef.OverTime:               //  2:æ®‹æ¥­
+                    case (int)AttendanceDailyData.WorkKindFlgDef.OutEarly:              //  1:æ—©å‡º
+                    case (int)AttendanceDailyData.WorkKindFlgDef.OverTime:              //  2:æ®‹æ¥­
                         pnlDateType1.Visible = true;
                         groupBoxEx2.Visible = true;
                         break;
 
-                    case (int)AttendanceDailyData.WorkKindFlgDef.HolidayWork:            //  3:ä¼‘æ—¥å‡ºå‹¤
+                    case (int)AttendanceDailyData.WorkKindFlgDef.HolidayWork:           //  3:ä¼‘æ—¥å‡ºå‹¤
                         pnlDateType3.Visible = true;
                         pnlFurikyu.Visible = false;
                         break;
-                    case (int)AttendanceDailyData.WorkKindFlgDef.TransferHoliday:        //  4:æŒ¯æ›¿ä¼‘æ—¥
+                    case (int)AttendanceDailyData.WorkKindFlgDef.TransferHoliday:       //  4:æŒ¯æ›¿ä¼‘æ—¥
                         pnlDateType3.Visible = true;
                         pnlFurikyu.Visible = true;
                         break;
-                    case (int)AttendanceDailyData.WorkKindFlgDef.CompensatoryHoliday:    //  5:ä»£ã€€ä¼‘
+                    case (int)AttendanceDailyData.WorkKindFlgDef.CompensatoryHoliday:   //  5:ä»£ã€€ä¼‘
                         pnlDateType3.Visible = true;
                         pnlFurikyu.Visible = false;
                         break;
 
-                    case (int)AttendanceDailyData.WorkKindFlgDef.PaidHolidays:           //  6:æœ‰çµ¦ä¼‘æš‡
+                    case (int)AttendanceDailyData.WorkKindFlgDef.PaidHolidays:          //  6:æœ‰çµ¦ä¼‘æš‡
                         pnlDateType2.Visible = true;
                         radioButton4.Visible = false;
                         break;
-                    case (int)AttendanceDailyData.WorkKindFlgDef.Absence:                //  7:æ¬ ã€€å‹¤
+                    case (int)AttendanceDailyData.WorkKindFlgDef.Absence:               //  7:æ¬ ã€€å‹¤
                         pnlDateType2.Visible = true;
                         radioButton1.Visible = false;
                         radioButton2.Visible = false;
@@ -121,9 +121,9 @@
                         radioButton4.Checked = true;
                         break;
 
-                    case (int)AttendanceDailyData.WorkKindFlgDef.Late:                   //  8:é�…ã€€åˆ»
-                    case (int)AttendanceDailyData.WorkKindFlgDef.LeaveEarly:             //  9:æ—©ã€€é€€
-                    case (int)AttendanceDailyData.WorkKindFlgDef.GoOut:                  // 10:å¤–ã€€å‡º
+                    case (int)AttendanceDailyData.WorkKindFlgDef.Late:                  //  8:é�…ã€€åˆ»
+                    case (int)AttendanceDailyData.WorkKindFlgDef.LeaveEarly:            //  9:æ—©ã€€é€€
+                    case (int)AttendanceDailyData.WorkKindFlgDef.GoOut:                 // 10:å¤–ã€€å‡º
                         pnlDateType1.Visible = true;
                         groupBoxEx2.Visible = false;
                         break;
@@ -948,6 +948,17 @@
                 // å�–å¾—æ®‹ã�Œç„¡ã�‘ã‚Œã�°æŠœã�‘ã‚‹
                 if (dWork == 0) return true;
 
+                // æœ€é«˜è²¬ä»»è€…ã�¯æœ‰çµ¦å‰�å€Ÿã�®ç”³è«‹ã�Œè¡Œã�ˆã‚‹
+                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // çµŒå–¶è€…ã‚¢ã‚¯ã‚»ã‚¹
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode)                               // ã‚·ã‚¹ãƒ†ãƒ ç®¡ç�†è€…
+                {
+                    return true;
+                }
+                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)       // çµŒå–¶è€…ã‚¢ã‚¯ã‚»ã‚¹
+                {
+                    return true;
+                }
+
                 // ----- å‰�å¹´åº¦ã‚’å¯¾è±¡ã�¨ã�™ã‚‹
                 // å‰�å¹´åº¦æœ‰çµ¦æ®‹ã�Œè¶³ã‚Šã�ªã�„å ´å�ˆ
                 if (ManRec.PaidVacationDaysPrev < dWork)
@@ -991,66 +1002,78 @@
 
                 DataGridView dgv = dgvConstr;
                 CommonMotions.chgBackColor(dgv.Rows[0].Cells[1], true);
-                if (radioButton5.Checked)
+
+                // å·¥äº‹é�¸æŠžã�¯å·¥äº‹ãƒ�ã‚§ãƒƒã‚¯
+                if (radioButton5.Checked && CommonMotions.cnvString(dgv.Rows[0].Cells[1].Value).Length < 1)
                 {
-                    // å·¥äº‹é�¸æŠžã�¯å·¥äº‹ãƒ�ã‚§ãƒƒã‚¯
-                    if (CommonMotions.cnvString(dgv.Rows[0].Cells[1].Value).Length < 1)
+                    CommonMotions.chgBackColor(dgv.Rows[0].Cells[1], false);
+                    MessageBox.Show("å·¥äº‹å��ç§°ã�Œæœªå…¥åŠ›ã�§ã�™ã€‚", "æœªå…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                CommonMotions.chgBackColor(dtType3_4, true);
+
+                // æŒ¯æ›¿ã�®å ´å�ˆä»¥å¤–ã�¯æ¬¡ã�®ãƒ�ã‚§ãƒƒã‚¯ã�¸è¡Œã��
+                if (!pnlFurikyu.Visible) goto FinalCheck;
+
+                // æŒ¯ã‚Šæ›¿ã�ˆä¼‘æ—¥ã�¯å½“æœˆå†…
+                if (dtType3_1.Value.Year != dtType3_4.Value.Year || dtType3_1.Value.Month != dtType3_4.Value.Month)
+                {
+                    CommonMotions.chgBackColor(dtType3_4, false);
+                    MessageBox.Show("æŒ¯ã‚Šæ›¿ã�ˆä¼‘æ—¥ã�¯å½“æœˆå†…ã�—ã�‹æŒ‡å®šã�§ã��ã�¾ã�›ã‚“ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // æŒ¯æ›¿ä¼‘æ—¥å­˜åœ¨ãƒ�ã‚§ãƒƒã‚¯
+                StringBuilder DaySQL = new StringBuilder();
+                DaySQL.AppendFormat(" Where PersonCode = {0}", m_ManNo);
+                DaySQL.AppendFormat(" And DATE(TransferDay) = DATE('{0}')", dtType3_4.Value.ToShortDateString());
+                List<AttendanceNotice> workList = new List<AttendanceNotice>();
+                NoticeDB.SelectAction(DaySQL.ToString(), ref workList);
+                if (workList.Count > 0)
+                {
+                    int nCnt = workList.Where(x => x.FromDate.ToShortDateString() != dtType3_1.Value.ToShortDateString()).Count();
+                    if (nCnt > 0)
                     {
-                        CommonMotions.chgBackColor(dgv.Rows[0].Cells[1], false);
-                        MessageBox.Show("å·¥äº‹å��ç§°ã�Œæœªå…¥åŠ›ã�§ã�™ã€‚", "æœªå…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        CommonMotions.chgBackColor(dtType3_4, false);
+                        MessageBox.Show("æŒ¯æ›¿ä¼‘æ—¥ã�Œæ—¢ã�«è¨­å®šã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return false;
                     }
                 }
 
-                // æŒ¯ã‚Šæ›¿ã�ˆä¼‘æ—¥ã�¯å½“æœˆå†…
-                CommonMotions.chgBackColor(dtType3_4, true);
-                if (pnlFurikyu.Visible)
+                // ä»–ã�®å±Šå­˜åœ¨ãƒ�ã‚§ãƒƒã‚¯
+                DaySQL.Clear();
+                DaySQL.AppendFormat(" Where PersonCode = {0}", m_ManNo);
+                DaySQL.AppendFormat(" And (DATE(FromDate) <= DATE('{0}')", dtType3_4.Value.ToShortDateString());
+                DaySQL.AppendFormat(" And DATE('{0}') <=  DATE(ToDate))", dtType3_4.Value.ToShortDateString());
+                workList.Clear();
+                NoticeDB.SelectAction(DaySQL.ToString(), ref workList);
+                if (workList.Count > 0)
                 {
-                    if (dtType3_1.Value.Year == dtType3_4.Value.Year
-                        && dtType3_1.Value.Month == dtType3_4.Value.Month)
-                    {
-                        // è¨­å®šä¼‘æ—¥å­˜åœ¨ãƒ�ã‚§ãƒƒã‚¯
-                        StringBuilder DaySQL = new StringBuilder();
-                        DaySQL.AppendFormat(" Where PersonCode = {0}", m_ManNo);
-                        DaySQL.AppendFormat(" And DATE(TransferDay) = DATE('{0}')", dtType3_4.Value.ToShortDateString());
-                        List<AttendanceNotice> workList = new List<AttendanceNotice>();
-                        NoticeDB.SelectAction(DaySQL.ToString(), ref workList);
-                        if (workList.Count > 0)
-                        {
-                            int nCnt = workList.Where(x => x.FromDate.ToShortDateString() != dtType3_1.Value.ToShortDateString()).Count();
-                            if (nCnt > 0)
-                            {
-                                CommonMotions.chgBackColor(dtType3_4, false);
-                                MessageBox.Show("æŒ¯æ›¿ä¼‘æ—¥ã�Œæ—¢ã�«è¨­å®šã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                                return false;
-                            }
-                        }
+                    CommonMotions.chgBackColor(dtType3_4, false);
+                    MessageBox.Show("ä»–ã�®å±Šã�Œæ—¢ã�«è¨­å®šã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
 
-                        // æŒ¯æ›¿ä¼‘æ—¥ã�¯ä¼‘ã�¿ã�®æ—¥ã�«è¨­å®šã�§ã��ã�ªã�„
-                        DaySQL.Clear();
-                        DaySQL.Append(" Select count(*) FROM holidaycalendermaster");
-                        DaySQL.AppendFormat(" Where DATE(Holiday) = DATE('{0}')", dtType3_4.Value.ToShortDateString());
-                        ArrayList array = new ArrayList();
-                        NoticeDB.ExecuteReader(DaySQL.ToString(), ref array);
-                        if (array.Count > 0)
-                        {
-                            object[] objRec = (object[])array[0];
-                            if(CommonMotions.cnvInt(objRec[0]) > 0)
-                            {
-                                CommonMotions.chgBackColor(dtType3_4, false);
-                                MessageBox.Show("æŒ¯æ›¿ä¼‘æ—¥ã�¯ä¼‘æ—¥ã�«è¨­å®šã�§ã��ã�¾ã�›ã‚“ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                                return false;
-                            }
-                        }
-                    }
-                    else
+                // æŒ¯æ›¿ä¼‘æ—¥ã�¯ä¼‘ã�¿ã�®æ—¥ã�«è¨­å®šã�§ã��ã�ªã�„
+                DaySQL.Clear();
+                DaySQL.Append(" Select count(*) FROM holidaycalendermaster");
+                DaySQL.AppendFormat(" Where DATE(Holiday) = DATE('{0}')", dtType3_4.Value.ToShortDateString());
+                ArrayList array = new ArrayList();
+                NoticeDB.ExecuteReader(DaySQL.ToString(), ref array);
+                if (array.Count > 0)
+                {
+                    object[] objRec = (object[])array[0];
+                    if (CommonMotions.cnvInt(objRec[0]) > 0)
                     {
                         CommonMotions.chgBackColor(dtType3_4, false);
-                        MessageBox.Show("æŒ¯ã‚Šæ›¿ã�ˆä¼‘æ—¥ã�¯å½“æœˆå†…ã�—ã�‹æŒ‡å®šã�§ã��ã�¾ã�›ã‚“ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        MessageBox.Show("æŒ¯æ›¿ä¼‘æ—¥ã�¯ä¼‘æ—¥ã�«è¨­å®šã�§ã��ã�¾ã�›ã‚“ã€‚", "å…¥åŠ›ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return false;
                     }
                 }
 
+                FinalCheck: // *------------------* é£›ã�³å…ˆ
+
                 CommonMotions.chgBackColor(dtType3_1, true);
                 // ç®¡ç�†è€…ãƒ»æœ€é«˜è²¬ä»»è€…ã�¯ãƒ‡ãƒ¼ã‚¿ãƒ­ãƒƒã‚¯ã‚’ã�—ã�ªã�„
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/PrintOut.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/PrintOut.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/PrintOut.cs	(revision 483)
@@ -715,6 +715,29 @@
         }
         #endregion
 
+        #region å‡ºå‹¤æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—é †
+        /// <summary>
+        /// å‡ºå‹¤æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—é †
+        /// </summary>
+        private enum ReadPrintDataOrder
+        {
+            YMD = 0,        //  0:æ—¥å ±æ—¥ä»˜
+            Holiday,        //  1:ä¼‘æ—¥æ—¥ä»˜
+            ConstrCode,     //  2:å·¥äº‹ç•ªå�·
+            ActionResult,   //  3:è¡Œå‹•å±¥æ­´
+            StartTime,      //  4:é–‹å§‹æ™‚é–“
+            CompTime,       //  5:çµ‚äº†æ™‚é–“
+            WorkingKind,    //  6:å‹¤å‹™åŒºåˆ†
+            WorkingTime,    //  7:ç¨¼åƒ�æ™‚é–“
+            Certification,  //  8:å°±æ¥­å¤–æ™‚é–“
+            Comment,        //  9:æ™‚é–“å¤–èª�å®šç�†ç”±
+            NoticeOrder,    // 10:å±Šæ��å‡ºé †
+            SeqNo,          // 11:æ—¥å ±æ—¥ä»˜å†…ä¸¦ã�³é †
+            AllAppStat,     // 12:æ—¥å ±æ‰¿èª�çŠ¶æ…‹
+            RowAppStat,     // 13:å±Šå‡ºæ‰¿èª�çŠ¶æ…‹
+        }
+        #endregion
+
         #region å‡ºå‹¤æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—SQLä½œæˆ�
         /// <summary>
         /// å‡ºå‹¤æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—SQLä½œæˆ�
@@ -945,7 +968,7 @@
                 FreeDB.ExecuteReader(strSQL.ToString(), ref DataList);
                 if (DataList.Count < 1) return;
 
-                foreach(object[] CurRec in DataList)
+                foreach (object[] CurRec in DataList)
                 {
                     CalenderDate calender = new CalenderDate();
                     calender.Year = CommonMotions.cnvInt(CurRec[0]);
@@ -1398,7 +1421,7 @@
         /// <summary>
         /// å‹¤å‹™æ™‚é–“å¤–ã�®è¨ˆç®—è¡¨ç¤º
         /// </summary>
-        private string PrintWorkingOut(string STime, string CTime,int nWorkKind, decimal dWorkingTime = 0)
+        private string PrintWorkingOut(string STime, string CTime, int nWorkKind, decimal dWorkingTime = 0)
         {
             try
             {
@@ -1549,6 +1572,7 @@
                     case (int)AttendanceDailyData.WorkKindFlgDef.PaidHolidays:          // æœ‰çµ¦ä¼‘æš‡
                     case (int)AttendanceDailyData.WorkKindFlgDef.Absence:               // æ¬ å‹¤
                     case (int)AttendanceDailyData.WorkKindFlgDef.CompensatoryHoliday:   // ä»£ä¼‘
+                    case (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay:             // ç‰¹æ®Šä¼‘
 
                         strWorkingTime = string.Format("-{0}:{1:00}", tsWorkingTime.Hours, tsWorkingTime.Minutes);
                         break;
@@ -1648,6 +1672,11 @@
                         // ä¼‘æ—¥
                         nRet = 0;
                         break;
+
+                    case (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay:
+                        // ç‰¹æ®Šä¼‘æš‡
+                        nRet = -1;
+                        break;
                 }
 
                 return nRet;
@@ -1974,6 +2003,9 @@
                     // å±Šå‡ºåŒºåˆ†ã‚³ãƒ¼ãƒ‰å�–å¾—
                     int AttendanceNo = CommonMotions.cnvInt(CurRec[(int)ReadNoticeOrder.AttendanceNo]);
 
+                    // ç‰¹æ®Šä¼‘æš‡ã�¯ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã�Œç„¡ã�„ã�Ÿã‚�å�°åˆ·ã�—ã�ªã�„
+                    if (AttendanceNo == (int)AttendanceDailyData.WorkKindFlgDef.UniqueDay) continue;
+
                     // å‹¤æ€ å±Šã‚·ãƒ¼ãƒˆã�®å�–å¾—
                     string strManName = CommonMotions.cnvString(objMan[(int)PersonDataOrder.PersonName]);
                     string strSheetName = string.Format("{0} å‹¤æ€ å±Š {1}", strManName, (DataCnt++).ToString("00"));
@@ -1980,7 +2012,7 @@
                     m_UsedExcel.ExcelSheetGet(CreateNewSheetName(AttendanceNo), true, strSheetName);
 
                     // å±Šå‡ºãƒ˜ãƒƒãƒ€ãƒ¼ã‚»ãƒƒãƒˆ
-                    if(!SetNoticeHeadr(AttendanceNo, objMan, CurRec)) return CommonDefine.RetunAnswer.Answer6;
+                    if (!SetNoticeHeadr(AttendanceNo, objMan, CurRec)) return CommonDefine.RetunAnswer.Answer6;
 
                     // äº‹ç”±ã�®ã‚»ãƒƒãƒˆ
                     string strReason = CommonMotions.cnvString(CurRec[(int)ReadNoticeOrder.Reason]);
@@ -2026,7 +2058,7 @@
                     case (int)AttendanceDailyData.WorkKindFlgDef.OverTime:              //  2:æ®‹ã€€æ¥­
                     case (int)AttendanceDailyData.WorkKindFlgDef.HolidayWork:           //  9:ä¼‘æ—¥å‡ºå‹¤
                         strSheetName = s_SheetName[(int)SheetNameDef.æ—©æ®‹ä¼‘å‡º];
-                            break;
+                        break;
 
                     case (int)AttendanceDailyData.WorkKindFlgDef.PaidHolidays:          //  6:æœ‰çµ¦ä¼‘æš‡
                     case (int)AttendanceDailyData.WorkKindFlgDef.Absence:               //  7:æ¬ ã€€å‹¤
@@ -2172,7 +2204,7 @@
             {
                 Color clrBackColor = s_WorkKindColor[WorkingKind];
                 Color clrForeColor = Color.Black;
-                
+
                 // ----- è‰²ã�®ã‚»ãƒƒãƒˆ
                 m_UsedExcel.ExcelCellColorSet("A2", "T2", clrForeColor, clrBackColor);                  // ã‚¿ã‚¤ãƒˆãƒ«è‰²
                 m_UsedExcel.ExcelCellColorSet("A8", "B8", clrForeColor, clrBackColor);                  // æ‰€å±žè‰²
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.cs	(revision 483)
@@ -42,19 +42,23 @@
         private enum DCFirstHalf
         {
             /// <summary>
-            /// 0:•\Ž¦’†ƒf�[ƒ^ƒR�[ƒh
+            /// ƒ}�[ƒN
             /// </summary>
-            SelectionCode = 0,
+            Mark = 0,
             /// <summary>
-            /// 1:‡‚
+            /// 1:•\Ž¦’†ƒf�[ƒ^ƒR�[ƒh
             /// </summary>
+            SelectionCode,
+            /// <summary>
+            /// 2:‡‚
+            /// </summary>
             No,
             /// <summary>
-            /// 2:•\Ž¦’†ƒf�[ƒ^–¼
+            /// 3:•\Ž¦’†ƒf�[ƒ^–¼
             /// </summary>
             SelectionName,
             /// <summary>
-            /// 3:Žó’�‹àŠz
+            /// 4:Žó’�‹àŠz
             /// </summary>
             OrdersDecisionPrice,
         }
@@ -69,15 +73,27 @@
             /// <summary>
             /// 7:‘�Žx•¥Šz
             /// </summary>
-            TotalPayment = -3,
+            TotalPayment = -6,
             /// <summary>
             /// 8:‘e—˜
             /// </summary>
-            GrossProfit = -2,
+            GrossProfit = -5,
             /// <summary>
             /// 9:�ƒ—˜‰v
             /// </summary>
-            NetProfit = -1,
+            NetProfit = -4,
+            /// <summary>
+            /// ƒL�[�€–Ú‚P
+            /// </summary>
+            KeyVal1 = -3,
+            /// <summary>
+            /// ƒL�[�€–Ú‚Q
+            /// </summary>
+            KeyVal2 = -2,
+            /// <summary>
+            /// ƒL�[�€–Ú‚R
+            /// </summary>
+            KeyVal3 = -1,
         }
         #endregion
 
@@ -283,6 +299,19 @@
         }
         #endregion
 
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
+        /// <summary>
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnStageUp_Click(object sender, EventArgs e)
+        {
+            // ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+            StageUpProcess();
+        }
+        #endregion
+
         #region ƒtƒH�[ƒ€ƒ��[ƒh
         /// <summary>
         /// �‰ŠúƒtƒH�[ƒ€ƒ��[ƒh
@@ -303,7 +332,7 @@
         /// <param name="e"></param>
         private async void FrmDepExpenssList_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
 
             // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
             InitFormLoad();
@@ -449,39 +478,18 @@
 
             // ƒf�[ƒ^‚ª‚È‚¢�ê�‡‚Í”²‚¯‚é
             if (dgv.RowCount == 0) return;
+            
             // �‡Œv�s‚Í�ˆ—�‚µ‚È‚¢
-            string strWork = CommonMotions.cnvString(CurRow.Cells[(int)DCFirstHalf.SelectionName].Value);
-            bool bTitle = false;
-            foreach (string strTitle in s_TotalTitleArray1)
-            {
-                if (strWork.Equals(strTitle))
-                {
-                    bTitle = true;
-                    break;
-                }
-            }
-            if (!bTitle)
-            {
-                foreach (string strTitle in s_TotalTitleArray2)
-                {
-                    if (strWork.Equals(strTitle))
-                    {
-                        bTitle = true;
-                        break;
-                    }
-                }
-            }
+            string strWork = CommonMotions.cnvString(CurRow.Cells[(int)DCFirstHalf.Mark].Value);
+            if (strWork.Equals("*")) return;
 
             // �s‘I‘ð�F‚ðŒ³‚É–ß‚·
             if (m_BeforeGridRow >= 0) DefaultRowChangeColor(m_BeforeGridRow);
 
-            if (!bTitle)
-            {
-                // ‘I‘ð�s�”‚ð‘Þ”ð
-                m_BeforeGridRow = dgv.CurrentRow.Index;
-                // �s‘I‘ð�F‚ð�Ý’è
-                SelectRowChangeColor(m_BeforeGridRow);
-            }
+            // ‘I‘ð�s�”‚ð‘Þ”ð
+            m_BeforeGridRow = dgv.CurrentRow.Index;
+            // �s‘I‘ð�F‚ð�Ý’è
+            SelectRowChangeColor(m_BeforeGridRow);
         }
         #endregion
 
@@ -559,6 +567,19 @@
         }
         #endregion
 
+        #region �Å�V‚Ì�ó‘Ô‚Öƒ{ƒ^ƒ“‰Ÿ‰º
+        /// <summary>
+        /// �Å�V‚Ì�ó‘Ô‚Öƒ{ƒ^ƒ“‰Ÿ‰º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnReLoadData_Click(object sender, EventArgs e)
+        {
+            // ƒf�[ƒ^•\Ž¦
+            DataDisplay();
+        }
+        #endregion
+
         #region –¢�ì�¬‘ä’ ˆê——•\Ž¦
         /// <summary>
         /// –¢�ì�¬‘ä’ ˆê——•\Ž¦
@@ -622,9 +643,11 @@
         }
         #endregion
 
+        #region ƒfƒoƒbƒO—p
         private void button1_Click(object sender, EventArgs e)
         {
             SetDepartmentCode();
         }
+        #endregion
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs	(revision 483)
@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDepExpenssList));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -47,18 +48,11 @@
             this.ProgressBar = new System.Windows.Forms.ProgressBar();
             this.btnLedgerStatus = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
+            this.btnHelp = new System.Windows.Forms.Button();
+            this.btnStageUp = new System.Windows.Forms.Button();
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.btnReLoadData = new System.Windows.Forms.Button();
             this.pnlPayroll = new System.Windows.Forms.Panel();
             this.label18 = new System.Windows.Forms.Label();
             this.lblEndDate = new System.Windows.Forms.Label();
@@ -95,7 +89,20 @@
             this.numUDConstPro = new System.Windows.Forms.NumericUpDown();
             this.label4 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.btnHelp = new System.Windows.Forms.Button();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.pnlPayroll.SuspendLayout();
@@ -175,6 +182,38 @@
             this.button1.Visible = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // btnHelp
+            // 
+            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnHelp.BackColor = System.Drawing.Color.Black;
+            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHelp.ForeColor = System.Drawing.Color.White;
+            this.btnHelp.Location = new System.Drawing.Point(1309, 0);
+            this.btnHelp.Name = "btnHelp";
+            this.btnHelp.Size = new System.Drawing.Size(30, 30);
+            this.btnHelp.TabIndex = 112;
+            this.btnHelp.TabStop = false;
+            this.btnHelp.Text = "ï¼Ÿ";
+            this.btnHelp.UseVisualStyleBackColor = false;
+            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            // 
+            // btnStageUp
+            // 
+            this.btnStageUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnStageUp.BackColor = System.Drawing.Color.White;
+            this.btnStageUp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnStageUp.ForeColor = System.Drawing.Color.Black;
+            this.btnStageUp.Image = ((System.Drawing.Image)(resources.GetObject("btnStageUp.Image")));
+            this.btnStageUp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnStageUp.Location = new System.Drawing.Point(5, 621);
+            this.btnStageUp.Name = "btnStageUp";
+            this.btnStageUp.Size = new System.Drawing.Size(120, 32);
+            this.btnStageUp.TabIndex = 131;
+            this.btnStageUp.Text = "ã€€ä¸Šã�«æˆ»ã‚‹";
+            this.btnStageUp.UseVisualStyleBackColor = false;
+            this.btnStageUp.Visible = false;
+            this.btnStageUp.Click += new System.EventHandler(this.btnStageUp_Click);
+            // 
             // dgvMaster
             // 
             this.dgvMaster.AllowUserToAddRows = false;
@@ -198,6 +237,7 @@
             this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column11,
             this.Column1,
             this.Column2,
             this.Column3,
@@ -207,7 +247,10 @@
             this.Column7,
             this.Column8,
             this.Column9,
-            this.Column10});
+            this.Column10,
+            this.Column12,
+            this.Column13,
+            this.Column14});
             dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
             dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
@@ -218,7 +261,7 @@
             this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
             this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgvMaster.EnableHeadersVisualStyles = false;
-            this.dgvMaster.Location = new System.Drawing.Point(5, 170);
+            this.dgvMaster.Location = new System.Drawing.Point(5, 190);
             this.dgvMaster.Name = "dgvMaster";
             this.dgvMaster.RowHeadersVisible = false;
             this.dgvMaster.RowHeadersWidth = 20;
@@ -225,7 +268,7 @@
             this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             this.dgvMaster.RowTemplate.Height = 21;
             this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1330, 446);
+            this.dgvMaster.Size = new System.Drawing.Size(1330, 424);
             this.dgvMaster.TabIndex = 5;
             this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
             this.dgvMaster.SelectionChanged += new System.EventHandler(this.dgvMaster_SelectionChanged);
@@ -232,133 +275,12 @@
             this.dgvMaster.Leave += new System.EventHandler(this.dgvMaster_Leave);
             this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
             // 
-            // Column1
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "ã‚³ãƒ¼ãƒ‰";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Visible = false;
-            this.Column1.Width = 5;
-            // 
-            // Column2
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column2.Frozen = true;
-            this.Column2.HeaderText = "â„–";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 50;
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "éƒ¨ã€€ç½²";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 280;
-            // 
-            // Column4
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column4.Frozen = true;
-            this.Column4.HeaderText = "å�—æ³¨é‡‘é¡�";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column4.Width = 140;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column5.HeaderText = "ä¼šç¤¾çµŒè²»";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 140;
-            // 
-            // Column6
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column6.HeaderText = "éƒ¨ç½²çµŒè²»";
-            this.Column6.Name = "Column6";
-            this.Column6.ReadOnly = true;
-            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 140;
-            // 
-            // Column7
-            // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
-            this.Column7.HeaderText = "å–¶æ¥­çµŒè²»";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column7.Width = 140;
-            // 
-            // Column8
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle10;
-            this.Column8.HeaderText = "ç·�æ”¯æ‰•é¡�";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column8.Width = 140;
-            // 
-            // Column9
-            // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle11;
-            this.Column9.HeaderText = "ç²—ã€€åˆ©";
-            this.Column9.Name = "Column9";
-            this.Column9.ReadOnly = true;
-            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column9.Width = 140;
-            // 
-            // Column10
-            // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle12;
-            this.Column10.HeaderText = "ç´”åˆ©ç›Š";
-            this.Column10.Name = "Column10";
-            this.Column10.ReadOnly = true;
-            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column10.Width = 140;
-            // 
             // groupBox1
             // 
             this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.groupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
             this.groupBox1.BorderColor = System.Drawing.Color.White;
+            this.groupBox1.Controls.Add(this.btnReLoadData);
             this.groupBox1.Controls.Add(this.pnlPayroll);
             this.groupBox1.Controls.Add(this.cmbDepartment);
             this.groupBox1.Controls.Add(this.label5);
@@ -369,10 +291,25 @@
             this.groupBox1.ForeColor = System.Drawing.Color.White;
             this.groupBox1.Location = new System.Drawing.Point(5, 38);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1330, 128);
+            this.groupBox1.Size = new System.Drawing.Size(1330, 148);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
+            // btnReLoadData
+            // 
+            this.btnReLoadData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnReLoadData.BackColor = System.Drawing.Color.SpringGreen;
+            this.btnReLoadData.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnReLoadData.ForeColor = System.Drawing.Color.Black;
+            this.btnReLoadData.Location = new System.Drawing.Point(1203, 7);
+            this.btnReLoadData.Name = "btnReLoadData";
+            this.btnReLoadData.Size = new System.Drawing.Size(120, 30);
+            this.btnReLoadData.TabIndex = 71;
+            this.btnReLoadData.TabStop = false;
+            this.btnReLoadData.Text = "æœ€æ–°çŠ¶æ…‹ã�«æ›´æ–°";
+            this.btnReLoadData.UseVisualStyleBackColor = false;
+            this.btnReLoadData.Click += new System.EventHandler(this.btnReLoadData_Click);
+            // 
             // pnlPayroll
             // 
             this.pnlPayroll.BackColor = System.Drawing.Color.LightSteelBlue;
@@ -408,7 +345,7 @@
             this.pnlPayroll.Controls.Add(this.label9);
             this.pnlPayroll.Location = new System.Drawing.Point(6, 37);
             this.pnlPayroll.Name = "pnlPayroll";
-            this.pnlPayroll.Size = new System.Drawing.Size(1318, 84);
+            this.pnlPayroll.Size = new System.Drawing.Size(1318, 104);
             this.pnlPayroll.TabIndex = 46;
             // 
             // label18
@@ -417,11 +354,11 @@
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label18.ForeColor = System.Drawing.Color.Red;
-            this.label18.Location = new System.Drawing.Point(942, 59);
+            this.label18.Location = new System.Drawing.Point(686, 80);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(345, 19);
             this.label18.TabIndex = 56;
-            this.label18.Text = "â€»å½“æœŸäººä»¶è²»ã�®ã�Šã�Šã‚ˆã��ã�®è¨ˆç®—ã�§ã�™";
+            this.label18.Text = "â€»å½“æœŸäººä»¶è²»ã�¯ã�Šã�Šã‚ˆã��ã�®è¨ˆç®—ã�§ã�™";
             // 
             // lblEndDate
             // 
@@ -848,21 +785,158 @@
             this.label7.Text = "ç¬¬";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // btnHelp
+            // Column11
             // 
-            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnHelp.BackColor = System.Drawing.Color.Black;
-            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1309, 0);
-            this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Size = new System.Drawing.Size(30, 30);
-            this.btnHelp.TabIndex = 112;
-            this.btnHelp.TabStop = false;
-            this.btnHelp.Text = "ï¼Ÿ";
-            this.btnHelp.UseVisualStyleBackColor = false;
-            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            this.Column11.Frozen = true;
+            this.Column11.HeaderText = "ãƒžãƒ¼ã‚¯";
+            this.Column11.Name = "Column11";
+            this.Column11.ReadOnly = true;
+            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column11.Visible = false;
             // 
+            // Column1
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "ã‚³ãƒ¼ãƒ‰";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Visible = false;
+            this.Column1.Width = 5;
+            // 
+            // Column2
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle4;
+            this.Column2.Frozen = true;
+            this.Column2.HeaderText = "â„–";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column2.Width = 50;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "éƒ¨ã€€ç½²";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 280;
+            // 
+            // Column4
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column4.Frozen = true;
+            this.Column4.HeaderText = "å�—æ³¨é‡‘é¡�";
+            this.Column4.Name = "Column4";
+            this.Column4.ReadOnly = true;
+            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column4.Width = 140;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column5.HeaderText = "ä¼šç¤¾çµŒè²»";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Width = 140;
+            // 
+            // Column6
+            // 
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column6.HeaderText = "éƒ¨ç½²çµŒè²»";
+            this.Column6.Name = "Column6";
+            this.Column6.ReadOnly = true;
+            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column6.Width = 140;
+            // 
+            // Column7
+            // 
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
+            this.Column7.HeaderText = "å–¶æ¥­çµŒè²»";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column7.Width = 140;
+            // 
+            // Column8
+            // 
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column8.HeaderText = "ç·�æ”¯æ‰•é¡�";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column8.Width = 140;
+            // 
+            // Column9
+            // 
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle11;
+            this.Column9.HeaderText = "ç²—ã€€åˆ©";
+            this.Column9.Name = "Column9";
+            this.Column9.ReadOnly = true;
+            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column9.Width = 140;
+            // 
+            // Column10
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle12;
+            this.Column10.HeaderText = "ç´”åˆ©ç›Š";
+            this.Column10.Name = "Column10";
+            this.Column10.ReadOnly = true;
+            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column10.Width = 140;
+            // 
+            // Column12
+            // 
+            this.Column12.HeaderText = "Key1";
+            this.Column12.Name = "Column12";
+            this.Column12.ReadOnly = true;
+            this.Column12.Visible = false;
+            // 
+            // Column13
+            // 
+            this.Column13.HeaderText = "Key2";
+            this.Column13.Name = "Column13";
+            this.Column13.ReadOnly = true;
+            this.Column13.Visible = false;
+            // 
+            // Column14
+            // 
+            this.Column14.HeaderText = "Key3";
+            this.Column14.Name = "Column14";
+            this.Column14.ReadOnly = true;
+            this.Column14.Visible = false;
+            // 
             // FrmDepExpenssList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -870,6 +944,7 @@
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1340, 657);
+            this.Controls.Add(this.btnStageUp);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.btnLedgerStatus);
@@ -948,6 +1023,10 @@
         private System.Windows.Forms.Button btnLedgerStatus;
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.Button btnStageUp;
+        private System.Windows.Forms.Button btnReLoadData;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
@@ -958,6 +1037,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
-        private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.resx	(revision 483)
@@ -117,6 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnStageUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVDhP7ZI9
+        zkRQFIY1EpVeIxKFDahZgEql19uAfUgswRLEClQqvcRPIiQKUWnu5J45904MZsg35fckrzjHe5+QEMiP
+        +Rf+nZ0wyzKiqipO99kIx3EkgiBA0jTF7T02QiZj6fsen1yHC3Vd3wlp7gInbNs+lNGIogjFM+q6hl4Q
+        BDCDcBgGGCiSJEFhmiaY53kmy7LA/RFRFEHfcRyYd99kWRYUkiTBzWfom9F+GIYw74RxHENBlmXcfIZ2
+        adq2fc5wfYOVXNfFzTGGYUBP0zTcnAjLsuRS0zRx+6JpGqIoCu+s64pPToSUoij4ARYqf991XYcnnpwK
+        GZ7n7SQ0vu9jY8tXIaOqKpLnOf+dzrgsvMqPhYQ8AEeNfa7rogIhAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -147,4 +162,13 @@
   <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column13.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: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 483)
@@ -340,7 +340,6 @@
         /// ƒOƒŠƒbƒh�sƒf�[ƒ^ƒZƒbƒg
         /// </summary>
         private void GridDataSet(int ExecCode, ArrayList arData, ref int ino, ref long[] TotalArea,
-                                    ArrayList TargetList,
                                     DateTime dtDefaultStart, DateTime dtDefaultEnd,
                                     IOMPersonInCharge SalaryDB, IOConstructionLedger LedgerDB, IOCostDataOfPerson CostDB,
                                     List<SalaryClass> ArrarySalary, List<PersonExpensesCost> ArraryCost)
@@ -350,34 +349,16 @@
                 DataGridViewEX dgv = dgvMaster;
 
                 // ‘Î�Ûƒf�[ƒ^‚ðŽæ“¾‚·‚é
-                ArrayList ArrayData = new ArrayList();
-                object[] objwrk = null;
-                long MaxOrder = -1;
-                foreach (object[] ObjRec in arData)
-                {
-                    // ƒŒƒR�[ƒh‚Ì�æ“ª‚ÍƒR�[ƒh
-                    int wrkCode = CommonMotions.cnvInt(ObjRec[(int)DBGetData.DepartmentCode]);
-                    if (wrkCode != ExecCode) continue;
+                int nGetCode = (int)DBGetData.DepartmentCode;
+                List<object[]> ArrayData = arData.Cast<object[]>()
+                                                    .Where(x => CommonMotions.cnvInt(x[nGetCode]) == ExecCode)
+                                                    .ToList();
 
-                    ArrayData.Add(ObjRec);
+                // Žó’�‹àŠz‚ª‘å‚«‚¢‚à‚Ì‚ðŽc‚·
+                nGetCode = (int)DBGetData.OrdersDecisionprice;
+                object[] objwrk = ArrayData.OrderByDescending(x => CommonMotions.cnvLong(x[nGetCode]))
+                                            .First();
 
-                    // Žó’�‹àŠz‚ª‘å‚«‚¢‚à‚Ì‚ðŽc‚·
-                    long wrkOrder = CommonMotions.cnvLong(ObjRec[(int)DBGetData.OrdersDecisionprice]);
-                    if (MaxOrder < wrkOrder)
-                    {
-                        objwrk = ObjRec;
-                        MaxOrder = wrkOrder;
-                    }
-                }
-
-                int TotalColCnt = Enum.GetNames(typeof(DBGetData)).Length;
-                long[] wrkArray = new long[TotalColCnt];
-
-                // Žó’�‹àŠzˆÈ�~‚ðƒZƒbƒg‚·‚é
-                for (int i = (int)DBGetData.OrdersDecisionprice; i <= (int)DBGetData.NetProfit; i++)
-                {
-                    wrkArray[i] = CommonMotions.cnvInt(objwrk[i]);
-                }
                 // ------ •”��ƒR�[ƒh�E’S“–ŽÒƒR�[ƒhŽæ“¾
                 int DepartmentCode = GetDepartmentCode();
                 int PersonCode = 0;
@@ -390,8 +371,8 @@
                 {   // •”��‚ª‚ ‚ê‚Î’S“–ŽÒƒR�[ƒh‚ðƒf�[ƒ^‚æ‚èŽæ“¾‚·‚é
                     PersonCode = CommonMotions.cnvInt(objwrk[(int)DBGetData.DepartmentCode]);
                 }
+
                 // ------------------------------------------------------------------------------------------
-
                 // ------ Œo”ï�E�U•ª�lŒ�”ïŽæ“¾
                 int TargetYear = (int)numUDConstPro.Value;
                 long CostValue = 0;
@@ -403,13 +384,9 @@
                 if (PersonCode == 0)
                 {
                     // Œo”ïŽæ“¾
-                    CostValue = ArraryCost.Where(x => x.DepartmentCode == DepartmentCode)
-                                            .Sum(x => x.CostValue.Sum());
-
+                    CostValue = ArraryCost.Where(x => x.DepartmentCode == DepartmentCode).Sum(x => x.CostValue.Sum());
                     // ‹‹—^—Ý�ÏŽæ“¾
-                    TotalSalary = ArrarySalary.Where(x => x.DepartmentCode == DepartmentCode)
-                                                .Sum(y => y.SalaryValue);
-
+                    TotalSalary = ArrarySalary.Where(x => x.DepartmentCode == DepartmentCode).Sum(y => y.SalaryValue);
                     // �U•ª‹‹—^‹àŠz
                     CommonLedgerData.ProfitGeneral(LedgerDB, TargetYear, DepartmentCode, 0, ref OnSalary);
                 }
@@ -416,15 +393,11 @@
                 else
                 {
                     // Œo”ïŽæ“¾
-                    CostValue = ArraryCost.Where(x => x.DepartmentCode == DepartmentCode
-                                                    && x.PersonCode == PersonCode)
+                    CostValue = ArraryCost.Where(x => x.DepartmentCode == DepartmentCode && x.PersonCode == PersonCode)
                                             .Sum(x => x.CostValue.Sum());
-
                     // ‹‹—^—Ý�ÏŽæ“¾
-                    TotalSalary = ArrarySalary.Where(x => x.DepartmentCode == DepartmentCode
-                                                        && x.PersonCode == PersonCode)
+                    TotalSalary = ArrarySalary.Where(x => x.DepartmentCode == DepartmentCode && x.PersonCode == PersonCode)
                                                 .Sum(y => y.SalaryValue);
-
                     // �U•ª‹‹—^‹àŠz
                     CommonLedgerData.ProfitGeneral(LedgerDB, TargetYear, DepartmentCode, PersonCode, ref OnSalary);
                 }
@@ -433,6 +406,15 @@
                 //Debug.WriteLine("");
                 //Debug.WriteLine(string.Format("{0}\t:{1}\t:{2}\t:{3}\t:{4}", DepartmentCode, PersonCode, CostValue, TotalSalary, OnSalary));
 
+                int TotalColCnt = Enum.GetNames(typeof(DBGetData)).Length;
+                long[] wrkArray = new long[TotalColCnt];
+
+                // Žó’�‹àŠzˆÈ�~‚ðƒZƒbƒg‚·‚é
+                for (int i = (int)DBGetData.OrdersDecisionprice; i <= (int)DBGetData.NetProfit; i++)
+                {
+                    wrkArray[i] = CommonMotions.cnvInt(objwrk[i]);
+                }
+
                 // ----- Œo”ï“™‰ÁŽZ
                 // ‘�Žx•¥Šz+=�HŽ–ŠO�w“ü•i
                 wrkArray[(int)DBGetData.TotalPayment] += CostValue;
@@ -444,8 +426,8 @@
                 // �ƒ—˜‰v-�U•ª‹‹—^�·Šz
                 long TotalValue = TotalSalary - OnSalary;
                 wrkArray[(int)DBGetData.NetProfit] -= TotalValue;
+
                 // ------------------------------------------------------------------------------------------
-
                 // ------ �U•ª‹‹—^‚ðŽæ“¾‚·‚é
                 int[] CostValue3 = new int[2];
                 // •â�•�lŒ�”ï�U•ª‹àŠz‚ðŽæ“¾‚·‚é
@@ -452,9 +434,26 @@
                 CommonLedgerData.GetPersonAuxiliaryCostValue(TargetYear, DepartmentCode, PersonCode, ref CostValue3);
                 // �ƒ—˜‰v‰ÁŽZ
                 wrkArray[(int)DBGetData.NetProfit] += CostValue3.Sum();
+
                 // ------------------------------------------------------------------------------------------
+                // ‘S•”��•\Ž¦Žž‚É•”��–ˆ‚ÌŒo”ïƒf�[ƒ^‚ðŽæ“¾‚·‚é
+                if (GetDepartmentCode() == 0)
+                {
+                    // ‘Î�Û•”��‚Ì�o”[‹àŠz�‡Œv‚ðŽæ“¾‚·‚é
+                    decimal decInData = CalcCostDataTotal(ExecCode, true);
+                    // ‘�Žx•¥Šz+=�o”[ƒf�[ƒ^
+                    wrkArray[(int)DBGetData.TotalPayment] += (long)decInData;
+
+                    decInData = CalcCostDataTotal(ExecCode, false);
+                    // ‘e—˜‰v+=�o”[ƒf�[ƒ^
+                    wrkArray[(int)DBGetData.GrossProfit] += (long)decInData;
+                    // �ƒ—˜‰v+=�o”[ƒf�[ƒ^
+                    wrkArray[(int)DBGetData.NetProfit] += (long)decInData;
+                }
+
+                // ------------------------------------------------------------------------------------------
                 // ‘S‘Ì•\Ž¦Žž�A‘S‚Ä‚O‚Í•\Ž¦‚µ‚È‚¢
-                if (PersonCode == 0 && wrkArray.Sum() == 0) { return; }
+                if (DepartmentCode > 0 && PersonCode == 0 && wrkArray.Sum() == 0) { return; }
 
                 // ------------------------------------------------------------------------------------------
                 // �s�ì�¬‚ÆŒo”ï‚æ‚è‘O‚Ìƒf�[ƒ^‚ðƒZƒbƒg‚·‚é
@@ -789,10 +788,17 @@
 
                 btnEnd.Visible = !bDisp;
                 btnLedgerStatus.Visible = !bDisp;
+                btnStageUp.Visible = !bDisp;
 
                 numUDConstPro.Enabled = !bDisp;
                 cmbDepartment.Enabled = !bDisp;
 
+                // ‘S‘Î�Û•\Ž¦Žž‚Í�ã‚É�ã‚ª‚éƒ{ƒ^ƒ“‚ð•\Ž¦‚µ‚È‚¢
+                if (!bDisp && GetDepartmentCode() > 0)
+                    btnStageUp.Visible = true;
+                else
+                    btnStageUp.Visible = false;
+
                 this.Update();
             }
             catch (Exception ex)
@@ -851,10 +857,9 @@
                 // ƒvƒ�ƒOƒŒƒXƒo�[‚Ì�‰Šú‰»
                 // ƒvƒ�ƒOƒŒƒXƒo�[•\Ž¦�§Œä
                 DisplayControlProgressBar(true);
-                // ƒvƒ�ƒOƒŒƒXƒo�[‚ÌMAX‚É“K“–‚É10‚ðƒZƒbƒg‚·‚é
-                prgber.Maximum = 10;
+                // ƒvƒ�ƒOƒŒƒXƒo�[‚ÌMAX‚É“K“–‚É12‚ðƒZƒbƒg‚·‚é
+                prgber.Maximum = 12;
 
-
                 // ----- ’S“–ŽÒ–ˆ‚ÌŽw’èŠú‚ÌŠJŽn�E�I—¹”NŒŽ“ú‚ðŽæ“¾‚·‚é
                 ArrayList TargetList = new ArrayList();
                 CommonLedgerData.GetPersonInDepartment(TargetYear, GetDepartmentCode(), 0, ref TargetList);
@@ -904,6 +909,16 @@
                 if (DepCode == 0) DispType = (int)DispDataTypeCode.AllTotal;
                 else DispType = (int)DispDataTypeCode.Department;
 
+                // �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+                GetCostDataType();
+
+                // •”���o”[ƒf�[ƒ^Žæ“¾
+                if (!GetCostDataOfCompensation()) return;
+
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
+
                 // SQL�ì�¬
                 StringBuilder strSQL = new StringBuilder();
                 switch (DispType)
@@ -939,36 +954,37 @@
 
                 int ino = 1;
                 // ƒf�[ƒ^•\Ž¦
-                if (arData.Count != 0)
-                {
-                    // ƒf�[ƒ^•\Ž¦
-                    CreateRowBlock(DispType, arData, ref ino, ref TotalArea,
-                                        TargetList,
-                                        dtDefaultStart, dtDefaultEnd, true,
-                                        SalaryDB, LedgerDB, CostDB,
-                                        ArrarySalary, ArraryCost);
-                }
+                CreateRowBlock(DispType, arData, ref ino, ref TotalArea,
+                                    TargetList,
+                                    dtDefaultStart, dtDefaultEnd, true,
+                                    SalaryDB, LedgerDB, CostDB,
+                                    ArrarySalary, ArraryCost);
 
-                // ”p•”�E‘Þ�EŽÒ‚Å‚àƒf�[ƒ^‚ª‚ ‚ê‚Î•\Ž¦‚·‚é
+
+                // ----- ”p•”�E‘Þ�EŽÒ‚Å‚àƒf�[ƒ^‚ª‚ ‚ê‚Î•\Ž¦‚·‚é
+                // ”p•”�E‘Þ�EŽÒƒf�[ƒ^Žæ“¾
                 arData.Clear();
+                GetType2DeleteData(LedgerDB, DispType, ref arData);
+
+                // ƒf�[ƒ^•\Ž¦
                 long[] RetireeTotalArea = new long[TotalColCnt];
+                CreateRowBlock(DispType, arData, ref ino, ref RetireeTotalArea,
+                                TargetList,
+                                dtDefaultStart, dtDefaultEnd, false,
+                                SalaryDB, LedgerDB, CostDB,
+                                ArrarySalary, ArraryCost);
 
-                GetType2DeleteData(LedgerDB, DispType, ref arData);
-                if (arData.Count > 0)
+                for (int i = 0; i < TotalArea.Length; i++)
                 {
-                    CreateRowBlock(DispType, arData, ref ino, ref RetireeTotalArea,
-                                    TargetList,
-                                    dtDefaultStart, dtDefaultEnd, false,
-                                    SalaryDB, LedgerDB, CostDB,
-                                    ArrarySalary, ArraryCost);
-                    for (int i = 0; i < TotalArea.Length; i++)
-                    {
-                        TotalArea[i] += RetireeTotalArea[i];
-                    }
+                    TotalArea[i] += RetireeTotalArea[i];
                 }
 
+                // •”���o”[ƒf�[ƒ^‚ðƒZƒbƒg‚·‚é
+                CreateCostData(DispType, ref TotalArea);
+
                 // ----- ‘��‡Œv�s•\Ž¦
                 int AllTotalRow = dgv.Rows.Add(1);
+                dgv.Rows[AllTotalRow].Cells[(int)DCFirstHalf.Mark].Value = "*";
                 dgv.Rows[AllTotalRow].Cells[(int)DCFirstHalf.SelectionName].Value = s_TotalTitleArray2[(int)RowTitleNum.AllTotal];
 
                 // �s‚Ì�F‚ð•Ï‚¦‚é
@@ -982,6 +998,14 @@
 
                     dgv.Rows[AllTotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
                 }
+
+                // ----- ƒAƒbƒvƒ{ƒ^ƒ“•\Ž¦�§Œä
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+                if (DepartmentCode == 0)
+                    btnStageUp.Visible = false;
+                else
+                    btnStageUp.Visible = true;
             }
             catch (Exception ex)
             {
@@ -1025,6 +1049,9 @@
             ProgressBar prgber = ProgressBar;
             try
             {
+                // ƒf�[ƒ^‚ª0‚Ì�ê�‡‚Í�ˆ—�‚µ‚È‚¢
+                if (arData.Count == 0) return;
+
                 // ‘Î�Û•”�iŽÒ�jƒR�[ƒhŽæ“¾
                 var Target = arData.Cast<object[]>().GroupBy(y => CommonMotions.cnvInt(y[(int)DBGetData.DepartmentCode]))
                                                     .ToArray();
@@ -1046,51 +1073,52 @@
                     // ----- Ž{�H’†ƒf�[ƒ^•\Ž¦
                     // ƒOƒŠƒbƒh‚Öƒf�[ƒ^•\Ž¦
                     GridDataSet(nKeyCode, arData, ref ino, ref TotalArea,
-                            TargetList,
                             dtDefaultStart, dtDefaultEnd,
                             SalaryDB, LedgerDB, CostDB,
                             ArrarySalary, ArraryCost);
                 }
 
-                dgv.Columns[(int)DCFirstHalf.SelectionName].HeaderText = GridColumnHeader[DispType];
+                int CellPo = (int)DCFirstHalf.SelectionName;
+                dgv.Columns[CellPo].HeaderText = GridColumnHeader[DispType];
 
                 // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                 prgber.Value++;
                 prgber.Update();
 
-                int depcode = GetDepartmentCode();
                 // ----- �‡Œv•\Ž¦
-                if (arData.Count > 0)
+                // �‡Œv�s•\Ž¦
+                int TotalRow = dgv.Rows.Add(1);
+                DataGridViewRow CurRow = dgv.Rows[TotalRow];
+
+                string strWork = string.Empty;
+                if (DispType == (int)DispDataTypeCode.AllTotal)
                 {
-                    // �‡Œv�s•\Ž¦
-                    int TotalRow = dgv.Rows.Add(1);
-
-                    if (DispType == (int)DispDataTypeCode.AllTotal)
-                    {
-                        if (IncumbentsFlg)
-                            dgv.Rows[TotalRow].Cells[(int)DCFirstHalf.SelectionName].Value = s_TotalTitleArray1[(int)RowTitleNum.Incumbents];
-                        else
-                            dgv.Rows[TotalRow].Cells[(int)DCFirstHalf.SelectionName].Value = s_TotalTitleArray1[(int)RowTitleNum.Retiree];
-                    }
+                    if (IncumbentsFlg)
+                        strWork = s_TotalTitleArray1[(int)RowTitleNum.Incumbents];
                     else
-                    {
-                        if (IncumbentsFlg)
-                            dgv.Rows[TotalRow].Cells[(int)DCFirstHalf.SelectionName].Value = s_TotalTitleArray2[(int)RowTitleNum.Incumbents];
-                        else
-                            dgv.Rows[TotalRow].Cells[(int)DCFirstHalf.SelectionName].Value = s_TotalTitleArray2[(int)RowTitleNum.Retiree];
-                    }
+                        strWork = s_TotalTitleArray1[(int)RowTitleNum.Retiree];
+                }
+                else
+                {
+                    if (IncumbentsFlg)
+                        strWork = s_TotalTitleArray2[(int)RowTitleNum.Incumbents];
+                    else
+                        strWork = s_TotalTitleArray2[(int)RowTitleNum.Retiree];
+                }
 
-                    // �s‚Ì�F‚ð•Ï‚¦‚é
-                    SetRowColor(dgv.Rows[TotalRow], s_RowTotalBackColor, s_RowTotalForeColor);
+                CurRow.Cells[CellPo].Value = strWork;
+                CurRow.Cells[(int)DCFirstHalf.Mark].Value = "*";
 
-                    // �”’l•\Ž¦
-                    for (int i = (int)DCFirstHalf.OrdersDecisionPrice; i < dgv.ColumnCount; i++)
-                    {
-                        // ƒwƒbƒ_�[ƒ^ƒCƒgƒ‹‚È‚µ‚Í•\Ž¦‚µ‚È‚¢
-                        if (dgv.Columns[i].HeaderText.Length < 1) continue;
+                // �s‚Ì�F‚ð•Ï‚¦‚é
+                SetRowColor(CurRow, s_RowTotalBackColor, s_RowTotalForeColor);
 
-                        dgv.Rows[TotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
-                    }
+                // �”’l•\Ž¦
+                for (int i = (int)DCFirstHalf.OrdersDecisionPrice; i < dgv.ColumnCount; i++)
+                {
+                    // ƒwƒbƒ_�[ƒ^ƒCƒgƒ‹‚È‚µ‚Í•\Ž¦‚µ‚È‚¢
+                    if (dgv.Columns[i].HeaderText.Length < 1) continue;
+
+                    CurRow.Cells[i].Value = TotalArea[i].ToString("#,0");
                 }
 
                 dgv.Rows.Add();       // ‹ó�s
@@ -1106,6 +1134,388 @@
         }
         #endregion
 
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+        /// <summary>
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“‰Ÿ‰ºŽž�ˆ—�
+        /// </summary>
+        private void StageUpProcess()
+        {
+            try
+            {
+                // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX’lŽæ“¾
+                int DepartmentCode = GetDepartmentCode();
+
+                if (DepartmentCode == 0) return;
+
+                cmbDepartment.SelectedValue = 0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^ƒŠƒXƒg
+        /// <summary>
+        /// �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^ƒŠƒXƒg
+        /// </summary>
+        List<CostDataType> m_CostDataTypeList = new List<CostDataType>();
+        #endregion
+
+        #region �o”[‘Î�ÛŒo”ï‘Î‰žƒ}ƒXƒ^ƒŠƒXƒg
+        /// <summary>
+        /// �o”[‘Î�ÛŒo”ï‘Î‰žƒ}ƒXƒ^ƒŠƒXƒg
+        /// </summary>
+        List<CostDataTargetTypeExpenses> m_CostDataTargetTypeExpensesList = new List<CostDataTargetTypeExpenses>();
+        #endregion
+
+        #region �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+        /// <summary>
+        /// �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+        /// </summary>
+        private void GetCostDataType()
+        {
+            IOMCostDataType TypeDB = new IOMCostDataType();
+            IOMCostDataTargetTypeExpenses TypeExpDB = new IOMCostDataTargetTypeExpenses();
+            try
+            {
+                string strSQL = " Order By CostType, TargetType";
+                TypeDB.SelectAction(strSQL, ref m_CostDataTypeList);
+
+                strSQL = " Order By TargetType, ExpensesCode";
+                TypeExpDB.SelectAction(strSQL, ref m_CostDataTargetTypeExpensesList);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                TypeDB.close(); TypeDB = null;
+                TypeExpDB.close(); TypeExpDB = null;
+            }
+        }
+        #endregion
+
+        #region ‘Î�Û•”��‚Ì�o”[‹àŠz�‡Œv‚ðŽæ“¾‚·‚é
+        /// <summary>
+        /// ‘Î�Û•”��‚Ì�o”[‹àŠz�‡Œv‚ðŽæ“¾‚·‚é
+        /// </summary>
+        /// <returns></returns>
+        private decimal CalcCostDataTotal(int DepCode, bool Payment)
+        {
+            try
+            {
+                decimal decInData = 0;
+                // •”���WŒv
+                int nCostTypeSt = (int)CostDataOfCompensation.CostTypeDef.Type1;
+                int nCostTypeEnd = (int)CostDataOfCompensation.CostTypeDef.Type6;
+                int nTargetType = (int)CostDataOfCompensation.TargetTypeDef.Department;
+                for (int ix = nCostTypeSt; ix <= nCostTypeEnd; ix++)
+                {
+                    decimal decWork = m_CostDataList.Where(x => x.CostType == ix
+                                                                && x.TargetType == nTargetType
+                                                                && x.TargetCode == DepCode)
+                                                .Sum(y => y.EntryPrice);
+                    decInData += CostDataOfCompensation.GetPublicCostData(ix, decWork, Payment);
+                }
+
+                return decInData;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
+        #region �‡ŒvŽž•”��“™�o”[ƒf�[ƒ^•\Ž¦
+        /// <summary>
+        /// �‡ŒvŽž•”��“™�o”[ƒf�[ƒ^•\Ž¦
+        /// </summary>
+        private void CreateCostData(int DispType, ref long[] TotalArea)
+        {
+            try
+            {
+                // �o”[ƒ}ƒXƒ^‚ª–³‚¯‚ê‚Î�ˆ—�‚µ‚È‚¢
+                if (m_CostDataTypeList.Count < 1) return;
+
+                int DispCnt = 0;
+                int StartCode = (int)CostDataOfCompensation.CostTypeDef.Type1;
+                int EndCode = (int)CostDataOfCompensation.CostTypeDef.Type6;
+                for (int ix = StartCode; ix <= EndCode; ix++)
+                {
+                    DispCnt += SetRowCostData(DispType, ix, ref TotalArea);
+                }
+                // ‹ó�s
+                DataGridViewEX dgv = dgvMaster;
+                if (DispCnt > 0) dgv.Rows.Add(1);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^‚ð�s‚ÉƒZƒbƒg‚·‚é
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^‚ð�s‚ÉƒZƒbƒg‚·‚é
+        /// </summary>
+        private int SetRowCostData(int DispType, int nCostType, ref long[] TotalArea)
+        {
+            try
+            {
+                int ArrayCnt = Enum.GetNames(typeof(CostDataOfCompensation.TargetTypeDef)).Length;
+                decimal[] decExpenses = new decimal[ArrayCnt];
+                decimal decInData = 0;
+                int nTargetType = 0;
+                int DepartmentCode = GetDepartmentCode();
+                switch (DispType)
+                {
+                    case (int)DispDataTypeCode.AllTotal:
+                        nTargetType = (int)CostDataOfCompensation.TargetTypeDef.Company;
+
+                        // ‘�Žx•¥�E‘e—˜�E�ƒ—˜‰v(‰ïŽÐ‘�Œv)
+                        decInData = m_CostDataList.Where(x => x.CostType == nCostType
+                                                            && x.TargetType == nTargetType)
+                                                    .Sum(y => y.EntryPrice);
+
+                        // ”Ì”„Žû“ü‚ÍŒo”ï‚ð�WŒv•\Ž¦‚µ‚È‚¢
+                        if (nCostType == (int)CostDataOfCompensation.CostTypeDef.Type6) break;
+
+                        for (int ix = (int)CostDataOfCompensation.TargetTypeDef.Construction; ix < ArrayCnt; ix++)
+                        {
+                            // �WŒv
+                            decExpenses[ix] = m_CostDataList.Where(x => x.CostType == nCostType && x.TargetType == ix)
+                                                                .Sum(y => y.EntryPrice);
+                            // Œo”ï‚Í‘S‚Äƒ}ƒCƒiƒX
+                            decExpenses[ix] *= -1;
+                        }
+                        break;
+
+                    case (int)DispDataTypeCode.Department:
+                        nTargetType = (int)CostDataOfCompensation.TargetTypeDef.Department;
+
+                        // •”���WŒv
+                        decInData = m_CostDataList.Where(x => x.CostType == nCostType
+                                                                    && x.TargetType == nTargetType
+                                                                    && x.TargetCode == DepartmentCode)
+                                                    .Sum(y => y.EntryPrice);
+
+                        // ”Ì”„Žû“ü‚ÍŒo”ï‚ð�WŒv•\Ž¦‚µ‚È‚¢
+                        if (nCostType == (int)CostDataOfCompensation.CostTypeDef.Type6) break;
+
+                        // •”��Œo”ï�WŒv�i”Ì”„ˆÈŠO�j
+                        for (int ix = (int)CostDataOfCompensation.TargetTypeDef.Construction; ix < ArrayCnt; ix++)
+                        {
+                            decExpenses[ix] = m_CostDataList.Where(x => x.CostType == nCostType
+                                                                            && x.TargetType == ix
+                                                                            && x.TargetCode == DepartmentCode)
+                                                                    .Sum(y => y.EntryPrice);
+                            // •â“U‚Ì‚Ý�HŽ–‚ð‰ÁŽZ‚·‚é
+                            if (ix == (int)CostDataOfCompensation.TargetTypeDef.Construction)
+                            {
+                                decExpenses[ix] += m_CostDataList2.Where(x => x.CostType == nCostType)
+                                                                        .Sum(y => y.EntryPrice);
+                            }
+                            // Œo”ï‚Í‘S‚Äƒ}ƒCƒiƒX
+                            decExpenses[ix] *= -1;
+                        }
+                        break;
+                }
+
+                // ƒf�[ƒ^–³‚µ‚Í�ˆ—�‚µ‚È‚¢
+                if (decExpenses.Sum() == 0 && decInData == 0) return 0;
+
+                DataGridViewEX dgv = dgvMaster;
+                int RowIndex = dgv.Rows.Add(1);
+                DataGridViewRow CurRow = dgv.Rows[RowIndex];
+
+                // –¾�×‘Î�ÛŠOƒ}�[ƒN
+                CurRow.Cells[(int)DCFirstHalf.Mark].Value = "*";
+                // ƒ^ƒCƒgƒ‹ƒZƒbƒg
+                CostDataType CurRec = m_CostDataTypeList.Where(x => x.CostType == nCostType && x.TargetType == 0).First();
+                int nindex = CurRec.CostDataTypeName.IndexOf("�i");
+                if (nindex < 0) nindex = CurRec.CostDataTypeName.Length;
+                CurRow.Cells[(int)DCFirstHalf.SelectionName].Value = string.Format("�–{0}�–", CurRec.CostDataTypeName.Substring(0, nindex));
+
+                // ŒŸ�õƒL�[�€–Ú‚ðƒZƒbƒg‚·‚é
+                int nKetPo = CalcLatterPoint((int)DCLatterHalf.KeyVal1);
+                CurRow.Cells[nKetPo].Value = nCostType;
+                nKetPo = CalcLatterPoint((int)DCLatterHalf.KeyVal2);
+                CurRow.Cells[nKetPo].Value = nTargetType;
+                nKetPo = CalcLatterPoint((int)DCLatterHalf.KeyVal3);
+                CurRow.Cells[nKetPo].Value = DepartmentCode;
+
+                // �s‚Ì�F‚ð•Ï‚¦‚é
+                SetRowColor(CurRow, Color.DarkSlateGray, Color.WhiteSmoke);
+
+                // Œo”ï‚ÉŒv�ã‚·‚é
+                int nPoint = 0;
+                int GridFirstCnt = Enum.GetNames(typeof(DCFirstHalf)).Length - 1;
+                for (int ix = (int)CostDataOfCompensation.TargetTypeDef.Construction; ix < ArrayCnt; ix++)
+                {
+                    if (m_CostDataTargetTypeExpensesList.Where(x => x.CostType == nCostType && x.TargetType == ix).Count() < 1) continue;
+                    int nIndex = m_CostDataTargetTypeExpensesList.Where(x => x.CostType == nCostType && x.TargetType == ix).First().ExpensesCode;
+                    nPoint = GridFirstCnt + nIndex;
+
+                    // ‹àŠz•\Ž¦
+                    decimal decEx = CommonMotions.cnvDecimal(CurRow.Cells[nPoint].Value);
+                    CurRow.Cells[nPoint].Value = (decEx + decExpenses[ix]).ToString("#,#");
+                    // ‘��‡Œv‰ÁŽZ
+                    TotalArea[nPoint] += (long)decExpenses[ix];
+                }
+
+                bool[] bDisp = new bool[] { false, false, false };
+                switch (nCostType)
+                {
+                    case (int)CostDataOfCompensation.CostTypeDef.Type1:     // 1:•â“U
+                        bDisp[0] = true;
+                        bDisp[1] = true;
+                        bDisp[2] = true;
+                        break;
+                    case (int)CostDataOfCompensation.CostTypeDef.Type2:     // 2:�w“ü
+                    case (int)CostDataOfCompensation.CostTypeDef.Type3:     // 3:‘ä’ •Â�½�HŽ–
+                    case (int)CostDataOfCompensation.CostTypeDef.Type4:     // 4:Ž©ŽÐ�HŽ–
+                    case (int)CostDataOfCompensation.CostTypeDef.Type5:     // 5:àêár�HŽ–
+                        break;
+                    case (int)CostDataOfCompensation.CostTypeDef.Type6:     // 6:”Ì”„
+                        bDisp[1] = true;
+                        bDisp[2] = true;
+                        break;
+                    default:
+                        break;
+                }
+
+                decimal decWk = 0;
+                if (bDisp[0])
+                {
+                    // ----- ‘�Žx•¥Šz
+                    decWk = CostDataOfCompensation.GetPublicCostData(nCostType, decInData);             // ƒf�[ƒ^ƒZƒbƒg
+                    nPoint = CalcLatterPoint((int)DCLatterHalf.TotalPayment);                           // ˆÊ’uŽæ“¾
+                    CurRow.Cells[nPoint].Value = decWk.ToString("#,#");                                 // ‹àŠz•\Ž¦
+                    TotalArea[nPoint] += (long)decWk;                                                   // ‘��‡Œv‰ÁŽZ
+                }
+                if (bDisp[1])
+                {
+                    // ----- ‘e—˜Šz
+                    decWk = CostDataOfCompensation.GetPublicCostData(nCostType, decInData, false);      // ƒf�[ƒ^ƒZƒbƒg
+                    nPoint = CalcLatterPoint((int)DCLatterHalf.GrossProfit);                            // ˆÊ’uŽæ“¾
+                    CurRow.Cells[nPoint].Value = decWk.ToString("#,#");                                 // ‹àŠz•\Ž¦
+                    TotalArea[nPoint] += (long)decWk;                                                   // ‘��‡Œv‰ÁŽZ
+                }
+                if (bDisp[2])
+                {
+                    // ----- �ƒ—˜Šz
+                    decWk = CostDataOfCompensation.GetPublicCostData(nCostType, decInData, false);      // ƒf�[ƒ^ƒZƒbƒg
+                    nPoint = CalcLatterPoint((int)DCLatterHalf.NetProfit);                              // ˆÊ’uŽæ“¾
+                    CurRow.Cells[nPoint].Value = decWk.ToString("#,#");                                 // ‹àŠz•\Ž¦
+                    TotalArea[nPoint] += (long)decWk;                                                   // ‘��‡Œv‰ÁŽZ
+                }
+
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^Žæ“¾ƒGƒŠƒA
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^Žæ“¾ƒGƒŠƒA
+        /// </summary>
+        List<CostDataOfCompensation> m_CostDataList = new List<CostDataOfCompensation>();
+        List<CostDataOfCompensation> m_CostDataList2 = new List<CostDataOfCompensation>();
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^Žæ“¾
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^Žæ“¾
+        /// </summary>
+        private bool GetCostDataOfCompensation()
+        {
+            IOCostDataOfCompensation CostDB = new IOCostDataOfCompensation();
+            try
+            {
+                // �o”[ƒ}ƒXƒ^‚ª–³‚¯‚ê‚Î�ˆ—�‚µ‚È‚¢
+                if (m_CostDataTypeList.Count < 1) return true;
+
+                m_CostDataList.Clear();
+                m_CostDataList2.Clear();
+
+                // ‘Î�Û”N
+                int nTargetYear = (int)numUDConstPro.Value;
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(CostDB.CreatePrimarykeyString(nTargetYear));
+                if (!CostDB.SelectAction(strSQL.ToString(), ref m_CostDataList)) return false;
+
+                // •”��‘I‘ð
+                CostDataToDepartment(CostDB);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                CostDB.close(); CostDB = null;
+            }
+        }
+        #endregion
+
+        #region •”���WŒvŽž�HŽ–ƒf�[ƒ^‚ðŽæ“¾‚·‚é
+        /// <summary>
+        /// •”���WŒvŽž�HŽ–ƒf�[ƒ^‚ðŽæ“¾‚·‚é
+        /// </summary>
+        private void CostDataToDepartment(IOCostDataOfCompensation CostDB)
+        {
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+                
+                int nTargetYear = (int)numUDConstPro.Value; // ‘Î�Û”N
+                int DepartmentCode = GetDepartmentCode();   // •”��ƒR�[ƒh
+
+                // •”��‘I‘ðŽžˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (GetDepartmentCode() < 1) return;
+
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.*");
+                strSQL.Append(" FROM costdataofcompensation As A");
+                strSQL.Append("  Inner Join constructionbaseinfo As B");
+                strSQL.Append("        On B.ConstructionCode = A.TargetCode");
+                strSQL.AppendFormat("  And B.ConstrDepCode = {0}", DepartmentCode);
+                strSQL.AppendFormat(" WHERE A.YearNumber = {0}", nTargetYear);
+                strSQL.AppendFormat(" And A.TargetType = {0}", (int)CostDataOfCompensation.TargetTypeDef.Construction);
+
+                ArrayList ArData = new ArrayList();
+                if (!CostDB.ExecuteReader(strSQL.ToString(), ref ArData)) return;
+
+                foreach (object[] ObjRec in ArData)
+                {
+                    CostDataOfCompensation work = new CostDataOfCompensation();
+                    CostDB.Reader2Struct(ObjRec, ref work);
+
+                    m_CostDataList2.Add(work);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ‚c‚aŽæ“¾�‡”Ô
         /// <summary>
         /// ‚c‚aŽæ“¾�‡”Ô
@@ -1250,14 +1660,31 @@
                     // Œ»�s•”��
                     if (bExistsFlg)
                     {
-                        strSQL.AppendFormat(" AND D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                        if (CommonMotions.CheckNowSeason(nTargetYear))
+                        {
+                            strSQL.AppendFormat(" AND D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                        }
+                        else
+                        {
+                            strSQL.AppendFormat(" AND (D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                            strSQL.AppendFormat("    OR (D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                            strSQL.AppendFormat("    AND DATE('{0}') < DATE(D.CompDate)))", dtDefaultEnd.ToShortDateString());
+                        }
                     }
                     else
                     {
-                        strSQL.AppendFormat(" AND D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                        if (CommonMotions.CheckNowSeason(nTargetYear))
+                        {
+                            strSQL.AppendFormat(" AND D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                        }
+                        else
+                        {
+                            strSQL.AppendFormat(" AND (D.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                            strSQL.AppendFormat("    AND DATE(D.CompDate) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
+                        }
                     }
-                    strSQL.AppendFormat(" AND (DATE(D.StartDate) <= DATE('{0}')", strdtEnd);
-                    strSQL.AppendFormat("  AND DATE('{0}') <= DATE(C.ENDDATE))", strdtStart);
+                    //strSQL.AppendFormat(" AND (DATE(D.StartDate) <= DATE('{0}')", strdtEnd);
+                    //strSQL.AppendFormat("  AND DATE('{0}') <= DATE(D.CompDate))", strdtStart);
 
                     strSQL.Append(" GROUP BY D.DepartmentCode, F.NameCode");
                     strSQL.Append(" ORDER BY D.DISPLAYORDER ASC, D.DepartmentCode ASC, G.DisplayOrder ASC");
@@ -1269,20 +1696,28 @@
                     // �Ý�ÐŽÒ�E‘Þ�EŽÒ
                     if (bExistsFlg)
                     {   // �Ý�Ð‚µ‚Ä‚¢‚é’S“–ŽÒ
-                        strSQL.AppendFormat(" AND ((C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
-                        strSQL.AppendFormat("  AND DATE(NOW()) <= DATE(C.ENDDATE))", strdtMax);
-
-                        strSQL.AppendFormat(" OR (DATE('{0}') <= DATE(C.ENDDATE)))", strdtEnd);
-                        //strSQL.AppendFormat("   OR DATE('{0}') = DATE(C.ENDDATE)))", strdtMax);
+                        if (CommonMotions.CheckNowSeason(nTargetYear))
+                        {
+                            strSQL.AppendFormat(" AND C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                        }
+                        else
+                        {
+                            strSQL.AppendFormat(" AND (C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                            strSQL.AppendFormat("    OR (C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                            strSQL.AppendFormat("      AND DATE('{0}') < DATE(C.ENDDATE)))", strdtEnd);
+                        }
                     }
                     else
                     {   // ‘Î�ÛŠú‚ÉŽ«‚ß‚½’S“–ŽÒ
-                        strSQL.AppendFormat(" AND ((C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
-                        strSQL.AppendFormat("   AND DATE('{0}') <= DATE(C.ENDDATE)", strdtStart);
-                        strSQL.AppendFormat("   AND DATE(C.EndDate) <= DATE('{0}'))", strdtEnd);
-
-                        strSQL.AppendFormat(" OR (C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Exists);
-                        strSQL.AppendFormat("   AND DATE(C.ENDDATE) < DATE(NOW())))", strdtMax);
+                        if (CommonMotions.CheckNowSeason(nTargetYear))
+                        {
+                            strSQL.AppendFormat(" AND C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                        }
+                        else
+                        {
+                            strSQL.AppendFormat(" AND (C.DeleteFlg = {0}", (int)CommonDefine.DataDeleteDef.Deleted);
+                            strSQL.AppendFormat("   AND DATE(C.ENDDATE) <= DATE('{0}'))", strdtEnd);
+                        }
                     }
 
                     strSQL.Append(" GROUP BY D.DepartmentCode, C.PersonCode, F.NameCode");
@@ -1687,63 +2122,7 @@
         #endregion
 
         // ----------------- ƒfƒoƒbƒOƒ�ƒWƒbƒN
-        #region �ÄŒvŽZ�ˆ—�
-        /// <summary>
-        /// �ÄŒvŽZ�ˆ—�
-        /// </summary>
-        private void ReCalculate()
-        {
-            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
-            try
-            {
-                MessageBox.Show("�ÄŒvŽZ�ˆ—�‚ðŠJŽn‚µ‚Ü‚·�B");
 
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("Select");
-                strSQL.Append(" ConstructionCode");
-                strSQL.Append(" From");
-                strSQL.Append(" constructionbaseinfo");
-                strSQL.Append(" Where");
-                strSQL.Append(" ConstructionPeriod = 17");
-                strSQL.Append(" And ConstructionStatusFlg != 11");
-                strSQL.Append(" Order By ConstructionCode");
-
-                ArrayList arData = new ArrayList();
-                BaseDB.ExecuteReader(strSQL.ToString(), ref arData);
-
-                foreach (object[] curdata in arData)
-                {
-                    FrmConstructionLedger frm = new FrmConstructionLedger();                    // �HŽ–�Ú�×‘ä’ “ü—Í
-                    // �HŽ–ƒR�[ƒh‚ÌƒZƒbƒg
-                    frm.ConstructionCode = CommonMotions.cnvInt(curdata[0]);
-
-                    // Œ©‚¦‚È‚¢‰æ–Ê‚ð�o‚·
-                    frm.WindowState = FormWindowState.Minimized;
-                    frm.Show();
-                    // ƒtƒH�[ƒ€”ñ•\Ž¦
-                    frm.Visible = false;
-
-                    // �ÄŒvŽZ�ˆ—�
-                    bool bret = frm.RecalculateLedger;
-
-                    // ‰æ–Ê‚ð•Â‚¶‚é
-                    frm.Close();
-                    frm.Dispose(); frm = null;
-                }
-                MessageBox.Show("�ÄŒvŽZ�ˆ—�‚ª�I—¹‚µ‚Ü‚µ‚½�B");
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                MessageBox.Show("�ÄŒvŽZ�ˆ—�‚ªƒAƒ{�[ƒg‚µ‚Ü‚µ‚½�B");
-            }
-            finally
-            {
-                BaseDB.close(); BaseDB = null;
-            }
-        }
-        #endregion
-
         #region �HŽ–‘ä’ •”��ƒR�[ƒhƒZƒbƒg�ˆ—�
         /// <summary>
         /// �HŽ–‘ä’ •”��ƒR�[ƒhƒZƒbƒg�ˆ—�
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepCostDetail.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepCostDetail.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepCostDetail.cs	(revision 483)
@@ -0,0 +1,752 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.SubForms;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    /// <summary>
+    /// •â“U•\Ž¦�ˆ—�
+    /// </summary>
+    partial class FrmDepCost
+    {
+        #region ’è�”
+
+        #region •â“U•”��“ü—Í•\Ž¦ƒJƒ‰ƒ€
+        /// <summary>
+        /// •â“U•”��“ü—Í•\Ž¦ƒJƒ‰ƒ€
+        /// </summary>
+        private enum DispColDetail
+        {
+            /// <summary>
+            /// 0:•Ò�Wƒtƒ‰ƒO
+            /// </summary>
+            RowState = 0,
+            /// <summary>
+            /// 1:�o”[•ª—Þƒ^ƒCƒv
+            /// </summary>
+            CostType,
+            /// <summary>
+            /// 2:‘Î�Û�æƒ^ƒCƒv
+            /// </summary>
+            TargetType,
+            /// <summary>
+            /// 3:‘Î�Û�æƒR�[ƒh
+            /// </summary>
+            TargetCode,
+            /// <summary>
+            /// 4:SeqNo
+            /// </summary>
+            SeqNo,
+            /// <summary>
+            /// 5:’S“–ŽÒƒR�[ƒh
+            /// </summary>
+            PersonCode,
+            /// <summary>
+            /// 6:‘ŠŽèŠú�æƒR�[ƒh
+            /// </summary>
+            FromCode,
+            /// <summary>
+            /// 7:“Ç�ž•â“U“ú
+            /// </summary>
+            Before_SendDate,
+            /// <summary>
+            /// 8:ƒf�[ƒ^ƒ�ƒbƒN
+            /// </summary>
+            DataLock,
+            /// <summary>
+            /// 9:No
+            /// </summary>
+            No,
+            /// <summary>
+            /// 10:’S“–ŽÒ–¼
+            /// </summary>
+            PersonName,
+            /// <summary>
+            /// 11:•â“U“ú
+            /// </summary>
+            SendDate,
+            /// <summary>
+            /// 12:‘ŠŽè�æ–¼�Ì
+            /// </summary>
+            FromName,
+            /// <summary>
+            /// 13:�o”[“à—e
+            /// </summary>
+            Content,
+            /// <summary>
+            /// 14:‹àŠz�i�Å”²�j
+            /// </summary>
+            EntryPrice,
+            /// <summary>
+            /// 15:‹àŠz�i�Å�ž�j
+            /// </summary>
+            EntryTax,
+            /// <summary>
+            /// 16:”õ�l
+            /// </summary>
+            Comment,
+        }
+        #endregion
+
+        #endregion
+
+        #region ƒf�[ƒ^“ü—Íˆê——•\Ž¦
+        /// <summary>
+        /// ƒf�[ƒ^“ü—Íˆê——•\Ž¦
+        /// </summary>
+        private void DispType1Detail()
+        {
+            // ƒvƒ�ƒOƒŒƒXƒo�[•\Ž¦�§Œä
+            VisibleProgressBar(true);
+            try
+            {
+                // ƒXƒ^ƒCƒ‹ƒZƒbƒg
+                DispStyleDetail();
+                
+                // ƒf�[ƒ^•\Ž¦
+                DispDataDetail();
+
+                // ƒOƒŠƒbƒh“ü—Í‰Â”ÛƒZƒbƒg
+                InputDetailEnable();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                VisibleProgressBar(false);
+            }
+        }
+        #endregion
+
+        #region “ü—Í�Fˆê——ƒXƒ^ƒCƒ‹ƒZƒbƒg
+        private DataGridViewTextBoxColumn[] ColumnType1_2 = new DataGridViewTextBoxColumn[17];
+        DataGridViewCellStyle[] CellStyleType1_2 = new DataGridViewCellStyle[8];
+        /// <summary>
+        /// “ü—Í�Fˆê——ƒXƒ^ƒCƒ‹ƒZƒbƒg
+        /// </summary>
+        private void DispStyleDetail()
+        {
+            DataGridView dgv = dgvMaster;
+            dgv.SuspendLayout();
+            try
+            {
+
+                // —ñƒf�[ƒ^�ì�¬
+                for (int ix = 0; ix < ColumnType1_2.Length; ix++)
+                {
+                    if (ColumnType1_2[ix] is null)
+                        ColumnType1_2[ix] = new DataGridViewTextBoxColumn();
+                }
+                // ƒOƒŠƒbƒh‚Ö—ñ’Ç‰Á
+                dgv.Columns.AddRange(ColumnType1_2[(int)DispColDetail.RowState]             // 0:•Ò�Wƒtƒ‰ƒO
+                                    , ColumnType1_2[(int)DispColDetail.CostType]            // 1:�o”[•ª—Þƒ^ƒCƒv
+                                    , ColumnType1_2[(int)DispColDetail.TargetType]          // 2:‘Î�Û�æƒ^ƒCƒv
+                                    , ColumnType1_2[(int)DispColDetail.TargetCode]          // 3:‘Î�Û�æƒR�[ƒh
+                                    , ColumnType1_2[(int)DispColDetail.SeqNo]               // 4:SeqNo
+                                    , ColumnType1_2[(int)DispColDetail.PersonCode]          // 5:’S“–ŽÒƒR�[ƒh
+                                    , ColumnType1_2[(int)DispColDetail.FromCode]            // 6:‘ŠŽèŠú�æƒR�[ƒh
+                                    , ColumnType1_2[(int)DispColDetail.Before_SendDate]     // 7:“Ç�ž•â“U“ú
+                                    , ColumnType1_2[(int)DispColDetail.DataLock]            // 8:ƒf�[ƒ^ƒ�ƒbƒN
+                                    , ColumnType1_2[(int)DispColDetail.No]                  // 9:No
+                                    , ColumnType1_2[(int)DispColDetail.PersonName]          // 10:’S“–ŽÒ–¼
+                                    , ColumnType1_2[(int)DispColDetail.SendDate]            // 11:•â“U“ú
+                                    , ColumnType1_2[(int)DispColDetail.FromName]            // 12:‘ŠŽè�æ–¼�Ì
+                                    , ColumnType1_2[(int)DispColDetail.Content]             // 13:�o”[“à—e
+                                    , ColumnType1_2[(int)DispColDetail.EntryPrice]          // 14:‹àŠz�i�Å”²�j
+                                    , ColumnType1_2[(int)DispColDetail.EntryTax]            // 15:‹àŠz�i�Å�ž�j
+                                    , ColumnType1_2[(int)DispColDetail.Comment]);           // 16:”õ�l
+                // —ñƒXƒ^ƒCƒ‹�ì�¬
+                for (int ix = 0; ix < CellStyleType1_2.Length; ix++)
+                {
+                    if (CellStyleType1_2[ix] is null)
+                        CellStyleType1_2[ix] = new DataGridViewCellStyle();
+                }
+
+                // 
+                // Column0
+                // 
+                int nDispCount = (int)DispColDetail.RowState;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "•Ò�Wƒtƒ‰ƒO";
+                ColumnType1_2[nDispCount].Name = "Column0";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column1
+                // 
+                nDispCount = (int)DispColDetail.CostType;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "�o”[•ª—Þƒ^ƒCƒv";
+                ColumnType1_2[nDispCount].Name = "Column1";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column2
+                // 
+                nDispCount = (int)DispColDetail.TargetType;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "‘Î�Û�æƒ^ƒCƒv";
+                ColumnType1_2[nDispCount].Name = "Column2";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column3
+                // 
+                nDispCount = (int)DispColDetail.TargetCode;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "‘Î�Û�æƒR�[ƒh";
+                ColumnType1_2[nDispCount].Name = "Column3";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column4
+                // 
+                nDispCount = (int)DispColDetail.SeqNo;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "SEQNO";
+                ColumnType1_2[nDispCount].Name = "Column4";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column5
+                // 
+                nDispCount = (int)DispColDetail.PersonCode;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "’S“–ŽÒƒR�[ƒh";
+                ColumnType1_2[nDispCount].Name = "Column5";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column6
+                // 
+                nDispCount = (int)DispColDetail.FromCode;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "‘ŠŽè�æƒR�[ƒh";
+                ColumnType1_2[nDispCount].Name = "Column6";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column7
+                // 
+                nDispCount = (int)DispColDetail.Before_SendDate;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "Œ³“ú•t";
+                ColumnType1_2[nDispCount].Name = "Column7";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column8
+                // 
+                nDispCount = (int)DispColDetail.DataLock;
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "ƒf�[ƒ^ƒ�ƒbƒN";
+                ColumnType1_2[nDispCount].Name = "Column8";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Visible = false;
+                ColumnType1_2[nDispCount].Width = 0;
+                // 
+                // Column9
+                // 
+                nDispCount = (int)DispColDetail.No;
+                CellStyleType1_2[0].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1_2[0].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[0].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[0];
+                ColumnType1_2[nDispCount].Frozen = true;
+                ColumnType1_2[nDispCount].HeaderText = "‡‚";
+                ColumnType1_2[nDispCount].Name = "Column9";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].Resizable = DataGridViewTriState.False;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 50;
+                // 
+                // Column10
+                // 
+                nDispCount = (int)DispColDetail.PersonName;
+                CellStyleType1_2[1].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1_2[1].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[1].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[1];
+                ColumnType1_2[nDispCount].HeaderText = "•â“UŽÒ";
+                ColumnType1_2[nDispCount].Name = "Column10";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 150;
+                // 
+                // Column11
+                // 
+                nDispCount = (int)DispColDetail.SendDate;
+                CellStyleType1_2[2].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1_2[2].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[2].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[2];
+                ColumnType1_2[nDispCount].HeaderText = "•â“U“ú";
+                ColumnType1_2[nDispCount].Name = "Column11";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 120;
+                // 
+                // Column12
+                // 
+                nDispCount = (int)DispColDetail.FromName;
+                CellStyleType1_2[3].Alignment = DataGridViewContentAlignment.MiddleLeft;
+                CellStyleType1_2[3].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[3].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[3];
+                ColumnType1_2[nDispCount].HeaderText = "‘ŠŽè�æ–¼�Ì";
+                ColumnType1_2[nDispCount].Name = "Column12";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 200;
+                // 
+                // Column13
+                // 
+                nDispCount = (int)DispColDetail.Content;
+                CellStyleType1_2[4].Alignment = DataGridViewContentAlignment.MiddleLeft;
+                CellStyleType1_2[4].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[4].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[4];
+                ColumnType1_2[nDispCount].HeaderText = "•â�@“U�@“à�@—e";
+                ColumnType1_2[nDispCount].Name = "Column13";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 250;
+                // 
+                // Column14
+                // 
+                nDispCount = (int)DispColDetail.EntryPrice;
+                CellStyleType1_2[5].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleType1_2[5].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[5].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[5];
+                ColumnType1_2[nDispCount].HeaderText = "‹àŠz�i�Å”²�j";
+                ColumnType1_2[nDispCount].Name = "Column14";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].Resizable = DataGridViewTriState.False;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 150;
+                // 
+                // Column15
+                // 
+                nDispCount = (int)DispColDetail.EntryTax;
+                CellStyleType1_2[6].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleType1_2[6].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[6].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[6];
+                ColumnType1_2[nDispCount].HeaderText = "‹àŠz�i�Å�ž�j";
+                ColumnType1_2[nDispCount].Name = "Column15";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 150;
+                // 
+                // Column16
+                // 
+                nDispCount = (int)DispColDetail.Comment;
+                CellStyleType1_2[7].Alignment = DataGridViewContentAlignment.MiddleLeft;
+                CellStyleType1_2[7].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1_2[7].ForeColor = Color.Black;
+                ColumnType1_2[nDispCount].DefaultCellStyle = CellStyleType1_2[7];
+                ColumnType1_2[nDispCount].HeaderText = "”õ�@�@�l";
+                ColumnType1_2[nDispCount].Name = "Column16";
+                ColumnType1_2[nDispCount].ReadOnly = true;
+                ColumnType1_2[nDispCount].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1_2[nDispCount].Width = 150;
+
+                // ‘Î�Û‚ª‰ïŽÐˆÈŠO‚Í�HŽ–�E•”��–¼‚ð•\Ž¦‚·‚é
+                if (m_TargetType != (int)CostDataOfCompensation.TargetTypeDef.Company)
+                {
+                    // •\Ž¦ƒ^ƒCƒgƒ‹ƒZƒbƒg
+                    lblTitle2.Visible = true;
+                    lblTitle2.Text = GetGridTile(false);
+                    if (m_TargetType == (int)CostDataOfCompensation.TargetTypeDef.Department)
+                        lblTitle2.Width = 1260 / 2;
+                    else
+                        lblTitle2.Width = 1260;
+
+                    // ƒOƒŠƒbƒhˆÊ’u�EƒTƒCƒY•Ï�X
+                    dgvMaster.Width = 1240;
+                    dgvMaster.Height = 484;
+                    dgvMaster.Location = new Point(10, 34);
+                }
+                switch (m_DispCost)
+                {
+                    case (int)CostDataOfCompensation.CostTypeDef.Type1:
+                        // ----- •â“U
+                        // ‘ŠŽè�æ–¼�Ì‚ð•\Ž¦‚µ‚È‚¢
+                        ColumnType1_2[(int)DispColDetail.FromName].Visible = false;
+                        // –¼�ÌƒZƒbƒg
+                        ColumnType1_2[(int)DispColDetail.PersonName].HeaderText = "•â “U ŽÒ";
+                        ColumnType1_2[(int)DispColDetail.SendDate].HeaderText = "•â “U “ú";
+                        ColumnType1_2[(int)DispColDetail.Content].HeaderText = "•â�@“U�@“à�@—e";
+                        ColumnType1_2[(int)DispColDetail.Content].Width = 450;
+                        break;
+
+                    case (int)CostDataOfCompensation.CostTypeDef.Type2:
+                        // ----- �w“ü
+                        // ‘ŠŽè�æ–¼�Ì‚ð•\Ž¦‚·‚é
+                        ColumnType1_2[(int)DispColDetail.FromName].Visible = true;
+                        // –¼�ÌƒZƒbƒg
+                        ColumnType1_2[(int)DispColDetail.PersonName].HeaderText = "�w“ü’S“–ŽÒ";
+                        ColumnType1_2[(int)DispColDetail.SendDate].HeaderText = "�w “ü “ú";
+                        ColumnType1_2[(int)DispColDetail.Content].HeaderText = "�w�@“ü�@“à�@—e";
+                        ColumnType1_2[(int)DispColDetail.Content].Width = 250;
+                        break;
+
+                    case (int)CostDataOfCompensation.CostTypeDef.Type3:
+                    case (int)CostDataOfCompensation.CostTypeDef.Type4:
+                    case (int)CostDataOfCompensation.CostTypeDef.Type5:
+                        // ----- �HŽ–
+                        // ‘ŠŽè�æ–¼�Ì‚ð•\Ž¦‚·‚é
+                        ColumnType1_2[(int)DispColDetail.FromName].Visible = true;
+                        // –¼�ÌƒZƒbƒg
+                        ColumnType1_2[(int)DispColDetail.PersonName].HeaderText = "�HŽ–’S“–ŽÒ";
+                        ColumnType1_2[(int)DispColDetail.SendDate].HeaderText = "Šm ”F “ú";
+                        ColumnType1_2[(int)DispColDetail.Content].HeaderText = "�H�@Ž–�@“à�@—e";
+                        ColumnType1_2[(int)DispColDetail.Content].Width = 250;
+                        break;
+
+                    case (int)CostDataOfCompensation.CostTypeDef.Type6:
+                        // ----- ”Ì”„
+                        // ‘ŠŽè�æ–¼�Ì‚ð•\Ž¦‚·‚é
+                        ColumnType1_2[(int)DispColDetail.FromName].Visible = true;
+                        // –¼�ÌƒZƒbƒg
+                        ColumnType1_2[(int)DispColDetail.PersonName].HeaderText = "”Ì ”„ ŽÒ";
+                        ColumnType1_2[(int)DispColDetail.SendDate].HeaderText = "”Ì ”„ “ú";
+                        ColumnType1_2[(int)DispColDetail.Content].HeaderText = "”Ì�@”„�@“à�@—e";
+                        ColumnType1_2[(int)DispColDetail.Content].Width = 250;
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                dgv.SuspendLayout();
+            }
+        }
+        #endregion
+
+        #region “ü—Í�Fˆê——•\Ž¦
+        /// <summary>
+        /// “ü—Í�Fˆê——•\Ž¦
+        /// </summary>
+        private void DispDataDetail()
+        {
+            IOCostDataOfCompensation CostDB = new IOCostDataOfCompensation();
+            DataGridView dgv = dgvMaster;
+            try
+            {
+                lblTitle.Visible = true;
+                lblTitle.Text = GetGridTile();
+
+                btnStageUp.Visible = true;
+                btnLineAdd.Visible = true;
+                btnLineDel.Visible = true;
+                btnLineAdd.Text = "�s�@’Ç�@‰Á";
+                btnLineDel.Text = "�s�@�í�@�œ";
+
+                btnDataEntry.Visible = true;
+
+                decimal nNumYear = numUDConstPro.Value;
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("Select A.*, B.CompanyName, C.PersonName From costdataofcompensation As A");
+                strSQL.Append("       Left Join(Select * From subcontractormaster As B1) As B");
+                strSQL.Append("            On B.CompanyCode = A.FromCode");
+                strSQL.Append("       Left Join personinchargemaster As C");
+                strSQL.Append("            On C.PersonCode = A.PersonCode");
+                strSQL.AppendFormat(" Where A.YearNumber = {0}", (int)nNumYear);
+                strSQL.AppendFormat(" And A.CostType = {0}", m_DispCost);
+                strSQL.AppendFormat(" And A.TargetType = {0}", m_TargetType);
+                strSQL.AppendFormat(" And A.TargetCode = {0}", m_TargetCode);
+                strSQL.Append(" Order By A.SendDate DESC");
+
+                ArrayList DataList = new ArrayList();
+                if (!CostDB.ExecuteReader(strSQL.ToString(), ref DataList)) return;
+
+                ProgressBar.Maximum = DataList.Count;
+
+                int nNo = 0;
+                int nCostLength = Enum.GetNames(typeof(IOCostDataOfCompensation.TableColumn)).Length;
+                CostDataOfCompensation CostRec = new CostDataOfCompensation();
+                foreach (object[] DataRec in DataList)
+                {
+                    CostDB.Reader2Struct(DataRec, ref CostRec);
+                    string CompanyName = CommonMotions.cnvString(DataRec[nCostLength]);
+                    string PersonName = CommonMotions.cnvString(DataRec[nCostLength + 1]);
+
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                    CurRow.Cells[(int)DispColDetail.RowState].Value = (int)DataRowState.Unchanged;                  // 0:•Ò�Wƒtƒ‰ƒO
+                    CurRow.Cells[(int)DispColDetail.CostType].Value = CostRec.CostType;                             // 1:�o”[ƒ^ƒCƒvƒR�[ƒh
+                    CurRow.Cells[(int)DispColDetail.TargetType].Value = CostRec.TargetType;                         // 2:‘Î�Ûƒ^ƒCƒv
+                    CurRow.Cells[(int)DispColDetail.DataLock].Value = CostRec.LockFlg;                              // 3:ƒf�[ƒ^ƒ�ƒbƒN
+                    CurRow.Cells[(int)DispColDetail.TargetCode].Value = CostRec.TargetCode;                         // 4:‘Î�ÛƒR�[ƒh
+                    CurRow.Cells[(int)DispColDetail.SeqNo].Value = CostRec.SeqNo;                                   // 5:SeqNo
+                    CurRow.Cells[(int)DispColDetail.PersonCode].Value = CostRec.PersonCode;                         // 6:’S“–ŽÒƒR�[ƒh
+                    CurRow.Cells[(int)DispColDetail.FromCode].Value = CostRec.FromCode;                             // 7:‘ŠŽè�æƒR�[ƒh
+                    CurRow.Cells[(int)DispColDetail.Before_SendDate].Value = CostRec.SendDate.ToShortDateString();  // 8:“Ç�ž•â“U“ú
+
+                    CurRow.Cells[(int)DispColDetail.No].Value = ++nNo;                                              // 9:No
+                    CurRow.Cells[(int)DispColDetail.PersonName].Value = PersonName;                                 // 10:’S“–ŽÒ–¼
+                    CurRow.Cells[(int)DispColDetail.SendDate].Value = CostRec.SendDate.ToShortDateString();         // 11:•â“U“ú
+                    CurRow.Cells[(int)DispColDetail.FromName].Value = CompanyName;                                  // 12:‘ŠŽè�æ–¼
+                    CurRow.Cells[(int)DispColDetail.Content].Value = CostRec.Content;                               // 13:�o”[“à—e
+
+                    CurRow.Cells[(int)DispColDetail.EntryPrice].Value = CostRec.EntryPrice.ToString("#,0");         // 14:‹àŠz�i�Å”²�j
+                    CurRow.Cells[(int)DispColDetail.EntryTax].Value = CostRec.EntryTax.ToString("#,0");             // 15:‹àŠz�i�Å�ž�j
+
+                    CurRow.Cells[(int)DispColDetail.Comment].Value = CostRec.BikoComment;                           // 16:”õ�l
+
+                    // ƒf�[ƒ^ƒ�ƒbƒN‚Í�sReadOnlt
+                    if (CostRec.LockFlg == (int)CostDataOfCompensation.LockFlgDef.Locked)
+                        CurRow.ReadOnly = true;
+
+                    ProgressBar.Value++;
+                }
+
+                // ‘��‡Œv•\Ž¦
+                SetTotalRowType1Detail();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                CostDB.close(); CostDB = null;
+
+                // ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
+                SetGridMaxRow();
+
+                ProgressBar.Value = ProgressBar.Maximum;
+            }
+        }
+        #endregion
+
+        #region “ü—Í�F�‡Œv�s‚Ì•\Ž¦
+        /// <summary>
+        /// “ü—Í�F�‡Œv�s‚Ì•\Ž¦
+        /// </summary>
+        private void SetTotalRowType1Detail()
+        {
+            DispEventControl(false);
+            try
+            {
+                DataGridView dgv = dgvMaster;
+
+                string strContent = "‘� �‡ Œv";
+                dgv.Rows.Add(2);
+                int nIndex = dgv.Rows.Add(1);
+
+                decimal[] decTotal = new decimal[2];
+                decTotal[0] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDetail.No].Value) > 0
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColDetail.RowState].Value) != (int)DataRowState.Deleted)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDetail.EntryPrice].Value));
+                decTotal[1] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDetail.No].Value) > 0
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColDetail.RowState].Value) != (int)DataRowState.Deleted)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDetail.EntryTax].Value));
+
+                DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                CurRow.Cells[(int)DispColDetail.CostType].Value = s_GridTotalCode;                          // ƒ^ƒCƒv‚ÉƒZƒbƒg
+                CurRow.Cells[(int)DispColDetail.Content].Value = strContent;                                // 3:ƒ^ƒCƒv–¼�Ì
+                CurRow.Cells[(int)DispColDetail.Content].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CurRow.Cells[(int)DispColDetail.EntryPrice].Value = decTotal[0].ToString("#,0");            // 5:‹àŠz�i�Å”²�j
+                CurRow.Cells[(int)DispColDetail.EntryTax].Value = decTotal[1].ToString("#,0");              // 6:‹àŠz�i�Å�ž�j
+
+                for (int ix = 0; ix < dgv.ColumnCount; ix++)
+                {
+                    CurRow.Cells[ix].Style.BackColor = Color.Black;
+                    CurRow.Cells[ix].Style.ForeColor = Color.White;
+                    CurRow.Cells[ix].ReadOnly = true;
+                }
+                CurRow.ReadOnly = true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DispEventControl(true);
+            }
+        }
+        #endregion
+
+        #region “ü—Í�F�‡Œv�s‚Ì�ÄŒvŽZ
+        /// <summary>
+        /// “ü—Í�F�‡Œv�s‚Ì�ÄŒvŽZ
+        /// </summary>
+        private void ReCalcTotalRowType1Detail()
+        {
+            DispEventControl(false);
+            try
+            {
+                DataGridView dgv = dgvMaster;
+
+                string strContent = "‘� �‡ Œv";
+                List<DataGridViewRow> TotalRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvString(x.Cells[(int)DispColDetail.Content].Value).Equals(strContent))
+                                                                            .ToList();
+                int nIndex = -1;
+                if (TotalRow.Count < 1) return;
+
+                nIndex = TotalRow[0].Index;
+
+                decimal[] decTotal = new decimal[2];
+                decTotal[0] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDetail.CostType].Value) < s_GridTotalCode
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColDetail.RowState].Value) != (int)DataRowState.Deleted)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDetail.EntryPrice].Value));
+                decTotal[1] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDetail.CostType].Value) < s_GridTotalCode
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColDetail.RowState].Value) != (int)DataRowState.Deleted)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDetail.EntryTax].Value));
+
+                DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                CurRow.Cells[(int)DispColDetail.EntryPrice].Value = decTotal[0].ToString("#,0");            // 5:‹àŠz�i�Å”²�j
+                CurRow.Cells[(int)DispColDetail.EntryTax].Value = decTotal[1].ToString("#,0");              // 6:‹àŠz�i�Å�ž�j
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DispEventControl(true);
+            }
+        }
+        #endregion
+
+        #region “ü—Í�FƒOƒŠƒbƒhƒ�ƒbƒN�ˆ—�
+        /// <summary>
+        /// “ü—Í�FƒOƒŠƒbƒhƒ�ƒbƒN�ˆ—�
+        /// </summary>
+        private void InputDetailEnable()
+        {
+            try
+            {
+                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
+                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
+                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
+
+                // ƒVƒXƒeƒ€ŠÇ—�ŽÒ�E�Å�‚�Ó”CŽÒ‚Í�í‚É‚·‚×‚Ä‰Â”\
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)
+                {
+                    goto ProcExe;
+                }
+
+                // •Ò�W�E“o˜^Œnƒ{ƒ^ƒ“”ñ•\Ž¦
+                btnLineAdd.Visible = false;
+                btnLineDel.Visible = false;
+                btnDataEntry.Visible = false;
+
+                bool bReturn = false;
+                switch (m_DispCost)
+                {
+                    case (int)CostDataOfCompensation.CostTypeDef.Type1:     // •â“U
+                        bReturn = true;
+                        break;
+
+                    case (int)CostDataOfCompensation.CostTypeDef.Type2:     // �w“ü•i
+                    case (int)CostDataOfCompensation.CostTypeDef.Type3:     // �HŽ–
+                    case (int)CostDataOfCompensation.CostTypeDef.Type4:     // ”Ì”„
+                        // “�Š‡ŽÒŒ ŒÀ�E�Š‘®’·Œ ŒÀ
+                        if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key
+                            || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                        {
+                            btnLineAdd.Visible = true;
+                            btnLineDel.Visible = true;
+                            btnDataEntry.Visible = true;
+                            bReturn = false;
+                        }
+                        else
+                        {
+                            bReturn = true;
+                        }
+                        break;
+                }
+                if (bReturn) return;
+
+                ProcExe:
+
+                DataGridView dgv = dgvMaster;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    // ƒ�ƒbƒN�s‚Í�ˆ—�‚µ‚È‚¢
+                    int nLock = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.DataLock].Value);
+                    if (nLock == (int)CostDataOfCompensation.LockFlgDef.Locked) continue;
+                    for (int ix = (int)DispColDetail.No; ix < dgv.ColumnCount; ix++)
+                    {
+                        DataGridViewCell CurCell = CurRow.Cells[ix];
+                        switch (ix)
+                        {
+                            case (int)DispColDetail.No:                 // 9:No
+                            case (int)DispColDetail.PersonName:         // 10:’S“–ŽÒ–¼
+                            case (int)DispColDetail.FromName:           // 12:‘ŠŽè�æ–¼�Ì
+                                CurCell.ReadOnly = true;
+                                break;
+                            case (int)DispColDetail.SendDate:           // 11:•â“U“ú
+                            case (int)DispColDetail.Content:            // 13:�o”[“à—e
+                            case (int)DispColDetail.EntryPrice:         // 14:‹àŠz�i�Å”²�j
+                            case (int)DispColDetail.EntryTax:           // 15:‹àŠz�i�Å�ž�j
+                            case (int)DispColDetail.Comment:            // 16:”õ�l
+                                CurCell.ReadOnly = false;
+                                break;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepCostSection.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepCostSection.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepCostSection.cs	(revision 483)
@@ -0,0 +1,721 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.Diagnostics;
+using System.Threading;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.SubForms;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    /// <summary>
+    /// •â“U•\Ž¦�ˆ—�
+    /// </summary>
+    partial class FrmDepCost
+    {
+        #region ’è�”
+
+        #region •â“U•”��•\Ž¦ƒJƒ‰ƒ€
+        /// <summary>
+        /// •â“U•”��•\Ž¦ƒJƒ‰ƒ€
+        /// </summary>
+        private enum DispColSection
+        {
+            /// <summary>
+            /// 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+            /// </summary>
+            CostType = 0,
+            /// <summary>
+            /// 1:�o”[�æƒR�[ƒh
+            /// </summary>
+            TargetType,
+            /// <summary>
+            /// 2:‘Î�ÛƒR�[ƒh
+            /// </summary>
+            TargetCode,
+            /// <summary>
+            /// 3:No
+            /// </summary>
+            No,
+            /// <summary>
+            /// 4:�o”[�æƒ^ƒCƒv–¼�Ì
+            /// </summary>
+            TargetTypeName,
+            /// <summary>
+            /// 5:‹àŠz�i�Å”²�j
+            /// </summary>
+            EntryPrice,
+            /// <summary>
+            /// 6:‹àŠz�i�Å�ž�j
+            /// </summary>
+            EntryTax,
+        }
+        #endregion
+
+        #endregion
+
+        #region •â“U�E•”���Fˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
+        /// <summary>
+        /// •â“U�E•”���Fˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
+        /// </summary>
+        private void DispType1Section()
+        {
+            // ƒvƒ�ƒOƒŒƒXƒo�[•\Ž¦�§Œä
+            VisibleProgressBar(true);
+            try
+            {
+                switch (m_TargetType)
+                {
+                    case (int)CostDataOfCompensation.TargetTypeDef.Department:
+                        // ---- •”��
+                        // ƒXƒ^ƒCƒ‹ƒZƒbƒg
+                        DispStyleType1SectionDepartment();
+                        // ƒf�[ƒ^•\Ž¦
+                        DispDataType1SectionDepartment();
+                        break;
+                    case (int)CostDataOfCompensation.TargetTypeDef.Construction:
+                        // �HŽ–
+                        // ƒXƒ^ƒCƒ‹ƒZƒbƒg
+                        DispStyleType1SectionConstruction();
+                        // ƒf�[ƒ^•\Ž¦
+                        DispDataType1SectionConstruction();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                VisibleProgressBar(false);
+            }
+        }
+        #endregion
+
+        #region •â“U�E•”���Fˆê——ƒXƒ^ƒCƒ‹ƒZƒbƒg
+        private DataGridViewTextBoxColumn[] ColumnType1 = new DataGridViewTextBoxColumn[7];
+        DataGridViewCellStyle[] CellStyleType1 = new DataGridViewCellStyle[4];
+        /// <summary>
+        /// •â“U�E•”���Fˆê——ƒXƒ^ƒCƒ‹ƒZƒbƒg
+        /// </summary>
+        private void DispStyleType1SectionDepartment()
+        {
+            DataGridView dgv = dgvMaster;
+            dgv.SuspendLayout();
+            try
+            {
+
+                // —ñƒf�[ƒ^�ì�¬
+                for (int ix = 0; ix < ColumnType1.Length; ix++)
+                {
+                    if (ColumnType1[ix] is null) ColumnType1[ix] = new DataGridViewTextBoxColumn();
+                }
+                // ƒOƒŠƒbƒh‚Ö—ñ’Ç‰Á
+                dgv.Columns.AddRange(ColumnType1[(int)DispColSection.CostType]          // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                                    , ColumnType1[(int)DispColSection.TargetType]       // 1:�o”[�æƒR�[ƒh
+                                    , ColumnType1[(int)DispColSection.TargetCode]       // 2:‘Î�ÛƒR�[ƒh
+                                    , ColumnType1[(int)DispColSection.No]               // 3:No
+                                    , ColumnType1[(int)DispColSection.TargetTypeName]   // 4:�o”[�æƒ^ƒCƒv–¼�Ì
+                                    , ColumnType1[(int)DispColSection.EntryPrice]       // 5:‹àŠz�i�Å”²�j
+                                    , ColumnType1[(int)DispColSection.EntryTax]);       // 6:‹àŠz�i�Å�ž�j
+                // —ñƒXƒ^ƒCƒ‹�ì�¬
+                for (int ix = 0; ix < CellStyleType1.Length; ix++)
+                {
+                    if (CellStyleType1[ix] is null) CellStyleType1[ix] = new DataGridViewCellStyle();
+                }
+
+                // 
+                // Column1
+                // 
+                int nDispCnt = (int)DispColSection.CostType;
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "�o”[•ª—ÞƒR�[ƒh";
+                ColumnType1[nDispCnt].Name = "Column1";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Visible = false;
+                ColumnType1[nDispCnt].Width = 0;
+                // 
+                // Column2
+                // 
+                nDispCnt = (int)DispColSection.TargetType;
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "�o”[�æƒR�[ƒh";
+                ColumnType1[nDispCnt].Name = "Column2";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Visible = false;
+                ColumnType1[nDispCnt].Width = 0;
+                // 
+                // Column3
+                // 
+                nDispCnt = (int)DispColSection.TargetCode;
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "‘Î�ÛƒR�[ƒh";
+                ColumnType1[nDispCnt].Name = "Column3";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Visible = false;
+                ColumnType1[nDispCnt].Width = 0;
+                // 
+                // Column4
+                // 
+                nDispCnt = (int)DispColSection.No;
+                CellStyleType1[0].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1[0].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[0].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[0];
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "‡‚";
+                ColumnType1[nDispCnt].Name = "Column4";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].Resizable = DataGridViewTriState.False;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 50;
+                // 
+                // Column5
+                // 
+                nDispCnt = (int)DispColSection.TargetTypeName;
+                CellStyleType1[1].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1[1].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1[1].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[1].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[1];
+                ColumnType1[nDispCnt].HeaderText = "‘Î�@�Û�@•”�@��";
+                ColumnType1[nDispCnt].Name = "Column5";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 770;
+                // 
+                // Column6
+                // 
+                nDispCnt = (int)DispColSection.EntryPrice;
+                CellStyleType1[2].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleType1[2].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[2].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[2];
+                ColumnType1[nDispCnt].HeaderText = "‹àŠz�i�Å”²�j";
+                ColumnType1[nDispCnt].Name = "Column6";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 200;
+                // 
+                // Column7
+                // 
+                nDispCnt = (int)DispColSection.EntryTax;
+                CellStyleType1[3].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleType1[3].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[3].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[3];
+                ColumnType1[nDispCnt].HeaderText = "‹àŠz�i�Å�ž�j";
+                ColumnType1[nDispCnt].Name = "Column7";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 200;
+
+                // ƒOƒŠƒbƒhˆÊ’u�EƒTƒCƒY•Ï�X
+                dgvMaster.Width = 1240;
+                dgvMaster.Height = 508;
+                dgvMaster.Location = new Point(10, 10);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                dgv.ResumeLayout();
+            }
+        }
+        #endregion
+
+        #region •â“U�E•”���Fˆê——•\Ž¦
+        /// <summary>
+        /// •â“U�E•”���Fˆê——•\Ž¦
+        /// </summary>
+        private void DispDataType1SectionDepartment()
+        {
+            IOAllFreeSQL FreeDB = new IOAllFreeSQL();
+            DataGridView dgv = dgvMaster;
+            try
+            {
+                lblTitle.Visible = true;
+                lblTitle.Text = GetGridTile();
+                btnStageUp.Visible = true;
+
+                StringBuilder strSQL = new StringBuilder();
+
+                // •â“U�E•”���Fˆê——‚r‚p‚k�ì�¬
+                strSQL.Append(CreateSQLType1SectionDepartment());
+
+                ArrayList ArList = new ArrayList();
+                if (!FreeDB.ExecuteReader(strSQL.ToString(), ref ArList)) return;
+
+                ProgressBar.Maximum = ArList.Count;
+
+                int nNo = 0;
+                foreach (object[] objRec in ArList)
+                {
+                    int nCostType = CommonMotions.cnvInt(objRec[0]);
+                    int nTargetType = CommonMotions.cnvInt(objRec[1]);
+                    int nTargetCode = CommonMotions.cnvInt(objRec[2]);
+
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                    CurRow.Cells[(int)DispColSection.CostType].Value = nCostType;                                 // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                    CurRow.Cells[(int)DispColSection.TargetType].Value = nTargetType;                             // 1:�o”[�æƒ^ƒCƒv
+                    CurRow.Cells[(int)DispColSection.TargetCode].Value = nTargetCode;                             // 2:�o”[�æƒR�[ƒh
+                    CurRow.Cells[(int)DispColSection.No].Value = ++nNo;                                           // 3:No
+                    CurRow.Cells[(int)DispColSection.TargetTypeName].Value = CommonMotions.cnvString(objRec[3]);  // 4:�æ–¼�Ì
+
+                    decimal decEntryPrice = CommonMotions.cnvDecimal(objRec[5]);
+                    decimal decEntryTax = CommonMotions.cnvDecimal(objRec[6]);
+                    CurRow.Cells[(int)DispColSection.EntryPrice].Value = decEntryPrice.ToString("#,0");           // 5:‹àŠz�i�Å”²�j
+                    CurRow.Cells[(int)DispColSection.EntryTax].Value = decEntryTax.ToString("#,0");               // 6:‹àŠz�i�Å�ž�j
+
+                    ProgressBar.Value++;
+                }
+                if (ArList.Count > 0)
+                {
+                    SetTotalRowType1SectionDepartment();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                FreeDB.close(); FreeDB = null;
+
+                // ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
+                SetGridMaxRow();
+
+                ProgressBar.Value = ProgressBar.Maximum;
+            }
+        }
+        #endregion
+
+        #region •â“U�E•”���Fˆê——‚r‚p‚k�ì�¬
+        /// <summary>
+        /// •â“U�E•”���Fˆê——‚r‚p‚k�ì�¬
+        /// </summary>
+        private string CreateSQLType1SectionDepartment()
+        {
+            try
+            {
+                decimal nNumYear = numUDConstPro.Value;
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.AppendFormat(" ifnull(C.CostType, {0})", m_DispCost);                        // 0
+                strSQL.AppendFormat(", ifnull(C.TargetType, {0})", m_TargetType);                   // 1
+                strSQL.Append("      , A.DepartmentCode");                                          // 2
+                strSQL.Append("      , A.DepartmentString");                                        // 3
+                strSQL.AppendFormat(", ifnull(C.YearNumber, {0})", nNumYear);                       // 4
+                strSQL.Append("      , ifnull(C.EntryPrice, 0)");                                   // 5
+                strSQL.Append("      , ifnull(C.EntryTax, 0)");                                     // 6
+                strSQL.Append(" From departmentmaster As A");
+                strSQL.Append("      Left Join (");
+                strSQL.Append("                 Select");
+                strSQL.Append("                       CC.YearNumber");
+                strSQL.Append("                       , CC.CostType");
+                strSQL.Append("                       , CC.TargetType");
+                strSQL.Append("                       , CC.TargetCode");
+                strSQL.Append("                       , SUM(CC.EntryPrice) As EntryPrice");
+                strSQL.Append("                       , SUM(CC.EntryTax) As EntryTax");
+                strSQL.Append("                  From costdataofcompensation As CC");
+                strSQL.AppendFormat("            Where CC.CostType = {0}", m_DispCost);
+                strSQL.AppendFormat("            And CC.TargetType = {0}", m_TargetType);
+                strSQL.AppendFormat("            And CC.YearNumber = {0}", nNumYear);
+                strSQL.Append("                  Group By CC.YearNumber");
+                strSQL.Append("                         , CC.CostType");
+                strSQL.Append("                         , CC.TargetType");
+                strSQL.Append("                         , CC.TargetCode) As C");
+                strSQL.AppendFormat("      On C.CostType = {0}", m_DispCost);
+                strSQL.AppendFormat("      And C.TargetType = {0}", m_TargetType);
+                strSQL.AppendFormat("      And C.YearNumber = {0}", nNumYear);
+                strSQL.Append("            And C.TargetCode = A.DepartmentCode");
+                strSQL.Append(" Where A.DeleteFlg = 0");
+                strSQL.Append(" Order By A.DisplayOrder");
+
+                return strSQL.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region •â“U�E•”���F�‡Œv�s‚Ì•\Ž¦
+        /// <summary>
+        /// •â“U�E•”���F�‡Œv�s‚Ì•\Ž¦
+        /// </summary>
+        private void SetTotalRowType1SectionDepartment()
+        {
+            try
+            {
+                DataGridView dgv = dgvMaster;
+                dgv.Rows.Add(1);
+                int nIndex = dgv.Rows.Add(1);
+
+                decimal[] decTotal = new decimal[2];
+                decTotal[0] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColSection.No].Value) > 0)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColSection.EntryPrice].Value));
+                decTotal[1] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColSection.No].Value) > 0)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColSection.EntryTax].Value));
+
+                DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                CurRow.Cells[(int)DispColDetail.CostType].Value = s_GridTotalCode;                                  // ƒ^ƒCƒv‚ÉƒZƒbƒg
+                CurRow.Cells[(int)DispColSection.TargetTypeName].Value = "‘� �‡ Œv";                                // 3:ƒ^ƒCƒv–¼�Ì
+                CurRow.Cells[(int)DispColSection.TargetTypeName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CurRow.Cells[(int)DispColSection.EntryPrice].Value = decTotal[0].ToString("#,0");                   // 5:‹àŠz�i�Å”²�j
+                CurRow.Cells[(int)DispColSection.EntryTax].Value = decTotal[1].ToString("#,0");                     // 6:‹àŠz�i�Å�ž�j
+
+                for (int ix = 0; ix < dgv.ColumnCount; ix++)
+                {
+                    CurRow.Cells[ix].Style.BackColor = Color.Black;
+                    CurRow.Cells[ix].Style.ForeColor = Color.White;
+                    CurRow.Cells[ix].ReadOnly = true;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region •â“U�E�HŽ–�Fˆê——ƒXƒ^ƒCƒ‹ƒZƒbƒg
+        /// <summary>
+        /// •â“U�E�HŽ–�Fˆê——ƒXƒ^ƒCƒ‹ƒZƒbƒg
+        /// </summary>
+        private void DispStyleType1SectionConstruction()
+        {
+            DataGridView dgv = dgvMaster;
+            dgv.SuspendLayout();
+            try
+            {
+
+                // —ñƒf�[ƒ^�ì�¬
+                for (int ix = 0; ix < ColumnType1.Length; ix++)
+                {
+                    if (ColumnType1[ix] is null) ColumnType1[ix] = new DataGridViewTextBoxColumn();
+                }
+                // ƒOƒŠƒbƒh‚Ö—ñ’Ç‰Á
+                dgv.Columns.AddRange(ColumnType1[(int)DispColSection.CostType]          // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                                    , ColumnType1[(int)DispColSection.TargetType]       // 1:�o”[�æƒR�[ƒh
+                                    , ColumnType1[(int)DispColSection.TargetCode]       // 2:‘Î�ÛƒR�[ƒh
+                                    , ColumnType1[(int)DispColSection.No]               // 3:No
+                                    , ColumnType1[(int)DispColSection.TargetTypeName]   // 4:�o”[�æƒ^ƒCƒv–¼�Ì
+                                    , ColumnType1[(int)DispColSection.EntryPrice]       // 5:‹àŠz�i�Å”²�j
+                                    , ColumnType1[(int)DispColSection.EntryTax]);       // 6:‹àŠz�i�Å�ž�j
+                // —ñƒXƒ^ƒCƒ‹�ì�¬
+                for (int ix = 0; ix < CellStyleType1.Length; ix++)
+                {
+                    if (CellStyleType1[ix] is null) CellStyleType1[ix] = new DataGridViewCellStyle();
+                }
+
+                // 
+                // Column1
+                // 
+                int nDispCnt = (int)DispColSection.CostType;
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "�o”[•ª—ÞƒR�[ƒh";
+                ColumnType1[nDispCnt].Name = "Column1";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Visible = false;
+                ColumnType1[nDispCnt].Width = 0;
+                // 
+                // Column2
+                // 
+                nDispCnt = (int)DispColSection.TargetType;
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "�o”[�æƒR�[ƒh";
+                ColumnType1[nDispCnt].Name = "Column2";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Visible = false;
+                ColumnType1[nDispCnt].Width = 0;
+                // 
+                // Column3
+                // 
+                nDispCnt = (int)DispColSection.TargetCode;
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "‘Î�ÛƒR�[ƒh";
+                ColumnType1[nDispCnt].Name = "Column3";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Visible = false;
+                ColumnType1[nDispCnt].Width = 0;
+                // 
+                // Column4
+                // 
+                nDispCnt = (int)DispColSection.No;
+                CellStyleType1[0].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleType1[0].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[0].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[0];
+                ColumnType1[nDispCnt].Frozen = true;
+                ColumnType1[nDispCnt].HeaderText = "‡‚";
+                ColumnType1[nDispCnt].Name = "Column4";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].Resizable = DataGridViewTriState.False;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 50;
+                // 
+                // Column5
+                // 
+                nDispCnt = (int)DispColSection.TargetTypeName;
+                CellStyleType1[1].Alignment = DataGridViewContentAlignment.MiddleLeft;
+                CellStyleType1[1].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[1].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[1];
+                ColumnType1[nDispCnt].HeaderText = "‘Î�@�Û�@�H�@Ž–";
+                ColumnType1[nDispCnt].Name = "Column5";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 770;
+                // 
+                // Column6
+                // 
+                nDispCnt = (int)DispColSection.EntryPrice;
+                CellStyleType1[2].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleType1[2].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[2].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[2];
+                ColumnType1[nDispCnt].HeaderText = "‹àŠz�i�Å”²�j";
+                ColumnType1[nDispCnt].Name = "Column6";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 200;
+                // 
+                // Column7
+                // 
+                nDispCnt = (int)DispColSection.EntryTax;
+                CellStyleType1[3].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleType1[3].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleType1[3].ForeColor = Color.Black;
+                ColumnType1[nDispCnt].DefaultCellStyle = CellStyleType1[3];
+                ColumnType1[nDispCnt].HeaderText = "‹àŠz�i�Å�ž�j";
+                ColumnType1[nDispCnt].Name = "Column7";
+                ColumnType1[nDispCnt].ReadOnly = true;
+                ColumnType1[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnType1[nDispCnt].Width = 200;
+
+                // ƒOƒŠƒbƒhˆÊ’u�EƒTƒCƒY•Ï�X
+                dgvMaster.Width = 1240;
+                dgvMaster.Height = 508;
+                dgvMaster.Location = new Point(10, 10);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                dgv.ResumeLayout();
+            }
+        }
+        #endregion
+
+        #region •â“U�E�HŽ–�Fˆê——•\Ž¦
+        /// <summary>
+        /// •â“U�E�HŽ–�Fˆê——•\Ž¦
+        /// </summary>
+        private void DispDataType1SectionConstruction()
+        {
+            IOAllFreeSQL FreeDB = new IOAllFreeSQL();
+            DataGridView dgv = dgvMaster;
+            try
+            {
+                lblTitle.Visible = true;
+                lblTitle.Text = GetGridTile();
+                btnStageUp.Visible = true;
+
+                btnLineAdd.Visible = true;
+                btnLineAdd.Text = "�H�@Ž–�@’Ç�@‰Á";
+
+                StringBuilder strSQL = new StringBuilder();
+                // •â“U�E�HŽ–�Fˆê——•\Ž¦‚r‚p‚k�ì�¬
+                strSQL.Append(CreateSQLType1SectionConstruction());
+
+                ArrayList ArList = new ArrayList();
+                if (!FreeDB.ExecuteReader(strSQL.ToString(), ref ArList)) return;
+
+                ProgressBar.Maximum = ArList.Count;
+
+                int nNo = 0;
+                foreach (object[] objRec in ArList)
+                {
+                    int nCostType = CommonMotions.cnvInt(objRec[0]);
+                    int nTargetType = CommonMotions.cnvInt(objRec[1]);
+                    int nTargetCode = CommonMotions.cnvInt(objRec[2]);
+
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                    CurRow.Cells[(int)DispColSection.CostType].Value = nCostType;                                 // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                    CurRow.Cells[(int)DispColSection.TargetType].Value = nTargetType;                             // 1:�o”[�æƒ^ƒCƒv
+                    CurRow.Cells[(int)DispColSection.TargetCode].Value = nTargetCode;                             // 2:�o”[�æƒR�[ƒh
+                    CurRow.Cells[(int)DispColSection.No].Value = ++nNo;                                           // 3:No
+                    CurRow.Cells[(int)DispColSection.TargetTypeName].Value = CommonMotions.cnvString(objRec[3]);  // 4:�HŽ––¼�Ì
+
+                    decimal decEntryPrice = CommonMotions.cnvDecimal(objRec[5]);
+                    decimal decEntryTax = CommonMotions.cnvDecimal(objRec[6]);
+                    CurRow.Cells[(int)DispColSection.EntryPrice].Value = decEntryPrice.ToString("#,0");           // 5:‹àŠz�i�Å”²�j
+                    CurRow.Cells[(int)DispColSection.EntryTax].Value = decEntryTax.ToString("#,0");               // 6:‹àŠz�i�Å�ž�j
+
+                    ProgressBar.Value++;
+                }
+                if (ArList.Count > 0)
+                {
+                    SetTotalRowType1SectionConstruction();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                FreeDB.close(); FreeDB = null;
+
+                // ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
+                SetGridMaxRow();
+
+                ProgressBar.Value = ProgressBar.Maximum;
+            }
+        }
+        #endregion
+
+        #region •â“U�E�HŽ–�Fˆê——•\Ž¦‚r‚p‚k�ì�¬
+        /// <summary>
+        /// •â“U�E�HŽ–�Fˆê——•\Ž¦‚r‚p‚k�ì�¬
+        /// </summary>
+        private string CreateSQLType1SectionConstruction()
+        {
+            try
+            {
+                decimal nNumYear = numUDConstPro.Value;
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
+                strSQL.AppendFormat(" ifnull(C.CostType, {0})", m_DispCost);                        // 0
+                strSQL.AppendFormat(", ifnull(C.TargetType, {0})", m_TargetType);                   // 1
+                strSQL.Append("      , A.ConstructionCode");                                        // 2
+                strSQL.Append("      , B.DetailString");                                            // 3
+                strSQL.AppendFormat(", ifnull(C.YearNumber, {0})", nNumYear);                       // 4
+                strSQL.Append("      , ifnull(C.EntryPrice, 0)");                                   // 5
+                strSQL.Append("      , ifnull(C.EntryTax, 0)");                                     // 6
+                strSQL.Append(" From constructionbaseinfo As A");
+                strSQL.Append("      Inner Join constructionbaseinfodetail As B");
+                strSQL.Append("             On B.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat("       And B.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.Append("      Inner Join (");
+                strSQL.Append("                 Select");
+                strSQL.Append("                       CC.YearNumber");
+                strSQL.Append("                       , CC.CostType");
+                strSQL.Append("                       , CC.TargetType");
+                strSQL.Append("                       , CC.TargetCode");
+                strSQL.Append("                       , SUM(CC.EntryPrice) As EntryPrice");
+                strSQL.Append("                       , SUM(CC.EntryTax) As EntryTax");
+                strSQL.Append("                  From costdataofcompensation As CC");
+                strSQL.AppendFormat("            Where CC.CostType = {0}", m_DispCost);
+                strSQL.AppendFormat("            And CC.TargetType = {0}", m_TargetType);
+                strSQL.AppendFormat("            And CC.YearNumber = {0}", nNumYear);
+                strSQL.Append("                  Group By CC.YearNumber");
+                strSQL.Append("                         , CC.CostType");
+                strSQL.Append("                         , CC.TargetType");
+                strSQL.Append("                         , CC.TargetCode) As C");
+                strSQL.AppendFormat("      On C.CostType = {0}", m_DispCost);
+                strSQL.AppendFormat("      And C.TargetType = {0}", m_TargetType);
+                strSQL.AppendFormat("      And C.YearNumber = {0}", nNumYear);
+                strSQL.Append("            And C.TargetCode = A.ConstructionCode");
+                strSQL.Append(" Where");
+                if (CommonMotions.BasePeriodYear())
+                {
+                    strSQL.AppendFormat(" A.ConstructionPeriod = {0}", nNumYear);
+                }
+                else
+                {
+                    strSQL.AppendFormat(" A.ConstructionYear = {0}", nNumYear);
+                }
+
+                strSQL.Append(" Order By A.ConstructionCode Desc");
+
+                return strSQL.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region •â“U�E�HŽ–�F�‡Œv�s‚Ì•\Ž¦
+        /// <summary>
+        /// •â“U�E�HŽ–�F�‡Œv�s‚Ì•\Ž¦
+        /// </summary>
+        private void SetTotalRowType1SectionConstruction()
+        {
+            try
+            {
+                DataGridView dgv = dgvMaster;
+                dgv.Rows.Add(1);
+                int nIndex = dgv.Rows.Add(1);
+
+                decimal[] decTotal = new decimal[2];
+                decTotal[0] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColSection.No].Value) > 0)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColSection.EntryPrice].Value));
+                decTotal[1] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColSection.No].Value) > 0)
+                                                                .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColSection.EntryTax].Value));
+
+                DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                CurRow.Cells[(int)DispColDetail.CostType].Value = s_GridTotalCode;                              // ƒ^ƒCƒv‚ÉƒZƒbƒg
+                CurRow.Cells[(int)DispColSection.TargetTypeName].Value = "‘� �‡ Œv";                            // 3:ƒ^ƒCƒv–¼�Ì
+                CurRow.Cells[(int)DispColSection.TargetTypeName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CurRow.Cells[(int)DispColSection.EntryPrice].Value = decTotal[0].ToString("#,0");               // 5:‹àŠz�i�Å”²�j
+                CurRow.Cells[(int)DispColSection.EntryTax].Value = decTotal[1].ToString("#,0");                 // 6:‹àŠz�i�Å�ž�j
+
+                for (int ix = 0; ix < dgv.ColumnCount; ix++)
+                {
+                    CurRow.Cells[ix].Style.BackColor = Color.Black;
+                    CurRow.Cells[ix].Style.ForeColor = Color.White;
+                    CurRow.Cells[ix].ReadOnly = true;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.cs	(revision 483)
@@ -6,6 +6,8 @@
 using System.Text;
 using System.Windows.Forms;
 using System.Collections;
+using System.Threading.Tasks;
+using System.Diagnostics;
 
 using log4net;
 using log4net.Appender;
@@ -34,100 +36,6 @@
         #endregion
 
         #region ’è�”
-        #region •\Ž¦ƒJƒ‰ƒ€
-        /// <summary>
-        /// ˆê——•\Ž¦ƒJƒ‰ƒ€
-        /// </summary>
-        private enum DispColType1
-        {
-            /// <summary>
-            /// 0:•”��ƒR�[ƒh
-            /// </summary>
-            DepCode = 0,
-            /// <summary>
-            /// 1:•”��–¼
-            /// </summary>
-            DepName,
-            /// <summary>
-            /// 2:Žx•¥Œ��”
-            /// </summary>
-            PaymentCnt,
-            /// <summary>
-            /// 3:‹àŠz�i�Å”²�j
-            /// </summary>
-            EntryPrice,
-            /// <summary>
-            /// 4:‹àŠz�i�Å�ž�j
-            /// </summary>
-            EntryTax,
-        }
-        /// <summary>
-        /// –¾�×•\Ž¦ƒJƒ‰ƒ€
-        /// </summary>
-        private enum DispColType2
-        {
-            /// <summary>
-            ///  0:�s•Ò�W�ó‘Ô
-            /// </summary>
-            RowStatus = 0,
-            /// <summary>
-            ///  1:•\Ž¦�o”[“ú
-            /// </summary>
-            DspCostDate,
-            /// <summary>
-            ///  2:Žx•¥�æƒR�[ƒh
-            /// </summary>
-            SuppliersCode,
-            /// <summary>
-            ///  3:Žx•¥�æ–¼
-            /// </summary>
-            SuppliersName,
-            /// <summary>
-            ///  4:Žx•¥“à—e
-            /// </summary>
-            PaymentContent,
-            /// <summary>
-            ///  5:Žx•¥ƒ{ƒ^ƒ“
-            /// </summary>
-            SRButton1,
-            /// <summary>
-            ///  6:Žû“üƒ{ƒ^ƒ“
-            /// </summary>
-            SRButton2,
-            /// <summary>
-            ///  7:�o”[‹æ•ªƒtƒ‰ƒO
-            /// </summary>
-            SRType,
-            /// <summary>
-            ///  8:�o”[‹æ•ªƒtƒ‰ƒO–¼�Ì
-            /// </summary>
-            SRNamne,
-            /// <summary>
-            ///  9:‹àŠz�i�Å”²�j
-            /// </summary>
-            EntryPrice,
-            /// <summary>
-            /// 10:‹àŠz�i�Å�ž�j
-            /// </summary>
-            EntryTax,
-            /// <summary>
-            /// 11:”õ�l
-            /// </summary>
-            Coment,
-            /// <summary>
-            /// 12:•”��ƒR�[ƒh
-            /// </summary>
-            DepCode,
-            /// <summary>
-            /// 13:�o”[“ú
-            /// </summary>
-            CostDate,
-            /// <summary>
-            /// 14:ƒŒƒR�[ƒh”Ô�†
-            /// </summary>
-            RecSeqNo,
-        }
-        #endregion
 
         #region �s‘I‘ð�F
         /// <summary>
@@ -134,8 +42,8 @@
         /// �s‘I‘ð�F
         /// </summary>
         private static Color s_RowSelectBackColor = Color.Blue;
-            private static Color s_RowSelectForeColor = Color.White;
-            #endregion
+        private static Color s_RowSelectForeColor = Color.White;
+        #endregion
 
         #region �‡Œv�s�F
         /// <summary>
@@ -145,68 +53,43 @@
         private static Color s_RowTotalForeColor = Color.White;
         #endregion
 
-        #region �sƒ^ƒCƒgƒ‹
+        #region ƒOƒŠƒbƒhƒfƒtƒHƒ‹ƒg�s
         /// <summary>
-        /// �sƒ^ƒCƒgƒ‹•À‚Ñ�‡
+        /// ƒOƒŠƒbƒhƒfƒtƒHƒ‹ƒg�s
         /// </summary>
-        private enum RowTitleNum
+        private static int s_RowDefault = 20;
+        #endregion
+
+        #region •\Ž¦’iŠK’è‹`
+        /// <summary>
+        /// •\Ž¦’iŠK’è‹`
+        /// </summary>
+        public enum DispStageDef
         {
             /// <summary>
-            /// Ž{�H’†�‡Œv
+            /// 0:“à—e
             /// </summary>
-            Execution = 0,
+            TotalData = 0,
             /// <summary>
-            /// Š®—¹�ÏŒv
+            /// 1:•”���E�HŽ–
             /// </summary>
-            Completed,
+            Section,
             /// <summary>
-            /// ‘S�HŽ–Œv
+            /// 2:–¾�×
             /// </summary>
-            AllConstrutions,
-            /// <summary>
-            /// Œo”ï�‡Œv
-            /// </summary>
-            Expenses,
-            /// <summary>
-            /// •â�•�U•ªŒv
-            /// </summary>
-            Auxiliary,
-            /// <summary>
-            /// ‘��‡Œv
-            /// </summary>
-            AllTotal,
+            Detail,
         }
-
-        /// <summary>
-        /// �‡Œv�sƒ^ƒCƒgƒ‹
-        /// </summary>
-        private static string[] s_TotalTitleArray = new string[] {  "�–Ž{�@�H�@’†�@�‡�@Œv�–",
-                                                                    "�–Š®�@—¹�@�Ï�@�‡�@Œv�–",
-                                                                    "�–‘S�@�H�@Ž–�@�‡�@Œv�–",
-                                                                    "�–�@Œo�@�@”ï�@�@Œv�@�–",
-                                                                    "�–�l Œ� ”ï �U •ª Œv�–",
-                                                                    "�–�–�@‘��@�‡�@Œv�@�–�–",
-                                                                };
         #endregion
 
-        #region ƒOƒŠƒbƒh�€–Ú�sƒ^ƒCƒgƒ‹
+        #region ƒOƒŠƒbƒh‚Ì�‡Œv�sƒR�[ƒh
         /// <summary>
-        /// ƒOƒŠƒbƒh�€–Ú�sƒ^ƒCƒgƒ‹
+        /// ƒOƒŠƒbƒh‚Ì�‡Œv�sƒR�[ƒh
         /// </summary>
-        private static string[] s_GroupTitle = new string[] {" •›’S“–ŽÒŽû‰v ",
-                                                             "  Žw“±ˆõŽû‰v  ",
-                                                             "’S“–ŽÒ‹‹—^�·Šz"};
+        private static int s_GridTotalCode = 9999;
         #endregion
 
-        #region �o”[–¼�Ì
-        /// <summary>
-        /// �o”[–¼�Ì
-        /// </summary>
-        private static Dictionary<int, string> s_SendReceiveName = new Dictionary<int, string>() { { -1, "Žx•¥‹àŠz" }, { 0, "" }, { 1, "Žû“ü‹àŠz" } };
         #endregion
 
-        #endregion
-
         #region •Ï�”
 
         /// <summary>
@@ -220,72 +103,50 @@
         private bool m_bChengeAns = false;
 
         /// <summary>
-        /// �I—¹�ó‘Ôƒtƒ‰ƒO
+        /// �I—¹ƒ{ƒ^ƒ“‰Ÿ‰ºƒtƒ‰ƒO
         /// </summary>
-        private DialogResult m_EndButton = DialogResult.None;
+        private bool m_CloseingProcessOn = true;
 
-        #region ƒOƒŠƒbƒhƒJƒ‰ƒ€ƒTƒCƒY
         /// <summary>
-        /// ƒOƒŠƒbƒhƒJƒ‰ƒ€ƒTƒCƒY
+        /// �HŽ–ƒR�[ƒh
         /// </summary>
-        int[] m_CellSize = null;
-        #endregion
+        private int m_ConstructionCode = 0;
 
-        #region ƒtƒH�[ƒ€•�
+        #region ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
         /// <summary>
-        /// ƒtƒH�[ƒ€•�
+        /// ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
         /// </summary>
-        private int m_FormWidthSize = 0;
+        private bool m_NextProcFlg = false;
         #endregion
 
-        #region ‘�ŒvƒOƒŠƒbƒh•�ƒTƒCƒY
+        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         /// <summary>
-        /// ‘�ŒvƒOƒŠƒbƒh•�ƒTƒCƒY
+        /// ŒÄ�oŒ³�I—¹ƒtƒ‰ƒO
         /// </summary>
-        private int m_GridWidthSize = 0;
-        #endregion
+        private bool m_ParentEnd = false;
 
-        #region �‰Šú‘I‘ð”N“x
         /// <summary>
-        /// �‰Šú‘I‘ð”N“x
+        /// ƒTƒuƒtƒH�[ƒ€‹N“®ƒtƒ‰ƒO
         /// </summary>
-        private int m_FirstStartPeriod = 0;
-        #endregion
+        private bool m_SubForm = false;
+        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
 
-        #region �‰Šú‘I‘ð•”��ƒR�[ƒh
         /// <summary>
-        /// �‰Šú‘I‘ð•”��ƒR�[ƒh
+        /// ƒAƒNƒZƒX�§ŒÀƒtƒ‰ƒO
         /// </summary>
-        private int m_FirstStartDepartmentCode = CommonMotions.LoginUserData.DepartmentCode;
-        #endregion
+        private bool m_EditLock = false;
 
-        #region �‰Šú‘I‘ð’S“–ŽÒƒR�[ƒh
         /// <summary>
-        /// �‰Šú‘I‘ð’S“–ŽÒƒR�[ƒh
+        /// ‹N“®Œ³ƒvƒ�ƒZƒX”Ô�†
         /// </summary>
-        private int m_FirstStartPersonCode = CommonMotions.LoginUserData.PersonCode;
-        #endregion
+        private int m_PrevProcessNo = 0;
 
-        #region ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
         /// <summary>
-        /// ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
+        /// �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^ƒŠƒXƒg
         /// </summary>
-        private bool m_NextProcFlg = false;
-        #endregion
+        List<CostDataType> m_DataTypeList = new List<CostDataType>();
 
-        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         /// <summary>
-        /// ŒÄ�oŒ³�I—¹ƒtƒ‰ƒO
-        /// </summary>
-        private bool m_ParentEnd = false;
-        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
-
-        /// <summary>
-        /// ƒAƒNƒZƒX�§ŒÀƒtƒ‰ƒO
-        /// </summary>
-        private bool m_EditLock = false;
-
-        /// <summary>
         /// ŠY“–�HŽ–Šî–{�î•ñ
         /// </summary>
         private ConstructionBaseInfo m_ConstructionBaseInfo = new ConstructionBaseInfo();
@@ -302,6 +163,45 @@
         private ContextMenuStrip m_ExecMenuStrip = new ContextMenuStrip();
         #endregion
 
+        /// <summary>
+        /// •\Ž¦�o”[ƒ^ƒCƒv•ÛŽ�ƒGƒŠƒA
+        /// </summary>
+        private int m_DispCost = (int)CostDataOfCompensation.CostTypeDef.None;
+
+        /// <summary>
+        /// •\Ž¦‘Î�Û•ÛŽ�ƒGƒŠƒA
+        /// </summary>
+        private int m_TargetType = (int)CostDataOfCompensation.TargetTypeDef.None;
+
+        /// <summary>
+        /// •\Ž¦‘Î�ÛƒR�[ƒh•ÛŽ�ƒGƒŠƒA
+        /// </summary>
+        private int m_TargetCode = 0;
+
+        /// <summary>
+        /// •\Ž¦’iŠK•ÛŽ�ƒGƒŠƒA
+        /// </summary>
+        private int m_DispStage = (int)DispStageDef.TotalData;
+
+        /// <summary>
+        /// ‘Î�Û“ú•t
+        /// </summary>
+        private DateTime m_TargetDate = DateTime.MinValue;
+
+        /// <summary>
+        /// ‘Î�Û‘ŠŽè�æ‰ïŽÐƒR�[ƒh
+        /// </summary>
+        private int m_TargetCompanyCode = 0;
+
+        /// <summary>
+        /// ‘Î�Û�HŽ–�E�w“ü•i–¼�Ì
+        /// </summary>
+        private string m_TargetName = string.Empty;
+
+        /// <summary>
+        /// ‘Î�Û‹àŠz
+        /// </summary>
+        private decimal m_TargetValue = 0;
         #endregion
 
         #region ƒvƒ�ƒpƒeƒB
@@ -317,86 +217,150 @@
         }
         #endregion
 
-        #region �‰Šú‘I‘ð”N“x
+        #region ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
         /// <summary>
-        /// �‰Šú‘I‘ð”N“x
+        /// ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
         /// </summary>
-        public int FirstStartPeriod
+        public bool NextProcFlg
         {
-            get { return m_FirstStartPeriod; }
-            set { m_FirstStartPeriod = value; }
+            get { return m_NextProcFlg; }
+            set { m_NextProcFlg = value; }
         }
         #endregion
 
-        #region �‰Šú‘I‘ð•”��ƒR�[ƒh
+        #region ƒAƒNƒZƒX�§ŒÀƒtƒ‰ƒO
         /// <summary>
-        /// �‰Šú‘I‘ð•”��ƒR�[ƒh
+        /// ƒAƒNƒZƒX�§ŒÀƒtƒ‰ƒO
         /// </summary>
-        public int FirstStartDepartmentCode
+        public bool EditLock
         {
-            get { return m_FirstStartDepartmentCode; }
-            set { m_FirstStartDepartmentCode = value; }
+            get { return m_EditLock; }
+            set { m_EditLock = value; }
         }
         #endregion
 
-        #region �‰Šú‘I‘ð’S“–ŽÒƒR�[ƒh
+        #region *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
+        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         /// <summary>
-        /// �‰Šú‘I‘ð’S“–ŽÒƒR�[ƒh
+        /// ŒÄ�oŒ³�I—¹ƒtƒ‰ƒO
         /// </summary>
-        public int FirstStartPersonCode
+        public bool ParentEnd
         {
-            get { return m_FirstStartPersonCode; }
-            set { m_FirstStartPersonCode = value; }
+            get { return m_ParentEnd; }
+            set { m_ParentEnd = value; }
         }
+        /// <summary>
+        /// ƒTƒuƒtƒH�[ƒ€ƒtƒ‰ƒO
+        /// </summary>
+        public bool SubForm
+        {
+            get { return m_SubForm; }
+            set { m_SubForm = value; }
+        }
+        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         #endregion
 
-        #region ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
+        #region ‹N“®Œ³ƒvƒ�ƒZƒX”Ô�†
         /// <summary>
-        /// ŽŸƒvƒ�ƒZƒX‹N“®ƒtƒ‰ƒO
+        /// ‹N“®Œ³ƒvƒ�ƒZƒX”Ô�†
         /// </summary>
-        public bool NextProcFlg
+        public int PrevProcessNo
         {
-            get { return m_NextProcFlg; }
-            set { m_NextProcFlg = value; }
+            get { return m_PrevProcessNo; }
+            set { m_PrevProcessNo = value; }
         }
         #endregion
 
-        #region ƒAƒNƒZƒX�§ŒÀƒtƒ‰ƒO
+        #region •\Ž¦�o”[ƒ^ƒCƒv•ÛŽ�ƒGƒŠƒA
         /// <summary>
-        /// ƒAƒNƒZƒX�§ŒÀƒtƒ‰ƒO
+        /// •\Ž¦�o”[ƒ^ƒCƒv•ÛŽ�ƒGƒŠƒA
         /// </summary>
-        public bool EditLock
+        public int DispCost
         {
-            get { return m_EditLock; }
-            set { m_EditLock = value; }
+            get { return m_DispCost; }
+            set { m_DispCost = value; }
         }
         #endregion
 
-        #region �I—¹ƒ{ƒ^ƒ“‰Ÿ‰º
+        #region •\Ž¦‘Î�Û•ÛŽ�ƒGƒŠƒA
         /// <summary>
-        /// �I—¹ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// •\Ž¦‘Î�Û•ÛŽ�ƒGƒŠƒA
         /// </summary>
-        public DialogResult EndButton
+        public int TargetType
         {
-            get { return m_EndButton; }
+            get { return m_TargetType; }
+            set { m_TargetType = value; }
         }
         #endregion
 
-        #region *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
-        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
+        #region •\Ž¦‘Î�ÛƒR�[ƒh•ÛŽ�ƒGƒŠƒA
         /// <summary>
-        /// ŒÄ�oŒ³�I—¹ƒtƒ‰ƒO
+        /// •\Ž¦‘Î�ÛƒR�[ƒh•ÛŽ�ƒGƒŠƒA
         /// </summary>
-        public bool ParentEnd
+        public int TargetCode
         {
-            get { return m_ParentEnd; }
-            set { m_ParentEnd = value; }
+            get { return m_TargetCode; }
+            set { m_TargetCode = value; }
         }
-        // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         #endregion
 
+        #region •\Ž¦’iŠK•ÛŽ�ƒGƒŠƒA
+        /// <summary>
+        /// •\Ž¦’iŠK•ÛŽ�ƒGƒŠƒA
+        /// </summary>
+        public int DispStage
+        {
+            get { return m_DispStage; }
+            set { m_DispStage = value; }
+        }
         #endregion
 
+        #region ‘Î�Û“ú•t
+        /// <summary>
+        /// ‘Î�Û“ú•t
+        /// </summary>
+        public DateTime TargetDate
+        {
+            get { return m_TargetDate; }
+            set { m_TargetDate = value; }
+        }
+        #endregion
+
+        #region ‘Î�Û‘ŠŽè�æ‰ïŽÐƒR�[ƒh
+        /// <summary>
+        /// ‘Î�Û‘ŠŽè�æ‰ïŽÐƒR�[ƒh
+        /// </summary>
+        public int TargetCompanyCode
+        {
+            get { return m_TargetCompanyCode; }
+            set { m_TargetCompanyCode = value; }
+        }
+        #endregion
+
+        #region ‘Î�Û�HŽ–�E�w“ü•i–¼�Ì
+        /// <summary>
+        /// ‘Î�Û�HŽ–�E�w“ü•i–¼�Ì
+        /// </summary>
+        public string TargetName
+        {
+            get { return m_TargetName; }
+            set { m_TargetName = value; }
+        }
+        #endregion
+
+        #region ‘Î�Û‹àŠz
+        /// <summary>
+        /// ‘Î�Û‹àŠz
+        /// </summary>
+        public decimal TargetValue
+        {
+            get { return m_TargetValue; }
+            set { m_TargetValue = value; }
+        }
+        #endregion
+
+        #endregion
+
         #region ƒRƒ“ƒXƒgƒ‰ƒNƒ^
         public FrmDepCost()
         {
@@ -423,7 +387,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FrmConstructionLedgerList_FormClosing(object sender, FormClosingEventArgs e)
+        private void FrmDepCost_FormClosing(object sender, FormClosingEventArgs e)
         {
             try
             {
@@ -437,8 +401,16 @@
                     }
                 }
 
-                // ‘Oƒvƒ�ƒZƒX‚É–ß‚é
-                ClsExcute.BackProcess();
+                if (m_CloseingProcessOn)
+                {
+                    // ‘Oƒvƒ�ƒZƒX‚É–ß‚é�iƒTƒuƒtƒH�[ƒ€‹N“®ˆÈŠO�j
+                    if (!m_SubForm) ClsExcute.BackProcess();
+                }
+                else
+                {
+                    // ˆê‹C‚Éƒ�ƒjƒ…�[‚Ö‚É–ß‚é
+                    ClsExcute.ClearProcess();
+                }
             }
             catch (System.Exception ex)
             {
@@ -455,80 +427,25 @@
         /// <param name="e"></param>
         private void FrmDepartmentCost_Load(object sender, EventArgs e)
         {
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            SetInitnumUDConstPro();
-            SetcmbDepartment();
-
-            // –¾�×ƒOƒŠƒbƒh�sƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[�ì�¬
-            SetExecMenuStrip();
-
-            // ƒOƒŠƒbƒh�‰Šú�Ý’è
-            SetDisplayObject();
-
-            // �‰Šú•\Ž¦
-            InitDataLoad();
-
-            // ƒCƒxƒ“ƒgƒZƒbƒg
-            SetControlEvent(true);
-
-            m_bChengeAns = false;
+            // �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
+            GetCostDataType();
         }
         #endregion
 
-        #region “o˜^ƒ{ƒ^ƒ“
+        #region ƒtƒH�[ƒ€ƒ��[ƒhŽž�ˆ—�
         /// <summary>
-        /// “o˜^ƒ{ƒ^ƒ“
+        /// ƒtƒH�[ƒ€ƒ��[ƒhŽž�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnDataEntry_Click(object sender, EventArgs e)
+        private async void FrmDepCost_Shown(object sender, EventArgs e)
         {
-            // ƒf�[ƒ^“o˜^
-            if (!DataEntryProcess()) return;
-
-            CommonMotions.EntryEndMessage("•”��•Ê�o”[’ ƒf�[ƒ^");
-
-            m_bChengeAns = false;
+            await Task.Delay(100);
+            // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
+            InitFormLoad();
         }
         #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)
-        {
-            m_EndButton = DialogResult.OK;
-
-            this.Close();
-        }
-        #endregion
-
-        #region EntryƒL�[‚Å‚ÌˆÚ“®�ˆ—�
-        /// <summary>
-        /// EntryƒL�[‚Å‚ÌˆÚ“®�ˆ—�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmConstructionLedgerList_KeyDown(object sender, KeyEventArgs 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;
-            }
-        }
-        #endregion
-
         #region ‰c‹ÆŠúƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
         /// <summary>
         /// ‰c‹ÆŠú•Ï�X
@@ -537,220 +454,229 @@
         /// <param name="e"></param>
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
-            // ƒCƒxƒ“ƒgƒNƒŠƒA
-            SetControlEvent(false);
-
-            // •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
-            SetcmbDepartment();
-
-            // ƒf�[ƒ^•\Ž¦
-            DataDisplay();
-
-            // ƒEƒBƒ“ƒhƒEƒTƒCƒYƒ`ƒFƒbƒN
-            FrmConstructionLedgerList_SizeChanged(sender, e);
-
-            // ƒCƒxƒ“ƒgƒZƒbƒg
-            SetControlEvent(true);
+            try
+            {
+                // ƒf�[ƒ^•\Ž¦
+                DataDisplay();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
         }
         #endregion
 
-        #region •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+        #region “o˜^ƒ{ƒ^ƒ“
         /// <summary>
-        /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+        /// “o˜^ƒ{ƒ^ƒ“
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void cmbDepartment_TextChanged(object sender, EventArgs e)
+        private void btnDataEntry_Click(object sender, EventArgs e)
         {
             try
             {
-                // ƒCƒxƒ“ƒgƒNƒŠƒA
-                SetControlEvent(false);
+                // ƒf�[ƒ^“o˜^ƒvƒ�ƒZƒX
+                if (!DataEntryProcess()) return;
 
                 // ƒf�[ƒ^•\Ž¦
                 DataDisplay();
 
-                // ƒEƒBƒ“ƒhƒEƒTƒCƒYƒ`ƒFƒbƒN
-                FrmConstructionLedgerList_SizeChanged(sender, e);
+                CommonMotions.EntryEndMessage("•”���o”[’ ƒf�[ƒ^");
+
+                if(m_SubForm) this.DialogResult = DialogResult.OK;
+                m_bChengeAns = false;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                // ƒCƒxƒ“ƒgƒZƒbƒg
-                SetControlEvent(true);
-            }
         }
         #endregion
 
-        #region ƒtƒH�[ƒ€ƒTƒCƒY•Ï�X
+        #region �I—¹ƒ{ƒ^ƒ“
         /// <summary>
-        /// ƒtƒH�[ƒ€ƒTƒCƒY•Ï�X
+        /// �I—¹ƒ{ƒ^ƒ“ƒNƒŠƒbƒN
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FrmConstructionLedgerList_SizeChanged(object sender, EventArgs e)
+        private void btnEnd_Click(object sender, EventArgs e)
         {
-            if (this.WindowState == FormWindowState.Minimized)
+            try
             {
-                // �Å�¬‰»
+                m_CloseingProcessOn = true;
+                if (m_SubForm) this.DialogResult = DialogResult.Cancel;
+                this.Close();
             }
-            else if (this.WindowState == FormWindowState.Maximized)
+            catch (Exception ex)
             {
-                // �Å‘å‰»
-                CellSizeChangesWhenChangingScreenSize(false);
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            else if (this.WindowState == FormWindowState.Normal)
-            {
-                // •W�€‰»
-                CellSizeChangesWhenChangingScreenSize(true);
-            }
         }
         #endregion
 
-        #region ˆê——ƒOƒŠƒbƒhƒ}ƒEƒXƒAƒbƒv
+        #region ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
         /// <summary>
-        /// ˆê——ƒOƒŠƒbƒhƒ}ƒEƒXƒAƒbƒv
+        /// ’iŠKƒAƒbƒvƒ{ƒ^ƒ“
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvList_MouseUp(object sender, MouseEventArgs e)
+        private void btnStageUp_Click(object sender, EventArgs e)
         {
-            // ˆê——Žw’è�s‚ð‰ÁŽZ‚·‚é
-            dgvList_CalcTarget(sender);
+            StageUpProcess();
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒhƒ}ƒEƒXƒAƒbƒv
+        #region �s’Ç‰Áƒ{ƒ^ƒ“
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒhƒ}ƒEƒXƒAƒbƒv
+        /// �s’Ç‰Áƒ{ƒ^ƒ“
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvMaster_MouseUp(object sender, MouseEventArgs e)
+        private void btnLineAdd_Click(object sender, EventArgs e)
         {
-            // –¾�×Žw’è�s‚ð‰ÁŽZ‚·‚é
-            dgvMaster_CalcTarget(sender);
+            DataLineAddProc();
         }
         #endregion
 
-        // ƒZƒ‹‘I‘ð�s
-        int m_BeforeGridRow = -1;
-        #region ƒZƒ‹‘I‘ð•Ï�X
+        #region �s�í�œƒ{ƒ^ƒ“
         /// <summary>
-        /// ƒZƒ‹•Ï�XŽž�s‚Ì�F‚ð•Ï‚¦‚é
+        /// �s�í�œƒ{ƒ^ƒ“
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvMaster_SelectionChanged(object sender, EventArgs e)
+        private void btnLineDel_Click(object sender, EventArgs e)
         {
-            DataGridViewEX dgv = dgvMaster;
-            DataGridViewRow CurRow = dgv.CurrentRow;
-
-            // ƒf�[ƒ^‚ª‚È‚¢�ê�‡‚Í”²‚¯‚é
-            if (dgv.RowCount == 0) return;
-            //if (CommonMotions.chkCellBlank(CurRow.Cells[(int)DispColumn.SelectionCode].Value) &&
-            //    CommonMotions.chkCellBlank(CurRow.Cells[(int)DispColumn.SelectionName].Value))
-            //{
-            //    return;
-            //}
-            //else
-            //{
-            //    // �‡Œv�s‚Í�ˆ—�‚µ‚È‚¢
-            //    string strWork = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.SelectionName].Value);
-            //    bool bTitle = false;
-            //    foreach (string strTitle in s_TotalTitleArray)
-            //    {
-            //        if (strWork.Equals(strTitle))
-            //        {
-            //            bTitle = true;
-            //            break;
-            //        }
-            //    }
-            //    if (bTitle) return;
-            //}
-            // �s‘I‘ð�F‚ðŒ³‚É–ß‚·
-            if (m_BeforeGridRow >= 0) DefaultRowChangeColor(m_BeforeGridRow);
-
-            // ‘I‘ð�s�”‚ð‘Þ”ð
-            m_BeforeGridRow = dgv.CurrentRow.Index;
-            // �s‘I‘ð�F‚ð�Ý’è
-            SelectRowChangeColor(m_BeforeGridRow);
+            DataLineDelProc();
         }
         #endregion
 
-        #region ƒOƒŠƒbƒh‚©‚çƒtƒH�[ƒJƒX‚ªŠO‚ê‚½�ê�‡
+        #region EntryƒL�[‚Å‚ÌˆÚ“®�ˆ—�
         /// <summary>
-        /// ƒOƒŠƒbƒh‚©‚çƒtƒH�[ƒJƒX‚ªŠO‚ê‚½�ê�‡
+        /// EntryƒL�[‚Å‚ÌˆÚ“®�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvMaster_Leave(object sender, EventArgs e)
+        private void FrmDepCost_KeyDown(object sender, KeyEventArgs e)
         {
-            lblCellTotal2.Text = string.Empty;
+            try
+            {
+                //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;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
         }
         #endregion
 
-        #region ˆê——ƒOƒŠƒbƒhƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        #region ƒZƒ‹“ü—Í‘O�ˆ—�
         /// <summary>
-        /// ˆê——ƒOƒŠƒbƒhƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        /// ƒZƒ‹“ü—Í‘O�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvList_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        private void dgvMaster_CellEnter(object sender, DataGridViewCellEventArgs e)
         {
-            DataGridViewEX dgv = dgvList;
-            int nCurRowCnt = dgv.CurrentRow.Index;
-            int nDepCode = CommonMotions.cnvInt(dgv.Rows[nCurRowCnt].Cells[(int)DispColType1.DepCode].Value);
+            try
+            {
+                DataGridViewEX dgv = (DataGridViewEX)sender;
+                // “Ç�ž�ê—pƒZƒ‹‚Í�ˆ—�‚µ‚È‚¢
+                if (dgv[e.ColumnIndex, e.RowIndex].ReadOnly) return;
+                // “ü—ÍƒOƒŠƒbƒhˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (m_DispStage != (int)DispStageDef.Detail) return;
 
-            if (nDepCode < 1) return;
+                //IME‚Ìƒ‚�[ƒh‚ð•Ï�X‚·‚é
+                switch (e.ColumnIndex)
+                {
+                    case (int)DispColDetail.Content:
+                    case (int)DispColDetail.Comment:
+                        dgv.ImeMode = ImeMode.On;
+                        break;
 
-            cmbDepartment.SelectedValue = nDepCode;
+                    default:
+                        dgv.ImeMode = ImeMode.Disable;
+                        break;
+                }
+                // ƒZƒ‹“à—e‘I‘ð
+                dgv.BeginEdit(true);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+            }
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh’l•Ï‰»
+        #region ƒZƒ‹“ü—ÍŠ®—¹Žž�ˆ—�
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh’l•Ï‰»
+        /// ƒZƒ‹“ü—ÍŠ®—¹Žž�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvMaster_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+        private void dgvMaster_CellValidated(object sender, DataGridViewCellEventArgs e)
         {
-            // •Ò�Wƒtƒ‰ƒOON
-            SetModifyFlg(sender, e);
+            GridValidated(e);
         }
         #endregion
 
-        #region ƒOƒŠƒbƒh�o”[ƒ{ƒ^ƒ“‰Ÿ‰º
+        #region ƒZƒ‹’l•Ï�XŽž�ˆ—�
         /// <summary>
-        /// ƒOƒŠƒbƒh�o”[ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// ƒZƒ‹’l•Ï�XŽž�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvMaster_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        private void dgvMaster_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         {
+            DataGridView dgv = dgvMaster;
             try
             {
-                // ŽQ�ÆŽž‚Í�ˆ—�‚µ‚È‚¢
-                if (m_EditLock) return;
+                if (e.RowIndex < 0) return;
+                DataGridViewRow CurRow = dgv.Rows[e.RowIndex];
 
-                if (e.ColumnIndex != (int)DispColType2.SRButton1
-                    && e.ColumnIndex != (int)DispColType2.SRButton2) return;
+                // –¾�×ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (m_DispStage != (int)DispStageDef.Detail) return;
 
-                // •Ò�Wƒtƒ‰ƒOON
-                SetModifyFlg(sender, e);
+                int nTypeCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.CostType].Value);
+                if (nTypeCode > 100) return;
+                // �í�œ‚Í‘Î�ÛŠO
+                int nStatus = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.RowState].Value);
+                if (nStatus == (int)DataRowState.Deleted) return;
 
-                // ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
-                GridButtonClick(sender, e);
+                // “ú•t‚ª–³‚¯‚ê‚Î‘Î�ÛŠO
+                DataGridViewCell CurCell = CurRow.Cells[(int)DispColDetail.SendDate];
+                if (CommonMotions.cnvDate(CurCell.Value).Date == DateTime.MinValue) return;
 
-                /// –¾�×ƒOƒŠƒbƒh�‡Œv�ˆ—�
-                CalcDetialTotal();
+                // ƒCƒxƒ“ƒg�í�œ
+                DispEventControl(false);
 
+                // �s‚É•Ï�Xƒtƒ‰ƒO‚ðON
+                CurRow.Cells[(int)DispColDetail.RowState].Value = (int)DataRowState.Modified;
+
+                // ƒCƒxƒ“ƒg�Ä�Ý’è
+                DispEventControl(true);
+
+                // ’S“–ŽÒ‚ÌƒZƒbƒg
+                SetInputPerson(CurRow);
+
+                // •Ï�Xƒtƒ‰ƒO‚ðON
+                m_bChengeAns = true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
@@ -757,84 +683,71 @@
         }
         #endregion
 
-        #region �s’Ç‰Áƒ{ƒ^ƒ“
+        #region ‘I‘ðƒZƒ‹‚Ì�”’lŒvŽZ
         /// <summary>
-        /// �s’Ç‰Áƒ{ƒ^ƒ“
+        /// ‘I‘ð’†‚ÌƒZƒ‹’l‚ðŒvŽZ‚µ‚Ä•\Ž¦‚·‚é
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnLineAdd_Click(object sender, EventArgs e)
+        private void dgvMaster_MouseUp(object sender, MouseEventArgs e)
         {
-            // –¾�×ƒOƒŠƒbƒh‘}“ü�ˆ—�
-            GridRowInsertExecute(sender, e);
-        }
-        #endregion
+            try
+            {
+                DataGridViewEX dgv = (DataGridViewEX)sender;
+                lblCellTotal.Text = string.Empty;
 
-        #region �s�í�œƒ{ƒ^ƒ“
-        /// <summary>
-        /// �s�í�œƒ{ƒ^ƒ“
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnLineDel_Click(object sender, EventArgs e)
-        {
-            // –¾�×ƒOƒŠƒbƒh�í�œ�ˆ—�
-            GridRowRemoveExecute(sender, e);
-        }
-        #endregion
+                double dTotal = 0;
+                int DataCnt = 0;
+                int NumericCnt = 0;
+                foreach (DataGridViewCell c in dgv.SelectedCells)
+                {
+                    if (CommonMotions.chkObjectIsNull(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex])) continue;
+                    if (CommonMotions.chkCellBlank(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) continue;
 
-        #region ƒZƒ‹“ü—ÍŒã�ˆ—�
-        /// <summary>
-        /// ƒZƒ‹“ü—ÍŒã�ˆ—�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellValidated(object sender, DataGridViewCellEventArgs e)
-        {
-            // –¾�×ƒOƒŠƒbƒh�Å‹àŠzŒvŽZ�ˆ—�
-            CalcGridDetailField(sender, e);
-        }
-        #endregion
+                    //Console.WriteLine("{0}, {1}", c.ColumnIndex, c.RowIndex);
+                    DataCnt++;
+                    dTotal += CommonMotions.cnvDouble(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value);
+                    if (CommonMotions.chkNumeric(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) NumericCnt++;
+                }
+                if (DataCnt <= 1 || NumericCnt == 0) return;
+                string strTotal = CommonMotions.cnvTruncate(dTotal).ToString("#,0");
+                if (dTotal - System.Math.Floor(dTotal) != 0) strTotal = dTotal.ToString("#,0.00");
 
-        #region –¾�×ƒOƒŠƒbƒh“ü—Í‘O�ˆ—�
-        /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh“ü—Í‘O�ˆ—�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellEnter(object sender, DataGridViewCellEventArgs e)
-        {
-            // –¾�×ƒOƒŠƒbƒh“ü—Í‘O�ˆ—�
-            dgvMaster_EntryCell(sender, e);
+                string strwrkData = string.Format(CommonDefine.s_CalculateCellFormat,
+                                                    CommonMotions.cnvTruncate(dTotal / (double)NumericCnt).ToString("#,0"),
+                                                    DataCnt.ToString("#,0"),
+                                                    strTotal);
+                lblCellTotal.Text = strwrkData;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒhƒNƒŠƒbƒN
+        #region ƒZƒ‹•`‰æ�ˆ—�
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒhƒNƒŠƒbƒN
+        /// ƒZƒ‹•`‰æ�ˆ—�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvMaster_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e)
+        private void dgvMaster_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
         {
-            //‰EƒNƒŠƒbƒN‚Ì‚Æ‚«‚Ì‚Ý
-            if (e.Button != MouseButtons.Right) return;
-
-            // ‰EƒNƒŠƒbƒNƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[•\Ž¦
-            dgvMaster_ContextMenu(sender, e);
+            // ƒZƒ‹‚ÌŒ‹�‡•`‰æ�ˆ—�
+            CellConnective(sender, e);
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒhƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        #region ƒOƒŠƒbƒhƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒhƒ_ƒuƒ‹ƒNƒŠƒbƒN
+        /// ƒOƒŠƒbƒhƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void dgvMaster_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
-            // ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒNŒã�ˆ—�
-            CellDoubleClickProc(sender, e);
+            CellDoubleClick(e);
         }
         #endregion
 
@@ -887,6 +800,5 @@
             }
         }
         #endregion
-
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.designer.cs	(revision 483)
@@ -28,72 +28,33 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDepCost));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.ProgressBar = new System.Windows.Forms.ProgressBar();
             this.btnOtherProc = new System.Windows.Forms.Button();
+            this.btnDataEntry = new System.Windows.Forms.Button();
+            this.btnHelp = new System.Windows.Forms.Button();
             this.btnLineDel = new System.Windows.Forms.Button();
             this.btnLineAdd = new System.Windows.Forms.Button();
-            this.btnDataEntry = new System.Windows.Forms.Button();
-            this.btnHelp = new System.Windows.Forms.Button();
+            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.lblTitle2 = new System.Windows.Forms.Label();
+            this.btnStageUp = new System.Windows.Forms.Button();
+            this.lblCellTotal = new System.Windows.Forms.Label();
+            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
-            this.label10 = new System.Windows.Forms.Label();
-            this.cmbTargetMonth = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.label3 = new System.Windows.Forms.Label();
+            this.lblTitle = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.numUDConstPro = new System.Windows.Forms.NumericUpDown();
             this.label5 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.groupBox3 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
-            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column001 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column002 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column003 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column004 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewButtonColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewButtonColumn();
-            this.Column005 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column006 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column007 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column008 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column009 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column010 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column011 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column012 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lblCellTotal2 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.groupBox2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
-            this.lblCellTotal1 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.dgvList = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBoxEx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
-            this.groupBox3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
-            this.groupBox2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
             this.SuspendLayout();
             // 
             // btnEnd
@@ -101,7 +62,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(1190, 620);
+            this.btnEnd.Location = new System.Drawing.Point(1150, 650);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
             this.btnEnd.TabIndex = 8;
@@ -112,23 +73,23 @@
             // label1
             // 
             this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.label1.BackColor = System.Drawing.Color.White;
+            this.label1.BackColor = System.Drawing.Color.Gold;
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(460, 10);
+            this.label1.ForeColor = System.Drawing.Color.DarkSlateGray;
+            this.label1.Location = new System.Drawing.Point(440, 10);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(400, 20);
             this.label1.TabIndex = 6;
-            this.label1.Text = "éƒ¨ã€€ç½²ã€€åˆ¥ã€€å‡ºã€€ç´�ã€€å¸³";
+            this.label1.Text = "éƒ¨ã€€ç½²ã€€å‡ºã€€ç´�ã€€å¸³";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // ProgressBar
             // 
             this.ProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.ProgressBar.Location = new System.Drawing.Point(10, 619);
+            this.ProgressBar.Location = new System.Drawing.Point(10, 649);
             this.ProgressBar.Name = "ProgressBar";
-            this.ProgressBar.Size = new System.Drawing.Size(600, 30);
+            this.ProgressBar.Size = new System.Drawing.Size(1134, 30);
             this.ProgressBar.TabIndex = 30;
             this.ProgressBar.Visible = false;
             // 
@@ -137,7 +98,7 @@
             this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
             this.btnOtherProc.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold);
-            this.btnOtherProc.Location = new System.Drawing.Point(7, 619);
+            this.btnOtherProc.Location = new System.Drawing.Point(7, 649);
             this.btnOtherProc.Name = "btnOtherProc";
             this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
             this.btnOtherProc.TabIndex = 119;
@@ -146,34 +107,6 @@
             this.btnOtherProc.UseVisualStyleBackColor = false;
             this.btnOtherProc.Visible = false;
             // 
-            // btnLineDel
-            // 
-            this.btnLineDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLineDel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.btnLineDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnLineDel.Location = new System.Drawing.Point(766, 620);
-            this.btnLineDel.Name = "btnLineDel";
-            this.btnLineDel.Size = new System.Drawing.Size(130, 30);
-            this.btnLineDel.TabIndex = 124;
-            this.btnLineDel.Text = "è¡Œã€€å‰Šã€€é™¤";
-            this.btnLineDel.UseVisualStyleBackColor = false;
-            this.btnLineDel.Visible = false;
-            this.btnLineDel.Click += new System.EventHandler(this.btnLineDel_Click);
-            // 
-            // btnLineAdd
-            // 
-            this.btnLineAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLineAdd.BackColor = System.Drawing.Color.PaleGreen;
-            this.btnLineAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnLineAdd.Location = new System.Drawing.Point(628, 620);
-            this.btnLineAdd.Name = "btnLineAdd";
-            this.btnLineAdd.Size = new System.Drawing.Size(130, 30);
-            this.btnLineAdd.TabIndex = 123;
-            this.btnLineAdd.Text = "è¡Œã€€æŒ¿ã€€å…¥";
-            this.btnLineAdd.UseVisualStyleBackColor = false;
-            this.btnLineAdd.Visible = false;
-            this.btnLineAdd.Click += new System.EventHandler(this.btnLineAdd_Click);
-            // 
             // btnDataEntry
             // 
             this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -180,12 +113,13 @@
             this.btnDataEntry.BackColor = System.Drawing.Color.Green;
             this.btnDataEntry.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(934, 620);
+            this.btnDataEntry.Location = new System.Drawing.Point(1024, 650);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
             this.btnDataEntry.TabIndex = 122;
             this.btnDataEntry.Text = "ç™»ã€€éŒ²";
             this.btnDataEntry.UseVisualStyleBackColor = false;
+            this.btnDataEntry.Visible = false;
             this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
             // 
             // btnHelp
@@ -194,7 +128,7 @@
             this.btnHelp.BackColor = System.Drawing.Color.Black;
             this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1289, 0);
+            this.btnHelp.Location = new System.Drawing.Point(1249, 0);
             this.btnHelp.Name = "btnHelp";
             this.btnHelp.Size = new System.Drawing.Size(30, 30);
             this.btnHelp.TabIndex = 125;
@@ -203,15 +137,147 @@
             this.btnHelp.UseVisualStyleBackColor = false;
             this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
             // 
+            // btnLineDel
+            // 
+            this.btnLineDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnLineDel.BackColor = System.Drawing.Color.Magenta;
+            this.btnLineDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnLineDel.ForeColor = System.Drawing.Color.Black;
+            this.btnLineDel.Location = new System.Drawing.Point(644, 650);
+            this.btnLineDel.Name = "btnLineDel";
+            this.btnLineDel.Size = new System.Drawing.Size(130, 30);
+            this.btnLineDel.TabIndex = 129;
+            this.btnLineDel.Text = "è¡Œã€€å‰Šã€€é™¤";
+            this.btnLineDel.UseVisualStyleBackColor = false;
+            this.btnLineDel.Visible = false;
+            this.btnLineDel.Click += new System.EventHandler(this.btnLineDel_Click);
+            // 
+            // btnLineAdd
+            // 
+            this.btnLineAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnLineAdd.BackColor = System.Drawing.Color.LimeGreen;
+            this.btnLineAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnLineAdd.ForeColor = System.Drawing.Color.Black;
+            this.btnLineAdd.Location = new System.Drawing.Point(506, 650);
+            this.btnLineAdd.Name = "btnLineAdd";
+            this.btnLineAdd.Size = new System.Drawing.Size(130, 30);
+            this.btnLineAdd.TabIndex = 128;
+            this.btnLineAdd.Text = "è¡Œã€€è¿½ã€€åŠ ";
+            this.btnLineAdd.UseVisualStyleBackColor = false;
+            this.btnLineAdd.Visible = false;
+            this.btnLineAdd.Click += new System.EventHandler(this.btnLineAdd_Click);
+            // 
+            // groupBoxEx1
+            // 
+            this.groupBoxEx1.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.groupBoxEx1.BackColor = System.Drawing.Color.DeepSkyBlue;
+            this.groupBoxEx1.BorderColor = System.Drawing.Color.White;
+            this.groupBoxEx1.Controls.Add(this.lblTitle2);
+            this.groupBoxEx1.Controls.Add(this.btnStageUp);
+            this.groupBoxEx1.Controls.Add(this.lblCellTotal);
+            this.groupBoxEx1.Controls.Add(this.dgvMaster);
+            this.groupBoxEx1.ForeColor = System.Drawing.Color.Black;
+            this.groupBoxEx1.Location = new System.Drawing.Point(10, 83);
+            this.groupBoxEx1.Name = "groupBoxEx1";
+            this.groupBoxEx1.Size = new System.Drawing.Size(1260, 558);
+            this.groupBoxEx1.TabIndex = 127;
+            this.groupBoxEx1.TabStop = false;
+            // 
+            // lblTitle2
+            // 
+            this.lblTitle2.BackColor = System.Drawing.Color.White;
+            this.lblTitle2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblTitle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblTitle2.Location = new System.Drawing.Point(10, 6);
+            this.lblTitle2.Name = "lblTitle2";
+            this.lblTitle2.Size = new System.Drawing.Size(1240, 26);
+            this.lblTitle2.TabIndex = 130;
+            this.lblTitle2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.lblTitle2.Visible = false;
+            // 
+            // btnStageUp
+            // 
+            this.btnStageUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnStageUp.BackColor = System.Drawing.Color.White;
+            this.btnStageUp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnStageUp.ForeColor = System.Drawing.Color.Black;
+            this.btnStageUp.Image = ((System.Drawing.Image)(resources.GetObject("btnStageUp.Image")));
+            this.btnStageUp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnStageUp.Location = new System.Drawing.Point(10, 522);
+            this.btnStageUp.Name = "btnStageUp";
+            this.btnStageUp.Size = new System.Drawing.Size(120, 32);
+            this.btnStageUp.TabIndex = 129;
+            this.btnStageUp.Text = "ã€€ä¸Šã�«æˆ»ã‚‹";
+            this.btnStageUp.UseVisualStyleBackColor = false;
+            this.btnStageUp.Visible = false;
+            this.btnStageUp.Click += new System.EventHandler(this.btnStageUp_Click);
+            // 
+            // lblCellTotal
+            // 
+            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblCellTotal.AutoSize = true;
+            this.lblCellTotal.BackColor = System.Drawing.Color.Transparent;
+            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
+            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
+            this.lblCellTotal.Location = new System.Drawing.Point(160, 532);
+            this.lblCellTotal.Name = "lblCellTotal";
+            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
+            this.lblCellTotal.TabIndex = 128;
+            // 
+            // dgvMaster
+            // 
+            this.dgvMaster.AllowUserToAddRows = false;
+            this.dgvMaster.AllowUserToDeleteRows = false;
+            this.dgvMaster.AllowUserToResizeRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.Honeydew;
+            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvMaster.ColumnHeadersHeight = 24;
+            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvMaster.EnableHeadersVisualStyles = false;
+            this.dgvMaster.Location = new System.Drawing.Point(10, 10);
+            this.dgvMaster.Name = "dgvMaster";
+            this.dgvMaster.RowHeadersVisible = false;
+            this.dgvMaster.RowHeadersWidth = 20;
+            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvMaster.RowTemplate.Height = 24;
+            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvMaster.Size = new System.Drawing.Size(1240, 512);
+            this.dgvMaster.TabIndex = 127;
+            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
+            this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellEnter);
+            this.dgvMaster.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dgvMaster_CellPainting);
+            this.dgvMaster.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValidated);
+            this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged);
+            this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
+            // 
             // groupBox1
             // 
             this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.groupBox1.BackColor = System.Drawing.Color.MediumSlateBlue;
+            this.groupBox1.BackColor = System.Drawing.Color.DeepSkyBlue;
             this.groupBox1.BorderColor = System.Drawing.Color.White;
-            this.groupBox1.Controls.Add(this.label10);
-            this.groupBox1.Controls.Add(this.cmbTargetMonth);
-            this.groupBox1.Controls.Add(this.cmbDepartment);
-            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.lblTitle);
             this.groupBox1.Controls.Add(this.label2);
             this.groupBox1.Controls.Add(this.numUDConstPro);
             this.groupBox1.Controls.Add(this.label5);
@@ -219,61 +285,23 @@
             this.groupBox1.ForeColor = System.Drawing.Color.White;
             this.groupBox1.Location = new System.Drawing.Point(10, 40);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1300, 55);
+            this.groupBox1.Size = new System.Drawing.Size(1260, 38);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
-            // label10
+            // lblTitle
             // 
-            this.label10.BackColor = System.Drawing.Color.PaleGoldenrod;
-            this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label10.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label10.ForeColor = System.Drawing.Color.Black;
-            this.label10.Location = new System.Drawing.Point(294, 19);
-            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(110, 25);
-            this.label10.TabIndex = 41;
-            this.label10.Text = "å¯¾ è±¡ æœˆ";
-            this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.lblTitle.BackColor = System.Drawing.Color.White;
+            this.lblTitle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblTitle.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblTitle.ForeColor = System.Drawing.Color.Black;
+            this.lblTitle.Location = new System.Drawing.Point(302, 6);
+            this.lblTitle.Name = "lblTitle";
+            this.lblTitle.Size = new System.Drawing.Size(948, 26);
+            this.lblTitle.TabIndex = 40;
+            this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.lblTitle.Visible = false;
             // 
-            // cmbTargetMonth
-            // 
-            this.cmbTargetMonth.BackColor = System.Drawing.Color.White;
-            this.cmbTargetMonth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbTargetMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbTargetMonth.FormattingEnabled = true;
-            this.cmbTargetMonth.Location = new System.Drawing.Point(412, 20);
-            this.cmbTargetMonth.Margin = new System.Windows.Forms.Padding(4);
-            this.cmbTargetMonth.MaxDropDownItems = 12;
-            this.cmbTargetMonth.Name = "cmbTargetMonth";
-            this.cmbTargetMonth.Size = new System.Drawing.Size(140, 23);
-            this.cmbTargetMonth.TabIndex = 42;
-            // 
-            // cmbDepartment
-            // 
-            this.cmbDepartment.BackColor = System.Drawing.Color.White;
-            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDepartment.FormattingEnabled = true;
-            this.cmbDepartment.Location = new System.Drawing.Point(704, 20);
-            this.cmbDepartment.Name = "cmbDepartment";
-            this.cmbDepartment.Size = new System.Drawing.Size(260, 23);
-            this.cmbDepartment.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.PaleGoldenrod;
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(576, 19);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(120, 25);
-            this.label3.TabIndex = 40;
-            this.label3.Text = "éƒ¨ã€€ã€€ç½²";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // label2
             // 
             this.label2.BackColor = System.Drawing.Color.PaleGoldenrod;
@@ -280,7 +308,7 @@
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(20, 19);
+            this.label2.Location = new System.Drawing.Point(20, 6);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(120, 25);
             this.label2.TabIndex = 38;
@@ -292,12 +320,13 @@
             this.numUDConstPro.BackColor = System.Drawing.Color.White;
             this.numUDConstPro.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.numUDConstPro.ForeColor = System.Drawing.Color.Black;
-            this.numUDConstPro.Location = new System.Drawing.Point(173, 20);
+            this.numUDConstPro.Location = new System.Drawing.Point(173, 7);
             this.numUDConstPro.Name = "numUDConstPro";
             this.numUDConstPro.ReadOnly = true;
             this.numUDConstPro.Size = new System.Drawing.Size(80, 23);
             this.numUDConstPro.TabIndex = 0;
             this.numUDConstPro.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.numUDConstPro.ValueChanged += new System.EventHandler(this.numUDConstPro_ValueChanged);
             // 
             // label5
             // 
@@ -304,7 +333,7 @@
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(253, 23);
+            this.label5.Location = new System.Drawing.Point(253, 10);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(25, 16);
             this.label5.TabIndex = 0;
@@ -315,7 +344,7 @@
             // 
             this.label4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(148, 23);
+            this.label4.Location = new System.Drawing.Point(148, 10);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(25, 16);
             this.label4.TabIndex = 0;
@@ -322,404 +351,6 @@
             this.label4.Text = "ç¬¬";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // groupBox3
-            // 
-            this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox3.BackColor = System.Drawing.Color.MediumSlateBlue;
-            this.groupBox3.BorderColor = System.Drawing.Color.White;
-            this.groupBox3.Controls.Add(this.dgvMaster);
-            this.groupBox3.Controls.Add(this.lblCellTotal2);
-            this.groupBox3.Controls.Add(this.label9);
-            this.groupBox3.Controls.Add(this.label8);
-            this.groupBox3.ForeColor = System.Drawing.Color.White;
-            this.groupBox3.Location = new System.Drawing.Point(10, 101);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(1300, 504);
-            this.groupBox3.TabIndex = 121;
-            this.groupBox3.TabStop = false;
-            // 
-            // dgvMaster
-            // 
-            this.dgvMaster.AllowUserToAddRows = false;
-            this.dgvMaster.AllowUserToDeleteRows = false;
-            this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
-            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvMaster.ColumnHeadersHeight = 24;
-            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column001,
-            this.Column002,
-            this.Column1,
-            this.Column003,
-            this.Column004,
-            this.Column2,
-            this.Column5,
-            this.Column005,
-            this.Column006,
-            this.Column007,
-            this.Column008,
-            this.Column009,
-            this.Column010,
-            this.Column011,
-            this.Column012});
-            this.dgvMaster.Location = new System.Drawing.Point(5, 10);
-            this.dgvMaster.Name = "dgvMaster";
-            this.dgvMaster.RowHeadersVisible = false;
-            this.dgvMaster.RowHeadersWidth = 20;
-            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 24;
-            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1290, 460);
-            this.dgvMaster.TabIndex = 124;
-            this.dgvMaster.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellContentClick);
-            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
-            this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellEnter);
-            this.dgvMaster.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvMaster_CellMouseClick);
-            this.dgvMaster.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValidated);
-            this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged);
-            this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
-            // 
-            // Column001
-            // 
-            this.Column001.HeaderText = "RowStatus";
-            this.Column001.Name = "Column001";
-            this.Column001.Visible = false;
-            // 
-            // Column002
-            // 
-            this.Column002.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
-            this.Column002.DefaultCellStyle = dataGridViewCellStyle2;
-            this.Column002.HeaderText = "æ—¥ä»˜";
-            this.Column002.Name = "Column002";
-            this.Column002.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column002.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column1
-            // 
-            this.Column1.HeaderText = "å‡ºç´�å…ˆã‚³ãƒ¼ãƒ‰";
-            this.Column1.Name = "Column1";
-            this.Column1.Visible = false;
-            // 
-            // Column003
-            // 
-            this.Column003.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
-            this.Column003.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column003.HeaderText = "å‡ºã€€ç´�ã€€å…ˆã€€å��";
-            this.Column003.Name = "Column003";
-            this.Column003.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column003.Width = 250;
-            // 
-            // Column004
-            // 
-            this.Column004.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
-            this.Column004.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column004.HeaderText = "å‡ºã€€ç´�ã€€å†…ã€€å®¹";
-            this.Column004.Name = "Column004";
-            this.Column004.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column004.Width = 250;
-            // 
-            // Column2
-            // 
-            this.Column2.HeaderText = "å‡º";
-            this.Column2.Name = "Column2";
-            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column2.Width = 30;
-            // 
-            // Column5
-            // 
-            this.Column5.HeaderText = "ç´�";
-            this.Column5.Name = "Column5";
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.Width = 30;
-            // 
-            // Column005
-            // 
-            this.Column005.HeaderText = "å‡ºç´�ãƒ•ãƒ©ã‚°";
-            this.Column005.Name = "Column005";
-            this.Column005.ReadOnly = true;
-            this.Column005.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column005.Visible = false;
-            // 
-            // Column006
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
-            this.Column006.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column006.HeaderText = "å‡ºç´�å��ç§°";
-            this.Column006.Name = "Column006";
-            this.Column006.ReadOnly = true;
-            this.Column006.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column006.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column007
-            // 
-            this.Column007.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
-            this.Column007.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column007.HeaderText = "ç¨ŽæŠœé‡‘é¡�";
-            this.Column007.Name = "Column007";
-            this.Column007.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column007.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column007.Width = 120;
-            // 
-            // Column008
-            // 
-            this.Column008.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
-            this.Column008.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column008.HeaderText = "ç¨Žè¾¼é‡‘é¡�";
-            this.Column008.Name = "Column008";
-            this.Column008.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column008.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column008.Width = 120;
-            // 
-            // Column009
-            // 
-            this.Column009.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
-            this.Column009.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column009.HeaderText = "å‚™ã€€è€ƒ";
-            this.Column009.Name = "Column009";
-            this.Column009.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column009.Width = 270;
-            // 
-            // Column010
-            // 
-            this.Column010.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
-            this.Column010.Name = "Column010";
-            this.Column010.ReadOnly = true;
-            this.Column010.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column010.Visible = false;
-            // 
-            // Column011
-            // 
-            this.Column011.HeaderText = "æ—¥ä»˜";
-            this.Column011.Name = "Column011";
-            this.Column011.ReadOnly = true;
-            this.Column011.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column011.Visible = false;
-            // 
-            // Column012
-            // 
-            this.Column012.HeaderText = "ãƒ¬ã‚³ãƒ¼ãƒ‰ç•ªå�·";
-            this.Column012.Name = "Column012";
-            this.Column012.ReadOnly = true;
-            this.Column012.Visible = false;
-            // 
-            // lblCellTotal2
-            // 
-            this.lblCellTotal2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblCellTotal2.AutoSize = true;
-            this.lblCellTotal2.BackColor = System.Drawing.Color.MediumSlateBlue;
-            this.lblCellTotal2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblCellTotal2.ForeColor = System.Drawing.Color.White;
-            this.lblCellTotal2.Location = new System.Drawing.Point(100, 476);
-            this.lblCellTotal2.Name = "lblCellTotal2";
-            this.lblCellTotal2.Size = new System.Drawing.Size(0, 13);
-            this.lblCellTotal2.TabIndex = 123;
-            // 
-            // label9
-            // 
-            this.label9.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.label9.BackColor = System.Drawing.Color.White;
-            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label9.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label9.ForeColor = System.Drawing.Color.Black;
-            this.label9.Location = new System.Drawing.Point(886, 470);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(120, 25);
-            this.label9.TabIndex = 122;
-            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label8
-            // 
-            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.label8.BackColor = System.Drawing.Color.White;
-            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label8.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(766, 470);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(120, 25);
-            this.label8.TabIndex = 121;
-            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox2.BackColor = System.Drawing.Color.MediumSlateBlue;
-            this.groupBox2.BorderColor = System.Drawing.Color.White;
-            this.groupBox2.Controls.Add(this.lblCellTotal1);
-            this.groupBox2.Controls.Add(this.label7);
-            this.groupBox2.Controls.Add(this.label6);
-            this.groupBox2.Controls.Add(this.dgvList);
-            this.groupBox2.ForeColor = System.Drawing.Color.White;
-            this.groupBox2.Location = new System.Drawing.Point(10, 101);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(1300, 504);
-            this.groupBox2.TabIndex = 120;
-            this.groupBox2.TabStop = false;
-            // 
-            // lblCellTotal1
-            // 
-            this.lblCellTotal1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblCellTotal1.AutoSize = true;
-            this.lblCellTotal1.BackColor = System.Drawing.Color.MediumSlateBlue;
-            this.lblCellTotal1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblCellTotal1.ForeColor = System.Drawing.Color.White;
-            this.lblCellTotal1.Location = new System.Drawing.Point(100, 476);
-            this.lblCellTotal1.Name = "lblCellTotal1";
-            this.lblCellTotal1.Size = new System.Drawing.Size(0, 13);
-            this.lblCellTotal1.TabIndex = 124;
-            // 
-            // label7
-            // 
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.label7.BackColor = System.Drawing.Color.White;
-            this.label7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label7.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(841, 470);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(160, 25);
-            this.label7.TabIndex = 120;
-            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label6
-            // 
-            this.label6.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-            this.label6.BackColor = System.Drawing.Color.White;
-            this.label6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(681, 470);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(160, 25);
-            this.label6.TabIndex = 120;
-            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // dgvList
-            // 
-            this.dgvList.AllowUserToAddRows = false;
-            this.dgvList.AllowUserToDeleteRows = false;
-            this.dgvList.AllowUserToResizeColumns = false;
-            this.dgvList.AllowUserToResizeRows = false;
-            this.dgvList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-            this.dgvList.BackgroundColor = System.Drawing.Color.White;
-            this.dgvList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
-            this.dgvList.ColumnHeadersHeight = 24;
-            this.dgvList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7,
-            this.dataGridViewTextBoxColumn8,
-            this.dataGridViewTextBoxColumn9});
-            this.dgvList.Location = new System.Drawing.Point(280, 10);
-            this.dgvList.Name = "dgvList";
-            this.dgvList.RowHeadersVisible = false;
-            this.dgvList.RowHeadersWidth = 20;
-            this.dgvList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvList.RowTemplate.Height = 24;
-            this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvList.Size = new System.Drawing.Size(740, 460);
-            this.dgvList.TabIndex = 119;
-            this.dgvList.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellDoubleClick);
-            this.dgvList.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvList_MouseUp);
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn1.Visible = false;
-            this.dataGridViewTextBoxColumn1.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle10;
-            this.dataGridViewTextBoxColumn6.HeaderText = "éƒ¨ã€€ç½²ã€€å��";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn6.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle11;
-            this.dataGridViewTextBoxColumn7.HeaderText = "å‡ºç´�ä»¶æ•°";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            this.dataGridViewTextBoxColumn7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle12;
-            this.dataGridViewTextBoxColumn8.HeaderText = "å‡ºç´�ç¨ŽæŠœé‡‘é¡�";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn8.Width = 160;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            this.dataGridViewTextBoxColumn9.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle13;
-            this.dataGridViewTextBoxColumn9.HeaderText = "å‡ºç´�ç¨Žè¾¼é‡‘é¡�";
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            this.dataGridViewTextBoxColumn9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn9.Width = 160;
-            // 
             // FrmDepCost
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -726,38 +357,35 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1320, 657);
-            this.Controls.Add(this.btnHelp);
+            this.ClientSize = new System.Drawing.Size(1280, 687);
             this.Controls.Add(this.btnLineDel);
             this.Controls.Add(this.btnLineAdd);
+            this.Controls.Add(this.groupBoxEx1);
+            this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.btnDataEntry);
             this.Controls.Add(this.btnOtherProc);
-            this.Controls.Add(this.ProgressBar);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.btnEnd);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.ProgressBar);
             this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
             this.KeyPreview = true;
+            this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FrmDepCost";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmConstructionLedgerList_FormClosing);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmDepCost_FormClosing);
             this.Load += new System.EventHandler(this.FrmDepartmentCost_Load);
-            this.SizeChanged += new System.EventHandler(this.FrmConstructionLedgerList_SizeChanged);
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmConstructionLedgerList_KeyDown);
+            this.Shown += new System.EventHandler(this.FrmDepCost_Shown);
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmDepCost_KeyDown);
+            this.groupBoxEx1.ResumeLayout(false);
+            this.groupBoxEx1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit();
-            this.groupBox3.ResumeLayout(false);
-            this.groupBox3.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvList)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -771,45 +399,17 @@
         private System.Windows.Forms.NumericUpDown numUDConstPro;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label2;
-        private ProcessManagement.Forms.CustomControls.ComboBoxEX cmbDepartment;
-        private System.Windows.Forms.Label label3;
         private System.Windows.Forms.ProgressBar ProgressBar;
         private System.Windows.Forms.Button btnOtherProc;
-        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBox2;
-        private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvList;
-        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBox3;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Button btnDataEntry;
+        private System.Windows.Forms.Button btnHelp;
+        private CustomControls.GroupBoxEx groupBoxEx1;
+        private CustomControls.DataGridViewEX dgvMaster;
+        private System.Windows.Forms.Label lblCellTotal;
+        private System.Windows.Forms.Button btnStageUp;
         private System.Windows.Forms.Button btnLineDel;
         private System.Windows.Forms.Button btnLineAdd;
-        private System.Windows.Forms.Button btnDataEntry;
-        private System.Windows.Forms.Label lblCellTotal2;
-        private CustomControls.DataGridViewEX dgvMaster;
-        private System.Windows.Forms.Label lblCellTotal1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
-        private System.Windows.Forms.Button btnHelp;
-        private System.Windows.Forms.Label label10;
-        private CustomControls.ComboBoxEX cmbTargetMonth;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column001;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column002;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column003;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column004;
-        private System.Windows.Forms.DataGridViewButtonColumn Column2;
-        private System.Windows.Forms.DataGridViewButtonColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column005;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column006;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column007;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column008;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column009;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column010;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column011;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column012;
+        private System.Windows.Forms.Label lblTitle2;
+        private System.Windows.Forms.Label lblTitle;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCost.resx	(revision 483)
@@ -117,64 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Column001.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnStageUp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVDhP7ZI9
+        zkRQFIY1EpVeIxKFDahZgEql19uAfUgswRLEClQqvcRPIiQKUWnu5J45904MZsg35fckrzjHe5+QEMiP
+        +Rf+nZ0wyzKiqipO99kIx3EkgiBA0jTF7T02QiZj6fsen1yHC3Vd3wlp7gInbNs+lNGIogjFM+q6hl4Q
+        BDCDcBgGGCiSJEFhmiaY53kmy7LA/RFRFEHfcRyYd99kWRYUkiTBzWfom9F+GIYw74RxHENBlmXcfIZ2
+        adq2fc5wfYOVXNfFzTGGYUBP0zTcnAjLsuRS0zRx+6JpGqIoCu+s64pPToSUoij4ARYqf991XYcnnpwK
+        GZ7n7SQ0vu9jY8tXIaOqKpLnOf+dzrgsvMqPhYQ8AEeNfa7rogIhAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column002.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column003.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column004.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column005.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column006.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column007.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column008.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column009.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column010.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column011.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column012.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs	(revision 483)
@@ -26,100 +26,220 @@
 {
     partial class FrmDepCost
     {
-        #region ƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[’è‹`
+        #region ’è�”
+
+        #region �‰Šú•\Ž¦ƒJƒ‰ƒ€
         /// <summary>
-        /// ƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[’è‹`
+        /// �‰Šú•\Ž¦ƒJƒ‰ƒ€
         /// </summary>
-        private enum ConMenuNo
+        private enum DispColDefault
         {
             /// <summary>
-            /// ƒRƒs�[
+            /// 0:�o”[ƒ^ƒCƒvƒR�[ƒh
             /// </summary>
-            ExecCopy = 0,
+            CostType = 0,
             /// <summary>
-            /// “\‚è•t‚¯
+            /// 1:�o”[�æƒR�[ƒh
             /// </summary>
-            ExecPaste,
+            TargetType,
             /// <summary>
-            /// ‚P�s�í�œ
+            /// 2:No
             /// </summary>
-            ExecOnceDel,
+            No,
             /// <summary>
-            /// 1�s‘}“ü
+            /// 3:�o”[ƒ^ƒCƒv–¼�Ì
             /// </summary>
-            ExecOnceInsert,
+            CostTypeName,
             /// <summary>
-            /// 1�s’Ç‰Á
+            /// 4:�o”[�æƒ^ƒCƒv–¼�Ì
             /// </summary>
-            ExecOnceAdd,
+            TargetTypeName,
+            /// <summary>
+            /// 5:‹àŠz�i�Å”²�j
+            /// </summary>
+            EntryPrice,
+            /// <summary>
+            /// 6:‹àŠz�i�Å�ž�j
+            /// </summary>
+            EntryTax,
         }
-        string[] ContextM = new string[] { "ƒRƒs�[", "“\‚è•t‚¯", "‚P�s�í�œ", "‚P�s‘}“ü", "‚P�s’Ç‰Á" };
         #endregion
-        #region –¾�×ƒOƒŠƒbƒh�sƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[�ì�¬
+
+        #endregion
+
+        #region ƒZƒ‹‚ÌŒ‹�‡•`‰æ�ˆ—�
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�sƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[�ì�¬
+        /// ƒZƒ‹‚ÌŒ‹�‡•`‰æ�ˆ—�
         /// </summary>
-        private void SetExecMenuStrip()
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CellConnective(object sender, DataGridViewCellPaintingEventArgs e)
         {
             try
             {
-                m_ExecMenuStrip.Items.Clear();
-                int nLoopCnt = Enum.GetNames(typeof(ConMenuNo)).Length;
-                for (int i = 0; i < nLoopCnt; i++)
+                if (e.ColumnIndex < 0) return;
+                if (e.RowIndex < 0) return;
+
+                DataGridView dgv = dgvMaster;
+                DataGridViewRow CurRow = dgv.Rows[e.RowIndex];
+
+                // �‡ŒvˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                int nGridTotalCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.CostType].Value);
+                if (nGridTotalCode != s_GridTotalCode) return;
+
+                bool bReturn = true;
+                int nContentPo = 0;
+                int nStPoint = 0;
+                int nEndtPoint = 0;
+                // ‘Î�ÛƒJƒ‰ƒ€ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                switch (m_DispStage)
                 {
-                    //ƒCƒxƒ“ƒg‚Ì“o˜^
-                    EventHandler handle = null;
-                    switch (i)
+                    case (int)DispStageDef.TotalData:
+                        switch (e.ColumnIndex)
+                        {
+                            case (int)DispColDefault.No:                // 2:No
+                            case (int)DispColDefault.CostTypeName:      // 3:�o”[ƒ^ƒCƒv–¼�Ì
+                            case (int)DispColDefault.TargetTypeName:    // 4:�o”[�æƒ^ƒCƒv–¼�Ì
+                                bReturn = false;
+                                nContentPo = (int)DispColDefault.CostTypeName;
+                                nStPoint = (int)DispColDefault.No;
+                                nEndtPoint = (int)DispColDefault.TargetTypeName;
+                                break;
+                            default:
+                                bReturn = true;
+                                break;
+                        }
+                        break;
+                    case (int)DispStageDef.Section:
+                        switch (e.ColumnIndex)
+                        {
+                            case (int)DispColSection.No:                // 3:No
+                            case (int)DispColSection.TargetTypeName:    // 4:�o”[�æƒ^ƒCƒv–¼�Ì
+                                bReturn = false;
+                                nContentPo = (int)DispColSection.TargetTypeName;
+                                nStPoint = (int)DispColSection.No;
+                                nEndtPoint = (int)DispColSection.TargetTypeName;
+                                break;
+                            default:
+                                bReturn = true;
+                                break;
+                        }
+                        break;
+                    case (int)DispStageDef.Detail:
+                        switch (e.ColumnIndex)
+                        {
+                            case (int)DispColDetail.No:                 // 8:No
+                            case (int)DispColDetail.PersonName:         // 9:’S“–ŽÒ–¼
+                            case (int)DispColDetail.SendDate:           // 10:•â“U“ú
+                            case (int)DispColDetail.FromName:           // 11:‘ŠŽè�æ–¼�Ì
+                            case (int)DispColDetail.Content:            // 12:�o”[“à—e
+                                bReturn = false;
+                                nContentPo = (int)DispColDetail.Content;
+                                nStPoint = (int)DispColDetail.No;
+                                nEndtPoint = (int)DispColDetail.Content;
+                                break;
+                            default:
+                                bReturn = true;
+                                break;
+                        }
+                        break;
+                }
+                if (bReturn) return;
+
+                // –¼�ÌŽæ“¾
+                string strValue = CommonMotions.cnvString(dgv.Rows[e.RowIndex].Cells[nContentPo].Value);
+
+                // ƒZƒ‹‚Ì‹éŒ`‚ðŽæ“¾
+                Rectangle rect = e.CellBounds;
+                // ŠJŽnˆÊ’u�E•�‚Ì�C�³‚ð�s‚¤
+                rect.X = dgv.GetCellDisplayRectangle(nStPoint, e.RowIndex, false).X;
+                rect.Width = 0;
+
+                for (int i = nStPoint; i <= nEndtPoint; i++)
+                {
+                    if (!dgv.Columns[i].Visible) continue;
+                    rect.Width += dgv.Columns[i].Width;
+                }
+
+                // ‹éŒ`‚ÌˆÊ’u‚ð•â�³
+                rect.X -= 1;
+                rect.Y -= 1;
+
+                // ”wŒi�A˜g�ü�AƒZƒ‹‚Ì’l‚ð•`‰æ
+                using (SolidBrush brush = new SolidBrush(e.CellStyle.BackColor))
+                {
+                    // ”wŒi‚Ì•`‰æ
+                    e.Graphics.FillRectangle(brush, rect);
+
+                    using (Pen pen = new Pen(dgv.GridColor))
                     {
-                        case (int)ConMenuNo.ExecCopy:
-                            handle = GridRowCopyExecute;
-                            break;
-                        case (int)ConMenuNo.ExecPaste:
-                            handle = GridRowPasteExecute;
-                            break;
-                        case (int)ConMenuNo.ExecOnceDel:
-                            handle = GridRowRemoveExecute;
-                            break;
-                        case (int)ConMenuNo.ExecOnceInsert:
-                            handle = GridRowInsertExecute;
-                            break;
-                        case (int)ConMenuNo.ExecOnceAdd:
-                            handle = GridRowAddExecute;
-                            break;
+                        // ˜g�ü‚Ì•`‰æ
+                        e.Graphics.DrawRectangle(pen, rect);
                     }
-                    // ‹æ�Ø‚è�ü
-                    if (i > 0) m_ExecMenuStrip.Items.Add("-");
-                    // �s‚ÌƒZƒbƒg
-                    m_ExecMenuStrip.Items.Add(new ToolStripMenuItem(ContextM[i], null, handle));
                 }
-                // ƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[‚ðƒZƒbƒg‚·‚é
-                //dgvMaster.ContextMenuStrip = m_ExecMenuStrip;
+
+                // ƒeƒLƒXƒg‚ÌˆÊ’u‚ð’²�®
+                rect.Y += 2;
+
+                // •¶Žš•`‰æˆÊ’uƒZƒbƒg
+                TextFormatFlags txtFlg = TextFormatFlags.HorizontalCenter | TextFormatFlags.VerticalCenter;
+
+                // ƒZƒ‹‚É•\Ž¦‚·‚éƒeƒLƒXƒg‚ð•`‰æ
+                using (Font ft = new System.Drawing.Font("@‚l‚r –¾’©", 11.25F, System.Drawing.FontStyle.Bold))
+                {
+                    Color DrowForeColor = e.CellStyle.ForeColor;
+                    Font DrowFont = ft;
+                    TextRenderer.DrawText(e.Graphics, strValue, DrowFont, rect, DrowForeColor, txtFlg);
+                }
+
+                // ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰“à‚Å�ˆ—�‚ð�s‚Á‚½‚±‚Æ‚ð’Ê’m
+                e.Handled = true;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+            }
         }
         #endregion
 
-        #region ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’Ç‰Á�ˆ—�
+        #region ‰æ–ÊƒCƒxƒ“ƒg‚ð�§Œä‚·‚é
         /// <summary>
-        /// ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’Ç‰Á�ˆ—�
+        /// ‰æ–ÊƒCƒxƒ“ƒg‚ð�§Œä‚·‚é
         /// </summary>
-        /// <param name="EventCon"></param>
-        private void SetControlEvent(bool bAddEvent)
+        private bool m_EventLock = false;
+        private void DispEventControl(bool bOn)
         {
             try
             {
-                if (bAddEvent)
+                // ƒCƒxƒ“ƒgƒ�ƒbƒN’†‚Í�ˆ—�‚µ‚È‚¢
+                if (m_EventLock) return;
+
+                if (bOn)
                 {
-                    numUDConstPro.ValueChanged += new EventHandler(numUDConstPro_ValueChanged);
-                    cmbDepartment.TextChanged += new EventHandler(cmbDepartment_TextChanged);
+                    // ----- ƒCƒxƒ“ƒg‚n‚m
+                    numUDConstPro.Enabled = true;
+                    btnOtherProc.Enabled = true;
+                    btnEnd.Enabled = true;
+                    if (btnLineAdd.Visible) btnLineAdd.Enabled = true;
+                    if (btnLineDel.Visible) btnLineDel.Enabled = true;
+                    if (btnDataEntry.Visible) btnDataEntry.Enabled = true;
+                    // ƒOƒŠƒbƒhƒCƒxƒ“ƒg
+                    dgvMaster.CellValueChanged += new DataGridViewCellEventHandler(dgvMaster_CellValueChanged);
                 }
                 else
                 {
-                    numUDConstPro.ValueChanged -= new EventHandler(numUDConstPro_ValueChanged);
-                    cmbDepartment.TextChanged -= new EventHandler(cmbDepartment_TextChanged);
+                    // ----- ƒCƒxƒ“ƒg‚n‚e‚e
+                    numUDConstPro.Enabled = false;
+                    btnOtherProc.Enabled = false;
+                    btnEnd.Enabled = true;
+                    if (btnLineAdd.Visible) btnLineAdd.Enabled = false;
+                    if (btnLineDel.Visible) btnLineDel.Enabled = false;
+                    if (btnDataEntry.Visible) btnDataEntry.Enabled = false;
+                    // ƒOƒŠƒbƒhƒCƒxƒ“ƒg
+                    dgvMaster.CellValueChanged -= new DataGridViewCellEventHandler(dgvMaster_CellValueChanged);
                 }
             }
             catch (Exception ex)
@@ -129,38 +249,25 @@
         }
         #endregion
 
-        #region •\Ž¦ƒIƒuƒWƒFƒNƒg‚ÌŽæ“¾
+        #region ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
         /// <summary>
-        /// •\Ž¦ƒIƒuƒWƒFƒNƒg‚ÌŽæ“¾
+        /// ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
         /// </summary>
-        private void SetDisplayObject()
+        private void InitFormLoad()
         {
-            // ƒtƒH�[ƒ€ƒTƒCƒYŽæ“¾
-            m_FormWidthSize = this.Width;
+            try
+            {
+                // Šú�E”NƒZƒbƒg�ˆ—�
+                SetInitnumUDConstPro();
 
-            DataGridViewEX dgv = dgvMaster;
-            // ƒOƒŠƒbƒh‚Ì�î•ñ‚ðŽæ“¾‚·‚é
-            m_GridWidthSize = dgv.Width;
+                // �‰Šúƒpƒ‰ƒ��[ƒ^ƒZƒbƒg
+                if (m_PrevProcessNo < 1)
+                {
+                    m_DispCost = (int)CostDataOfCompensation.CostTypeDef.None;
+                    m_DispStage = (int)DispStageDef.TotalData;
+                }
 
-            // ƒOƒŠƒbƒhƒJƒ‰ƒ€•�Žæ“¾
-            int ColCount = Enum.GetNames(typeof(DispColType2)).Length;
-            m_CellSize = new int[ColCount];
-            foreach (DataGridViewColumn wrkCell in dgvMaster.Columns)
-            {
-                m_CellSize[wrkCell.Index] = wrkCell.Width;
-            }
-        }
-        #endregion
-
-        #region �‰ŠúŽžƒf�[ƒ^Žæ“¾
-        /// <summary>
-        /// �‰ŠúŽžƒf�[ƒ^Žæ“¾
-        /// </summary>
-        private void InitDataLoad()
-        {
-            try
-            {
-                // ƒf�[ƒ^•\Ž¦
+                // ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
                 DataDisplay();
             }
             catch (Exception ex)
@@ -170,53 +277,28 @@
         }
         #endregion
 
-        #region ‰æ–ÊƒTƒCƒY•Ï�XŽž‚ÌƒZƒ‹ƒTƒCƒY•Ï�X
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
         /// <summary>
-        /// ‰æ–ÊƒTƒCƒY•Ï�XŽž‚ÌƒZƒ‹ƒTƒCƒY•Ï�X
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
         /// </summary>
-        private void CellSizeChangesWhenChangingScreenSize(bool bNormal)
+        private void SetInitnumUDConstPro()
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                int idifference = 0;
-                // �Å‘å‰»‚Ì�ê�‡
-                if (!bNormal)
-                {
-                    // ƒJƒ‰ƒ€‚ÌƒTƒCƒY‚ð‹�‚ß‚é
-                    int ColumnCount = 0;
-                    int TotalWidth = 0;
-                    int NotVisibleSize = 0;
-                    for (int i = 0; i < m_CellSize.Length; i++)
-                    {
-                        TotalWidth += m_CellSize[i];
-                        if (dgv.Columns[i].Visible && !dgv.Columns[i].GetType().Equals(typeof(DataGridViewButtonColumn)))
-                        {
-                            ColumnCount++;
-                        }
-                        else
-                        {
-                            NotVisibleSize += m_CellSize[i];
-                        }
-                    }
+                numUDConstPro.ValueChanged -= new EventHandler(numUDConstPro_ValueChanged);
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYearMinMax(ref minval, ref maxval);
 
-                    // ‘å‚«‚­‚È‚Á‚½ƒTƒCƒY
-                    //int formdiff = (dgv.Width - (m_GridWidthSize - NotVisibleSize));
-                    int formdiff = (dgv.Width - m_GridWidthSize);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.GetPeriodYear();
 
-                    idifference = formdiff / ColumnCount;
-                }
+                CommonMotions.SetSerchTitle(label2, label4, numUDConstPro, label5);
 
-                // ƒZƒ‹ƒTƒCƒY•Ï�X
-                for (int i = 0; i < dgv.ColumnCount; i++)
-                {
-                    DataGridViewColumn wrkCol = dgv.Columns[i];
-                    if (wrkCol.GetType().Equals(typeof(DataGridViewButtonColumn))) continue;
-                    wrkCol.Width = m_CellSize[i] + idifference;
-                }
-
-                // –¾�×�‡ŒvƒGƒŠƒAˆÊ’u•Ï�X
-                PointTotalArea();
+                numUDConstPro.ValueChanged += new EventHandler(numUDConstPro_ValueChanged);
             }
             catch (Exception ex)
             {
@@ -225,134 +307,182 @@
         }
         #endregion
 
-        #region –¾�×�‡ŒvƒGƒŠƒAˆÊ’u•Ï�X
+        #region �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
         /// <summary>
-        /// –¾�×�‡ŒvƒGƒŠƒAˆÊ’u•Ï�X
+        /// �o”[ƒ^ƒCƒv–¼�Ìƒ}ƒXƒ^Žæ“¾
         /// </summary>
-        private void PointTotalArea()
+        private void GetCostDataType()
         {
+            IOMCostDataType TypeDB = new IOMCostDataType();
             try
             {
-                if (!groupBox3.Visible) return;
-
-                DataGridViewEX dgv = dgvMaster;
-                int nXpoint = dgv.Location.X + 1;
-                // •\Ž¦�o”[“ú
-                nXpoint += dgv.Columns[(int)DispColType2.DspCostDate].Width;
-                // Žx•¥�æ–¼
-                nXpoint += dgv.Columns[(int)DispColType2.SuppliersName].Width;
-                // Žx•¥“à—e
-                nXpoint += dgv.Columns[(int)DispColType2.PaymentContent].Width;
-                // �o”[ƒ{ƒ^ƒ“‚P
-                nXpoint += dgv.Columns[(int)DispColType2.SRButton1].Width;
-                // �o”[ƒ{ƒ^ƒ“‚Q
-                nXpoint += dgv.Columns[(int)DispColType2.SRButton2].Width;
-                // �o”[–¼�Ì
-                nXpoint += dgv.Columns[(int)DispColType2.SRNamne].Width;
-
-                // ˆÊ’u•Ï�X
-                Point po = label8.Location;
-                po.X = nXpoint;
-                label8.Location = po;
-                label8.Width = dgv.Columns[(int)DispColType2.EntryPrice].Width;
-
-                // ‹àŠz�i�Å”²�j
-                nXpoint += dgv.Columns[(int)DispColType2.EntryPrice].Width;
-                Point po2 = label9.Location;
-                po2.X = nXpoint;
-                label9.Location = po2;
-                label9.Width = dgv.Columns[(int)DispColType2.EntryTax].Width;
+                string strSQL = " Order By CostType, TargetType";
+                TypeDB.SelectAction(strSQL, ref m_DataTypeList);
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                TypeDB.close(); TypeDB = null;
+            }
         }
         #endregion
 
-        #region �s�F�Ý’è
+        #region �HŽ–ˆê——‚æ‚èƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// <summary>
-        /// �s‚ð‘I‘ð�F‚É‚·‚é
+        /// �HŽ–ˆê——‚æ‚èƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// </summary>
-        /// <param name="CurrentRow"></param>
-        private void SetRowColor(DataGridViewRow CurRow, Color BackColor, Color ForeColor)
+        /// <returns></returns>
+        private bool SectionGridDoubleClick()
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
+                DataGridView dgv = dgvMaster;
+                DataGridViewRow CurRow = dgv.CurrentRow;
 
-                // �s‚Ì�F‚ð•Ï‚¦‚é
-                for (int i = 0; i < dgv.ColumnCount; i++)
-                {
-                    CurRow.Cells[i].Style.BackColor = BackColor;
-                    CurRow.Cells[i].Style.ForeColor = ForeColor;
-                }
+                // �HŽ–ˆê——ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (m_TargetType != (int)CostDataOfCompensation.TargetTypeDef.Construction) return false;
+                // ‹ó”’�sˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (CommonMotions.cnvString(CurRow.Cells[(int)DispColDefault.TargetTypeName].Value).Length > 0) return false;
+
+                // �HŽ–ˆê——Žæ“¾�ˆ—�
+                return DispConstrDialog();
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
-
         }
         #endregion
 
-        #region �s‘I‘ð�F
+        #region ƒf�[ƒ^•\Ž¦�ˆ—�
         /// <summary>
-        /// �s‚ð‘I‘ð�F‚É‚·‚é
+        /// ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
         /// </summary>
-        /// <param name="CurrentRow"></param>
-        private void SelectRowChangeColor(int CurrentRow)
+        private void DataDisplay()
         {
+            DataGridView dgv = dgvMaster;
+            DispEventControl(false);
+            m_EventLock = true;
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                DataGridViewRow CurRow = dgv.Rows[CurrentRow];
+                // ƒOƒŠƒbƒhƒNƒŠƒA
+                dgv.Rows.Clear();
+                dgv.Columns.Clear();
+                // ƒ^ƒCƒgƒ‹”ñ•\Ž¦
+                lblTitle.Visible = false;
+                lblTitle2.Visible = false;
+                // ƒ{ƒ^ƒ“‚Ì”ñ•\Ž¦
+                btnStageUp.Visible = false;
+                btnLineAdd.Visible = false;
+                btnLineDel.Visible = false;
+                btnDataEntry.Visible = false;
 
-                // �s‚Ì�F‚ð•Ï‚¦‚é
-                SetRowColor(CurRow, s_RowSelectBackColor, s_RowSelectForeColor);
+                // ƒvƒ�ƒOƒŒƒXƒo�[•\Ž¦�§Œä
+                VisibleProgressBar(true);
+
+                // “à—e•\Ž¦‚Í�Å�‰‚É�s‚¤
+                switch (m_DispStage)
+                {
+                    case (int)DispStageDef.TotalData:
+                        // ‘I‘ð‚ÌƒNƒŠƒA
+                        m_DispCost = (int)CostDataOfCompensation.CostTypeDef.None;
+                        m_TargetType = (int)CostDataOfCompensation.TargetTypeDef.None;
+                        m_TargetCode = 0;
+                        // •\Ž¦ƒXƒ^ƒCƒ‹‚Ì•Ï�X
+                        DispStyleDefault();
+                        // ƒf�[ƒ^•\Ž¦
+                        DataDisplayStage0();
+                        break;
+
+                    case (int)DispStageDef.Section:
+                        // ‘I‘ð‚ÌƒNƒŠƒA
+                        m_TargetCode = 0;
+                        // ƒf�[ƒ^•\Ž¦
+                        DispType1Section();
+                        break;
+
+                    case (int)DispStageDef.Detail:
+                        // ƒf�[ƒ^•\Ž¦
+                        DispType1Detail();
+                        break;
+                }
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-
+            finally
+            {
+                VisibleProgressBar(false);
+                m_bChengeAns = false;
+                m_EventLock = false;
+                DispEventControl(true);
+            }
         }
         #endregion
 
-        #region �sƒfƒtƒHƒ‹ƒg�F
+        #region •\Ž¦ƒ^ƒCƒgƒ‹ƒZƒbƒg
         /// <summary>
-        /// �s‚ðƒfƒtƒHƒ‹ƒg�F‚É‚·‚é
+        /// •\Ž¦ƒ^ƒCƒgƒ‹ƒZƒbƒg
         /// </summary>
-        /// <param name="BeforeGridRow"></param>
-        private void DefaultRowChangeColor(int CurrentRow)
+        private string GetGridTile(bool bTop = true)
         {
+            IOMDepartment DepDB = new IOMDepartment();
+            IOConstructionBaseInfoDetail BaseDB = new IOConstructionBaseInfoDetail();
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                if (CurrentRow >= dgv.RowCount) return;
-                DataGridViewRow CurRow = dgv.Rows[CurrentRow];
+                CostDataType CurRec = m_DataTypeList.Where(x => x.CostType == m_DispCost
+                                                                && x.TargetType == 0).First();
+                string strTypeName = CurRec.CostDataTypeName;
 
-                Color SetBackColor = Color.White;
-                Color SetForeColor = Color.Black;
+                CostDataType CurRec2 = m_DataTypeList.Where(x => x.CostType == m_DispCost
+                                                                && x.TargetType == m_TargetType).First();
+                string strTargetName = CurRec2.CostDataTypeName;
 
-                if ((CurrentRow % 2) != 0)
+                string strDetailName = string.Empty;
+                StringBuilder strSQL = new StringBuilder();
+                if(m_TargetType == (int)CostDataOfCompensation.TargetTypeDef.Department)
                 {
-                    SetBackColor = dgv.AlternatingRowsDefaultCellStyle.BackColor;
-                    SetForeColor = dgv.AlternatingRowsDefaultCellStyle.ForeColor;
+                    strSQL.Append(DepDB.CreatePrimarykeyString(m_TargetCode));
+                    DepartmentMaster DepRec = new DepartmentMaster();
+                    if(DepDB.SelectAction(strSQL.ToString(), ref DepRec))
+                    {
+                        strDetailName = DepRec.DepartmentString;
+                    }
                 }
-                else
+                else if (m_TargetType == (int)CostDataOfCompensation.TargetTypeDef.Construction)
                 {
-                    SetBackColor = dgv.RowsDefaultCellStyle.BackColor;
-                    SetForeColor = dgv.RowsDefaultCellStyle.ForeColor;
+                    strSQL.Append(BaseDB.CreatePrimarykeyString(m_TargetCode
+                                                                , (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName));
+                    ConstructionBaseInfoDetail BaseRec = new ConstructionBaseInfoDetail();
+                    if (BaseDB.SelectAction(strSQL.ToString(), ref BaseRec))
+                    {
+                        strDetailName = BaseRec.DetailString;
+                    }
                 }
-                // �s‚Ì�F‚ð•Ï‚¦‚é
-                // �s‚Ì�F‚ð•Ï‚¦‚é
-                SetRowColor(CurRow, SetBackColor, SetForeColor);
+
+                string strRet = string.Empty;
+                if (bTop)
+                    strRet = string.Format("{0}�E{1}", strTypeName, strTargetName);
+                else
+                    strRet = strDetailName;
+
+                return strRet;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
             }
+            finally
+            {
+                DepDB.close(); DepDB = null;
+                BaseDB.close(); BaseDB = null;
+            }
         }
         #endregion
 
@@ -361,7 +491,7 @@
         /// ƒvƒ�ƒOƒŒƒXƒo�[•\Ž¦�§Œä
         /// </summary>
         /// <param name="bDisp"></param>
-        private void DisplayControlProgressBar(bool bDisp)
+        private void VisibleProgressBar(bool bDisp)
         {
             try
             {
@@ -372,7 +502,6 @@
                 btnEnd.Visible = !bDisp;
 
                 numUDConstPro.Enabled = !bDisp;
-                cmbDepartment.Enabled = !bDisp;
 
                 this.Update();
             }
@@ -383,113 +512,206 @@
         }
         #endregion
 
-        #region ˆê——ƒf�[ƒ^•\Ž¦‚r‚p‚k�ì�¬
+        #region •\Ž¦�‰ŠúƒXƒ^ƒCƒ‹ƒZƒbƒg
+        private DataGridViewTextBoxColumn[] ColumnDefault = new DataGridViewTextBoxColumn[7];
+        DataGridViewCellStyle[] CellStyleDefault = new DataGridViewCellStyle[5];
         /// <summary>
-        /// ˆê——ƒf�[ƒ^•\Ž¦‚r‚p‚k�ì�¬
+        /// •\Ž¦�‰ŠúƒXƒ^ƒCƒ‹ƒZƒbƒg
         /// </summary>
-        /// <param name="strSQL"></param>
-        private void CreateDispDataSQLType1(ref StringBuilder strSQL)
+        private void DispStyleDefault()
         {
+            DataGridView dgv = dgvMaster;
+            dgv.SuspendLayout();
             try
             {
-                int nTargetCount = (int)numUDConstPro.Value;
-                // �¡Šú‚Ìƒf�[ƒ^‚©‚Ç‚¤‚©‚ð”»’è‚·‚é
-                bool bNowSeason = CommonMotions.CheckNowSeason(nTargetCount);
 
-                // ŠúŽñ�EŠú––Žæ“¾
-                //DateTime dtStart = CommonMotions.GetOpeningEndDate(nTargetCount);
-                //DateTime dtComp = CommonMotions.GetOpeningEndDate(nTargetCount, false);
-                if (bNowSeason)
+                // —ñƒf�[ƒ^�ì�¬
+                for (int ix = 0; ix < ColumnDefault.Length; ix++)
                 {
-                    // �¡Šú‚Ìƒvƒ‰ƒCƒ}ƒŠƒe�[ƒuƒ‹‚Í•”��ƒ}ƒXƒ^
-                    strSQL.Append("Select");
-                    strSQL.Append(" B.DepartmentCode");
-                    strSQL.Append(", B.DepartmentString");
-                    strSQL.Append(", ifnull(C.DataCount, 0)");
-                    strSQL.Append(", ifnull(C.EntryPrice, 0)");
-                    strSQL.Append(", ifnull(C.EntryTax, 0)");
-                    strSQL.Append(" From departmentmaster As B");
-                    strSQL.Append(" Left Join(Select");
-                    strSQL.Append("           A.DepartmentCode");
-                    strSQL.Append("         , count(*) As DataCount");
-                    strSQL.Append("         , SUM((A.EntryPrice * A.SendReceiveFlg)) As EntryPrice");
-                    strSQL.Append("         , SUM((A.EntryTax * A.SendReceiveFlg)) As EntryTax");
-                    strSQL.Append("         From costdataofdepartment As A");
-                    strSQL.Append("         Where");
-                    strSQL.AppendFormat("       A.ConstrYear = {0}", nTargetCount);
-                    //strSQL.AppendFormat("     DATE ('{0}') <= DATE(A.CostDate)", dtStart.ToShortDateString());
-                    //strSQL.AppendFormat("     And DATE(A.CostDate) <= DATE('{0}')", dtComp.ToShortDateString());
+                    if (ColumnDefault[ix] is null) ColumnDefault[ix] = new DataGridViewTextBoxColumn();
+                }
+                // ƒOƒŠƒbƒh‚Ö—ñ’Ç‰Á
+                dgv.Columns.AddRange(ColumnDefault[(int)DispColDefault.CostType]            // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                                    , ColumnDefault[(int)DispColDefault.TargetType]         // 1:�o”[�æƒR�[ƒh
+                                    , ColumnDefault[(int)DispColDefault.No]                 // 2:No
+                                    , ColumnDefault[(int)DispColDefault.CostTypeName]       // 3:�o”[ƒ^ƒCƒv–¼�Ì
+                                    , ColumnDefault[(int)DispColDefault.TargetTypeName]     // 4:�o”[�æƒ^ƒCƒv–¼�Ì
+                                    , ColumnDefault[(int)DispColDefault.EntryPrice]         // 5:‹àŠz�i�Å”²�j
+                                    , ColumnDefault[(int)DispColDefault.EntryTax]);         // 6:‹àŠz�i�Å�ž�j
 
-                    strSQL.Append("         Group By A.DepartmentCode) As C");
-                    strSQL.Append("     On C.DepartmentCode = B.DepartmentCode");
-                    strSQL.AppendFormat(" Where B.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
-                    strSQL.Append(" Order By B.DisplayOrder");
+                // —ñƒXƒ^ƒCƒ‹�ì�¬
+                for (int ix = 0; ix < CellStyleDefault.Length; ix++)
+                {
+                    if (CellStyleDefault[ix] is null) CellStyleDefault[ix] = new DataGridViewCellStyle();
                 }
-                else
-                {   // ‰ß‹Ž‚Ìƒf�[ƒ^‚Í•”���o”[ƒf�[ƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL.Append("Select");
-                    strSQL.Append(" A.DepartmentCode");
-                    strSQL.Append(", A.DepartmentName");
-                    strSQL.Append(", count(*) As DataCount");
-                    strSQL.Append(", SUM((A.EntryPrice * A.SendReceiveFlg)) As EntryPrice");
-                    strSQL.Append(", SUM((A.EntryTax * A.SendReceiveFlg)) As EntryTax");
-                    strSQL.Append(" From costdataofdepartment As A");
-                    strSQL.Append(" Inner Join departmentmaster As B");
-                    strSQL.Append("        On B.DepartmentCode = A.DepartmentCode");
-                    strSQL.Append(" Where");
-                    strSQL.AppendFormat("  A.ConstrYear = {0}", nTargetCount);
-                    //strSQL.AppendFormat(" DATE ('{0}') <= DATE(A.CostDate)", dtStart.ToShortDateString());
-                    //strSQL.AppendFormat(" And DATE(A.CostDate) <= DATE('{0}')", dtComp.ToShortDateString());
-                    strSQL.Append(" Group By A.DepartmentCode");
-                    strSQL.Append(" Order By B.DisplayOrder");
-                }
+
+                // 
+                // Column1
+                // 
+                int nDispCnt = (int)DispColDefault.CostType;
+                ColumnDefault[nDispCnt].Frozen = true;
+                ColumnDefault[nDispCnt].HeaderText = "�o”[•ª—ÞƒR�[ƒh";
+                ColumnDefault[nDispCnt].Name = "Column1";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Visible = false;
+                ColumnDefault[nDispCnt].Width = 0;
+                // 
+                // Column2
+                // 
+                nDispCnt = (int)DispColDefault.TargetType;
+                ColumnDefault[nDispCnt].Frozen = true;
+                ColumnDefault[nDispCnt].HeaderText = "�o”[�æƒR�[ƒh";
+                ColumnDefault[nDispCnt].Name = "Column2";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Visible = false;
+                ColumnDefault[nDispCnt].Width = 0;
+                // 
+                // Column3
+                // 
+                nDispCnt = (int)DispColDefault.No;
+                CellStyleDefault[0].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleDefault[0].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleDefault[0].ForeColor = Color.Black;
+                ColumnDefault[nDispCnt].DefaultCellStyle = CellStyleDefault[0];
+                ColumnDefault[nDispCnt].Frozen = true;
+                ColumnDefault[nDispCnt].HeaderText = "‡‚";
+                ColumnDefault[nDispCnt].Name = "Column3";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].Resizable = DataGridViewTriState.False;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Width = 50;
+                // 
+                // Column4
+                // 
+                nDispCnt = (int)DispColDefault.CostTypeName;
+                CellStyleDefault[1].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleDefault[1].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleDefault[1].ForeColor = Color.Black;
+                ColumnDefault[nDispCnt].DefaultCellStyle = CellStyleDefault[1];
+                ColumnDefault[nDispCnt].HeaderText = "�o�@”[�@“à�@—e";
+                ColumnDefault[nDispCnt].Name = "Column4";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Width = 385;
+                // 
+                // Column5
+                // 
+                nDispCnt = (int)DispColDefault.TargetTypeName;
+                CellStyleDefault[2].Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CellStyleDefault[2].Font = new Font("‚l‚r –¾’©", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleDefault[2].ForeColor = Color.Black;
+                ColumnDefault[nDispCnt].DefaultCellStyle = CellStyleDefault[2];
+                ColumnDefault[nDispCnt].HeaderText = "�o�@”[�@‘Î�@�Û�@�æ";
+                ColumnDefault[nDispCnt].Name = "Column5";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Width = 385;
+                // 
+                // Column6
+                // 
+                nDispCnt = (int)DispColDefault.EntryPrice;
+                CellStyleDefault[3].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleDefault[3].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleDefault[3].ForeColor = Color.Black;
+                ColumnDefault[nDispCnt].DefaultCellStyle = CellStyleDefault[3];
+                ColumnDefault[nDispCnt].HeaderText = "‹àŠz�i�Å”²�j";
+                ColumnDefault[nDispCnt].Name = "Column6";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Width = 200;
+                // 
+                // Column7
+                // 
+                nDispCnt = (int)DispColDefault.EntryTax;
+                CellStyleDefault[4].Alignment = DataGridViewContentAlignment.MiddleRight;
+                CellStyleDefault[4].Font = new Font("Century", 12F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
+                CellStyleDefault[4].ForeColor = Color.Black;
+                ColumnDefault[nDispCnt].DefaultCellStyle = CellStyleDefault[4];
+                ColumnDefault[nDispCnt].HeaderText = "‹àŠz�i�Å�ž�j";
+                ColumnDefault[nDispCnt].Name = "Column7";
+                ColumnDefault[nDispCnt].ReadOnly = true;
+                ColumnDefault[nDispCnt].SortMode = DataGridViewColumnSortMode.NotSortable;
+                ColumnDefault[nDispCnt].Width = 200;
+
+                // ƒOƒŠƒbƒhˆÊ’u�EƒTƒCƒY•Ï�X
+                dgvMaster.Width = 1240;
+                dgvMaster.Height = 508;
+                dgvMaster.Location = new Point(10, 10);
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                dgv.ResumeLayout();
+            }
         }
         #endregion
 
-        #region ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
+        #region ƒf�[ƒ^�‰Šú•\Ž¦�ˆ—�
         /// <summary>
-        /// ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
+        /// ƒf�[ƒ^�‰Šú•\Ž¦�ˆ—�
         /// </summary>
-        private void DataDisplayType1()
+        private void DataDisplayStage0()
         {
-            IOCostDataOfDepartment CostDepDB = new IOCostDataOfDepartment();
-            DataGridViewEX dgv = dgvList;
+            IOAllFreeSQL FreeDB = new IOAllFreeSQL();
+            DataGridView dgv = dgvMaster;
             try
             {
-                // ƒf�[ƒ^Žæ“¾‚r‚p‚k�ì�¬
                 StringBuilder strSQL = new StringBuilder();
-                CreateDispDataSQLType1(ref strSQL);
+                // ƒf�[ƒ^�‰Šú‚r‚p‚k�ì�¬
+                strSQL.Append(CreateSQLStage0());
 
                 ArrayList ArList = new ArrayList();
-                if (!CostDepDB.ExecuteReader(strSQL.ToString(), ref ArList)) return;
+                if (!FreeDB.ExecuteReader(strSQL.ToString(), ref ArList)) return;
 
-                dgv.Rows.Clear();
-                label6.Text = string.Empty;
-                label7.Text = string.Empty;
+                ProgressBar.Maximum = ArList.Count;
 
-                long lTotal1 = 0;
-                long lTotal2 = 0;
+                int nNo = 0;
+                int nBreak = 0;
+                string strBreak = string.Empty;
+                string strCostTypeName = string.Empty;
                 foreach (object[] objRec in ArList)
                 {
-                    int nRowCnt = dgv.Rows.Add(
-                                                CommonMotions.cnvInt(objRec[0]),
-                                                CommonMotions.cnvString(objRec[1]),
-                                                CommonMotions.cnvInt(objRec[2]),
-                                                CommonMotions.cnvInt(objRec[3]).ToString("#,0"),
-                                                CommonMotions.cnvInt(objRec[4]).ToString("#,0")
-                                    );
-                    lTotal1 += CommonMotions.cnvInt(objRec[3]);
-                    lTotal2 += CommonMotions.cnvInt(objRec[4]);
+                    int nCostType = CommonMotions.cnvInt(objRec[0]);
+                    int nTargetType = CommonMotions.cnvInt(objRec[1]);
+                    // ƒ^ƒCƒv‚ªˆá‚¦‚Î�‡ŒvƒZƒbƒg
+                    if (nBreak != nCostType)
+                    {
+                        if (nBreak != 0) SetTotalRow(strBreak, nBreak);
+
+                        nBreak = nCostType;
+                        strCostTypeName = CommonMotions.cnvString(objRec[2]);
+                        strBreak = strCostTypeName;
+                        continue;
+                    }
+
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                    CurRow.Cells[(int)DispColDefault.CostType].Value = nCostType;                                   // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                    CurRow.Cells[(int)DispColDefault.TargetType].Value = nTargetType;                               // 1:�o”[�æƒ^ƒCƒv
+                    CurRow.Cells[(int)DispColDefault.No].Value = ++nNo;                                             // 2:No
+                    CurRow.Cells[(int)DispColDefault.CostTypeName].Value = strCostTypeName;                         // 3:ƒ^ƒCƒv–¼�Ì
+                    CurRow.Cells[(int)DispColDefault.TargetTypeName].Value = CommonMotions.cnvString(objRec[2]);    // 4:�æ–¼�Ì
+
+                    decimal decEntryPrice = CommonMotions.cnvDecimal(objRec[4]);
+                    decimal decEntryTax = CommonMotions.cnvDecimal(objRec[5]);
+                    CurRow.Cells[(int)DispColDefault.EntryPrice].Value = decEntryPrice.ToString("#,0");             // 5:‹àŠz�i�Å”²�j
+                    CurRow.Cells[(int)DispColDefault.EntryTax].Value = decEntryTax.ToString("#,0");                 // 6:‹àŠz�i�Å�ž�j
+
+                    strCostTypeName = string.Empty;
+
+                    ProgressBar.Value++;
                 }
-                // �‡Œv•\Ž¦
-                label6.Text = lTotal1.ToString("#,0");
-                label7.Text = lTotal2.ToString("#,0");
-
+                if (ArList.Count > 0)
+                {
+                    SetTotalRow(strBreak, nBreak);
+                    SetTotalRow("‘�", 0, true);
+                }
             }
             catch (Exception ex)
             {
@@ -497,233 +719,222 @@
             }
             finally
             {
-                CostDepDB.close(); CostDepDB = null;
-                int nDpsRow = 20 - dgv.RowCount;
-                if (nDpsRow > 0) dgv.RowCount += nDpsRow;
+                FreeDB.close(); FreeDB = null;
+                // ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
+                SetGridMaxRow();
+                ProgressBar.Value = ProgressBar.Maximum;
             }
         }
         #endregion
 
-        #region �o”[•¶Žš
+        #region ƒf�[ƒ^�‰Šú‚r‚p‚k�ì�¬
         /// <summary>
-        /// �o”[•¶Žš
+        /// ƒf�[ƒ^�‰Šú‚r‚p‚k�ì�¬
         /// </summary>
-        private static string[] s_SRTypeMark = new string[] { "�£", "�œ" };
-        #endregion
-
-        #region –¾�×ƒf�[ƒ^•\Ž¦‚r‚p‚k�ì�¬
-        /// <summary>
-        /// –¾�×ƒf�[ƒ^•\Ž¦‚r‚p‚k�ì�¬
-        /// </summary>
-        /// <param name="strSQL"></param>
-        private void CreateDispDataSQLType2(ref StringBuilder strSQL)
+        private string CreateSQLStage0()
         {
             try
             {
-                int nTargetCount = (int)numUDConstPro.Value;
-                // ŠúŽñ�EŠú––Žæ“¾
-                //DateTime dtStart = CommonMotions.GetOpeningEndDate(nTargetCount);
-                //DateTime dtComp = CommonMotions.GetOpeningEndDate(nTargetCount, false);
-                // •”��ƒR�[ƒhŽæ“¾
-                int nDepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+                decimal nNumYear = numUDConstPro.Value;
 
+                StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("Select");
-                strSQL.Append(" A.DepartmentCode");     //  0
-                strSQL.Append(", DATE(A.CostDate)");    //  1
-                strSQL.Append(", A.SeqNo");             //  2
-                strSQL.Append(", A.CostDate");          //  3
-                strSQL.Append(", A.SuppliersCode");     //  4
-                strSQL.Append(", A.SuppliersName");     //  5
-                strSQL.Append(", A.PaymentContent");    //  6
-                strSQL.Append(", A.EntryPrice");        //  7
-                strSQL.Append(", A.EntryTax");          //  8
-                strSQL.Append(", A.Coment");            //  9
-                strSQL.Append(", A.SendReceiveFlg");    // 10
-                strSQL.Append(" From");
-                strSQL.Append(" costdataofdepartment As A");
-                strSQL.Append(" Where");
-                strSQL.AppendFormat("  A.ConstrYear = {0}", nTargetCount);
-                //strSQL.AppendFormat(" Where DATE('{0}') <= DATE(A.CostDate)", dtStart.ToShortDateString());
-                //strSQL.AppendFormat(" And DATE(A.CostDate) <= DATE('{0}')", dtComp.ToShortDateString());
-                strSQL.AppendFormat(" And A.DepartmentCode = {0}", nDepCode);
+                strSQL.Append("        A.CostType");                            // 0
+                strSQL.Append("      , A.TargetType");                          // 1
+                strSQL.Append("      , A.CostDataTypeName");                    // 2
+                strSQL.AppendFormat(", ifnull(B.YearNumber, {0})", nNumYear);   // 3
+                strSQL.Append("      , ifnull(SUM(B.EntryPrice), 0)");          // 4
+                strSQL.Append("      , ifnull(SUM(B.EntryTax), 0)");            // 5
+                strSQL.Append(" From costdatatype As A");
+                strSQL.Append("      Left Join costdataofcompensation As B");
+                strSQL.Append("           On B.CostType = A.CostType");
+                strSQL.Append("           And B.TargetType = A.TargetType");
+                strSQL.AppendFormat("     And B.YearNumber = {0}", nNumYear);
+                strSQL.Append(" Group by A.CostType, A.TargetType");
 
-                strSQL.Append(" Order By A.DepartmentCode, A.CostDate");
+                return strSQL.ToString();
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
             }
         }
         #endregion
 
-        #region –¾�×ƒf�[ƒ^•\Ž¦�ˆ—�
+        #region �‡Œv�s‚Ì•\Ž¦
         /// <summary>
-        /// –¾�×ƒf�[ƒ^•\Ž¦�ˆ—�
+        /// �‡Œv�s‚Ì•\Ž¦
         /// </summary>
-        private void DataDisplayType2()
+        private void SetTotalRow(string TypeName, int CostType, bool bAll = false)
         {
-
-            dgvMaster.CellValueChanged -= new DataGridViewCellEventHandler(dgvMaster_CellValueChanged);
-            IOCostDataOfDepartment CostDepDB = new IOCostDataOfDepartment();
-            DataGridViewEX dgv = dgvMaster;
             try
             {
-                // ƒf�[ƒ^Žæ“¾‚r‚p‚k�ì�¬
-                StringBuilder strSQL = new StringBuilder();
-                CreateDispDataSQLType2(ref strSQL);
+                DataGridView dgv = dgvMaster;
 
-                ArrayList ArList = new ArrayList();
-                if (!CostDepDB.ExecuteReader(strSQL.ToString(), ref ArList)) return;
+                decimal[] decTotal = new decimal[2];
+                if (bAll)
+                {
+                    decTotal[0] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDefault.No].Value) > 0)
+                                                                    .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDefault.EntryPrice].Value));
+                    decTotal[1] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDefault.No].Value) > 0)
+                                                                    .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDefault.EntryTax].Value));
+                }
+                else
+                {
+                    decTotal[0] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDefault.No].Value) > 0
+                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColDefault.CostType].Value) == CostType)
+                                                                    .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDefault.EntryPrice].Value));
+                    decTotal[1] = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDefault.No].Value) > 0
+                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColDefault.CostType].Value) == CostType)
+                                                                    .Sum(y => CommonMotions.cnvDecimal(y.Cells[(int)DispColDefault.EntryTax].Value));
+                }
 
-                dgv.Rows.Clear();
-                label8.Text = string.Empty;
-                label9.Text = string.Empty;
+                int nIndex = 0;
+                if (bAll)
+                    nIndex = dgv.RowCount - 1;
+                else
+                    nIndex = dgv.Rows.Add(1);
 
-                long lTotal1 = 0;
-                long lTotal2 = 0;
-                string strName = string.Empty;
-                string[] strBtnVal = new string[2];
-                foreach (object[] objRec in ArList)
+                DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                CurRow.Cells[(int)DispColDetail.CostType].Value = s_GridTotalCode;                              // ƒ^ƒCƒv‚ÉƒZƒbƒg
+                CurRow.Cells[(int)DispColDefault.CostTypeName].Value = string.Format("{0}�@�‡�@Œv", TypeName);  // 3:ƒ^ƒCƒv–¼�Ì
+                CurRow.Cells[(int)DispColDefault.CostTypeName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                CurRow.Cells[(int)DispColDefault.EntryPrice].Value = decTotal[0].ToString("#,0");               // 5:‹àŠz�i�Å”²�j
+                CurRow.Cells[(int)DispColDefault.EntryTax].Value = decTotal[1].ToString("#,0");                 // 6:‹àŠz�i�Å�ž�j
+
+                for (int ix = 0; ix < dgv.ColumnCount; ix++)
                 {
-                    int SRType = CommonMotions.cnvInt(objRec[10]);
-                    Array.Clear(strBtnVal, 0, 2);
-                    if (SRType < 0)
+                    if (bAll)
                     {
-                        strBtnVal[0] = s_SRTypeMark[0];
+                        CurRow.Cells[ix].Style.BackColor = Color.Black;
+                        CurRow.Cells[ix].Style.ForeColor = Color.White;
                     }
-                    else if (SRType > 0)
+                    else
                     {
-                        strBtnVal[1] = s_SRTypeMark[1];
+                        CurRow.Cells[ix].Style.BackColor = Color.LightSteelBlue;
                     }
+                    CurRow.Cells[ix].ReadOnly = true;
+                }
 
-                    int nRowCnt = dgv.Rows.Add(
-                                            (int)DataRowState.Unchanged,
-                                            CommonMotions.cnvDate(objRec[3]).ToShortDateString(),
-                                            CommonMotions.cnvInt(objRec[4]),
-                                            CommonMotions.cnvString(objRec[5]),
-                                            CommonMotions.cnvString(objRec[6]),
-                                            strBtnVal[0],
-                                            strBtnVal[1],
-                                            SRType,
-                                            s_SendReceiveName[SRType],
-                                            CommonMotions.cnvInt(objRec[7]).ToString("#,0"),
-                                            CommonMotions.cnvInt(objRec[8]).ToString("#,0"),
-                                            CommonMotions.cnvString(objRec[9]),
-                                            CommonMotions.cnvInt(objRec[0]),
-                                            CommonMotions.cnvDate(objRec[1]).ToShortDateString(),
-                                            CommonMotions.cnvInt(objRec[2])
-                                );
-
-                    int nValue = CommonMotions.cnvInt(objRec[7]) * SRType;
-                    int nValTax = CommonMotions.cnvInt(objRec[8]) * SRType;
-                    lTotal1 += nValue;
-                    lTotal2 += nValTax;
-
-                }
-                label8.Text = lTotal1.ToString("#,0");
-                label9.Text = lTotal2.ToString("#,0");
+                if (!bAll) dgv.Rows.Add(1);
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                CostDepDB.close(); CostDepDB = null;
-                int nDpsRow = 40 - dgv.RowCount;
-                if (nDpsRow > 0) dgv.RowCount += nDpsRow;
-
-                dgvMaster.CellValueChanged += new DataGridViewCellEventHandler(dgvMaster_CellValueChanged);
-            }
         }
         #endregion
 
-        #region ƒf�[ƒ^•\Ž¦�ˆ—�
+        #region ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
         /// <summary>
-        /// ƒf�[ƒ^•\Ž¦�ˆ—�
+        /// ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
         /// </summary>
-        private void DataDisplay()
+        private void SetGridMaxRow()
         {
             try
             {
-                int nDepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-                if (nDepCode < 1)
+                DataGridView dgv = dgvMaster;
+
+                // �í�œ�i”ñ•\Ž¦�jˆÈŠO‚Ì�s�”Žæ“¾
+                int nCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => x.Visible).Count();
+
+                // –¾�×‚Æ‚»‚êˆÈŠO‚Í•\Ž¦�s�”‚ð•Ï‚¦‚é
+                int nDefault = s_RowDefault;
+                if (m_DispStage == (int)DispStageDef.Detail)
                 {
-                    groupBox2.Visible = true;
-                    groupBox3.Visible = false;
-                    btnLineAdd.Visible = false;
-                    btnLineDel.Visible = false;
-                    // ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
-                    DataDisplayType1();
+                    if (m_TargetType != (int)CostDataOfCompensation.TargetTypeDef.Company)
+                    {
+                        --nDefault;
+                    }
                 }
-                else
-                {
-                    groupBox2.Visible = false;
-                    groupBox3.Visible = true;
-                    btnLineAdd.Visible = true;
-                    btnLineDel.Visible = true;
-                    // –¾�×ƒf�[ƒ^•\Ž¦�ˆ—�
-                    DataDisplayType2();
-                }
+
+                // ƒOƒŠƒbƒh�s�”‚ðƒZƒbƒg‚·‚é
+                if (nCount < nDefault && (nDefault - nCount) > 0)
+                    dgv.RowCount += (nDefault - nCount);
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-            }
         }
         #endregion
 
-        #region ‚c‚aŽæ“¾�‡”Ô
+        #region ƒOƒŠƒbƒhƒZƒ‹‚Ìƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// <summary>
-        /// ‚c‚aŽæ“¾�‡”Ô
+        /// ƒOƒŠƒbƒhƒZƒ‹‚Ìƒ_ƒuƒ‹ƒNƒŠƒbƒN
         /// </summary>
-        private enum DBGetData
+        private void CellDoubleClick(DataGridViewCellEventArgs e)
         {
-        }
-        #endregion
-
-        #region ˆê——Žw’è�s‚ð‰ÁŽZ‚·‚é
-        /// <summary>
-        /// ˆê——Žw’è�s‚ð‰ÁŽZ‚·‚é
-        /// </summary>
-        /// <param name="sender"></param>
-        private void dgvList_CalcTarget(object sender)
-        {
+            DataGridView dgv = dgvMaster;
             try
             {
-                DataGridViewEX dgv = (DataGridViewEX)sender;
+                DataGridViewRow CurRow = dgv.Rows[e.RowIndex];
 
-                lblCellTotal1.Text = string.Empty;
 
-                double dTotal = 0;
-                int DataCnt = 0;
-                int NumericCnt = 0;
-                foreach (DataGridViewCell c in dgv.SelectedCells)
+                // ƒwƒbƒ_�[ƒNƒŠƒbƒN‚Í�ˆ—�‚µ‚È‚¢
+                if (e.RowIndex < 0) return;
+
+                bool bReturn = true;
+                switch (m_DispStage)
                 {
-                    if (CommonMotions.chkObjectIsNull(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex])) continue;
-                    if (CommonMotions.chkCellBlank(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) continue;
+                    case (int)DispStageDef.TotalData:
+                        int wk1 = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDefault.CostType].Value);       // 0:�o”[ƒ^ƒCƒvƒR�[ƒh
+                        int wk2 = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDefault.TargetType].Value);     // 1:�o”[�æƒR�[ƒh
+                        if (wk1 < 1)
+                        {
+                            // ‘I‘ð–³‚µ‚Í�ˆ—�‚µ‚È‚¢
+                            bReturn = true;
+                            break;
+                        }
 
-                    //Console.WriteLine("{0}, {1}", c.ColumnIndex, c.RowIndex);
-                    DataCnt++;
-                    int nValue = CommonMotions.cnvInt(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value);
+                        m_DispCost = wk1;
+                        m_TargetType = wk2;
+                        bReturn = false;
+                        // ‘I‘ð�o”[�æ‚ª‰ïŽÐ‚Ì�ê�‡‚Íˆê‹C‚É–¾�×‚Ö
+                        if (m_TargetType == (int)CostDataOfCompensation.TargetTypeDef.Company)
+                        {
+                            m_TargetCode = (int)CostDataOfCompensation.OwnCompany;
+                            m_DispStage++;
+                        }
+                        break;
 
-                    dTotal += nValue;
-                    if (CommonMotions.chkNumeric(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) NumericCnt++;
+                    case (int)DispStageDef.Section:
+                        int wk3 = CommonMotions.cnvInt(CurRow.Cells[(int)DispColSection.TargetCode].Value);     // 2:‘Î�ÛƒR�[ƒh
+                        if (wk3 < 1)
+                        {
+                            // �HŽ–ˆê——‚æ‚èƒ_ƒuƒ‹ƒNƒŠƒbƒN
+                            if (!SectionGridDoubleClick()) bReturn = true;
+                        }
+                        else
+                        {
+                            m_TargetCode = wk3;
+                            bReturn = false;
+                        }
+                        break;
+
+                    case (int)DispStageDef.Detail:
+                        // ƒ�ƒbƒN�s‚Í�ˆ—�‚µ‚È‚¢
+                        int nLock = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.DataLock].Value);
+                        if (nLock == (int)CostDataOfCompensation.LockFlgDef.Locked) break;
+
+                        // ‘ŠŽè�æŒŸ�õ‚ð�s‚¤
+                        if (e.ColumnIndex == (int)DispColDetail.FromName) ShowSubConstructorDiag();
+                        break;
+
+                    default:
+                        break;
                 }
-                // ƒf�[ƒ^–³‚Í•\Ž¦‚µ‚È‚¢
-                if (DataCnt <= 1 || dTotal == 0 || NumericCnt == 0) return;
 
-                string strTotal = CommonMotions.cnvTruncate(dTotal).ToString("#,#");
-                if (dTotal - System.Math.Floor(dTotal) != 0) strTotal = dTotal.ToString("#,#.00");
+                // ˆÈ‰º‚ð�ˆ—�‚µ‚È‚¢
+                if (bReturn) return;
 
-                string strwrkData = string.Format(CommonDefine.s_CalculateCellFormat,
-                                                    CommonMotions.cnvTruncate(dTotal / (double)NumericCnt).ToString("#,#"),
-                                                    DataCnt.ToString("#,#"),
-                                                    strTotal);
-                lblCellTotal1.Text = strwrkData;
+                // ŠK‘wƒJƒEƒ“ƒ^ƒAƒbƒv
+                m_DispStage++;
+
+                // ƒf�[ƒ^•\Ž¦
+                DataDisplay();
             }
             catch (Exception ex)
             {
@@ -732,303 +943,190 @@
         }
         #endregion
 
-        #region –¾�×Žw’è�s‚ð‰ÁŽZ‚·‚é
+        #region ‹¦—Í‰ïŽÐ‘I‘ðƒ_ƒCƒAƒ�ƒO•\Ž¦
         /// <summary>
-        /// –¾�×Žw’è�s‚ð‰ÁŽZ‚·‚é
+        /// ‹¦—Í‰ïŽÐ‘I‘ðƒ_ƒCƒAƒ�ƒO•\Ž¦
         /// </summary>
-        /// <param name="sender"></param>
-        private void dgvMaster_CalcTarget(object sender)
+        private void ShowSubConstructorDiag()
         {
+            FrmSubContractorDiag frm = new FrmSubContractorDiag();
             try
             {
-                DataGridViewEX dgv = (DataGridViewEX)sender;
+                DataGridViewEX dgv = dgvMaster;
 
-                lblCellTotal2.Text = string.Empty;
+                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.DepartmentCost;
+                frm.ShowDialog();
+                if (frm.EndButton != System.Windows.Forms.DialogResult.OK) return;
 
-                double dTotal = 0;
-                int DataCnt = 0;
-                int NumericCnt = 0;
-                foreach (DataGridViewCell c in dgv.SelectedCells)
-                {
-                    if (CommonMotions.chkObjectIsNull(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex])) continue;
-                    if (CommonMotions.chkCellBlank(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) continue;
-
-                    //Console.WriteLine("{0}, {1}", c.ColumnIndex, c.RowIndex);
-                    DataCnt++;
-                    int nValue = CommonMotions.cnvInt(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value);
-                    int nCoefficient = CommonMotions.cnvInt(dgv.Rows[c.RowIndex].Cells[(int)DispColType2.SRType].Value);
-
-                    dTotal += (nValue * nCoefficient);
-                    if (CommonMotions.chkNumeric(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) NumericCnt++;
-                }
-                // ƒf�[ƒ^–³‚Í•\Ž¦‚µ‚È‚¢
-                if (DataCnt <= 1 || dTotal == 0 || NumericCnt == 0) return;
-
-                string strTotal = CommonMotions.cnvTruncate(dTotal).ToString("#,#");
-                if (dTotal - System.Math.Floor(dTotal) != 0) strTotal = dTotal.ToString("#,#.00");
-
-                string strwrkData = string.Format(CommonDefine.s_CalculateCellFormat,
-                                                    CommonMotions.cnvTruncate(dTotal / (double)NumericCnt).ToString("#,#"),
-                                                    DataCnt.ToString("#,#"),
-                                                    strTotal);
-                lblCellTotal2.Text = strwrkData;
+                SubContractorMaster selRec = frm.SelectData;
+                dgv.CurrentRow.Cells[(int)DispColDetail.FromCode].Value = selRec.CompanyCode;
+                dgv.CurrentRow.Cells[(int)DispColDetail.FromName].Value = selRec.CompanyName;
+                m_bChengeAns = true;
             }
-            catch (Exception ex)
+            catch (System.Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-        }
-        #endregion
-
-        #region •”��ƒRƒ“ƒ{‚æ‚èƒR�[ƒh‚ðŽæ“¾‚·‚é
-        /// <summary>
-        /// •”��ƒRƒ“ƒ{‚æ‚èƒR�[ƒh‚ðŽæ“¾‚·‚é
-        /// </summary>
-        /// <returns></returns>
-        private int GetDepartmentCode()
-        {
-            try
+            finally
             {
-                return CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+                frm.Dispose();
+                frm = null;
             }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}", ex.Message);
-                return 0;
-            }
         }
         #endregion
 
-        #region ’S“–ŽÒ–ˆ‚ÌŽw’èŠú‚Ì�HŽ–ŠJŽn“ú‚ðŽæ“¾‚·‚é
+        #region •\Ž¦ƒXƒe�[ƒWƒAƒbƒv�ˆ—�
         /// <summary>
-        /// ’S“–ŽÒ–ˆ‚ÌŽw’èŠú‚Ì�HŽ–ŠJŽn“ú‚ðŽæ“¾‚·‚é
+        /// •\Ž¦ƒXƒe�[ƒWƒAƒbƒv�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        //private DateTime GetConstructionDate(int PersonCode, bool bStart = true)
-        //{
-        //    IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
-        //    try
-        //    {
-        //        // ‹ó‚Ì�ê�‡‚Íƒ�ƒOƒCƒ“ƒ†�[ƒU�[
-        //        if (PersonCode == 0) PersonCode = CommonMotions.LoginUserData.PersonCode;
-
-        //        // ŠJŽn“úŽæ“¾
-        //        StringBuilder strSQL = new StringBuilder();
-        //        strSQL.Append("SELECT A.CONSTRUCTIONPERSONCODE, MIN(B.CONSTRUCTIONSTART) FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBUDGET B");
-        //        // �I—¹Žw’è‚Í�I—¹‚ÌMAX‚É•Ï�X
-        //        if (!bStart) strSQL.Replace("MIN(B.CONSTRUCTIONSTART)", "MAX(B.CONSTRUCTIONEND)");
-
-        //        strSQL.AppendFormat(" WHERE A.CONSTRUCTIONPERSONCODE = {0}", PersonCode);
-        //        strSQL.AppendFormat("  AND A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-        //        strSQL.Append(" AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE GROUP BY A.CONSTRUCTIONPERSONCODE");
-        //        ArrayList ArrayList = new ArrayList();
-        //        if (!BaseDB.ExecuteReader(strSQL.ToString(), ref ArrayList)) return DateTime.MinValue;
-        //        if (ArrayList.Count == 0) return DateTime.MinValue;
-
-        //        object[] objRec = (object[])ArrayList[0];
-
-        //        return CommonMotions.cnvDate(objRec[1]);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-        //        return DateTime.MinValue;
-        //    }
-        //    finally
-        //    {
-        //        BaseDB.close(); BaseDB = null;
-        //    }
-        //}
-        #endregion
-
-        #region •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ðƒZƒbƒg‚·‚é
-        /// <summary>
-        /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚Ö•¶Žš‚ðƒZƒbƒg‚·‚é
-        /// </summary>
-        private void SetcmbDepartment()
+        private void StageUpProcess()
         {
-            IOMDepartment depDB = new IOMDepartment();
             try
             {
-                int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+                if (m_bChengeAns)
+                {
+                    string strMsg = "ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É‘O‰æ–Ê‚Ì–ß‚Á‚Ä‚æ‚ë‚µ‚¢‚Å‚µ‚å‚¤‚©�H";
+                    if (MessageBox.Show(strMsg
+                                        , "‘I‘ðŠm”F"
+                                        , MessageBoxButtons.YesNo
+                                        , MessageBoxIcon.Warning) == DialogResult.No) return;
+                }
 
-                int nTargetCount = (int)numUDConstPro.Value;
-                // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
-                StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
+                bool bReturn = true;
+                switch (m_DispStage)
+                {
+                    case (int)DispStageDef.TotalData:
+                        bReturn = true;
+                        break;
 
-                // •”��ƒ}ƒXƒ^“Ç�ž
-                ArrayList arList = new ArrayList();
-                if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
+                    case (int)DispStageDef.Section:
+                        bReturn = false;
+                        break;
 
-                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
-                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
+                    case (int)DispStageDef.Detail:
+                        bReturn = false;
 
-                foreach (object[] work in arList)
-                {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(CommonMotions.cnvInt(work[0])
-                                                                                    , CommonMotions.cnvString(work[1]));
+                        // ‘I‘ð�o”[�æ‚ª‰ïŽÐ‚Ì�ê�‡‚Íˆê‹C‚É�æ“ª‚Ö
+                        if (m_TargetType == (int)CostDataOfCompensation.TargetTypeDef.Company)
+                            m_DispStage--;
+                        break;
 
-                    ConstructionDataList.Add(keyval);
+                    default:
+                        break;
                 }
 
-                cmbDepartment.DataSource = null;
-                cmbDepartment.Items.Clear();
-                cmbDepartment.Text = "";
+                // ˆÈ‰º‚ð�ˆ—�‚µ‚È‚¢
+                if (bReturn) return;
 
-                // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-                ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList);
+                // ŠK‘wƒJƒEƒ“ƒ^ƒ_ƒEƒ“
+                m_DispStage--;
 
-                cmbDepartment.SelectedValue = nBeforeCode;
+                // ƒf�[ƒ^•\Ž¦
+                DataDisplay();
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                depDB.close(); depDB = null;
-            }
         }
         #endregion
 
-        #region •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^Žæ“¾‚r‚p‚k�ì�¬
+        #region ƒOƒŠƒbƒhƒZƒ‹“ü—ÍŒã�ˆ—�
         /// <summary>
-        /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^Žæ“¾‚r‚p‚k�ì�¬
+        /// ƒOƒŠƒbƒhƒZƒ‹“ü—ÍŒã�ˆ—�
         /// </summary>
-        /// <param name="strSQL"></param>
-        //public static void CreateDepCombBoxSQL(ref StringBuilder strSQL, int nTargetCount, bool bInput = false)
-        //{
-        //    try
-        //    {
-        //        // �¡Šú‚Ìƒf�[ƒ^‚©‚Ç‚¤‚©‚ð”»’è‚·‚é
-        //        bool bNowSeason = CommonMotions.CheckNowSeason(nTargetCount);
+        private void GridValidated(DataGridViewCellEventArgs e)
+        {
+            try
+            {
+                // �I—¹Žž‚Íƒ`ƒFƒbƒN‚µ‚È‚¢
+                if (ActiveControl == btnEnd) return;
 
-        //        strSQL.Append("SELECT");
-        //        strSQL.Append(" A.DEPARTMENTCODE");
-        //        strSQL.Append(", A.DEPARTMENTSTRING");
-        //        strSQL.Append(", A.DISPLAYORDER");
-        //        strSQL.Append(", COUNT(*)");
-        //        strSQL.Append(" FROM");
-        //        if (bNowSeason)
-        //        {
-        //            // �¡Šú‚Ìƒvƒ‰ƒCƒ}ƒŠƒe�[ƒuƒ‹‚Í•”��ƒ}ƒXƒ^
-        //            strSQL.Append(" DEPARTMENTMASTER A");
-        //        }
-        //        else
-        //        {   // ‰ß‹Ž‚Ìƒf�[ƒ^‚Í�HŽ–�î•ñ‚æ‚èŽæ“¾‚·‚é
-        //            strSQL.Append(" (");
-        //            strSQL.Append("Select");
-        //            strSQL.Append(" A1.SalesDepCode As DEPARTMENTCODE");
-        //            strSQL.Append(", B1.DetailString As DEPARTMENTSTRING");
-        //            strSQL.Append(", ifnull(C1.DisplayOrder, 10) As DISPLAYORDER");
-        //            strSQL.Append(" From Constructionbaseinfo As A1");
-        //            strSQL.Append("  Inner Join constructionbaseinfodetail As B1");
-        //            strSQL.Append("        On B1.ConstructionCode = A1.ConstructionCode");
-        //            strSQL.AppendFormat("  And B1.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.SalesDepartmentName);
-        //            strSQL.Append("  Left Join departmentmaster As C1");
-        //            strSQL.Append("       On C1.DepartmentCode = A1.SalesDepCode");
-        //            strSQL.AppendFormat(" Where A1.ConstructionPeriod = {0}", nTargetCount);
-        //            strSQL.Append("       And A1.SalesDepCode != 0");
+                // –¾�×ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (m_DispStage != (int)DispStageDef.Detail) return;
 
-        //            strSQL.Append(" Union Select");
-        //            strSQL.Append(" A2.ConstrDepCode As DEPARTMENTCODE");
-        //            strSQL.Append(", B2.DetailString As DEPARTMENTSTRING");
-        //            strSQL.Append(", ifnull(C2.DisplayOrder, 10) As DISPLAYORDER");
-        //            strSQL.Append(" From Constructionbaseinfo As A2");
-        //            strSQL.Append(" Inner Join constructionbaseinfodetail As B2");
-        //            strSQL.Append("       On B2.ConstructionCode = A2.ConstructionCode");
-        //            strSQL.AppendFormat(" And B2.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstrDepartmentName);
-        //            strSQL.Append(" Left Join departmentmaster As C2");
-        //            strSQL.Append("      On C2.DepartmentCode = A2.ConstrDepCode");
-        //            strSQL.AppendFormat(" Where A2.ConstructionPeriod = {0}", nTargetCount);
-        //            strSQL.Append("       And A2.ConstrDepCode != 0");
+                DataGridView dgv = dgvMaster;
+                int nRowIndex = e.RowIndex;
+                int nColIndex = e.ColumnIndex;
+                if (nRowIndex < 0) return;
+                if (nColIndex < 0) return;
 
-        //            strSQL.Append(" Union Select");
-        //            strSQL.Append(" A3.ConstrSubDepCode As DEPARTMENTCODE");
-        //            strSQL.Append(", B3.DetailString As DEPARTMENTSTRING");
-        //            strSQL.Append(", ifnull(C3.DisplayOrder, 10) As DISPLAYORDER");
-        //            strSQL.Append(" From Constructionbaseinfo As A3");
-        //            strSQL.Append(" Inner Join constructionbaseinfodetail As B3");
-        //            strSQL.Append("       On B3.ConstructionCode = A3.ConstructionCode");
-        //            strSQL.AppendFormat(" And B3.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstrSubDepartmentName);
-        //            strSQL.Append(" Left Join departmentmaster As C3");
-        //            strSQL.Append("      On C3.DepartmentCode = A3.ConstrSubDepCode");
-        //            strSQL.AppendFormat(" Where A3.ConstructionPeriod = {0}", nTargetCount);
-        //            strSQL.Append("       And A3.ConstrSubDepCode != 0");
+                int ColCount = Enum.GetNames(typeof(DispColDetail)).Length;
+                if (dgv.ColumnCount < ColCount) return;
 
-        //            strSQL.Append(" Union Select");
-        //            strSQL.Append(" A4.ConstrInstrDepCode As DEPARTMENTCODE");
-        //            strSQL.Append(", B4.DetailString As DEPARTMENTSTRING");
-        //            strSQL.Append(", ifnull(C4.DisplayOrder, 10) As DISPLAYORDER");
-        //            strSQL.Append(" From Constructionbaseinfo As A4");
-        //            strSQL.Append(" Inner Join constructionbaseinfodetail As B4");
-        //            strSQL.Append("       On B4.ConstructionCode = A4.ConstructionCode");
-        //            strSQL.AppendFormat(" And B4.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.InstrDepartmentName);
-        //            strSQL.Append(" Left Join departmentmaster As C4");
-        //            strSQL.Append("      On C4.DepartmentCode = A4.ConstrInstrDepCode");
-        //            strSQL.AppendFormat(" Where A4.ConstructionPeriod = {0}", nTargetCount);
-        //            strSQL.Append("       And A4.ConstrInstrDepCode != 0");
-        //            strSQL.Append(") As A");
-        //        }
+                DataGridViewRow CurRow = dgv.Rows[nRowIndex];
+                DataGridViewCell CurCell = CurRow.Cells[nColIndex];
 
-        //        if (bNowSeason)
-        //        {   // ‘Î�Û‚ª�¡Šú‚Ì�ê�‡
-        //            if (!bInput) strSQL.Append(", CONSTRUCTIONBASEINFO C");
-        //            strSQL.Append(" WHERE");
+                // ƒZƒ‹�³�í�F‚Ö
+                ChgBackColor(nRowIndex, CurCell);
 
-        //            // �í�œ‚³‚ê‚Ä‚¢‚È‚¢‚à‚Ì
-        //            strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
-        //            DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false);
+                // “ü—Í‚ª–³‚¢�s‚Í�ˆ—�‚µ‚È‚¢
+                string[] strArray = new string[6];
+                strArray[0] = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.SendDate].Value);         // 9:•â“U“ú
+                strArray[1] = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.FromName].Value);         // 10:‘ŠŽè�æ–¼�Ì
+                strArray[2] = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Content].Value);          // 11:�o”[“à—e
+                strArray[3] = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.EntryPrice].Value);       // 12:‹àŠz�i�Å”²�j
+                strArray[4] = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.EntryTax].Value);         // 13:‹àŠz�i�Å�ž�j
+                strArray[5] = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Comment].Value);          // 14:”õ�l
+                if (strArray.Where(x => x.Length > 0).Count() < 1) return;
 
-        //            strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
-        //            if (!bInput) strSQL.Append(" And C.ConstrDepCode = A.DepartmentCode");
+                string strWork = string.Empty;
+                switch (nColIndex)
+                {
+                    case (int)DispColDetail.RowState:       // 0:•Ò�Wƒtƒ‰ƒO
+                    case (int)DispColDetail.CostType:       // 1:�o”[ƒ^ƒCƒvƒR�[ƒh
+                    case (int)DispColDetail.TargetType:     // 2:�o”[�æƒR�[ƒh
+                    case (int)DispColDetail.TargetCode:     // 3:‘Î�ÛƒR�[ƒh
+                    case (int)DispColDetail.SeqNo:          // 4:SeqNo
+                    case (int)DispColDetail.PersonCode:     // 5:’S“–ŽÒƒR�[ƒh
+                    case (int)DispColDetail.FromCode:       // 6:‘ŠŽèŠú�æƒR�[ƒh
+                    case (int)DispColDetail.No:             // 7:No
+                    case (int)DispColDetail.PersonName:     // 8:’S“–ŽÒ–¼
+                        // “ü—Íƒ`ƒFƒbƒN�E�ˆ—�–³
+                        break;
 
-        //            // ƒVƒXƒeƒ€ŠÇ—�ŽÒˆÈŠO‚Í•”��ŽQ�Æƒ}ƒXƒ^‚æ‚èƒf�[ƒ^Žæ“¾
-        //            if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
-        //            {
-        //                // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-        //                strSQL.Append(" And A.DEPARTMENTCODE");
-        //                strSQL.Append(" IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1");
-        //                strSQL.AppendFormat(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-        //            }
-        //        }
-        //        else
-        //        {   // ‘Î�Û‚ª‰ß‹Ž‚Ì�ê�‡
-        //            strSQL.Append(", CONSTRUCTIONBASEINFO C");
-        //            strSQL.Append(" WHERE");
+                    case (int)DispColDetail.SendDate:       // 9:•â“U“ú
+                        // ”NŒŽ“ú“ü—ÍŒã�ˆ—�
+                        InputDateChanged(CurCell);
+                        break;
 
-        //            strSQL.AppendFormat(" (C.ConstructionPeriod = {0}", nTargetCount);
-        //            strSQL.Append(" And A.DepartmentCode IN(C.SalesDepCode, C.ConstrDepCode, C.ConstrSubDepCode, C.ConstrInstrDepCode))");
-        //        }
-        //        strSQL.Append(" GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER");
-        //        strSQL.Append(" ORDER BY A.DISPLAYORDER ASC");
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //}
-        #endregion
+                    case (int)DispColDetail.FromName:       // 10:‘ŠŽè�æ–¼�Ì
+                        strWork = CommonMotions.cnvString(CurCell.Value);
+                        if ((m_DispCost == (int)CostDataOfCompensation.CostTypeDef.Type2
+                            || m_DispCost == (int)CostDataOfCompensation.CostTypeDef.Type3
+                            || m_DispCost == (int)CostDataOfCompensation.CostTypeDef.Type4)
+                            && strWork.Length < 1)
+                        {
+                            ChgBackColor(nRowIndex, CurCell, true);
+                            MessageBox.Show("‘ŠŽè�æ–¼‚Í•K�{“ü—Í‚Å‚·�B"
+                                            , "“ü—Í’lƒGƒ‰�["
+                                            , MessageBoxButtons.OK
+                                            , MessageBoxIcon.Error);
+                            return;
+                        }
+                        break;
 
-        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
-        /// <summary>
-        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
-        /// </summary>
-        private void SetInitnumUDConstPro()
-        {
-            try
-            {
-                // ŒŸ�õ”N“xƒZƒbƒg
-                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
-                int minval = 0;
-                int maxval = 0;
-                CommonMotions.GetPeriodYearMinMax(ref minval, ref maxval);
+                    case (int)DispColDetail.Content:        // 11:�o”[“à—e
+                    case (int)DispColDetail.Comment:        // 14:”õ�l
+                        strWork = CommonMotions.cnvString(CurCell.Value);
+                        if (strWork.Length > 120)
+                        {
+                            ChgBackColor(nRowIndex, CurCell, true);
+                            MessageBox.Show("•¶Žš‚Í120•¶Žš‚Ü‚Å‚Ì“ü—Í‚Å‚«‚Ü‚·�B"
+                                            , "“ü—Í’lƒGƒ‰�["
+                                            , MessageBoxButtons.OK
+                                            , MessageBoxIcon.Error);
+                            return;
+                        }
+                        break;
 
-                numUDConstPro.Minimum = minval;
-                numUDConstPro.Maximum = maxval;
-                numUDConstPro.Value = CommonMotions.GetPeriodYear();
-                CommonMotions.SetSerchTitle(label2, label4, numUDConstPro, label5);
+                    case (int)DispColDetail.EntryPrice:     // 12:‹àŠz�i�Å”²�j
+                    case (int)DispColDetail.EntryTax:       // 13:‹àŠz�i�Å�ž�j
+                        // ‹àŠzƒZƒ‹“ü—ÍŒã�ˆ—�
+                        GridValidatedPrice(e);
+                        break;
+
+                }
             }
             catch (Exception ex)
             {
@@ -1037,476 +1135,486 @@
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh“ü—Í‘O�ˆ—�
+        #region ’S“–ŽÒ‚ÌƒZƒbƒg
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh“ü—Í‘O�ˆ—�
+        /// ’S“–ŽÒ‚ÌƒZƒbƒg
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_EntryCell(object sender, DataGridViewCellEventArgs e)
+        private void SetInputPerson(DataGridViewRow CurRow)
         {
+            DispEventControl(false);
             try
             {
-                // ƒf�[ƒ^ƒOƒŠƒbƒh‚ªActive‚Å‚È‚¯‚ê‚Î�ˆ—�‚µ‚È‚¢
-                if (!groupBox3.Visible) return;
-
-                DataGridViewEX dgv = (DataGridViewEX)sender;
-                // “Ç�ž�ê—pƒZƒ‹‚Í�ˆ—�‚µ‚È‚¢
-                if (!dgv[e.ColumnIndex, e.RowIndex].GetType().Equals(typeof(DataGridViewTextBoxCell))) return;
-                if (dgv[e.ColumnIndex, e.RowIndex].ReadOnly) return;
-
-                //IME‚Ìƒ‚�[ƒh‚ð•Ï�X‚·‚é
-                switch (e.ColumnIndex)
-                {
-                    //  2:Žx•¥�æ–¼
-                    case (int)DispColType2.SuppliersName:
-                    //  3:Žx•¥“à—e
-                    case (int)DispColType2.PaymentContent:
-                    // 10:”õ�l
-                    case (int)DispColType2.Coment:
-                        dgv.ImeMode = ImeMode.On;
-                        break;
-
-                    //  1:•\Ž¦�o”[“ú
-                    case (int)DispColType2.DspCostDate:
-                    //  8:‹àŠz�i�Å”²�j
-                    case (int)DispColType2.EntryPrice:
-                    //  9:‹àŠz�i�Å�ž�j
-                    case (int)DispColType2.EntryTax:
-                        dgv.ImeMode = ImeMode.Disable;
-                        break;
-
-                    default:
-                        dgv.ImeMode = ImeMode.Disable;
-                        break;
-                }
-                // ƒZƒ‹“à—e‘I‘ð
-                dgv.BeginEdit(true);
-
+                // “ü—ÍŽž‚É’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
+                int ix = (int)DispColDetail.PersonCode;
+                CurRow.Cells[ix].Value = CommonMotions.LoginUserData.PersonCode;
+                ix = (int)DispColDetail.PersonName;
+                CurRow.Cells[ix].Value = CommonMotions.LoginUserData.PersonName;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                DispEventControl(true);
+            }
         }
         #endregion
 
-        #region “o˜^ƒ{ƒ^ƒ“‰Ÿ‰ºŒã‚Ì“o˜^�ˆ—�
+        #region ‹àŠzƒZƒ‹“ü—ÍŒã�ˆ—�
         /// <summary>
-        /// “o˜^ƒ{ƒ^ƒ“‰Ÿ‰ºŒã‚Ì“o˜^�ˆ—�
+        /// ‹àŠzƒZƒ‹“ü—ÍŒã�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        private bool DataEntryProcess(bool Display = true)
+        /// <param name="e"></param>
+        private void GridValidatedPrice(DataGridViewCellEventArgs e)
         {
-            IOCostDataOfDepartment Cdd = new IOCostDataOfDepartment();
+            DispEventControl(false);
             try
             {
-                //ƒf�[ƒ^ƒ`ƒFƒbƒN
-                if (!DispFeildCheck()) return false;
+                DataGridView dgv = dgvMaster;
+                int nRowIndex = e.RowIndex;
+                int nColIndex = e.ColumnIndex;
+                DataGridViewRow CurRow = dgv.Rows[nRowIndex];
+                DataGridViewCell CurCell = CurRow.Cells[nColIndex];
 
-                if (Display)
+                decimal decWork = CommonMotions.cnvDecimal(CurCell.Value);
+                if (decWork < -999999999 || 999999999 < decWork)
                 {
-                    if (MessageBox.Show("•”��•Ê�o”[’ ƒf�[ƒ^‚ð�X�V‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚µ‚å‚¤‚©�H", "“o˜^Šm”F"
-                                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
+                    ChgBackColor(nRowIndex, CurCell, true);
+                    MessageBox.Show("‹àŠz‚Í-999,999,999�`999,999,999‚Ü‚Å‚Ì”ÍˆÍ‚Å‚·�B"
+                                    , "“ü—Í’lƒGƒ‰�["
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return;
                 }
+                // �”’l•Ò�W
+                CurCell.Value = decWork.ToString("#,0");
 
-                Cdd.connect(); Cdd.beginTran();
-
-                // ƒf�[ƒ^“o˜^
-                if (!EntCostDataOfDepartment(Cdd))
+                // ----- �”’lŒvŽZ
+                DispEventControl(false);
+                // �Á”ï�Å‚ðŽæ“¾‚·‚é
+                DateTime dtTarget = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.SendDate].Value);
+                if (dtTarget.Date == DateTime.MinValue.Date) dtTarget = DateTime.Today.Date;
+                double dTax = CommonMotions.AdaptationConsumptionTax(dtTarget) / 100.0;
+                DataGridViewCell CalcCell = null;
+                switch (nColIndex)
                 {
-                    Cdd.rollback();
-                    MessageBox.Show("•”��•Ê�o”[’ ƒf�[ƒ^“o˜^ƒGƒ‰�[‚Å‚·�B"
-                                        , "“ü—ÍƒGƒ‰�["
-                                        , MessageBoxButtons.OK
-                                        , MessageBoxIcon.Error);
-                    return false;
+                    case (int)DispColDetail.EntryPrice:     // 12:‹àŠz�i�Å”²�j
+                        CalcCell = CurRow.Cells[(int)DispColDetail.EntryTax];
+                        if (CommonMotions.cnvDecimal(CalcCell.Value) == 0)
+                            CalcCell.Value = CommonMotions.cnvRound((double)(decWork * (decimal)(1.0 + dTax))).ToString("#,0");
+                        break;
+                    case (int)DispColDetail.EntryTax:       // 13:‹àŠz�i�Å�ž�j
+                        CalcCell = CurRow.Cells[(int)DispColDetail.EntryPrice];
+                        if (CommonMotions.cnvDecimal(CalcCell.Value) == 0)
+                            CalcCell.Value = CommonMotions.cnvRound((double)(decWork / (decimal)(1.0 + dTax))).ToString("#,0");
+                        break;
                 }
+                DispEventControl(true);
 
-                Cdd.commit();
-
-                return true;
+                // �‡Œv•\Ž¦
+                ReCalcTotalRowType1Detail();
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
             finally
             {
-                Cdd.close(); Cdd = null;
+                DispEventControl(true);
             }
         }
         #endregion
 
-        #region Žw’è�s‚Íƒuƒ‰ƒ“ƒN‚©‚ðƒ`ƒFƒbƒN‚·‚é
+        #region ƒZƒ‹�F•Ï�X�ˆ—�
         /// <summary>
-        /// Žw’è�s‚Íƒuƒ‰ƒ“ƒN‚©‚ðƒ`ƒFƒbƒN‚·‚é
+        /// ƒZƒ‹�F•Ï�X�ˆ—�
         /// </summary>
-        /// <param name="CurRow"></param>
-        /// <returns></returns>
-        private bool RowBlankCheck(DataGridViewRow CurRow)
+        public void ChgBackColor(int nIdex ,DataGridViewCell CurCell, bool bError = false)
         {
             try
             {
-                DateTime dtDate1 = CommonMotions.cnvDate(CurRow.Cells[(int)DispColType2.DspCostDate].Value);
-                int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.RecSeqNo].Value);
-                string strSuppliersName = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.SuppliersName].Value);
-                string strPaymentContent = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.PaymentContent].Value);
-                int nSRType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.SRType].Value);
-                int nEntryPrice = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryPrice].Value);
-                int nEntryTax = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryTax].Value);
-                string strComent = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.Coment].Value);
+                DataGridViewRow CurRow = dgvMaster.Rows[nIdex];
+                // ƒGƒ‰�[�F�Eƒ��[ƒjƒ“ƒO�F
+                Color ErrorColor = Color.Red;
+                Color NormalColor = CurRow.Cells[0].Style.BackColor;
 
-                // ‹ó”’�s‚Í‘Î�ÛŠO
-                if (dtDate1.Date == DateTime.MinValue.Date
-                    && strSuppliersName.Length == 0 && strPaymentContent.Length == 0
-                    && nSRType == 0 && nEntryPrice == 0 && nEntryTax == 0
-                    && strComent.Length == 0) return true;
-
-                return false;
+                if (bError)
+                {
+                    CurCell.Style.BackColor = ErrorColor;
+                }
+                else
+                {
+                    CurCell.Style.BackColor = NormalColor;
+                }
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
         }
         #endregion
 
-        #region •”��•Ê�o”[’ ƒf�[ƒ^“o˜^�ˆ—�
+        #region ”NŒŽ“ú“ü—ÍŒã�ˆ—�
         /// <summary>
-        /// •”��•Ê�o”[’ ƒf�[ƒ^“o˜^�ˆ—�
+        /// ”NŒŽ“ú“ü—ÍŒã�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        private bool EntCostDataOfDepartment(IOCostDataOfDepartment Cdd)
+        private void InputDateChanged(object sender)
         {
+            // �I—¹Žž‚Í�ˆ—�‚µ‚È‚¢
+            if (ActiveControl == btnEnd) return;
+
+            DataGridViewCell cell = (DataGridViewCell)sender;
             try
             {
-                StringBuilder strSQL = new StringBuilder();
+                string txtbox = CommonMotions.cnvString(cell.Value);
+                // “ú•t‚ðyyyy/mm/ddŒ`Ž®‚Å•\Ž¦‚·‚é
+                if (txtbox.Length < 1) return;
 
-                int nDepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
-                int nConstrYear = (int)numUDConstPro.Value;
-                string strDepName = CommonMotions.cnvString(cmbDepartment.Text);
+                DateTime dtToday = DateTime.Today.Date;
 
-                DataGridViewEX dgv = dgvMaster;
-                List<CostDataOfDepartment> EntList = new List<CostDataOfDepartment>();
-                foreach (DataGridViewRow CurRow in dgv.Rows)
-                {
-                    // ‹ó”’�s‚Í‘Î�ÛŠO
-                    if (RowBlankCheck(CurRow)) continue;
-
-                    DateTime dtDate1 = CommonMotions.cnvDate(CurRow.Cells[(int)DispColType2.DspCostDate].Value);
-                    int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.RecSeqNo].Value);
-                    int strSuppliersCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.SuppliersCode].Value);
-                    string strSuppliersName = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.SuppliersName].Value);
-                    string strPaymentContent = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.PaymentContent].Value);
-                    int nSRType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.SRType].Value);
-                    int nEntryPrice = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryPrice].Value);
-                    int nEntryTax = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryTax].Value);
-                    string strComent = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.Coment].Value);
-
-                    CostDataOfDepartment EntRec = new CostDataOfDepartment();
-                    EntRec.DepartmentCode = nDepCode;           // •”��ƒR�[ƒh
-                    EntRec.ConstrYear = nConstrYear;            // �HŽ–Šú�”�E”N�”
-                    EntRec.CostDate = dtDate1;                  // ‘Î�Û“ú•t
-                    EntRec.SeqNo = nSeqNo;                      // ƒf�[ƒ^”Ô�†
-                    EntRec.DepartmentName = strDepName;         // •”��–¼
-                    EntRec.SuppliersCode = strSuppliersCode;    // Žx•¥�æƒR�[ƒh
-                    EntRec.SuppliersName = strSuppliersName;    // Žx•¥�æ–¼�Ì
-                    EntRec.PaymentContent = strPaymentContent;  // Žx•¥“à—e
-                    EntRec.SendReceiveFlg = nSRType;            // �o”[ƒtƒ‰ƒO
-                    EntRec.EntryPrice = nEntryPrice;            // ‹àŠz�i�Å”²�j
-                    EntRec.EntryTax = nEntryTax;                // ‹àŠz�i�Å�ž�j
-                    EntRec.Coment = strComent;                  // ”õ�l
-
-                    // ˜A”Ô‚ª–³‚¢�ê�‡‚ÍƒZƒbƒg‚·‚é
-                    if (EntRec.SeqNo < 1)
+                // •¶Žš‚Ì�oŒ»‰ñ�”ƒJƒEƒ“ƒg
+                if (CommonMotions.chkNumeric(txtbox))
+                {   // �”Žš‚Ì‚Ý“ü—Í
+                    if (txtbox.Length <= 4)
                     {
-                        strSQL.Clear();
-                        strSQL.Append(Cdd.CreatePrimarykeyString(EntRec.DepartmentCode, EntRec.ConstrYear));
-                        EntRec.SeqNo = Cdd.SelectMaxAddDataCount(strSQL.ToString(), false) + 1;
+                        txtbox = dtToday.Year.ToString()
+                                        + "/" + CommonMotions.cnvInt(txtbox.Substring(0, 2)).ToString("00")
+                                        + "/" + CommonMotions.cnvInt(txtbox.Substring(2)).ToString("00");
                     }
+                }
+                else
+                {   // 99/99‚Ì“ü—Í
+                    if (txtbox.Length <= 5)
+                    {
+                        txtbox = dtToday.Year.ToString()
+                                        + "/" + CommonMotions.cnvInt(txtbox.Substring(0, txtbox.IndexOf("/"))).ToString("00")
+                                        + "/" + CommonMotions.cnvInt(txtbox.Substring(txtbox.IndexOf("/") + 1)).ToString("00");
 
-                    // �s‚Ì�ó‘ÔŽæ“¾
-                    if (CurRow.Cells[(int)DispColType2.RowStatus].Value.ToString().Length < 1) continue;
-
-                    int nCurRowStat = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.RowStatus].Value);
-
-                    if ((int)DataRowState.Unchanged == nCurRowStat) continue;
-                    if ((int)DataRowState.Added == nCurRowStat)
-                    {
-                        // ’Ç‰Á“o˜^
-                        if (!Cdd.InsertAction(EntRec, false)) return false;
                     }
-                    else if ((int)DataRowState.Deleted == nCurRowStat)
-                    {
-                        // �í�œ“o˜^
-                        strSQL.Clear();
-                        strSQL.Append(Cdd.CreatePrimarykeyString(EntRec.DepartmentCode, EntRec.ConstrYear, EntRec.SeqNo));
-                        if (!Cdd.DeleteAction(strSQL.ToString(), false)) return false;
-                    }
-                    else if ((int)DataRowState.Modified == nCurRowStat)
-                    {
-                        // �X�V“o˜^
-                        strSQL.Clear();
-                        strSQL.Append(Cdd.CreatePrimarykeyString(EntRec.DepartmentCode, EntRec.ConstrYear, EntRec.SeqNo));
-                        if (!Cdd.UpdateAction(strSQL.ToString(), EntRec, false)) return false;
-                    }
                 }
 
-                return true;
+                cell.Value = CommonMotions.cnvDate(txtbox).ToShortDateString();
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
         }
         #endregion
 
-        #region ƒf�[ƒ^ƒ`ƒFƒbƒN
+        #region �s’Ç‰Á�ˆ—�
         /// <summary>
-        /// ƒf�[ƒ^ƒ`ƒFƒbƒN
+        /// �s’Ç‰Á�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        private bool DispFeildCheck()
+        private void DataLineAddProc()
         {
-            DataGridViewEX dgv = dgvMaster;
             try
             {
-                foreach (DataGridViewRow CurRow in dgv.Rows)
+                switch (m_DispStage)
                 {
-                    // �sƒtƒB�[ƒ‹ƒhƒ`ƒFƒbƒN
-                    if (!CheckRowField(CurRow)) return false;
+                    case (int)DispStageDef.Section:
+                        // ----- ˆê——
+                        switch (m_TargetType)
+                        {
+                            case (int)CostDataOfCompensation.TargetTypeDef.Construction:
+                                // �HŽ–ˆê——Žæ“¾�ˆ—�
+                                DispConstrDialog();
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+
+                    case (int)DispStageDef.Detail:
+                        // ----- –¾�×
+                        //
+                        CreateNewLine();
+                        break;
+
+                    default:
+                        break;
                 }
-
-                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
-            finally
-            {
-                dgv.CurrentCell = null;
-            }
         }
         #endregion
 
-        #region �sƒtƒB�[ƒ‹ƒhƒ`ƒFƒbƒN
+        #region �s’Ç‰Á�ˆ—�
         /// <summary>
-        /// �sƒtƒB�[ƒ‹ƒhƒ`ƒFƒbƒN
+        /// �s’Ç‰Á�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        private bool CheckRowField(DataGridViewRow CurRow)
+        private void CreateNewLine()
         {
             try
             {
-                // ƒtƒB�[ƒ‹ƒh�FƒNƒŠƒA
-                for (int i = 0; i < CurRow.Cells.Count; i++)
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[i], true);
-                }
+                DataGridView dgv = dgvMaster;
+                DataGridViewRow CurRow = dgv.CurrentRow;
+                int nIndex = CurRow.Index;
 
-                // ‹ó”’�s‚Í‘Î�ÛŠO
-                if (RowBlankCheck(CurRow)) return true;
+                DialogResult drRet = MessageBox.Show("Œ»�Ý�s‚Ì‰º‚É�s‚ð’Ç‰Á‚µ‚Ü‚·�B"
+                                , "�s’Ç‰ÁŠm”F"
+                                , MessageBoxButtons.OKCancel
+                                , MessageBoxIcon.Question);
+                if (drRet == DialogResult.Cancel) return;
 
-                DateTime dtDate1 = CommonMotions.cnvDate(CurRow.Cells[(int)DispColType2.DspCostDate].Value);
-                string strSuppliersName = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.SuppliersName].Value);
-                string strPaymentContent = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.PaymentContent].Value);
-                int nSRType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.SRType].Value);
-                int nEntryPrice = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryPrice].Value);
-                int nEntryTax = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryTax].Value);
-                string strComent = CommonMotions.cnvString(CurRow.Cells[(int)DispColType2.Coment].Value);
-
-                string strErrMsg = string.Empty;
-                // 0:•\Ž¦�o”[“ú
-                if (!Check01(dtDate1, CurRow, ref strErrMsg))
+                // ----- �s�ì�¬
+                // Œ»�Ý�s‚ª–³‚¢
+                if (nIndex == (dgv.RowCount - 1))
                 {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.DspCostDate], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
+                    // �Å�I�s
+                    nIndex = dgv.Rows.Add(1);
                 }
-
-                // 1:Žx•¥�æ–¼
-                if (!Check02(strSuppliersName, CurRow, ref strErrMsg))
+                else
                 {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.SuppliersName], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
+                    dgv.Rows.Insert(++nIndex, 1);
                 }
 
-                // 2:Žx•¥“à—e
-                if (!Check03(strPaymentContent, CurRow, ref strErrMsg))
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.PaymentContent], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
+                //�@•Ï�Xƒtƒ‰ƒOOn
+                m_bChengeAns = true;
 
-                // 5:�o”[‹æ•ªƒtƒ‰ƒO
-                if (!Check04(nSRType, CurRow, ref strErrMsg))
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.SRType], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // 7:‹àŠz�i�Å”²�j
-                if (!Check05(nEntryPrice, CurRow, ref strErrMsg))
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.EntryPrice], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // 8:‹àŠz�i�Å�ž�j
-                if (!Check06(nEntryTax, CurRow, ref strErrMsg))
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.EntryTax], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // 9:”õ�l
-                if (!Check07(strComent, CurRow, ref strErrMsg))
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.Coment], false);
-                    MessageBox.Show(strErrMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
         }
         #endregion
 
-        #region �o”[“úƒ`ƒFƒbƒN
+        #region �s�í�œ�ˆ—�
         /// <summary>
-        /// �o”[“úƒ`ƒFƒbƒN
+        /// �s�í�œ�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        private bool Check01(DateTime dtDate1, DataGridViewRow CurRow, ref string ErrorMsg)
+        private void DataLineDelProc()
         {
+            DataGridView dgv = dgvMaster;
+            DataGridViewRow CurRow = dgv.CurrentRow;
+            Color clrPrev = Color.White;
             try
             {
-                // 0:•\Ž¦�o”[“ú
-                // ”wŒi�F•Ï�X
-                if (dtDate1.Date == DateTime.MinValue.Date)
+                // –¾�×“ü—ÍˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (m_DispStage != (int)DispStageDef.Detail) return;
+
+                // “ü—Í�sˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.No].Value) < 1)
                 {
-                    ErrorMsg = "�³‚µ‚¢�o”[“ú‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B";
-                    return false;
+                    // “ü—Í’l‚ª‚ ‚ê‚ÎƒNƒŠƒA‚·‚é‚½‚ß�ˆ—�‘±�s
+                    if (CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.SendDate].Value).Date == DateTime.MinValue        // ‘Î�Û“ú•t
+                        && CommonMotions.cnvLong(CurRow.Cells[(int)DispColDetail.EntryPrice].Value) < 1                         // ‹àŠz�i�Å”²�j
+                        && CommonMotions.cnvLong(CurRow.Cells[(int)DispColDetail.EntryTax].Value) < 1                           // ‹àŠz�i�Å�ž�j
+                        && CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Content].Value).Length < 1                   // Žx•¥“à—e
+                        && CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Comment].Value).Length < 1)                  // ”õ�l
+                        return;
                 }
-                else
+
+                // �F‚ÌƒoƒbƒNƒAƒbƒv
+                clrPrev = CurRow.Cells[0].Style.BackColor;
+                // ‘I‘ð�s‚Ì�F‚ð•Ï‚¦‚é
+                for (int ix = (int)DispColDetail.No; ix < dgv.ColumnCount; ix++)
                 {
-                    // ŠúŽñ�EŠú––Žæ“¾
-                    DateTime dtStart = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value);
-                    DateTime dtComp = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, false);
-                    if (dtDate1.Date < dtStart || dtComp < dtDate1.Date)
+                    DataGridViewCell CurCell = CurRow.Cells[ix];
+                    CurCell.Style.BackColor = Color.Red;
+                    CurCell.Style.ForeColor = Color.White;
+                }
+
+                // ƒ�ƒbƒN�Ï‚Ýƒf�[ƒ^‚Í�ˆ—�‚µ‚È‚¢
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.DataLock].Value)
+                                == (int)CostDataOfCompensation.LockFlgDef.Locked)
+                {
+                    MessageBox.Show("‘I‘ð‚µ‚½�s‚Í�ˆ—��Ï‚Ý‚Å‚·�A\r\nƒ�ƒbƒN‚³‚ê‚Ä‚¢‚é‚Ì‚Å�í�œ�o—ˆ‚Ü‚¹‚ñ�B"
+                                        , "�í�œ•s‰Â"
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Information);
+                    return;
+                }
+
+                DialogResult dtRet = MessageBox.Show("‘I‘ð‚µ‚½�s‚ð�í�œ‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚µ‚å‚¤‚©�H"
+                                                        , "�í�œŠm”F"
+                                                        , MessageBoxButtons.OKCancel
+                                                        , MessageBoxIcon.Question);
+                if (dtRet == DialogResult.Cancel) return;
+
+                // �V‹K�s“™‚ÍƒNƒŠƒA‚·‚é
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.No].Value) < 1)
+                {
+                    foreach(DataGridViewCell CurCell in CurRow.Cells)
                     {
-                        ErrorMsg = "�o”[“ú‚ªŽw’è‚³‚ê‚Ä‚¢‚éŠúŠÔ“à‚Å‚Í‚ ‚è‚Ü‚¹‚ñ�B";
-                        return false;
+                        CurCell.Value = string.Empty;
                     }
+                    return;
                 }
-                return true;
+
+                // �í�œƒZƒbƒg
+                CurRow.Cells[(int)DispColDetail.RowState].Value = (int)DataRowState.Deleted;
+                // �s”ñ•\Ž¦
+                CurRow.Visible = false;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
-        }
-        #endregion
-
-        #region Žx•¥�æ–¼ƒ`ƒFƒbƒN
-        /// <summary>
-        /// Žx•¥�æ–¼ƒ`ƒFƒbƒN
-        /// </summary>
-        /// <returns></returns>
-        private bool Check02(string strSuppliersName, DataGridViewRow CurRow, ref string ErrorMsg)
-        {
-            try
+            finally
             {
-                // 1:Žx•¥�æ–¼
-                if (strSuppliersName.Length == 0)
+                // �‡Œv•\Ž¦
+                ReCalcTotalRowType1Detail();
+                // ‘I‘ð�s‚Ì�F‚ð–ß‚·
+                for (int ix = (int)DispColDetail.No; ix < dgv.ColumnCount; ix++)
                 {
-                    ErrorMsg = "Žx•¥�æ–¼‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B";
-                    return false;
+                    DataGridViewCell CurCell = CurRow.Cells[ix];
+                    CurCell.Style.BackColor = clrPrev;
+                    CurCell.Style.ForeColor = Color.Black;
                 }
-                else if (strSuppliersName.Length > 120)
-                {
-                    ErrorMsg = "Žx•¥�æ–¼‚ª’·‚·‚¬‚Å‚·�B";
-                    return false;
-                }
-
-                return true;
+                // ƒOƒŠƒbƒh‚É�s‚ð•\Ž¦ˆê”t‚ÉƒZƒbƒg‚·‚é
+                SetGridMaxRow();
             }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
         }
         #endregion
 
-        #region Žx•¥“à—eƒ`ƒFƒbƒN
+        #region �HŽ–ˆê——Žæ“¾�ˆ—�
         /// <summary>
-        /// Žx•¥“à—eƒ`ƒFƒbƒN
+        /// �HŽ–ˆê——Žæ“¾�ˆ—�
         /// </summary>
-        /// <returns></returns>
-        private bool Check03(string strPaymentContent, DataGridViewRow CurRow, ref string ErrorMsg)
+        private bool DispConstrDialog()
         {
+            FrmConstructionDiag frm = new FrmConstructionDiag();
             try
             {
-                // 2:Žx•¥“à—e
-                if (strPaymentContent.Length == 0)
-                {
-                    ErrorMsg = "Žx•¥“à—e‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B";
-                    return false;
-                }
-                else if (strPaymentContent.Length > 100)
-                {
-                    CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.PaymentContent], false);
-                    ErrorMsg = "Žx•¥“à—e‚ª’·‚·‚¬‚Å‚·�B";
-                    return false;
-                }
+                // �HŽ–’S“–ŽÒŒŸ�õ
+                frm.PersonCharge = (int)FrmConstructionDiag.PersonChargePoint.None;
+                frm.PersonCode = CommonMotions.LoginUserData.PersonCode;
+                frm.ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts;
+                frm.SelectType = (int)FrmConstructionDiag.SelectConstructionType.OwnOnGoing;
 
+                if (frm.ShowDialog() == DialogResult.Cancel) return false;
+
+                // �HŽ–ƒR�[ƒhƒZƒbƒg
+                m_TargetCode = frm.ConstructionCode;
+
+                // ŠK‘wƒJƒEƒ“ƒ^ƒAƒbƒv
+                m_DispStage++;
+
+                // ƒf�[ƒ^•\Ž¦
+                DataDisplay();
+
                 return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
                 return false;
             }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
         }
         #endregion
 
-        #region �o”[‹æ•ªƒtƒ‰ƒOƒ`ƒFƒbƒN
+        #region ƒf�[ƒ^ƒ`ƒFƒbƒN
         /// <summary>
-        /// �o”[‹æ•ªƒtƒ‰ƒOƒ`ƒFƒbƒN
+        /// ƒf�[ƒ^ƒ`ƒFƒbƒN
         /// </summary>
         /// <returns></returns>
-        private bool Check04(int nSRType, DataGridViewRow CurRow, ref string ErrorMsg)
+        private bool DataCheck()
         {
             try
             {
-                // 5:�o”[‹æ•ªƒtƒ‰ƒO
-                if (nSRType == 0)
+                decimal nNumYear = numUDConstPro.Value;
+                DateTime dtStart = CommonMotions.GetOpeningEndDate((int)nNumYear);
+                DateTime dtEnd = CommonMotions.GetOpeningEndDate((int)nNumYear, false);
+
+                bool bRet = true;
+                DataGridView dgv = dgvMaster;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
                 {
-                    ErrorMsg = "�o”[‹æ•ª‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B";
-                    return false;
+                    for (int ix = (int)DispColDetail.No; ix < dgv.ColumnCount; ix++)
+                    {
+                        DataGridViewCell CurCell = CurRow.Cells[ix];
+                        // ƒZƒ‹�³�í�F‚Ö
+                        ChgBackColor(CurRow.Index, CurCell);
+                    }
+
+                    int nTypeCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.CostType].Value);                  // Žx•¥ƒ^ƒCƒv
+                    DateTime dtSendDate = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.SendDate].Value);           // ‘Î�Û“ú•t
+                    int nFromCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.FromName].Value);                  // ‘ŠŽè�æ–¼�Ì
+                    string strFromName = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.FromName].Value);          // ‘ŠŽè�æ–¼�Ì
+                    decimal decEntryPrice = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColDetail.EntryPrice].Value);    // ‹àŠz�i�Å”²�j
+                    decimal decEntryTax = CommonMotions.cnvLong(CurRow.Cells[(int)DispColDetail.EntryTax].Value);           // ‹àŠz�i�Å�ž�j
+                    string strContent = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Content].Value);            // Žx•¥“à—e
+
+                    // �‡Œv�s‚Í‘Î�ÛŠO
+                    if (nTypeCode > 100) continue;
+
+                    // “ü—Í‚ª–³‚¢‚Æ‚±‚ë‚Í‘Î�ÛŠO
+                    if (dtSendDate.Date == DateTime.MinValue.Date
+                        && strFromName.Length < 1
+                        && decEntryPrice == 0
+                        && decEntryTax == 0
+                        && strContent.Length < 1) continue;
+
+                    // “ú•tƒ`ƒFƒbƒN
+                    if (dtSendDate.Date == DateTime.MinValue.Date)
+                    {
+                        SetErrorRowColor(CurRow.Index);
+                        MessageBox.Show("“ú•t‚Í•K�{“ü—Í‚Å‚·�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        bRet = false;
+                        break;
+                    }
+
+                    // “ú•t”ÍˆÍƒ`ƒFƒbƒN
+                    if (dtSendDate.Date < dtStart.Date || dtEnd.Date < dtSendDate.Date)
+                    {
+                        SetErrorRowColor(CurRow.Index);
+                        string strMsg = string.Format("“ú•t‚ª‘I‘ð{0}‚Ì”ÍˆÍŠO‚Å‚·�B", CommonMotions.GetYearTitle(false));
+                        MessageBox.Show(strMsg, "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        bRet = false;
+                        break;
+                    }
+
+                    // “à—eƒ`ƒFƒbƒN
+                    if (strContent.Length < 1)
+                    {
+                        SetErrorRowColor(CurRow.Index);
+                        MessageBox.Show("“à—e‚Í•K�{“ü—Í‚Å‚·�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        bRet = false;
+                        break;
+                    }
+
+                    // ‘ŠŽè�æƒ`ƒFƒbƒN�i•â“UˆÈŠO‚Åƒ`ƒFƒbƒN�j
+                    if (m_DispCost != (int)CostDataOfCompensation.CostTypeDef.Type1)
+                    {
+                        if (strFromName.Length < 1)
+                        {
+                            SetErrorRowColor(CurRow.Index);
+                            MessageBox.Show("‘ŠŽè�æ‚Í•K�{“ü—Í‚Å‚·�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            bRet = false;
+                            break;
+                        }
+                    }
+
+                    // ‹àŠzƒ`ƒFƒbƒN
+                    if (decEntryPrice == 0)
+                    {
+                        SetErrorRowColor(CurRow.Index);
+                        MessageBox.Show("‹àŠz‚Í•K�{“ü—Í‚Å‚·�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        bRet = false;
+                        break;
+                    }
+                    if (decEntryTax == 0)
+                    {
+                        SetErrorRowColor(CurRow.Index);
+                        MessageBox.Show("‹àŠz‚Í•K�{“ü—Í‚Å‚·�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        bRet = false;
+                        break;
+                    }
                 }
 
-                return true;
+                return bRet;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
                 return false;
@@ -1514,88 +1622,185 @@
         }
         #endregion
 
-        #region ‹àŠz�i�Å”²�jƒ`ƒFƒbƒN
+        #region �s‘S‘Ì‚ðƒGƒ‰�[�F‚É‚·‚é
         /// <summary>
-        /// ‹àŠz�i�Å”²�jƒ`ƒFƒbƒN
+        /// �s‘S‘Ì‚ðƒGƒ‰�[�F‚É‚·‚é
         /// </summary>
-        /// <returns></returns>
-        private bool Check05(int nEntryPrice, DataGridViewRow CurRow, ref string ErrorMsg)
+        private void SetErrorRowColor(int ErrorRowIndex)
         {
             try
             {
-                // 7:‹àŠz�i�Å”²�j
-                if (nEntryPrice == 0)
+                DataGridView dgv = dgvMaster;
+                DataGridViewRow CurRow = dgv.Rows[ErrorRowIndex];
+                for (int ix = (int)DispColDetail.No; ix < dgv.ColumnCount; ix++)
                 {
-                    ErrorMsg = "�Å”²‹àŠz‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B";
-                    return false;
+                    DataGridViewCell CurCell = CurRow.Cells[ix];
+                    // ƒZƒ‹ƒGƒ‰�[�F‚Ö
+                    ChgBackColor(CurRow.Index, CurCell, true);
                 }
-                else if (nEntryPrice > int.MaxValue)
-                {
-                    ErrorMsg = "�Å”²‹àŠz‚ª‘å‚«‚·‚¬‚Ü‚·�B";
-                    return false;
-                }
-
-                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
         }
         #endregion
 
-        #region ‹àŠz�i�Å�ž�jƒ`ƒFƒbƒN
+        #region ƒf�[ƒ^“o˜^ƒvƒ�ƒZƒX
         /// <summary>
-        /// ‹àŠz�i�Å�ž�jƒ`ƒFƒbƒN
+        /// ‘ä’ �ÄŒvŽZƒtƒ‰ƒO
         /// </summary>
+        private bool m_bLedger_ReCalc = false;
+        private int m_ProcConstrCode = 0;
+        /// <summary>
+        /// ƒf�[ƒ^“o˜^ƒvƒ�ƒZƒX
+        /// </summary>
         /// <returns></returns>
-        private bool Check06(int nEntryTax, DataGridViewRow CurRow, ref string ErrorMsg)
+        private bool DataEntryProcess()
         {
+            IOCostDataOfCompensation CostDB = new IOCostDataOfCompensation();
+            IOConstructionLedgerDetail ledgerDetail = new IOConstructionLedgerDetail();
+            IOConstructionLedgerExcute ledgerExcute = new IOConstructionLedgerExcute();
             try
             {
-                // 8:‹àŠz�i�Å�ž�j
-                if (nEntryTax == 0)
+                // ƒf�[ƒ^ƒ`ƒFƒbƒN
+                if (!DataCheck()) return false;
+
+                DataGridView dgv = dgvMaster;
+
+                CostDB.connect(); CostDB.beginTran();
+                ledgerDetail.connect(); ledgerDetail.beginTran();
+                ledgerExcute.connect(); ledgerExcute.beginTran();
+
+                // �í�œ�s‚Ì”»’è
+                DataGridViewRow[] DelRow = dgv.Rows.Cast<DataGridViewRow>()
+                                        .Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDetail.CostType].Value) < s_GridTotalCode
+                                                && CommonMotions.cnvInt(x.Cells[(int)DispColDetail.RowState].Value) == (int)DataRowState.Deleted)
+                                        .ToArray();
+
+                if (!DataEntryDeleted(CostDB, ledgerDetail, ledgerExcute, DelRow))
                 {
-                    ErrorMsg = "�Å�ž‹àŠz‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B";
+                    CostDB.rollback();
+                    ledgerDetail.rollback();
+                    ledgerExcute.rollback();
+
                     return false;
                 }
-                else if (nEntryTax > int.MaxValue)
+
+                // •Ï�X�s‚Ì”»’è
+                DataGridViewRow[] ChgRow = dgv.Rows.Cast<DataGridViewRow>()
+                                        .Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColDetail.CostType].Value) < s_GridTotalCode
+                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColDetail.RowState].Value) == (int)DataRowState.Modified)
+                                        .ToArray();
+                if (!DataEntryModified(CostDB, ledgerDetail, ledgerExcute, ChgRow))
                 {
-                    ErrorMsg = "�Å�ž‹àŠz‚ª‘å‚«‚·‚¬‚Ü‚·�B";
+                    CostDB.rollback();
+                    ledgerDetail.rollback();
+                    ledgerExcute.rollback();
+
                     return false;
                 }
 
+                // ‘ä’ �ÄŒvŽZ
+                if (m_bLedger_ReCalc)
+                {
+                    if (!LedgerReCalculate(ledgerExcute))
+                    {
+                        CostDB.rollback();
+                        ledgerDetail.rollback();
+                        ledgerExcute.rollback();
+
+                        return false;
+                    }
+                }
+
+
+                CostDB.commit();
+                ledgerDetail.commit();
+                ledgerExcute.commit();
+
                 return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
                 return false;
             }
+            finally
+            {
+                CostDB.close(); CostDB = null;
+                ledgerDetail.close(); ledgerDetail = null;
+                ledgerExcute.close(); ledgerExcute = null;
+            }
         }
         #endregion
 
-        #region ”õ�lƒ`ƒFƒbƒN
+        #region ƒf�[ƒ^•Ï�X�ˆ—�
         /// <summary>
-        /// ”õ�lƒ`ƒFƒbƒN
+        /// ƒf�[ƒ^•Ï�X�ˆ—�
         /// </summary>
         /// <returns></returns>
-        private bool Check07(string strComent, DataGridViewRow CurRow, ref string ErrorMsg)
+        private bool DataEntryModified(IOCostDataOfCompensation CostDB
+                                        , IOConstructionLedgerDetail ledgerDetail
+                                        , IOConstructionLedgerExcute ledgerExcute
+                                        , DataGridViewRow[] ChgRow)
         {
             try
             {
-                // 9:”õ�l
-                CommonMotions.chgBackColor(CurRow.Cells[(int)DispColType2.Coment], true);
-                if (strComent.Length > 100)
+                decimal nNumYear = numUDConstPro.Value;
+
+                List<CostDataOfCompensation> DataList = new List<CostDataOfCompensation>();
+                DataGridView dgv = dgvMaster;
+                foreach (DataGridViewRow CurRow in ChgRow)
                 {
-                    ErrorMsg = "”õ�l‚ª’·‚·‚¬‚Å‚·�B";
-                    return false;
+                    // “o˜^ƒŒƒR�[ƒhƒf�[ƒ^ƒZƒbƒg
+                    CostDataOfCompensation CurRec = new CostDataOfCompensation();
+                    CreateEntryRec(CostDB, CurRow, ref CurRec);
+
+                    StringBuilder strSQL = new StringBuilder();
+                    strSQL.Append(CostDB.CreatePrimarykeyString(CurRec.YearNumber
+                                                                , CurRec.CostType
+                                                                , CurRec.TargetType
+                                                                , CurRec.TargetCode
+                                                                , CurRec.SeqNo));
+                    // ƒf�[ƒ^‚ª‘¶�Ý‚·‚ê‚Î�X�V�A–³‚¯‚ê‚Î’Ç‰Á
+                    DataList.Clear();
+                    if (!CostDB.SelectAction(strSQL.ToString(), ref DataList, false)) continue;
+
+                    if (DataList.Count > 0)
+                    {
+                        if (!CostDB.UpdateAction(strSQL.ToString(), CurRec, false))
+                        {
+                            MessageBox.Show("•”���o”[ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                            , "�X�VƒGƒ‰�["
+                                            , MessageBoxButtons.OK
+                                            , MessageBoxIcon.Error);
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        if (!CostDB.InsertAction(CurRec, false))
+                        {
+                            MessageBox.Show("•”���o”[ƒf�[ƒ^�F“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                            , "“o˜^ƒGƒ‰�["
+                                            , MessageBoxButtons.OK
+                                            , MessageBoxIcon.Error);
+                            return false;
+                        }
+                    }
+
+                    // •â“U‚Ì�HŽ–ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                    if (m_DispCost == (int)CostDataOfCompensation.CostTypeDef.Type1
+                        && m_TargetType == (int)CostDataOfCompensation.TargetTypeDef.Construction)
+                    {
+                        // �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�X�V
+                        if (!ModifyLedgerProc(CurRow, ledgerDetail, ledgerExcute)) return false;
+                    }
                 }
-
                 return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
                 return false;
@@ -1603,49 +1808,55 @@
         }
         #endregion
 
-        #region ƒOƒŠƒbƒhƒ{ƒ^ƒ“ƒNƒŠƒbƒN�ˆ—�
+        #region “o˜^ƒŒƒR�[ƒhƒf�[ƒ^ƒZƒbƒg
         /// <summary>
-        /// ƒOƒŠƒbƒhƒ{ƒ^ƒ“ƒNƒŠƒbƒN�ˆ—�
+        /// “o˜^ƒŒƒR�[ƒhƒf�[ƒ^ƒZƒbƒg
         /// </summary>
-        private void GridButtonClick(object sender, DataGridViewCellEventArgs e)
+        private void CreateEntryRec(IOCostDataOfCompensation CostDB
+                                    , DataGridViewRow CurRow
+                                    , ref CostDataOfCompensation CurRec)
         {
             try
             {
-                DataGridViewEX dgv = (DataGridViewEX)sender;
-                DataGridViewRow dgvRow = dgv.CurrentRow;
+                decimal nNumYear = numUDConstPro.Value;
 
-                // ƒOƒŠƒbƒh‚ªREADONLY‚Í�ˆ—�‚µ‚È‚¢
-                if (dgv.ReadOnly) return;
-
-                string strCount = string.Empty;
-                int nPaymentTypeCnt = (int)DispColType2.SRType;
-                string strPaymentTypeNameCnt = string.Empty;
-                string[] strBtnVal = new string[2];
-                switch (e.ColumnIndex)
+                int nCostType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.CostType].Value);              // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                int nTargetType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.TargetType].Value);          // �æƒR�[ƒhƒ^ƒCƒv
+                int nTargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.TargetCode].Value);          // �æƒR�[ƒh
+                int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.SeqNo].Value);                    // ƒf�[ƒ^”Ô�†
+                int nPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.PersonCode].Value);          // ’S“–ŽÒƒR�[ƒh
+                int nFromCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.FromCode].Value);              // ‘ŠŽè�æƒR�[ƒh
+                switch (m_DispCost)
                 {
-                    case (int)DispColType2.SRButton1:
-                        // Žx•¥ƒ{ƒ^ƒ“
-                        nPaymentTypeCnt = (int)CostDataOfDepartment.SendReceiveFlgDef.Payment;
-                        strPaymentTypeNameCnt = s_SendReceiveName[(int)CostDataOfDepartment.SendReceiveFlgDef.Payment];
-                        strBtnVal[0] = s_SRTypeMark[0];
+                    case (int)CostDataOfCompensation.CostTypeDef.Type1:
+                        nFromCode = (int)CostDataOfCompensation.OwnCompany;
                         break;
-                    case (int)DispColType2.SRButton2:
-                        // Œ»‹à
-                        nPaymentTypeCnt = (int)CostDataOfDepartment.SendReceiveFlgDef.Revenue;
-                        strPaymentTypeNameCnt = s_SendReceiveName[(int)CostDataOfDepartment.SendReceiveFlgDef.Revenue];
-                        strBtnVal[1] = s_SRTypeMark[1];
-
-                        break;
                     default:
                         break;
                 }
-                dgvRow.Cells[(int)DispColType2.SRType].Value = nPaymentTypeCnt;
-                dgvRow.Cells[(int)DispColType2.SRNamne].Value = strPaymentTypeNameCnt;
-                dgvRow.Cells[(int)DispColType2.SRButton1].Value = strBtnVal[0];
-                dgvRow.Cells[(int)DispColType2.SRButton2].Value = strBtnVal[1];
 
+                nCostType = nCostType > 0 ? nCostType : m_DispCost;                                                 // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                nTargetType = nTargetType > 0 ? nTargetType : m_TargetType;                                         // �æƒR�[ƒhƒ^ƒCƒv
+                nTargetCode = nTargetCode > 0 ? nTargetCode : m_TargetCode;                                         // �æƒR�[ƒh
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(CostDB.CreatePrimarykeyString((int)nNumYear, m_DispCost, m_TargetType, nTargetCode));
+
+                CurRec.YearNumber = (int)nNumYear;                                                                  // ”N“x
+                CurRec.CostType = nCostType;                                                                        // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                CurRec.TargetType = nTargetType;                                                                    // �æƒR�[ƒhƒ^ƒCƒv
+                CurRec.TargetCode = nTargetCode;                                                                    // �æƒR�[ƒh
+                CurRec.SeqNo = nSeqNo > 0 ? nSeqNo : (CostDB.SelectMaxAddDataCount(strSQL.ToString(), false) + 1);  // ƒf�[ƒ^”Ô�†
+                CurRec.PersonCode = nPersonCode > 0 ? nPersonCode : CommonMotions.LoginUserData.PersonCode;         // �ì�¬ŽÒƒR�[ƒh
+                CurRec.FromCodeType = (int)CostDataOfCompensation.TargetTypeDef.Company;                            // ‘ŠŽè�æƒR�[ƒhƒ^ƒCƒv
+                CurRec.FromCode = nFromCode;                                                                        // ‘ŠŽè�æƒR�[ƒh
+                CurRec.SendDate = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.SendDate].Value).Date;      // ‘Î�Û“ú•t
+                CurRec.EntryPrice = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColDetail.EntryPrice].Value);    // ‹àŠz�i�Å”²�j
+                CurRec.EntryTax = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColDetail.EntryTax].Value);        // ‹àŠz�i�Å�ž�j
+                CurRec.Content = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Content].Value);           // Žx•¥“à—e
+                CurRec.BikoComment = CommonMotions.cnvString(CurRow.Cells[(int)DispColDetail.Comment].Value);       // ”õ�l
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
@@ -1652,39 +1863,55 @@
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�‡Œv�ˆ—�
+        #region ƒf�[ƒ^�í�œ�ˆ—�
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�‡Œv�ˆ—�
+        /// ƒf�[ƒ^�í�œ�ˆ—�
         /// </summary>
         /// <returns></returns>
-        private bool CalcDetialTotal()
+        private bool DataEntryDeleted(IOCostDataOfCompensation CostDB
+                                        , IOConstructionLedgerDetail ledgerDetail
+                                        , IOConstructionLedgerExcute ledgerExcute
+                                        , DataGridViewRow[] DelRow)
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                long lTotal1 = 0;
-                long lTotal2 = 0;
-                foreach (DataGridViewRow CurRow in dgv.Rows)
+                decimal nNumYear = numUDConstPro.Value;
+
+                DataGridView dgv = dgvMaster;
+                foreach (DataGridViewRow CurRow in DelRow)
                 {
-                    // ‹ó”’�s‚Í‘Î�ÛŠO
-                    if (RowBlankCheck(CurRow)) continue;
-                    // ”ñ•\Ž¦�s‚Í‘Î�ÛŠO
-                    if (!CurRow.Visible) continue;
+                    int nCostType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.CostType].Value);              // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                    int nTargetType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.TargetType].Value);          // �æƒR�[ƒhƒ^ƒCƒv
+                    int nTargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.TargetCode].Value);          // �æƒR�[ƒh
+                    int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.SeqNo].Value);                    // ƒf�[ƒ^”Ô�†
+                    DateTime dtExec = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.Before_SendDate].Value);    // “ú•t
 
-                    int nSRType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.SRType].Value);
-                    int nEntryPrice = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryPrice].Value);
-                    int nEntryTax = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.EntryTax].Value);
+                    StringBuilder strSQL = new StringBuilder();
+                    strSQL.Append(CostDB.CreatePrimarykeyString((int)nNumYear, nCostType, nTargetType, nTargetCode, nSeqNo));
 
-                    lTotal1 += (nEntryPrice * nSRType);
-                    lTotal2 += (nEntryTax * nSRType);
+                    if (!CostDB.DeleteAction(strSQL.ToString(), false))
+                    {
+                        MessageBox.Show("•”���o”[ƒf�[ƒ^�F�í�œ‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "�í�œƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
+                    }
 
+                    // “Ç�žŽž‚Ì“ú•t‚ª–³‚¢�ê�‡‚Íƒf�[ƒ^‚ª–³‚¢‚Ì‚ÅˆÈ‰º‚ð�ˆ—�‚µ‚È‚¢
+                    if (dtExec.Date == DateTime.MinValue) continue;
+
+                    // •â“U‚Ì�HŽ–ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                    if (nCostType == (int)CostDataOfCompensation.CostTypeDef.Type1
+                        && nTargetType == (int)CostDataOfCompensation.TargetTypeDef.Construction)
+                    {
+                        // �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�í�œ
+                        if (!DeleteLedgerProc(CurRow, ledgerDetail, ledgerExcute)) return false;
+                    }
                 }
-                label8.Text = lTotal1.ToString("#,0");
-                label9.Text = lTotal2.ToString("#,0");
-
                 return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
                 return false;
@@ -1692,276 +1919,236 @@
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�Å‹àŠzŒvŽZ�ˆ—�
+        #region �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�í�œ
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�Å‹àŠzŒvŽZ�ˆ—�
+        /// �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�í�œ
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void CalcGridDetailField(object sender, DataGridViewCellEventArgs e)
+        /// <returns></returns>
+        private bool DeleteLedgerProc(DataGridViewRow CurRow
+                                    ,IOConstructionLedgerDetail ledgerDetail
+                                    ,IOConstructionLedgerExcute ledgerExcute)
         {
             try
             {
-                DataGridViewEX dgv = (DataGridViewEX)sender;
-                DataGridViewRow CurRow = dgv.CurrentRow;
-                DataGridViewCell CurCell = dgv.CurrentCell;
+                int DataCount = 0;
+                // �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�í�œ
+                if (!DeleteLedgerExcute(CurRow, ledgerExcute, ref DataCount)) return false;
 
-                double CurValue = 0;
-                double CalcValue = 0;
-                switch (e.ColumnIndex)
-                {
-                    case (int)DispColType2.DspCostDate:
-                        // “ú•t‚Ì�Ý’è
-                        FormatDate(sender);
-                        break;
+                // �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^‚É‘¼‚ÌƒŒƒR�[ƒh‚ª‚ ‚ê‚Î�ˆ—��I—¹
+                if (DataCount > 0) return true;
 
-                    case (int)DispColType2.EntryPrice:
-                        CurValue = CommonMotions.cnvInt(CurCell.Value);
-                        // �Å”²Žx•¥‹àŠz
-                        CurCell.Value = CommonMotions.cnvInt(CurCell.Value).ToString("#,#");
-                        CalcValue = CommonMotions.cnvRound(CurValue * (1.00 + (CommonMotions.AdaptationConsumptionTax(DateTime.Now) / 100.0)));
-                        CurRow.Cells[(int)DispColType2.EntryTax].Value = CalcValue.ToString("#,#");
-                        m_bChengeAns = true;
-                        // �‡Œv‚ð•\Ž¦‚·‚é
-                        CalcDetialTotal();
-                        break;
+                // �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^‚Éƒf�[ƒ^‚ª‘¶�Ý‚µ‚È‚¯‚ê‚Î�HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^‚ð�í�œ‚·‚é
+                if (!DeleteLedgerDetail(CurRow, ledgerDetail)) return false;
 
-                    case (int)DispColType2.EntryTax:
-                        CurValue = CommonMotions.cnvInt(CurCell.Value);
-                        // �Å�žŽx•¥‹àŠz
-                        CurCell.Value = CommonMotions.cnvInt(CurCell.Value).ToString("#,#");
-                        CalcValue = CommonMotions.cnvRound(CurValue / (1.00 + (CommonMotions.AdaptationConsumptionTax(DateTime.Now) / 100.0)));
-                        CurRow.Cells[(int)DispColType2.EntryPrice].Value = CalcValue.ToString("#,#");
-                        m_bChengeAns = true;
-                        // �‡Œv‚ð•\Ž¦‚·‚é
-                        CalcDetialTotal();
-                        break;
-                    default:
-                        break;
-                }
+                return true;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
 
-        #region “ü—Í“ú•t‚Ì•Ò�W
+        #region �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�í�œ
         /// <summary>
-        /// “ü—Í“ú•t‚Ì•Ò�W
+        /// �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�í�œ
         /// </summary>
-        /// <param name="sender"></param>
-        private void FormatDate(object sender)
+        private bool DeleteLedgerExcute(DataGridViewRow CurRow
+                                    , IOConstructionLedgerExcute ledgerExcute
+                                    , ref int DataCount)
         {
             try
             {
-                DataGridViewEX dgv = (DataGridViewEX)sender;
-                DataGridViewRow CurRow = dgv.CurrentRow;
-                DataGridViewCell CurCell = dgv.CurrentCell;
+                int nTargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.TargetCode].Value);          // �æƒR�[ƒh
+                DateTime dtExec = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.Before_SendDate].Value);    // “ú•t
 
-                DateTime dtToday = DateTime.Today;
-                string strCurCell = CommonMotions.cnvString(CurCell.Value);
-                // •¶Žš‚Ì�oŒ»‰ñ�”ƒJƒEƒ“ƒg
-                if (CommonMotions.chkNumeric(strCurCell))
-                {   // �”Žš‚Ì‚Ý“ü—Í
-                    if (strCurCell.Length < 1) { }
-                    else if (strCurCell.Length <= 4)
-                    {
-                        CurCell.Value = dtToday.Year.ToString()
-                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(0, 2)).ToString("00")
-                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(2)).ToString("00");
-                    }
-                }
-                else
+                // ‘Î�ÛƒJƒ‰ƒ€�”Žæ“¾
+                int nCol = ClsChangeLedgerData.CalcTargetMonthToColumn(ledgerExcute, false, nTargetCode, dtExec);
+                StringBuilder strSQL = new StringBuilder();
+                // ----- �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^‚Ì�í�œ
+                strSQL.Append(ledgerExcute.CreatePrimarykeyString(nTargetCode
+                                                                    , (int)ConstructionLedgerDetail.GroupCountDef.Compensation
+                                                                    , 0
+                                                                    , nCol));
+                List<ConstructionLedgerExcute> ExcuteList = new List<ConstructionLedgerExcute>();
+                // �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^‚ª‘¶�Ý‚·‚ê‚Î�í�œ‚·‚é
+                if (ledgerExcute.SelectAction(strSQL.ToString(), ref ExcuteList, false) && ExcuteList.Count > 0)
                 {
-                    if (strCurCell.Length < 1) { }
-                    else if (strCurCell.ToString().Length <= 5)
-                    {   // 99/99‚Ì“ü—Í
-                        CurCell.Value = dtToday.Year.ToString()
-                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(0, strCurCell.IndexOf("/"))).ToString("00")
-                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(strCurCell.IndexOf("/") + 1)).ToString("00");
+                    // ƒf�[ƒ^�í�œ
+                    strSQL.Clear();
+                    strSQL.Append(ledgerExcute.CreatePrimarykeyString(ExcuteList[0].ConstructionCode
+                                                                        , ExcuteList[0].GroupCount
+                                                                        , ExcuteList[0].LineCount
+                                                                        , ExcuteList[0].ColumnCount));
 
+                    if (!ledgerExcute.DeleteAction(strSQL.ToString(), false))
+                    {
+                        MessageBox.Show("�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�F�í�œ‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "�í�œƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
 
-        #region  •Ò�Wƒtƒ‰ƒOON
-        /// <summary>
-        /// •Ò�Wƒtƒ‰ƒOON
-        /// </summary>
-        private void SetModifyFlg(object sender, DataGridViewCellEventArgs e)
-        {
-            try
-            {
-                DataGridViewEX dgv = dgvMaster;
-                int nRowIndex = e.RowIndex;
-                if (nRowIndex < 0) return;
-                if (dgv.Rows[nRowIndex] == null) return;
+                // �ˆ—�Œã‚ÌŽÀ�sƒf�[ƒ^ƒŒƒR�[ƒh�”‚ðŽæ“¾‚·‚é
+                ExcuteList.Clear();
+                strSQL.Clear();
+                strSQL.Append(ledgerExcute.CreatePrimarykeyString(nTargetCode
+                                                                , (int)ConstructionLedgerDetail.GroupCountDef.Compensation));
+                ledgerExcute.SelectAction(strSQL.ToString(), ref ExcuteList, false);
+                DataCount = ExcuteList.Count;
 
-                DataGridViewRow CurRow = dgv.Rows[nRowIndex];
-                int nRowStat = CommonMotions.cnvInt(CurRow.Cells[(int)DispColType2.RowStatus].Value);
-                if (nRowStat == 0)
-                {
-                    CurRow.Cells[(int)DispColType2.RowStatus].Value = (int)DataRowState.Added;
-                }
-                else if (nRowStat == (int)DataRowState.Unchanged)
-                {
-                    CurRow.Cells[(int)DispColType2.RowStatus].Value = (int)DataRowState.Modified;
-                }
+                // ‘ä’ �ÄŒvŽZ
+                m_bLedger_ReCalc = true;
+                m_ProcConstrCode = nTargetCode;
 
-                m_bChengeAns = true;
+                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
 
-        #region ‰EƒNƒŠƒbƒNƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[•\Ž¦
+        #region �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�í�œ
         /// <summary>
-        /// ‰EƒNƒŠƒbƒNƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[•\Ž¦
+        /// �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�í�œ
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_ContextMenu(object sender, DataGridViewCellMouseEventArgs e)
+        /// <returns></returns>
+        private bool DeleteLedgerDetail(DataGridViewRow CurRow
+                                    , IOConstructionLedgerDetail ledgerDetail)
         {
             try
             {
-                DataGridView dgv = dgvMaster;
-                int idx = dgv.CurrentCell.RowIndex;
+                int nTargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColDetail.TargetCode].Value);          // �æƒR�[ƒh
 
-                // �Å�I�s‚Í’Ç‰Á—L
-                int nLastRow = (int)ConMenuNo.ExecOnceAdd * 2;
-                if (idx == (dgv.RowCount - 1))
+                StringBuilder strSQL = new StringBuilder();
+                // ----- �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^‚Ì�í�œ
+                strSQL.Append(ledgerDetail.CreatePrimarykeyString(nTargetCode
+                                                                    , (int)ConstructionLedgerDetail.GroupCountDef.Compensation));
+                List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
+                // �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^‚ª‘¶�Ý‚·‚ê‚Î�í�œ‚·‚é
+                if (ledgerDetail.SelectAction(strSQL.ToString(), ref DetailList, false) && DetailList.Count > 0)
                 {
-                    m_ExecMenuStrip.Items[nLastRow].Enabled = true;
+                    if (!ledgerDetail.DeleteAction(strSQL.ToString(), false))
+                    {
+                        MessageBox.Show("�HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�F�í�œ‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "�í�œƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
+                    }
                 }
-                else
-                {
-                    m_ExecMenuStrip.Items[nLastRow].Enabled = false;
-                }
-                //ƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[‚ð•\Ž¦‚·‚é
-                m_ExecMenuStrip.Show();
-                //ƒ}ƒEƒXƒJ�[ƒ\ƒ‹‚ÌˆÊ’u‚ð‰æ–Ê�À•W‚ÅŽæ“¾
-                Point p = Control.MousePosition;
-                m_ExecMenuStrip.Top = p.Y;
-                m_ExecMenuStrip.Left = p.X;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�FƒRƒs�[
-        /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�FƒRƒs�[
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GridRowCopyExecute(object sender, EventArgs e)
-        {
-            try
-            {
-                DataGridViewEX dgv = dgvMaster;
-                if (dgv.CurrentRow == null) return;
+                // ‘ä’ �ÄŒvŽZ
+                m_bLedger_ReCalc = true;
+                m_ProcConstrCode = nTargetCode;
 
-                // –¾�×ƒOƒŠƒbƒhƒRƒs�[�ˆ—�
-                dgv.RowCopyAction();
+                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�F“\‚è•t‚¯
+        #region �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�X�V
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�F“\‚è•t‚¯
+        /// �HŽ–�Ú�×‘ä’ ƒf�[ƒ^�X�V
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GridRowPasteExecute(object sender, EventArgs e)
+        /// <returns></returns>
+        private bool ModifyLedgerProc(DataGridViewRow CurRow
+                                    , IOConstructionLedgerDetail ledgerDetail
+                                    , IOConstructionLedgerExcute ledgerExcute)
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                if (dgv.CurrentRow == null) return;
+                // �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�X�V
+                if (!ModifyLedgerDetail(CurRow, ledgerDetail)) return false;
 
-                // –¾�×ƒOƒŠƒbƒh“\‚è•t‚¯�ˆ—�
-                dgv.RowPasteAction(true);
+                // �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�X�V
+                if (!ModifyLedgerExcute(CurRow, ledgerExcute)) return false;
 
-                // •Ï�Xƒtƒ‰ƒOON
-                m_bChengeAns = true;
+                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�F�s�í�œ
+        #region �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�X�V
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�F�s�í�œ
+        /// �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�X�V
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GridRowRemoveExecute(object sender, EventArgs e)
+        /// <returns></returns>
+        private bool ModifyLedgerDetail(DataGridViewRow CurRow
+                                    , IOConstructionLedgerDetail ledgerDetail)
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                if (dgv.CurrentRow == null) return;
+                int nTargetCode = m_TargetCode;
 
-                int nRowStat = CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispColType2.RowStatus].Value);
-                if (nRowStat == (int)DataRowState.Unchanged) return;
-
-                if (nRowStat != (int)DataRowState.Added)
+                StringBuilder strSQL = new StringBuilder();
+                // ----- �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^‚Ì�X�V
+                strSQL.Append(ledgerDetail.CreatePrimarykeyString(nTargetCode
+                                                                    , (int)ConstructionLedgerDetail.GroupCountDef.Compensation));
+                List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
+                // �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^‚ª‘¶�Ý‚µ‚È‚¯‚ê‚Î�ì�¬‚·‚é
+                if (ledgerDetail.SelectAction(strSQL.ToString(), ref DetailList, false) && DetailList.Count < 1)
                 {
-                    dgv.CurrentRow.Cells[(int)DispColType2.RowStatus].Value = (int)DataRowState.Deleted;
+                    ConstructionLedgerDetail DetailRec = new ConstructionLedgerDetail();
+                    // �HŽ–�Ú�×‘ä’ ƒf�[ƒ^ƒZƒbƒg
+                    SetDetailRec(CurRow, ref DetailRec);
+                    if (!ledgerDetail.InsertAction(DetailRec, false))
+                    {
+                        MessageBox.Show("�HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^�F�ì�¬‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "�ì�¬ƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
+                    }
                 }
 
-                // –¾�×ƒOƒŠƒbƒh”ñ•\Ž¦
-                dgv.CurrentRow.Visible = false;
+                // ‘ä’ �ÄŒvŽZ
+                m_bLedger_ReCalc = true;
+                m_ProcConstrCode = nTargetCode;
 
-                // •Ï�Xƒtƒ‰ƒOON
-                m_bChengeAns = true;
+                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�F�s‘}“ü
+        #region �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^ƒZƒbƒg
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�F�s‘}“ü
+        /// �HŽ–�Ú�×‘ä’ –¾�×ƒf�[ƒ^ƒZƒbƒg
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GridRowInsertExecute(object sender, EventArgs e)
+        private void SetDetailRec(DataGridViewRow CurRow, ref ConstructionLedgerDetail NewRec)
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                if (dgv.CurrentRow == null) return;
+                int nTargetCode = m_TargetCode;
+                CostDataType CurRec = m_DataTypeList.Where(x => x.CostType == (int)CostDataOfCompensation.CostTypeDef.Type1
+                                                && x.TargetType == 0).First();
 
-                // –¾�×ƒOƒŠƒbƒh‘}“ü�ˆ—�
-                dgv.RowInsertAction();
-
-                dgv.CurrentRow.Cells[(int)DispColType2.RowStatus].Value = (int)DataRowState.Added;
+                NewRec.ConstructionCode = nTargetCode;                                                              // �HŽ–”Ô�†
+                NewRec.GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.Compensation;                       // ƒOƒ‹�[ƒv”Ô�†
+                NewRec.FirstString = string.Format("{0}�@‹à�@Šz", CurRec.CostDataTypeName);                         // �€–Ú–¼�Ì
+                NewRec.FixDataFlg = 1;                                                                              // ŒÅ’èƒf�[ƒ^ƒtƒ‰ƒO
+                NewRec.SourceCode = nTargetCode;                                                                    // Œ³�HŽ–”Ô�†
             }
             catch (System.Exception ex)
             {
@@ -1970,101 +2157,120 @@
         }
         #endregion
 
-        #region –¾�×ƒOƒŠƒbƒh�F�s’Ç‰Á
+        #region �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�X�V
         /// <summary>
-        /// –¾�×ƒOƒŠƒbƒh�F�s’Ç‰Á
+        /// �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�X�V
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GridRowAddExecute(object sender, EventArgs e)
+        private bool ModifyLedgerExcute(DataGridViewRow CurRow
+                                    , IOConstructionLedgerExcute ledgerExcute)
         {
             try
             {
-                DataGridViewEX dgv = dgvMaster;
-                if (dgv.CurrentRow == null) return;
+                int nTargetCode = m_TargetCode;
 
-                // –¾�×ƒOƒŠƒbƒh’Ç‰Á�ˆ—�
-                dgv.RowAddAction();
+                DateTime dtWork1 = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.Before_SendDate].Value);
+                DateTime dtWork2 = CommonMotions.cnvDate(CurRow.Cells[(int)DispColDetail.SendDate].Value);
+                DateTime dtExec = dtWork1 != DateTime.MinValue ? dtWork1 : dtWork2;                                 // “ú•t
 
-                dgv.Rows[(dgv.RowCount - 1)].Cells[(int)DispColType2.RowStatus].Value = (int)DataRowState.Added;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
+                double dPaymentAmount = CommonMotions.cnvDouble(CurRow.Cells[(int)DispColDetail.EntryPrice].Value);
+                dPaymentAmount *= -1;
 
-        #region ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒNŒã�ˆ—�
-        /// <summary>
-        /// ƒZƒ‹ƒ_ƒuƒ‹ƒNƒŠƒbƒNŒã�ˆ—�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void CellDoubleClickProc(object sender, DataGridViewCellEventArgs e)
-        {
-            try
-            {
-                DataGridViewEX dgv = (DataGridViewEX)sender;
+                if (dtExec.Date == DateTime.MinValue) return true;
 
-                switch (e.ColumnIndex)
+                // ‘Î�ÛƒJƒ‰ƒ€�”Žæ“¾
+                int nCol = ClsChangeLedgerData.CalcTargetMonthToColumn(ledgerExcute, false, nTargetCode, dtExec);
+                StringBuilder strSQL = new StringBuilder();
+                // ----- �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^‚Ì�X�V
+                strSQL.Append(ledgerExcute.CreatePrimarykeyString(nTargetCode
+                                                                    , (int)ConstructionLedgerDetail.GroupCountDef.Compensation
+                                                                    , 0
+                                                                    , nCol));
+
+                                // �HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^‚ª‘¶�Ý‚·‚ê‚Î�X�V�A–³‚¯‚ê‚Î’Ç‰Á‚·‚é
+                List<ConstructionLedgerExcute> ExcuteList = new List<ConstructionLedgerExcute>();
+                if (ledgerExcute.SelectAction(strSQL.ToString(), ref ExcuteList, false) && ExcuteList.Count > 0)
                 {
-                    case (int)DispColType2.SuppliersName:
-                        //  3:Žx•¥�æ–¼
-                        ShowSubConstructorDiag();
-                        break;
-                        
-                    default:
-                        break;
+                    // ƒf�[ƒ^�X�V
+                    strSQL.Clear();
+                    strSQL.Append(ledgerExcute.CreatePrimarykeyString(ExcuteList[0].ConstructionCode
+                                                                        , ExcuteList[0].GroupCount
+                                                                        , ExcuteList[0].LineCount
+                                                                        , ExcuteList[0].ColumnCount));
+
+                    ExcuteList[0].PaymentAmount = dPaymentAmount;       // Žx•¥‹àŠz
+                    ExcuteList[0].TargetMonth = dtWork2;                // ‘Î�Û”NŒŽ
+
+                    if (!ledgerExcute.UpdateAction(strSQL.ToString(), ExcuteList[0], false))
+                    {
+                        MessageBox.Show("�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "�X�VƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
+                    }
                 }
+                else
+                {
+                    ConstructionLedgerExcute NewRec = new ConstructionLedgerExcute();
+                    NewRec.ConstructionCode = nTargetCode;                                          // �HŽ–”Ô�†
+                    NewRec.GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.Compensation;   // ƒOƒ‹�[ƒv”Ô�†
+                    NewRec.ColumnCount = nCol;                                                      // —ñ”Ô�†
+                    NewRec.PaymentAmount = dPaymentAmount;                                          // Žx•¥‹àŠz
+                    NewRec.TargetMonth = dtExec;                                                    // ‘Î�Û”NŒŽ
+                    if (!ledgerExcute.InsertAction(NewRec, false))
+                    {
+                        MessageBox.Show("�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�F�ì�¬‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "�ì�¬ƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
+                    }
+
+                }
+
+                // ‘ä’ �ÄŒvŽZ
+                m_bLedger_ReCalc = true;
+                m_ProcConstrCode = nTargetCode;
+
+                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
 
-        #region ‹¦—Í‰ïŽÐ‘I‘ðƒ_ƒCƒAƒ�ƒO•\Ž¦
+        #region �HŽ–‘ä’ ‚ð�ÄŒvŽZ‚·‚é
         /// <summary>
-        /// ‹¦—Í‰ïŽÐ‘I‘ðƒ_ƒCƒAƒ�ƒO•\Ž¦
+        /// �HŽ–‘ä’ ‚ð�ÄŒvŽZ‚·‚é
         /// </summary>
-        private void ShowSubConstructorDiag()
+        /// <param name="ProcConstrCode"></param>
+        private bool LedgerReCalculate(IOConstructionLedgerExcute ExcuteDB)
         {
-            FrmSubContractorDiag frm = new FrmSubContractorDiag();
             try
             {
-                DataGridViewEX dgv = dgvMaster;
+                List<int> CodeList = new List<int>();
+                CodeList.Add(m_ProcConstrCode);
 
-                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.DepartmentCost;
-                //frm.ShowInTaskbar = false;
-                frm.ShowDialog();
-                if (frm.EndButton != System.Windows.Forms.DialogResult.OK) return;
+                if(!ClsChangeLedgerData.LedgerRecalculate(ExcuteDB, CodeList))
+                {
 
-                SubContractorMaster selRec = frm.SelectData;
-                if (dgv.GetCellCount(DataGridViewElementStates.Selected) == 1)
-                {
-                    dgv.CurrentRow.Cells[(int)DispColType2.SuppliersCode].Value = selRec.CompanyCode;
-                    dgv.CurrentRow.Cells[(int)DispColType2.SuppliersName].Value = selRec.CompanyName;
+                    MessageBox.Show("�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^�F�ÄŒvŽZ‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                    , "�ÄŒvŽZƒGƒ‰�["
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return false;
                 }
-                else
-                {
-                    foreach (DataGridViewCell r in dgv.SelectedCells)
-                    {
-                        dgv.Rows[r.RowIndex].Cells[(int)DispColType2.SuppliersCode].Value = selRec.CompanyCode;
-                        dgv.Rows[r.RowIndex].Cells[(int)DispColType2.SuppliersName].Value = selRec.CompanyName;
-                    }
-                }
-                m_bChengeAns = true;
+
+                return true;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
-            finally
-            {
-                frm.Dispose(); frm = null;
-            }
         }
         #endregion
     }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/ProcessControl.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/ProcessControl.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/ProcessControl.cs	(revision 483)
@@ -0,0 +1,1670 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.Linq;
+using System.Diagnostics;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.SubForms;
+using ProcessManagement.Forms.Master;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmDepCost
+    {
+        #region è‡ªãƒ—ãƒ­ã‚»ã‚¹ã�®ç•ªå�·
+        /// <summary>
+        /// è‡ªãƒ—ãƒ­ã‚»ã‚¹ã�®ç•ªå�·ã‚’æŒ�ã�¤
+        /// </summary>
+        private static int s_CurrentProcessNo = (int)ClsExcute.ProcessExecuteNo.DepartmentCost;
+        #endregion
+
+        #region ãƒ—ãƒ­ã‚»ã‚¹ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ¼å¤‰æ•°
+        /// <summary>
+        /// ãƒ—ãƒ­ã‚»ã‚¹ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ¼
+        /// </summary>
+        private ContextMenuStrip m_ProcessContextMenuStrip = new ContextMenuStrip();
+        #endregion
+
+        #region åˆ¥ãƒ—ãƒ­ã‚»ã‚¹ç§»å‹•ãƒ¡ãƒ‹ãƒ¥ãƒ¼ä½œæˆ�
+        /// <summary>
+        /// åˆ¥ãƒ—ãƒ­ã‚»ã‚¹ç§»å‹•ãƒ¡ãƒ‹ãƒ¥ãƒ¼ä½œæˆ�
+        /// </summary>
+        private void CreateProcessContextMenu(bool bSubForm)
+        {
+            try
+            {
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�®ã‚»ãƒƒãƒˆ
+                UpDateProcessContextMenu(bSubForm);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region åˆ¥ãƒ—ãƒ­ã‚»ã‚¹ç§»å‹•ãƒ¡ãƒ‹ãƒ¥ãƒ¼æ›´æ–°
+        /// <summary>
+        /// åˆ¥ãƒ—ãƒ­ã‚»ã‚¹ç§»å‹•ãƒ¡ãƒ‹ãƒ¥ãƒ¼æ›´æ–°
+        /// </summary>
+        private void UpDateProcessContextMenu(bool bSubForm = false)
+        {
+            try
+            {
+                // èµ·å‹•ãƒ—ãƒ­ã‚»ã‚¹ã�®ä¸€æ¡ˆã‚’ä½œæˆ�ã�™ã‚‹
+                List<KeyValuePair<int, string>> ProcList = new List<KeyValuePair<int, string>>();
+                // å·¥äº‹ç•ªå�·ã‚»ãƒƒãƒˆ
+                ClsProcessExist.ConstructionCode = m_ConstructionCode;
+                // ãƒªã‚¹ãƒˆå�–å¾—
+                ClsProcessExist.GetProcessList(ref ProcList, s_CurrentProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ä¸€è¦§ã‚’ä½œæˆ�ã�™ã‚‹
+                m_ProcessContextMenuStrip.Items.Clear();
+
+                // 1éšŽå±¤ç›®ã�®ã‚»ãƒƒãƒˆ
+                m_ProcessContextMenuStrip.Items.Add(new ToolStripMenuItem("ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹", null, ProcessExecute_MainMenu));
+                ToolStripMenuItem tsi1 = new ToolStripMenuItem();
+                tsi1.Text = "å�—æ³¨ç®¡ç�†";
+                m_ProcessContextMenuStrip.Items.Add(tsi1);
+                ToolStripMenuItem tsi2 = new ToolStripMenuItem();
+                tsi2.Text = "æ–½å·¥ç®¡ç�†";
+                m_ProcessContextMenuStrip.Items.Add(tsi2);
+                ToolStripMenuItem tsi3 = new ToolStripMenuItem();
+                tsi3.Text = "æ¥­å‹™ç®¡ç�†";
+                m_ProcessContextMenuStrip.Items.Add(tsi3);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒ‡ãƒ¼ã‚¿ã�®ã‚»ãƒƒãƒˆ
+                bool[] bFirst = new bool[] { false, false, false };
+                for (int ix=1;ix< ProcList.Count;ix++)
+                {
+                    KeyValuePair<int, string> CurRec = ProcList[ix];
+                    // è‡ªãƒ—ãƒ­ã‚»ã‚¹ã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if (CurRec.Key == s_CurrentProcessNo) continue;
+
+                    // è£½å“�ã�«ã‚ˆã�£ã�¦ã�®å®Ÿè£…ãƒ�ã‚§ãƒƒã‚¯
+                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
+
+                    // èµ·å‹•ãƒ�ã‚§ãƒƒã‚¯
+                    int m_EditFlg = -1;
+                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
+
+                    //ã‚¤ãƒ™ãƒ³ãƒˆã�®ç™»éŒ²
+                    switch (CurRec.Key)
+                    {
+                        case (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo:      //  2:å·¥äº‹æƒ…å ±å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_ConstructionBaseInfo, ref tsi1, ref bFirst[0]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.EstimateInput:             //  3:ç©�ç®—è¦‹ç©�å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_EstimateInput, ref tsi1, ref bFirst[0]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.EstimatePrint:             //  4:ç©�ç®—è¦‹ç©�æ›¸å�°åˆ·
+                            SetDropDownItems(CurRec.Value, ProcessExecute_EstimatePrint, ref tsi1, ref bFirst[0]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.EstimateBudget:            //  5:ç©�ç®—äºˆç®—æ›¸å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_EstimateBudget, ref tsi1, ref bFirst[0]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.ConstructionBudget:        //  6:å·¥äº‹äºˆç®—æ›¸å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_ConstructionBudget, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList:      //  8:å·¥äº‹æ¡ˆä»¶ã‚³ãƒ”ãƒ¼æ©Ÿèƒ½
+                            SetDropDownItems(CurRec.Value, ProcessExecute_ConstructionCopyList, ref tsi3, ref bFirst[2]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:        //  9:æ³¨æ–‡æ›¸å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_PurchaseOrderEntry, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:        // 10:æ³¨æ–‡æ›¸å�°åˆ·
+                            SetDropDownItems(CurRec.Value, ProcessExecute_PurchaseOrderPrint, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.ConstructionLedger:        // 13:å·¥äº‹è©³ç´°å�°å¸³
+                            SetDropDownItems(CurRec.Value, ProcessExecute_ConstructionLedger, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.TAndPCosts:                // 14:äº¤é€šè²»å�Šã�³è³¼å…¥å“�å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_TAndPCosts, ref tsi3, ref bFirst[2]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.DRConstruction:            // 16:å·¥äº‹æ—¥å ±å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_DRConstruction, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.Proceedings:               // 17:æ‰“å�ˆã�›è­°äº‹éŒ²å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_Proceedings, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.DRWork:                    // 18:å‡ºå‹¤æ—¥å ±
+                            SetDropDownItems(CurRec.Value, ProcessExecute_DRWork, ref tsi3, ref bFirst[2]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.MaterialReserveEntry:      // 26:è³‡æ��è²¸å‡º
+                            SetDropDownItems(CurRec.Value, ProcessExecute_MaterialReserve, ref tsi3, ref bFirst[2]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry:       // 27:è³‡æ��è¿”å�´
+                            SetDropDownItems(CurRec.Value, ProcessExecute_MaterialReturn, ref tsi3, ref bFirst[2]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.PaymentConfirmation:       // 30:å…¥é‡‘å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_PaymentConfirmation, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.RequestInput:              // 31:è«‹æ±‚å…¥åŠ›
+                            SetDropDownItems(CurRec.Value, ProcessExecute_RequestInput, ref tsi2, ref bFirst[1]);
+                            break;
+                        case (int)ClsExcute.ProcessExecuteNo.RequestPrint:              // 32:è«‹æ±‚æ›¸å�°åˆ·
+                            SetDropDownItems(CurRec.Value, ProcessExecute_RequestPrint, ref tsi2, ref bFirst[1]);
+                            break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ãƒ‰ãƒ­ãƒƒãƒ—ãƒ€ã‚¦ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�®å†…å®¹ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// <summary>
+        /// ãƒ‰ãƒ­ãƒƒãƒ—ãƒ€ã‚¦ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�®å†…å®¹ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// </summary>
+        private void SetDropDownItems(string strEventName, EventHandler eventHandler, ref ToolStripMenuItem tsi, ref bool bFirst)
+        {
+            try
+            {
+                if (bFirst) tsi.DropDownItems.Add("-");
+                // è¡Œã�®ã‚»ãƒƒãƒˆ
+                ToolStripMenuItem tsmItem = new ToolStripMenuItem(strEventName, null, eventHandler);
+                tsi.DropDownItems.Add(tsmItem);
+                bFirst = true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region çµ‚äº†æ™‚å‡¦ç�†
+        /// <summary>
+        /// çµ‚äº†æ™‚ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚¯ãƒ­ãƒ¼ã‚º
+        /// </summary>
+        private void TerminatingProcess()
+        {
+            try
+            {
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�ŒCloseã�•ã‚Œã�¦ã�„ã�ªã�‘ã‚Œã�°ã‚¯ãƒ­ãƒ¼ã‚ºã�™ã‚‹
+                for (int i = 0; i < ClsExcute.SubFormHandleList.Length; i++)
+                {
+                    PreserveSubFormHandle Handle = ClsExcute.SubFormHandleList[i];
+
+                    // è‡ªåˆ†ã�Œèµ·å‹•ã�—ã�Ÿã‚‚ã�®ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if (Handle.ProcessNo != s_CurrentProcessNo) continue;
+
+                    // èµ·å‹•ã�•ã‚Œã�¦ç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
+                    if (Handle.SubFormHandle == null) continue;
+
+                    // è‡ªåˆ†ã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if (i == s_CurrentProcessNo)
+                    {
+                        Handle.SubFormHandle = null;
+                        Handle.ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
+                        continue;
+                    }
+
+                    // ç”»é�¢ã‚¯ãƒ­ãƒ¼ã‚º
+                    Handle.SubFormHandle.Close();
+                    ClsOtherProc.ProcFormClose(i);
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ¬¡ã�®èµ·å‹•ã�Œç”³è«‹ç”»é�¢ã�‹ã�©ã�†ã�‹ã�®åˆ¤å®š
+        /// <summary>
+        /// æ¬¡ã�®èµ·å‹•ã�Œç”³è«‹ç”»é�¢ã�‹ã�©ã�†ã�‹ã�®åˆ¤å®š
+        /// </summary>
+        /// <returns></returns>
+        private bool judgmentApprovalScreen()
+        {
+            try
+            {
+                if (ClsExcute.ProcControlPara.Count < 1) return false;
+                // ãƒ—ãƒ­ã‚»ã‚¹èµ·å‹•ãƒ†ãƒ¼ãƒ–ãƒ«ã�«ç”³è«‹ç”»é�¢ã�Œè¨­å®šã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã�¯true
+                int NextProcess = ClsExcute.ProcControlPara[ClsExcute.GetNowProcessPoint()].ProcNo;
+                if (NextProcess == (int)ClsExcute.SubFormExecuteNo.ApprovalScreen) return true;
+
+                return false;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region    // ---------- ä»–ãƒ—ãƒ­ã‚»ã‚¹èµ·å‹•ãƒ�ãƒ³ãƒ‰ãƒ©ç¾¤ã€€START
+        #region ä¸€æ°—ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹
+        /// <summary>
+        /// ä¸€æ°—ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_MainMenu(object sender, EventArgs e)
+        {
+            try
+            {
+                // èµ·å‹•ãƒ†ãƒ¼ãƒ–ãƒ«ã‚’ã‚¯ãƒªã‚¢ã�™ã‚‹
+                ClsOtherProc.ProcExec_MainMenu();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ãƒ•ãƒ©ã‚°ONã€€
+                m_ParentEnd = true;
+                // çµ‚äº†å‡¦ç�†OFF
+                m_CloseingProcessOn = false;
+                // è‡ªãƒ•ã‚©ãƒ¼ãƒ çµ‚äº†
+                this.Close();
+            }
+        }
+        #endregion
+
+        #region å¢—æ¸›å·¥äº‹ãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// å¢—æ¸›å·¥äº‹ãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <returns></returns>
+        private bool CheckconstrLink()
+        {
+            try
+            {
+                bool linkFlg = false;
+                if (m_ConstructionBaseInfo.TyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Standard ||
+                    m_ConstructionBaseInfo.JoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard) linkFlg = true;
+
+                return linkFlg;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹æƒ…å ±å…¥åŠ›
+        /// <summary>
+        /// å·¥äº‹æƒ…å ±å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_ConstructionBaseInfo(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmConstructionBaseInfo frm = (FrmConstructionBaseInfo)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // å·¥äº‹æƒ…å ±å…¥åŠ›èµ·å‹•
+                frm = new FrmConstructionBaseInfo();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmConstructionBaseInfoClosed);
+                ClsOtherProc.ProcExec_ConstructionBaseInfo(ref frm
+                                                        , m_ConstructionCode
+                                                        , linkFlg
+                                                        , s_CurrentProcessNo
+                                                        , m_EditLock
+                                                        , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç©�ç®—è¦‹ç©�æ›¸å…¥åŠ›
+        /// <summary>
+        /// ç©�ç®—è¦‹ç©�æ›¸å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_EstimateInput(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateInput;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmEstimateInput frm = (FrmEstimateInput)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // ç©�ç®—è¦‹ç©�æ›¸å…¥åŠ›èµ·å‹•
+                frm = new FrmEstimateInput();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmEstimateInputClosed);
+
+                ClsOtherProc.ProcExec_EstimateInput(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç©�ç®—è¦‹ç©�æ›¸å�°åˆ·
+        /// <summary>
+        /// ç©�ç®—è¦‹ç©�æ›¸å�°åˆ·
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_EstimatePrint(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimatePrint;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmEstimatePrint frm = (FrmEstimatePrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // ç©�ç®—è¦‹ç©�æ›¸å�°åˆ·èµ·å‹•
+                frm = new FrmEstimatePrint();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmEstimatePrintClosed);
+
+                ClsOtherProc.ProcExec_EstimatePrint(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç©�ç®—äºˆç®—æ›¸å…¥åŠ›
+        /// <summary>
+        /// ç©�ç®—äºˆç®—æ›¸å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_EstimateBudget(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateBudget;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmEstimateBudget frm = (FrmEstimateBudget)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // ç©�ç®—äºˆç®—æ›¸å…¥åŠ›èµ·å‹•
+                frm = new FrmEstimateBudget();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmEstimateBudgetClosed);
+
+                ClsOtherProc.ProcExec_EstimateBudget(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹äºˆç®—æ›¸å…¥åŠ›
+        /// <summary>
+        /// å·¥äº‹äºˆç®—æ›¸å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_ConstructionBudget(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionBudget;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmConstructionBudget frm = (FrmConstructionBudget)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // å·¥äº‹äºˆç®—æ›¸å…¥åŠ›èµ·å‹•
+                frm = new FrmConstructionBudget();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmConstructionBudgetClosed);
+
+                ClsOtherProc.ProcExec_ConstructionBudget(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹æ¡ˆä»¶ã‚³ãƒ”ãƒ¼æ©Ÿèƒ½
+        /// <summary>
+        /// å·¥äº‹æ¡ˆä»¶ã‚³ãƒ”ãƒ¼æ©Ÿèƒ½
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_ConstructionCopyList(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmNewOrContinueCopy frm = (FrmNewOrContinueCopy)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // å·¥äº‹æ¡ˆä»¶ã‚³ãƒ”ãƒ¼èµ·å‹•
+                frm = new FrmNewOrContinueCopy();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmNewOrContinueCopyClosed);
+
+                ClsOtherProc.ProcExec_ConstructionCopyList(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ³¨æ–‡æ›¸å…¥åŠ›
+        /// <summary>
+        /// æ³¨æ–‡æ›¸å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_PurchaseOrderEntry(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // æ³¨æ–‡æ›¸å…¥åŠ›èµ·å‹•
+                frm = new FrmPurchaseOrderEntry();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmPurchaseOrderEntryClosed);
+
+                ClsOtherProc.ProcExec_PurchaseOrderEntry(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ³¨æ–‡æ›¸å�°åˆ·
+        /// <summary>
+        /// æ³¨æ–‡æ›¸å�°åˆ·
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_PurchaseOrderPrint(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å¢—æ¸›å·¥äº‹ã�¯ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ã‚’è¡¨ç¤ºã�™ã‚‹
+                bool linkFlg = CheckconstrLink();
+
+                // æ³¨æ–‡æ›¸å�°åˆ·èµ·å‹•
+                frm = new FrmPurchaseOrderPrint();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmPurchaseOrderPrintClosed);
+
+                ClsOtherProc.ProcExec_PurchaseOrderPrint(ref frm
+                                                    , m_ConstructionCode
+                                                    , linkFlg
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹è©³ç´°å�°å¸³
+        /// <summary>
+        /// å·¥äº‹è©³ç´°å�°å¸³
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_ConstructionLedger(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionLedger;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmConstructionLedger frm = (FrmConstructionLedger)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å·¥äº‹è©³ç´°å�°å¸³å…¥åŠ›èµ·å‹•
+                frm = new FrmConstructionLedger();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmConstructionLedgerClosed);
+
+                ClsOtherProc.ProcExec_ConstructionLedger(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region äº¤é€šè²»å�Šã�³è³¼å…¥å“�ç­‰å…¥åŠ›
+        /// <summary>
+        /// äº¤é€šè²»å�Šã�³è³¼å…¥å“�ç­‰å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_TAndPCosts(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmTAndPCosts frm = (FrmTAndPCosts)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // äº¤é€šè²»å�Šã�³è³¼å…¥å“�ç­‰å…¥åŠ›èµ·å‹•
+                frm = new FrmTAndPCosts();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmTAndPCostsClosed);
+
+                int nDepCode = m_ConstructionBaseInfo.ConstrDepCode;
+                int nPersonCode = m_ConstructionBaseInfo.ConstructionPersonCode;
+                ClsOtherProc.ProcExec_TAndPCosts(ref frm
+                                                    , m_ConstructionCode
+                                                    , nDepCode
+                                                    , nPersonCode
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹æ—¥å ±å…¥åŠ›
+        /// <summary>
+        /// å·¥äº‹æ—¥å ±å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_DRConstruction(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.DRConstruction;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmDRConstruction frm = (FrmDRConstruction)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å·¥äº‹æ—¥å ±å…¥åŠ›èµ·å‹•
+                frm = new FrmDRConstruction();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmDRConstructionClosed);
+
+                int nPersonCode = m_ConstructionBaseInfo.ConstructionPersonCode;
+                ClsOtherProc.ProcExec_DRConstruction(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , nPersonCode
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ‰“å�ˆã�›è­°äº‹éŒ²å…¥åŠ›
+        /// <summary>
+        /// æ‰“å�ˆã�›è­°äº‹éŒ²å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_Proceedings(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.Proceedings;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmProceedings frm = (FrmProceedings)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // æ‰“å�ˆã�›è­°äº‹éŒ²å…¥åŠ›èµ·å‹•
+                frm = new FrmProceedings();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmProceedingsClosed);
+
+                int nPersonCode = m_ConstructionBaseInfo.ConstructionPersonCode;
+                ClsOtherProc.ProcExec_Proceedings(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , nPersonCode
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å‡ºå‹¤æ—¥å ±
+        /// <summary>
+        /// å‡ºå‹¤æ—¥å ±
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_DRWork(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmDRWork frm = (FrmDRWork)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // å‡ºå‹¤æ—¥å ±èµ·å‹•
+                frm = new FrmDRWork();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmDRWorkClosed);
+
+                int nDepCode = CommonMotions.LoginUserData.DepartmentCode;
+                int nPersonCode = CommonMotions.LoginUserData.PersonCode;
+                ClsOtherProc.ProcExec_DRWork(ref frm
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è³‡æ��è²¸å‡ºå…¥åŠ›
+        /// <summary>
+        /// è³‡æ��è²¸å‡ºå…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_MaterialReserve(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReserveEntry;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmMaterialReserveEntry frm = (FrmMaterialReserveEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // è³‡æ��è²¸å‡ºå…¥åŠ›èµ·å‹•
+                frm = new FrmMaterialReserveEntry();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
+
+                ClsOtherProc.ProcExec_MaterialReserve(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è³‡æ��è¿”å�´å…¥åŠ›
+        /// <summary>
+        /// è³‡æ��è¿”å�´å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_MaterialReturn(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // è³‡æ��è¿”å�´å…¥åŠ›èµ·å‹•
+                frm = new FrmMaterialReturnEntry();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
+
+                ClsOtherProc.ProcExec_MaterialReturn(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è«‹æ±‚å…¥åŠ›
+        /// <summary>
+        /// è«‹æ±‚å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_RequestInput(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestInput;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmRequestInput frm = (FrmRequestInput)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // è«‹æ±‚å…¥åŠ›èµ·å‹•
+                frm = new FrmRequestInput();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmRequestInputClosed);
+
+                ClsOtherProc.ProcExec_RequestInput(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , m_EditLock
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è«‹æ±‚å�°åˆ·
+        /// <summary>
+        /// è«‹æ±‚å�°åˆ·
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_RequestPrint(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestPrint;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmRequestPrintSel frm = (FrmRequestPrintSel)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // è«‹æ±‚å…¥åŠ›èµ·å‹•
+                frm = new FrmRequestPrintSel();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmRequestPrintClosed);
+
+                ClsOtherProc.ProcExec_RequestPrint(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å…¥é‡‘å…¥åŠ›
+        /// <summary>
+        /// å…¥é‡‘å…¥åŠ›
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProcessExecute_PaymentConfirmation(object sender, EventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PaymentConfirmation;
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�Œã�‚ã‚Œã�°æœ€å‰�é�¢ã�¸
+                FrmSelectPayment frm = (FrmSelectPayment)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                if (frm != null)
+                {
+                    frm.Activate();
+                    return;
+                }
+
+                // è«‹æ±‚å…¥åŠ›èµ·å‹•
+                frm = new FrmSelectPayment();
+                // ã‚¯ãƒ­ãƒ¼ã‚¹ãƒ‰ãƒ�ãƒ³ãƒ‰ãƒ©ã‚’ã�“ã�¡ã‚‰ã�§å®šç¾©ã�™ã‚‹
+                frm.FormClosed += new FormClosedEventHandler(FrmPaymentConfirmationClosed);
+
+                ClsOtherProc.ProcExec_PaymentConfirmation(ref frm
+                                                    , m_ConstructionCode
+                                                    , s_CurrentProcessNo
+                                                    , this);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #endregion // ---------- ä»–ãƒ—ãƒ­ã‚»ã‚¹èµ·å‹•ãƒ�ãƒ³ãƒ‰ãƒ©ç¾¤ã€€END
+
+        #region    // ---------- ä»–ãƒ—ãƒ­ã‚»ã‚¹çµ‚äº†ãƒ�ãƒ³ãƒ‰ãƒ©ç¾¤ã€€START
+        #region å·¥äº‹æƒ…å ±å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹æƒ…å ±å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmConstructionBaseInfoClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo;
+                FrmConstructionBaseInfo frm = (FrmConstructionBaseInfo)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+                bool DataChange = frm.DataChenge;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç©�ç®—è¦‹ç©�å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ç©�ç®—è¦‹ç©�å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmEstimateInputClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateInput;
+                FrmEstimateInput frm = (FrmEstimateInput)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // ç”³è«‹ç”»é�¢ã�Œè¨­å®šã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã�¯è¦ªã‚‚çµ‚ã‚�ã‚‰ã�›ã‚‹
+                    if (judgmentApprovalScreen()) m_ParentEnd = true;
+
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç©�ç®—è¦‹ç©�å�°åˆ·ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ç©�ç®—è¦‹ç©�å�°åˆ·ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmEstimatePrintClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimatePrint;
+                FrmEstimatePrint frm = (FrmEstimatePrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç©�ç®—äºˆç®—æ›¸å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ç©�ç®—äºˆç®—æ›¸å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmEstimateBudgetClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateBudget;
+                FrmEstimateBudget frm = (FrmEstimateBudget)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // ç”³è«‹ç”»é�¢ã�Œè¨­å®šã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã�¯è¦ªã‚‚çµ‚ã‚�ã‚‰ã�›ã‚‹
+                    if (judgmentApprovalScreen()) m_ParentEnd = true;
+
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹äºˆç®—æ›¸å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹äºˆç®—æ›¸å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmConstructionBudgetClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionBudget;
+                FrmConstructionBudget frm = (FrmConstructionBudget)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // ç”³è«‹ç”»é�¢ã�Œè¨­å®šã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã�¯è¦ªã‚‚çµ‚ã‚�ã‚‰ã�›ã‚‹
+                    if (judgmentApprovalScreen()) m_ParentEnd = true;
+
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹æ¡ˆä»¶ã‚³ãƒ”ãƒ¼æ©Ÿèƒ½ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹æ¡ˆä»¶ã‚³ãƒ”ãƒ¼æ©Ÿèƒ½ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmNewOrContinueCopyClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList;
+                // ãƒ—ãƒ­ã‚»ã‚¹ç•ªå�·ã�Œé�•ã�†ã�®ã�§æ³¨æ„�ï¼�ï¼�
+                FrmNewOrContinueCopy frm = (FrmNewOrContinueCopy)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+
+                // æˆ»ã‚Šå€¤å�–å¾—
+                int ConstructionCode = frm.ConstructionCode;
+                bool bNowConstruction = frm.NewConstruction;
+                DialogResult drThisEnd = frm.EndButton;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ç”»é�¢çµ‚äº†æ™‚ã�¯ä»¥ä¸‹å‡¦ç�†ç„¡
+                if (drThisEnd == DialogResult.Cancel) return;
+
+                // çµ‚äº†å‡¦ç�†ãƒ•ãƒ©ã‚°On
+                m_CloseingProcessOn = true;
+
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ³¨æ–‡æ›¸å…¥åŠ›ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// æ³¨æ–‡æ›¸å…¥åŠ›ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmPurchaseOrderEntryClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry;
+                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // ç”³è«‹ç”»é�¢ã�Œè¨­å®šã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã�¯è¦ªã‚‚çµ‚ã‚�ã‚‰ã�›ã‚‹
+                    if (judgmentApprovalScreen()) m_ParentEnd = true;
+
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ³¨æ–‡æ›¸å�°åˆ·ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// æ³¨æ–‡æ›¸å�°åˆ·ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmPurchaseOrderPrintClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
+                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹è©³ç´°å�°å¸³ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹è©³ç´°å�°å¸³ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmConstructionLedgerClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionLedger;
+                FrmConstructionLedger frm = (FrmConstructionLedger)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region äº¤é€šè²»å�Šã�³è³¼å…¥å“�ç­‰å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// äº¤é€šè²»å�Šã�³è³¼å…¥å“�ç­‰å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmTAndPCostsClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.TAndPCosts;
+                FrmTAndPCosts frm = (FrmTAndPCosts)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹æ—¥å ±å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹æ—¥å ±å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmDRConstructionClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.DRConstruction;
+                FrmDRConstruction frm = (FrmDRConstruction)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ‰“å�ˆã�›è­°äº‹éŒ²å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// æ‰“å�ˆã�›è­°äº‹éŒ²å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmProceedingsClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.Proceedings;
+                FrmProceedings frm = (FrmProceedings)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å‡ºå‹¤æ—¥å ±ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å‡ºå‹¤æ—¥å ±ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmDRWorkClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
+                FrmDRWork frm = (FrmDRWork)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                // ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¸æˆ»ã‚‹ã�®é�¸æŠž
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è³‡æ��è²¸å‡ºå…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// è³‡æ��è²¸å‡ºå…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmMaterialReserveClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReserveEntry;
+                FrmMaterialReserveEntry frm = (FrmMaterialReserveEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è³‡æ��è¿”å�´å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// è³‡æ��è¿”å�´å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
+                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è«‹æ±‚å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// è«‹æ±‚å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmRequestInputClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestInput;
+                FrmRequestInput frm = (FrmRequestInput)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+                bool ThisEnd = frm.ParentEnd;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                if (ThisEnd)
+                {
+                    // çµ‚äº†å‡¦ç�†OFF
+                    m_CloseingProcessOn = false;
+                    this.Close();
+                }
+                else
+                {
+                    UpDateProcessContextMenu();
+                    this.Activate();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è«‹æ±‚å�°åˆ·ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// è«‹æ±‚å�°åˆ·ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmRequestPrintClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestPrint;
+                FrmRequestPrintSel frm = (FrmRequestPrintSel)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                UpDateProcessContextMenu();
+                this.Activate();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å…¥é‡‘å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å…¥é‡‘å…¥åŠ›ã�®ã‚¯ãƒ­ãƒ¼ã‚ºã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmPaymentConfirmationClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PaymentConfirmation;
+                FrmSelectPayment frm = (FrmSelectPayment)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
+
+                // ãƒ•ã‚©ãƒ¼ãƒ ã�®ã‚¯ãƒªã‚¢
+                ClsOtherProc.ProcFormClose(ProcessNo);
+
+                UpDateProcessContextMenu();
+                this.Activate();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #endregion // ---------- ä»–ãƒ—ãƒ­ã‚»ã‚¹çµ‚äº†ãƒ�ãƒ³ãƒ‰ãƒ©ç¾¤ã€€END
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 483)
@@ -1178,7 +1178,7 @@
         /// <param name="e"></param>
         private async void FrmEstimateInput_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
             
             // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
             InitFormLoad();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/OnHandVolume/PrintOut.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/OnHandVolume/PrintOut.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/OnHandVolume/PrintOut.cs	(revision 483)
@@ -946,7 +946,7 @@
                 strSQL.Append("                   AX1.ConstructionCode");
                 strSQL.Append("                   , sum(AX1.PaymentAmount) As BillVal");
                 strSQL.Append("                 From constructionledgerexcute As AX1");
-                strSQL.AppendFormat("           Where AX1.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.BillingAmount);
+                strSQL.AppendFormat("           Where AX1.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount);
                 strSQL.AppendFormat("           And DATE(AX1.TargetMonth) > DATE('{0}')", strFirstMonthOfDay);
                 strSQL.Append("                 Group By AX1.ConstructionCode");
                 strSQL.Append("                        , AX1.GroupCount) As A1");
@@ -956,7 +956,7 @@
                 strSQL.Append("                   AX2.ConstructionCode");
                 strSQL.Append("                   , sum(AX2.PaymentAmount) As DepositVal");
                 strSQL.Append("                 From constructionledgerexcute As AX2");
-                strSQL.AppendFormat("           Where AX2.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);
+                strSQL.AppendFormat("           Where AX2.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
                 strSQL.AppendFormat("           And DATE(AX2.TargetMonth) > DATE('{0}')", strFirstMonthOfDay);
                 strSQL.Append("                 Group By AX2.ConstructionCode");
                 strSQL.Append("                        , AX2.GroupCount) As A2");
@@ -964,7 +964,7 @@
 
                 strSQL.Append("      Left Join constructionledgerexcute As Deposit");
                 strSQL.Append("            On Deposit.ConstructionCode = A.ConstructionCode");
-                strSQL.AppendFormat("      And Deposit.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);
+                strSQL.AppendFormat("      And Deposit.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
 
                 strSQL.Append("      Left Join(Select detail.ConstructionCode");
                 strSQL.Append("                     , detail.GroupCount");
@@ -975,7 +975,7 @@
                 strSQL.Append("                           On exe.ConstructionCode = detail.ConstructionCode");
                 strSQL.Append("                           And detail.GroupCount = exe.GroupCount");
                 strSQL.Append("                           And detail.LineCount = exe.LineCount");
-                strSQL.AppendFormat("          Where detail.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat("          Where detail.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.AppendFormat("          And detail.InvalidLine = {0}", (int)ConstructionLedgerDetail.InvalidLineDef.ValidData);
                 strSQL.Append("                Group by detail.ConstructionCode) As progress");
                 strSQL.Append("            On progress.ConstructionCode = A.ConstructionCode");
@@ -1090,7 +1090,7 @@
                 strSQL.Append("                   AX1.ConstructionCode");
                 strSQL.Append("                   , sum(AX1.PaymentAmount) As BillVal");
                 strSQL.Append("                 From constructionledgerexcute As AX1");
-                strSQL.AppendFormat("           Where AX1.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.BillingAmount);
+                strSQL.AppendFormat("           Where AX1.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.BillingAmount);
                 strSQL.Append("                 Group By AX1.ConstructionCode");
                 strSQL.Append("                        , AX1.GroupCount) As A1");
                 strSQL.Append("            On A1.ConstructionCode = A.ConstructionCode");
@@ -1099,7 +1099,7 @@
                 strSQL.Append("                   AX2.ConstructionCode");
                 strSQL.Append("                   , sum(AX2.PaymentAmount) As DepositVal");
                 strSQL.Append("                 From constructionledgerexcute As AX2");
-                strSQL.AppendFormat("           Where AX2.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);
+                strSQL.AppendFormat("           Where AX2.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
                 strSQL.Append("                 Group By AX2.ConstructionCode");
                 strSQL.Append("                        , AX2.GroupCount) As A2");
                 strSQL.Append("            On A2.ConstructionCode = A.ConstructionCode");
@@ -1106,7 +1106,7 @@
 
                 strSQL.Append("      Left Join constructionledgerexcute As Deposit");
                 strSQL.Append("            On Deposit.ConstructionCode = A.ConstructionCode");
-                strSQL.AppendFormat("      And Deposit.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);
+                strSQL.AppendFormat("      And Deposit.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
                 strSQL.Append(" Group By C.ConstructionCode");
 
                 strSQL.Append(" Union (Select DA.ConstructionCode, Count(*) From constructionlink As BB");
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs	(revision 483)
@@ -260,7 +260,7 @@
 
                 strSQL.Append(" LEFT JOIN CONSTRUCTIONBUDGETDETAIL AS Budget");
                 strSQL.Append("       ON Budget.ConstructionCode = A.ConstructionCode");
-                strSQL.AppendFormat(" And Budget.GroupCount = {0}", (int)FrmConstructionBudget.DataGroup.Expenses);
+                strSQL.AppendFormat(" And Budget.GroupCount = {0}", (int)ConstructionBudgetDetail.GroupCountDef.Expenses);
 
                 strSQL.Append(" LEFT JOIN DEPARTMENTMASTER C1");
                 strSQL.Append("       On C1.DEPARTMENTCODE = A.ConstrDepCode");
@@ -888,7 +888,7 @@
                 strSQL.Append("            On A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
                 strSQL.Append("     LEFT JOIN CONSTRUCTIONLEDGERDETAIL AS C");
                 strSQL.Append("            ON C.ConstructionCode = A.ConstructionCode");
-                strSQL.AppendFormat("      And C.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.Expenses);
+                strSQL.AppendFormat("      And C.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.Expenses);
                 strSQL.Append("     LEFT JOIN constrledgerexpenses AS D");
                 strSQL.Append("           On D.ConstructionCode = A.ConstructionCode");
                 strSQL.Append("           And D.NameCode = C.ComponentCode");
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs	(revision 483)
@@ -56,6 +56,7 @@
             this.btnAllSelect = new System.Windows.Forms.Button();
             this.lblCellTotal = new System.Windows.Forms.Label();
             this.btnHelp = new System.Windows.Forms.Button();
+            this.btnAddOrders = new System.Windows.Forms.Button();
             this.groupBox2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -73,7 +74,6 @@
             this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnLineOrders = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
@@ -353,6 +353,19 @@
             this.btnHelp.UseVisualStyleBackColor = false;
             this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
             // 
+            // btnAddOrders
+            // 
+            this.btnAddOrders.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnAddOrders.BackColor = System.Drawing.Color.PaleGreen;
+            this.btnAddOrders.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnAddOrders.Location = new System.Drawing.Point(607, 656);
+            this.btnAddOrders.Name = "btnAddOrders";
+            this.btnAddOrders.Size = new System.Drawing.Size(130, 30);
+            this.btnAddOrders.TabIndex = 117;
+            this.btnAddOrders.Text = "ç™ºæ³¨å…ˆè¿½åŠ ";
+            this.btnAddOrders.UseVisualStyleBackColor = false;
+            this.btnAddOrders.Click += new System.EventHandler(this.btnAddOrders_Click);
+            // 
             // groupBox2
             // 
             this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -464,7 +477,7 @@
             dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column9.Frozen = true;
-            this.Column9.HeaderText = "ç”³è«‹å›ž";
+            this.Column9.HeaderText = "ç™ºæ³¨å›žæ•°";
             this.Column9.Name = "Column9";
             this.Column9.ReadOnly = true;
             this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -558,19 +571,6 @@
             this.Column13.Name = "Column13";
             this.Column13.Visible = false;
             // 
-            // btnLineOrders
-            // 
-            this.btnLineOrders.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLineOrders.BackColor = System.Drawing.Color.PaleGreen;
-            this.btnLineOrders.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnLineOrders.Location = new System.Drawing.Point(607, 656);
-            this.btnLineOrders.Name = "btnLineOrders";
-            this.btnLineOrders.Size = new System.Drawing.Size(130, 30);
-            this.btnLineOrders.TabIndex = 117;
-            this.btnLineOrders.Text = "ç™ºæ³¨å…ˆè¿½åŠ ";
-            this.btnLineOrders.UseVisualStyleBackColor = false;
-            this.btnLineOrders.Click += new System.EventHandler(this.btnLineOrders_Click);
-            // 
             // FrmOrderEntryList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -577,7 +577,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1344, 692);
-            this.Controls.Add(this.btnLineOrders);
+            this.Controls.Add(this.btnAddOrders);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.lblCellTotal);
             this.Controls.Add(this.btnAllSelect);
@@ -632,6 +632,7 @@
         private System.Windows.Forms.Button btnAllSelect;
         private System.Windows.Forms.Label lblCellTotal;
         private System.Windows.Forms.Button btnHelp;
+        private System.Windows.Forms.Button btnAddOrders;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
@@ -647,6 +648,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
-        private System.Windows.Forms.Button btnLineOrders;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs	(revision 483)
@@ -414,10 +414,10 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnLineOrders_Click(object sender, EventArgs e)
+        private void btnAddOrders_Click(object sender, EventArgs e)
         {
-            // å�”åŠ›ä¼šç¤¾å�°å¸³é�¸æŠžå‡¦ç�†
-            GetLedgerInfoDiag();
+            // ç™ºæ³¨å…ˆå�”åŠ›ä¼šç¤¾è¿½åŠ 
+            AddCompanyOrders();
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 483)
@@ -225,10 +225,12 @@
         /// ä¸€è¦§æ¤œç´¢ï¼³ï¼±ï¼¬ä½œæˆ�
         /// </summary>
         /// <param name="strSQL"></param>
-        public void CreateSQL(ref StringBuilder strSQL, int ParentCode, int SearchCode)
+        public string CreateSQL(int ParentCode, int SearchCode)
         {
             try
             {
+                StringBuilder strSQL = new StringBuilder();
+
                 strSQL.Append(" (SELECT");
                 strSQL.Append(" A.CONSTRUCTIONCODE");
                 strSQL.Append(", A.FIRSTSTRING");
@@ -235,7 +237,6 @@
                 strSQL.Append(", A.SECONDSTRING");
                 strSQL.Append(", A.COMPANYCODE AS COMPANYCODE");
                 strSQL.Append(", A.COMPANYNAME");
-                //strSQL.Append(", SUM(A.EXECUTIONAMOUNT)");
                 strSQL.Append(", C.TotalVal");
                 strSQL.Append(", A.SOURCECODE");
                 strSQL.Append(", A.PURCHASEORDERFLG");
@@ -258,6 +259,9 @@
                 strSQL.Append("  , ATD.SourceCode");
                 strSQL.Append("  From");
                 strSQL.Append("   CONSTRUCTIONLEDGERDETAIL As ATD");
+                strSQL.Append("  Where");
+                strSQL.Append("   ATD.ExecutionAmount > -1");               // ãƒžã‚¤ãƒŠã‚¹ã�¯æ³¨æ–‡æ›¸ã‚’å‡ºã�•ã�ªã�„
+
                 strSQL.Append("  Group by");
                 strSQL.Append("    ATD.CONSTRUCTIONCODE");
                 strSQL.Append("  , ATD.GROUPCOUNT");
@@ -283,7 +287,7 @@
 
                 strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", ParentCode);
                 strSQL.AppendFormat(" AND A.SOURCECODE = {0}", SearchCode);
-                strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.Append("       AND A.COMPANYCODE > 0");
                 strSQL.AppendFormat(" AND A.COMPANYTYPE != {0}", (int)CommonDefine.CodeDataType.Person);
                 strSQL.AppendFormat(" AND (A.PurchaseOrderFlg > {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld);
@@ -314,9 +318,9 @@
                 strSQL.Append(", H.COMPANYNAME");
 
                 strSQL.Append(", Case ifnull(F.OrderPrice, 0)");
-                strSQL.Append(" When 0 Then A.EXECUTIONAMOUNT");
-                strSQL.Append(" Else F.OrderPrice");
-                strSQL.Append(" End AS EXECUTIONAMOUNT");
+                strSQL.Append("   When 0 Then A.EXECUTIONAMOUNT");
+                strSQL.Append("   Else F.OrderPrice");
+                strSQL.Append("  End AS EXECUTIONAMOUNT");
 
                 strSQL.Append(", A.SOURCECODE");
                 strSQL.Append(", A.PURCHASEORDERFLG");
@@ -354,7 +358,7 @@
 
                 strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", ParentCode);
                 strSQL.AppendFormat(" AND A.SOURCECODE = {0}", SearchCode);
-                strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.AppendFormat(" AND A.PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);
                 strSQL.Append("       AND A.COMPANYCODE > 0");
                 strSQL.AppendFormat(" AND A.COMPANYTYPE <> {0}", (int)CommonDefine.CodeDataType.Person);
@@ -370,14 +374,19 @@
                     strSQL.Append("     AND PAPPD.LinkCode = E.SeqNo)");
                 }
 
-                strSQL.Append("       Group by A.CompanyCode, A.PURCHASEORDERFLG, F.SeqNo");
-                strSQL.Append(")");
+                // ãƒžã‚¤ãƒŠã‚¹ã�¯æ³¨æ–‡æ›¸ã‚’å‡ºã�•ã�ªã�„
+                strSQL.Append(" AND A.EXECUTIONAMOUNT > -1");
 
+                strSQL.Append(" Group by A.CompanyCode, A.PURCHASEORDERFLG, F.SeqNo)");
+
                 strSQL.Append(" ORDER BY ORDERNO DESC, PURCHASEORDERFLG ASC, SOURCECODE ASC, COMPANYCODE ASC, APPVAL ASC");
+
+                return strSQL.ToString();
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
             }
         }
         #endregion
@@ -400,22 +409,22 @@
                 if (m_ConstructionBaseInfo.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent)
                 {   // çµ�å�ˆã�®è¦ªå·¥äº‹
                     ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-                    CreateSQL(ref strSQL, ParentCode, ParentCode);
+                    strSQL.Append(CreateSQL(ParentCode, ParentCode));
                 }
                 else if (m_ConstructionBaseInfo.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren)
                 {   // çµ�å�ˆã�®æ§‹æˆ�å·¥äº‹
                     ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-                    CreateSQL(ref strSQL, ParentCode, m_ConstructionCode);
+                    strSQL.Append(CreateSQL(ParentCode, m_ConstructionCode));
                 }
                 else if (m_ConstructionBaseInfo.TyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Standard)
                 {   // å¢—æ¸›å·¥äº‹
                     ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-                    CreateSQL(ref strSQL, ParentCode, m_ConstructionCode);
+                    strSQL.Append(CreateSQL(ParentCode, m_ConstructionCode));
                     LimitedDisp = true;
                 }
                 else
                 {   // é€šå¸¸å·¥äº‹
-                    CreateSQL(ref strSQL, m_ConstructionCode, m_ConstructionCode);               // SQLä½œæˆ�
+                    strSQL.Append(CreateSQL(m_ConstructionCode, m_ConstructionCode));
                     LimitedDisp = true;
                 }
 
@@ -424,17 +433,8 @@
 
                 if (LimitedDisp)
                 {
-                    // å…ƒå·¥äº‹ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                    int VisbleCount = 0;
-                    foreach (DataGridViewColumn CurCol in dgv.Columns)
-                    {
-                        if (CurCol.Visible) VisbleCount++;
-                    }
-                    if (VisbleCount == 8)
-                    {
-                        dgv.Columns[(int)GridColumn.PurchaseName].Width += dgv.Columns[(int)GridColumn.SourceName].Width;
-                        dgv.Columns[(int)GridColumn.SourceName].Visible = false;
-                    }
+                    dgv.Columns[(int)GridColumn.PurchaseName].Width += dgv.Columns[(int)GridColumn.SourceName].Width;
+                    dgv.Columns[(int)GridColumn.SourceName].Visible = false;
                 }
             }
             catch (Exception ex)
@@ -829,7 +829,7 @@
                 {
                     strUpdate.AppendFormat("UPDATE CONSTRUCTIONLEDGERDETAIL SET PURCHASEORDERFLG = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate);
                     strUpdate.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", TargetCode);
-                    strUpdate.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                    strUpdate.AppendFormat(" AND GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                     strUpdate.AppendFormat(" AND (PURCHASEORDERFLG != {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);
                     strUpdate.AppendFormat(" AND PURCHASEORDERFLG != {0})", (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld);
                     strUpdate.AppendFormat(" AND CompanyCode IN ({0})", strDispAllData.ToString());
@@ -843,7 +843,7 @@
                     strUpdate.Clear();
                     strUpdate.AppendFormat("UPDATE CONSTRUCTIONLEDGERDETAIL SET PURCHASEORDERFLG = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.NotMakingData);
                     strUpdate.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", TargetCode);
-                    strUpdate.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                    strUpdate.AppendFormat(" AND GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                     strUpdate.AppendFormat(" AND (PURCHASEORDERFLG != {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);
                     strUpdate.AppendFormat(" AND PURCHASEORDERFLG != {0})", (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld);
                     strUpdate.AppendFormat(" AND CompanyCode IN ({0})", strNotMake.ToString());
@@ -978,122 +978,103 @@
         }
         #endregion
 
-        #region å�°å¸³é�¸æŠžå‡¦ç�†
+        #region ç™ºæ³¨å…ˆå�”åŠ›ä¼šç¤¾è¿½åŠ 
         /// <summary>
-        /// å�°å¸³é�¸æŠžå‡¦ç�†
+        /// ç™ºæ³¨å…ˆå�”åŠ›ä¼šç¤¾è¿½åŠ 
         /// </summary>
-        private void GetLedgerInfoDiag()
+        private void AddCompanyOrders()
         {
             try
             {
-                DataGridViewRow CurRow = dgvAllDisplay.CurrentRow;
+                SubContractorMaster CompanyRec = null;
+                // ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
+                if ((CompanyRec = SelectPurchaseCompany()) == null) return;
 
-                // æ‰¿èª�æ¸ˆã�¿ã�¯å‡¦ç�†ã�—ã�ªã�„
-                string strStat = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn.PurchaseExists].Value);
-                if (strStat.Equals(DataStatusString[(int)DataStatusNo.Approvals]))
-                {
-                    MessageBox.Show("ä½œæˆ�æ¸ˆãƒ‡ãƒ¼ã‚¿ã�¯è¨­å®šã�§ã��ã�¾ã�›ã‚“", "è¿½åŠ ä¸�å�¯", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
+                // å·¥äº‹è©³ç´°å�°å¸³ã�¸ãƒ‡ãƒ¼ã‚¿ã‚’æ›¸ã��è¾¼ã‚€
+                if (!CreatDetailData(CompanyRec)) return;
 
-                // å·¥äº‹è©³ç´°å�°å¸³ã�®è¡Œç•ªå�·ã€�åˆ—ç•ªå�·ã‚’è¨­å®š
-                //int[] nLedgerInfo = new int[3];
-                //nLedgerInfo[0] = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerLineNo]);
-                //nLedgerInfo[1] = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerDetailNo]);
-                //nLedgerInfo[2] = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerColNo]);
-                //if (nLedgerInfo[0] > 0 && nLedgerInfo[1] > 0 && nLedgerInfo[2] > 0)
-                //{
-                //    DialogResult drRet = MessageBox.Show("å·¥äº‹å�°å¸³ã�¨é–¢é€£ä»˜ã�‘ã�Œã�•ã‚Œã�¦ã�„ã�¾ã�™\nå¤‰æ›´ã�—ã�¾ã�™ã�‹ï¼Ÿ"
-                //                    , "è¨­å®šç¢ºèª�", MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
-                //    if (drRet == DialogResult.Cancel) return;
-                //}
-
-                //// å�°å¸³é–¢é€£ä»˜ã�‘å‡¦ç�†
-                //if (!GridLinkLedger()) return;
-
-                //// å¤‰æ›´ãƒ•ãƒ©ã‚°
-                //DataRowState nDataRowState = (DataRowState)CurRow.Cells[(int)DispColumn.RowState].Value;
-                //RowsTypeDef nRowType = (RowsTypeDef)CurRow.Cells[(int)DispColumn.RowType].Value;
-                //if (nRowType == RowsTypeDef.æ˜Žç´° && DataRowState.Unchanged == nDataRowState)
-                //    CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
-
+                // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
+                DataDisplay();
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                GC.Collect();
-            }
         }
         #endregion
 
-        #region å�°å¸³é–¢é€£ä»˜ã�‘å‡¦ç�†
+        #region ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
-        /// å�°å¸³é–¢é€£ä»˜ã�‘å‡¦ç�†
+        /// ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
         /// </summary>
-        private bool GridLinkLedger()
+        private SubContractorMaster SelectPurchaseCompany()
         {
-            FrmConstructionLedger frmLedger = new FrmConstructionLedger();
+            FrmSubContractorDiag frm = new FrmSubContractorDiag();
             try
             {
-                DataGridViewEX dgv = dgvAllDisplay;
-                DataGridViewRow CurRow = dgv.CurrentRow;
+                // å�”åŠ›ä¼šç¤¾é�¸æŠžç”»é�¢è¡¨ç¤º
+                frm.ConstructionCode = m_ConstructionCode;
+                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderList;
+                frm.ShowDialog();
 
-                int nCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.CompanyCode].Value);
-                int nConstrCode = m_ConstructionCode;
+                // ï¼¯ï¼«ä»¥å¤–ã�¯å‡¦ç�†ã‚’æŠœã�‘ã‚‹
+                if (frm.EndButton != DialogResult.OK) return null;
 
-                // å�°å¸³é�¸æŠž
-                int[] nRowCol = new int[2];
-                if (nConstrCode < 1 || nCompanyCode < 1) return false;
-
-                // æ¥­è€…ãƒ»å·¥äº‹ã�Œè¨­å®šæ¸ˆã�¿ã�¯å�°å¸³ã‚ˆã‚Šè¡Œã‚’é�¸æŠž
-                if (!DispSelectLedger(nCompanyCode, nConstrCode, frmLedger, ref nRowCol))
-                {
-                    return false;
-                }
-
-                return true;
+                return frm.SelectData;
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
+                return null;
             }
             finally
             {
-                frmLedger.Dispose(); frmLedger = null;
-                GC.Collect();
+                frm.Dispose(); frm = null;
             }
         }
         #endregion
 
-        #region å�°å¸³è¡Œã�®é�¸æŠžç”»é�¢ã‚’è¡¨ç¤ºã�™ã‚‹
+        #region å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
         /// <summary>
-        /// å�°å¸³è¡Œã�®é�¸æŠžç”»é�¢ã‚’è¡¨ç¤ºã�™ã‚‹
+        /// å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
         /// </summary>
-        private bool DispSelectLedger(int nCompnyCode, int nConstrCode, FrmConstructionLedger frmLedger, ref int[] nRowCol)
+        private bool CreatDetailData(SubContractorMaster CompanyRec)
         {
+            IOConstructionLedgerDetail DetailDB = new IOConstructionLedgerDetail();
             try
             {
-                // å¯¾è±¡ãƒªã‚¹ãƒˆä½œæˆ�
-                SetTargetCompanyList(nCompnyCode, nConstrCode, frmLedger);
-                // é�¸æŠžå¾Œå�°å¸³è¡¨ç¤º
-                frmLedger.SubForm = true;
-                // å·¥äº‹ç•ªå�·
-                frmLedger.ConstructionCode = nConstrCode;
-                // è«‹æ±‚ã�¾ã�¨ã‚�é�¸æŠžä½¿ç”¨æ™‚ãƒ•ãƒ©ã‚°
-                frmLedger.ReqSumDialogFlag = true;
-                // è«‹æ±‚ã�¾ã�¨ã‚�å¯¾è±¡æœˆ
-                //frmLedger.ReqSumTargetMonth = CommonMotions.cnvInt(cmbTargetMonth.SelectedValue);
-                // è«‹æ±‚ã�¾ã�¨ã‚�å¯¾è±¡æ¥­è€…ã‚³ãƒ¼ãƒ‰
-                frmLedger.ReqSumCompany = nCompnyCode;
-                // ç”»é�¢è¡¨ç¤º
-                frmLedger.ShowDialog();
-                // çµ‚äº†ã‚³ãƒ¼ãƒ‰ç¢ºèª�
-                if (DialogResult.Cancel.Equals(frmLedger.EndButton)) return false;
+                ConstructionLedgerDetail NewRec = new ConstructionLedgerDetail();
 
+                int ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+
+                StringBuilder strSQL = new StringBuilder();
+                // ãƒ©ã‚¤ãƒ³ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
+                strSQL.Append(DetailDB.CreatePrimarykeyString(ParentCode, (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts));
+                int nMaxLine = DetailDB.SelectMaxLineCount(strSQL.ToString());
+                // æ˜Žç´°ç•ªå�·å�–å¾—
+                int DetailCount = DetailDB.SelectMaxDetailCount(strSQL.ToString());
+
+                // æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                NewRec.ConstructionCode = ParentCode;                                                                       // å·¥äº‹ç•ªå�·
+                NewRec.GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;                          // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
+                NewRec.LineCount = nMaxLine += 1;                                                                           // è¡Œç•ªå�·
+                NewRec.CompanyType = (int)ConstructionLedgerDetail.CompanyTypeDef.Subconstractor;                           // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                NewRec.CompanyCode = CompanyRec.CompanyCode;                                                                // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
+                NewRec.CompanyName = CompanyRec.CompanyName;                                                                // å�”åŠ›ä¼šç¤¾å��ç§°
+                NewRec.EstimatePrice = 0;                                                                                   // äºˆç®—ï¼ˆè¦‹ç©�ï¼‰é‡‘é¡�
+                NewRec.ExecutionAmount = 0;                                                                                 // å®Ÿè¡Œé‡‘é¡�
+                NewRec.IndependentFlg = (int)ConstructionLedgerDetail.IndependentFlgDef.Independent;                        // ç‹¬ç«‹ãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
+                NewRec.FixDataFlg = 0;                                                                                      // å›ºå®šãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
+                NewRec.SalaryFlg = 0;                                                                                       // çµ¦ä¸ŽæŒ¯åˆ†åŒºåˆ†
+                NewRec.SalaryDays = 0;                                                                                      // çµ¦ä¸ŽæŒ¯åˆ†æ—¥æ•°
+                NewRec.OperatingFlg = 0;                                                                                    // æ‹…å½“ä¸­ãƒ•ãƒ©ã‚°
+                NewRec.SourceCode = m_ConstructionCode;                                                                     // å…ƒå·¥äº‹ç•ªå�·
+                NewRec.PurchaseOrderFlg = (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate;                            // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
+                NewRec.InvalidLine = (int)ConstructionLedgerDetail.InvalidLineDef.ValidData;                                // ç„¡åŠ¹è¡Œ
+                NewRec.DetailCount = ++DetailCount;                                                                         // æ˜Žç´°ç•ªå�·
+
+                if (!DetailDB.InsertAction(NewRec)) return false;
+
                 return true;
             }
             catch (System.Exception ex)
@@ -1101,34 +1082,10 @@
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
                 return false;
             }
-        }
-        #endregion
-
-        #region å·¥äº‹å�°å¸³å�‘ã�‘å¯¾è±¡æ¥­è€…ãƒªã‚¹ãƒˆä½œæˆ�å‡¦ç�†
-        /// <summary>
-        /// å·¥äº‹å�°å¸³å�‘ã�‘å¯¾è±¡æ¥­è€…ãƒªã‚¹ãƒˆä½œæˆ�å‡¦ç�†
-        /// </summary>
-        private void SetTargetCompanyList(int nCompnyCode, int nSelConstrCode, FrmConstructionLedger frm2, bool bDialog = true)
-        {
-            try
+            finally
             {
-                DataGridViewEX dgv = dgvAllDisplay;
-
-                // å¯¾è±¡æ¥­è€…ã‚’å�–å¾— ãƒªã‚¹ãƒˆã‚»ãƒƒãƒˆ
-                frm2.BillDetailList.Clear();
-                foreach (DataGridViewRow CurRow in dgv.Rows)
-                {
-                    //BillingDataDetail DataCurRec = new BillingDataDetail();
-                    //DataCurRec.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.CompanyCode].Value);
-                    //DataCurRec.ConstructionRowCnt = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.LedgerDetailNo].Value);
-                    //DataCurRec.BillPrice = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.KojiSeikyu].Value);
-                    //frm2.BillDetailList.Add(DataCurRec);
-                }
+                DetailDB.close(); DetailDB = null;
             }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
         }
         #endregion
     }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs	(revision 483)
@@ -165,7 +165,7 @@
             try
             {
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.AppendFormat(" Where GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" Where GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.Append(" Order by ConstructionCode,LineCount");
                 List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
                 LedgerDDB.SelectAction(strSQL.ToString(), ref DetailList, false);
@@ -214,7 +214,7 @@
                 {
                     strSQL.Clear();
                     strSQL.Append(LedgerDDB.CreatePrimarykeyString((int)OrderRec.SourceCode
-                                                                    , (int)FrmConstructionLedger.DataGroup.ConstructionCosts
+                                                                    , (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts
                                                                     , OrderRec.SourceDetailCnt));
                     ConstructionLedgerDetail LedgerRec = new ConstructionLedgerDetail();
                     if (!LedgerDDB.SelectAction(strSQL.ToString(), ref LedgerRec, false)) continue;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs	(revision 483)
@@ -1795,7 +1795,7 @@
             //frm.ShowDialog();
             //frm.Dispose();
             //frm = null;
-            RateSet();
+            //RateSet();
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 483)
@@ -575,7 +575,7 @@
                 strSQL.AppendFormat(" AND SOURCECODE = {0}"
                                             , CommonMotions.cnvInt(ParentRec[(int)FrmOrderEntryList.ReadDBColumn.SourceCode]));
                 strSQL.AppendFormat(" AND PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate);
-
+                strSQL.Append("       AND ExecutionAmount > -1");
                 strSQL.Append(" AND (");
                 bool bFirstCompany = true;
                 foreach (object[] CurRec in m_DetailList)
@@ -1234,7 +1234,7 @@
                 strSQL.Append(", SUM(EXECUTIONAMOUNT)");
                 strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL");
                 strSQL.AppendFormat(" WHERE SOURCECODE = {0}", m_ConstructionCode);
-                strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.AppendFormat(" AND PURCHASEORDERFLG = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);
                 strSQL.Append(" GROUP BY COMPANYCODE ORDER BY COMPANYCODE");
                 ArrayList arList = new ArrayList();
@@ -1820,6 +1820,7 @@
                 strSQL.Append(OrderDB.CreatePrimarykeyString(m_ConstructionCode, SeqNo));
                 if (OrderDB.SelectAction(strSQL.ToString(), ref DataRec, false)) DataExists = true;
 
+                // ç„¡ã�„å ´å�ˆã�¯ã‚­ãƒ¼é …ç›®ã‚»ãƒƒãƒˆ
                 if (!DataExists)
                 {
                     DataRec.ConstructionCode = m_ConstructionCode;                                  // å·¥äº‹ç•ªå�·
@@ -1943,16 +1944,6 @@
                         CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.Quantity].Value) == 0 &&
                         CommonMotions.cnvDouble(GetRow.Cells[(int)DispDetailGridColumn.PriceValue].Value) == 0) continue;
 
-                    // æ¥­è€…å¤‰æ›´æ™‚ã�¯å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’æ–°è¦�ä½œæˆ�ã�—ã�¦è¡Œç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
-                    int nGroupNo = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.GroupNo].Value);
-                    if (DataTab.CompanyChange && nGroupNo == (int)PurchaseOrderDetail.DataTypeFlagDef.CommonData)
-                    {
-                        // å…ƒå�°å¸³è¡Œç•ªå�·å¤‰æ›´
-                        int nSourceDetailCnt = 0;
-                        if (!CreateRowLedgerDetail(LDetailDB, DataTab, GetRow, ref nSourceDetailCnt)) return false;
-                        GetRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value = nSourceDetailCnt;
-                    }
-
                     PurchaseOrderDetail DatailRec = new PurchaseOrderDetail();
                     DatailRec.ConstructionCode = m_ConstructionCode;	                                                            // å·¥äº‹ç•ªå�·
                     DatailRec.SeqNo = SeqNo;                                                                                        // æ³¨æ–‡æ›¸æž�ç•ª
@@ -2036,14 +2027,16 @@
             {
                 StringBuilder strSQL = new StringBuilder();
 
-                // å�°å¸³ã�®è¿½åŠ è¡Œä½�ç½®ã‚’å�–å¾—ã�™ã‚‹
+                // ç�¾è¡Œè¡Œã�®ã‚­ãƒ¼æƒ…å ±ã‚’å�–å¾—ã�™ã‚‹
                 int ConstrCode = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.SourceCode].Value);
-                int GrpCnt = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;
+                int GrpCnt = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;
                 int LedgerLineCnt = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value);
 
-                strSQL.Append(LDetailDB.CreatePrimarykeyString(ConstrCode, GrpCnt));
-                nDetailCnt = LDetailDB.SelectMaxDetailCount(strSQL.ToString(), false) + 1;
+                // ä¼šç¤¾æƒ…å ±
+                int nCompanyCode = DataTab.OrderCompanyCode;
+                string strCompanyName = DataTab.PageValueItem[(int)PageValue.SubConstractorName].Text;
 
+                int nPurOrderFlg = (int)ConstructionLedgerDetail.PurOrderFlgDef.Making;
                 strSQL.Clear();
                 strSQL.Append("Insert INTO ConstructionLedgerDetail");
                 strSQL.Append(" SELECT");
@@ -2052,14 +2045,14 @@
                 strSQL.Append(", (A.LineCount + 1)");                       // è¡Œç•ªå�·
                 strSQL.Append(", A.ComponentCode");                         // æ§‹æˆ�ã‚­ãƒ¼
                 strSQL.Append(", A.ItemCode");		                        // å·¥ç¨®ã‚­ãƒ¼
-                strSQL.Append(", ''");                                      // é …ç›®å��ç§°
-                strSQL.Append(", ''");                                      // å·¥äº‹å†…å®¹
+                strSQL.Append(", A.FirstString");                           // é …ç›®å��ç§°
+                strSQL.Append(", A.SecondString");                          // å·¥äº‹å†…å®¹
                 strSQL.Append(", A.CompanyType");                           // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
-                strSQL.AppendFormat(", {0}", DataTab.OrderCompanyCode);      // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
-                strSQL.AppendFormat(", '{0}'", DataTab.PageValueItem[(int)PageValue.SubConstractorName].Text);  // å�”åŠ›ä¼šç¤¾å��ç§°
+                strSQL.AppendFormat(", {0}", nCompanyCode);                 // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
+                strSQL.AppendFormat(", '{0}'", strCompanyName);             // å�”åŠ›ä¼šç¤¾å��ç§°
                 strSQL.Append(", 0");                                       // äºˆç®—ï¼ˆè¦‹ç©�ï¼‰é‡‘é¡�
-                strSQL.Append(", 0");                                       // å®Ÿè¡Œé‡‘é¡�
-                strSQL.Append(", 0");                                       // é‡‘é¡�æ§‹æˆ�çŽ‡
+                strSQL.Append(", A.ExecutionAmount");                       // å®Ÿè¡Œé‡‘é¡�
+                strSQL.Append(", A.AmountConfigRate");                      // é‡‘é¡�æ§‹æˆ�çŽ‡
                 strSQL.Append(", 0");                                       // æ”¯æ‰•è£œå¡«é¡�
                 strSQL.Append(", A.FixDataFlg");                            // å›ºå®šãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
                 strSQL.Append(", A.IndependentFlg");                        // ç‹¬ç«‹ãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
@@ -2070,11 +2063,11 @@
                 strSQL.Append(", A.SourceCode");                            // å…ƒå·¥äº‹ç•ªå�·
                 strSQL.Append(", A.JoinTitleFlg");                          // å·¥äº‹å��ç§°ã‚¿ã‚¤ãƒˆãƒ«
                 strSQL.Append(", A.SalaryOnRegist");                        // ç™»éŒ²æ™‚æœˆé¡�çµ¦ä¸Ž
-                strSQL.AppendFormat(", {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);  // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
-                strSQL.AppendFormat(", {0}", nDetailCnt);                     // æ˜Žç´°ç•ªå�·
+                strSQL.AppendFormat(", {0}", nPurOrderFlg);                 // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
+                strSQL.AppendFormat(", {0}", ++nDetailCnt);                 // æ˜Žç´°ç•ªå�·
                 strSQL.Append(", 0");                                       // ç„¡åŠ¹è¡Œ
-                strSQL.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", DateTime.Now);
-                strSQL.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", DateTime.Now);
+                strSQL.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", DateTime.Now.ToString());
+                strSQL.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", DateTime.Now.ToString());
                 strSQL.Append(" FROM ConstructionLedgerDetail As A");
 
                 strSQL.Append(LDetailDB.CreatePrimarykeyString(ConstrCode, GrpCnt, 0, "A."));
@@ -2088,25 +2081,20 @@
 
                 // å¤‰æ›´å‰�æ¥­è€…è¡Œæ›´æ–°
                 strSQL.Clear();
+                strSQL.Append("UPDATE ConstructionLedgerDetail");
+                strSQL.AppendFormat(" Set PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld); // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
+                strSQL.AppendFormat(", InvalidLine = {0}", (int)ConstructionLedgerDetail.InvalidLineDef.InValidData);       // ç„¡åŠ¹è¡Œ
                 strSQL.Append(LDetailDB.CreatePrimarykeyString(ConstrCode, GrpCnt));
                 strSQL.AppendFormat(" And DetailCount = {0}", LedgerLineCnt);
-                if (!LDetailDB.UpdateFeild(strSQL.ToString()
-                                            , (int)IOConstructionLedgerDetail.TableColumn.PurchaseOrderFlg
-                                            , (int)ConstructionLedgerDetail.PurOrderFlgDef.ChangeOld
-                                            , false))
+
+                if (!LDetailDB.ExecuteNonQuery(strSQL.ToString(), false))
                 {
                     LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šæ¥­è€…å¤‰æ›´ãƒ•ãƒ©ã‚°æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
                     return false;
                 }
-                if (!LDetailDB.UpdateFeild(strSQL.ToString()
-                                            , (int)IOConstructionLedgerDetail.TableColumn.InvalidLine
-                                            , (int)ConstructionLedgerDetail.InvalidLineDef.InValidData
-                                            , false))
-                {
-                    LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šæ¥­è€…å¤‰æ›´ãƒ•ãƒ©ã‚°æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
-                    return false;
-                }
 
+                // æ–°ã�—ã�„æ˜Žç´°ç•ªå�·ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                GetRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value = nDetailCnt;
 
                 return true;
             }
@@ -2127,58 +2115,60 @@
         {
             try
             {
+                int ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+
+                // ----- å·¥äº‹å�°å¸³ã‚ˆã‚Šå¿…è¦�ãƒ‡ãƒ¼ã‚¿å�–å¾—
                 StringBuilder strSQL = new StringBuilder();
-
-                // å·¥äº‹å�°å¸³ã‚ˆã‚Šå¿…è¦�ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                strSQL.Append("Select");
-                strSQL.Append(" ConstructionCode");
-                strSQL.Append(", MAX(LineCount)");
-                strSQL.Append(" From constructionledgerdetail");
-                strSQL.AppendFormat(" Where GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
-                strSQL.AppendFormat(" And SourceCode = {0}", m_ConstructionCode);
-                ArrayList GetData = new ArrayList();
-                if (!LDetailDB.ExecuteReader(strSQL.ToString(), ref GetData, false)) return false;
-                if (GetData.Count < 1) return false;
-                object[] LedgerData = (object[])GetData[0];
-                int nBaseCode = CommonMotions.cnvInt(LedgerData[0]);
-                int nMaxLine = CommonMotions.cnvInt(LedgerData[1]);
-
-                // ã‚­ãƒ¼é …ç›®å�–å¾—æ�¡ä»¶ä½œæˆ�
-                strSQL.Clear();
-                strSQL.Append(LDetailDB.CreatePrimarykeyString(nBaseCode, (int)FrmConstructionLedger.DataGroup.ConstructionCosts));
-                // ãƒ‡ãƒ¼ã‚¿ã�Œã�ªã�„å ´å�ˆã�¯æ–°è¦�æ˜Žç´°ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
+                // ãƒ©ã‚¤ãƒ³ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
+                strSQL.Append(LDetailDB.CreatePrimarykeyString(ParentCode, (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts));
+                int nMaxLine = LDetailDB.SelectMaxLineCount(strSQL.ToString(), false);
+                // æ˜Žç´°ç•ªå�·å�–å¾—
                 int DetailCount = LDetailDB.SelectMaxDetailCount(strSQL.ToString(), false);
 
                 List<ConstructionLedgerDetail> NewList = new List<ConstructionLedgerDetail>();
 
                 DataGridViewEX dgv = DataTab.Group1DataGridView;
-                foreach (DataGridViewRow CurRow in dgv.Rows)
+                // å¯¾è±¡è¡Œå�–å¾—
+                int[] nCompPoint = new int[] { (int)DispDetailGridColumn.DataType, (int)DispDetailGridColumn.Quantity, (int)DispDetailGridColumn.PriceValue };
+                int nTargetCode = (int)PurchaseOrderDetail.DataTypeFlagDef.CommonData;
+                DataGridViewRow[] GetArray = dgv.Rows.Cast<DataGridViewRow>()
+                                                    .Where(x => CommonMotions.cnvInt(x.Cells[nCompPoint[0]].Value) == nTargetCode
+                                                                && (CommonMotions.cnvInt(x.Cells[nCompPoint[1]].Value) != 0
+                                                                && CommonMotions.cnvInt(x.Cells[nCompPoint[2]].Value) != 0))
+                                                    .ToArray();
+                foreach (DataGridViewRow CurRow in GetArray)
                 {
+                    // ----- æ¥­è€…å¤‰æ›´æ™‚ã�¯å…ƒã�®å�°å¸³è¡Œã‚’é–‹æ”¾ã�—ã�¦æ–°è¦�ã�«è¡Œã‚’ä½œæˆ�ã�™ã‚‹
+                    if (DataTab.CompanyChange)
+                    {
+                        // æ¥­è€…å¤‰æ›´æ™‚ã�¯å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’æ–°è¦�ä½œæˆ�ã�—ã�¦è¡Œç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
+                        if (!CreateRowLedgerDetail(LDetailDB, DataTab, CurRow, ref DetailCount)) return false;
+                        continue;
+                    }
+
                     // ç¦�åˆ©åŽšç”Ÿè²»ã�¯å‡¦ç�†ã�—ã�ªã�„
                     int DataType = CommonMotions.cnvInt(CurRow.Cells[(int)DispDetailGridColumn.DataType].Value);
                     if (DataType == (int)PurchaseOrderDetail.DataTypeFlagDef.StatutoryWelfare) continue;
 
-                    // å�°å¸³å·¥äº‹ç•ªå�·
-                    int TargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispDetailGridColumn.SourceCode].Value);
                     // æ•°é‡�
                     int QuantityVal = CommonMotions.cnvInt(CurRow.Cells[(int)DispDetailGridColumn.Quantity].Value);
                     // é‡‘é¡�
                     int PriceVal = CommonMotions.cnvInt(CurRow.Cells[(int)DispDetailGridColumn.PriceValue].Value);
-                    // å·¥äº‹å�°å¸³è¡Œ
-                    int LedgerLine = CommonMotions.cnvInt(CurRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value);
+                    // å�°å¸³æ˜Žç´°ç•ªå�·
+                    int LedgerDetailNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value);
                     // æ•°é‡�é‡‘é¡�ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
                     if (QuantityVal == 0 && PriceVal == 0) continue;
 
-                    // å�°å¸³è¡Œã�Œç„¡ã�‘ã‚Œã�°è¿½åŠ ãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
-                    if (LedgerLine == 0)
+                    // æ˜Žç´°ç•ªå�·ã�Œç„¡ã�‘ã‚Œã�°è¿½åŠ ãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
+                    if (LedgerDetailNo == 0)
                     {
                         // é‡‘é¡�ãƒžã‚¤ãƒŠã‚¹ã�¯å‡¦ç�†ã�—ã�ªã�„
                         if (PriceVal < 0) continue;
                         // å�°å¸³æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
-                        CreateInsertRowData(nBaseCode, DataTab, CurRow, ref DetailCount, ref nMaxLine, ref NewList);
+                        CreateInsertRowData(ParentCode, DataTab, CurRow, ref DetailCount, ref nMaxLine, ref NewList);
 
                         // å…ƒå·¥äº‹ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
-                        CurRow.Cells[(int)DispDetailGridColumn.SourceCode].Value = nBaseCode;
+                        CurRow.Cells[(int)DispDetailGridColumn.SourceCode].Value = ParentCode;
                         // å�°å¸³æ˜Žç´°ç•ªå�·ã‚’ã‚°ãƒªãƒƒãƒ‰ã�¸ã‚»ãƒƒãƒˆ
                         CurRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value = DetailCount;
                     }
@@ -2185,16 +2175,19 @@
                     else
                     {
                         // æ³¨æ–‡æ›¸ä½œæˆ�ãƒ•ãƒ©ã‚°ON
+                        string strFirst = CommonMotions.cnvString(CurRow.Cells[(int)DispDetailGridColumn.FirstName].Value);
+                        string strSecond = CommonMotions.cnvString(CurRow.Cells[(int)DispDetailGridColumn.SecondName].Value);
                         strSQL.Clear();
-                        strSQL.Append(LDetailDB.CreatePrimarykeyString(TargetCode));
+                        strSQL.Append("UPDATE ConstructionLedgerDetail");
+                        strSQL.AppendFormat(" Set FirstString = '{0}'", strFirst);                                              // é …ç›®å��ç§°
+                        strSQL.AppendFormat(", SecondString = '{0}'", strSecond);                                               // å·¥äº‹å†…å®¹
+                        strSQL.AppendFormat(", PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);   // æ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
+                        strSQL.Append(LDetailDB.CreatePrimarykeyString(ParentCode));
                         strSQL.AppendFormat(" AND SOURCECODE = {0}", m_ConstructionCode);
-                        strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
-                        //strSQL.AppendFormat(" AND COMPANYCODE = {0}", DataTab.OrderCompanyCode);
-                        strSQL.AppendFormat(" AND DetailCount = {0}", LedgerLine);
-                        if (!LDetailDB.UpdateFeild(strSQL.ToString()
-                                                    , (int)IOConstructionLedgerDetail.TableColumn.PurchaseOrderFlg
-                                                    , (int)ConstructionLedgerDetail.PurOrderFlgDef.Making
-                                                    , false))
+                        strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
+                        strSQL.AppendFormat(" AND DetailCount = {0}", LedgerDetailNo);
+
+                        if (!LDetailDB.ExecuteNonQuery(strSQL.ToString(), false))
                         {
                             LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šæ³¨æ–‡æ›¸ä½œæˆ�ãƒ•ãƒ©ã‚°æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
                             return false;
@@ -2236,7 +2229,7 @@
                 ConstructionLedgerDetail NewRec = new ConstructionLedgerDetail();
 
                 NewRec.ConstructionCode = nBaseCode;                                                                        // å·¥äº‹ç•ªå�·
-                NewRec.GroupCount = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;                                 // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
+                NewRec.GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;                                 // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
                 NewRec.LineCount = nMaxLine += 1;                                                                           // è¡Œç•ªå�·
                 NewRec.FirstString = CommonMotions.cnvString(CurRow.Cells[(int)DispDetailGridColumn.FirstName].Value);      // é …ç›®å��ç§°
                 NewRec.SecondString = CommonMotions.cnvString(CurRow.Cells[(int)DispDetailGridColumn.SecondName].Value);    // å·¥äº‹å†…å®¹
@@ -2358,7 +2351,7 @@
                         if (SourceLine == 0) continue;
 
                         strUpdate.Clear();
-                        strUpdate.AppendFormat(LDetailDB.CreatePrimarykeyString(SourceCode, (int)FrmConstructionLedger.DataGroup.ConstructionCosts));
+                        strUpdate.AppendFormat(LDetailDB.CreatePrimarykeyString(SourceCode, (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts));
                         strUpdate.AppendFormat(" And DetailCount = {0}", SourceLine);
 
                         // å�°å¸³æ›´æ–°
@@ -2470,7 +2463,7 @@
                 int SourceCode = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.SourceCode].Value);
                 int SourceLine = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value);
                 StringBuilder strUpdate = new StringBuilder();
-                strUpdate.AppendFormat(LDetailDB.CreatePrimarykeyString(SourceCode, (int)FrmConstructionLedger.DataGroup.ConstructionCosts));
+                strUpdate.AppendFormat(LDetailDB.CreatePrimarykeyString(SourceCode, (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts));
                 strUpdate.AppendFormat(" And DetailCount = {0}", SourceLine);
                 if (!LDetailDB.UpdateFeild(strUpdate.ToString(),
                                             (int)IOConstructionLedgerDetail.TableColumn.PurchaseOrderFlg,
@@ -2674,6 +2667,8 @@
                 CurRow.Cells[(int)DispDetailGridColumn.UnitPrice].Value = UnitPriceValue.ToString("#,#");
                 CurRow.Cells[(int)DispDetailGridColumn.PriceValue].Value = PriceValue.ToString("#,#");
 
+                CurRow.Cells[(int)DispDetailGridColumn.DataType].Value = (int)PurchaseOrderDetail.DataTypeFlagDef.CommonData;
+
                 return true;
             }
             catch (Exception ex)
@@ -3619,78 +3614,5 @@
         #endregion
 
         // > ----------- ãƒ‡ãƒ�ãƒƒã‚¯å‡¦ç�†
-        #region ç¦�åˆ©åŽšç”Ÿè²»ã‚»ãƒƒãƒˆå‡¦ç�†
-        /// <summary>
-        /// ç¦�åˆ©åŽšç”Ÿè²»ã‚»ãƒƒãƒˆå‡¦ç�†
-        /// </summary>
-        private void RateSet()
-        {
-            IOPurchaseOrderDetail ADB = new IOPurchaseOrderDetail();
-            try
-            {
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("select");
-                strSQL.Append(" A.ConstructionCode");
-                strSQL.Append(", A.SeqNo");
-                strSQL.Append(", (100 - ROUND((C.Price / A.OrderPrice) * 100.0, 2)) As OrderPriceA");
-                strSQL.Append(", A.CompanyCode");
-                strSQL.Append(", A.OrderPrice");
-
-                strSQL.Append(" From purchaseorder As A");
-
-                strSQL.Append(" Inner Join(");
-                strSQL.Append(" Select");
-                strSQL.Append("  B.ConstructionCode");
-                strSQL.Append(", B.SeqNo");
-                strSQL.Append(", SUM(B.OrdersLinePrice) As Price");
-                strSQL.Append(" From purchaseorderdetail As B");
-                strSQL.Append(" Where B.GroupCount = 0");
-                strSQL.Append(" group By");
-                strSQL.Append("   B.ConstructionCode");
-                strSQL.Append(" , B.SeqNo, B.GroupCount");
-                strSQL.Append(") As C");
-                strSQL.Append(" On C.ConstructionCode = A.ConstructionCode");
-                strSQL.Append(" And C.SeqNo = A.SeqNo");
-                strSQL.Append(" Inner Join purchaseorderdetail As D");
-                strSQL.Append(" On D.ConstructionCode = C.ConstructionCode");
-                strSQL.Append(" And D.SeqNo = C.SeqNo");
-                strSQL.Append(" And D.GroupCount = 9");
-
-                strSQL.Append(" Where");
-                strSQL.Append(" 100 - ROUND((C.Price / A.OrderPrice) * 100.0, 1) <> 0.0");
-
-                ArrayList arList = new ArrayList();
-                if (!ADB.ExecuteReader(strSQL.ToString(), ref arList)) return;
-
-                ADB.connect(); ADB.beginTran();
-                foreach (object[] objRec in arList)
-                {
-                    strSQL.Clear();
-                    strSQL.Append("Update purchaseorderdetail");
-                    strSQL.AppendFormat(" Set StatutoryWelfareRate = {0}", CommonMotions.cnvFloat(objRec[2]).ToString("0.0"));
-                    //strSQL.Append(" Set StatutoryWelfareRate = 8.0");
-                    strSQL.AppendFormat(" Where ConstructionCode = {0}", CommonMotions.cnvInt(objRec[0]));
-                    strSQL.AppendFormat(" And SeqNo = {0}", CommonMotions.cnvInt(objRec[1]));
-                    strSQL.Append(" And GroupCount = 9");
-                    if (!ADB.ExecuteNonQuery(strSQL.ToString(), false))
-                    {
-                        ADB.rollback();
-                        MessageBox.Show("æ›´æ–°ã‚¨ãƒ©ãƒ¼", "ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK);
-                        return;
-                    }
-                }
-                MessageBox.Show("æ›´æ–°å‡¦ç�†çµ‚äº†", "æ­£å¸¸çµ‚äº†", MessageBoxButtons.OK);
-                ADB.commit();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                ADB.close(); ADB = null;
-            }
-        }
-        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs	(revision 483)
@@ -35,6 +35,7 @@
             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.panel1 = new System.Windows.Forms.Panel();
             this.label2 = new System.Windows.Forms.Label();
@@ -60,6 +61,7 @@
             this.btnPrint = new System.Windows.Forms.Button();
             this.lblNoLook = new System.Windows.Forms.Label();
             this.lblCellTotal = new System.Windows.Forms.Label();
+            this.btnHelp = new System.Windows.Forms.Button();
             this.groupBox2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.PrintProgress = new System.Windows.Forms.ProgressBar();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
@@ -67,11 +69,11 @@
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.btnHelp = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
@@ -386,6 +388,21 @@
             this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
             this.lblCellTotal.TabIndex = 100;
             // 
+            // btnHelp
+            // 
+            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnHelp.BackColor = System.Drawing.Color.Black;
+            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHelp.ForeColor = System.Drawing.Color.White;
+            this.btnHelp.Location = new System.Drawing.Point(1313, 0);
+            this.btnHelp.Name = "btnHelp";
+            this.btnHelp.Size = new System.Drawing.Size(30, 30);
+            this.btnHelp.TabIndex = 116;
+            this.btnHelp.TabStop = false;
+            this.btnHelp.Text = "ï¼Ÿ";
+            this.btnHelp.UseVisualStyleBackColor = false;
+            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            // 
             // groupBox2
             // 
             this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -431,6 +448,7 @@
             this.dataGridViewTextBoxColumn3,
             this.Column5,
             this.Column6,
+            this.Column7,
             this.Column4,
             this.Column1,
             this.Column3,
@@ -491,10 +509,20 @@
             this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column6.Width = 400;
             // 
+            // Column7
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column7.HeaderText = "æ‰¿èª�å›žæ•°";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // Column4
             // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column4.HeaderText = "æ³¨æ–‡æ›¸å�°åˆ·æ—¥";
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
@@ -504,8 +532,8 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column1.HeaderText = "ç™ºæ³¨é‡‘é¡�";
             this.Column1.Name = "Column1";
             this.Column1.ReadOnly = true;
@@ -514,12 +542,12 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column3.HeaderText = "æ”¯æ‰•æ�¡ä»¶";
             this.Column3.Name = "Column3";
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 300;
+            this.Column3.Width = 200;
             // 
             // Column2
             // 
@@ -526,21 +554,6 @@
             this.Column2.HeaderText = "å�°åˆ·";
             this.Column2.Name = "Column2";
             // 
-            // btnHelp
-            // 
-            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnHelp.BackColor = System.Drawing.Color.Black;
-            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1313, 0);
-            this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Size = new System.Drawing.Size(30, 30);
-            this.btnHelp.TabIndex = 116;
-            this.btnHelp.TabStop = false;
-            this.btnHelp.Text = "ï¼Ÿ";
-            this.btnHelp.UseVisualStyleBackColor = false;
-            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
-            // 
             // FrmPurchaseOrderPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -604,14 +617,15 @@
         private System.Windows.Forms.ProgressBar PrintProgress;
         private System.Windows.Forms.Label lblNoLook;
         private System.Windows.Forms.Label lblCellTotal;
+        private System.Windows.Forms.Button btnHelp;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
-        private System.Windows.Forms.Button btnHelp;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs	(revision 483)
@@ -60,6 +60,10 @@
             /// </summary>
             PurchaseName,
             /// <summary>
+            /// æ‰¿èª�å›žæ•°
+            /// </summary>
+            OrderNo,
+            /// <summary>
             /// æ³¨æ–‡æ›¸ä½œæˆ�æ—¥
             /// </summary>
             CreateDate,
@@ -399,7 +403,7 @@
         /// <summary>
         /// æ©Ÿèƒ½æ‰¿èª�å›žæ•°
         /// </summary>
-        private int m_OrderNo = 1;
+        private int m_OrderNo = 0;
 
         /// <summary>
         /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹ãƒ•ãƒ©ã‚°
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.resx	(revision 483)
@@ -123,6 +123,9 @@
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs	(revision 483)
@@ -211,7 +211,7 @@
             {
                 // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿èª­è¾¼
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("SELECT A.* FROM PURCHASEORDER A");
+                strSQL.Append("SELECT A.*, C.OrderNo FROM PURCHASEORDER A");
                 strSQL.Append(", PROCESSAPPROVALDETAIL B");
                 strSQL.Append(", PROCESSAPPROVAL C");
 
@@ -218,7 +218,7 @@
                 strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
                 strSQL.Append("       AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
                 strSQL.AppendFormat(" AND B.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
-                strSQL.AppendFormat(" AND B.ORDERNO = {0}", m_OrderNo);
+                if (m_OrderNo > 0) strSQL.AppendFormat(" AND B.ORDERNO = {0}", m_OrderNo);
                 strSQL.Append("       AND B.LINKCODE = A.SEQNO");
                 strSQL.Append("       AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
                 strSQL.Append("       AND C.APPROVALCODE = B.APPROVALCODE");
@@ -225,7 +225,7 @@
                 strSQL.Append("       AND C.ORDERNO = B.ORDERNO");
                 strSQL.Append("       AND C.SEQNO = 1");
                 strSQL.AppendFormat(" AND C.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval);
-                strSQL.Append(" ORDER BY A.SEQNO");
+                strSQL.Append(" ORDER BY C.OrderNo Desc");
 
                 ArrayList arList = new ArrayList();
                 if (!OrderDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
@@ -235,6 +235,7 @@
                 int icnt = 1;
                 PurchaseOrder OrderRec = new PurchaseOrder();
                 string strPrintDate = string.Empty;
+                int nDLength = Enum.GetNames(typeof(IOPurchaseOrder.TableColumn)).Length;
                 foreach (object[] objRec in arList)
                 {
                     OrderDB.Reader2Struct(objRec, ref OrderRec);
@@ -281,8 +282,10 @@
                                                                                     , OrderRec.SeqNo.ToString("000"));
                     // ç™ºæ³¨ä¼šç¤¾å��
                     CurRow.Cells[(int)GridColumn.PurchaseName].Value = SubConRec.CompanyName;
+                    // æ‰¿èª�å›žæ•°
+                    CurRow.Cells[(int)GridColumn.OrderNo].Value = string.Format("{0}å›žç›®",CommonMotions.cnvInt(objRec[nDLength]));
                     // æ³¨æ–‡æ›¸ä½œæˆ�æ—¥
-                    CurRow.Cells[(int)GridColumn.CreateDate].Value = strPrintDate;
+                    CurRow.Cells[(int)GridColumn.CreateDate].Value = OrderRec.PrintoutDate.ToShortDateString();
                     // ç™ºæ³¨é‡‘é¡�
                     CurRow.Cells[(int)GridColumn.PurchasePrice].Value = OrderRec.OrderPrice.ToString("#,0");
                     // ç™ºæ³¨æ�¡ä»¶
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs	(revision 483)
@@ -205,7 +205,7 @@
         /// <param name="e"></param>
         private async void FrmPurchaseOrderStatus_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
        
             // �‰Šú•\Ž¦
             InitDataLoad();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ReqMessage/FrmReqMessageList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ReqMessage/FrmReqMessageList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ReqMessage/FrmReqMessageList.cs	(revision 483)
@@ -202,7 +202,7 @@
         /// <param name="e"></param>
         private async void FrmReqMessageList_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
             // ƒtƒH�[ƒ€ƒ��[ƒhŽž‚Ì�ˆ—�
             InitFormLoad();
         }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ReqMessage/FrmReqMessageListAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ReqMessage/FrmReqMessageListAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ReqMessage/FrmReqMessageListAux.cs	(revision 483)
@@ -197,11 +197,12 @@
             try
             {
                 strSQL.Append("Select A.*, B.DataCnt, C.PersonName, D.DepartmentString");
-                strSQL.Append(" From NotificationMessage As A");
-                strSQL.Append("      Left Join(Select BB.MessageDate, BB.SeqNo, Count(*) As DataCnt");
-                strSQL.Append("                 From notificationmessagebrowsing As BB");
-                strSQL.Append("                 Where BB.BrowsingFlag = 0) As B");
-                strSQL.Append("            On B.MessageDate = A.MessageDate");
+                strSQL.Append("      From NotificationMessage As A");
+                strSQL.Append("           Left Join(Select BB.MessageDate, BB.SeqNo, Count(*) As DataCnt");
+                strSQL.Append("                            From notificationmessagebrowsing As BB");
+                strSQL.Append("                            Where BB.BrowsingFlag = 0");
+                strSQL.Append("                            Group by BB.MessageDate, BB.SeqNo) As B");
+                strSQL.Append("            On DATE(B.MessageDate) = DATE(A.MessageDate)");
                 strSQL.Append("            And B.SeqNo = A.SeqNo");
                 strSQL.Append("      Left Join personinchargemaster As C On C.PersonCode = A.PersonCode");
                 strSQL.Append("      Left Join departmentmaster As D On D.DepartmentCode = A.PersonCode");
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 483)
@@ -3648,12 +3648,10 @@
             IORequestHead ioReqHead = new IORequestHead();
             IORequestData ioReqData = new IORequestData();
             IORequestDataDetail ioReqDetail = new IORequestDataDetail();
-            IOConstructionLedgerExcute ioLedger = new IOConstructionLedgerExcute();
 
             ioReqHead.connect(); ioReqHead.beginTran();
             ioReqData.connect(); ioReqData.beginTran();
             ioReqDetail.connect(); ioReqDetail.beginTran();
-            ioLedger.connect(); ioLedger.beginTran();
 
              RequestHead ReqHead = m_lstRequestHead[m_nMaxOrderNo - 1];
 
@@ -3750,22 +3748,10 @@
                     return bRet;
                 }
 
-                // å�°å¸³é‡‘é¡�åŠ ç®—
-                if (!UpdateLedger(ioLedger, ioReqHead))
-                {
-                    MessageBox.Show("å·¥äº‹å�°å¸³æ›´æ–°ã‚¨ãƒ©ãƒ¼"
-                                    , "ç™»éŒ²ã‚¨ãƒ©ãƒ¼"
-                                    , MessageBoxButtons.OK
-                                    , MessageBoxIcon.Error);
-                    bRet = false;
-                    return bRet;
-                }
-
                 // ã‚³ãƒŸãƒƒãƒˆ
                 ioReqHead.commit();
                 ioReqData.commit();
                 ioReqDetail.commit();
-                ioLedger.commit();
 
                 return true;
             }
@@ -3781,73 +3767,15 @@
                     ioReqHead.rollback();
                     ioReqData.rollback();
                     ioReqDetail.rollback();
-                    ioLedger.rollback();
                 }
 
                 ioReqHead.close(); ioReqHead = null;
                 ioReqData.close(); ioReqData = null;
                 ioReqDetail.close(); ioReqDetail = null;
-                ioLedger.close(); ioLedger = null;
             }
         }
         #endregion
 
-        #region å·¥äº‹å�°å¸³æ›´æ–°å‡¦ç�†
-        /// <summary>
-        /// å·¥äº‹å�°å¸³æ›´æ–°å‡¦ç�†
-        /// </summary>
-        /// <param name="ioLedger"></param>
-        /// <returns></returns>
-        private bool UpdateLedger(IOConstructionLedgerExcute ioLedger, IORequestHead ioReqHead)
-        {
-            try
-            {
-                int tcol = m_nMaxOrderNo + (int)ColumnName1.Sum;
-                DateTime dtRequest = CommonMotions.cnvDate(dgv1.Rows[(int)HeaderRowIndex.BillingDate].Cells[tcol].Value);
-                int ColPoint = ClsChangeLedgerData.CalcTargetMonthToColumn(ioLedger, false, m_ConstructionCode, dtRequest);
-
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append(ioLedger.CreatePrimarykeyString(m_ConstructionCode
-                                                                , (int)FrmConstructionLedger.DataGroup.BillingAmount
-                                                                , 0
-                                                                , ColPoint));
-                // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿å‰Šé™¤
-                ioLedger.DeleteAction(strSQL.ToString(), false);
-
-                // è«‹æ±‚é‡‘é¡�å�–å¾—
-                strSQL.Clear();
-                strSQL.Append("Select");
-                strSQL.Append(" SUM(REQUESTAMOUNT)");
-                strSQL.Append(" From REQUESTHEAD");
-                strSQL.AppendFormat(" Where REQCONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                strSQL.AppendFormat(" And REQUESTMONTH = {0}{1}", dtRequest.Year, dtRequest.Month.ToString("00"));
-                ArrayList ReqData = new ArrayList();
-                if (!ioReqHead.ExecuteReader(strSQL.ToString(), ref ReqData, false)) return false;
-                if (ReqData.Count < 1) return false;
-
-                object[] objRec = (object[])ReqData[0];
-                long lValue = CommonMotions.cnvLong(objRec[0]);
-                if (lValue == 0) return true;
-
-                ConstructionLedgerExcute DataRec = new ConstructionLedgerExcute();
-                DataRec.ConstructionCode = m_ConstructionCode;
-                DataRec.GroupCount = (int)FrmConstructionLedger.DataGroup.BillingAmount;
-                //DataRec.LineCount
-                DataRec.ColumnCount = ColPoint;
-                DataRec.PaymentAmount = lValue;
-                DataRec.TargetMonth = dtRequest.BeginOfMonth();
-                if (!ioLedger.InsertAction(DataRec, false)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
         #region è«‹æ±‚ãƒ‡ãƒ¼ã‚¿ãƒªã‚¹ãƒˆã�®è¨­å®š
         /// <summary>
         /// è«‹æ±‚ãƒ‡ãƒ¼ã‚¿ãƒªã‚¹ãƒˆã�®è¨­å®š
@@ -3935,7 +3863,9 @@
                 strSQL.AppendFormat(" AND CONSTRUCTIONSTATUSFLG != {0}", iStatus);
 
                 iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("å�—ã€€ã€€æ³¨")).Key;
-                strSQL.AppendFormat(" AND (CONSTRUCTIONSTATUSFLG >= {0})", iStatus);
+                int iStatus2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("ä¸€èˆ¬è£œä¿®å·¥äº‹")).Key;
+                strSQL.AppendFormat(" AND (CONSTRUCTIONSTATUSFLG >= {0}", iStatus);
+                strSQL.AppendFormat(" OR CONSTRUCTIONSTATUSFLG = {0})", iStatus2);
 
                 //// åˆ†å‰²ã�‹ä¸€æ‹¬ã�‹ã�«ã‚ˆã�£ã�¦å¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã�Œé�•ã�†
                 //switch (m_BaseConstructionBaseInfo.BillingSplitFlg)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs	(revision 483)
@@ -35,6 +35,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label4 = new System.Windows.Forms.Label();
             this.lbReqMonth = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -44,15 +45,6 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.PrintProgress = new System.Windows.Forms.ProgressBar();
             this.lbTotalAmount = new System.Windows.Forms.Label();
-            this.dgv1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.col2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label8 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.lbSelect = new System.Windows.Forms.Label();
@@ -64,9 +56,19 @@
             this.btnCancel = new System.Windows.Forms.Button();
             this.lblCellTotal = new System.Windows.Forms.Label();
             this.btnHelp = new System.Windows.Forms.Button();
+            this.dgv1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.col2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv1)).BeginInit();
-            this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // label4
@@ -187,129 +189,6 @@
             this.lbTotalAmount.TabIndex = 42;
             this.lbTotalAmount.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // dgv1
-            // 
-            this.dgv1.AllowUserToAddRows = false;
-            this.dgv1.AllowUserToDeleteRows = false;
-            this.dgv1.AllowUserToResizeColumns = false;
-            this.dgv1.AllowUserToResizeRows = false;
-            this.dgv1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgv1.BackgroundColor = System.Drawing.Color.White;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgv1.ColumnHeadersHeight = 24;
-            this.dgv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column1,
-            this.col1,
-            this.col2,
-            this.col3,
-            this.Column2,
-            this.col4,
-            this.col5,
-            this.col6});
-            this.dgv1.EnableHeadersVisualStyles = false;
-            this.dgv1.Location = new System.Drawing.Point(8, 34);
-            this.dgv1.Name = "dgv1";
-            this.dgv1.RowHeadersVisible = false;
-            this.dgv1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgv1.RowTemplate.Height = 20;
-            this.dgv1.Size = new System.Drawing.Size(1240, 414);
-            this.dgv1.TabIndex = 43;
-            this.dgv1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellContentClick);
-            this.dgv1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgv1_MouseUp);
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "â„–";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 60;
-            // 
-            // col1
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
-            dataGridViewCellStyle3.NullValue = false;
-            this.col1.DefaultCellStyle = dataGridViewCellStyle3;
-            this.col1.Frozen = true;
-            this.col1.HeaderText = "";
-            this.col1.Name = "col1";
-            this.col1.Width = 30;
-            // 
-            // col2
-            // 
-            this.col2.HeaderText = "è«‹ã€€æ±‚ã€€æ¡ˆã€€ä»¶";
-            this.col2.Name = "col2";
-            this.col2.ReadOnly = true;
-            this.col2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.col2.Width = 670;
-            // 
-            // col3
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
-            this.col3.DefaultCellStyle = dataGridViewCellStyle4;
-            this.col3.HeaderText = "è«‹æ±‚é‡‘é¡�(ç¨ŽæŠœ)";
-            this.col3.Name = "col3";
-            this.col3.ReadOnly = true;
-            this.col3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.col3.Width = 160;
-            // 
-            // Column2
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column2.HeaderText = "è«‹æ±‚é‡‘é¡�(ç¨Žè¾¼)";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 160;
-            // 
-            // col4
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
-            this.col4.DefaultCellStyle = dataGridViewCellStyle6;
-            this.col4.HeaderText = "è«‹æ±‚æ›¸ä½œæˆ�æ—¥";
-            this.col4.Name = "col4";
-            this.col4.ReadOnly = true;
-            this.col4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.col4.Width = 140;
-            // 
-            // col5
-            // 
-            this.col5.HeaderText = "RequestNo";
-            this.col5.Name = "col5";
-            this.col5.ReadOnly = true;
-            this.col5.Visible = false;
-            // 
-            // col6
-            // 
-            this.col6.HeaderText = "InvoiceNo";
-            this.col6.Name = "col6";
-            this.col6.ReadOnly = true;
-            this.col6.Visible = false;
-            // 
             // label8
             // 
             this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
@@ -460,6 +339,142 @@
             this.btnHelp.UseVisualStyleBackColor = false;
             this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
             // 
+            // dgv1
+            // 
+            this.dgv1.AllowUserToAddRows = false;
+            this.dgv1.AllowUserToDeleteRows = false;
+            this.dgv1.AllowUserToResizeColumns = false;
+            this.dgv1.AllowUserToResizeRows = false;
+            this.dgv1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dgv1.BackgroundColor = System.Drawing.Color.White;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgv1.ColumnHeadersHeight = 24;
+            this.dgv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column1,
+            this.col1,
+            this.col2,
+            this.Column3,
+            this.col3,
+            this.Column2,
+            this.col4,
+            this.col5,
+            this.col6});
+            this.dgv1.EnableHeadersVisualStyles = false;
+            this.dgv1.Location = new System.Drawing.Point(8, 34);
+            this.dgv1.Name = "dgv1";
+            this.dgv1.RowHeadersVisible = false;
+            this.dgv1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgv1.RowTemplate.Height = 20;
+            this.dgv1.Size = new System.Drawing.Size(1240, 414);
+            this.dgv1.TabIndex = 43;
+            this.dgv1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellContentClick);
+            this.dgv1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgv1_MouseUp);
+            // 
+            // Column1
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "â„–";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 60;
+            // 
+            // col1
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle3.NullValue = false;
+            this.col1.DefaultCellStyle = dataGridViewCellStyle3;
+            this.col1.Frozen = true;
+            this.col1.HeaderText = "";
+            this.col1.Name = "col1";
+            this.col1.Width = 30;
+            // 
+            // col2
+            // 
+            this.col2.HeaderText = "è«‹ã€€æ±‚ã€€æ¡ˆã€€ä»¶";
+            this.col2.Name = "col2";
+            this.col2.ReadOnly = true;
+            this.col2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.col2.Width = 570;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle4;
+            this.Column3.HeaderText = "è«‹æ±‚ç· æ—¥";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 120;
+            // 
+            // col3
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
+            this.col3.DefaultCellStyle = dataGridViewCellStyle5;
+            this.col3.HeaderText = "è«‹æ±‚é‡‘é¡�(ç¨ŽæŠœ)";
+            this.col3.Name = "col3";
+            this.col3.ReadOnly = true;
+            this.col3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.col3.Width = 160;
+            // 
+            // Column2
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column2.HeaderText = "è«‹æ±‚é‡‘é¡�(ç¨Žè¾¼)";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column2.Width = 160;
+            // 
+            // col4
+            // 
+            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.col4.DefaultCellStyle = dataGridViewCellStyle7;
+            this.col4.HeaderText = "è«‹æ±‚ç™ºçµ¦æ—¥";
+            this.col4.Name = "col4";
+            this.col4.ReadOnly = true;
+            this.col4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.col4.Width = 120;
+            // 
+            // col5
+            // 
+            this.col5.HeaderText = "RequestNo";
+            this.col5.Name = "col5";
+            this.col5.ReadOnly = true;
+            this.col5.Visible = false;
+            // 
+            // col6
+            // 
+            this.col6.HeaderText = "InvoiceNo";
+            this.col6.Name = "col6";
+            this.col6.ReadOnly = true;
+            this.col6.Visible = false;
+            // 
             // FrmRequestPrintSel
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 15F);
@@ -486,8 +501,8 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmRequestPrintSel_FormClosing);
             this.Load += new System.EventHandler(this.FrmRequestPrintSel_Load);
             this.panel1.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgv1)).EndInit();
-            this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -515,14 +530,15 @@
         private System.Windows.Forms.ProgressBar PrintProgress;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Label lblCellTotal;
+        private System.Windows.Forms.Button btnHelp;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn col1;
         private System.Windows.Forms.DataGridViewTextBoxColumn col2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn col3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn col4;
         private System.Windows.Forms.DataGridViewTextBoxColumn col5;
         private System.Windows.Forms.DataGridViewTextBoxColumn col6;
-        private System.Windows.Forms.Button btnHelp;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.cs	(revision 483)
@@ -46,6 +46,7 @@
             DataNo=0,
             CheckFlg,
             RequestTitle,
+            BillingDate,
             ReqValue,
             ReqValueInTax,
             CreateDate,
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.resx	(revision 483)
@@ -126,6 +126,9 @@
   <metadata name="col2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="col3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelAux.cs	(revision 483)
@@ -252,6 +252,7 @@
                     CurRow.Cells[(int)DispColumn.ReqValue].Value = ReqHead.RequestAmount.ToString("#,0");
                     CurRow.Cells[(int)DispColumn.ReqValueInTax].Value = (ReqHead.RequestAmount+ ReqHead.TaxAmount).ToString("#,0");
                     CurRow.Cells[(int)DispColumn.RequestNo].Value = ReqHead.RequestNo;
+                    CurRow.Cells[(int)DispColumn.BillingDate].Value = ReqHead.BillingDate.ToShortDateString();
 
                     // å�°åˆ·æœªã�¯ä»¥ä¸‹ã‚’å‡¦ç�†ã�—ã�ªã�„
                     if (ReqHead.InvoiceNo < 1) continue;
@@ -299,8 +300,6 @@
         {
             try
             {
-                int nRet = (int)CheckState.Ok;
-
                 // é�¸æŠžã�ªã�—
                 int nSelect = CommonMotions.cnvInt(lbSelect.Text);
                 if (nSelect < 1)
@@ -316,12 +315,33 @@
                     return (int)CheckState.Error;
                 }
 
-                if (nRet == (int)CheckState.Ok)
+
+                // å�Œä¸€ç· æ—¥ã�®ãƒ�ã‚§ãƒƒã‚¯
+                List<DateTime> BillDateList = new List<DateTime>();
+                foreach(DataGridViewRow CurRow in dgv1.Rows)
                 {
-                    msg = "ã�“ã�®å†…å®¹ã�§è«‹æ±‚æ›¸ã‚’ä½œæˆ�ã�—ã�¦ã‚ˆã‚�ã�—ã�„ã�§ã�—ã‚‡ã�†ã�‹ï¼Ÿ";
+                    // ãƒ�ã‚§ãƒƒã‚¯ç„¡ã�¯å¯¾è±¡å¤–
+                    if(!CommonMotions.cnvBool(CurRow.Cells[(int)DispColumn.CheckFlg].Value)) continue;
+
+                    DateTime dtWork = CommonMotions.cnvDate(CurRow.Cells[(int)DispColumn.BillingDate].Value);
+                    // ä»¶æ•°ã�ªã�—ã�¯ã‚»ãƒƒãƒˆã�™ã‚‹
+                    if (BillDateList.Count < 1)
+                    {
+                        BillDateList.Add(dtWork.Date);
+                        continue;
+                    }
+
+                    // å�Œã�˜æ—¥ä»˜ã�Œç„¡ã�‘ã‚Œã�°ã‚¨ãƒ©ãƒ¼
+                    if (BillDateList.IndexOf(dtWork) < 0)
+                    {
+                        msg = "è«‹æ±‚ç· æ—¥ã�Œé�•ã�†ã‚‚ã�®ã�¯ä¸€ç·’ã�«å�°åˆ·ã�§ã��ã�¾ã�›ã‚“ã€‚";
+                        return (int)CheckState.Error;
+                    }
                 }
 
-                return nRet;
+                msg = "ã�“ã�®å†…å®¹ã�§è«‹æ±‚æ›¸ã‚’ä½œæˆ�ã�—ã�¦ã‚ˆã‚�ã�—ã�„ã�§ã�—ã‚‡ã�†ã�‹ï¼Ÿ";
+
+                return (int)CheckState.Ok;
             }
             catch (Exception ex)
             {
@@ -613,11 +633,9 @@
         {
             try
             {
-                int ret;
+                // ä½œæˆ�ãƒ�ã‚§ãƒƒã‚¯
                 string msg = string.Empty;
-
-                // ä½œæˆ�ãƒ�ã‚§ãƒƒã‚¯
-                ret = CheckGenerate(ref msg);
+                int ret = CheckGenerate(ref msg);
                 bool bError = false;
                 switch (ret)
                 {
@@ -648,6 +666,35 @@
         }
         #endregion
 
+        #region ã‚°ãƒªãƒƒãƒ‰ã‚ˆã‚Šè«‹æ±‚ç· æ—¥ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ã‚ˆã‚Šè«‹æ±‚ç· æ—¥ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private DateTime GetBillingDate()
+        {
+            DateTime dtRet = DateTime.Today.Date;
+            try
+            {
+                // å�Œä¸€ç· æ—¥ã�®ãƒ�ã‚§ãƒƒã‚¯
+                List<DateTime> BillDateList = new List<DateTime>();
+                foreach (DataGridViewRow CurRow in dgv1.Rows)
+                {
+                    // ãƒ�ã‚§ãƒƒã‚¯ç„¡ã�¯å¯¾è±¡å¤–
+                    if (!CommonMotions.cnvBool(CurRow.Cells[(int)DispColumn.CheckFlg].Value)) continue;
+
+                    dtRet = CommonMotions.cnvDate(CurRow.Cells[(int)DispColumn.BillingDate].Value).Date;
+                    break; 
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            return dtRet;
+        }
+        #endregion
+
         #region å�°åˆ·å®Ÿè¡Œ
         /// <summary>
         /// å�°åˆ·å®Ÿè¡Œ
@@ -667,8 +714,10 @@
                 // ä½œæˆ�ãƒ�ã‚§ãƒƒã‚¯
                 if (!GenerateCheck()) return;
 
+                DateTime dtBillDate = GetBillingDate();
+
                 // å�°åˆ·ç¢ºèª�ç”»é�¢ã�¸ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                SetParaInvoiceData(frmPrint, ioInvData);
+                SetParaInvoiceData(frmPrint, ioInvData, dtBillDate);
 
                 // å�°åˆ·ç¢ºèª�ç”»é�¢è¡¨ç¤º
                 m_PrintresRet = DialogResult.Cancel;
@@ -816,12 +865,14 @@
         /// <summary>
         /// å�°åˆ·ç¢ºèª�ç”»é�¢ã�¸ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// </summary>
-        private void SetParaInvoiceData(FrmRequestPrint frmPrint, IOInvoiceData ioInvData)
+        private void SetParaInvoiceData(FrmRequestPrint frmPrint
+                                        , IOInvoiceData ioInvData
+                                        , DateTime dtBillDate)
         {
             try
             {
                 frmPrint.OrdersName = lbOrderersName.Text;
-                frmPrint.ExcuteDate = DateTime.Today.Date;
+                frmPrint.ExcuteDate = dtBillDate;
 
                 int nInvoiceNo = GetSelInvoiceNo();
                 if (nInvoiceNo < 1) return;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelPrtOut.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelPrtOut.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelPrtOut.cs	(revision 483)
@@ -1062,7 +1062,7 @@
                             DateDescription = "ï¼ˆå¥‘ç´„å·¥æœŸçµ‚äº†æ—¥ï¼‰";
                         }
 
-                        ExcelPrnData.AddPrintData("C", trow + 1, string.Format("ï½ž {0}", EndDate));                      // å·¥æœŸçµ‚äº†
+                        ExcelPrnData.AddPrintData("C", trow + 1, string.Format("ï½ž {0}", EndDate));                     // å·¥æœŸçµ‚äº†
                         ExcelPrnData.AddPrintData("C", trow + 2, DateDescription);                                      // çµ‚äº†æ—¥èª¬æ˜Ž
 
                         ExcelPrnData.AddPrintData("D", trow, string.Format("{0}å¹´{1}æœˆ{2}æ—¥"
@@ -1080,8 +1080,7 @@
                         //lAmount += ReqData.TaxAmount;
                         //lAmount += ReqData.UnpaidAmount;
 
-                        //ExcelPrnData.AddPrintData("E", trow, lAmount.ToString("#,0"));                                // è«‹æ±‚é‡‘é¡�
-                        ExcelPrnData.AddPrintData("E", trow, ReqHead.RequestAmount.ToString("#,0"));                    // è«‹æ±‚é‡‘é¡�
+                        ExcelPrnData.AddPrintData("E", trow, ReqHead.RequestTotalAmount.ToString("#,0"));               // è«‹æ±‚é‡‘é¡�
 
                         ExcelPrnData.AddPrintData("F", trow, ReqData.Note);                                             // å‚™è€ƒ
                         ExcelPrnData.AddPrintData("A", 34, CommonMotions.SystemMasterData.CompanyName1.Trim());         // ãƒ•ãƒƒãƒ€ãƒ¼
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrintList/FrmReqPrintListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrintList/FrmReqPrintListAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrintList/FrmReqPrintListAuxiliary.cs	(revision 483)
@@ -396,6 +396,7 @@
                 strSQL.Append(" Inner Join processapproval As App");
                 strSQL.Append("        On App.ConstructionCode = Base.ConstructionCode");
                 strSQL.AppendFormat("  And App.ApprovalCode = {0}",(int)ClsExcute.ApprovalListNo.OrderRequestApproval);
+                strSQL.Append("        And App.OrderNo = ReqHead.ORDERNO");
                 strSQL.Append("        And App.SeqNo = 1");
                 strSQL.AppendFormat("  And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
 
@@ -484,18 +485,21 @@
                          nBreakMonth = nReqMonth;
                     }
 
-                    dgv.Rows.Add((ino++)
-                                , string.Format("{0}”N{1}ŒŽ", (nReqMonth / 100), (nReqMonth % 100).ToString())
-                                , strOrder
-                                , nNotCnt.ToString("#,0")
-                                , nOnCnt.ToString("#,0")
-                                , lNotVal.ToString("#,0")
-                                , lOnVal.ToString("#,0")
-                                , nReqMonth
-                                , nOrderDiv
-                                , nOrderCode
-                        );
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
 
+
+                    CurRow.Cells[(int)DispColumn.No].Value = (ino++);
+                    CurRow.Cells[(int)DispColumn.RequestMonth].Value = string.Format("{0}”N{1}ŒŽ", (nReqMonth / 100), (nReqMonth % 100).ToString());
+                    CurRow.Cells[(int)DispColumn.OrdererName].Value = strOrder;
+                    CurRow.Cells[(int)DispColumn.UnReqCount].Value = nNotCnt.ToString("#,0");
+                    CurRow.Cells[(int)DispColumn.ReqCount].Value = nOnCnt.ToString("#,0");
+                    CurRow.Cells[(int)DispColumn.UnReqValue].Value = lNotVal.ToString("#,0");
+                    CurRow.Cells[(int)DispColumn.ReqValue].Value = lOnVal.ToString("#,0");
+                    CurRow.Cells[(int)DispColumn.RequestMonthKey].Value = nReqMonth;
+                    CurRow.Cells[(int)DispColumn.DivisionCode].Value = nOrderDiv;
+                    CurRow.Cells[(int)DispColumn.OrdererCode].Value = nOrderCode;
+
                 }
             }
             catch (Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.cs	(revision 483)
@@ -154,6 +154,8 @@
             CompanyName2,
             LedgerRowLine,
             DetailName,
+            PurchaseVal,
+            ExecSumVal,
             LabourKind,
             SomuSeikyu,
             SomuKosoku,
@@ -255,6 +257,11 @@
             DetailNameBlank,
             Gojyuon,
             LinkDataType,
+            CostLinkKey1,
+            CostLinkKey2,
+            CostLinkKey3,
+            CostLinkKey4,
+            CostLinkKey5,
         }
         #endregion
 
@@ -296,8 +303,9 @@
         /// ƒwƒbƒ_�[�F’è‹`
         /// 0:‘�–±•”“ü—ÍƒJƒ‰ƒ€
         /// 1:�HŽ–•”“ü—ÍƒJƒ‰ƒ€
+        /// 2:”­’��EŽx•¥‹àŠz
         /// </summary>
-        private Color[] HeaderColor = new Color[] { Color.Coral, Color.SkyBlue };
+        private Color[] HeaderColor = new Color[] { Color.Coral, Color.SkyBlue, Color.Yellow };
         #endregion
 
         #region Žæ“¾‚·‚éƒf�[ƒ^�€–Ú
@@ -345,7 +353,7 @@
             InstrDepCode,               // Žw“±ˆõ•”��ƒR�[ƒh
             PurchaseOrderMailingDate,   // ’�•¶�‘—X‘—“ú
             PurchaseOrderReturnDate,    // ’�•¶�‘•Ô‘—“ú
-            PaData,                     // —\ŽZ�‘
+            PaData,                     // —\ŽZ�‘‘¶�Ýƒtƒ‰ƒO
             ConstructionLedgerRowNo,    // �HŽ–�Ú�×‘ä’ �s”Ô�†
             ConstructionLedgerDetailNo, // �HŽ–�Ú�×‘ä’ –¾�×”Ô�†
             ConstructionLedgerColNo,    // �HŽ–�Ú�×‘ä’ —ñ”Ô�†
@@ -372,6 +380,15 @@
             LabourKind,                 // Žx•¥‹æ•ª
             OrverFlg,                   // Žx•¥’´‰ßƒtƒ‰ƒO
             LinkDataType,               // ŠÖ˜A•t‚¯ƒf�[ƒ^ƒ^ƒCƒv
+            ExecSumVal,                 // Žx•¥�‡Œv‹àŠz
+            ExecNowVal,                 // “–ŒŽŽx•¥Šz
+            PurchaseVal,                // ”­’�‹àŠz
+            ExecutionAmount,            // —\ŽZŽÀ�s‹àŠz
+            YearNumber,                 // ”N“x
+            CostType,                   // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+            TargetType,                 // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+            TargetCode,                 // ‘Î�Û�æƒR�[ƒh
+            SeqNoC,                     // ƒf�[ƒ^”Ô�†
         }
         #endregion
 
@@ -528,7 +545,7 @@
         /// ‘—�MƒLƒ…�[˜A”Ô
         /// </summary>
         private int m_QueSeqNo = 0;
-        
+
         #region �³”Fƒpƒlƒ‹ƒŠƒXƒg
         /// <summary>
         /// �³”Fƒpƒlƒ‹ƒŠƒXƒg
@@ -760,7 +777,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DataGridView_CellEnter(object sender, DataGridViewCellEventArgs e)
+        private void dgvData_CellEnter(object sender, DataGridViewCellEventArgs e)
         {
             if (m_Abandonments) return;
 
@@ -775,7 +792,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DataGridView_CellValidated(object sender, DataGridViewCellEventArgs e)
+        private void dgvData_CellValidated(object sender, DataGridViewCellEventArgs e)
         {
             if (m_Abandonments) return;
 
@@ -827,7 +844,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DataGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
+        private void dgvData_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
         {
             if (m_Abandonments) return;
 
@@ -871,7 +888,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DataGridView_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        private void dgvData_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
             // ƒ_ƒuƒ‹ƒNƒŠƒbƒN�ˆ—�
             GridDoubleClick(sender, e);
@@ -884,10 +901,10 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
+        private void dgvData_CurrentCellDirtyStateChanged(object sender, EventArgs e)
         {
             DataGridViewEX dgv = (DataGridViewEX)sender;
-            dgv.CurrentCellDirtyStateChanged -= new System.EventHandler(DataGridView_CurrentCellDirtyStateChanged);
+            dgv.CurrentCellDirtyStateChanged -= new System.EventHandler(dgvData_CurrentCellDirtyStateChanged);
             try
             {
                 // ‹¦—Í‹àƒRƒ“ƒ{ƒ{ƒbƒNƒXƒRƒ~ƒbƒg‚³‚ê‚Ä‚¢‚È‚¯‚ê‚ÎƒRƒ~ƒbƒg
@@ -907,7 +924,7 @@
             }
             finally
             {
-                dgvData.CurrentCellDirtyStateChanged += new System.EventHandler(DataGridView_CurrentCellDirtyStateChanged);
+                dgvData.CurrentCellDirtyStateChanged += new System.EventHandler(dgvData_CurrentCellDirtyStateChanged);
             }
         }
         #endregion
@@ -924,7 +941,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DataGridView_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+        private void dgvData_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
         {
 
             DataGridViewEX dgv = (DataGridViewEX)sender;
@@ -1190,7 +1207,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnOtherAcc_Click(object sender, EventArgs e)
+        private void btnPurchase_Click(object sender, EventArgs e)
         {
 
         }
@@ -1202,9 +1219,10 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnDepExpence_Click(object sender, EventArgs e)
+        private void btnCostExpence_Click(object sender, EventArgs e)
         {
-
+            // •”��“™�w“ü•i�Ý’è�ˆ—�
+            CostExpenceExec();
         }
         #endregion
 
@@ -1465,6 +1483,9 @@
         /// <param name="e"></param>
         private void btnDataUpDate_Click(object sender, EventArgs e)
         {
+            // �³”F‰æ–Ê‚©‚ç‹N“®‚µ‚½Žž‚Æ“¯‚¶“®‚«‚ð�s‚¤
+            m_StartSourceFlg = (int)StartSource.FromMenu;
+
             // ƒf�[ƒ^•\Ž¦
             m_Abandonments = true;
             DispGridData();
@@ -1478,7 +1499,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvCompany_MouseUp(object sender, MouseEventArgs e)
+        private void dgvData_MouseUp(object sender, MouseEventArgs e)
         {
             // ‘I‘ðƒZƒ‹ŒvŽZ�ˆ—�
             GridCalcProc();
@@ -1598,11 +1619,26 @@
         /// <param name="e"></param>
         private void btnChkPetition_Click(object sender, EventArgs e)
         {
+            // ƒf�[ƒ^•Ï�XŠm”F
+            if (!DataChangeMsg())
+            {
+                //ƒf�[ƒ^ƒ`ƒFƒbƒN
+                if (!DispFeildCheck()) return;
+
+                // ƒf�[ƒ^“o˜^
+                if (!DataEntryProcess(true)) return;
+
+                m_bChengeAns = false;
+            }
             // ƒf�[ƒ^•\Ž¦
             m_Abandonments = true;
+
             // �³”F‰æ–Ê‚©‚ç‹N“®‚µ‚½Žž‚Æ“¯‚¶“®‚«‚ð�s‚¤
             m_StartSourceFlg = (int)StartSource.FromApproval;
+
+            // ƒf�[ƒ^‘I‘ð�Ä•\Ž¦
             DispGridData();
+
             m_Abandonments = false;
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.designer.cs	(revision 483)
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = 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();
@@ -64,13 +64,11 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.btnDataEntry = new System.Windows.Forms.Button();
-            this.btnDelProject = new System.Windows.Forms.Button();
-            this.btnDelCompany = new System.Windows.Forms.Button();
-            this.btnAddCompany = new System.Windows.Forms.Button();
-            this.btnAddProject = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
             this.label8 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -108,19 +106,26 @@
             this.lblEntryDateTo = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
             this.lblCellTotal = new System.Windows.Forms.Label();
-            this.panel5 = new System.Windows.Forms.Panel();
-            this.btnLinkLedger = new System.Windows.Forms.Button();
-            this.panel6 = new System.Windows.Forms.Panel();
-            this.panel7 = new System.Windows.Forms.Panel();
-            this.panel8 = new System.Windows.Forms.Panel();
-            this.btnAutoCalc = new System.Windows.Forms.Button();
             this.btnHelp = new System.Windows.Forms.Button();
             this.btnDspInput = new System.Windows.Forms.Button();
+            this.panel10 = new System.Windows.Forms.Panel();
+            this.btnCostExpence = new System.Windows.Forms.Button();
             this.panel9 = new System.Windows.Forms.Panel();
-            this.btnOtherAcc = new System.Windows.Forms.Button();
-            this.panel10 = new System.Windows.Forms.Panel();
-            this.btnDepExpence = new System.Windows.Forms.Button();
+            this.btnPurchase = new System.Windows.Forms.Button();
+            this.panel8 = new System.Windows.Forms.Panel();
+            this.btnAutoCalc = new System.Windows.Forms.Button();
+            this.panel7 = new System.Windows.Forms.Panel();
+            this.btnLinkLedger = new System.Windows.Forms.Button();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.btnAddProject = new System.Windows.Forms.Button();
+            this.btnDelProject = new System.Windows.Forms.Button();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.btnAddCompany = new System.Windows.Forms.Button();
+            this.btnDelCompany = new System.Windows.Forms.Button();
             this.dgvData = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.cmbTargetMonth = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.dgvCompany001 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvCompany002 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvCompany003 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -140,6 +145,8 @@
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvCompany016 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column16 = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.dgvCompany017 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvCompany018 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -239,9 +246,11 @@
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmbTargetMonth = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.Column21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.pnlApproval.SuspendLayout();
             this.pnlApprovalButton.SuspendLayout();
@@ -248,12 +257,12 @@
             this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
             this.panel4.SuspendLayout();
+            this.panel10.SuspendLayout();
+            this.panel9.SuspendLayout();
+            this.panel8.SuspendLayout();
+            this.panel7.SuspendLayout();
+            this.panel6.SuspendLayout();
             this.panel5.SuspendLayout();
-            this.panel6.SuspendLayout();
-            this.panel7.SuspendLayout();
-            this.panel8.SuspendLayout();
-            this.panel9.SuspendLayout();
-            this.panel10.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvData)).BeginInit();
             this.SuspendLayout();
             // 
@@ -293,7 +302,7 @@
             this.btnDataEntry.BackColor = System.Drawing.Color.Green;
             this.btnDataEntry.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(1087, 657);
+            this.btnDataEntry.Location = new System.Drawing.Point(1092, 657);
             this.btnDataEntry.Margin = new System.Windows.Forms.Padding(4);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
@@ -302,62 +311,6 @@
             this.btnDataEntry.UseVisualStyleBackColor = false;
             this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
             // 
-            // btnDelProject
-            // 
-            this.btnDelProject.BackColor = System.Drawing.Color.Red;
-            this.btnDelProject.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDelProject.ForeColor = System.Drawing.Color.FloralWhite;
-            this.btnDelProject.Location = new System.Drawing.Point(104, 2);
-            this.btnDelProject.Margin = new System.Windows.Forms.Padding(4);
-            this.btnDelProject.Name = "btnDelProject";
-            this.btnDelProject.Size = new System.Drawing.Size(100, 30);
-            this.btnDelProject.TabIndex = 8;
-            this.btnDelProject.Text = "ç�¾å ´å‰Šé™¤";
-            this.btnDelProject.UseVisualStyleBackColor = false;
-            this.btnDelProject.Click += new System.EventHandler(this.btnDeleteProject_Click);
-            // 
-            // btnDelCompany
-            // 
-            this.btnDelCompany.BackColor = System.Drawing.Color.Red;
-            this.btnDelCompany.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDelCompany.ForeColor = System.Drawing.Color.White;
-            this.btnDelCompany.Location = new System.Drawing.Point(104, 2);
-            this.btnDelCompany.Margin = new System.Windows.Forms.Padding(4);
-            this.btnDelCompany.Name = "btnDelCompany";
-            this.btnDelCompany.Size = new System.Drawing.Size(100, 30);
-            this.btnDelCompany.TabIndex = 6;
-            this.btnDelCompany.Text = "æ¥­è€…å‰Šé™¤";
-            this.btnDelCompany.UseVisualStyleBackColor = false;
-            this.btnDelCompany.Click += new System.EventHandler(this.btnDeleteCompany_Click);
-            // 
-            // btnAddCompany
-            // 
-            this.btnAddCompany.BackColor = System.Drawing.Color.Green;
-            this.btnAddCompany.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnAddCompany.ForeColor = System.Drawing.Color.White;
-            this.btnAddCompany.Location = new System.Drawing.Point(2, 2);
-            this.btnAddCompany.Margin = new System.Windows.Forms.Padding(4);
-            this.btnAddCompany.Name = "btnAddCompany";
-            this.btnAddCompany.Size = new System.Drawing.Size(100, 30);
-            this.btnAddCompany.TabIndex = 5;
-            this.btnAddCompany.Text = "æ¥­è€…è¿½åŠ ";
-            this.btnAddCompany.UseVisualStyleBackColor = false;
-            this.btnAddCompany.Click += new System.EventHandler(this.btnAddCompany_Click);
-            // 
-            // btnAddProject
-            // 
-            this.btnAddProject.BackColor = System.Drawing.Color.ForestGreen;
-            this.btnAddProject.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnAddProject.ForeColor = System.Drawing.Color.FloralWhite;
-            this.btnAddProject.Location = new System.Drawing.Point(2, 2);
-            this.btnAddProject.Margin = new System.Windows.Forms.Padding(4);
-            this.btnAddProject.Name = "btnAddProject";
-            this.btnAddProject.Size = new System.Drawing.Size(100, 30);
-            this.btnAddProject.TabIndex = 7;
-            this.btnAddProject.Text = "ç�¾å ´è¿½åŠ ";
-            this.btnAddProject.UseVisualStyleBackColor = false;
-            this.btnAddProject.Click += new System.EventHandler(this.btnAddProject_Click);
-            // 
             // panel1
             // 
             this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -864,73 +817,100 @@
             this.lblCellTotal.Size = new System.Drawing.Size(0, 16);
             this.lblCellTotal.TabIndex = 99;
             // 
-            // panel5
+            // btnHelp
             // 
-            this.panel5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.panel5.BackColor = System.Drawing.Color.DodgerBlue;
-            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel5.Controls.Add(this.btnAddCompany);
-            this.panel5.Controls.Add(this.btnDelCompany);
-            this.panel5.Location = new System.Drawing.Point(174, 653);
-            this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(210, 38);
-            this.panel5.TabIndex = 101;
+            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnHelp.BackColor = System.Drawing.Color.Black;
+            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHelp.ForeColor = System.Drawing.Color.White;
+            this.btnHelp.Location = new System.Drawing.Point(1310, 0);
+            this.btnHelp.Name = "btnHelp";
+            this.btnHelp.Size = new System.Drawing.Size(30, 30);
+            this.btnHelp.TabIndex = 105;
+            this.btnHelp.Text = "ï¼Ÿ";
+            this.btnHelp.UseVisualStyleBackColor = false;
+            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
             // 
-            // btnLinkLedger
+            // btnDspInput
             // 
-            this.btnLinkLedger.BackColor = System.Drawing.Color.White;
-            this.btnLinkLedger.Enabled = false;
-            this.btnLinkLedger.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnLinkLedger.ForeColor = System.Drawing.Color.Black;
-            this.btnLinkLedger.Location = new System.Drawing.Point(2, 2);
-            this.btnLinkLedger.Name = "btnLinkLedger";
-            this.btnLinkLedger.Size = new System.Drawing.Size(100, 30);
-            this.btnLinkLedger.TabIndex = 7;
-            this.btnLinkLedger.Text = "å�°å¸³é�¸æŠž";
-            this.btnLinkLedger.UseVisualStyleBackColor = false;
-            this.btnLinkLedger.Click += new System.EventHandler(this.btnLinkLedger_Click);
+            this.btnDspInput.BackColor = System.Drawing.Color.Peru;
+            this.btnDspInput.ForeColor = System.Drawing.Color.Linen;
+            this.btnDspInput.Location = new System.Drawing.Point(202, 6);
+            this.btnDspInput.Name = "btnDspInput";
+            this.btnDspInput.Size = new System.Drawing.Size(120, 30);
+            this.btnDspInput.TabIndex = 102;
+            this.btnDspInput.Text = "Webå…¥åŠ›è¡¨ç¤º";
+            this.btnDspInput.UseVisualStyleBackColor = false;
+            this.btnDspInput.Click += new System.EventHandler(this.btnDspInput_Click);
             // 
-            // panel6
+            // panel10
             // 
-            this.panel6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.panel6.BackColor = System.Drawing.Color.Orange;
-            this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel6.Controls.Add(this.btnAddProject);
-            this.panel6.Controls.Add(this.btnDelProject);
-            this.panel6.Location = new System.Drawing.Point(388, 653);
-            this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(210, 38);
-            this.panel6.TabIndex = 102;
+            this.panel10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel10.BackColor = System.Drawing.Color.AntiqueWhite;
+            this.panel10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel10.Controls.Add(this.btnCostExpence);
+            this.panel10.Location = new System.Drawing.Point(834, 653);
+            this.panel10.Name = "panel10";
+            this.panel10.Size = new System.Drawing.Size(126, 38);
+            this.panel10.TabIndex = 113;
             // 
-            // panel7
+            // btnCostExpence
             // 
-            this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.panel7.BackColor = System.Drawing.Color.Salmon;
-            this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel7.Controls.Add(this.btnLinkLedger);
-            this.panel7.Location = new System.Drawing.Point(602, 653);
-            this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(108, 38);
-            this.panel7.TabIndex = 103;
+            this.btnCostExpence.BackColor = System.Drawing.Color.LightSeaGreen;
+            this.btnCostExpence.Enabled = false;
+            this.btnCostExpence.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnCostExpence.ForeColor = System.Drawing.Color.Black;
+            this.btnCostExpence.Location = new System.Drawing.Point(1, 2);
+            this.btnCostExpence.Name = "btnCostExpence";
+            this.btnCostExpence.Size = new System.Drawing.Size(120, 30);
+            this.btnCostExpence.TabIndex = 7;
+            this.btnCostExpence.Text = "éƒ¨ç½²å‡ºç´�";
+            this.btnCostExpence.UseVisualStyleBackColor = false;
+            this.btnCostExpence.Click += new System.EventHandler(this.btnCostExpence_Click);
             // 
+            // panel9
+            // 
+            this.panel9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel9.BackColor = System.Drawing.Color.NavajoWhite;
+            this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel9.Controls.Add(this.btnPurchase);
+            this.panel9.Location = new System.Drawing.Point(707, 653);
+            this.panel9.Name = "panel9";
+            this.panel9.Size = new System.Drawing.Size(126, 38);
+            this.panel9.TabIndex = 112;
+            // 
+            // btnPurchase
+            // 
+            this.btnPurchase.BackColor = System.Drawing.Color.Turquoise;
+            this.btnPurchase.Enabled = false;
+            this.btnPurchase.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnPurchase.ForeColor = System.Drawing.Color.Black;
+            this.btnPurchase.Location = new System.Drawing.Point(1, 2);
+            this.btnPurchase.Name = "btnPurchase";
+            this.btnPurchase.Size = new System.Drawing.Size(120, 30);
+            this.btnPurchase.TabIndex = 7;
+            this.btnPurchase.Text = "è³¼ã€€å…¥ã€€å“�";
+            this.btnPurchase.UseVisualStyleBackColor = false;
+            this.btnPurchase.Click += new System.EventHandler(this.btnPurchase_Click);
+            // 
             // panel8
             // 
-            this.panel8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.panel8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.panel8.BackColor = System.Drawing.Color.MediumAquamarine;
             this.panel8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel8.Controls.Add(this.btnAutoCalc);
-            this.panel8.Location = new System.Drawing.Point(938, 653);
+            this.panel8.Location = new System.Drawing.Point(961, 653);
             this.panel8.Name = "panel8";
-            this.panel8.Size = new System.Drawing.Size(128, 38);
-            this.panel8.TabIndex = 104;
+            this.panel8.Size = new System.Drawing.Size(126, 38);
+            this.panel8.TabIndex = 111;
             // 
             // btnAutoCalc
             // 
             this.btnAutoCalc.BackColor = System.Drawing.Color.DarkRed;
             this.btnAutoCalc.Enabled = false;
-            this.btnAutoCalc.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnAutoCalc.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnAutoCalc.ForeColor = System.Drawing.Color.White;
-            this.btnAutoCalc.Location = new System.Drawing.Point(2, 2);
+            this.btnAutoCalc.Location = new System.Drawing.Point(1, 2);
             this.btnAutoCalc.Name = "btnAutoCalc";
             this.btnAutoCalc.Size = new System.Drawing.Size(120, 30);
             this.btnAutoCalc.TabIndex = 7;
@@ -938,82 +918,111 @@
             this.btnAutoCalc.UseVisualStyleBackColor = false;
             this.btnAutoCalc.Click += new System.EventHandler(this.btnAutoCalc_Click);
             // 
-            // btnHelp
+            // panel7
             // 
-            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnHelp.BackColor = System.Drawing.Color.Black;
-            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnHelp.ForeColor = System.Drawing.Color.White;
-            this.btnHelp.Location = new System.Drawing.Point(1310, 0);
-            this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Size = new System.Drawing.Size(30, 30);
-            this.btnHelp.TabIndex = 105;
-            this.btnHelp.Text = "ï¼Ÿ";
-            this.btnHelp.UseVisualStyleBackColor = false;
-            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
+            this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel7.BackColor = System.Drawing.Color.Salmon;
+            this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel7.Controls.Add(this.btnLinkLedger);
+            this.panel7.Location = new System.Drawing.Point(590, 653);
+            this.panel7.Name = "panel7";
+            this.panel7.Size = new System.Drawing.Size(116, 38);
+            this.panel7.TabIndex = 110;
             // 
-            // btnDspInput
+            // btnLinkLedger
             // 
-            this.btnDspInput.BackColor = System.Drawing.Color.Peru;
-            this.btnDspInput.ForeColor = System.Drawing.Color.Linen;
-            this.btnDspInput.Location = new System.Drawing.Point(202, 6);
-            this.btnDspInput.Name = "btnDspInput";
-            this.btnDspInput.Size = new System.Drawing.Size(120, 30);
-            this.btnDspInput.TabIndex = 102;
-            this.btnDspInput.Text = "Webå…¥åŠ›è¡¨ç¤º";
-            this.btnDspInput.UseVisualStyleBackColor = false;
-            this.btnDspInput.Click += new System.EventHandler(this.btnDspInput_Click);
+            this.btnLinkLedger.BackColor = System.Drawing.Color.White;
+            this.btnLinkLedger.Enabled = false;
+            this.btnLinkLedger.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnLinkLedger.ForeColor = System.Drawing.Color.Black;
+            this.btnLinkLedger.Location = new System.Drawing.Point(1, 2);
+            this.btnLinkLedger.Name = "btnLinkLedger";
+            this.btnLinkLedger.Size = new System.Drawing.Size(110, 30);
+            this.btnLinkLedger.TabIndex = 7;
+            this.btnLinkLedger.Text = "å�°å¸³é�¸æŠž";
+            this.btnLinkLedger.UseVisualStyleBackColor = false;
+            this.btnLinkLedger.Click += new System.EventHandler(this.btnLinkLedger_Click);
             // 
-            // panel9
+            // panel6
             // 
-            this.panel9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.panel9.BackColor = System.Drawing.Color.NavajoWhite;
-            this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel9.Controls.Add(this.btnOtherAcc);
-            this.panel9.Location = new System.Drawing.Point(714, 653);
-            this.panel9.Name = "panel9";
-            this.panel9.Size = new System.Drawing.Size(108, 38);
-            this.panel9.TabIndex = 106;
+            this.panel6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel6.BackColor = System.Drawing.Color.Orange;
+            this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel6.Controls.Add(this.btnAddProject);
+            this.panel6.Controls.Add(this.btnDelProject);
+            this.panel6.Location = new System.Drawing.Point(381, 653);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(207, 38);
+            this.panel6.TabIndex = 109;
             // 
-            // btnOtherAcc
+            // btnAddProject
             // 
-            this.btnOtherAcc.BackColor = System.Drawing.Color.Turquoise;
-            this.btnOtherAcc.Enabled = false;
-            this.btnOtherAcc.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnOtherAcc.ForeColor = System.Drawing.Color.Black;
-            this.btnOtherAcc.Location = new System.Drawing.Point(2, 2);
-            this.btnOtherAcc.Name = "btnOtherAcc";
-            this.btnOtherAcc.Size = new System.Drawing.Size(100, 30);
-            this.btnOtherAcc.TabIndex = 7;
-            this.btnOtherAcc.Text = "è³¼å…¥å“�";
-            this.btnOtherAcc.UseVisualStyleBackColor = false;
-            this.btnOtherAcc.Click += new System.EventHandler(this.btnOtherAcc_Click);
+            this.btnAddProject.BackColor = System.Drawing.Color.ForestGreen;
+            this.btnAddProject.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnAddProject.ForeColor = System.Drawing.Color.FloralWhite;
+            this.btnAddProject.Location = new System.Drawing.Point(1, 2);
+            this.btnAddProject.Margin = new System.Windows.Forms.Padding(4);
+            this.btnAddProject.Name = "btnAddProject";
+            this.btnAddProject.Size = new System.Drawing.Size(100, 30);
+            this.btnAddProject.TabIndex = 7;
+            this.btnAddProject.Text = "ç�¾å ´è¿½åŠ ";
+            this.btnAddProject.UseVisualStyleBackColor = false;
+            this.btnAddProject.Click += new System.EventHandler(this.btnAddProject_Click);
             // 
-            // panel10
+            // btnDelProject
             // 
-            this.panel10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.panel10.BackColor = System.Drawing.Color.AntiqueWhite;
-            this.panel10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel10.Controls.Add(this.btnDepExpence);
-            this.panel10.Location = new System.Drawing.Point(826, 653);
-            this.panel10.Name = "panel10";
-            this.panel10.Size = new System.Drawing.Size(108, 38);
-            this.panel10.TabIndex = 107;
+            this.btnDelProject.BackColor = System.Drawing.Color.Red;
+            this.btnDelProject.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDelProject.ForeColor = System.Drawing.Color.FloralWhite;
+            this.btnDelProject.Location = new System.Drawing.Point(101, 2);
+            this.btnDelProject.Margin = new System.Windows.Forms.Padding(4);
+            this.btnDelProject.Name = "btnDelProject";
+            this.btnDelProject.Size = new System.Drawing.Size(100, 30);
+            this.btnDelProject.TabIndex = 8;
+            this.btnDelProject.Text = "ç�¾å ´å‰Šé™¤";
+            this.btnDelProject.UseVisualStyleBackColor = false;
+            this.btnDelProject.Click += new System.EventHandler(this.btnDeleteProject_Click);
             // 
-            // btnDepExpence
+            // panel5
             // 
-            this.btnDepExpence.BackColor = System.Drawing.Color.LightSeaGreen;
-            this.btnDepExpence.Enabled = false;
-            this.btnDepExpence.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDepExpence.ForeColor = System.Drawing.Color.Black;
-            this.btnDepExpence.Location = new System.Drawing.Point(2, 2);
-            this.btnDepExpence.Name = "btnDepExpence";
-            this.btnDepExpence.Size = new System.Drawing.Size(100, 30);
-            this.btnDepExpence.TabIndex = 7;
-            this.btnDepExpence.Text = "éƒ¨ç½²çµŒè²»";
-            this.btnDepExpence.UseVisualStyleBackColor = false;
-            this.btnDepExpence.Click += new System.EventHandler(this.btnDepExpence_Click);
+            this.panel5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel5.BackColor = System.Drawing.Color.DodgerBlue;
+            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel5.Controls.Add(this.btnAddCompany);
+            this.panel5.Controls.Add(this.btnDelCompany);
+            this.panel5.Location = new System.Drawing.Point(172, 653);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(207, 38);
+            this.panel5.TabIndex = 108;
             // 
+            // btnAddCompany
+            // 
+            this.btnAddCompany.BackColor = System.Drawing.Color.Green;
+            this.btnAddCompany.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnAddCompany.ForeColor = System.Drawing.Color.White;
+            this.btnAddCompany.Location = new System.Drawing.Point(1, 2);
+            this.btnAddCompany.Margin = new System.Windows.Forms.Padding(4);
+            this.btnAddCompany.Name = "btnAddCompany";
+            this.btnAddCompany.Size = new System.Drawing.Size(100, 30);
+            this.btnAddCompany.TabIndex = 5;
+            this.btnAddCompany.Text = "æ¥­è€…è¿½åŠ ";
+            this.btnAddCompany.UseVisualStyleBackColor = false;
+            this.btnAddCompany.Click += new System.EventHandler(this.btnAddCompany_Click);
+            // 
+            // btnDelCompany
+            // 
+            this.btnDelCompany.BackColor = System.Drawing.Color.Red;
+            this.btnDelCompany.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDelCompany.ForeColor = System.Drawing.Color.White;
+            this.btnDelCompany.Location = new System.Drawing.Point(101, 2);
+            this.btnDelCompany.Margin = new System.Windows.Forms.Padding(4);
+            this.btnDelCompany.Name = "btnDelCompany";
+            this.btnDelCompany.Size = new System.Drawing.Size(100, 30);
+            this.btnDelCompany.TabIndex = 6;
+            this.btnDelCompany.Text = "æ¥­è€…å‰Šé™¤";
+            this.btnDelCompany.UseVisualStyleBackColor = false;
+            this.btnDelCompany.Click += new System.EventHandler(this.btnDeleteCompany_Click);
+            // 
             // dgvData
             // 
             this.dgvData.AllowUserToAddRows = false;
@@ -1051,6 +1060,8 @@
             this.Column2,
             this.Column14,
             this.dgvCompany016,
+            this.Column20,
+            this.Column19,
             this.Column16,
             this.dgvCompany017,
             this.dgvCompany018,
@@ -1149,15 +1160,20 @@
             this.dgvCompany100,
             this.Column1,
             this.Column13,
-            this.Column18});
-            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle36.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
-            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvData.DefaultCellStyle = dataGridViewCellStyle36;
+            this.Column18,
+            this.Column21,
+            this.Column22,
+            this.Column23,
+            this.Column24,
+            this.Column25});
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle38.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle38.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvData.DefaultCellStyle = dataGridViewCellStyle38;
             this.dgvData.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgvData.EnableHeadersVisualStyles = false;
             this.dgvData.Location = new System.Drawing.Point(2, 1);
@@ -1171,6 +1187,45 @@
             this.dgvData.Size = new System.Drawing.Size(1326, 512);
             this.dgvData.TabIndex = 4;
             // 
+            // cmbTargetMonth
+            // 
+            this.cmbTargetMonth.BackColor = System.Drawing.Color.White;
+            this.cmbTargetMonth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTargetMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbTargetMonth.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmbTargetMonth.FormattingEnabled = true;
+            this.cmbTargetMonth.Location = new System.Drawing.Point(124, 2);
+            this.cmbTargetMonth.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbTargetMonth.MaxDropDownItems = 12;
+            this.cmbTargetMonth.Name = "cmbTargetMonth";
+            this.cmbTargetMonth.Size = new System.Drawing.Size(140, 28);
+            this.cmbTargetMonth.TabIndex = 1;
+            this.cmbTargetMonth.TextChanged += new System.EventHandler(this.cmbTargetMonth_TextChanged);
+            // 
+            // cmbDepartment
+            // 
+            this.cmbDepartment.BackColor = System.Drawing.Color.White;
+            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDepartment.FormattingEnabled = true;
+            this.cmbDepartment.Location = new System.Drawing.Point(428, 5);
+            this.cmbDepartment.Name = "cmbDepartment";
+            this.cmbDepartment.Size = new System.Drawing.Size(170, 23);
+            this.cmbDepartment.TabIndex = 98;
+            this.cmbDepartment.TextChanged += new System.EventHandler(this.cmbPerson_TextChanged);
+            // 
+            // cmbPerson
+            // 
+            this.cmbPerson.BackColor = System.Drawing.Color.White;
+            this.cmbPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbPerson.FormattingEnabled = true;
+            this.cmbPerson.Location = new System.Drawing.Point(732, 5);
+            this.cmbPerson.Name = "cmbPerson";
+            this.cmbPerson.Size = new System.Drawing.Size(170, 23);
+            this.cmbPerson.TabIndex = 100;
+            this.cmbPerson.TextChanged += new System.EventHandler(this.cmbPerson_TextChanged);
+            // 
             // dgvCompany001
             // 
             this.dgvCompany001.HeaderText = "CompanyDispOrder";
@@ -1279,7 +1334,7 @@
             this.dgvCompany013.Name = "dgvCompany013";
             this.dgvCompany013.ReadOnly = true;
             this.dgvCompany013.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dgvCompany013.Width = 140;
+            this.dgvCompany013.Width = 130;
             // 
             // dgvCompany014
             // 
@@ -1299,7 +1354,7 @@
             this.Column15.Name = "Column15";
             this.Column15.ReadOnly = true;
             this.Column15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column15.Width = 60;
+            this.Column15.Width = 50;
             // 
             // dgvCompany015
             // 
@@ -1307,7 +1362,7 @@
             this.dgvCompany015.Name = "dgvCompany015";
             this.dgvCompany015.ReadOnly = true;
             this.dgvCompany015.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dgvCompany015.Width = 140;
+            this.dgvCompany015.Width = 130;
             // 
             // Column2
             // 
@@ -1315,7 +1370,7 @@
             this.Column2.Name = "Column2";
             this.Column2.ReadOnly = true;
             this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 140;
+            this.Column2.Width = 130;
             // 
             // Column14
             // 
@@ -1336,18 +1391,41 @@
             this.dgvCompany016.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.dgvCompany016.Width = 140;
             // 
+            // Column20
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column20.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column20.HeaderText = "ç™ºæ³¨é‡‘é¡�";
+            this.Column20.Name = "Column20";
+            this.Column20.ReadOnly = true;
+            this.Column20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column20.Width = 110;
+            // 
+            // Column19
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column19.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column19.HeaderText = "å‰�æœˆä»¥å‰�\r\næ”¯æ‰•æ¸ˆé‡‘é¡�";
+            this.Column19.Name = "Column19";
+            this.Column19.ReadOnly = true;
+            this.Column19.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column19.Width = 110;
+            // 
             // Column16
             // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column16.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS UI Gothic", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
+            this.Column16.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column16.HeaderText = "æ”¯æ‰•\nåŒºåˆ†";
             this.Column16.Name = "Column16";
-            this.Column16.Width = 70;
+            this.Column16.Width = 60;
             // 
             // dgvCompany017
             // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany017.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany017.DefaultCellStyle = dataGridViewCellStyle8;
             this.dgvCompany017.HeaderText = "è«‹æ±‚æ›¸\r\né‡‘é¡�";
             this.dgvCompany017.Name = "dgvCompany017";
             this.dgvCompany017.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1356,8 +1434,8 @@
             // 
             // dgvCompany018
             // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany018.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany018.DefaultCellStyle = dataGridViewCellStyle9;
             this.dgvCompany018.HeaderText = "é«˜é€Ÿä»£\né§�è»Šä»£";
             this.dgvCompany018.Name = "dgvCompany018";
             this.dgvCompany018.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1366,8 +1444,8 @@
             // 
             // dgvCompany019
             // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany019.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany019.DefaultCellStyle = dataGridViewCellStyle10;
             this.dgvCompany019.HeaderText = "é‡‘ç‰©ä»£";
             this.dgvCompany019.Name = "dgvCompany019";
             this.dgvCompany019.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1376,8 +1454,8 @@
             // 
             // dgvCompany020
             // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany020.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany020.DefaultCellStyle = dataGridViewCellStyle11;
             this.dgvCompany020.HeaderText = "ç”£å»ƒç¨Ž";
             this.dgvCompany020.Name = "dgvCompany020";
             this.dgvCompany020.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1386,8 +1464,8 @@
             // 
             // dgvCompany021
             // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany021.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany021.DefaultCellStyle = dataGridViewCellStyle12;
             this.dgvCompany021.HeaderText = "è«‹æ±‚é‡‘é¡�";
             this.dgvCompany021.Name = "dgvCompany021";
             this.dgvCompany021.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1396,8 +1474,8 @@
             // 
             // dgvCompany022
             // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany022.DefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany022.DefaultCellStyle = dataGridViewCellStyle13;
             this.dgvCompany022.HeaderText = "å€¤å¼•é‡‘é¡�";
             this.dgvCompany022.Name = "dgvCompany022";
             this.dgvCompany022.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1406,8 +1484,8 @@
             // 
             // dgvCompany023
             // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany023.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany023.DefaultCellStyle = dataGridViewCellStyle14;
             this.dgvCompany023.HeaderText = "ç›¸æ®ºé‡‘é¡�";
             this.dgvCompany023.Name = "dgvCompany023";
             this.dgvCompany023.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1416,9 +1494,9 @@
             // 
             // dgvCompany024
             // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany024.DefaultCellStyle = dataGridViewCellStyle13;
-            this.dgvCompany024.HeaderText = "æ¬¡å›žç¹°è¶Š";
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany024.DefaultCellStyle = dataGridViewCellStyle15;
+            this.dgvCompany024.HeaderText = "æ¬¡å›žä»¥é™�ç¹°è¶Š";
             this.dgvCompany024.Name = "dgvCompany024";
             this.dgvCompany024.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.dgvCompany024.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -1426,8 +1504,8 @@
             // 
             // dgvCompany025
             // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany025.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany025.DefaultCellStyle = dataGridViewCellStyle16;
             this.dgvCompany025.HeaderText = "é«˜é€Ÿä»£\né§�è»Šä»£";
             this.dgvCompany025.Name = "dgvCompany025";
             this.dgvCompany025.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1436,8 +1514,8 @@
             // 
             // dgvCompany026
             // 
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany026.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany026.DefaultCellStyle = dataGridViewCellStyle17;
             this.dgvCompany026.HeaderText = "é‡‘ç‰©ä»£";
             this.dgvCompany026.Name = "dgvCompany026";
             this.dgvCompany026.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1446,8 +1524,8 @@
             // 
             // dgvCompany027
             // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany027.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany027.DefaultCellStyle = dataGridViewCellStyle18;
             this.dgvCompany027.HeaderText = "ç”£å»ƒç¨Ž";
             this.dgvCompany027.Name = "dgvCompany027";
             this.dgvCompany027.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1456,8 +1534,8 @@
             // 
             // dgvCompany028
             // 
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dgvCompany028.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dgvCompany028.DefaultCellStyle = dataGridViewCellStyle19;
             this.dgvCompany028.HeaderText = "å�”åŠ›é‡‘";
             this.dgvCompany028.Name = "dgvCompany028";
             this.dgvCompany028.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1474,10 +1552,10 @@
             // 
             // dgvCompany030
             // 
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle18.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
-            this.dgvCompany030.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
+            this.dgvCompany030.DefaultCellStyle = dataGridViewCellStyle20;
             this.dgvCompany030.HeaderText = "å�”åŠ›é‡‘\r\næœ‰ç„¡";
             this.dgvCompany030.MaxDropDownItems = 3;
             this.dgvCompany030.Name = "dgvCompany030";
@@ -1486,8 +1564,8 @@
             // 
             // dgvCompany031
             // 
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany031.DefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany031.DefaultCellStyle = dataGridViewCellStyle21;
             this.dgvCompany031.HeaderText = "æ³¨æ–‡æ›¸\r\né€�ä»˜";
             this.dgvCompany031.Name = "dgvCompany031";
             this.dgvCompany031.ReadOnly = true;
@@ -1497,8 +1575,8 @@
             // 
             // dgvCompany032
             // 
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany032.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany032.DefaultCellStyle = dataGridViewCellStyle22;
             this.dgvCompany032.HeaderText = "æ³¨æ–‡æ›¸\r\nåˆ°ç�€";
             this.dgvCompany032.Name = "dgvCompany032";
             this.dgvCompany032.ReadOnly = true;
@@ -1508,8 +1586,8 @@
             // 
             // dgvCompany033
             // 
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany033.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany033.DefaultCellStyle = dataGridViewCellStyle23;
             this.dgvCompany033.HeaderText = "äºˆç®—æ›¸";
             this.dgvCompany033.Name = "dgvCompany033";
             this.dgvCompany033.ReadOnly = true;
@@ -1519,9 +1597,9 @@
             // 
             // Column17
             // 
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
-            this.Column17.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
+            this.Column17.DefaultCellStyle = dataGridViewCellStyle24;
             this.Column17.HeaderText = "æ”¯æ‰•è¶…é�Ž";
             this.Column17.Name = "Column17";
             this.Column17.ReadOnly = true;
@@ -1538,8 +1616,8 @@
             // 
             // dgvCompany035
             // 
-            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany035.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany035.DefaultCellStyle = dataGridViewCellStyle25;
             this.dgvCompany035.HeaderText = "æ‹…å½“è€…";
             this.dgvCompany035.Name = "dgvCompany035";
             this.dgvCompany035.ReadOnly = true;
@@ -1571,8 +1649,8 @@
             // 
             // dgvCompany039
             // 
-            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany039.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany039.DefaultCellStyle = dataGridViewCellStyle26;
             this.dgvCompany039.HeaderText = "æ‰¿èª�è€…ï¼‘";
             this.dgvCompany039.Name = "dgvCompany039";
             this.dgvCompany039.ReadOnly = true;
@@ -1623,8 +1701,8 @@
             // 
             // dgvCompany044
             // 
-            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany044.DefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany044.DefaultCellStyle = dataGridViewCellStyle27;
             this.dgvCompany044.HeaderText = "æ‰¿èª�è€…ï¼’";
             this.dgvCompany044.Name = "dgvCompany044";
             this.dgvCompany044.ReadOnly = true;
@@ -1675,8 +1753,8 @@
             // 
             // dgvCompany049
             // 
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany049.DefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany049.DefaultCellStyle = dataGridViewCellStyle28;
             this.dgvCompany049.HeaderText = "æ‰¿èª�è€…ï¼“";
             this.dgvCompany049.Name = "dgvCompany049";
             this.dgvCompany049.ReadOnly = true;
@@ -1727,8 +1805,8 @@
             // 
             // dgvCompany054
             // 
-            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany054.DefaultCellStyle = dataGridViewCellStyle27;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany054.DefaultCellStyle = dataGridViewCellStyle29;
             this.dgvCompany054.HeaderText = "æ‰¿èª�è€…ï¼”";
             this.dgvCompany054.Name = "dgvCompany054";
             this.dgvCompany054.ReadOnly = true;
@@ -1778,8 +1856,8 @@
             // 
             // dgvCompany059
             // 
-            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany059.DefaultCellStyle = dataGridViewCellStyle28;
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany059.DefaultCellStyle = dataGridViewCellStyle30;
             this.dgvCompany059.HeaderText = "æ‰¿èª�è€…ï¼•";
             this.dgvCompany059.Name = "dgvCompany059";
             this.dgvCompany059.ReadOnly = true;
@@ -1830,8 +1908,8 @@
             // 
             // dgvCompany064
             // 
-            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany064.DefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany064.DefaultCellStyle = dataGridViewCellStyle31;
             this.dgvCompany064.HeaderText = "æ‰¿èª�è€…ï¼–";
             this.dgvCompany064.Name = "dgvCompany064";
             this.dgvCompany064.ReadOnly = true;
@@ -1882,8 +1960,8 @@
             // 
             // dgvCompany069
             // 
-            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany069.DefaultCellStyle = dataGridViewCellStyle30;
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany069.DefaultCellStyle = dataGridViewCellStyle32;
             this.dgvCompany069.HeaderText = "æ‰¿èª�è€…ï¼—";
             this.dgvCompany069.Name = "dgvCompany069";
             this.dgvCompany069.ReadOnly = true;
@@ -1934,8 +2012,8 @@
             // 
             // dgvCompany074
             // 
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany074.DefaultCellStyle = dataGridViewCellStyle31;
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany074.DefaultCellStyle = dataGridViewCellStyle33;
             this.dgvCompany074.HeaderText = "æ‰¿èª�è€…ï¼˜";
             this.dgvCompany074.Name = "dgvCompany074";
             this.dgvCompany074.ReadOnly = true;
@@ -1986,8 +2064,8 @@
             // 
             // dgvCompany079
             // 
-            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany079.DefaultCellStyle = dataGridViewCellStyle32;
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany079.DefaultCellStyle = dataGridViewCellStyle34;
             this.dgvCompany079.HeaderText = "æ‰¿èª�è€…ï¼™";
             this.dgvCompany079.Name = "dgvCompany079";
             this.dgvCompany079.ReadOnly = true;
@@ -2038,8 +2116,8 @@
             // 
             // dgvCompany084
             // 
-            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dgvCompany084.DefaultCellStyle = dataGridViewCellStyle33;
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dgvCompany084.DefaultCellStyle = dataGridViewCellStyle35;
             this.dgvCompany084.HeaderText = "æ‰¿èª�è€…10";
             this.dgvCompany084.Name = "dgvCompany084";
             this.dgvCompany084.ReadOnly = true;
@@ -2082,8 +2160,8 @@
             // 
             // dgvCompany088
             // 
-            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dgvCompany088.DefaultCellStyle = dataGridViewCellStyle34;
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dgvCompany088.DefaultCellStyle = dataGridViewCellStyle36;
             this.dgvCompany088.HeaderText = "å‚™è€ƒ";
             this.dgvCompany088.Name = "dgvCompany088";
             this.dgvCompany088.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -2198,8 +2276,8 @@
             // 
             // Column18
             // 
-            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column18.DefaultCellStyle = dataGridViewCellStyle35;
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column18.DefaultCellStyle = dataGridViewCellStyle37;
             this.Column18.HeaderText = "é–¢é€£ä»˜ã�‘ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—";
             this.Column18.Name = "Column18";
             this.Column18.ReadOnly = true;
@@ -2206,45 +2284,41 @@
             this.Column18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column18.Visible = false;
             // 
-            // cmbTargetMonth
+            // Column21
             // 
-            this.cmbTargetMonth.BackColor = System.Drawing.Color.White;
-            this.cmbTargetMonth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbTargetMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbTargetMonth.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cmbTargetMonth.FormattingEnabled = true;
-            this.cmbTargetMonth.Location = new System.Drawing.Point(124, 2);
-            this.cmbTargetMonth.Margin = new System.Windows.Forms.Padding(4);
-            this.cmbTargetMonth.MaxDropDownItems = 12;
-            this.cmbTargetMonth.Name = "cmbTargetMonth";
-            this.cmbTargetMonth.Size = new System.Drawing.Size(140, 28);
-            this.cmbTargetMonth.TabIndex = 1;
-            this.cmbTargetMonth.TextChanged += new System.EventHandler(this.cmbTargetMonth_TextChanged);
+            this.Column21.HeaderText = "éƒ¨ç½²å‡ºç´�ã‚­ãƒ¼ï¼‘";
+            this.Column21.Name = "Column21";
+            this.Column21.ReadOnly = true;
+            this.Column21.Visible = false;
             // 
-            // cmbDepartment
+            // Column22
             // 
-            this.cmbDepartment.BackColor = System.Drawing.Color.White;
-            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDepartment.FormattingEnabled = true;
-            this.cmbDepartment.Location = new System.Drawing.Point(428, 5);
-            this.cmbDepartment.Name = "cmbDepartment";
-            this.cmbDepartment.Size = new System.Drawing.Size(170, 23);
-            this.cmbDepartment.TabIndex = 98;
-            this.cmbDepartment.TextChanged += new System.EventHandler(this.cmbPerson_TextChanged);
+            this.Column22.HeaderText = "éƒ¨ç½²å‡ºç´�ã‚­ãƒ¼ï¼’";
+            this.Column22.Name = "Column22";
+            this.Column22.ReadOnly = true;
+            this.Column22.Visible = false;
             // 
-            // cmbPerson
+            // Column23
             // 
-            this.cmbPerson.BackColor = System.Drawing.Color.White;
-            this.cmbPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbPerson.FormattingEnabled = true;
-            this.cmbPerson.Location = new System.Drawing.Point(732, 5);
-            this.cmbPerson.Name = "cmbPerson";
-            this.cmbPerson.Size = new System.Drawing.Size(170, 23);
-            this.cmbPerson.TabIndex = 100;
-            this.cmbPerson.TextChanged += new System.EventHandler(this.cmbPerson_TextChanged);
+            this.Column23.HeaderText = "éƒ¨ç½²å‡ºç´�ã‚­ãƒ¼ï¼“";
+            this.Column23.Name = "Column23";
+            this.Column23.ReadOnly = true;
+            this.Column23.Visible = false;
             // 
+            // Column24
+            // 
+            this.Column24.HeaderText = "éƒ¨ç½²å‡ºç´�ã‚­ãƒ¼ï¼”";
+            this.Column24.Name = "Column24";
+            this.Column24.ReadOnly = true;
+            this.Column24.Visible = false;
+            // 
+            // Column25
+            // 
+            this.Column25.HeaderText = "éƒ¨ç½²å‡ºç´�ã‚­ãƒ¼ï¼•";
+            this.Column25.Name = "Column25";
+            this.Column25.ReadOnly = true;
+            this.Column25.Visible = false;
+            // 
             // FrmReqSumList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -2253,11 +2327,11 @@
             this.ClientSize = new System.Drawing.Size(1340, 697);
             this.Controls.Add(this.panel10);
             this.Controls.Add(this.panel9);
-            this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.panel8);
             this.Controls.Add(this.panel7);
             this.Controls.Add(this.panel6);
             this.Controls.Add(this.panel5);
+            this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.btnDspInput);
             this.Controls.Add(this.panel4);
             this.Controls.Add(this.panel3);
@@ -2290,12 +2364,12 @@
             this.panel3.PerformLayout();
             this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
+            this.panel10.ResumeLayout(false);
+            this.panel9.ResumeLayout(false);
+            this.panel8.ResumeLayout(false);
+            this.panel7.ResumeLayout(false);
+            this.panel6.ResumeLayout(false);
             this.panel5.ResumeLayout(false);
-            this.panel6.ResumeLayout(false);
-            this.panel7.ResumeLayout(false);
-            this.panel8.ResumeLayout(false);
-            this.panel9.ResumeLayout(false);
-            this.panel10.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvData)).EndInit();
             this.ResumeLayout(false);
 
@@ -2312,10 +2386,6 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label lblEntryDateFrom;
-        private System.Windows.Forms.Button btnDelProject;
-        private System.Windows.Forms.Button btnDelCompany;
-        private System.Windows.Forms.Button btnAddCompany;
-        private System.Windows.Forms.Button btnAddProject;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label10;
@@ -2346,23 +2416,27 @@
         private System.Windows.Forms.Panel panel3;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label lblCellTotal;
-        private System.Windows.Forms.Panel panel5;
-        private System.Windows.Forms.Panel panel6;
-        private System.Windows.Forms.Button btnLinkLedger;
         private System.Windows.Forms.Button btnEntryClose;
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.Label lblEntryDateTo;
-        private System.Windows.Forms.Panel panel7;
         private System.Windows.Forms.Button btnChkPetition;
-        private System.Windows.Forms.Panel panel8;
-        private System.Windows.Forms.Button btnAutoCalc;
         private System.Windows.Forms.Button btnCsvOutput;
         private System.Windows.Forms.Button btnHelp;
         private System.Windows.Forms.Button btnDspInput;
+        private System.Windows.Forms.Panel panel10;
+        private System.Windows.Forms.Button btnCostExpence;
         private System.Windows.Forms.Panel panel9;
-        private System.Windows.Forms.Button btnOtherAcc;
-        private System.Windows.Forms.Panel panel10;
-        private System.Windows.Forms.Button btnDepExpence;
+        private System.Windows.Forms.Button btnPurchase;
+        private System.Windows.Forms.Panel panel8;
+        private System.Windows.Forms.Button btnAutoCalc;
+        private System.Windows.Forms.Panel panel7;
+        private System.Windows.Forms.Button btnLinkLedger;
+        private System.Windows.Forms.Panel panel6;
+        private System.Windows.Forms.Button btnAddProject;
+        private System.Windows.Forms.Button btnDelProject;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Button btnAddCompany;
+        private System.Windows.Forms.Button btnDelCompany;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany001;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany002;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany003;
@@ -2382,6 +2456,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany016;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column20;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column19;
         private System.Windows.Forms.DataGridViewComboBoxColumn Column16;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany017;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany018;
@@ -2481,5 +2557,10 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column18;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column21;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column22;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column23;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column24;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column25;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumList.resx	(revision 483)
@@ -129,6 +129,12 @@
   <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -177,4 +183,19 @@
   <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column24.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column25.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumListAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumListAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmReqSumListAux.cs	(revision 483)
@@ -399,7 +399,8 @@
                 // ‘ä’ ‘Î�Û—ñ‚ðŽZ�o
                 DateTime dateTime = new DateTime(CommonMotions.cnvTruncate(InputRec.TargetDate / 100), (InputRec.TargetDate % 100), 1);
                 int nExecCnt = ClsChangeLedgerData.CalcTargetMonthToColumn(CleDB, false, (int)InputRec.ConstructionCode, dateTime);
-
+                int nLinkType = 0;
+                if (InputRec.ConstructionCode > 0) nLinkType = 1;
                 // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^‚Ì�X�V
                 BillingDataDetail DetailRec = new BillingDataDetail
                 {
@@ -411,6 +412,7 @@
                     ConstructionCode = InputRec.ConstructionCode,
                     ConstructionRowCnt = InputRec.ConstructionRowCnt,
                     ConstructionColCnt = nExecCnt,
+                    LinkDataType = nLinkType,
                     FieldName = InputRec.FieldName,
                     BillPrice = InputRec.BillPrice,
                     HighwPrice = InputRec.HighwPrice,
@@ -693,6 +695,57 @@
         }
         #endregion
 
+        #region ‘I‘ð”NŒŽ‚É‚æ‚Á‚Äƒ{ƒ^ƒ“•\Ž¦‚ð�§Œä‚·‚é
+        /// <summary>
+        /// ‘I‘ð”NŒŽ‚É‚æ‚Á‚Äƒ{ƒ^ƒ“•\Ž¦‚ð�§Œä‚·‚é
+        /// </summary>
+        private void DispButtonControlYM()
+        {
+            IOClosingDateOfMonth DateDB = new IOClosingDateOfMonth();
+            try
+            {
+                // ‘OŒŽˆÈŠO‚Í�I—¹ƒ{ƒ^ƒ“ˆÈŠO‚ð‘S‚Ä”ñ•\Ž¦
+                int nTargetDate = CommonMotions.cnvInt(cmbTargetMonth.SelectedValue);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(DateDB.CreatePrimarykeyString(nTargetDate));
+                strSQL.AppendFormat(" And SeqNo = {0}", m_Labourkind);
+                ClosingDateOfMonth GetCloseRec = new ClosingDateOfMonth();
+                if (!DateDB.SelectAction(strSQL.ToString(), ref GetCloseRec)) return;
+
+
+                // “o˜^ƒ{ƒ^ƒ“‚Ì•\Ž¦�§Œä‚Í‚±‚±‚µ‚©‚È‚¢‚Ì‚Å‚Ü‚¸•\Ž¦‚·‚é
+                btnDataEntry.Visible = true;
+
+                // ‘I‘ðŒŽ‚ÌŠJŽn“ú‚Ì1ƒJŒŽŒã‚æ‚è�¡“ú‚ª�¬‚³‚¢‚±‚Æ
+                DateTime dtLimitYM = GetCloseRec.StartDate.AddMonths(1);
+                if (DateTime.Today.Date < dtLimitYM.Date) return;
+
+                // ----- ‘OŒŽˆÈ‘O‚Íƒf�[ƒ^‚ð•Ï�X‚Å‚«‚È‚¢
+
+                // “o˜^ƒ{ƒ^ƒ“‚à�Á‚·
+                btnDataEntry.Visible = false;
+
+                // ƒx�[ƒXƒpƒlƒ‹–ˆ”ñ•\Ž¦
+                panel5.Visible = false;
+                panel6.Visible = false;
+                panel7.Visible = false;
+                panel8.Visible = false;
+                panel9.Visible = false;
+                panel10.Visible = false;
+
+                this.Update();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DateDB.close(); DateDB = null;
+            }
+        }
+        #endregion
+
         #region ƒtƒH�[ƒ€‚ÌƒCƒxƒ“ƒg‚ð’Ç‰Á‚·‚é
         /// <summary>
         /// ƒtƒH�[ƒ€‚ÌƒCƒxƒ“ƒg‚ð’Ç‰Á‚·‚é
@@ -701,16 +754,16 @@
         {
             try
             {
-                dgvData.CellBeginEdit += new DataGridViewCellCancelEventHandler(DataGridView_CellBeginEdit);
-                dgvData.CellDoubleClick += new DataGridViewCellEventHandler(DataGridView_CellDoubleClick);
+                dgvData.CellBeginEdit += new DataGridViewCellCancelEventHandler(dgvData_CellBeginEdit);
+                dgvData.CellDoubleClick += new DataGridViewCellEventHandler(dgvData_CellDoubleClick);
                 dgvData.CellEndEdit += new DataGridViewCellEventHandler(this.dgvData_CellEndEdit);
-                dgvData.CellEnter += new DataGridViewCellEventHandler(DataGridView_CellEnter);
+                dgvData.CellEnter += new DataGridViewCellEventHandler(dgvData_CellEnter);
                 dgvData.CellValueChanged += new DataGridViewCellEventHandler(dgvData_CellValueChanged);
-                dgvData.CellFormatting += new DataGridViewCellFormattingEventHandler(DataGridView_CellFormatting);
-                dgvData.CellValidated += new DataGridViewCellEventHandler(DataGridView_CellValidated);
-                dgvData.CurrentCellDirtyStateChanged += new EventHandler(DataGridView_CurrentCellDirtyStateChanged);
+                dgvData.CellFormatting += new DataGridViewCellFormattingEventHandler(dgvData_CellFormatting);
+                dgvData.CellValidated += new DataGridViewCellEventHandler(dgvData_CellValidated);
+                dgvData.CurrentCellDirtyStateChanged += new EventHandler(dgvData_CurrentCellDirtyStateChanged);
                 dgvData.SelectionChanged += new EventHandler(dgvData_SelectionChanged);
-                dgvData.MouseUp += new MouseEventHandler(dgvCompany_MouseUp);
+                dgvData.MouseUp += new MouseEventHandler(dgvData_MouseUp);
             }
             catch (Exception ex)
             {
@@ -719,6 +772,13 @@
         }
         #endregion
 
+        #region “ü—Í‘O‹àŠz
+        /// <summary>
+        /// “ü—Í‘O‹àŠz
+        /// </summary>
+        private long m_Brfore_Value = 0;
+        #endregion
+
         #region ƒZƒ‹‚Ì“ü—Í‘O�ˆ—�
         /// <summary>
         /// ƒZƒ‹‚Ì“ü—Í‘O�ˆ—�
@@ -763,13 +823,6 @@
         }
         #endregion
 
-        #region “ü—Í‘O‹àŠz
-        /// <summary>
-        /// “ü—Í‘O‹àŠz
-        /// </summary>
-        private long m_Brfore_Value = 0;
-        #endregion
-
         #region ƒZƒ‹“ü—ÍŠ®—¹�ˆ—�
         /// <summary>
         /// ƒZƒ‹“ü—ÍŠ®—¹�ˆ—�
@@ -780,6 +833,23 @@
         {
             try
             {
+                DataGridView dgv = dgvData;
+                DataGridViewRow CurRow = dgv.Rows[e.RowIndex];
+                switch (e.ColumnIndex)
+                {
+                    case (int)DispColumn.KojiSeikyu:
+                    case (int)DispColumn.KojiNebiki:
+                    case (int)DispColumn.KojiSousai:
+                    case (int)DispColumn.JikaiKurikosi:
+                    case (int)DispColumn.KojiKosoku:
+                    case (int)DispColumn.KojiKanamono:
+                    case (int)DispColumn.KojiSannhaiZei:
+                        // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^‚ÌŽx•¥’´‰ßƒ�ƒbƒZ�[ƒWƒZƒbƒg
+                        SetOverBillingDataDetailMsg(CurRow);
+                        break;
+                    default:
+                        break;
+                }
             }
             catch (Exception ex)
             {
@@ -796,6 +866,8 @@
         /// <param name="e"></param>
         private void GridCellValidated(object sender, DataGridViewCellEventArgs e)
         {
+            // ƒZƒ‹•Ï�XƒCƒxƒ“ƒgOFF
+            dgvData.CellValueChanged -= new DataGridViewCellEventHandler(dgvData_CellValueChanged);
             try
             {
                 DataGridViewEX dgv = (DataGridViewEX)sender;
@@ -823,9 +895,11 @@
                         // �s�E—ñ‚ª”ÍˆÍŠO‚Í�ˆ—�‚µ‚È‚¢
                         if (e.ColumnIndex < (int)DispColumn.SomuSeikyu
                             || (int)DispColumn.KojiSannhaiZei < e.ColumnIndex) return;
+
                         // “ü—Í’l‚ª“¯‚¶�ê�‡‚Í�ˆ—�‚µ‚È‚¢
                         int nCurVal = CommonMotions.cnvInt(CurRow.Cells[e.ColumnIndex].Value);
                         if (nCurVal == m_Brfore_Value) return;
+                        
                         // ’l‚Ìƒ`ƒFƒbƒN�i“¯‚¶�ê�‡‚Í•Ï�Xƒtƒ‰ƒO‚ðON‚É‚µ‚È‚¢�j
                         if (CommonMotions.cnvInt(m_BeforeValue) == nCurVal) return;
                         break;
@@ -917,16 +991,65 @@
                 // ‘��‡Œv‚ÌŒvŽZ
                 setTotalGoukei();
 
-                if (!m_Abandonments) m_bChengeAns = true;
+                // �‰ŠúŽž‚Í•Ï�Xƒtƒ‰ƒO‚ðON‚É‚µ‚È‚¢
+                if (m_Abandonments) return;
 
+                // •s–¾�s‚É’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
+                SetApprovalPerson(CurRow);
+
+                m_bChengeAns = true;
+
             }
             catch (System.Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            // ƒZƒ‹•Ï�XƒCƒxƒ“ƒgON
+            dgvData.CellValueChanged += new DataGridViewCellEventHandler(dgvData_CellValueChanged);
         }
         #endregion
 
+        #region •s–¾�s‚É’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
+        /// <summary>
+        /// •s–¾�s‚É’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
+        /// </summary>
+        private void SetApprovalPerson(DataGridViewRow CurRow)
+        {
+            try
+            {
+                int nLoginManNo = CommonMotions.LoginUserData.PersonCode;
+                string strLoginManName = CommonMotions.LoginUserData.PersonName;
+                // ŠÇ—�ŽÒ‚Í�ˆ—�‚µ‚È‚¢
+                if (nLoginManNo == CommonDefine.AdminCode) return;
+
+                int nLinkDataType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LinkDataType].Value);
+                int nPerson = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.TantoShoninCode].Value);
+
+                // •s–¾ƒf�[ƒ^‚Ì�ê�‡
+                switch (nLinkDataType)
+                {
+                    case (int)BillingDataDetail.DataTypeDef.UnKnown:
+                        // ƒZƒbƒg�Ï‚Í�ˆ—�‚µ‚È‚¢
+                        if (nPerson > 0) break;
+
+                        // “ü—ÍŽÒ‚ð’S“–ŽÒ‚Æ‚·‚é
+                        CurRow.Cells[(int)DispColumn.TantoShoninCode].Value = nLoginManNo;
+                        CurRow.Cells[(int)DispColumn.TantoShonin].Value = strLoginManName;
+
+                        break;
+                    case (int)BillingDataDetail.DataTypeDef.Ledger:
+                    case (int)BillingDataDetail.DataTypeDef.PurchaseCost:
+                    case (int)BillingDataDetail.DataTypeDef.DepAccount:
+                        break;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ‘Î�Û�s‚ÌŽŸ‰ñŒJ‰z‹à‚ÌƒZƒbƒg
         /// <summary>
         /// ‘Î�Û�s‚ÌŽŸ‰ñŒJ‰z‹à‚ÌƒZƒbƒg
@@ -1405,6 +1528,9 @@
                 panel4.Enabled = !bDisp;
                 btnDataEntry.Enabled = !bDisp;
                 btnEnd.Enabled = !bDisp;
+
+                // ƒ{ƒ^ƒ“•\Ž¦‚ð�§Œä‚·‚é
+                DispButtonControlYM();
             }
             catch (Exception ex)
             {
@@ -1837,12 +1963,16 @@
                 column2.Items.Add(new KeyValuePair<int, string>((int)SubContractorMaster.PaymentKindDef.Normal, "’Ê�í"));
                 column2.Items.Add(new KeyValuePair<int, string>((int)SubContractorMaster.PaymentKindDef.Labor, "ŽèŠÔ"));
 
-                // 0:‘�–±ƒJƒ‰�[ 1:�HŽ–ƒJƒ‰�[
+                // 0:‘�–±ƒJƒ‰�[ 1:�HŽ–ƒJƒ‰�[ 2:”­’��EŽx•¥ƒJƒ‰�[
                 dgv.Columns[(int)DispColumn.SomuSeikyu].HeaderCell.Style.BackColor = HeaderColor[0];
                 dgv.Columns[(int)DispColumn.SomuKosoku].HeaderCell.Style.BackColor = HeaderColor[0];
                 dgv.Columns[(int)DispColumn.SomuKanamono].HeaderCell.Style.BackColor = HeaderColor[0];
                 dgv.Columns[(int)DispColumn.SomuSannhaiZei].HeaderCell.Style.BackColor = HeaderColor[0];
 
+                dgv.Columns[(int)DispColumn.PurchaseVal].HeaderCell.Style.BackColor= HeaderColor[2];
+                dgv.Columns[(int)DispColumn.ExecSumVal].HeaderCell.Style.BackColor = HeaderColor[2];
+                dgv.Columns[(int)DispColumn.LabourKind].HeaderCell.Style.BackColor = HeaderColor[2];
+
                 dgv.Columns[(int)DispColumn.KojiSeikyu].HeaderCell.Style.BackColor = HeaderColor[1];
                 dgv.Columns[(int)DispColumn.KojiNebiki].HeaderCell.Style.BackColor = HeaderColor[1];
                 dgv.Columns[(int)DispColumn.KojiSousai].HeaderCell.Style.BackColor = HeaderColor[1];
@@ -1944,9 +2074,9 @@
                 strSQL.Append(DateDB.CreatePrimarykeyString(CurYearMonth));
                 strSQL.AppendFormat(" And SeqNo = {0}", m_Labourkind);
 
-                ClosingDateOfMonth GetRec = new ClosingDateOfMonth();
                 // ƒf�[ƒ^–³‚µ‚ÍƒGƒ‰�[
-                if (!DateDB.SelectAction(strSQL.ToString(), ref GetRec))
+                ClosingDateOfMonth GetCloseRec = new ClosingDateOfMonth();
+                if (!DateDB.SelectAction(strSQL.ToString(), ref GetCloseRec))
                 {
                     CommonMotions.chgBackColor(lblEntryDateFrom, false);
                     CommonMotions.chgBackColor(lblEntryDateTo, false);
@@ -1954,7 +2084,7 @@
                     return;
                 }
 
-                if (GetRec.StartDate.Date == DateTime.MinValue.Date)
+                if (GetCloseRec.StartDate.Date == DateTime.MinValue.Date)
                 {
                     // ‚ ‚Á‚Ä‚à“ú•t‚ª–³‚¯‚ê‚ÎƒGƒ‰�[
                     CommonMotions.chgBackColor(lblEntryDateFrom, false);
@@ -1963,10 +2093,10 @@
                 else
                 {
                     // ŠJŽn“ú‚ÌƒZƒbƒg
-                    lblEntryDateFrom.Text = GetRec.StartDate.ToShortDateString();
+                    lblEntryDateFrom.Text = GetCloseRec.StartDate.ToShortDateString();
                 }
 
-                if (GetRec.CompDate.Date == DateTime.MinValue.Date)
+                if (GetCloseRec.CompDate.Date == DateTime.MinValue.Date)
                 {
                     // ‚ ‚Á‚Ä‚à“ú•t‚ª–³‚¯‚ê‚ÎƒGƒ‰�[
                     CommonMotions.chgBackColor(lblEntryDateTo, false);
@@ -1975,7 +2105,7 @@
                 else
                 {
                     // �I—¹“ú‚ÌƒZƒbƒg
-                    lblEntryDateTo.Text = GetRec.CompDate.ToShortDateString();
+                    lblEntryDateTo.Text = GetCloseRec.CompDate.ToShortDateString();
                 }
             }
             catch (Exception ex)
@@ -2111,13 +2241,12 @@
                 if (RecList.Count < 1) return 0;
 
                 int nTargetCnt = -1;
-                for (int ix = 0;ix< RecList.Count; ix++)
+                foreach(object[] vs in RecList)
                 {
-                    object[] vs = (object[])RecList[ix];
                     int nTargetData = CommonMotions.cnvInt(vs[0]);
                     DateTime dtNextStart = CommonMotions.cnvDate(vs[4]);
                     // —‚ŒŽ‚ÌŠJŽn“ú•t‚ª–¾“ú‚Ì�ê�‡
-                    if (BaseDate.Date< dtNextStart)
+                    if (BaseDate.Date < dtNextStart)
                     {
                         nTargetCnt = nTargetData;
                         break;
@@ -2190,9 +2319,12 @@
             {
                 DataGridViewEX dgv = dgvData;
 
-                DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
-                                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible)
-                                                                        .ToArray();
+                int nRowType = (int)DispColumn.RowType;
+                int nRowVisible = (int)DispColumn.RowVisible;
+                DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>()
+                                                .Where(x => CommonMotions.cnvInt(x.Cells[nRowType].Value) == (int)RowsTypeDef.–¾�×
+                                                        && CommonMotions.cnvInt(x.Cells[nRowVisible].Value) == (int)RowVisibleDef.Visible)
+                                                .ToArray();
                 if (Rows.Count() == 0)
                 {
                     if (rdbCompany.Checked)
@@ -2674,7 +2806,7 @@
                 MakeIndex = iIndex;
 
                 // �HŽ–‘ä’ ‚ÆŠÖ˜A•t‚¯‚ª‚³‚ê‚Ä‚¢‚È‚¢�s‚Í�F‚ð•Ï‚¦‚é
-                SetLinkLedgerColor(CurRow, nRowCol[0]);
+                SetLinkLedgerColor(CurRow);
                 // �HŽ–‘ä’ ‚ÆŠÖ˜A•t‚¯‚ª‚³‚ê‚Ä‚¢‚È‚¢�s‚Í�HŽ––¼�Ì‚ð“ü—Í‰Â”\‚É‚·‚é
                 if (nRowCol[0] < 1)
                     CurRow.Cells[(int)DispColumn.GenbaName].ReadOnly = false;
@@ -2811,7 +2943,7 @@
                 CurRow.Cells[(int)DispColumn.LedgerColNo].Value = nRowCol[1];
 
                 // –¾�×�s‚ð�HŽ–‘ä’ ƒf�[ƒ^‚ÆŠÖ˜A•t‚¯‚³‚ê‚Ä‚¢‚é‚©‚Å�F‚ð•Ï‚¦‚é
-                SetLinkLedgerColor(CurRow, nRowCol[0]);
+                SetLinkLedgerColor(CurRow);
 
                 m_bChengeAns = true;
 
@@ -3780,7 +3912,7 @@
                 CurRow.Cells[(int)DispColumn.KojiKanamono].Value = string.Empty;
                 CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value = string.Empty;
                 CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = string.Empty;
-                if (CompanyCode == 131) Debug.WriteLine("");
+
                 // ‘�–±�¿‹�Šz
                 long SoumuKei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.SubConstractorCode].Value) == CompanyCode
                                                                             && ((int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�¬Œv
@@ -4857,7 +4989,6 @@
                 int iNo = 0;
                 int iGoukeiSeq = 0;
                 int iBreakCode = -1, iBreakSeqNo = -1;
-                int iDataCount = 0;
                 int iShoninMaxCount = 0;
                 string strErrorMsg = string.Empty;
 
@@ -4893,22 +5024,12 @@
                     CurRow.Visible = true;
                     CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
 
-                    // �³”F�Ï‚Í�A�s‘S�€–Ú•Ò�W•s‰Â
-                    int nApprovalEndFlg = CommonMotions.cnvInt(work[(int)GetDBDataDef.ApprovalEndFlg]);
-                    if (nApprovalEndFlg == (int)PaymentDataDetail.ApprovalEndFlgDef.Approval)
-                    {
-                        for (int iz = (int)DispColumn.No; iz < dgv.ColumnCount; iz++)
-                        {
-                            CurRow.Cells[iz].ReadOnly = true;
-                        }
-                    }
-
                     DataProgressBar.Value++;
                     DataProgressBar.Update();
                 }
 
                 // –¾�×•\Ž¦‚³‚ê‚Ä‚¢‚éƒf�[ƒ^Œ��”ƒ`ƒFƒbƒN
-                iDataCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
+                int iDataCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                         && CommonMotions.cnvInt(x.Cells[nBreakGridCodeColumn].Value) == iBreakCode)
                                                                 .Count();
@@ -4947,6 +5068,7 @@
                 // �\�¿Šm”Fƒ{ƒ^ƒ“•\Ž¦�§Œä
                 DispPetitionButton(bNormal);
 
+                // •\Ž¦�æ“ª�s�Ý’è
                 if (m_BeforeDispRowIndex < 0)
                 {
                     dgv.FirstDisplayedScrollingRowIndex = 0;
@@ -4985,17 +5107,17 @@
         {
             try
             {
-                object[] FirstRow = (object[])RowData[ReadCnt];
+                object[] CurRow = (object[])RowData[ReadCnt];
 
                 // ƒOƒŠƒbƒhƒf�[ƒ^ƒZƒbƒg
-                SetGridData(iNo, iGoukeiSeq, FirstRow, ref nSetRowCnt);
+                SetGridData(iNo, iGoukeiSeq, CurRow, ref nSetRowCnt);
 
                 // �³”F‘Î�Ûƒf�[ƒ^Žæ“¾
-                int BreakKey1 = CommonMotions.cnvInt(FirstRow[(int)GetDBDataDef.CompanyCode]);
-                int BreakKey2 = CommonMotions.cnvInt(FirstRow[(int)GetDBDataDef.ConstrCode]);
-                int BreakKey3 = CommonMotions.cnvInt(FirstRow[(int)GetDBDataDef.ConstructionLedgerDetailNo]);
-                long BreakKey4 = CommonMotions.cnvLong(FirstRow[(int)GetDBDataDef.BillPrice]);
-                int BreakKey5 = CommonMotions.cnvInt(FirstRow[(int)GetDBDataDef.CurrentLine]);
+                int BreakKey1 = CommonMotions.cnvInt(CurRow[(int)GetDBDataDef.CompanyCode]);
+                int BreakKey2 = CommonMotions.cnvInt(CurRow[(int)GetDBDataDef.ConstrCode]);
+                int BreakKey3 = CommonMotions.cnvInt(CurRow[(int)GetDBDataDef.ConstructionLedgerDetailNo]);
+                long BreakKey4 = CommonMotions.cnvLong(CurRow[(int)GetDBDataDef.BillPrice]);
+                int BreakKey5 = CommonMotions.cnvInt(CurRow[(int)GetDBDataDef.CurrentLine]);
 
                 List<object[]> arrayList = RowData.Cast<object[]>().Where(x => BreakKey1 == CommonMotions.cnvInt(x[(int)GetDBDataDef.CompanyCode])
                                                                             && BreakKey2 == CommonMotions.cnvInt(x[(int)GetDBDataDef.ConstrCode])
@@ -5112,6 +5234,9 @@
                     CurCell = CurRow.Cells[ColCnt + (int)ShoninBlockDef.ShoninStatus];
                     CurCell.Value = nAppStat;
                 }
+
+                // ‘Î�Û�s‚Ì�³”FŽÒƒJƒ‰ƒ€�F‚ðŒ»�Ý�³”F�ó‘Ô‚É•Ï‚¦‚é
+                ResetApprovalListColor(CurRow);
             }
             catch (Exception ex)
             {
@@ -5124,7 +5249,7 @@
         /// <summary>
         /// ƒOƒŠƒbƒhƒf�[ƒ^ƒZƒbƒg
         /// </summary>
-        private void SetGridData(int iNo, int iGoukeiSeq, object[] work, ref int nSetRowCnt)
+        private void SetGridData(int iNo, int iGoukeiSeq, object[] ObjCurRow, ref int nSetRowCnt)
         {
             try
             {
@@ -5132,11 +5257,11 @@
                 nSetRowCnt = dgv.Rows.Add(1);
                 DataGridViewRow CurRow = dgv.Rows[nSetRowCnt];
 
-                CurRow.Cells[(int)DispColumn.CompanyDispOrder].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.DisplayOrder]);
-                CurRow.Cells[(int)DispColumn.ApprovalEndFlg].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.ApprovalEndFlg]);
-                CurRow.Cells[(int)DispColumn.UpdateDate].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.UpdateDate]);
+                CurRow.Cells[(int)DispColumn.CompanyDispOrder].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.DisplayOrder]);
+                CurRow.Cells[(int)DispColumn.ApprovalEndFlg].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ApprovalEndFlg]);
+                CurRow.Cells[(int)DispColumn.UpdateDate].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.UpdateDate]);
 
-                int nExistsFlg = CommonMotions.cnvInt(work[(int)GetDBDataDef.ExistsFlg]);
+                int nExistsFlg = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ExistsFlg]);
                 if (nExistsFlg == 0)
                     CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Added;
                 else
@@ -5145,13 +5270,13 @@
                 CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                 CurRow.Cells[(int)DispColumn.RowType].Value = (int)RowsTypeDef.–¾�×;
                 CurRow.Cells[(int)DispColumn.GoukeiSeqNo].Value = iGoukeiSeq;
-                CurRow.Cells[(int)DispColumn.SeqNo].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.SeqNo]);
-                CurRow.Cells[(int)DispColumn.LineCount].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.LineCount]);
+                CurRow.Cells[(int)DispColumn.SeqNo].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.SeqNo]);
+                CurRow.Cells[(int)DispColumn.LineCount].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.LineCount]);
 
                 CurRow.Cells[(int)DispColumn.No].Value = iNo;
 
-                int nCompanyCode = CommonMotions.cnvInt(work[(int)GetDBDataDef.CompanyCode]);
-                string strCompanyName = CommonMotions.cnvString(work[(int)GetDBDataDef.CompanyName]);
+                int nCompanyCode = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.CompanyCode]);
+                string strCompanyName = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.CompanyName]);
 
                 CurRow.Cells[(int)DispColumn.SubConstractorCode].Value = nCompanyCode;
                 CurRow.Cells[(int)DispColumn.CompanyCode].Value = nCompanyCode;
@@ -5158,11 +5283,11 @@
                 CurRow.Cells[(int)DispColumn.CompanyName].Value = nCompanyCode > 0 ? strCompanyName : s_UnknownString;
                 CurRow.Cells[(int)DispColumn.CompanyName].ToolTipText = nCompanyCode > 0 ? strCompanyName : s_UnknownString;
 
-                int nConstrYear = CommonMotions.cnvInt(work[(int)GetDBDataDef.ConstrPeriod]);
+                int nConstrYear = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ConstrPeriod]);
                 CurRow.Cells[(int)DispColumn.Period].Value = nConstrYear.ToString("#");
 
-                int nConstrCode = CommonMotions.cnvInt(work[(int)GetDBDataDef.ConstrCode]);
-                string strConstrName = CommonMotions.cnvString(work[(int)GetDBDataDef.FieldName]);
+                int nConstrCode = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ConstrCode]);
+                string strConstrName = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.FieldName]);
                 CurRow.Cells[(int)DispColumn.GenbaCode].Value = nConstrCode;
                 CurRow.Cells[(int)DispColumn.GenbaName].Value = strConstrName;
                 CurRow.Cells[(int)DispColumn.GenbaName].ToolTipText = strConstrName;
@@ -5170,42 +5295,66 @@
                 CurRow.Cells[(int)DispColumn.CompanyName2].Value = strCompanyName;
                 CurRow.Cells[(int)DispColumn.CompanyName2].ToolTipText = strCompanyName;
 
-                CurRow.Cells[(int)DispColumn.LabourKind].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.LabourKind]);
+                CurRow.Cells[(int)DispColumn.PurchaseVal].Value = CommonMotions.cnvLong(ObjCurRow[(int)GetDBDataDef.PurchaseVal]).ToString("#,0");
+                long nExecSumVal = CommonMotions.cnvLong(ObjCurRow[(int)GetDBDataDef.ExecSumVal]);
+                long nExecNowVal = CommonMotions.cnvLong(ObjCurRow[(int)GetDBDataDef.ExecNowVal]);
+                CurRow.Cells[(int)DispColumn.ExecSumVal].Value = (nExecSumVal - nExecNowVal).ToString("#,0");
 
-                CurRow.Cells[(int)DispColumn.SomuSeikyu].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.BillPrice]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.SomuKosoku].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.HighwPrice]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.SomuKanamono].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.HardwPrice]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.SomuSannhaiZei].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.IndswasteTax]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.LabourKind].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.LabourKind]);
 
-                CurRow.Cells[(int)DispColumn.KojiSeikyu].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.KojiSeikyu]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.SomuSeikyu].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.BillPrice]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.SomuKosoku].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.HighwPrice]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.SomuKanamono].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.HardwPrice]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.SomuSannhaiZei].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.IndswasteTax]).ToString("#,0");
 
-                CurRow.Cells[(int)DispColumn.KojiNebiki].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.KojiNebiki]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.KojiSousai].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.KojiSousai]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.JikaiKurikosi].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.JikaiKurikosi]).ToString("#,0");
+                decimal[] GetValue = new decimal[] { CommonMotions.cnvDecimal(ObjCurRow[(int)GetDBDataDef.KojiSeikyu])
+                                                    , CommonMotions.cnvDecimal(ObjCurRow[(int)GetDBDataDef.KojiKosoku])
+                                                    , CommonMotions.cnvDecimal(ObjCurRow[(int)GetDBDataDef.KojiKanamono])
+                                                    , CommonMotions.cnvDecimal(ObjCurRow[(int)GetDBDataDef.KojiSannhaiZei]) };
 
-                CurRow.Cells[(int)DispColumn.KojiKosoku].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.KojiKosoku]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.KojiKanamono].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.KojiKanamono]).ToString("#,0");
-                CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.KojiSannhaiZei]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.KojiSeikyu].Value = GetValue[0].ToString("#,0");
 
-                CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.CnstrPrice]).ToString("#,0");
-                int nKyoryokuUmu = CommonMotions.cnvInt(work[(int)GetDBDataDef.CnstrPriceExist]);
+                CurRow.Cells[(int)DispColumn.KojiNebiki].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.KojiNebiki]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.KojiSousai].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.KojiSousai]).ToString("#,0");
+                CurRow.Cells[(int)DispColumn.JikaiKurikosi].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.JikaiKurikosi]).ToString("#,0");
+
+                CurRow.Cells[(int)DispColumn.KojiKosoku].Value = GetValue[1].ToString("#,0");
+                CurRow.Cells[(int)DispColumn.KojiKanamono].Value = GetValue[2].ToString("#,0");
+                CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value = GetValue[3].ToString("#,0");
+
+                CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.CnstrPrice]).ToString("#,0");
+                int nKyoryokuUmu = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.CnstrPriceExist]);
                 CurRow.Cells[(int)DispColumn.KyoryokuUmu].Value = nKyoryokuUmu == 1 ? nKyoryokuUmu : 0;
 
-                CurRow.Cells[(int)DispColumn.OrderSend].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.PurchaseOrderMailingDate]);
-                CurRow.Cells[(int)DispColumn.OrderReceipt].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.PurchaseOrderReturnDate]);
-                CurRow.Cells[(int)DispColumn.YosanSho].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.PaData]);
+                CurRow.Cells[(int)DispColumn.OrderSend].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.PurchaseOrderMailingDate]);
+                CurRow.Cells[(int)DispColumn.OrderReceipt].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.PurchaseOrderReturnDate]);
+                CurRow.Cells[(int)DispColumn.YosanSho].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.PaData]);
 
-                int nOverFlg = CommonMotions.cnvInt(work[(int)GetDBDataDef.OrverFlg]);
-                if(nOverFlg == (int)BillingDataDetail.OverFlgDef.OverValue)
-                    CurRow.Cells[(int)DispColumn.OverValue].Value = s_strOverComment;
+                decimal decExecVal = CommonMotions.cnvDecimal(ObjCurRow[(int)GetDBDataDef.ExecutionAmount]);
+                int nOverFlg = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.OrverFlg]);
+                // ‰ßŽx•¥‚Ì”»’è
+                if (nOverFlg == (int)BillingDataDetail.OverFlgDef.OverValue)
+                {
+                    if (decExecVal > 0)
+                    {
+                        // ŽÀ�s‹àŠz‚ª0‚æ‚è‘å‚«‚¢�ê�‡‚ÍŽx•¥‰ß�è
+                        CurRow.Cells[(int)DispColumn.OverValue].Value = s_strOverComment;
+                    }
+                    else
+                    {
+                        // ƒ}ƒCƒiƒX‚Ì�HŽ–‚Å‚à“ü—Í‚ª‚ ‚ê‚ÎŽx•¥‰ß�è
+                        if (GetValue.Sum() != 0)
+                            CurRow.Cells[(int)DispColumn.OverValue].Value = s_strOverComment;
+                    }
+                }
 
                 // ”õ�l�Ý’è
-                CurRow.Cells[(int)DispColumn.Bikou].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.Bikou]);
+                CurRow.Cells[(int)DispColumn.Bikou].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.Bikou]);
                 // �HŽ–�Ú�×‘ä’ ‚Ì�s”Ô�†�A—ñ”Ô�†‚ð�Ý’è
                 int[] nLedgerInfo = new int[3];
-                nLedgerInfo[0] = CommonMotions.cnvInt(work[(int)GetDBDataDef.ConstructionLedgerRowNo]);
-                nLedgerInfo[1] = CommonMotions.cnvInt(work[(int)GetDBDataDef.ConstructionLedgerDetailNo]);
-                nLedgerInfo[2] = CommonMotions.cnvInt(work[(int)GetDBDataDef.ConstructionLedgerColNo]);
+                nLedgerInfo[0] = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ConstructionLedgerRowNo]);
+                nLedgerInfo[1] = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ConstructionLedgerDetailNo]);
+                nLedgerInfo[2] = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ConstructionLedgerColNo]);
 
                 CurRow.Cells[(int)DispColumn.LedgerLineNo].Value = nLedgerInfo[0];
                 CurRow.Cells[(int)DispColumn.LedgerDetailNo].Value = nLedgerInfo[1];
@@ -5212,13 +5361,13 @@
                 CurRow.Cells[(int)DispColumn.LedgerColNo].Value = nLedgerInfo[2];
 
                 // ‘ä’ �s”Ô�†ƒZƒbƒg
-                int nCurLine = CommonMotions.cnvInt(work[(int)GetDBDataDef.CurrentLine]);
-                int nMinLine = CommonMotions.cnvInt(work[(int)GetDBDataDef.MinLine]);
+                int nCurLine = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.CurrentLine]);
+                int nMinLine = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.MinLine]);
                 string strRowNo = string.Empty;
                 if (nCurLine > 0 && nMinLine > 0)
                 {
                     int LineCnt = ((nCurLine - nMinLine) / 10) + 1;
-                    string strWork = string.Format("{0}-{1}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts
+                    string strWork = string.Format("{0}-{1}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts
                                                         , LineCnt);
                     strRowNo = string.Format("{0, -5}", strWork);
                 }
@@ -5225,34 +5374,53 @@
                 CurRow.Cells[(int)DispColumn.LedgerRowLine].Value = strRowNo;
 
                 // –¾�×–¼�ÌƒZƒbƒg
-                string strDetail = CommonMotions.cnvString(work[(int)GetDBDataDef.DetailName]);
-                if(strDetail.Length<1) strDetail = CommonMotions.cnvString(work[(int)GetDBDataDef.DetailNameF]);
+                string strDetail = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.DetailName]);
+                if(strDetail.Length<1) strDetail = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.DetailNameF]);
                 CurRow.Cells[(int)DispColumn.DetailName].Value = strDetail;
                 CurRow.Cells[(int)DispColumn.DetailNameBlank].Value = strDetail;
 
                 // �HŽ–’S“–ŽÒƒZƒbƒg
-                CurRow.Cells[(int)DispColumn.ConstrPerson].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.ConstructionPersonCode]);
-                CurRow.Cells[(int)DispColumn.ConstrDepCode].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.ConstrDepCode]);
+                CurRow.Cells[(int)DispColumn.ConstrPerson].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.ConstructionPersonCode]);
+                CurRow.Cells[(int)DispColumn.ConstrDepCode].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.ConstrDepCode]);
                 // ‰c‹Æ’S“–ŽÒƒZƒbƒg
-                CurRow.Cells[(int)DispColumn.SalesPerson].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.SalesPersonCode]);
-                CurRow.Cells[(int)DispColumn.SalesDepCode].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.SalesDepCode]);
+                CurRow.Cells[(int)DispColumn.SalesPerson].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.SalesPersonCode]);
+                CurRow.Cells[(int)DispColumn.SalesDepCode].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.SalesDepCode]);
                 // •›’S“–ŽÒƒZƒbƒg
-                CurRow.Cells[(int)DispColumn.AssistPerson].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.ConstrSubPersonCode]);
-                CurRow.Cells[(int)DispColumn.AssistDepCode].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.AssistDepCode]);
+                CurRow.Cells[(int)DispColumn.AssistPerson].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.ConstrSubPersonCode]);
+                CurRow.Cells[(int)DispColumn.AssistDepCode].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.AssistDepCode]);
                 // Žw“±ˆõƒZƒbƒg
-                CurRow.Cells[(int)DispColumn.InstrPerson].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.ConstructionInstructor]);
-                CurRow.Cells[(int)DispColumn.InstrDepCode].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.InstrDepCode]);
+                CurRow.Cells[(int)DispColumn.InstrPerson].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.ConstructionInstructor]);
+                CurRow.Cells[(int)DispColumn.InstrDepCode].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.InstrDepCode]);
 
                 // ‚T‚O‰¹ƒZƒbƒg
-                CurRow.Cells[(int)DispColumn.Gojyuon].Value = CommonMotions.cnvString(work[(int)GetDBDataDef.Gojyuon]);
+                CurRow.Cells[(int)DispColumn.Gojyuon].Value = CommonMotions.cnvString(ObjCurRow[(int)GetDBDataDef.Gojyuon]);
                 // ƒf�[ƒ^ŠÖ˜A•t‚¯ƒ^ƒCƒv
-                CurRow.Cells[(int)DispColumn.LinkDataType].Value = CommonMotions.cnvInt(work[(int)GetDBDataDef.LinkDataType]);
+                CurRow.Cells[(int)DispColumn.LinkDataType].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.LinkDataType]);
 
+                // •”���o”[ƒf�[ƒ^‚ÌƒL�[‚ðƒZƒbƒg‚·‚é
+                CurRow.Cells[(int)DispColumn.CostLinkKey1].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.YearNumber]);   // ”N“x
+                CurRow.Cells[(int)DispColumn.CostLinkKey2].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.CostType]);     // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                CurRow.Cells[(int)DispColumn.CostLinkKey3].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.TargetType]);   // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+                CurRow.Cells[(int)DispColumn.CostLinkKey4].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.TargetCode]);   // ‘Î�Û�æƒR�[ƒh
+                CurRow.Cells[(int)DispColumn.CostLinkKey5].Value = CommonMotions.cnvInt(ObjCurRow[(int)GetDBDataDef.SeqNoC]);       // ƒf�[ƒ^”Ô�†
+
                 // �HŽ–‘ä’ ‚ÆŠÖ˜A•t‚¯‚ª‚³‚ê‚Ä‚¢‚È‚¢�s‚Í�F‚ð•Ï‚¦‚é
-                SetLinkLedgerColor(CurRow, nLedgerInfo[1]);
+                SetLinkLedgerColor(CurRow);
 
                 // ‘Î�Û�s‚Ì•¶Žš�€–ÚReadOnly‚ðƒZƒbƒg‚·‚é
                 SetReadOnlyRow(CurRow);
+
+                int nAppEndFlg = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ApprovalEndFlg].Value);
+                if (nAppEndFlg != (int)PaymentDataDetail.ApprovalEndFlgDef.Approval) return;
+
+                // �³”F‚ª‚³‚ê‚Ä‚¢‚é�ê�‡‚Í�s‚ð•Ò�W•s‰Â‚É‚·‚é
+                for (int ix = (int)DispColumn.No; ix < (int)DispColumn.OrderSend; ix++)
+                {
+                    if (CurRow.Cells[ix].ReadOnly) continue;
+                    if (!CurRow.Cells[ix].Visible) continue;
+
+                    CurRow.Cells[ix].ReadOnly = true;
+                }
             }
             catch (Exception ex)
             {
@@ -5265,30 +5433,47 @@
         /// <summary>
         /// –¾�×�s‚ð�HŽ–‘ä’ ƒf�[ƒ^‚ÆŠÖ˜A•t‚¯‚³‚ê‚Ä‚¢‚é‚©‚Å�F‚ð•Ï‚¦‚é
         /// </summary>
-        private void SetLinkLedgerColor(DataGridViewRow CurRow, int DetailNo)
+        private void SetLinkLedgerColor(DataGridViewRow CurRow)
         {
             try
             {
-                int nApprovalEndFlg = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ApprovalEndFlg].Value);
+                int nLinkType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LinkDataType].Value);
+                int DetailNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerDetailNo].Value);
+                int SeqNoC = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey5].Value);
 
-                // �³”F‚ª‚³‚ê‚Ä‚¢‚é�ê�‡‚Í�s‚ð•Ò�W•s‰Â‚É‚·‚é
-                if (nApprovalEndFlg == (int)PaymentDataDetail.ApprovalEndFlgDef.Approval)
-                    CurRow.Cells[(int)DispColumn.DetailName].ReadOnly = true;
-
-                // ŠÖ˜A•t‚¯‚ª‚ ‚ê‚Î’Ê�í�F
-                Color clrBack = RowDefaultColor[(int)RowsTypeDef.–¾�×, 1];
-
                 // ŠÖ˜A•t‚¯‚ª–³‚¯‚ê‚Î�F‚ð•Ï‚¦‚é
-                if (DetailNo < 1) clrBack = m_RowBackColor[(int)RowColorDef.UnKnown];
+                bool bReturn = true;
+                Color clrBack = m_RowBackColor[(int)RowColorDef.UnKnown];
+                switch (nLinkType)
+                {
+                    case (int)BillingDataDetail.DataTypeDef.Ledger:
+                        // ‘ä’ ƒf�[ƒ^‚Í–¾�×”Ô�†‚ðƒ`ƒFƒbƒN‚·‚é
+                        if (DetailNo < 1) bReturn = false;
+                        break;
+                    case (int)BillingDataDetail.DataTypeDef.DepAccount:
+                        // •”���o”[‚Í˜A”Ô‚ðƒ`ƒFƒbƒN‚·‚é
+                        //if (SeqNoC > 0)
+                        //{
+                            clrBack = Color.Azure;
+                        //}
+                        bReturn = false;
+                        break;
+                    case (int)BillingDataDetail.DataTypeDef.PurchaseCost:
+                        bReturn = false;
+                        break;
+                    default:
+                        bReturn = false;
+                        break;
+                }
+                if (bReturn) return;
 
+                // ----- ŠÖ˜A•t‚¯‚ª–³‚¯‚ê‚Î•s–¾�F
+                Color clrFore = RowDefaultColor[(int)RowsTypeDef.–¾�×, 0];
                 for (int ix = (int)DispColumn.No; ix <= (int)DispColumn.OverValue; ix++)
                 {
-                    CurRow.Cells[ix].Style.ForeColor = RowDefaultColor[(int)RowsTypeDef.–¾�×, 0];
+                    CurRow.Cells[ix].Style.ForeColor = clrFore;
                     CurRow.Cells[ix].Style.BackColor = clrBack;
                 }
-
-                // ‘Î�Û�s‚Ì�³”FŽÒƒJƒ‰ƒ€�F‚ðŒ»�Ý�³”F�ó‘Ô‚É•Ï‚¦‚é
-                if (DetailNo > 0) ResetApprovalListColor(CurRow);
             }
             catch (Exception ex)
             {
@@ -5356,12 +5541,26 @@
                 if (rdbCompany.Checked)
                 {
                     // ‹ÆŽÒ’PˆÊ•\Ž¦
-                    sql.AppendLine(" Order By Gojyuon ASC, CompanyCode ASC, ConstructionCode ASC, SeqNo ASC, LinePoint ASC, M10 DESC");
+                    sql.AppendLine(" Order By");
+                    sql.AppendLine("  Gojyuon ASC");
+                    sql.AppendLine(", CompanyCode ASC");
+                    sql.AppendLine(", ConstructionCode ASC");
+                    sql.AppendLine(", SeqNo ASC");
+                    sql.AppendLine(", LinePoint ASC");
+                    sql.AppendLine(", LinkDataType Asc");
+                    sql.AppendLine(", M10 DESC");
                 }
                 else if (rdbProject.Checked)
                 {
                     // Œ»�ê’PˆÊ•\Ž¦
-                    sql.AppendLine(" Order By ConstructionCode Desc, CurrentLine ASC, Gojyuon ASC, LineCount ASC, CompanyCode ASC, M10 DESC ");
+                    sql.AppendLine(" Order By");
+                    sql.AppendLine("  ConstructionCode Desc");
+                    sql.AppendLine(", LinkDataType Desc");
+                    sql.AppendLine(", CurrentLine ASC");
+                    sql.AppendLine(", Gojyuon ASC");
+                    sql.AppendLine(", LineCount ASC");
+                    sql.AppendLine(", CompanyCode ASC");
+                    sql.AppendLine(", M10 DESC ");
                 }
             }
             catch (Exception ex)
@@ -5379,8 +5578,6 @@
         {
             try
             {
-                int DefaultCol = ClsChangeLedgerData.GetLedgerColumnCount();
-
                 strSQL.Append(" Select ");
                 strSQL.Append("  1 As ExistsData");
                 strSQL.Append("  , ifnull(Bdd.SeqNo, 1) as SeqNo ");
@@ -5433,25 +5630,38 @@
                 strSQL.Append("  , Cbi.ConstrSubDepCode As AssistDepCode ");
                 strSQL.Append("  , Cbi.ConstrInstrDepCode As InstrDepCode ");
 
-                //strSQL.Append("  , case ifnull(DATE(Pod.SendDate), '') ");
+                // ’�•¶�‘ˆó�ü“ú�EŽó’�“ú
                 strSQL.Append("  , case ifnull(DATE(Po.PrintoutDate), '') ");
                 strSQL.Append("    when '' then '�~' ");
                 strSQL.AppendFormat("    when DATE('{0}') then '�~' ", DateTime.MinValue.ToShortDateString());
                 strSQL.Append("    else '�›' ");
-                strSQL.Append("    end as PurchaseOrderMailingDate ");
+                strSQL.Append("    end as PurchaseOrderDate ");
 
-                strSQL.Append("  , case ifnull(DATE(Pod.ReturnCheckDate), '') ");
-                strSQL.Append("    when '' then '�~' ");
-                strSQL.AppendFormat("    when DATE('{0}') then '�~' ", DateTime.MinValue.ToShortDateString());
-                strSQL.Append("    else '�›' ");
-                strSQL.Append("    end as PurchaseOrderReturnDate ");
+                // WebƒT�[ƒrƒX‚Ì�¿‹�‚ª‚ ‚ê‚Î�³”F“ú�A–³‚¯‚ê‚Î•Ô‘—Žó—Ì“ú
+                if (ProductDefine.Web_Service == (int)ProductDefine.Web_ServiceDef.Exists)
+                {
+                    strSQL.Append("  , case ifnull(OrderApp.ApprovalStatus, 0)");
+                    strSQL.Append("    when 2 then '�›'");
+                    strSQL.Append("    else '�~'");
+                    strSQL.Append("    end as PurchaseOrderApprovalDate");
+                }
+                else
+                {
+                    // ’�•¶�‘•Ô‘—Žó—Ì“ú
+                    strSQL.Append("  , case ifnull(DATE(Pod.ReturnCheckDate), '') ");
+                    strSQL.Append("    when '' then '�~' ");
+                    strSQL.AppendFormat("    when DATE('{0}') then '�~' ", DateTime.MinValue.ToShortDateString());
+                    strSQL.Append("    else '�›' ");
+                    strSQL.Append("    end as PurchaseOrderReturnDate ");
+                }
 
-                //strSQL.Append("  , case ifnull(PersonPet.PersonCode, 0) ");
-                strSQL.Append("  , case ifnull(Cld.ConstructionCode, 0) ");
+                // �HŽ–—\ŽZ�¬—§
+                strSQL.Append("  , Case ifnull(Cld.ConstructionCode, 0) ");
                 strSQL.Append("    when 0 then '�~' ");
                 strSQL.Append("    else '�›' ");
                 strSQL.Append("    end as PaData ");
 
+                int DefaultCol = ClsChangeLedgerData.GetLedgerColumnCount();
                 strSQL.Append("  , Bdd.LineCount as LinePoint ");
                 strSQL.Append("  , Bdd.CONSTRUCTIONROWCNT as DetailPoint ");
                 strSQL.Append("  , Case when AX.TargetMonth is null");
@@ -5495,8 +5705,25 @@
                     strSQL.Append(" , Cbi.ConstructionYear");
 
                 strSQL.Append("  , Bdd.LabourKind");
-                strSQL.Append("  , Bdd.OverFlg");
+
+                strSQL.Append("  , Case When(");
+                strSQL.Append("         (Case When ifnull(Pode.OrdersLinePrice, 0) > 0");
+                strSQL.AppendFormat("        Then ROUND((Pode.OrdersLinePrice / ((100.0 - {0}) / 100.0)), 0)"
+                                                        , CommonMotions.SystemMasterData.StatutoryWelfareRate);
+                strSQL.Append("              Else Cld.ExecutionAmount");
+                strSQL.Append("          End)");
+                strSQL.Append("         - ifnull(NowSumVal.SumVal, 0)) < 0");
+                strSQL.Append("      Then 1 Else 0 End As OverFlg");
                 strSQL.Append("  , Bdd.LinkDataType");
+                strSQL.Append("  , ifnull(NowSumVal.SumVal, 0)As ExecSumVal");
+                strSQL.Append("  , ifnull(TougetsuVal.PaymentAmount, 0) As ExecNowVal");
+                strSQL.Append("  , ROUND((Pode.OrdersLinePrice / ((100.0 - 8) / 100.0)), 0) as OrdersLinePrice");
+                strSQL.Append("  , Cld.ExecutionAmount");
+                strSQL.Append("  , Bcl.YearNumber");
+                strSQL.Append("  , Bcl.CostType");
+                strSQL.Append("  , Bcl.TargetType");
+                strSQL.Append("  , Bcl.TargetCode");
+                strSQL.Append("  , Bcl.SeqNoC");
 
                 int DepartmentCode = GetDepartmentCode();       // •”��‚Ì‘I‘ð
                 int PersonCode = GetConstrPersonCode();         // ‰c‹Æ’S“–ŽÒ‚Ì‘I‘ð
@@ -5578,7 +5805,7 @@
 
                 strSQL.Append("      Left Join constructionledgerDetail as Cld");
                 strSQL.Append("        ON Cld.ConstructionCode = Bdd.CONSTRUCTIONCODE");
-                strSQL.AppendFormat("  And Cld.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat("  And Cld.GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.Append("        And Cld.DetailCount = Bdd.CONSTRUCTIONROWCNT");
 
                 strSQL.Append("      Left Join purchaseorderdetail as Pode");
@@ -5594,6 +5821,18 @@
                 strSQL.Append("        And Pod.CompanyCode = Cld.CompanyCode ");
                 strSQL.Append("        And Pod.SeqNo = Pode.SeqNo ");
 
+                strSQL.Append("      Left Join processapprovaldetail As OrderApp2");
+                strSQL.Append("        On OrderApp2.ConstructionCode = Pode.ConstructionCode");
+                strSQL.AppendFormat("  And OrderApp2.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQL.Append("        And OrderApp2.LinkCode = Pode.SeqNo");
+
+                strSQL.Append("      Left Join processapproval As OrderApp");
+                strSQL.Append("        On OrderApp.ConstructionCode = OrderApp2.ConstructionCode");
+                strSQL.Append("        And OrderApp.ApprovalCode = OrderApp2.ApprovalCode");
+                strSQL.Append("        And OrderApp.OrderNo = OrderApp2.OrderNo");
+                strSQL.Append("        And OrderApp.SeqNo = 1");
+                strSQL.AppendFormat("  And OrderApp.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+
                 strSQL.Append("      Left Join constructionledger as Cl");
                 strSQL.Append("        ON Cl.ConstructionCode = Bdd.CONSTRUCTIONCODE");
                 strSQL.AppendFormat("  And Cl.ComplateFlg = {0}", (int)ConstructionLedger.CompFlagDef.Operateing);
@@ -5612,10 +5851,9 @@
 
                 strSQL.Append("      Left Join approvalmaster As AppM ");
                 strSQL.AppendFormat("  On AppM.ApprovalCode = {0} ", Appcode);
-                strSQL.Append("        And AppM.DepartmentCode in (Select B.DepartmentCode From chgchargedep As B");
-                strSQL.Append("                                    Where B.PersonCode = Picm.PersonCode ");
-                strSQL.AppendFormat("                              AND (DATE(B.STARTDATE) <= DATE(ifnull(PersonPet.EntryDate,'{0}'))", DateTime.Today.ToShortDateString());
-                strSQL.AppendFormat("                              AND DATE('{0}') <= DATE(B.CompDate))) ", DateTime.Today.ToShortDateString());
+                strSQL.Append("        And AppM.DepartmentCode  = case ifnull(Cbi.ConstrDepCode, 0)");
+                strSQL.Append("                                   When 0 Then Picm.DepartmentCode");
+                strSQL.Append("                                   Else Cbi.ConstrDepCode End");
 
                 strSQL.Append("      Left Join PersonInChargeMaster as AppPName ");
                 strSQL.Append("        On AppPName.PersonCode = AppM.ApprovalPerson ");
@@ -5642,10 +5880,60 @@
                 strSQL.Append("                    Group By A.ConstructionCode) As AX");
                 strSQL.Append("        On AX.ConstructionCode = Cld.ConstructionCode");
 
+                strSQL.Append("      Left Join (Select");
+                strSQL.Append("                      cle.ConstructionCode");
+                strSQL.Append("                    , cle.GroupCount");
+                strSQL.Append("                    , cle.LineCount");
+                strSQL.Append("                    , sum(cle.PaymentAmount) As SumVal");
+                strSQL.Append("                 From constructionledgerexcute As cle");
+                strSQL.Append("                 Group by cle.ConstructionCode, cle.GroupCount, cle.LineCount) As NowSumVal");
+                strSQL.Append("         On NowSumVal.ConstructionCode = Cld.ConstructionCode");
+                strSQL.Append("         And NowSumVal.GroupCount = Cld.GroupCount");
+                strSQL.Append("         And NowSumVal.LineCount = Cld.LineCount");
+
+                int DefaultCol = ClsChangeLedgerData.GetLedgerColumnCount();
+                strSQL.Append("      Left Join (Select");
+                strSQL.Append("                      clex.*");
+                strSQL.Append("                 From constructionledgerexcute As clex");
+                strSQL.Append("                   Inner Join (Select");
+                strSQL.Append("                                    A.ConstructionCode");
+                strSQL.Append("                                  , Case When CX.TargetMonth is null");
+                strSQL.AppendFormat("                                   Then PERIOD_DIFF({0}", m_SelTargetDate);
+                strSQL.AppendFormat("                                                   , DATE_FORMAT(A.ConstructionStart, '%Y%m')) + {0}", DefaultCol);
+                strSQL.AppendFormat("                                   Else PERIOD_DIFF({0}", m_SelTargetDate);
+                strSQL.AppendFormat("                                                   , DATE_FORMAT(CX.TargetMonth, '%Y%m')) + {0}", DefaultCol);
+                strSQL.Append("                                         End As ColPoint");
+                strSQL.Append("                                From constructionledger As A");
+                strSQL.Append("                                     Left Join (Select");
+                strSQL.Append("                                                     BX.ConstructionCode");
+                strSQL.Append("                                                   , Min(BX.ColumnCount) As ColumnCount");
+                strSQL.Append("                                                   , Min(BX.TargetMonth) As TargetMonth");
+                strSQL.Append("                                                From constructionledgerexcute As BX");
+                strSQL.Append("                                                Group By BX.ConstructionCode) As CX");
+                strSQL.Append("                                     On CX.ConstructionCode = A.ConstructionCode");
+                strSQL.Append("                     ) As CCX");
+                strSQL.Append("                       On CCX.ConstructionCode = clex.ConstructionCode");
+                strSQL.Append("                       And CCX.ColPoint = clex.ColumnCount");
+                strSQL.Append("                 ) As TougetsuVal");
+                strSQL.Append("         On TougetsuVal.ConstructionCode = Cld.ConstructionCode");
+                strSQL.Append("         And TougetsuVal.GroupCount = Cld.GroupCount");
+                strSQL.Append("         And TougetsuVal.LineCount = Cld.LineCount");
+                strSQL.Append("      Left Join billingcostdatalink As Bcl");
+                strSQL.Append("         On Bcl.CompanyCode = Bdd.COMPANYCODE");
+                strSQL.Append("         And Bcl.TargetDate = Bdd.TARGETDATE");
+                strSQL.Append("         And Bcl.SeqNoB = Bdd.SEQNO");
+                strSQL.Append("         And Bcl.LineCount = Bdd.LINECOUNT");
+                strSQL.Append("         And Bcl.LabourKind = Bdd.LABOURKIND");
+
+
                 strSQL.AppendFormat(" Where Bdd.TargetDate = {0} ", m_SelTargetDate);
                 strSQL.AppendFormat(" And Bdd.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
 
                 strSQL.AppendFormat(" And Bdd.LabourKind = {0}", m_Labourkind);
+                
+                // Œ¸Šz�HŽ–‚Í•\Ž¦‚µ‚È‚¢�iƒIƒŠƒWƒiƒ‹ˆÈŠO�j
+                if (ProductDefine.ProductType != (int)ProductDefine.ProductTypeDef.Originals)
+                    strSQL.AppendFormat(" And Cld.ExecutionAmount >= 0");
 
                 // ŒŸ�õSQL‚ÌƒZƒLƒ…ƒŠƒeƒB”»’è•”•ª‚ð�ì�¬‚·‚é
                 CreateSecuritySQL(ref strSQL);
@@ -5655,12 +5943,13 @@
                     if (PersonCode > 0)
                     {
                         // ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
-                        strSQL.Append(GetPersonString(DepartmentCode, PersonCode));
+                        //strSQL.Append(GetBaseManSQL(DepartmentCode, PersonCode));
+                        strSQL.Append(GetDataManSQL(DepartmentCode, PersonCode));
                     }
                     else if (DepartmentCode > 0)
                     {
                         // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
-                        strSQL.Append(GetDepartmentString(DepartmentCode));
+                        strSQL.Append(GetBaseDepartmentSQL(DepartmentCode));
                     }
 
                     // •s–¾‚ð’Ç‰Á‚·‚é
@@ -5671,15 +5960,21 @@
                 }
                 else
                 {   // ----- �\�¿‘Î�Ûƒf�[ƒ^
-                    if (DepartmentCode > 0)
-                        strSQL.AppendFormat(" And Cbi.ConstrDepCode = {0}", DepartmentCode);
-                    if (PersonCode > 0)
-                        strSQL.AppendFormat(" And Cbi.ConstructionPersonCode = {0}", PersonCode);
+                    strSQL.Append(GetDataManSQL(DepartmentCode, PersonCode));
 
-                    strSQL.Append(" And((Pdd.BILLPRICE != 0)");
-                    strSQL.Append(" Or (Pdd.HIGHWPRICE != 0)");
-                    strSQL.Append(" Or (Pdd.HARDWPRICE != 0)");
-                    strSQL.Append(" Or (Pdd.INDSWASTETAX != 0))");
+                    strSQL.Append(" And (((Bdd.BILLPRICE != 0)");
+                    strSQL.Append("  Or (Bdd.HIGHWPRICE != 0)");
+                    strSQL.Append("  Or (Bdd.HARDWPRICE != 0)");
+                    strSQL.Append("  Or (Bdd.INDSWASTETAX != 0))");
+
+                    strSQL.Append(" Or ((Pdd.BILLPRICE != 0)");
+                    strSQL.Append("  Or (Pdd.OFFSETPRICE != 0)");
+                    strSQL.Append("  Or (Pdd.NEXTCOPRICE != 0)");
+                    strSQL.Append("  Or (Pdd.HIGHWPRICE != 0)");
+                    strSQL.Append("  Or (Pdd.HARDWPRICE != 0)");
+                    strSQL.Append("  Or (Pdd.INDSWASTETAX != 0)");
+                    strSQL.Append("  Or (Pdd.CNSTRPRICE != 0)");
+                    strSQL.Append("  Or (Pdd.DISCOUNTPRICE != 0)))");
                 }
             }
             catch (Exception ex)
@@ -5745,20 +6040,34 @@
                 strSQL.Append("  , Cbi.ConstrSubDepCode As AssistDepCode ");
                 strSQL.Append("  , Cbi.ConstrInstrDepCode As InstrDepCode ");
 
-                //strSQL.Append("  , case ifnull(DATE(Pod.SendDate), '') ");
+                // ’�•¶�‘ˆó�ü“ú�EŽó’�“ú
                 strSQL.Append("  , case ifnull(DATE(Po.PrintoutDate), '') ");
                 strSQL.Append("    when '' then '�~' ");
                 strSQL.AppendFormat("    when DATE('{0}') then '�~' ", DateTime.MinValue.ToShortDateString());
                 strSQL.Append("    else '�›' ");
-                strSQL.Append("    end as PurchaseOrderMailingDate ");
+                strSQL.Append("    end as PurchaseOrderDate ");
 
-                strSQL.Append("  , case ifnull(DATE(Pod.ReturnCheckDate), '') ");
-                strSQL.Append("    when '' then '�~' ");
-                strSQL.AppendFormat("    when DATE('{0}') then '�~' ", DateTime.MinValue.ToShortDateString());
-                strSQL.Append("    else '�›' ");
-                strSQL.Append("    end as PurchaseOrderReturnDate ");
+                // WebƒT�[ƒrƒX‚Ì�¿‹�‚ª‚ ‚ê‚Î�³”F“ú�A–³‚¯‚ê‚Î•Ô‘—Žó—Ì“ú
+                if (ProductDefine.Web_Service == (int)ProductDefine.Web_ServiceDef.Exists)
+                {
+                    strSQL.Append("  , case ifnull(OrderApp.ApprovalStatus, 0)");
+                    strSQL.Append("    when 2 then '�›'");
+                    strSQL.Append("    else '�~'");
+                    strSQL.Append("    end as PurchaseOrderApprovalDate");
+                }
+                else
+                {
+                    // ’�•¶�‘•Ô‘—Žó—Ì“ú
+                    strSQL.Append("  , case ifnull(DATE(Pod.ReturnCheckDate), '') ");
+                    strSQL.Append("    when '' then '�~' ");
+                    strSQL.AppendFormat("    when DATE('{0}') then '�~' ", DateTime.MinValue.ToShortDateString());
+                    strSQL.Append("    else '�›' ");
+                    strSQL.Append("    end as PurchaseOrderReturnDate ");
+                }
 
+                // �HŽ–—\ŽZ�¬—§
                 strSQL.Append("  , '�›' as PaData ");
+
                 strSQL.Append("  , Cld.LineCount as LinePoint ");
                 strSQL.Append("  , Cld.DetailCount as DetailPoint ");
                 strSQL.Append("  , Case when AX.TargetMonth is null");
@@ -5795,8 +6104,25 @@
                     strSQL.Append(" , Cbi.ConstructionYear");
 
                 strSQL.Append(" , Sc.LabourKind");
-                strSQL.Append("  , 0 As OverFlg");
+
+                strSQL.Append("  , Case When(");
+                strSQL.Append("         (Case When ifnull(Pode.OrdersLinePrice, 0) > 0");
+                strSQL.AppendFormat("        Then ROUND((Pode.OrdersLinePrice / ((100.0 - {0}) / 100.0)), 0)"
+                                                        , CommonMotions.SystemMasterData.StatutoryWelfareRate);
+                strSQL.Append("              Else Cld.ExecutionAmount");
+                strSQL.Append("          End)");
+                strSQL.Append("         - ifnull(NowSumVal.SumVal, 0)) < 0");
+                strSQL.Append("      Then 1 Else 0 End As OverFlg");
                 strSQL.Append("  , 1 As LinkDataType");
+                strSQL.Append("  , ifnull(NowSumVal.SumVal, 0)As ExecSumVal");
+                strSQL.Append("  , ifnull(TougetsuVal.PaymentAmount, 0) As ExecNowVal");
+                strSQL.Append("  , ROUND((Pode.OrdersLinePrice / ((100.0 - 8) / 100.0)), 0) as OrdersLinePrice");
+                strSQL.Append("  , Cld.ExecutionAmount");
+                strSQL.Append("  , 0 As YearNumber");
+                strSQL.Append("  , 0 As CostType");
+                strSQL.Append("  , 0 As TargetType");
+                strSQL.Append("  , 0 As TargetCode");
+                strSQL.Append("  , 0 As SeqNoC");
 
                 strSQL.Append(" From ConstructionLedgerDetail as Cld ");
 
@@ -5833,6 +6159,18 @@
                 strSQL.Append("        On Po.ConstructionCode = Cld.SourceCode");
                 strSQL.Append("        And Po.SeqNo = Pode.SeqNo");
 
+                strSQL.Append("      Left Join processapprovaldetail As OrderApp2");
+                strSQL.Append("        On OrderApp2.ConstructionCode = Pode.ConstructionCode");
+                strSQL.AppendFormat("  And OrderApp2.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQL.Append("        And OrderApp2.LinkCode = Pode.SeqNo");
+
+                strSQL.Append("      Left Join processapproval As OrderApp");
+                strSQL.Append("        On OrderApp.ConstructionCode = OrderApp2.ConstructionCode");
+                strSQL.Append("        And OrderApp.ApprovalCode = OrderApp2.ApprovalCode");
+                strSQL.Append("        And OrderApp.OrderNo = OrderApp2.OrderNo");
+                strSQL.Append("        And OrderApp.SeqNo = 1");
+                strSQL.AppendFormat("  And OrderApp.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+
                 strSQL.Append("      Left Join ConstructionBaseInfo as Cbi ");
                 strSQL.Append("            On Cld.ConstructionCode = Cbi.ConstructionCode ");
                 strSQL.AppendFormat("      And Cbi.ConstructionStatusFlg != {0} ", nNotCode);
@@ -5858,13 +6196,56 @@
                 strSQL.Append("                Group By A.ConstructionCode) As AX");
                 strSQL.Append("           On AX.ConstructionCode = Cld.ConstructionCode");
 
+                strSQL.Append("      Left Join (Select");
+                strSQL.Append("                      cle.ConstructionCode");
+                strSQL.Append("                    , cle.GroupCount");
+                strSQL.Append("                    , cle.LineCount");
+                strSQL.Append("                    , sum(cle.PaymentAmount) As SumVal");
+                strSQL.Append("                 From constructionledgerexcute As cle");
+                strSQL.Append("                 Group by cle.ConstructionCode, cle.GroupCount, cle.LineCount) As NowSumVal");
+                strSQL.Append("         On NowSumVal.ConstructionCode = Cld.ConstructionCode");
+                strSQL.Append("         And NowSumVal.GroupCount = Cld.GroupCount");
+                strSQL.Append("         And NowSumVal.LineCount = Cld.LineCount");
+
+                strSQL.Append("      Left Join (Select");
+                strSQL.Append("                      clex.*");
+                strSQL.Append("                 From constructionledgerexcute As clex");
+                strSQL.Append("                   Inner Join (Select");
+                strSQL.Append("                                    A.ConstructionCode");
+                strSQL.Append("                                  , Case When CX.TargetMonth is null");
+                strSQL.AppendFormat("                                   Then PERIOD_DIFF({0}", m_SelTargetDate);
+                strSQL.AppendFormat("                                                   , DATE_FORMAT(A.ConstructionStart, '%Y%m')) + {0}", DefaultCol);
+                strSQL.AppendFormat("                                   Else PERIOD_DIFF({0}", m_SelTargetDate);
+                strSQL.AppendFormat("                                                   , DATE_FORMAT(CX.TargetMonth, '%Y%m')) + {0}", DefaultCol);
+                strSQL.Append("                                         End As ColPoint");
+                strSQL.Append("                                From constructionledger As A");
+                strSQL.Append("                                     Left Join (Select");
+                strSQL.Append("                                                     BX.ConstructionCode");
+                strSQL.Append("                                                   , Min(BX.ColumnCount) As ColumnCount");
+                strSQL.Append("                                                   , Min(BX.TargetMonth) As TargetMonth");
+                strSQL.Append("                                                From constructionledgerexcute As BX");
+                strSQL.Append("                                                Group By BX.ConstructionCode) As CX");
+                strSQL.Append("                                     On CX.ConstructionCode = A.ConstructionCode");
+                strSQL.Append("                     ) As CCX");
+                strSQL.Append("                       On CCX.ConstructionCode = clex.ConstructionCode");
+                strSQL.Append("                       And CCX.ColPoint = clex.ColumnCount");
+                strSQL.Append("                 ) As TougetsuVal");
+                strSQL.Append("                   On TougetsuVal.ConstructionCode = Cld.ConstructionCode");
+                strSQL.Append("                   And TougetsuVal.GroupCount = Cld.GroupCount");
+                strSQL.Append("                   And TougetsuVal.LineCount = Cld.LineCount");
+
                 strSQL.Append(" Where ");
                 strSQL.AppendFormat(" Cbi.ConstructionStatusFlg != {0}", nNotCode);
-                strSQL.AppendFormat("  And Cld.GroupCount = {0} ", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL.AppendFormat("  And Cld.GroupCount = {0} ", (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts);
                 strSQL.Append("        And Cld.CompanyCode > 0 ");
                 strSQL.AppendFormat("  And Cld.CompanyType = {0}", (int)CommonDefine.CodeDataType.Subconstractor);
-                strSQL.AppendFormat("  And Scm.LabourKind = {0}", m_Labourkind);
 
+                // Œ¸Šz�HŽ–‚Í•\Ž¦‚µ‚È‚¢�iƒIƒŠƒWƒiƒ‹ˆÈŠO�j
+                if (ProductDefine.ProductType != (int)ProductDefine.ProductTypeDef.Originals)
+                    strSQL.AppendFormat(" And Cld.ExecutionAmount >= 0");
+
+                    strSQL.AppendFormat("  And Scm.LabourKind = {0}", m_Labourkind);
+
                 // ŒŸ�õSQL‚ÌƒZƒLƒ…ƒŠƒeƒB”»’è•”•ª‚ð�ì�¬‚·‚é
                 CreateSecuritySQL(ref strSQL);
 
@@ -5873,12 +6254,12 @@
                 if (DepartmentCode > 0 && PersonCode > 0)
                 {
                     // ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
-                    strSQL.Append(GetPersonString(DepartmentCode, PersonCode));
+                    strSQL.Append(GetBaseManSQL(DepartmentCode, PersonCode));
                 }
                 else if (DepartmentCode > 0)
                 {
                     // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
-                    strSQL.Append(GetDepartmentString(DepartmentCode));
+                    strSQL.Append(GetBaseDepartmentSQL(DepartmentCode));
                 }
 
                 strSQL.Append("  And Not Exists(Select * From billingdatadetail As execDB");
@@ -5996,12 +6377,12 @@
         }
         #endregion
 
-        #region •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
+        #region •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡�A�HŽ–�î•ñ‚æ‚èŽæ“¾‚·‚é
         /// <summary>
-        /// •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
+        /// •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡�A�HŽ–�î•ñ‚æ‚èŽæ“¾‚·‚é
         /// </summary>
         /// <returns></returns>
-        private string GetDepartmentString(int DepartmentCode)
+        private string GetBaseDepartmentSQL(int DepartmentCode)
         {
             try
             {
@@ -6022,12 +6403,12 @@
         }
         #endregion
 
-        #region ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
+        #region ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡�A�HŽ–�î•ñ‚æ‚èŽæ“¾‚·‚é
         /// <summary>
-        /// ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
+        /// ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡�A�HŽ–�î•ñ‚æ‚èŽæ“¾‚·‚é
         /// </summary>
         /// <returns></returns>
-        private string GetPersonString(int DepartmentCode, int PersonCode)
+        private string GetBaseManSQL(int DepartmentCode, int PersonCode)
         {
             try
             {
@@ -6066,6 +6447,54 @@
         }
         #endregion
 
+        #region ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡�A�¿‹�ƒf�[ƒ^‚æ‚èŽæ“¾‚·‚é
+        /// <summary>
+        /// ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡�A�¿‹�ƒf�[ƒ^‚æ‚èŽæ“¾‚·‚é
+        /// </summary>
+        /// <returns></returns>
+        private string GetDataManSQL(int DepartmentCode, int PersonCode)
+        {
+            try
+            {
+                StringBuilder strRet = new StringBuilder();
+
+                strRet.Append(" And ((");
+                strRet.Append(" (");
+                if (DepartmentCode > 0) strRet.AppendFormat(" Cbi.ConstrDepCode = {0} And", DepartmentCode);
+                strRet.AppendFormat(" Cbi.ConstructionPersonCode = {0}", PersonCode);
+                strRet.Append(")");
+
+                strRet.Append(" Or (");
+                if (DepartmentCode > 0) strRet.AppendFormat(" Cbi.SalesDepCode = {0} And", DepartmentCode);
+                strRet.AppendFormat(" Cbi.SalesPersonCode = {0}", PersonCode);
+                strRet.Append(")");
+
+                strRet.Append(" Or (");
+                if (DepartmentCode > 0) strRet.AppendFormat(" Cbi.ConstrSubDepCode = {0} And", DepartmentCode);
+                strRet.AppendFormat(" Cbi.ConstrSubPersonCode = {0}", PersonCode);
+                strRet.Append(")");
+
+                strRet.Append(" Or (");
+                if (DepartmentCode > 0) strRet.AppendFormat(" Cbi.ConstrInstrDepCode = {0} And ", DepartmentCode);
+                strRet.AppendFormat(" Cbi.ConstructionInstructor = {0}", PersonCode);
+                strRet.Append(")");
+                strRet.Append(")");
+
+                strRet.AppendFormat(" OR (Picm.DepartmentCode = {0}", DepartmentCode);
+                strRet.AppendFormat(" And Pdd.APPROVALPERSONCODE = {0}", PersonCode);
+                strRet.Append("       And ifnull(Cbi.ConstrDepCode, 0) < 1)");
+                strRet.Append(")");
+
+                return strRet.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
         #region ‹ÆŽÒ�¿‹�Žx•¥ƒTƒ}ƒŠ�[ƒf�[ƒ^—p�‡Œv’lŽæ“¾�@(—ñ’PˆÊ)
         /// <summary>
         /// ‹ÆŽÒ�¿‹�Žx•¥ƒTƒ}ƒŠ�[ƒf�[ƒ^—p�‡Œv’lŽæ“¾�@(—ñ’PˆÊ)
@@ -6169,7 +6598,9 @@
         private void DataEntryRollBack(IOBillingDataDetail IoBdD,
                                         IOPaymentDataDetail IoPdD,
                                         IOConstructionLedgerDetail IoDetail,
-                                        IOConstructionLedgerExcute IoExec)
+                                        IOConstructionLedgerExcute IoExec,
+                                        IOCostDataOfCompensation CostDB,
+                                        IOBillingCostDataLink LinkDB)
         {
             try
             {
@@ -6177,6 +6608,8 @@
                 IoPdD.rollback();
                 IoDetail.rollback();
                 IoExec.rollback();
+                CostDB.rollback();
+                LinkDB.rollback();
             }
             catch (System.Exception ex)
             {
@@ -6924,6 +7357,8 @@
             IOConstructionLedgerDetail IoDetail = new IOConstructionLedgerDetail();
             IOConstructionLedgerExcute IoExec = new IOConstructionLedgerExcute();
             IOMSubContractor IoSub = new IOMSubContractor();
+            IOCostDataOfCompensation CostDB = new IOCostDataOfCompensation();
+            IOBillingCostDataLink LinkDB = new IOBillingCostDataLink();
 
             // ‘Î�ÛƒOƒŠƒbƒhŽæ“¾
             DataGridViewEX dgv = dgvData;
@@ -6942,9 +7377,11 @@
                 IoDetail.connect(); IoDetail.beginTran();
                 IoExec.connect(); IoExec.beginTran();
                 IoSub.connect(); IoSub.beginTran();
+                CostDB.connect(); CostDB.beginTran();
+                LinkDB.connect(); LinkDB.beginTran();
 
-                // •K—v�s’Š�o�i–¾�×‚Å•Ï�X‚ª‚ ‚Á‚½�s‚ð‘Î�Û�j
-                DataGridViewRow[] TargetRows = dgv.Rows.Cast<DataGridViewRow>()
+                 // •K—v�s’Š�o�i–¾�×‚Å•Ï�X‚ª‚ ‚Á‚½�s‚ð‘Î�Û�j
+                 DataGridViewRow[] TargetRows = dgv.Rows.Cast<DataGridViewRow>()
                                                         .Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowState].Value) != (int)DataRowState.Unchanged)
                                                         .OrderBy(y => y.Cells[(int)DispColumn.CompanyCode].Value)
@@ -6973,16 +7410,13 @@
                     // –¾�×“o˜^�ˆ—�ƒ‹�[ƒv
                     foreach (DataGridViewRow CurRow in TargetRows)
                     {
-                        // �ó‘ÔŽæ“¾
-                        DataRowState CurStatus = cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value);
-                        // ‰ïŽÐƒR�[ƒhŽæ“¾
-                        int nCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);
-                        // �HŽ–”Ô�†Žæ“¾
-                        int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.GenbaCode].Value);
-                        // ˜A”ÔŽæ“¾
-                        int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SeqNo].Value);
-                        // �sƒJƒEƒ“ƒgŽæ“¾
-                        int nLineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LineCount].Value);
+                        
+                        DataRowState CurStatus = cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value);             // �ó‘ÔŽæ“¾
+                        int nCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);       // ‰ïŽÐƒR�[ƒhŽæ“¾
+                        int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.GenbaCode].Value);          // �HŽ–”Ô�†Žæ“¾
+                        int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SeqNo].Value);                   // ˜A”ÔŽæ“¾
+                        int nLineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LineCount].Value);           // �sƒJƒEƒ“ƒgŽæ“¾
+                        int nLinkKey = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey1].Value);          // •”���o”[ƒŠƒ“ƒNƒL�[
 
                         // �V‹K“o˜^‚Ì�s”Ô�†‚ª‚O‚Ì�ê�‡‚Í˜A”Ô‚ð�Ý’è‚·‚é
                         if (nSeqNo == 0 && nCompanyCode > 0)
@@ -7020,6 +7454,11 @@
                             if (nConstrCode > 0 && nLedgerDetailNo > 0 && nLedgerColCount > 0)
                                 if (!ModConstructionLedgerExcute(IoDetail, IoExec, IoSub, CurRow, false, ref nErrCode))
                                     throw new Exception(CreateEntryErrorMsg(nErrCode, "�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^", "�X�V“o˜^"));
+
+                            // •”���o”[ƒf�[ƒ^�X�V“o˜^
+                            if (nLinkKey > 0)
+                                if (!ModCostdataOfCompensation(CostDB, LinkDB, CurRow, ref nErrCode))
+                                    throw new Exception(CreateEntryErrorMsg(nErrCode, "•”���o”[ƒf�[ƒ^", "�X�V“o˜^"));
                         }
                         else if (CurStatus == DataRowState.Modified)
                         {
@@ -7036,6 +7475,11 @@
                             if (nConstrCode > 0 && nLedgerDetailNo > 0 && nLedgerColCount > 0)
                                 if (!ModConstructionLedgerExcute(IoDetail, IoExec, IoSub, CurRow, false, ref nErrCode))
                                     throw new Exception(CreateEntryErrorMsg(nErrCode, "�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^", "�X�V“o˜^"));
+
+                            // •”���o”[ƒf�[ƒ^�X�V“o˜^
+                            if (nLinkKey > 0)
+                                if (!ModCostdataOfCompensation(CostDB, LinkDB, CurRow, ref nErrCode))
+                                    throw new Exception(CreateEntryErrorMsg(nErrCode, "•”���o”[ƒf�[ƒ^", "�X�V“o˜^"));
                         }
                         else if (CurStatus == DataRowState.Deleted)
                         {
@@ -7052,6 +7496,11 @@
                             if (nConstrCode > 0 && nLedgerDetailNo > 0 && nLedgerColCount > 0)
                                 if (!ModConstructionLedgerExcute(IoDetail, IoExec, IoSub, CurRow, true, ref nErrCode))
                                     throw new Exception(CreateEntryErrorMsg(nErrCode, "�HŽ–�Ú�×‘ä’ ŽÀ�sƒf�[ƒ^", "�í�œ“o˜^"));
+
+                            // •”���o”[ƒf�[ƒ^�í�œ
+                            if (nLinkKey > 0)
+                                if(!DeleteCostdataOfCompensation(CostDB, LinkDB, CurRow, ref nErrCode))
+                                    throw new Exception(CreateEntryErrorMsg(nErrCode, "•”���o”[ƒf�[ƒ^", "�í�œ“o˜^"));
                         }
 
                         DataProgressBar.Value++;
@@ -7077,7 +7526,7 @@
                 }
                 catch (Exception ex)
                 {
-                    DataEntryRollBack(IoBdD, IoPdD, IoDetail, IoExec);
+                    DataEntryRollBack(IoBdD, IoPdD, IoDetail, IoExec, CostDB, LinkDB);
                     MessageBox.Show(ex.Message, "“o˜^�ˆ—�ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     // ƒGƒ‰�[Žž‚Íƒvƒ�ƒOƒŒƒX•Ï�X
                     ProgressBarCtrl(false);
@@ -7103,6 +7552,8 @@
                 IoDetail.commit(); IoDetail.close(); IoDetail = null;
                 IoExec.commit(); IoExec.close(); IoExec = null;
                 IoSub.close(); IoSub = null;
+                CostDB.commit(); CostDB.close(); CostDB = null;
+                LinkDB.commit(); LinkDB.close(); LinkDB = null;
 
                 // ƒvƒ�ƒOƒŒƒX•\Ž¦�§Œä
                 if (!bLinking)
@@ -7218,7 +7669,7 @@
                     // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^�ì�¬
                     BillingDataDetail BdDWork = new BillingDataDetail();
                     // ƒf�[ƒ^ƒZƒbƒg
-                    SetRow2BillingDataDetail(CurRow, IoBdD, IoDetail, ref BdDWork, nCompanyCode, m_SelTargetDate, nSeqNoNew, nLineCountNew);
+                    SetRow2BillingDataDetail(CurRow, ref BdDWork, nCompanyCode, m_SelTargetDate, nSeqNoNew, nLineCountNew);
                     // ƒf�[ƒ^�‘�ž‚Ý
                     if (!IoBdD.InsertAction(BdDWork, false))
                     {
@@ -7230,7 +7681,7 @@
                 {
                     BillingDataDetail BdDWork = Datalist[0];
                     // ƒf�[ƒ^ƒZƒbƒg
-                    SetRow2BillingDataDetail(CurRow, IoBdD, IoDetail, ref BdDWork, nCompanyCode, m_SelTargetDate, nSeqNoNew, nLineCountNew);
+                    SetRow2BillingDataDetail(CurRow, ref BdDWork, nCompanyCode, m_SelTargetDate, nSeqNoNew, nLineCountNew);
 
                     // ƒf�[ƒ^�X�V
                     if (!IoBdD.UpdateAction(strWhere.ToString(), Datalist[0], false))
@@ -7290,7 +7741,7 @@
                 // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^�ì�¬
                 BillingDataDetail BdDWork = new BillingDataDetail();
                 // ƒf�[ƒ^ƒZƒbƒg
-                SetRow2BillingDataDetail(CurRow, IoBdD, IoDetail, ref BdDWork, nCompanyCode, m_SelTargetDate, nSeqNoNew, nLineCountNew);
+                SetRow2BillingDataDetail(CurRow, ref BdDWork, nCompanyCode, m_SelTargetDate, nSeqNoNew, nLineCountNew);
 
                 // �X�V�i‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�j
                 // ƒ�ƒbƒN
@@ -7386,8 +7837,6 @@
         /// ‘Î�Û�s‚æ‚è‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^�s‚ð�ì�¬‚·‚é
         /// </summary>
         private void SetRow2BillingDataDetail(DataGridViewRow CurRow
-                                                , IOBillingDataDetail IoBdD
-                                                , IOConstructionLedgerDetail IoDetail
                                                 , ref BillingDataDetail BdDWork
                                                 , int nCompanyCode
                                                 , int nTargetDate
@@ -7397,7 +7846,7 @@
             try
             {
                 // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^‚ÌŽx•¥’´‰ßƒ�ƒbƒZ�[ƒWƒZƒbƒg
-                SetOverBillingDataDetailMsg(CurRow, nCompanyCode, nTargetDate);
+                //SetOverBillingDataDetailMsg(CurRow, nCompanyCode, nTargetDate);
 
                 // ƒf�[ƒ^ƒZƒbƒg
                 BdDWork.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);                        // ‹¦—Í‰ïŽÐƒR�[ƒh
@@ -7480,18 +7929,27 @@
         /// ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^‚ÌŽx•¥’´‰ßƒ�ƒbƒZ�[ƒWƒZƒbƒg
         /// </summary>
         /// <param name="CurRow"></param>
-        private void SetOverBillingDataDetailMsg(DataGridViewRow CurRow
-                                                , int nCompanyCode
-                                                , int nTargetDate)
+        private void SetOverBillingDataDetailMsg(DataGridViewRow CurRow)
         {
             try
             {
+                int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.GenbaCode].Value);
+                int nLedgerDetailNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerDetailNo].Value);
+                int nCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);
+
+                int nKingaku = (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value)
+                                + CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KojiKosoku].Value)
+                                + CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KojiKanamono].Value)
+                                + CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value));
+
                 // Žx•¥‹àŠz’´‰ßƒ`ƒFƒbƒN
-                bool bOver = ClsChangeLedgerData.OverExecAmount(CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.GenbaCode].Value),
-                                                                CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerDetailNo].Value),
-                                                                CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value),
-                                                                nTargetDate,
-                                                                nCompanyCode);
+                bool bOver = ClsChangeLedgerData.OverExecAmount(nConstrCode
+                                                                , nLedgerDetailNo
+                                                                , nKingaku
+                                                                , m_SelTargetDate
+                                                                , nCompanyCode);
+                // ƒZƒ‹•Ï�XƒCƒxƒ“ƒgOFF
+                dgvData.CellValueChanged -= new DataGridViewCellEventHandler(dgvData_CellValueChanged);
                 if (!bOver)
                 {   // Žx•¥’´‰ß
                     CurRow.Cells[(int)DispColumn.OverValue].Value = s_strOverComment;
@@ -7500,6 +7958,8 @@
                 {   // ŒÀ“x“à‚Ì�ê�‡
                     CurRow.Cells[(int)DispColumn.OverValue].Value = string.Empty;
                 }
+                // ƒZƒ‹•Ï�XƒCƒxƒ“ƒgON
+                dgvData.CellValueChanged += new DataGridViewCellEventHandler(dgvData_CellValueChanged);
             }
             catch (System.Exception ex)
             {
@@ -7740,7 +8200,7 @@
                 int nLedgerDetail = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerDetailNo].Value);
 
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.Append(IoDetail.CreatePrimarykeyString(nConstrCode, (int)FrmConstructionLedger.DataGroup.ConstructionCosts));
+                strSQL.Append(IoDetail.CreatePrimarykeyString(nConstrCode, (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts));
                 // �s”Ô�†‚Ì�Å‘å’l‚ðŽæ“¾‚·‚é
                 int nLineCnt = IoDetail.SelectMaxLineCount(strSQL.ToString(), false) + 1;
 
@@ -7770,7 +8230,7 @@
 
                 // –¾�×ƒf�[ƒ^�ì�¬
                 DetailRec.ConstructionCode = nConstrCode;	                                                                    // �HŽ–ƒR�[ƒh
-                DetailRec.GroupCount = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;                                  // ƒOƒ‹�[ƒv”Ô�†
+                DetailRec.GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;                           // ƒOƒ‹�[ƒv”Ô�†
 
                 DetailRec.LineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerLineNo].Value);                   // �s”Ô�†
                 if (DetailRec.LineCount == 0) DetailRec.LineCount = nLineCnt;
@@ -7789,7 +8249,7 @@
 
                 // ŽÀ�sƒf�[ƒ^�ì�¬
                 ExcuteRec.ConstructionCode = nConstrCode;                                                                       // �HŽ–ƒR�[ƒh
-                ExcuteRec.GroupCount = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;                                  // ƒOƒ‹�[ƒv”Ô�†
+                ExcuteRec.GroupCount = (int)ConstructionLedgerDetail.GroupCountDef.ConstructionCosts;                                  // ƒOƒ‹�[ƒv”Ô�†
                 ExcuteRec.LineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerLineNo].Value);                   // �s”Ô�†
                 if (ExcuteRec.LineCount == 0) ExcuteRec.LineCount = nLineCnt;
                 ExcuteRec.ColumnCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerColNo].Value);                  // —ñ”Ô�†
@@ -8169,6 +8629,167 @@
         }
         #endregion
 
+        #region •”���o”[ƒf�[ƒ^�X�V
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^�X�V
+        /// </summary>
+        private bool ModCostdataOfCompensation(IOCostDataOfCompensation CostDB
+                                            , IOBillingCostDataLink LinkDB
+                                            , DataGridViewRow CurRow
+                                            , ref int nErrorCode)
+        {
+            try
+            {
+
+                int nYearNumber = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey1].Value);       // ”N“x
+                int nCostType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey2].Value);         // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                int nTargetType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey3].Value);       // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+                int nTargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey4].Value);       // ‘Î�Û�æƒR�[ƒh
+                int nSeqNoC = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey5].Value);           // ƒf�[ƒ^”Ô�†
+
+                int nTargetDate = CommonMotions.cnvInt(cmbTargetMonth.SelectedValue);
+                int nYear = CommonMotions.cnvTruncate(nTargetDate / 100);
+                int nMounth = nTargetDate - (nYear * 100);
+                DateTime date = new DateTime(nYear, nMounth, 1);
+                DateTime TargetDate = date.EndOfMonth();                                                            // ‘Î�Û“ú•t
+                int TargetCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);      // ‘Î�Û‘ŠŽè�æ‰ïŽÐƒR�[ƒh
+                string TargetName = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.DetailName].Value);        // ‘Î�Û�HŽ–�E�w“ü•i–¼�Ì
+                decimal TargetValue = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value)      // ‘Î�Û‹àŠz
+                                    + CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiKosoku].Value)
+                                    + CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiKanamono].Value)
+                                    + CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value);
+                int nFromCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);
+                decimal decEntryPrice = CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value)           // �¿‹�‹àŠz
+                                        + CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiKosoku].Value)         // �‚‘¬‘ã
+                                        + CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiKanamono].Value)       // ‹à•¨‘ã
+                                        + CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value);    // ŽY”p�Å
+                string strContent = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.DetailName].Value);
+                string strBikoComment = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.Bikou].Value);
+                double dTaxRate = 1.00 + (CommonMotions.SystemMasterData.ConsumptionTax / 100.0);
+
+                // ‹àŠz‚ª–³‚¢�ê�‡‚Í�í�œ‚µ‚Ä�I—¹
+                if (decEntryPrice < 1)
+                {
+                    bool bRet = DeleteCostdataOfCompensation(CostDB, LinkDB, CurRow, ref nErrorCode);
+                    return bRet;
+                }
+
+                CostDataOfCompensation CostRec = new CostDataOfCompensation
+                {
+                    // •”���o”[ƒf�[ƒ^�ì�¬
+                    YearNumber = nYearNumber,                                               // ”N“x
+                    CostType = nCostType,                                                   // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                    TargetType = nTargetType,                                               // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+                    TargetCode = nTargetCode,                                               // ‘Î�Û�æƒR�[ƒh
+                    SeqNo = nSeqNoC,                                                        // ƒf�[ƒ^”Ô�†
+                    PersonCode = CommonMotions.LoginUserData.PersonCode,                    // �ì�¬ŽÒƒR�[ƒh
+                    FromCodeType = (int)CostDataOfCompensation.TargetTypeDef.Company,       // �o”[Œ³ƒR�[ƒhƒ^ƒCƒv
+                    FromCode = nFromCode,                                                   // �o”[Œ³ƒR�[ƒh
+                    SendDate = TargetDate.Date,                                             // ‘Î�Û“ú•t
+                    EntryPrice = decEntryPrice,                                             // ‹àŠz�i�Å”²�j	
+                    EntryTax = CommonMotions.cnvRound((double)decEntryPrice * dTaxRate),    // ‹àŠz�i�Å�ž�j
+                    Content = strContent,                                                   // Žx•¥“à—e
+                    BikoComment = strBikoComment,                                           // ”õ�l
+                    LockFlg = (int)CostDataOfCompensation.LockFlgDef.Locked                 // ƒf�[ƒ^ƒ�ƒbƒN
+                };
+                // •”���o”[ƒf�[ƒ^�ì�¬
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(CostDB.CreatePrimarykeyString(CostRec.YearNumber
+                                                            , CostRec.CostType
+                                                            , CostRec.TargetType
+                                                            , CostRec.TargetCode
+                                                            , CostRec.SeqNo));
+                List<CostDataOfCompensation> CostList = new List<CostDataOfCompensation>();
+                if (!CostDB.SelectAction(strSQL.ToString(), ref CostList, false))
+                {
+                    nErrorCode = (int)EntryErrorCode.AbNormal;
+                    return false;
+                }
+                if (CostList.Count < 1)
+                {
+                    if (!CostDB.InsertAction(CostRec, false))
+                    {
+                        nErrorCode = (int)EntryErrorCode.AbNormal;
+                        return false;
+                    }
+                }
+                else
+                {
+                    if (!CostDB.UpdateAction(strSQL.ToString(), CostRec, false))
+                    {
+                        nErrorCode = (int)EntryErrorCode.AbNormal;
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                nErrorCode = (int)EntryErrorCode.AbNormal;
+                return false;
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^�í�œ
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^�í�œ
+        /// </summary>
+        private bool DeleteCostdataOfCompensation(IOCostDataOfCompensation CostDB
+                                            , IOBillingCostDataLink LinkDB
+                                            , DataGridViewRow CurRow
+                                            , ref int nErrorCode)
+        {
+            try
+            {
+                int nTargetDate = CommonMotions.cnvInt(cmbTargetMonth.SelectedValue);
+                int nYearNumber = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey1].Value);       // ”N“x
+                int nCostType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey2].Value);         // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                int nTargetType = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey3].Value);       // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+                int nTargetCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey4].Value);       // ‘Î�Û�æƒR�[ƒh
+                int nSeqNoC = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CostLinkKey5].Value);           // ƒf�[ƒ^”Ô�†
+                int nFromCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);
+                int nSeqNoB = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SeqNo].Value);
+                int nLineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LineCount].Value);
+                int nLabourKind = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LabourKind].Value);
+
+                // •”���o”[ƒf�[ƒ^�ì�¬
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(CostDB.CreatePrimarykeyString(nYearNumber
+                                                            , nCostType
+                                                            , nTargetType
+                                                            , nTargetCode
+                                                            , nSeqNoC));
+                if (!CostDB.DeleteAction(strSQL.ToString(), false))
+                {
+                    nErrorCode = (int)EntryErrorCode.AbNormal;
+                    return false;
+                }
+
+                strSQL.Clear();
+                strSQL.Append(LinkDB.CreatePrimarykeyString(nFromCode
+                                                            , nTargetDate
+                                                            , nSeqNoB
+                                                            , nLineCount));
+                if (!LinkDB.DeleteAction(strSQL.ToString(), false))
+                {
+                    nErrorCode = (int)EntryErrorCode.AbNormal;
+                    return false;
+                }
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                nErrorCode = (int)EntryErrorCode.AbNormal;
+                return false;
+            }
+        }
+        #endregion
+
         #region ƒOƒŠƒbƒh‘I‘ð•Ï�X�ˆ—�
         private int m_BeforeRowIndex = -1;
         /// <summary>
@@ -8187,9 +8808,9 @@
                 // ‘ä’ ‘I‘ðƒ{ƒ^ƒ“Off
                 btnLinkLedger.Enabled = false;
                 // �w“ü•iƒ{ƒ^ƒ“Off
-                btnOtherAcc.Enabled = false;
+                btnPurchase.Enabled = false;
                 // •”���o”[ƒ{ƒ^ƒ“Off
-                btnDepExpence.Enabled = false;
+                btnCostExpence.Enabled = false;
                 // Ž©“®ŒvŽZƒ{ƒ^ƒ“Off
                 btnAutoCalc.Enabled = false;
 
@@ -8198,9 +8819,14 @@
                 {
                     DataGridViewRow BeforeRow = dgv.Rows[m_BeforeRowIndex];
 
+                    for (int ix = (int)DispColumn.No; ix <= (int)DispColumn.OverValue; ix++)
+                    {
+                        BeforeRow.Cells[ix].Style.ForeColor = RowDefaultColor[(int)RowsTypeDef.–¾�×, 0];
+                        BeforeRow.Cells[ix].Style.BackColor = RowDefaultColor[(int)RowsTypeDef.–¾�×, 1];
+                    }
+
                     // –¾�×�s‚ð�HŽ–‘ä’ ƒf�[ƒ^‚ÆŠÖ˜A•t‚¯‚³‚ê‚Ä‚¢‚é‚©‚Å�F‚ð•Ï‚¦‚é
-                    int DetailNo = CommonMotions.cnvInt(BeforeRow.Cells[(int)DispColumn.LedgerDetailNo].Value);
-                    SetLinkLedgerColor(BeforeRow, DetailNo);
+                    SetLinkLedgerColor(BeforeRow);
                 }
                 m_BeforeRowIndex = -1;
 
@@ -8231,8 +8857,8 @@
                     || nConstrLedgerDetailNo < 1)
                 {
                     btnLinkLedger.Enabled = true;
-                    btnOtherAcc.Enabled = true;
-                    btnDepExpence.Enabled = true;
+                    btnPurchase.Enabled = true;
+                    btnCostExpence.Enabled = true;
                 }
 
                 int nCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);
@@ -8370,6 +8996,8 @@
                 }
 
                 m_FrmWebInput.Show();
+                Point poNew = new Point((this.Location.X + 30), (this.Location.Y + 30));
+                m_FrmWebInput.Location = poNew;
             }
             catch (System.Exception ex)
             {
@@ -8377,5 +9005,316 @@
             }
         }
         #endregion
+
+        #region •”��“™�w“ü•i�Ý’è�ˆ—�
+        /// <summary>
+        /// •”��“™�w“ü•i�Ý’è�ˆ—�
+        /// </summary>
+        private void CostExpenceExec()
+        {
+            FrmSelectTarget frm = new FrmSelectTarget();
+            try
+            {
+                DialogResult drRet = frm.ShowDialog();
+                if (drRet == DialogResult.Cancel) return;
+
+                int nCostType = frm.CostType;
+                int nType = frm.TargetType;
+                int nTargetCode = (int)CostDataOfCompensation.OwnCompany;
+                if (nType == (int)CostDataOfCompensation.TargetTypeDef.Department)
+                    nTargetCode = frm.SelectDepCode;
+
+                // •”���o”[ƒf�[ƒ^�ì�¬
+                if (!CreateDepartmentCost(nCostType, nType, nTargetCode)) return;
+
+                MessageBox.Show("•”���o”[‚ª�Ý’è‚³‚ê‚Ü‚µ‚½�B", "�Ý’èŠ®—¹", MessageBoxButtons.OK, MessageBoxIcon.None);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^�ì�¬
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^�ì�¬
+        /// </summary>
+        private bool CreateDepartmentCost(int nCostType, int nTargetType, int nTargetCode)
+        {
+            IOCostDataOfCompensation CostDB = new IOCostDataOfCompensation();
+            IOBillingCostDataLink LinkDB = new IOBillingCostDataLink();
+            IOBillingDataDetail BillDB = new IOBillingDataDetail();
+            IOPaymentDataDetail PayDB = new IOPaymentDataDetail();
+            bool bRet = true;
+            try
+            {
+                CostDataOfCompensation CostRec = new CostDataOfCompensation();
+                BillingCostDataLink LinkRec = new BillingCostDataLink();
+                PaymentDataDetail PayRec = new PaymentDataDetail();
+
+                // •”���o”[ƒf�[ƒ^ƒZƒbƒg
+                SetInitCostDatas(nCostType, nTargetType, nTargetCode, CostDB, PayDB, ref CostRec, ref LinkRec, ref PayRec);
+
+                CostDB.connect(); CostDB.beginTran();
+                LinkDB.connect(); LinkDB.beginTran();
+                BillDB.connect(); BillDB.beginTran();
+                PayDB.connect(); PayDB.beginTran();
+
+                 // •”���o”[ƒf�[ƒ^�ì�¬
+                 StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(CostDB.CreatePrimarykeyString(CostRec.YearNumber
+                                                            , CostRec.CostType
+                                                            , CostRec.TargetType
+                                                            , CostRec.TargetCode
+                                                            , CostRec.SeqNo));
+                List<CostDataOfCompensation> CostList = new List<CostDataOfCompensation>();
+                if (!CostDB.SelectAction(strSQL.ToString(), ref CostList, false))
+                {
+                    bRet = false;
+                    return bRet;
+                }
+                if (CostList.Count < 1)
+                {
+                    if(!CostDB.InsertAction(CostRec, false))
+                    {
+                        CostDB.rollback();
+                        LinkDB.rollback();
+                        BillDB.rollback();
+                        PayDB.rollback();
+                        MessageBox.Show("•”���o”[ƒf�[ƒ^�ì�¬Ž¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "ƒf�[ƒ^�ì�¬ƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        bRet = false;
+                        return bRet;
+                    }
+                }
+
+                // ‹ÆŽÒ�¿‹�•”���o”[ƒŠƒ“ƒNƒf�[ƒ^�ì�¬
+                strSQL.Clear();
+                strSQL.Append(LinkDB.CreatePrimarykeyString(LinkRec.CompanyCode
+                                                            ,LinkRec.TargetDate
+                                                            , LinkRec.SeqNoB
+                                                            , LinkRec.LineCount));
+                List<BillingCostDataLink> LinkList = new List<BillingCostDataLink>();
+                if (!LinkDB.SelectAction(strSQL.ToString(), ref LinkList, false))
+                {
+                    bRet = false;
+                    return bRet;
+                }
+                if (LinkList.Count < 1)
+                {
+                    if (!LinkDB.InsertAction(LinkRec, false))
+                    {
+                        CostDB.rollback();
+                        LinkDB.rollback();
+                        BillDB.rollback();
+                        PayDB.rollback();
+                        MessageBox.Show("‹ÆŽÒ�¿‹�•”���o”[ƒŠƒ“ƒNƒf�[ƒ^�ì�¬Ž¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "ƒf�[ƒ^�ì�¬ƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        bRet = false;
+                        return bRet;
+                    }
+                }
+
+                // �¿‹�–¾�×ƒf�[ƒ^�X�V
+                if(!BillDB.UpdateFeild(LinkRec.CompanyCode
+                                        , LinkRec.TargetDate
+                                        , LinkRec.SeqNoB
+                                        , LinkRec.LineCount
+                                        , (int)IOBillingDataDetail.NameColumn.LinkDataType
+                                        , (int)BillingDataDetail.DataTypeDef.DepAccount
+                                        , false))
+                {
+                    CostDB.rollback();
+                    LinkDB.rollback();
+                    BillDB.rollback();
+                    PayDB.rollback();
+                    MessageBox.Show("�¿‹�–¾�×ƒf�[ƒ^�X�VŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                    , "ƒf�[ƒ^�X�VƒGƒ‰�["
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    bRet = false;
+                    return bRet;
+                }
+
+                // ‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^�ì�¬
+                strSQL.Clear();
+                strSQL.Append(PayDB.CreatePrimarykeyString(PayRec.CompanyCode
+                                                            , PayRec.TargetDate
+                                                            , PayRec.SeqNo
+                                                            , PayRec.LineCount
+                                                            , PayRec.LabourKind));
+                List<PaymentDataDetail> PayList = new List<PaymentDataDetail>();
+                if (!PayDB.SelectAction(strSQL.ToString(), ref PayList, false))
+                {
+                    bRet = false;
+                    return bRet;
+                }
+                if (PayList.Count < 1)
+                {
+                    if (!PayDB.InsertAction(PayRec, false))
+                    {
+                        CostDB.rollback();
+                        LinkDB.rollback();
+                        BillDB.rollback();
+                        PayDB.rollback();
+                        MessageBox.Show("‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^�ì�¬Ž¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "ƒf�[ƒ^�ì�¬ƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        bRet = false;
+                        return bRet;
+                    }
+                }
+                else
+                {
+                    if (!PayDB.UpdateAction(strSQL.ToString(), PayRec, false))
+                    {
+                        MessageBox.Show("‹ÆŽÒ�¿‹�–¾�×ƒf�[ƒ^�X�VŽ¸”s‚µ‚Ü‚µ‚½�B"
+                                        , "ƒf�[ƒ^�X�VƒGƒ‰�["
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        bRet = false;
+                        return bRet;
+                    }
+                }
+
+                // ƒOƒŠƒbƒh‚Öƒf�[ƒ^ƒZƒbƒg
+                DataGridView dgv = dgvData;
+                DataGridViewRow CurRow = dgv.CurrentRow;
+
+                CurRow.Cells[(int)DispColumn.RowState].Value = (int)DataRowState.Modified;
+                CurRow.Cells[(int)DispColumn.LinkDataType].Value = (int)BillingDataDetail.DataTypeDef.DepAccount;
+                CurRow.Cells[(int)DispColumn.TantoShoninCode].Value = CommonMotions.LoginUserData.PersonCode;
+                CurRow.Cells[(int)DispColumn.TantoShonin].Value = CommonMotions.LoginUserData.PersonName;
+                CurRow.Cells[(int)DispColumn.CostLinkKey1].Value = CostRec.YearNumber;
+                CurRow.Cells[(int)DispColumn.CostLinkKey2].Value = CostRec.CostType;
+                CurRow.Cells[(int)DispColumn.CostLinkKey3].Value = CostRec.TargetType;
+                CurRow.Cells[(int)DispColumn.CostLinkKey4].Value = CostRec.TargetCode;
+                CurRow.Cells[(int)DispColumn.CostLinkKey5].Value = CostRec.SeqNo;
+
+                // –¾�×�s‚ð�HŽ–‘ä’ ƒf�[ƒ^‚ÆŠÖ˜A•t‚¯‚³‚ê‚Ä‚¢‚é‚©‚Å�F‚ð•Ï‚¦‚é
+                SetLinkLedgerColor(CurRow);
+
+                return bRet;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                bRet = false;
+                return false;
+            }
+            finally
+            {
+                if (!bRet)
+                {
+                    CostDB.rollback();
+                    LinkDB.rollback();
+                    BillDB.rollback();
+                    PayDB.rollback();
+                }
+                CostDB.commit();
+                LinkDB.commit();
+                BillDB.commit();
+                PayDB.commit();
+
+                CostDB.close(); CostDB = null;
+                LinkDB.close(); LinkDB = null;
+                BillDB.close(); BillDB = null;
+                PayDB.close(); PayDB = null;
+            }
+        }
+        #endregion
+
+        #region •”���o”[ƒf�[ƒ^ƒZƒbƒg
+        /// <summary>
+        /// •”���o”[ƒf�[ƒ^ƒZƒbƒg
+        /// </summary>
+        private void SetInitCostDatas(int nCostType, int nTargetType, int nTargetCode
+                                        , IOCostDataOfCompensation CostDB
+                                        , IOPaymentDataDetail PayDB
+                                        , ref CostDataOfCompensation CostRec
+                                        , ref BillingCostDataLink LinkRec
+                                        , ref PaymentDataDetail PayRec)
+        {
+            try
+            {
+                DataGridView dgv = dgvData;
+                DataGridViewRow CurRow = dgv.CurrentRow;
+
+                int nTargetDate = CommonMotions.cnvInt(cmbTargetMonth.SelectedValue);
+                int nYear = CommonMotions.cnvTruncate(nTargetDate / 100);
+                int nMounth = nTargetDate - (nYear * 100);
+                DateTime date = new DateTime(nYear, nMounth, 1);
+                DateTime TargetDate = date.EndOfMonth();                               // ‘Î�Û“ú•t
+                int TargetCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);      // ‘Î�Û‘ŠŽè�æ‰ïŽÐƒR�[ƒh
+                string TargetName = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.DetailName].Value);        // ‘Î�Û�HŽ–�E�w“ü•i–¼�Ì
+                decimal TargetValue = CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value)      // ‘Î�Û‹àŠz
+                                    + CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiKosoku].Value)
+                                    + CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiKanamono].Value)
+                                    + CommonMotions.cnvDecimal(CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value);
+                int nFromCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.CompanyCode].Value);
+                decimal decEntryPrice = CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value)           // �¿‹�‹àŠz
+                                        + CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiKosoku].Value)         // �‚‘¬‘ã
+                                        + CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiKanamono].Value)       // ‹à•¨‘ã
+                                        + CommonMotions.cnvLong(CurRow.Cells[(int)DispColumn.KojiSannhaiZei].Value);    // ŽY”p�Å
+                string strContent = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.DetailName].Value);
+                string strBikoComment = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.Bikou].Value);
+                double dTaxRate = (1.00 + CommonMotions.SystemMasterData.ConsumptionTax) / 100.0;
+
+                int nYearNumber = CommonMotions.GetPeriodYear();
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(CostDB.CreatePrimarykeyString(nYearNumber, nCostType, nTargetType, nTargetCode));
+                int nSeqNoC = CostDB.SelectMaxAddDataCount(strSQL.ToString()) + 1;
+
+                // •”���o”[ƒf�[ƒ^�ì�¬
+                CostRec.YearNumber = nYearNumber;                                                // ”N“x
+                CostRec.CostType = nCostType;                                                   // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                CostRec.TargetType = nTargetType;                                               // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+                CostRec.TargetCode = nTargetCode;                                               // ‘Î�Û�æƒR�[ƒh
+                CostRec.SeqNo = nSeqNoC;                                                        // ƒf�[ƒ^”Ô�†
+                CostRec.PersonCode = CommonMotions.LoginUserData.PersonCode;                    // �ì�¬ŽÒƒR�[ƒh
+                CostRec.FromCodeType = (int)CostDataOfCompensation.TargetTypeDef.Company;       // �o”[Œ³ƒR�[ƒhƒ^ƒCƒv
+                CostRec.FromCode = nFromCode;                                                   // �o”[Œ³ƒR�[ƒh
+                CostRec.SendDate = TargetDate.Date;                                             // ‘Î�Û“ú•t
+                CostRec.EntryPrice = decEntryPrice;                                             // ‹àŠz�i�Å”²�j	
+                CostRec.EntryTax = CommonMotions.cnvRound((double)decEntryPrice * dTaxRate);    // ‹àŠz�i�Å�ž�j
+                CostRec.Content = strContent;                                                   // Žx•¥“à—e
+                CostRec.BikoComment = strBikoComment;                                           // ”õ�l
+                CostRec.LockFlg = (int)CostDataOfCompensation.LockFlgDef.Locked;                // ƒf�[ƒ^ƒ�ƒbƒN
+
+                int nSeqNoB = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SeqNo].Value);
+                int nLineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LineCount].Value);
+                int nLabourKind = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LabourKind].Value);
+
+                // ‹ÆŽÒ�¿‹�•”���o”[ƒŠƒ“ƒNƒf�[ƒ^�ì�¬
+                LinkRec.CompanyCode = nFromCode;                                            // ‹¦—Í‰ïŽÐƒR�[ƒh 
+                LinkRec.TargetDate = nTargetDate;                                           // ‘Î�Û”NŒŽ
+                LinkRec.SeqNoB = nSeqNoB;                                                   // ˜A”Ô
+                LinkRec.LineCount = nLineCount;                                             // �s”Ô�†
+                LinkRec.LabourKind = nLabourKind;                                           // Žx•¥‚¢’Ê�í�EŽèŠÔ‹æ•ª
+                LinkRec.YearNumber = nYearNumber;                                           // ”N“x
+                LinkRec.CostType = nCostType;                                               // �o”[ƒ^ƒCƒvƒtƒ‰ƒO
+                LinkRec.TargetType = nTargetType;                                           // ‘Î�Û�æƒR�[ƒhƒ^ƒCƒv
+                LinkRec.TargetCode = nTargetCode;                                           // ‘Î�Û�æƒR�[ƒh
+                LinkRec.SeqNoC = nSeqNoC;                                                   // ƒf�[ƒ^”Ô�†
+
+                // Žx•¥–¾�×ƒf�[ƒ^�s‚ð�ì�¬‚·‚é
+                SetRow2PaymentDataDetail(CurRow, ref PayRec, nSeqNoB, nLineCount);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.Designer.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.Designer.cs	(revision 483)
@@ -0,0 +1,294 @@
+ï»¿namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmSelectTarget
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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();
+            this.btnSelect = new System.Windows.Forms.Button();
+            this.btnEnd = new System.Windows.Forms.Button();
+            this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.RdoBtn1_2 = new System.Windows.Forms.RadioButton();
+            this.RdoBtn1_1 = new System.Windows.Forms.RadioButton();
+            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.RdoBtn2_2 = new System.Windows.Forms.RadioButton();
+            this.RdoBtn2_1 = new System.Windows.Forms.RadioButton();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.RdoBtn2_3 = new System.Windows.Forms.RadioButton();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
+            this.groupBoxEx1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.BackColor = System.Drawing.Color.Green;
+            this.btnSelect.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnSelect.ForeColor = System.Drawing.Color.White;
+            this.btnSelect.Location = new System.Drawing.Point(342, 460);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(120, 30);
+            this.btnSelect.TabIndex = 3;
+            this.btnSelect.Text = "é�¸ã€€æŠž";
+            this.btnSelect.UseVisualStyleBackColor = false;
+            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+            // 
+            // btnEnd
+            // 
+            this.btnEnd.BackColor = System.Drawing.Color.Blue;
+            this.btnEnd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnEnd.ForeColor = System.Drawing.Color.White;
+            this.btnEnd.Location = new System.Drawing.Point(470, 460);
+            this.btnEnd.Name = "btnEnd";
+            this.btnEnd.Size = new System.Drawing.Size(120, 30);
+            this.btnEnd.TabIndex = 4;
+            this.btnEnd.Text = "çµ‚ã€€äº†";
+            this.btnEnd.UseVisualStyleBackColor = false;
+            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.BackColor = System.Drawing.Color.Snow;
+            this.groupBox1.BorderColor = System.Drawing.Color.Black;
+            this.groupBox1.Controls.Add(this.dgvMaster);
+            this.groupBox1.Controls.Add(this.RdoBtn1_2);
+            this.groupBox1.Controls.Add(this.RdoBtn1_1);
+            this.groupBox1.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.groupBox1.ForeColor = System.Drawing.Color.Black;
+            this.groupBox1.Location = new System.Drawing.Point(10, 164);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(580, 290);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "å‡º ç´� å¯¾ è±¡";
+            // 
+            // dgvMaster
+            // 
+            this.dgvMaster.AllowUserToAddRows = false;
+            this.dgvMaster.AllowUserToDeleteRows = false;
+            this.dgvMaster.AllowUserToResizeColumns = false;
+            this.dgvMaster.AllowUserToResizeRows = false;
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvMaster.ColumnHeadersHeight = 24;
+            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column5,
+            this.Column3,
+            this.Column2});
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dgvMaster.Enabled = false;
+            this.dgvMaster.EnableHeadersVisualStyles = false;
+            this.dgvMaster.Location = new System.Drawing.Point(40, 105);
+            this.dgvMaster.MultiSelect = false;
+            this.dgvMaster.Name = "dgvMaster";
+            this.dgvMaster.RowHeadersVisible = false;
+            this.dgvMaster.RowHeadersWidth = 20;
+            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvMaster.RowTemplate.Height = 24;
+            this.dgvMaster.Size = new System.Drawing.Size(500, 170);
+            this.dgvMaster.TabIndex = 46;
+            // 
+            // RdoBtn1_2
+            // 
+            this.RdoBtn1_2.AutoSize = true;
+            this.RdoBtn1_2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.RdoBtn1_2.ForeColor = System.Drawing.Color.Black;
+            this.RdoBtn1_2.Location = new System.Drawing.Point(205, 24);
+            this.RdoBtn1_2.Name = "RdoBtn1_2";
+            this.RdoBtn1_2.Size = new System.Drawing.Size(171, 33);
+            this.RdoBtn1_2.TabIndex = 45;
+            this.RdoBtn1_2.Text = " ä¼šã€€ã€€ç¤¾";
+            this.RdoBtn1_2.UseVisualStyleBackColor = true;
+            this.RdoBtn1_2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+            // 
+            // RdoBtn1_1
+            // 
+            this.RdoBtn1_1.AutoSize = true;
+            this.RdoBtn1_1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.RdoBtn1_1.ForeColor = System.Drawing.Color.Black;
+            this.RdoBtn1_1.Location = new System.Drawing.Point(205, 64);
+            this.RdoBtn1_1.Name = "RdoBtn1_1";
+            this.RdoBtn1_1.Size = new System.Drawing.Size(171, 33);
+            this.RdoBtn1_1.TabIndex = 45;
+            this.RdoBtn1_1.Text = " éƒ¨ã€€ã€€ç½²";
+            this.RdoBtn1_1.UseVisualStyleBackColor = true;
+            this.RdoBtn1_1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+            // 
+            // groupBoxEx1
+            // 
+            this.groupBoxEx1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.groupBoxEx1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxEx1.Controls.Add(this.RdoBtn2_3);
+            this.groupBoxEx1.Controls.Add(this.RdoBtn2_2);
+            this.groupBoxEx1.Controls.Add(this.RdoBtn2_1);
+            this.groupBoxEx1.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.groupBoxEx1.ForeColor = System.Drawing.Color.Black;
+            this.groupBoxEx1.Location = new System.Drawing.Point(9, 10);
+            this.groupBoxEx1.Name = "groupBoxEx1";
+            this.groupBoxEx1.Size = new System.Drawing.Size(581, 144);
+            this.groupBoxEx1.TabIndex = 5;
+            this.groupBoxEx1.TabStop = false;
+            this.groupBoxEx1.Text = "å‡º ç´� ç§‘ ç›®";
+            // 
+            // RdoBtn2_2
+            // 
+            this.RdoBtn2_2.AutoSize = true;
+            this.RdoBtn2_2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.RdoBtn2_2.ForeColor = System.Drawing.Color.Black;
+            this.RdoBtn2_2.Location = new System.Drawing.Point(110, 64);
+            this.RdoBtn2_2.Name = "RdoBtn2_2";
+            this.RdoBtn2_2.Size = new System.Drawing.Size(306, 31);
+            this.RdoBtn2_2.TabIndex = 46;
+            this.RdoBtn2_2.Text = " å·¥ã€€äº‹ï¼ˆè‡ªç¤¾å·¥äº‹ï¼‰";
+            this.RdoBtn2_2.UseVisualStyleBackColor = true;
+            // 
+            // RdoBtn2_1
+            // 
+            this.RdoBtn2_1.AutoSize = true;
+            this.RdoBtn2_1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.RdoBtn2_1.ForeColor = System.Drawing.Color.Black;
+            this.RdoBtn2_1.Location = new System.Drawing.Point(110, 24);
+            this.RdoBtn2_1.Name = "RdoBtn2_1";
+            this.RdoBtn2_1.Size = new System.Drawing.Size(190, 31);
+            this.RdoBtn2_1.TabIndex = 46;
+            this.RdoBtn2_1.Text = " è³¼ã€€å…¥ã€€å“�";
+            this.RdoBtn2_1.UseVisualStyleBackColor = true;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle2;
+            this.Column5.Frozen = true;
+            this.Column5.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Visible = false;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "éƒ¨ã€€ç½²ã€€å��ã€€ç§°";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 440;
+            // 
+            // Column2
+            // 
+            this.Column2.HeaderText = "";
+            this.Column2.Name = "Column2";
+            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Column2.Width = 40;
+            // 
+            // RdoBtn2_3
+            // 
+            this.RdoBtn2_3.AutoSize = true;
+            this.RdoBtn2_3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.RdoBtn2_3.ForeColor = System.Drawing.Color.Black;
+            this.RdoBtn2_3.Location = new System.Drawing.Point(110, 104);
+            this.RdoBtn2_3.Name = "RdoBtn2_3";
+            this.RdoBtn2_3.Size = new System.Drawing.Size(451, 31);
+            this.RdoBtn2_3.TabIndex = 46;
+            this.RdoBtn2_3.Text = " å·¥ã€€äº‹ï¼ˆå�°å¸³å®Œäº†ãƒ»ç‘•ç–µå·¥äº‹ï¼‰";
+            this.RdoBtn2_3.UseVisualStyleBackColor = true;
+            // 
+            // FrmSelectTarget
+            // 
+            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(600, 500);
+            this.Controls.Add(this.groupBoxEx1);
+            this.Controls.Add(this.btnSelect);
+            this.Controls.Add(this.btnEnd);
+            this.Controls.Add(this.groupBox1);
+            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.ForeColor = System.Drawing.Color.White;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrmSelectTarget";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "å¯¾è±¡é�¸æŠž";
+            this.Shown += new System.EventHandler(this.FrmSelectTarget_Shown);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
+            this.groupBoxEx1.ResumeLayout(false);
+            this.groupBoxEx1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private CustomControls.GroupBoxEx groupBox1;
+        private System.Windows.Forms.RadioButton RdoBtn1_2;
+        private System.Windows.Forms.RadioButton RdoBtn1_1;
+        private System.Windows.Forms.Button btnSelect;
+        private System.Windows.Forms.Button btnEnd;
+        private CustomControls.DataGridViewEX dgvMaster;
+        private CustomControls.GroupBoxEx groupBoxEx1;
+        private System.Windows.Forms.RadioButton RdoBtn2_2;
+        private System.Windows.Forms.RadioButton RdoBtn2_1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
+        private System.Windows.Forms.RadioButton RdoBtn2_3;
+    }
+}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.cs	(revision 483)
@@ -0,0 +1,325 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.Master;
+using ProcessManagement.Forms.SubForms;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.CustomControls;
+
+//*---------------------------- éƒ¨ç½²ãƒ»ä¼šç¤¾é�¸æŠžç”»é�¢ ----------------------------*
+//  2020/05/01  Ver1.0.0.0      Create Source           
+//
+//
+//
+//*----------------------------------------------------------------------------*
+namespace ProcessManagement.Forms.DataEntry
+{
+    public partial class FrmSelectTarget : Form
+    {
+        #region ä½¿ç”¨å®šç¾©
+        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å¤‰æ•°
+
+        /// <summary>
+        /// çµŒè²»ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        private int m_CostType = (int)CostDataOfCompensation.CostTypeDef.None;
+
+        /// <summary>
+        /// é�¸æŠžã‚¿ã‚¤ãƒ—
+        /// </summary>
+        private int m_TargetType = (int)CostDataOfCompensation.TargetTypeDef.None;
+
+        /// <summary>
+        /// é�¸æŠžéƒ¨ç½²ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        private int m_SelectDepCode = 0;
+
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+
+        /// <summary>
+        /// çµŒè²»ã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int CostType
+        {
+            get { return m_CostType; }
+            set { m_CostType = value; }
+        }
+
+        /// <summary>
+        /// é�¸æŠžã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public int TargetType
+        {
+            get { return m_TargetType; }
+            set { m_TargetType = value; }
+        }
+
+        /// <summary>
+        /// é�¸æŠžéƒ¨ç½²ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        public int SelectDepCode
+        {
+            get { return m_SelectDepCode; }
+            set { m_SelectDepCode = value; }
+        }
+
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        public FrmSelectTarget()
+        {
+            InitializeComponent();
+        }
+        #endregion
+
+        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰æ™‚å‡¦ç�†
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰æ™‚å‡¦ç�†
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmSelectTarget_Shown(object sender, EventArgs e)
+        {
+          // éƒ¨ç½²è¡¨ç¤º
+            SetDepartmentData();
+        }
+        #endregion
+
+        #region é�¸æŠžãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// <summary>
+        /// é�¸æŠžãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSelect_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
+                if (!DataCheck()) return;
+
+                // å‡ºç´�ç§‘ç›®
+                if (RdoBtn2_1.Checked)
+                {
+                    m_CostType = (int)CostDataOfCompensation.CostTypeDef.Type2;
+                }
+                else if (RdoBtn2_2.Checked)
+                {
+                    m_CostType = (int)CostDataOfCompensation.CostTypeDef.Type3;
+                }
+                else
+                {
+                    m_CostType = (int)CostDataOfCompensation.CostTypeDef.Type4;
+                }
+
+                // å‡ºç´�åˆ†é¡ž
+                if (RdoBtn1_1.Checked)
+                {
+                    m_TargetType = (int)CostDataOfCompensation.TargetTypeDef.Department;
+                    m_SelectDepCode = GetSelectDepCode();
+                }
+                else
+                {
+                    m_TargetType = (int)CostDataOfCompensation.TargetTypeDef.Company;
+                }
+
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region é�¸æŠžéƒ¨ç½²ã‚³ãƒ¼ãƒ‰å�–å¾—
+        /// <summary>
+        /// é�¸æŠžéƒ¨ç½²ã‚³ãƒ¼ãƒ‰å�–å¾—
+        /// </summary>
+        /// <returns></returns>
+        private int GetSelectDepCode()
+        {
+            try
+            {
+                int nDepCode = 0;
+                List<DataGridViewRow> RowList = dgvMaster.Rows.Cast<DataGridViewRow>()
+                                                            .Where(x => CommonMotions.cnvBool(x.Cells[2].Value))
+                                                            .ToList();
+                nDepCode = CommonMotions.cnvInt(RowList[0].Cells[0].Value);
+
+                return nDepCode;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <returns></returns>
+        private bool DataCheck()
+        {
+            try
+            {
+                // å‡ºç´�ç§‘ç›®ãƒ�ã‚§ãƒƒã‚¯
+                if (!RdoBtn2_1.Checked && !RdoBtn2_2.Checked && !RdoBtn2_3.Checked)
+                {
+                    MessageBox.Show("å‡ºç´�ç§‘ç›®ï¼šå¿…ã�šé�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+                                    , "é�¸æŠžã‚¨ãƒ©ãƒ¼"
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // å‡ºç´�å¯¾è±¡ãƒ�ã‚§ãƒƒã‚¯
+                if (!RdoBtn1_1.Checked && !RdoBtn1_2.Checked)
+                {
+                    MessageBox.Show("å‡ºç´�å¯¾è±¡ï¼šå¿…ã�šé�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+                                    , "é�¸æŠžã‚¨ãƒ©ãƒ¼"
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return false;
+                }
+
+                if (!RdoBtn1_1.Checked) return true;
+
+                // éƒ¨ç½²é�¸æŠžãƒ�ã‚§ãƒƒã‚¯
+                List<DataGridViewRow> RowList = dgvMaster.Rows.Cast<DataGridViewRow>()
+                                                            .Where(x => CommonMotions.cnvBool(x.Cells[2].Value))
+                                                            .ToList();
+                if (RowList.Count < 1)
+                {
+                    MessageBox.Show("éƒ¨ç½²ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+                                    , "é�¸æŠžã‚¨ãƒ©ãƒ¼"
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return false;
+                }
+
+                if (RowList.Count > 1)
+                {
+                    MessageBox.Show("éƒ¨ç½²ã�¯ï¼’ã�¤ä»¥ä¸Šé�¸æŠžå‡ºæ�¥ã�¾ã�›ã‚“ã€‚"
+                                    , "é�¸æŠžã‚¨ãƒ©ãƒ¼"
+                                    , MessageBoxButtons.OK
+                                    , MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// <summary>
+        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnEnd_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                this.DialogResult = DialogResult.Cancel;
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region éƒ¨ç½²è¡¨ç¤º
+        /// <summary>
+        /// éƒ¨ç½²è¡¨ç¤º
+        /// </summary>
+        private void SetDepartmentData()
+        {
+            IOMDepartment DepDB = new IOMDepartment();
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(" Where DeleteFlg = 0");
+                strSQL.Append(" Order By DisplayOrder Asc");
+                List<DepartmentMaster> DepList = new List<DepartmentMaster>();
+                DepDB.SelectAction(strSQL.ToString(), ref DepList);
+
+                DataGridView dgv = dgvMaster;
+                dgv.Rows.Clear();
+                foreach(DepartmentMaster CurRec in DepList)
+                {
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
+
+                    CurRow.Cells[0].Value = CurRec.DepartmentCode;
+                    CurRow.Cells[1].Value = CurRec.DepartmentString;
+                    CurRow.Cells[2].Value = false;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DepDB.close();DepDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³é�¸æŠžå¤‰æ›´
+        /// <summary>
+        /// ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³é�¸æŠžå¤‰æ›´
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void radioButton1_CheckedChanged(object sender, EventArgs e)
+        {
+            if (RdoBtn1_1.Checked)
+            {
+                dgvMaster.Enabled = true;
+            }
+            else
+            {
+                dgvMaster.Enabled = false;
+            }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.resx	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSumList/FrmSelectTarget.resx	(revision 483)
@@ -0,0 +1,129 @@
+ï»¿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs	(revision 483)
@@ -964,7 +964,10 @@
             var ioDepositData = new IODepositData();
             try
             {
-                if (MessageBox.Show("é�¸æŠžã�—ã�¦ã�„ã‚‹ãƒ‡ãƒ¼ã‚¿ã‚’å‰Šé™¤ã�—ã�¾ã�™ã€‚ã‚ˆã‚�ã�—ã�„ã�§ã�—ã‚‡ã�†ã�‹ã€‚", "å‰Šé™¤ç¢ºèª�", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                if (MessageBox.Show("é�¸æŠžã�—ã�¦ã�„ã‚‹ãƒ‡ãƒ¼ã‚¿ã‚’å‰Šé™¤ã�—ã�¾ã�™ã€‚\r\nã‚ˆã‚�ã�—ã�„ã�§ã�—ã‚‡ã�†ã�‹ï¼Ÿ"
+                                    , "å‰Šé™¤ç¢ºèª�"
+                                    , MessageBoxButtons.YesNo
+                                    , MessageBoxIcon.Question) != DialogResult.Yes)
                 {
                     return;
                 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPaymentAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPaymentAux.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPaymentAux.cs	(revision 483)
@@ -35,10 +35,15 @@
     {
         #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰æ™‚ã�®å‡¦ç�†
         /// <summary>
+        /// åˆ�æœŸãƒ­ãƒ¼ãƒ‰æ™‚ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private bool m_bInitLoad = false;
+        /// <summary>
         /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰æ™‚ã�®å‡¦ç�†
         /// </summary>
         private void InitFormLoad()
         {
+            m_bInitLoad = true;
             try
             {
                 // å¯¾è±¡æœˆã‚³ãƒ³ãƒœBOXè¨­å®š
@@ -94,6 +99,7 @@
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            m_bInitLoad = false;
         }
         #endregion
 
@@ -304,18 +310,20 @@
                 List<DataGridViewRow> wrkRow = dgvMaster.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.KB].Value) == (int)PaymentLineClass.detailLine
                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.OrderersDivision].Value) == nDivisionCode
                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.OrderersCode].Value) == nOrderCode
-                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.DepositSeqNo].Value) > 0)
+                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.DetailSeqNo].Value) > 0)
                                                                     .OrderBy(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.No].Value))
                                                                     .ToList();
                 // å…¥é‡‘ãƒ‡ãƒ¼ã‚¿ã�®æ¶ˆè¾¼æ®‹ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                 foreach (DataGridViewRow CurRow in wrkRow)
                 {
-                    int wrkDepositMonth = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.DepositMonth].Value);
-                    int wrkDepositSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.DepositSeqNo].Value);
+                    int wrkDepositMonth = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.DetailDepositMonth].Value);
+                    int wrkDepositSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.DetailSeqNo].Value);
                     if (wrkDepositMonth < 1 || wrkDepositSeqNo < 1) continue;
-                    SetSumLineDataDepositDiff(CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.OrderersDivision].Value)
-                                                , CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.OrderersCode].Value)
-                                                , wrkDepositMonth, wrkDepositSeqNo);
+
+                    nDivisionCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.OrderersDivision].Value);
+                    nOrderCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.OrderersCode].Value);
+
+                    SetSumLineDataDepositDiff(nDivisionCode, nOrderCode, wrkDepositMonth, wrkDepositSeqNo);
                 }
 
                 // ç™ºæ³¨è€…å�ˆè¨ˆã�®è¡¨ç¤º
@@ -708,6 +716,7 @@
                 TotalCount(m_Select_TargetDate);
                 DataProgressBar.Value++;
 
+                // ç·¨é›†ãƒ•ãƒ©ã‚°OFF
                 m_isDirty = false;
 
                 if (m_Select_TargetDate != m_BeforeDispMonth)
@@ -1202,7 +1211,7 @@
                 DepositDataCalc(DivisionCode, OrderCode, DepositMonth, SeqNo, ref wrkDeposit);
 
                 // å…¥é‡‘å�ˆè¨ˆã‚’è¨ˆç®—ã�™ã‚‹
-                long lwork = m_depositOrderers.Where(x => x.KB == (int)PaymentLineClass.detailLine
+                long lwkDepsit = m_depositOrderers.Where(x => x.KB == (int)PaymentLineClass.detailLine
                                                             && x.OrderersDivision == DivisionCode
                                                             && x.OrderersCode == OrderCode
                                                             && x.Deposits[0].DepositMonth == DepositMonth
@@ -1213,38 +1222,38 @@
                                                             + y.Deposits[0].Fees
                                                             + y.Deposits[0].OtherAdjustments);
 
-                //// æ˜Žç´°å�´ã�®å…¥é‡‘æ¶ˆè¾¼é‡‘é¡�ã‚’é›†è¨ˆã�™ã‚‹ï¼ˆæ¶ˆè²»ç¨Žã‚’é™¤ã��ï¼‰
-                //long wrkTotal = m_depositOrderers.Where(x => x.KB == (int)PaymentLineClass.detailLine
-                //                                            && x.OrderersDivision == DivisionCode
-                //                                            && x.OrderersCode == OrderCode
-                //                                            && x.DepositDetails[0].DepositMonth == DepositMonth
-                //                                            && x.DepositDetails[0].SeqNo == SeqNo)
-                //                                .Sum(y => y.DepositDetails[0].DepositAmount
-                //                                            + y.DepositDetails[0].CnstrPrice
-                //                                            + y.DepositDetails[0].Fees
-                //                                            + y.DepositDetails[0].OtherAdjustments);
+                // æ˜Žç´°å�´ã�®å…¥é‡‘æ¶ˆè¾¼é‡‘é¡�ã‚’é›†è¨ˆã�™ã‚‹ï¼ˆæ¶ˆè²»ç¨Žã‚’é™¤ã��ï¼‰
+                long wrkPayTotal = m_depositOrderers.Where(x => x.KB == (int)PaymentLineClass.detailLine
+                                                            && x.OrderersDivision == DivisionCode
+                                                            && x.OrderersCode == OrderCode
+                                                            && x.DepositDetails[0].DepositMonth == DepositMonth
+                                                            && x.DepositDetails[0].SeqNo == SeqNo)
+                                                .Sum(y => y.DepositDetails[0].DepositAmount
+                                                            + y.DepositDetails[0].CnstrPrice
+                                                            + y.DepositDetails[0].Fees
+                                                            + y.DepositDetails[0].OtherAdjustments);
 
-                //// æ¶ˆè²»ç¨Žé›†è¨ˆ
-                //int SelDate = CommonMotions.cnvInt(cbTargetMonth.SelectedValue);
-                //int nYear = CommonMotions.cnvTruncate(SelDate / 100);
-                //int nMonth = SelDate - (nYear * 100);
-                //int nParaDate = 0;
-                //if (nYear > 0 && (1 <= nMonth && nMonth <= 12))
-                //    nParaDate = (SelDate * 100) + DateTime.DaysInMonth(nYear, nMonth);
-                //long wrkTotalTax = m_depositOrderers.Where(x => x.KB == (int)PaymentLineClass.detailLine
-                //                                            && x.OrderersDivision == DivisionCode
-                //                                            && x.OrderersCode == OrderCode
-                //                                            && x.DepositDetails[0].DepositMonth == DepositMonth
-                //                                            && x.DepositDetails[0].SeqNo == SeqNo)
-                //                                .Sum(y => y.DepositDetails[0].TaxAmount - (CommonMotions.cnvRound((double)(y.DepositDetails[0].DiscountAmount)
-                //                                                                            * (CommonMotions.AdaptationConsumptionTax(nParaDate) / 100.0))));
+                // æ¶ˆè²»ç¨Žé›†è¨ˆ
+                int SelDate = CommonMotions.cnvInt(cbTargetMonth.SelectedValue);
+                int nYear = CommonMotions.cnvTruncate(SelDate / 100);
+                int nMonth = SelDate - (nYear * 100);
+                int nParaDate = 0;
+                if (nYear > 0 && (1 <= nMonth && nMonth <= 12))
+                    nParaDate = (SelDate * 100) + DateTime.DaysInMonth(nYear, nMonth);
+                long wrkPayTotalTax = m_depositOrderers.Where(x => x.KB == (int)PaymentLineClass.detailLine
+                                                            && x.OrderersDivision == DivisionCode
+                                                            && x.OrderersCode == OrderCode
+                                                            && x.DepositDetails[0].DepositMonth == DepositMonth
+                                                            && x.DepositDetails[0].SeqNo == SeqNo)
+                                                .Sum(y => y.DepositDetails[0].TaxAmount - (CommonMotions.cnvRound((double)(y.DepositDetails[0].DiscountAmount)
+                                                                                            * (CommonMotions.AdaptationConsumptionTax(nParaDate) / 100.0))));
 
-                //// æ¶ˆè²»ç¨Žé‡‘é¡�ã‚’åŠ ç®—
-                //wrkTotal += wrkTotalTax;
+                // æ¶ˆè²»ç¨Žé‡‘é¡�ã‚’åŠ ç®—
+                wrkPayTotal += wrkPayTotalTax;
 
-                //// å‰�æœˆã�¾ã�§ã�®æ¶ˆè¾¼é‡‘é¡�ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                // å‰�æœˆã�¾ã�§ã�®æ¶ˆè¾¼æ®‹é‡‘é¡�ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                 //wrkTotal += wrkDeposit.RemainingValue_Prev;
-                long wrkTotal = wrkDeposit.RemainingValue_Prev;
+                //long wrkTotal = wrkDeposit.RemainingValue_Prev;
 
                 // å…¥é‡‘æƒ…å ±ã�®è¡¨ç¤ºè¡Œã‚’å�–å¾—ã�™ã‚‹
                 DataGridViewRow DspRow = dgvMaster.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.KB].Value) == (int)PaymentLineClass.detailLine
@@ -1261,11 +1270,9 @@
                 CurCell.Style.BackColor = SetDetailCelColor(CurCell);
 
                 // å…¥é‡‘é‡‘é¡�å�–å¾—
-                lwork -= wrkTotal;
+                lwkDepsit -= (wrkDeposit.RemainingValue_Prev + wrkPayTotal);
                 // æ¶ˆè¾¼æ®‹è¡¨ç¤º
-                SetPrice(DspRow.Cells, (int)DispColumn.CalcDeposit, lwork);
-                // ãƒžã‚¤ãƒŠã‚¹æ™‚ã€�èƒŒæ™¯è‰²å¤‰æ›´
-                if (lwork < 0) CurCell.Style.BackColor = Color.Yellow;
+                SetPrice(DspRow.Cells, (int)DispColumn.CalcDeposit, lwkDepsit);
             }
             catch (Exception ex)
             {
@@ -1278,7 +1285,7 @@
         /// <summary>
         /// ç™ºæ³¨è€…ã�®æ˜Žç´°ã‚ˆã‚Šæ‰‹æ•°æ–™ç­‰ã‚’å�–å¾—ã�™ã‚‹â—�ï¼³ï¼µï¼­
         /// </summary>
-        private void DepositDataCalc(int OrderersDivision, int OrderersCode, int nDepositMonth, int nSeqNo, ref Deposit Targetdeposit, bool bReCalc = false)
+        private void DepositDataCalc(int OrderersDivision, int OrderersCode, int nDepositMonth, int nSeqNo, ref Deposit Targetdeposit)
         {
             try
             {
@@ -1915,55 +1922,11 @@
                 sql.Append("  LEFT OUTER JOIN DEPOSITDATADETAIL AS DPDE ");
                 sql.Append("   ON DPDE.ORDERERSDIVISION = H.ORDERERSDIVISION");
                 sql.Append("   AND DPDE.ORDERERSCODE = H.ORDERERSCODE ");
-                //sql.AppendFormat("   And DPDE.TARGETDATE = {0} ", m_Select_TargetDate);
                 sql.Append("   AND DPDE.REQUESTNO = H.REQUESTNO ");
 
-                //sql.Append("  LEFT JOIN(Select");
-                //sql.Append("              DddX.ORDERERSDIVISION, DddX.ORDERERSCODE, DddX.REQUESTNO");
-                //sql.Append("            , SUM(DddX.DEPOSITAMOUNT");
-                //sql.Append("                 + DddX.TAXAMOUNT");
-                //sql.Append("                 + DddX.DISCOUNTAMOUNT");
-                //sql.Append("                 + DddX.CNSTRPRICE");
-                //sql.Append("                 + DddX.FEES");
-                //sql.Append("                 + DddX.OTHERADJUSTMENTS) As CalcValue");
-                //sql.Append("            From depositdatadetail As DddX");
-                //sql.AppendFormat("      Where DddX.TARGETDATE < {0}", m_Select_TargetDate);
-                //sql.Append("            Group By DddX.ORDERERSDIVISION, DddX.ORDERERSCODE, DddX.REQUESTNO) As Ddd");
-                //sql.Append("       On Ddd.ORDERERSDIVISION = H.ORDERERSDIVISION");
-                //sql.Append("       And Ddd.ORDERERSCODE = H.ORDERERSCODE");
-                //sql.Append("       And Ddd.REQUESTNO = H.REQUESTNO");
-
                 sql.Append("  WHERE ");
-                sql.AppendFormat(" (DATE({0}) <= DATE(H.BILLINGDATE)", (m_Select_TargetDate * 100) + 1);
-                sql.AppendFormat(" And DATE(H.BILLINGDATE) <= DATE({0}))", nEndDate);
+                sql.AppendFormat("  {0} = H.REQUESTMONTH", m_Select_TargetDate);
 
-                //sql.Append("        EXISTS(Select * From DEPOSITDATADETAIL As SearchDp");
-                //sql.Append("                             Inner Join requesthead As Req");
-                //sql.Append("                                   On Req.REQUESTNO = SearchDp.REQUESTNO");
-                //sql.Append("                        Where SearchDp.ORDERERSDIVISION = H.ORDERERSDIVISION");
-                //sql.Append("                        AND SearchDp.ORDERERSCODE = H.ORDERERSCODE ");
-                //sql.Append("                        AND SearchDp.REQUESTNO = H.REQUESTNO ");
-
-                //sql.AppendFormat("                  And SearchDp.TARGETDATE = {0} ", m_Select_TargetDate);
-
-                //sql.AppendFormat("                  And ((DATE({0}) <= DATE(Req.BILLINGDATE)", (m_Select_TargetDate * 100) + 1);
-                //sql.AppendFormat("                  And DATE(Req.BILLINGDATE) <= DATE({0}))))", nEndDate);
-
-                //sql.AppendFormat("   (H.REQUESTMONTH = {0}) ", m_Select_TargetDate);
-
-                //sql.AppendFormat("   Or ((H.REQUESTMONTH < {0})", m_Select_TargetDate);
-                //sql.Append("          And ((H.REQUESTTOTALAMOUNT - ifnull(Ddd.CalcValue, 0) < -1)");
-                //sql.Append("              Or (1 < H.REQUESTTOTALAMOUNT - ifnull(Ddd.CalcValue, 0))))");
-
-                //sql.AppendFormat("   Or ((H.REQUESTMONTH < {0}) And (DPDE.TARGETDATE = {0}))", m_Select_TargetDate);
-
-                //sql.AppendFormat("   Or ((H.REQUESTMONTH < {0})", m_Select_TargetDate);
-                //sql.Append("              And EXISTS(Select * From DEPOSITDATADETAIL As SearchDp");
-                //sql.Append("                             Where SearchDp.ORDERERSDIVISION = H.ORDERERSDIVISION");
-                //sql.Append("                             AND SearchDp.ORDERERSCODE = H.ORDERERSCODE ");
-                //sql.AppendFormat("                       And SearchDp.TARGETDATE = {0} ", m_Select_TargetDate);
-                //sql.Append("                             AND SearchDp.REQUESTNO = H.REQUESTNO)) ");
-
                 sql.Append("  Group By ORDERERSNAME, H.ORDERERSDIVISION, H.ORDERERSCODE");
 
                 sql.Append(" ) ");
@@ -1970,12 +1933,11 @@
                 sql.Append(" UNION ( ");
                 sql.Append("  SELECT ");
                 sql.Append("   CONCAT(O.ORDERERSNAME1, 'ã€€', O.ORDERERSNAME2) AS ORDERERSNAME ");
-                sql.Append("   , I.REQUESTMONTH AS REQUESTMONTH ");
+                sql.Append("   , H.REQUESTMONTH AS REQUESTMONTH ");
                 sql.Append("   , H.REQUESTNO ");
-                sql.Append("   , I.ORDERERSDIVISION ");
-                sql.Append("   , I.ORDERERSCODE ");
+                sql.Append("   , H.ORDERERSDIVISION ");
+                sql.Append("   , H.ORDERERSCODE ");
                 sql.Append("   , H.ORDERNO ");
-                //sql.Append("   , DATE_FORMAT(H.BILLINGDATE, '%m/%d') AS REQUESTDATE ");
                 sql.Append("   , DATE_FORMAT(H.BILLINGDATE, '%Y/%m/%d') AS REQUESTDATE ");
                 sql.Append("   , H.REQCONSTRUCTIONCODE ");
                 sql.Append("   , H.REQCONSTRUCTIONNAME ");
@@ -2019,13 +1981,12 @@
                 sql.Append("   ON O.ORDERERSCODE = H.ORDERERSCODE ");
                 sql.Append("   AND O.ORDERCOTEGORY = H.ORDERERSDIVISION ");
 
-                sql.Append("  INNER JOIN INVOICEDATA AS I ");
+                sql.Append("  LEFT JOIN INVOICEDATA AS I ");
                 sql.Append("   ON I.INVOICENO = H.INVOICENO ");
 
                 sql.Append("  LEFT OUTER JOIN DEPOSITDATADETAIL AS DPDE ");
                 sql.Append("   ON DPDE.ORDERERSDIVISION = H.ORDERERSDIVISION");
                 sql.Append("   AND DPDE.ORDERERSCODE = H.ORDERERSCODE ");
-                //sql.AppendFormat("   And DPDE.TARGETDATE = {0} ", m_Select_TargetDate);
                 sql.Append("   AND DPDE.REQUESTNO = H.REQUESTNO ");
 
                 sql.Append("  LEFT OUTER JOIN CONSTRUCTIONBASEINFO CBI ");
@@ -2053,27 +2014,7 @@
                 sql.Append("       And Ddd.REQUESTNO = H.REQUESTNO");
 
                 sql.Append("  WHERE ");
-
-                //int nYear = CommonMotions.cnvTruncate(m_Select_TargetDate / 100);
-                //int nMounth = m_Select_TargetDate % 100;
-                //DateTime dtEnd = DateTimeUtil.EndOfMonth(new DateTime(nYear, nMounth, 1));
-                //int nEndDate = CommonMotions.cnvInt(dtEnd.ToShortDateString().Replace("/", ""));
-                sql.AppendFormat("   (DATE({0}) <= DATE(H.BILLINGDATE)", (m_Select_TargetDate * 100) + 1);
-                sql.AppendFormat("    And DATE(H.BILLINGDATE) <= DATE({0}))", nEndDate);
-
-
-                //sql.AppendFormat("   Or ((H.REQUESTMONTH < {0})", m_Select_TargetDate);
-                //sql.Append("          And ((H.REQUESTTOTALAMOUNT - ifnull(Ddd.CalcValue, 0) < -1)");
-                //sql.Append("              Or (1 < H.REQUESTTOTALAMOUNT - ifnull(Ddd.CalcValue, 0))))");
-
-                //sql.AppendFormat("   Or ((H.REQUESTMONTH < {0}) And (DPDE.TARGETDATE = {0}))", m_Select_TargetDate);
-
-                //sql.AppendFormat("   Or ((H.REQUESTMONTH < {0})", m_Select_TargetDate);
-                //sql.Append("              And EXISTS(Select * From DEPOSITDATADETAIL As SearchDp");
-                //sql.Append("                             Where SearchDp.ORDERERSDIVISION = H.ORDERERSDIVISION");
-                //sql.Append("                             AND SearchDp.ORDERERSCODE = H.ORDERERSCODE ");
-                //sql.AppendFormat("                       And SearchDp.TARGETDATE = {0} ", m_Select_TargetDate);
-                //sql.Append("                             AND SearchDp.REQUESTNO = H.REQUESTNO)) ");
+                sql.AppendFormat("  {0} = H.REQUESTMONTH", m_Select_TargetDate);
                 sql.Append(" ) ");
 
                 sql.Append(" ORDER BY ");
@@ -2252,7 +2193,7 @@
                 stringBuilder.Append("                    + BB.OTHERADJUSTMENTS) As SumVal");
                 stringBuilder.Append("                 , BB.ORDERERSDIVISION, BB.ORDERERSCODE, BB.DEPOSITMONTH, BB.SEQNO");
                 stringBuilder.Append("           From depositdatadetail As BB");
-                //stringBuilder.AppendFormat("     Where BB.TARGETDATE < {0}", nSelYM);
+                stringBuilder.AppendFormat("     Where BB.TARGETDATE != {0}", nSelYM);
                 stringBuilder.Append("           Group by BB.ORDERERSDIVISION, BB.ORDERERSCODE, BB.DEPOSITMONTH, BB.SEQNO) As B");
                 stringBuilder.Append(" ON B.ORDERERSDIVISION = A.ORDERERSDIVISION");
                 stringBuilder.Append(" And B.ORDERERSCODE = A.ORDERERSCODE");
@@ -3101,7 +3042,7 @@
                 bool DspMsg = true;                                     // ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸è¡¨ç¤ºç”¨ãƒ•ãƒ©ã‚°
                 ClsChangeLedgerData.ModifyExecuteValue(LedgerDB, ExecDB
                                                             , nConstrCode, TargetMonth, lValue
-                                                            , (int)FrmConstructionLedger.DataGroup.DepositAmount
+                                                            , (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount
                                                             , DspMsg);
             }
             catch (Exception ex)
@@ -3317,7 +3258,7 @@
                 DepositOrderer[] TargetArray = m_depositOrderers.Where(x => x.OrderersDivision == nOrderersDivision
                                                                             && x.OrderersCode == nOrderersCode
                                                                             && (x.DepositDetails.Count > 0
-                                                                                && x.DepositDetails[0].RequestNo == nRequestNo))
+                                                                            && x.DepositDetails[0].RequestNo == nRequestNo))
                                                                     .ToArray();
 
                 string setstrData = string.Empty;
@@ -4175,6 +4116,12 @@
                 sql.Append(" + Sum(A.FEES)");
                 sql.Append(" + Sum(OTHERADJUSTMENTS)");
                 sql.Append(" From depositdatadetail As A");
+                sql.Append(" Inner Join requesthead As B");
+                sql.Append("       On A.ORDERERSDIVISION = B.ORDERERSDIVISION");
+                sql.Append("       And A.ORDERERSCODE = B.ORDERERSCODE");
+                sql.Append("       And A.TARGETDATE = B.REQUESTMONTH");
+                sql.Append("       And A.REQUESTNO = B.REQUESTNO");
+              
                 sql.Append(" Where");
                 sql.AppendFormat(" A.TARGETDATE = {0}", nNowYM);
 
@@ -4214,9 +4161,7 @@
                 sql.Append("     , SUM(H.TAXAMOUNT) ");
                 sql.Append(" FROM ");
                 sql.Append("     REQUESTHEAD AS H ");
-                sql.Append("     INNER JOIN INVOICEDATA AS I ");
-                sql.Append("     ON I.INVOICENO = H.INVOICENO ");
-                sql.Append("  LEFT OUTER JOIN CONSTRUCTIONBASEINFO CBI ");
+                sql.Append("  INNER JOIN CONSTRUCTIONBASEINFO CBI ");
                 sql.Append("   ON H.REQCONSTRUCTIONCODE = CBI.CONSTRUCTIONCODE ");
                 sql.Append(" WHERE ");
                 if (tgl == 1)
@@ -4331,8 +4276,6 @@
         /// </summary>
         private void TotalCount(int targetDate)
         {
-            long depositTotal = 0;
-            long requestTotal = 0;
             try
             {
                 // å…¥é‡‘é‡‘é¡�ã�®å�ˆè¨ˆã‚’ç®—å‡º
@@ -4357,8 +4300,8 @@
                 }
 
                 //depositTotal = SumDepositAmountCash + SumDepositAmountBill;
-                depositTotal = DepositEraceSum(targetDate);
-                requestTotal = SumRequestBill + SumRequestTax;
+                long depositTotal = DepositEraceSum(targetDate);
+                long requestTotal = SumRequestBill + SumRequestTax;
 
                 lblDepositTotal.Text = depositTotal.ToString("#,0") + " å††";
                 lblRequestTotal.Text = requestTotal.ToString("#,0") + " å††";
@@ -5596,100 +5539,6 @@
         }
         #endregion
 
-        #region å…¥é‡‘ãƒ‡ãƒ¼ã‚¿è¡Œä½œæˆ�
-        /// <summary>
-        /// å…¥é‡‘ãƒ‡ãƒ¼ã‚¿è¡Œä½œæˆ�
-        /// </summary>
-        private void CreateDepositRowData()
-        {
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            try
-            {
-                StringBuilder strExists = new StringBuilder();
-                strExists.Append("Select A.ConstructionCode From constructionledger As A");
-                strExists.Append(" Inner Join constructionbaseinfo As B");
-                strExists.Append("       On B.ConstructionCode = A.ConstructionCode");
-                strExists.AppendFormat(" Where B.ConstructionStatusFlg != {0}", (int)CommonDefine.StatNumArray.Status11);
-                strExists.Append("       And Not Exists(Select * From constructionledgerdetail As C");
-                strExists.Append("                      Where C.ConstructionCode = A.ConstructionCode");
-                strExists.AppendFormat(" And C.GroupCount = {0})", (int)FrmConstructionLedger.DataGroup.DepositAmount);
-                strExists.Append(" order by ConstructionCode");
-                ArrayList ArList = new ArrayList();
-                LedgerDB.ExecuteReader(strExists.ToString(), ref ArList);
-                if (ArList.Count < 1) return;
-
-                bool bSuccess = true;
-                int nCnt = 0;
-                foreach (object[] CurRec in ArList)
-                {
-                    if (!(bSuccess = NonDspLedger(CommonMotions.cnvInt(CurRec[0]))))
-                    {
-                        break;
-                    }
-                    nCnt++;
-                    if ((nCnt % 100) == 0)
-                    {
-                        break;
-                    }
-                }
-                if (!bSuccess)
-                {
-                    MessageBox.Show("å‡¦ç�†å¤±æ•—");
-                }
-                MessageBox.Show(string.Format("{0}ä»¶ï¼šå‡¦ç�†çµ‚äº†", nCnt));
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                LedgerDB.close(); LedgerDB = null;
-            }
-        }
-        private bool NonDspLedger(int CnstrCode)
-        {
-            try
-            {
-                bool bSuccess = true;
-                using (FrmConstructionLedger frm = new FrmConstructionLedger())
-                {
-                    // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
-                    frm.ConstructionCode = CnstrCode;
-
-                    // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
-                    frm.ShowInTaskbar = false;
-                    frm.WindowState = FormWindowState.Minimized;
-                    frm.OnVisible = false;
-                    frm.Show();
-                    frm.RemoveAllEvent();
-                    // ãƒ•ã‚©ãƒ¼ãƒ é�žè¡¨ç¤º
-                    //frm.Visible = false;
-
-                    // ãƒ‡ãƒ¼ã‚¿ä½œæˆ�å‡¦ç�†
-                    if (!frm.SaveLedgerData)
-                    {
-                        bSuccess = false;
-                    }
-
-                    // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                    frm.Close();
-                    frm.Dispose();
-                }
-                return bSuccess;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                GC.Collect();
-            }
-        }
-        #endregion
-
         #region æœªå…¥é‡‘é‡‘é¡�ã‚»ãƒƒãƒˆ
         /// <summary>
         /// æœªå…¥é‡‘é‡‘é¡�ã‚»ãƒƒãƒˆ
@@ -5798,7 +5647,7 @@
 
                 CleDB.connect(); CleDB.beginTran();
                 strSQL.Clear();
-                strSQL.AppendFormat(" Where GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);
+                strSQL.AppendFormat(" Where GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
                 if(!CleDB.DeleteAction(strSQL.ToString(), false))
                 {
                     CleDB.rollback();
@@ -5827,7 +5676,7 @@
                     strSQL.Clear();
                     DetailList.Clear();
                     strSQL.Append(CldDB.CreatePrimarykeyString(nConstrCode));
-                    strSQL.AppendFormat(" And GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);
+                    strSQL.AppendFormat(" And GroupCount = {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);
 
                     if (!CldDB.SelectAction(strSQL.ToString(), ref DetailList)) continue;
                     if (DetailList.Count() < 1) continue;
@@ -5840,7 +5689,7 @@
                     else strIns.Append(", (");
 
                     strIns.AppendFormat("  {0}", nConstrCode);                                          // å·¥äº‹ç•ªå�·
-                    strIns.AppendFormat(", {0}", (int)FrmConstructionLedger.DataGroup.DepositAmount);   // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
+                    strIns.AppendFormat(", {0}", (int)ConstructionLedgerDetail.GroupCountDef.DepositAmount);   // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
                     strIns.AppendFormat(", {0}", DetailList[0].LineCount);                              // è¡Œç•ªå�·
                     strIns.AppendFormat(", {0}", nColCnt);                                              // åˆ—ç•ªå�·
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/WebEDIClose/FrmWebEDIClose.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/WebEDIClose/FrmWebEDIClose.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/WebEDIClose/FrmWebEDIClose.cs	(revision 483)
@@ -97,7 +97,7 @@
         /// <param name="e"></param>
         private async void FrmWebEDIClose_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
 
             // å¯¾è±¡å¹´æœˆã‚»ãƒƒãƒˆå‡¦ç�†
             SetTargetMonth();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Calender/PrintFormat.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Calender/PrintFormat.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Calender/PrintFormat.cs	(revision 483)
@@ -70,7 +70,28 @@
                 // å�°åˆ·å‡¦ç�†
                 // +++++++++++++++++++++++++ å�°åˆ· +++++++++++++++++++++++++
                 m_UsedExcel.ExcelSheetPrint();
+                // +++++++++++++++++++++++++ ä¿�å­˜ +++++++++++++++++++++++++
+                //string strFilePath = @"C:\Users\Horiuchi\Desktop";
+                //// ã‚¨ã‚¯ã‚»ãƒ«ä¿�å­˜
+                //if (CommonMotions.ChkDirPath(strFilePath, true))
+                //{
+                //    string wrkFile = "1.";
+                //    foreach (string ww in strParaList)
+                //    {
+                //        wrkFile += ww;
+                //    }
+                //    for (int ix = 0; ix < m_UsedExcel.ExcelBadCharcter.Length; ix++)
+                //    {
 
+                //        wrkFile = wrkFile.Replace(m_UsedExcel.ExcelBadCharcter[ix], "");
+                //    }
+                //    // ãƒ•ã‚¡ã‚¤ãƒ«å��ä½œæˆ�
+                //    strFilePath += @"\" + @wrkFile + @"ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼.xlsx";
+
+                //    m_UsedExcel.SaveSwitch = true;
+                //    m_UsedExcel.ExcelSaveBook(strFilePath);
+                //}
+
                 m_rtAns = CommonDefine.RetunAnswer.Answer0;
 
             }
@@ -114,9 +135,10 @@
                 //ã‚·ãƒ¼ãƒˆã�®å�–å¾—
                 m_UsedExcel.ExcelSheetGet(s_SheetName);
 
-                string strChar = string.Empty; ;
+                string strChar = string.Empty;
+                string strCell = string.Empty;
+                int ColCnt = 0;
                 int RowCnt = 0;
-                int ColCnt = 0;
 
                 int nMonthCnt = 0;
                 int nMonthArrayCnt = m_CalendPage.lblMonthTitle.Length;
@@ -129,10 +151,11 @@
                         if (strMonthValue.Length == 0) break;
 
                         // å¹´æœˆã‚’å�–å¾—ã�™ã‚‹
-                        RowCnt = (ix * 8);
-                        ColCnt = (iy * 8) + 4;
-                        strChar = CommonMotions.cnvNumberToAlphaCharacter(RowCnt);
-                        m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, ColCnt), strMonthValue);
+                        ColCnt = (ix * 8);
+                        RowCnt = (iy * 9) + 3;
+                        strChar = CommonMotions.cnvNumberToAlphaCharacter(ColCnt);
+                        strCell = m_UsedExcel.CreateCellString(strChar, RowCnt);
+                        m_UsedExcel.ExcelCellSet(strCell, strMonthValue);
 
                         int nDaysCnt = 0;
                         int nDayArrayCnt = m_CalendPage.MonthryData[nMonthCnt].lblDayData.Length;
@@ -143,14 +166,15 @@
                             // 1é€±é–“åˆ†å›žã�™
                             for (int ixD = 0; ixD < 7; ixD++)
                             {
+                                strChar = CommonMotions.cnvNumberToAlphaCharacter((ColCnt + ixD));
                                 if (iyD == 0)
                                 {
                                     string strWeekValue = m_CalendPage.MonthryData[nMonthCnt].lblWeekTitle[ixD].Text;
                                     if (strWeekValue.Length < 1) continue;
 
-                                    // æ›œæ—¥ã‚’å�–å¾—ã�™ã‚‹
-                                    strChar = CommonMotions.cnvNumberToAlphaCharacter((RowCnt + ixD));
-                                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, (ColCnt + 1)), strWeekValue);
+                                    // æ›œæ—¥ã‚’è¨­å®šã�™ã‚‹
+                                    strCell = m_UsedExcel.CreateCellString(strChar, (RowCnt + 1));
+                                    m_UsedExcel.ExcelCellSet(strCell, strWeekValue);
                                     continue;
                                 }
 
@@ -159,9 +183,8 @@
                                 nDaysCnt++;
                                 if (strDaysValue.Length == 0) continue;
 
-                                // æ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
-                                strChar = CommonMotions.cnvNumberToAlphaCharacter((RowCnt + ixD));
-                                string strCell = m_UsedExcel.CreateCellString(strChar, (ColCnt + 1 + iyD));
+                                // æ—¥ä»˜ã‚’è¨­å®šã�™ã‚‹
+                                strCell = m_UsedExcel.CreateCellString(strChar, (RowCnt + 1 + iyD));
                                 m_UsedExcel.ExcelCellSet(strCell, strDaysValue);
                                 // ä¼‘æ—¥ã�«è‰²ã‚’ä»˜ã�‘ã‚‹
                                 if (m_CalendPage.MonthryData[nMonthCnt].lblDayData[nSaveDaysCnt].BackColor == Color.Red)
@@ -186,9 +209,11 @@
                 }
 
                 // ç¨¼åƒ�æ—¥æ•°ã‚»ãƒƒãƒˆ
-                m_UsedExcel.ExcelCellSet("D36", lblWorkingDays.Text);
+                strCell = m_UsedExcel.CreateCellString("D", (RowCnt + 9));
+                m_UsedExcel.ExcelCellSet(strCell, lblWorkingDays.Text);
                 // ä¼‘æ—¥æ—¥æ•°ã‚»ãƒƒãƒˆ
-                m_UsedExcel.ExcelCellSet("D37", lblHolidyas.Text);
+                strCell = m_UsedExcel.CreateCellString("H", (RowCnt + 9));
+                m_UsedExcel.ExcelCellSet(strCell, lblHolidyas.Text);
 
                 // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
                 this.Invoke(m_progressDlg, new object[] { m_ProcessCount });
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.designer.cs	(revision 483)
@@ -96,6 +96,8 @@
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label23 = new System.Windows.Forms.Label();
+            this.cmbJapaneseSyllabary = new System.Windows.Forms.ComboBox();
             this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
@@ -161,7 +163,6 @@
             // 
             // label12
             // 
-            this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label12.BackColor = System.Drawing.Color.White;
             this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label12.ForeColor = System.Drawing.Color.Black;
@@ -256,12 +257,14 @@
             // 
             this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel2.Controls.Add(this.cmbJapaneseSyllabary);
+            this.panel2.Controls.Add(this.label23);
             this.panel2.Controls.Add(this.label12);
             this.panel2.Controls.Add(this.cmbDivision);
             this.panel2.ForeColor = System.Drawing.Color.White;
             this.panel2.Location = new System.Drawing.Point(8, 40);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(540, 40);
+            this.panel2.Size = new System.Drawing.Size(540, 70);
             this.panel2.TabIndex = 24;
             // 
             // btnSelect
@@ -509,7 +512,7 @@
             this.cmbCorporateStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbCorporateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbCorporateStatus.FormattingEnabled = true;
-            this.cmbCorporateStatus.Location = new System.Drawing.Point(153, 65);
+            this.cmbCorporateStatus.Location = new System.Drawing.Point(153, 63);
             this.cmbCorporateStatus.Name = "cmbCorporateStatus";
             this.cmbCorporateStatus.Size = new System.Drawing.Size(430, 24);
             this.cmbCorporateStatus.TabIndex = 0;
@@ -985,7 +988,7 @@
             this.Column2,
             this.Column3});
             this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
-            this.dgvMaster.Location = new System.Drawing.Point(8, 88);
+            this.dgvMaster.Location = new System.Drawing.Point(8, 118);
             this.dgvMaster.MultiSelect = false;
             this.dgvMaster.Name = "dgvMaster";
             this.dgvMaster.RowHeadersWidth = 20;
@@ -992,7 +995,7 @@
             this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
             this.dgvMaster.RowTemplate.Height = 21;
             this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(540, 554);
+            this.dgvMaster.Size = new System.Drawing.Size(540, 530);
             this.dgvMaster.TabIndex = 11;
             this.dgvMaster.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellClick);
             // 
@@ -1029,6 +1032,32 @@
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column3.Width = 420;
             // 
+            // label23
+            // 
+            this.label23.BackColor = System.Drawing.Color.White;
+            this.label23.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label23.ForeColor = System.Drawing.Color.Black;
+            this.label23.Location = new System.Drawing.Point(20, 35);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(110, 27);
+            this.label23.TabIndex = 24;
+            this.label23.Text = "50éŸ³é †";
+            this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label23.Visible = false;
+            // 
+            // cmbJapaneseSyllabary
+            // 
+            this.cmbJapaneseSyllabary.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbJapaneseSyllabary.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbJapaneseSyllabary.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbJapaneseSyllabary.FormattingEnabled = true;
+            this.cmbJapaneseSyllabary.Location = new System.Drawing.Point(137, 35);
+            this.cmbJapaneseSyllabary.Name = "cmbJapaneseSyllabary";
+            this.cmbJapaneseSyllabary.Size = new System.Drawing.Size(100, 27);
+            this.cmbJapaneseSyllabary.TabIndex = 25;
+            this.cmbJapaneseSyllabary.TabStop = false;
+            this.cmbJapaneseSyllabary.Visible = false;
+            // 
             // FrmOrderers
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1140,5 +1169,7 @@
         private System.Windows.Forms.Label label21;
         private System.Windows.Forms.Label lblEntryDate;
         private System.Windows.Forms.Label lblEntryPerson;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.ComboBox cmbJapaneseSyllabary;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmInputTax.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmInputTax.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmInputTax.cs	(revision 483)
@@ -116,7 +116,7 @@
         /// <param name="e"></param>
         private async void FrmInputTax_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(500);
+            await Task.Delay(100);
 
             // åˆ�æœŸè¡¨ç¤º
             DisplayData();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/WorkingTime/FrmWorkingTime.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/WorkingTime/FrmWorkingTime.designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/WorkingTime/FrmWorkingTime.designer.cs	(revision 483)
@@ -520,7 +520,7 @@
             this.txtInput10.Name = "txtInput10";
             this.tableLayoutPanel1.SetRowSpan(this.txtInput10, 3);
             this.txtInput10.Size = new System.Drawing.Size(444, 102);
-            this.txtInput10.TabIndex = 11;
+            this.txtInput10.TabIndex = 6;
             // 
             // panel3
             // 
@@ -728,7 +728,7 @@
             this.dateTimePicker5.Name = "dateTimePicker5";
             this.dateTimePicker5.ShowUpDown = true;
             this.dateTimePicker5.Size = new System.Drawing.Size(82, 30);
-            this.dateTimePicker5.TabIndex = 1;
+            this.dateTimePicker5.TabIndex = 5;
             // 
             // btnHelp
             // 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.cs	(nonexistent)
@@ -1,391 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.ControlsAction;
-using System.Collections;
-
-namespace ProcessManagement.Forms.SubForms
-{
-    public partial class FrmConstrProgDiag : Form
-    {
-        #region ãƒ­ã‚°ä½¿ç”¨å®šç¾©
-        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region å®šæ•°
-        /// <summary>
-        /// è¡¨ç¤ºã‚«ãƒ©ãƒ 
-        /// </summary>
-        private enum GridColumn
-        {
-            DisplayOrder = 0,
-            ConstructionCode,
-            ConstructionName,
-            Check,
-        }
-
-        /// <summary>
-        /// æ‹…å½“è€…æ¤œç´¢ä½�ç½®
-        /// </summary>
-        public enum PersonChargePoint
-        {
-            /// <summary>
-            /// å–¶æ¥­æ‹…å½“
-            /// </summary>
-            Sales = 0,
-            /// <summary>
-            /// å·¥äº‹æ‹…å½“è€…
-            /// </summary>
-            Construction,
-        }
-        #endregion
-
-        #region å¤‰æ•°
-
-        #region å·¥äº‹ç•ªå�·
-        /// <summary>
-        /// å·¥äº‹ç•ªå�·
-        /// </summary>
-        private int m_ConstructionCode = 0;
-        #endregion
-
-        #region å¯¾è±¡ãƒªã‚¹ãƒˆ
-        /// <summary>
-        /// å¯¾è±¡ãƒªã‚¹ãƒˆ
-        /// </summary>
-        private List<int> m_TergetList = new List<int>();
-        #endregion
-        
-        #endregion
-        
-        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
-        /// <summary>
-        /// å·¥äº‹ç•ªå�·
-        /// </summary>
-        public int ConstructionCode
-        {
-            get { return m_ConstructionCode; }
-            set { m_ConstructionCode = value; }
-        }
-
-        /// <summary>
-        /// å¯¾è±¡ãƒªã‚¹ãƒˆ
-        /// </summary>
-        public List<int> TergetList
-        {
-            get { return m_TergetList; }
-            set { m_TergetList = value; }
-        }
-
-        /// <summary>
-        /// å‡¦ç�†ã‚’èµ·å‹•ã�™ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯ã‚’è¡Œã�†
-        /// </summary>
-        public bool ChkExec
-        {
-            get { return CheckExecuteProcess(); }
-        }
-        #endregion
-
-        #region ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
-        /// <summary>
-        /// ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
-        /// </summary>
-        public FrmConstrProgDiag()
-        {
-            InitializeComponent();
-        }
-        #endregion
-
-        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
-        /// <summary>
-        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmCostStructureDiag_Load(object sender, EventArgs e)
-        {
-            // ãƒ•ã‚©ãƒ¼ãƒ ã‚µã‚¤ã‚ºå›ºå®š
-            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
-
-            // åˆ�æœŸè¡¨ç¤º
-            InitDataLoad();
-        }
-        #endregion
-
-        #region çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
-        /// <summary>
-        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            this.Close();
-        }
-        #endregion
-
-        #region é�¸æŠžãƒœã‚¿ãƒ³æŠ¼ä¸‹
-        /// <summary>
-        /// é�¸æŠžãƒœã‚¿ãƒ³æŠ¼ä¸‹
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnSelect_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                DataGridViewEX dgv = dgvMaster;
-
-                m_TergetList.Clear();
-
-                // é�¸æŠž
-                foreach (DataGridViewRow CurRow in dgv.Rows)
-                {
-                    // ç©ºæ¬„ãƒ�ã‚§ãƒƒã‚¯
-                    if (!BlanckRowCheck(CurRow)) continue;
-
-                    if (!CommonMotions.cnvBool(CurRow.Cells[(int)GridColumn.Check].Value)) continue;
-
-                    m_TergetList.Add(CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ConstructionCode].Value));
-                }
-
-                // é�¸æŠžç„¡ã�—ã�¯å‡¦ç�†ã�—ã�ªã�„ã€‚
-                if (m_TergetList.Count < 1)
-                {
-                    MessageBox.Show("é�¸æŠžã�•ã‚Œã�Ÿãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                DialogResult = DialogResult.OK;
-
-                this.Close();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region ã‚»ãƒ«ã�®ãƒ€ãƒ–ãƒ«ã‚¯ãƒªãƒƒã‚¯æ™‚
-        /// <summary>
-        /// ã‚»ãƒ«ã�®ãƒ€ãƒ–ãƒ«ã‚¯ãƒªãƒƒã‚¯æ™‚
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        {
-            try
-            {
-                DataGridViewEX dgv = dgvMaster;
-                DataGridViewRow CurRow = dgv.CurrentRow;
-
-                // ç©ºç™½ãƒ�ã‚§ãƒƒã‚¯
-                if (!BlanckRowCheck(CurRow)) return;
-                // ã‚°ãƒªãƒƒãƒ‰ã‚¯ãƒªãƒƒã‚¯ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (e.RowIndex < 0) return;
-
-                CurRow.Cells[(int)GridColumn.Check].Value = true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region åˆ�æœŸè¡¨ç¤ºå‡¦ç�†
-        /// <summary>
-        /// åˆ�æœŸè¡¨ç¤ºå‡¦ç�†
-        /// </summary>
-        private void InitDataLoad()
-        {
-            try
-            {
-                // ã‚°ãƒªãƒƒãƒ‰ã�®è¡Œã‚’0ã�«æˆ»ã�™
-                dgvMaster.Rows.Clear();
-
-                // ä¸€è¦§è¡¨ç¤º
-                DisplayConstruction();
-
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region å‡¦ç�†ãƒªã‚¹ãƒˆ
-        /// <summary>
-        /// å‡¦ç�†ãƒªã‚¹ãƒˆ
-        /// </summary>
-        private ArrayList m_BaseList = new ArrayList();
-        #endregion
-
-        #region å‡¦ç�†ã‚’èµ·å‹•ã�™ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯ã‚’è¡Œã�†
-        /// <summary>
-        /// å‡¦ç�†ã‚’èµ·å‹•ã�™ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯ã‚’è¡Œã�†
-        /// </summary>
-        /// <returns></returns>
-        private bool CheckExecuteProcess()
-        {
-            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
-            try
-            {
-
-                int ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-
-                int nAppCode = ClsExcute.AppovalList.First(x => x.Value.Equals("å·¥äº‹äºˆç®—æ›¸æ‰¿èª�")).Key;
-
-                int[] nStatArrary = new int[] {CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥æº–å‚™")).Key,
-                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥æº–å‚™")).Key,
-                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥é–‹å§‹")).Key,
-                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("æ–½å·¥å®Œäº†")).Key,
-                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("è«‹æ±‚æº–å‚™")).Key,
-                                                CommonDefine.ProjectsStatus.First(x => x.Value.Equals("è«‹æ±‚ç¢ºèª�")).Key};
-
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("SELECT");
-                strSQL.Append(" A.CONSTRUCTIONCODE");
-                strSQL.Append(", B.DETAILSTRING");
-                strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
-
-                strSQL.Append(" Inner Join constructionbaseinfodetail As B");
-                strSQL.Append("        On B.ConstructionCode = A.ConstructionCode");
-                strSQL.AppendFormat("  And B.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
-
-                strSQL.Append(" Inner Join processapproval As D");
-                strSQL.Append("        On D.ConstructionCode = A.ConstructionCode");
-                strSQL.AppendFormat("  And D.ApprovalCode = {0}", nAppCode);
-                strSQL.Append("        And D.SeqNo = 1");
-                strSQL.AppendFormat("  And D.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
-
-                strSQL.Append(" Where");
-                strSQL.AppendFormat(" A.ConstructionCode = {0}", ParentCode);
-                strSQL.Append("    Or A.ConstructionCode in (Select C.FluctuationCode From constructionlink As C");
-                strSQL.AppendFormat("                        Where C.ConstructionCode = {0})", ParentCode);
-                strSQL.AppendFormat(" And A.ConstructionStatusFlg in ({0},{1},{2},{3},{4},{5})"
-                                , nStatArrary[0], nStatArrary[1], nStatArrary[2]
-                                , nStatArrary[3], nStatArrary[4], nStatArrary[5]);
-                strSQL.Append(" ORDER BY A.CONSTRUCTIONCODE");
-
-                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref m_BaseList)) return false;
-                if (m_BaseList.Count < 1)
-                {   // ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
-                    return false;
-                }
-                else if (m_BaseList.Count == 1)
-                {
-                    // 1ä»¶ã�—ã�‹ã�ªã�„å ´å�ˆã�¯ä¸€è¦§ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                    object[] Once = (object[])m_BaseList[0];
-                    // å·¥äº‹ç•ªå�·å�–å¾—
-                    m_ConstructionCode = CommonMotions.cnvInt(Once[0]);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                BaseDB.close(); BaseDB = null;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
-        /// <summary>
-        /// å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
-        /// </summary>
-        private void DisplayConstruction()
-        {
-            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
-            try
-            {
-                dgvMaster.Rows.Clear();
-
-                if (m_BaseList.Count < 1)
-                {   // ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
-                    DialogResult = DialogResult.Cancel;
-                    this.Close();
-                    return;
-                }
-                else if (m_BaseList.Count == 1)
-                {
-                    // 1ä»¶ã�—ã�‹ã�ªã�„å ´å�ˆã�¯ä¸€è¦§ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                    object[] Once = (object[])m_BaseList[0];
-                    // å·¥äº‹ç•ªå�·å�–å¾—
-                    m_ConstructionCode = CommonMotions.cnvInt(Once[0]);
-                    DialogResult = DialogResult.OK;
-                    this.Close();
-                    return;
-                }
-
-                // è¦�ç´ è¡¨ç¤º
-                int i = 0;
-                foreach (object[] wrk in m_BaseList)
-                {
-                    // è‡ªåˆ†ã�¯è¡¨ç¤ºã�—ã�ªã�„
-                    if (m_ConstructionCode == CommonMotions.cnvInt(wrk[0])) continue;
-                    // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-                    dgvMaster.Rows.Add((i + 1),
-                                        CommonMotions.cnvInt(wrk[0]),
-                                        CommonMotions.cnvString(wrk[1]),
-                                        false);
-
-                    dgvMaster.Rows[i++].Cells[(int)GridColumn.ConstructionName].ToolTipText = CommonMotions.cnvString(wrk[1]);
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                BaseDB.close(); BaseDB = null;
-            }
-        }
-        #endregion
-
-        #region ã‚°ãƒªãƒƒãƒ‰ç©ºè¡Œãƒ�ã‚§ãƒƒã‚¯
-        /// <summary>
-        /// ã‚°ãƒªãƒƒãƒ‰ç©ºè¡Œãƒ�ã‚§ãƒƒã‚¯
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        private bool BlanckRowCheck(DataGridViewRow row)
-        {
-            try
-            {
-                // ç©ºæ¬„ãƒ�ã‚§ãƒƒã‚¯
-                if (CommonMotions.chkObjectIsNull(row.Cells[(int)GridColumn.ConstructionCode].Value)) return false;
-                if (CommonMotions.cnvString(row.Cells[(int)GridColumn.ConstructionName].Value).Length == 0) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-    }
-}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.Designer.cs	(nonexistent)
@@ -1,215 +0,0 @@
-ï»¿namespace ProcessManagement.Forms.SubForms
-{
-    partial class FrmConstrProgDiag
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.btnSelect = new System.Windows.Forms.Button();
-            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label1 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
-            this.panel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(772, 214);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 3;
-            this.btnEnd.Text = "çµ‚ã€€äº†";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.BackColor = System.Drawing.Color.Green;
-            this.btnSelect.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnSelect.ForeColor = System.Drawing.Color.White;
-            this.btnSelect.Location = new System.Drawing.Point(644, 214);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(120, 30);
-            this.btnSelect.TabIndex = 2;
-            this.btnSelect.Text = "é�¸ã€€æŠž";
-            this.btnSelect.UseVisualStyleBackColor = false;
-            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-            // 
-            // dgvMaster
-            // 
-            this.dgvMaster.AllowUserToAddRows = false;
-            this.dgvMaster.AllowUserToDeleteRows = false;
-            this.dgvMaster.AllowUserToResizeColumns = false;
-            this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
-            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvMaster.ColumnHeadersHeight = 24;
-            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column1,
-            this.Column5,
-            this.Column3,
-            this.Column2});
-            this.dgvMaster.EnableHeadersVisualStyles = false;
-            this.dgvMaster.Location = new System.Drawing.Point(12, 60);
-            this.dgvMaster.Name = "dgvMaster";
-            this.dgvMaster.RowHeadersVisible = false;
-            this.dgvMaster.RowHeadersWidth = 20;
-            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 24;
-            this.dgvMaster.Size = new System.Drawing.Size(880, 146);
-            this.dgvMaster.TabIndex = 0;
-            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "â„–";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 60;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column5.Frozen = true;
-            this.Column5.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Visible = false;
-            this.Column5.Width = 120;
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "å¢—ã€€æ¸›ã€€å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 760;
-            // 
-            // Column2
-            // 
-            this.Column2.HeaderText = "å�Œ";
-            this.Column2.Name = "Column2";
-            this.Column2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Column2.Width = 40;
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.LemonChiffon;
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Location = new System.Drawing.Point(12, 6);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(880, 50);
-            this.panel1.TabIndex = 5;
-            // 
-            // label1
-            // 
-            this.label1.BackColor = System.Drawing.Color.Black;
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label1.ForeColor = System.Drawing.Color.White;
-            this.label1.Location = new System.Drawing.Point(40, 6);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(800, 36);
-            this.label1.TabIndex = 5;
-            this.label1.Text = "é–¢é€£å·¥äº‹ã�®ä¸­ã�§å·¥äº‹é€²æ�—çŠ¶æ…‹ã‚’å�Œã�˜ã�«ã�™ã‚‹å·¥äº‹ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // FrmConstrProgDiag
-            // 
-            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(904, 251);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.dgvMaster);
-            this.Controls.Add(this.btnSelect);
-            this.Controls.Add(this.btnEnd);
-            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.KeyPreview = true;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmConstrProgDiag";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "å·¥äº‹æ¡ˆä»¶é€²æ�—å�ŒæœŸé�¸æŠž";
-            this.Load += new System.EventHandler(this.FrmCostStructureDiag_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
-            this.panel1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnEnd;
-        private System.Windows.Forms.Button btnSelect;
-        private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvMaster;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label label1;
-    }
-}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.resx	(nonexistent)
@@ -1,132 +0,0 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.Designer.cs	(revision 483)
@@ -34,6 +34,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.btnSelect = new System.Windows.Forms.Button();
             this.btnAddUnknown = new System.Windows.Forms.Button();
@@ -40,6 +41,7 @@
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -110,6 +112,7 @@
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
             this.Column5,
+            this.Column8,
             this.Column3,
             this.Column7,
             this.Column2,
@@ -152,22 +155,36 @@
             this.Column5.Visible = false;
             this.Column5.Width = 5;
             // 
+            // Column8
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column8.Frozen = true;
+            this.Column8.HeaderText = "å¹´";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column8.Width = 80;
+            // 
             // Column3
             // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column3.Frozen = true;
             this.Column3.HeaderText = "å·¥ã€€ã€€äº‹ã€€ã€€å��ã€€ã€€ç§°";
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 800;
+            this.Column3.Width = 720;
             // 
             // Column7
             // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column7.Frozen = true;
             this.Column7.HeaderText = "å·¥äº‹æ‹…å½“è€…";
             this.Column7.Name = "Column7";
@@ -230,6 +247,7 @@
         private System.Windows.Forms.Button btnAddUnknown;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs	(revision 483)
@@ -28,10 +28,11 @@
         /// <summary>
         /// è¡¨ç¤ºã‚«ãƒ©ãƒ 
         /// </summary>
-        private enum DispGridColumn
+        private enum DispGridCol
         {
             DisplayOrder = 0,
             DispConstructionCode,
+            ConstructionYear,
             ConstructionName,
             ConstructionPersonName,
             ConstructionCode,
@@ -45,9 +46,13 @@
         public enum PersonChargePoint
         {
             /// <summary>
+            /// ç„¡
+            /// </summary>
+            None = 0,
+            /// <summary>
             /// å–¶æ¥­æ‹…å½“
             /// </summary>
-            Sales = 0,
+            Sales,
             /// <summary>
             /// å·¥äº‹æ‹…å½“è€…
             /// </summary>
@@ -85,6 +90,11 @@
             RengeOnGoing,
         }
 
+        /// <summary>
+        /// ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¡¨ç¤ºè¡Œæ•°è¡¨ç¤º
+        /// </summary>
+        public static int s_MaxInitLineCount = 20;
+
         #endregion
 
         #region å¤‰æ•°
@@ -268,6 +278,12 @@
             // ãƒ•ã‚©ãƒ¼ãƒ ã‚µã‚¤ã‚ºå›ºå®š
             this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
 
+            DataGridView dgv = dgvMaster;
+            if (CommonMotions.BasePeriodYear())
+                dgv.Columns[2].HeaderText = "æœŸ";
+            else
+                dgv.Columns[2].HeaderText = "å¹´";
+
             // ä¸€è¦§è¡¨ç¤º
             ConstructionListDisplay();
         }
@@ -282,6 +298,8 @@
         private void btnEnd_Click(object sender, EventArgs e)
         {
             m_EndButton = DialogResult.Cancel;
+            this.DialogResult= DialogResult.Cancel;
+
             this.Close();
         }
         #endregion
@@ -353,8 +371,8 @@
             try
             {
                 // ç©ºæ¬„ãƒ�ã‚§ãƒƒã‚¯
-                if (CommonMotions.chkObjectIsNull(row.Cells[(int)DispGridColumn.ConstructionCode].Value)) return false;
-                if (CommonMotions.cnvString(row.Cells[(int)DispGridColumn.ConstructionName].Value).Length == 0) return false;
+                if (CommonMotions.chkObjectIsNull(row.Cells[(int)DispGridCol.ConstructionCode].Value)) return false;
+                if (CommonMotions.cnvString(row.Cells[(int)DispGridCol.ConstructionName].Value).Length == 0) return false;
 
                 return true;
             }
@@ -377,19 +395,20 @@
             try
             {
                 // å·¥äº‹ç•ªå�·å�–å¾—
-                m_ConstructionCode = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn.ConstructionCode].Value);
+                m_ConstructionCode = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridCol.ConstructionCode].Value);
                 // å·¥äº‹å��ç§°å�–å¾—
-                m_ConstructionName = CommonMotions.cnvString(dgvRow.Cells[(int)DispGridColumn.ConstructionName].Value);
+                m_ConstructionName = CommonMotions.cnvString(dgvRow.Cells[(int)DispGridCol.ConstructionName].Value);
 
                 if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.OrderJoin)
                 {
                     // ç™ºæ³¨è€…åŒºåˆ†
-                    m_OrderCotegory = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn.OrderersDivision].Value);
+                    m_OrderCotegory = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridCol.OrderersDivision].Value);
                     // ç™ºæ³¨è€…ç•ªå�·
-                    m_OrdererCode = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn.OrderersCode].Value);
+                    m_OrdererCode = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridCol.OrderersCode].Value);
                 }
 
                 m_EndButton = DialogResult.OK;
+                this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)
             {
@@ -463,15 +482,18 @@
                     // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
                     int ConstructionCode = CommonMotions.cnvInt(wrk[0]);
                     EditConstructionCode = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
-                    dgv.Rows.Add((i + 1),
-                                        EditConstructionCode,
-                                        CommonMotions.cnvString(wrk[1]),
-                                        CommonMotions.cnvString(wrk[4]),
-                                        ConstructionCode,
-                                        iData[0],
-                                        iData[1]);
+                    int nIndex = dgv.Rows.Add(1);
+                    DataGridViewRow CurRow = dgv.Rows[nIndex];
+                    CurRow.Cells[(int)DispGridCol.DisplayOrder].Value = (i + 1);
+                    CurRow.Cells[(int)DispGridCol.DispConstructionCode].Value = EditConstructionCode;
+                    CurRow.Cells[(int)DispGridCol.ConstructionYear].Value = CommonMotions.cnvInt(wrk[5]);
+                    CurRow.Cells[(int)DispGridCol.ConstructionName].Value = CommonMotions.cnvString(wrk[1]);
+                    CurRow.Cells[(int)DispGridCol.ConstructionPersonName].Value = CommonMotions.cnvString(wrk[4]);
+                    CurRow.Cells[(int)DispGridCol.ConstructionCode].Value = ConstructionCode;
+                    CurRow.Cells[(int)DispGridCol.OrderersDivision].Value = iData[0];
+                    CurRow.Cells[(int)DispGridCol.OrderersCode].Value = iData[1];
 
-                    dgv.Rows[i++].Cells[(int)DispGridColumn.ConstructionName].ToolTipText = CommonMotions.cnvString(wrk[1]);
+                    dgv.Rows[i++].Cells[(int)DispGridCol.ConstructionName].ToolTipText = CommonMotions.cnvString(wrk[1]);
                 }
             }
             catch (Exception ex)
@@ -481,8 +503,8 @@
             finally
             {
                 BaseDB.close(); BaseDB = null;
-                if (CommonDefine.s_MaxInitLineCount > dgv.Rows.Count)
-                    dgv.RowCount += (CommonDefine.s_MaxInitLineCount - dgv.Rows.Count);
+                if (s_MaxInitLineCount > dgv.Rows.Count)
+                    dgv.RowCount += (s_MaxInitLineCount - dgv.Rows.Count);
             }
         }
         #endregion
@@ -505,6 +527,10 @@
                 strSQL.Append(", ''");
                 strSQL.Append(", ''");
                 strSQL.Append(", D.PERSONNAME");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append(", A.ConstructionPeriod");
+                else
+                    strSQL.Append(", A.ConstructionYear");
                 strSQL.Append(" FROM");
                 strSQL.Append(" CONSTRUCTIONBASEINFO A");
                 strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B");
@@ -521,10 +547,14 @@
 
                 //int TargetYear = CommonMotions.GetPeriodYear();
                 //if (CommonMotions.BasePeriodYear())
-                //    strSQL.AppendFormat(" And A.ConstructionPeriod = {0}", TargetYear);
+                //{
+                //    strSQL.Append(" And A.ConstructionPeriod");
+                //}
                 //else
-                //    strSQL.AppendFormat(" And B.ConstructionYear = {0}", TargetYear);
-
+                //{
+                //    strSQL.Append(" And B.ConstructionYear");
+                //}
+                //strSQL.AppendFormat(" IN ({0},{1},{2})", TargetYear, (TargetYear - 1), (TargetYear + 1));
             }
             catch (Exception ex)
             {
@@ -544,8 +574,12 @@
             {
                 SetSelectShareGoing(ref strSQL);
                 CreateSecuritySQL(ref strSQL);
-                strSQL.Append(" ORDER BY B.DetailString ASC, A.ConstructionPeriodStart DESC");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append(" ORDER BY A.ConstructionPeriod Desc");
+                else
+                    strSQL.Append(" ORDER BY A.ConstructionYear Desc");
 
+                strSQL.Append(" , B.DetailString ASC");
             }
             catch (Exception ex)
             {
@@ -581,8 +615,15 @@
                         strSQL.AppendFormat(" AND (A.SalesPersonCode = {0} OR A.SalesSubPersonCode = {0}", m_PersonCode);
                         strSQL.AppendFormat(" OR A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
                         break;
+                    default:
+                        break;
                 }
-                strSQL.Append(" ORDER BY B.DetailString ASC, A.ConstructionPeriodStart DESC");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append(" ORDER BY A.ConstructionPeriod Desc");
+                else
+                    strSQL.Append(" ORDER BY A.ConstructionYear Desc");
+
+                strSQL.Append(" , B.DetailString ASC");
             }
             catch (Exception ex)
             {
@@ -602,26 +643,31 @@
             {
                 // é€²è¡Œä¸­ï¼‹ä¸€æ‹¬è«‹æ±‚ã‚’æ¤œç´¢ã�™ã‚‹
                 strSQL.Append("SELECT");
-                strSQL.Append(" UNI.CONSTRUCTIONCODE");
-                strSQL.Append(", UNI.DETAILSTRING");
-                strSQL.Append(", '', '', UNI.PERSONNAME");
-                strSQL.Append(" FROM (");
-                strSQL.Append(" SELECT");
-                strSQL.Append(" A1.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
-                strSQL.Append(", B1.DETAILSTRING AS DETAILSTRING");
-                strSQL.Append(", A1.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
-                strSQL.Append(", P1.PERSONNAME AS PERSONNAME");
-                strSQL.Append(" FROM");
-                strSQL.Append(" CONSTRUCTIONBASEINFO A1");
-                strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B1 ON ");
-                strSQL.Append(" A1.CONSTRUCTIONCODE = B1.CONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND B1.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
-                strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C1 ON ");
-                strSQL.Append(" A1.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE");
-                strSQL.Append(" AND C1.COMPLATEFLG = 0 ");
-                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER P1 ON P1.PERSONCODE = A1.CONSTRUCTIONPERSONCODE");
-                strSQL.Append(" WHERE ");
-                strSQL.AppendFormat(" A1.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling);
+                strSQL.Append("      UNI.CONSTRUCTIONCODE");
+                strSQL.Append("    , UNI.DETAILSTRING");
+                strSQL.Append("    , ''");
+                strSQL.Append("    , ''");
+                strSQL.Append("    , UNI.PERSONNAME");
+                strSQL.Append("    , UNI.ConstrYear");
+                strSQL.Append(" FROM (SELECT");
+                strSQL.Append("            A1.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
+                strSQL.Append("          , B1.DETAILSTRING AS DETAILSTRING");
+                strSQL.Append("          , A1.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
+                strSQL.Append("          , P1.PERSONNAME AS PERSONNAME");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append("      , A1.ConstructionPeriod As ConstrYear");
+                else
+                    strSQL.Append("      , A1.ConstructionYear As ConstrYear");
+                strSQL.Append("       FROM CONSTRUCTIONBASEINFO A1");
+                strSQL.Append("       INNER JOIN CONSTRUCTIONBASEINFODETAIL B1");
+                strSQL.Append("             ON A1.CONSTRUCTIONCODE = B1.CONSTRUCTIONCODE");
+                strSQL.AppendFormat("       AND B1.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.Append("       INNER JOIN CONSTRUCTIONLEDGER C1");
+                strSQL.Append("             ON A1.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE");
+                strSQL.Append("             AND C1.COMPLATEFLG = 0 ");
+                strSQL.Append("       LEFT JOIN PERSONINCHARGEMASTER P1");
+                strSQL.Append("             ON P1.PERSONCODE = A1.CONSTRUCTIONPERSONCODE");
+                strSQL.AppendFormat(" WHERE A1.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling);
                 strSQL.AppendFormat(" AND A1.JOINFLG <> {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
 
                 switch (m_PersonCharge)
@@ -636,27 +682,29 @@
                         break;
                 }
 
-                strSQL.Append(" UNION ALL");
-                strSQL.Append(" SELECT");
-                strSQL.Append(" A2.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
-                strSQL.Append(", B2.DETAILSTRING AS DETAILSTRING");
-                strSQL.Append(", A2.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
-                strSQL.Append(", P2.PERSONNAME AS PERSONNAME");
-                strSQL.Append(" FROM");
-                strSQL.Append(" CONSTRUCTIONBASEINFO A2");
-                strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B2 ON ");
-                strSQL.Append(" A2.CONSTRUCTIONCODE = B2.CONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND B2.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
-                strSQL.Append(" INNER JOIN CONSTRUCTIONLINK D2 ON ");
-                strSQL.Append(" A2.CONSTRUCTIONCODE = D2.FLUCTUATIONCODE");
-                strSQL.AppendFormat(" AND D2.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.JoinType);
-                strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C2 ON ");
-                strSQL.Append(" D2.CONSTRUCTIONCODE = C2.CONSTRUCTIONCODE");
-                strSQL.Append(" AND C2.COMPLATEFLG = 0 ");
-                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER P2 ON P2.PERSONCODE = A2.CONSTRUCTIONPERSONCODE");
-                strSQL.Append(" WHERE ");
-                strSQL.AppendFormat(" A2.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling);
-                strSQL.AppendFormat(" AND A2.JOINFLG = {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
+                strSQL.Append("      UNION ALL SELECT");
+                strSQL.Append("                     A2.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
+                strSQL.Append("                   , B2.DETAILSTRING AS DETAILSTRING");
+                strSQL.Append("                   , A2.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
+                strSQL.Append("                   , P2.PERSONNAME AS PERSONNAME");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append("               , A2.ConstructionPeriod As ConstrYear");
+                else
+                    strSQL.Append("               , A2.ConstructionYear As ConstrYear");
+                strSQL.Append("                FROM CONSTRUCTIONBASEINFO A2");
+                strSQL.Append("                INNER JOIN CONSTRUCTIONBASEINFODETAIL B2");
+                strSQL.Append("                      ON A2.CONSTRUCTIONCODE = B2.CONSTRUCTIONCODE");
+                strSQL.AppendFormat("                AND B2.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.Append("                INNER JOIN CONSTRUCTIONLINK D2");
+                strSQL.Append("                      ON A2.CONSTRUCTIONCODE = D2.FLUCTUATIONCODE");
+                strSQL.AppendFormat("                AND D2.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.JoinType);
+                strSQL.Append("                INNER JOIN CONSTRUCTIONLEDGER C2");
+                strSQL.Append("                      ON D2.CONSTRUCTIONCODE = C2.CONSTRUCTIONCODE");
+                strSQL.Append("                      AND C2.COMPLATEFLG = 0 ");
+                strSQL.Append("                LEFT JOIN PERSONINCHARGEMASTER P2");
+                strSQL.Append("                      ON P2.PERSONCODE = A2.CONSTRUCTIONPERSONCODE");
+                strSQL.AppendFormat("          WHERE A2.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling);
+                strSQL.AppendFormat("          AND A2.JOINFLG = {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
 
                 switch (m_PersonCharge)
                 {
@@ -669,7 +717,8 @@
                         strSQL.AppendFormat(" AND (A2.CONSTRUCTIONPERSONCODE = {0} OR A2.CONSTRSUBPERSONCODE = {0} OR A2.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
                         break;
                 }
-                strSQL.Append(" ) UNI ORDER BY DetailString ASC, UNI.CONSTRUCTIONPERIODSTART DESC");
+                strSQL.Append(" ) As UNI");
+                strSQL.Append(" ORDER BY DetailString ASC, UNI.CONSTRUCTIONPERIODSTART DESC");
             }
             catch (Exception ex)
             {
@@ -689,26 +738,31 @@
             {   // ----- è«‹æ±‚å…¥åŠ›ï¼ˆåˆ†å‰²è«‹æ±‚ï¼‰ã�®å ´å�ˆ
                 // é€²è¡Œä¸­ï¼‹åˆ†å‰²è«‹æ±‚ã‚’æ¤œç´¢ã�™ã‚‹
                 strSQL.Append("SELECT");
-                strSQL.Append(" UNI.CONSTRUCTIONCODE");
-                strSQL.Append(", UNI.DETAILSTRING");
-                strSQL.Append(", '', '', UNI.PERSONNAME");
-                strSQL.Append(" FROM (");
-                strSQL.Append(" SELECT");
-                strSQL.Append(" A1.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
-                strSQL.Append(", B1.DETAILSTRING AS DETAILSTRING");
-                strSQL.Append(", A1.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
-                strSQL.Append(", P1.PersonName AS PERSONNAME");
-                strSQL.Append(" FROM");
-                strSQL.Append(" CONSTRUCTIONBASEINFO A1");
-                strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B1 ON ");
-                strSQL.Append(" A1.CONSTRUCTIONCODE = B1.CONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND B1.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
-                strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C1 ON ");
-                strSQL.Append(" A1.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE");
-                strSQL.Append(" AND C1.COMPLATEFLG = 0 ");
-                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER P1 ON P1.PERSONCODE = A1.CONSTRUCTIONPERSONCODE");
-                strSQL.Append(" WHERE ");
-                strSQL.AppendFormat(" A1.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling);
+                strSQL.Append("      UNI.CONSTRUCTIONCODE");
+                strSQL.Append("    , UNI.DETAILSTRING");
+                strSQL.Append("    , ''");
+                strSQL.Append("    , ''");
+                strSQL.Append("    , UNI.PERSONNAME");
+                strSQL.Append("    , UNI.ConstrYear");
+                strSQL.Append(" FROM (SELECT");
+                strSQL.Append("            A1.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
+                strSQL.Append("          , B1.DETAILSTRING AS DETAILSTRING");
+                strSQL.Append("          , A1.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
+                strSQL.Append("          , P1.PersonName AS PERSONNAME");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append("      , A1.ConstructionPeriod As ConstrYear");
+                else
+                    strSQL.Append("      , A1.ConstructionYear As ConstrYear");
+                strSQL.Append("       FROM CONSTRUCTIONBASEINFO A1");
+                strSQL.Append("       INNER JOIN CONSTRUCTIONBASEINFODETAIL B1");
+                strSQL.Append("             ON A1.CONSTRUCTIONCODE = B1.CONSTRUCTIONCODE");
+                strSQL.AppendFormat("       AND B1.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.Append("       INNER JOIN CONSTRUCTIONLEDGER C1");
+                strSQL.Append("             ON A1.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE");
+                strSQL.Append("             AND C1.COMPLATEFLG = 0 ");
+                strSQL.Append("       LEFT JOIN PERSONINCHARGEMASTER P1");
+                strSQL.Append("            ON P1.PERSONCODE = A1.CONSTRUCTIONPERSONCODE");
+                strSQL.AppendFormat(" WHERE A1.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling);
                 strSQL.AppendFormat(" AND A1.JOINFLG <> {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
 
                 switch (m_PersonCharge)
@@ -723,27 +777,29 @@
                         break;
                 }
 
-                strSQL.Append(" UNION ALL");
-                strSQL.Append(" SELECT");
-                strSQL.Append(" A2.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
-                strSQL.Append(", B2.DETAILSTRING AS DETAILSTRING");
-                strSQL.Append(", A2.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
-                strSQL.Append(", P2.PERSONNAME AS PERSONNAME");
-                strSQL.Append(" FROM");
-                strSQL.Append(" CONSTRUCTIONBASEINFO A2");
-                strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B2 ON ");
-                strSQL.Append(" A2.CONSTRUCTIONCODE = B2.CONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND B2.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
-                strSQL.Append(" INNER JOIN CONSTRUCTIONLINK D2 ON ");
-                strSQL.Append(" A2.CONSTRUCTIONCODE = D2.FLUCTUATIONCODE");
-                strSQL.AppendFormat(" AND D2.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.JoinType);
-                strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C2 ON ");
-                strSQL.Append(" D2.CONSTRUCTIONCODE = C2.CONSTRUCTIONCODE");
-                strSQL.Append(" AND C2.COMPLATEFLG = 0 ");
-                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER P2 ON P2.PERSONCODE = A2.CONSTRUCTIONPERSONCODE");
-                strSQL.Append(" WHERE ");
-                strSQL.AppendFormat(" A2.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling);
-                strSQL.AppendFormat(" AND A2.JOINFLG = {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
+                strSQL.Append("      UNION ALL SELECT");
+                strSQL.Append("                     A2.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
+                strSQL.Append("                   , B2.DETAILSTRING AS DETAILSTRING");
+                strSQL.Append("                   , A2.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
+                strSQL.Append("                   , P2.PERSONNAME AS PERSONNAME");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append("               , A2.ConstructionPeriod As ConstrYear");
+                else
+                    strSQL.Append("               , A2.ConstructionYear As ConstrYear");
+                strSQL.Append("                FROM CONSTRUCTIONBASEINFO A2");
+                strSQL.Append("                INNER JOIN CONSTRUCTIONBASEINFODETAIL B2");
+                strSQL.Append("                      ON A2.CONSTRUCTIONCODE = B2.CONSTRUCTIONCODE");
+                strSQL.AppendFormat("                AND B2.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.Append("                INNER JOIN CONSTRUCTIONLINK D2");
+                strSQL.Append("                      ON A2.CONSTRUCTIONCODE = D2.FLUCTUATIONCODE");
+                strSQL.AppendFormat("                AND D2.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.JoinType);
+                strSQL.Append("                INNER JOIN CONSTRUCTIONLEDGER C2");
+                strSQL.Append("                      ON D2.CONSTRUCTIONCODE = C2.CONSTRUCTIONCODE");
+                strSQL.Append("                      AND C2.COMPLATEFLG = 0 ");
+                strSQL.Append("                LEFT JOIN PERSONINCHARGEMASTER P2");
+                strSQL.Append("                      ON P2.PERSONCODE = A2.CONSTRUCTIONPERSONCODE");
+                strSQL.AppendFormat("          WHERE A2.BILLINGSPLITFLG = {0}", (int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling);
+                strSQL.AppendFormat("          AND A2.JOINFLG = {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
 
                 switch (m_PersonCharge)
                 {
@@ -756,7 +812,8 @@
                         strSQL.AppendFormat(" AND (A2.CONSTRUCTIONPERSONCODE = {0} OR A2.CONSTRSUBPERSONCODE = {0} OR A2.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
                         break;
                 }
-                strSQL.Append(" ) UNI ORDER BY DETAILSTRING DESC, UNI.CONSTRUCTIONPERIODSTART DESC");
+                strSQL.Append(" ) As UNI");
+                strSQL.Append(" ORDER BY DETAILSTRING DESC, UNI.CONSTRUCTIONPERIODSTART DESC");
             }
             catch (Exception ex)
             {
@@ -776,9 +833,20 @@
             {
                 // ----- å·¥äº‹çµ�å�ˆã�®å ´å�ˆ
                 // å¯¾è±¡å…¨ã�¦ã�®æ¡ˆä»¶ã‚’æ¤œç´¢ã�™ã‚‹
-                strSQL.Append("SELECT DISTINCT A.CONSTRUCTIONCODE, B.DETAILSTRING, A.OrderersDivision, A.OrderersCode, C.PERSONNAME");
-                strSQL.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PERSONINCHARGEMASTER C");
-                strSQL.AppendFormat(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSQL.Append("SELECT DISTINCT A.CONSTRUCTIONCODE");
+                strSQL.Append("     , B.DETAILSTRING");
+                strSQL.Append("     , A.OrderersDivision");
+                strSQL.Append("     , A.OrderersCode");
+                strSQL.Append("     , C.PERSONNAME");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append(" , A.ConstructionPeriod");
+                else
+                    strSQL.Append(" , A.ConstructionYear");
+                strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
+                strSQL.Append("    , CONSTRUCTIONBASEINFODETAIL B");
+                strSQL.Append("    , PERSONINCHARGEMASTER C");
+                strSQL.Append(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
+                strSQL.AppendFormat(" AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
                 strSQL.AppendFormat(" AND A.JOINFLG = {0} ", (int)ConstructionBaseInfo.JoinFlgDef.JoinParent);
                 switch (m_PersonCharge)
                 {
@@ -791,12 +859,17 @@
                         strSQL.AppendFormat(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
                         break;
                 }
-                strSQL.Append(" AND (C.PERSONCODE = A.SALESPERSONCODE");
-                strSQL.Append(" Or C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
-                strSQL.Append(" Or C.PERSONCODE = A.CONSTRSUBPERSONCODE");
-                strSQL.Append(" Or C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)");
+                strSQL.Append("       AND (C.PERSONCODE = A.SALESPERSONCODE");
+                strSQL.Append("          Or C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
+                strSQL.Append("          Or C.PERSONCODE = A.CONSTRSUBPERSONCODE");
+                strSQL.Append("          Or C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)");
                 strSQL.Append(" Group By A.CONSTRUCTIONCODE");
-                strSQL.Append(" ORDER BY B.DETAILSTRING ASC, A.CONSTRUCTIONCODE DESC");
+                if (CommonMotions.BasePeriodYear())
+                    strSQL.Append(" ORDER BY A.ConstructionPeriod Desc");
+                else
+                    strSQL.Append(" ORDER BY A.ConstructionYear Desc");
+
+                strSQL.Append(" , B.DetailString ASC");
             }
             catch (Exception ex)
             {
@@ -844,7 +917,6 @@
                     strChgDep.AppendFormat(" Where (DATE(H.StartDate) <= DATE('{0}')", strdtEnd);
                     strChgDep.AppendFormat(" And DATE('{0}') <= DATE(H.CompDate)))", strdtStart);
 
-                    // strSQL.Append(" And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1");
                     strSQL.AppendFormat(" And (A.SalesPersonCode IN (Select A1.PersonCode From {0} As A1", strChgDep.ToString());
                     strSQL.Append("                                  Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2");
                     strSQL.AppendFormat("                                                        WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
@@ -851,17 +923,14 @@
 
                     strSQL.AppendFormat(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
 
-                    // strSQL.Append(" And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3");
                     strSQL.AppendFormat(" And (A.ConstructionPersonCode IN (Select A3.PersonCode From {0} As A3", strChgDep.ToString());
                     strSQL.Append("                                         Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4");
                     strSQL.AppendFormat("                                                               WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
 
-                    // strSQL.Append(" Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5");
                     strSQL.AppendFormat(" Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From {0} As A5", strChgDep.ToString());
                     strSQL.Append("                                    Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6");
                     strSQL.AppendFormat("                                                          WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
 
-                    // strSQL.Append(" Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7");
                     strSQL.AppendFormat(" Or A.ConstructionInstructor IN (Select A7.PersonCode From {0} As A7", strChgDep.ToString());
                     strSQL.Append("                                       Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8");
                     strSQL.AppendFormat("                                                             WHERE A8.PERSONCODE = {0}))))", CommonMotions.LoginUserData.PersonCode);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.resx	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.resx	(revision 483)
@@ -123,6 +123,9 @@
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmReqPrtSelContruction.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmReqPrtSelContruction.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmReqPrtSelContruction.cs	(revision 483)
@@ -319,18 +319,18 @@
 
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("Select");
-                strSQL.Append(" A.ConstructionCode");       // 0
-                strSQL.Append(", B.DetailString");          // 1
-                strSQL.Append(", A.OrderersDivision");      // 2
-                strSQL.Append(", A.OrderersCode");          // 3
-                strSQL.Append(", Orders.OrderersName1");    // 4
-                strSQL.Append(", Orders.OrderersName2");    // 5
-                strSQL.Append(", A.BillingSplitFlg");       // 6
-                strSQL.Append(", ReqHead.ORDERNO");         // 7
-                strSQL.Append(", ReqHead.REQUESTNO");       // 8
-                strSQL.Append(", ReqHead.REQUESTMONTH");    // 9
-                strSQL.Append(", ReqHead.REQUESTAMOUNT");   // 10
-                strSQL.Append(", InvData.InvoiceNo");       // 11
+                strSQL.Append(" A.ConstructionCode");                                   // 0
+                strSQL.Append(", B.DetailString");                                      // 1
+                strSQL.Append(", A.OrderersDivision");                                  // 2
+                strSQL.Append(", A.OrderersCode");                                      // 3
+                strSQL.Append(", OrderName.DetailString");                              // 4
+                strSQL.Append(", CONCAT(Orders.OrderersName1, Orders.OrderersName2)");  // 5
+                strSQL.Append(", A.BillingSplitFlg");                                   // 6
+                strSQL.Append(", ReqHead.ORDERNO");                                     // 7
+                strSQL.Append(", ReqHead.REQUESTNO");                                   // 8
+                strSQL.Append(", ReqHead.REQUESTMONTH");                                // 9
+                strSQL.Append(", ReqHead.REQUESTAMOUNT");                               // 10
+                strSQL.Append(", InvData.InvoiceNo");                                   // 11
                 strSQL.Append(" From constructionbaseinfo As A");
 
                 strSQL.Append(" Inner Join constructionbaseinfodetail As B");
@@ -337,6 +337,10 @@
                 strSQL.Append("        On B.ConstructionCode = A.ConstructionCode");
                 strSQL.AppendFormat("  And B.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
 
+                strSQL.Append(" Inner Join constructionbaseinfodetail As OrderName");
+                strSQL.Append("        On OrderName.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat("  And OrderName.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName);
+
                 strSQL.Append(" Inner Join orderersmaster As Orders");
                 strSQL.Append("        ON Orders.OrderCotegory = A.OrderersDivision");
                 strSQL.Append("        And Orders.OrderersCode = A.OrderersCode");
@@ -395,9 +399,8 @@
                     // è«‹æ±‚é‡‘é¡�
                     RequestPrice = CommonMotions.cnvInt(objRec[10]);
                     // ç™ºæ³¨è€…å��
-                    strOrderersName = string.Format("{0} {1}"
-                                                    , CommonMotions.cnvString(objRec[4])
-                                                    , CommonMotions.cnvString(objRec[5]));
+                    strOrderersName = CommonMotions.cnvString(objRec[4]);
+                    if (strOrderersName.Length < 1) strOrderersName = CommonMotions.cnvString(objRec[5]);
                     // å·¥äº‹å��ç§°
                     strConstrName = CommonMotions.cnvString(objRec[1]);
                     // è«‹æ±‚ç•ªå�·
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSelectCalenderData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSelectCalenderData.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSelectCalenderData.cs	(revision 483)
@@ -246,7 +246,7 @@
         {
             try
             {
-                await Task.Delay(500);
+                await Task.Delay(100);
 
                 // ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼è¡¨ç¤º
                 CreateDefaultCalender();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubconstractorDiag.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubconstractorDiag.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubconstractorDiag.cs	(revision 483)
@@ -362,7 +362,7 @@
                     break;
                 // éƒ¨ç½²åˆ¥å‡ºç´�å¸³
                 case (int)ClsExcute.ProcessExecuteNo.DepartmentCost:
-                    iRet = (int)buttonVariable.UnDecided;
+                    iRet = (int)buttonVariable.AlwaysEmployment;
                     break;
             }
             return iRet;
@@ -377,6 +377,15 @@
         {
             try
             {
+                // éƒ¨ç½²å‡ºç´�ãƒ»æ³¨æ–‡æ›¸ä¸€è¦§ã�¯è‡ªç¤¾ã‚‚æœªå®šã‚‚è¡¨ç¤ºã�—ã�ªã�„
+                if (m_StartupSource == (int)ClsExcute.ProcessExecuteNo.DepartmentCost
+                    || m_StartupSource == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderList)
+                {
+                    btnMyCompany.Visible = false;
+                    btnVariable.Visible = false;
+                    return;
+                }
+
                 // è¡¨ç¤ºãƒœã‚¿ãƒ³ã�®åˆ¤å®š
                 int ActionNo = JudgmentAction();
                 if (ActionNo == (int)buttonVariable.None)
@@ -835,6 +844,9 @@
             {
                 dgvHistory.Rows.Clear();
 
+                // å·¥äº‹ç•ªå�·è¨­å®šç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (m_ConstructionCode < 1) return;
+
                 if (m_ConstructionCode < 0) return;
                 ArrayList isdList = new ArrayList();
                 // SQLä½œæˆ�å¢—æ¸›å·¥äº‹ã‚’å�«ã‚€å±¥æ­´ã‚’è¡¨ç¤ºã�™ã‚‹
@@ -1182,7 +1194,7 @@
                 {
                     return true;
                 }
-                if (m_ConstructionCode < 0) return true;
+                if (m_ConstructionCode < 1) return true;
 
                 InputSearchLogData isdRec = new InputSearchLogData();
                 string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVersion.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVersion.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVersion.Designer.cs	(revision 483)
@@ -49,11 +49,11 @@
             // 
             this.label2.AutoSize = true;
             this.label2.BackColor = System.Drawing.Color.White;
-            this.label2.Font = new System.Drawing.Font("ARæ•™ç§‘æ›¸ä½“M", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label2.Font = new System.Drawing.Font("ARæ–°è—�ä½“E", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label2.ForeColor = System.Drawing.Color.Black;
             this.label2.Location = new System.Drawing.Point(10, 58);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(93, 19);
+            this.label2.Size = new System.Drawing.Size(89, 19);
             this.label2.TabIndex = 5;
             this.label2.Text = "æ©Ÿèƒ½æ§‹æˆ�";
             // 
@@ -61,11 +61,11 @@
             // 
             this.label3.AutoSize = true;
             this.label3.BackColor = System.Drawing.Color.White;
-            this.label3.Font = new System.Drawing.Font("ARæ•™ç§‘æ›¸ä½“M", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label3.Font = new System.Drawing.Font("ARæ–°è—�ä½“E", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label3.ForeColor = System.Drawing.Color.Black;
             this.label3.Location = new System.Drawing.Point(10, 132);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(114, 19);
+            this.label3.Size = new System.Drawing.Size(109, 19);
             this.label3.TabIndex = 6;
             this.label3.Text = "ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³";
             // 
@@ -88,11 +88,11 @@
             // 
             this.label1.AutoSize = true;
             this.label1.BackColor = System.Drawing.Color.White;
-            this.label1.Font = new System.Drawing.Font("ARæ•™ç§‘æ›¸ä½“M", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label1.Font = new System.Drawing.Font("ARæ–°è—�ä½“E", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label1.ForeColor = System.Drawing.Color.Black;
             this.label1.Location = new System.Drawing.Point(10, 4);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(93, 19);
+            this.label1.Size = new System.Drawing.Size(89, 19);
             this.label1.TabIndex = 10;
             this.label1.Text = "ã‚·ã‚¹ãƒ†ãƒ ";
             // 
@@ -147,7 +147,7 @@
             // btnUpDate
             // 
             this.btnUpDate.BackColor = System.Drawing.Color.Green;
-            this.btnUpDate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnUpDate.Font = new System.Drawing.Font("MS UI Gothic", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnUpDate.ForeColor = System.Drawing.Color.White;
             this.btnUpDate.Location = new System.Drawing.Point(159, 30);
             this.btnUpDate.Name = "btnUpDate";
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs	(revision 483)
@@ -29,210 +29,210 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle196 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle197 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle198 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle199 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle200 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle201 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle202 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle203 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle204 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle205 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle206 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle207 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle208 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle209 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle210 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle211 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle212 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle213 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle214 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle215 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle216 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle217 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle218 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle219 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle220 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle221 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle222 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle223 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle224 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle225 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle226 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle227 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle228 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle229 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle230 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle231 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle232 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle233 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle234 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle235 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle236 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle237 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle238 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle239 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle240 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle241 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle242 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle243 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle244 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle245 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle246 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle247 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle248 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle249 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle250 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle251 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle252 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle253 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle254 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle255 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle256 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle257 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle258 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle259 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle260 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle261 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle262 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle263 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle264 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle265 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle266 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle267 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle268 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle269 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle270 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle271 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle272 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle273 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle274 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle275 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle276 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle277 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle278 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle279 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle280 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle281 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle282 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle283 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle292 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle284 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle285 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle286 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle287 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle288 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle289 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle290 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle291 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle293 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle294 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle295 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle296 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle297 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle298 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle299 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle300 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle301 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle302 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle303 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle304 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle305 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle306 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle307 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle308 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle309 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle310 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle311 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle312 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle313 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle314 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle315 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle316 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle317 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle318 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle319 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle320 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle321 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle322 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle323 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle324 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle325 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle326 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle327 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle328 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle329 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle330 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle331 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle332 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle333 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle334 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle335 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle336 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle337 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle338 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle339 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle340 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle341 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle342 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle343 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle344 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle345 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle346 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle347 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle348 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle349 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle350 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle351 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle352 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle353 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle354 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle355 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle356 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle357 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle358 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle359 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle360 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle361 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle362 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle363 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle364 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle365 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle366 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle367 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle368 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle369 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle370 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle371 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle372 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle373 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle374 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle375 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle376 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle377 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle378 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle379 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle380 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle381 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle382 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle383 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle384 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle385 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle386 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle390 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle387 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle388 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle389 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series8 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series9 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series13 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series14 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle61 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle62 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle63 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle64 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle65 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle66 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle70 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle73 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle74 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle75 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle76 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle77 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle78 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle79 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle80 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle81 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle82 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle83 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle84 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle85 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle86 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle87 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle88 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle97 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle89 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle90 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle91 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle92 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle93 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle94 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle95 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle96 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle98 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle99 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle100 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle101 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle102 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle103 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle104 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle105 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle106 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle107 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle108 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle109 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle110 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle111 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle112 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle113 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle114 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle115 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle116 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle117 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle118 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle119 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle120 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle121 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle122 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle123 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle124 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle125 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle126 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle127 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle128 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle129 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle130 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle131 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle132 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle133 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle134 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle135 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle136 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle137 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle138 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle139 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle140 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle141 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle142 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle143 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle144 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle145 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle146 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle147 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle148 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle149 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle150 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle151 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle152 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle153 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle154 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle155 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle156 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle157 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle158 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle159 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle160 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle161 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle162 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle163 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle164 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle165 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle166 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle167 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle168 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle169 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle170 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle171 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle172 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle173 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle174 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle175 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle176 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle177 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle178 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle179 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle180 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle181 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle182 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle183 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle184 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle185 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle186 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle187 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle188 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle189 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle190 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle191 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle195 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle192 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle193 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle194 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
             this.lblTitle = new System.Windows.Forms.Label();
             this.btnEnd = new System.Windows.Forms.Button();
             this.tabMenu = new System.Windows.Forms.TabControl();
@@ -265,20 +265,6 @@
             this.label29 = new System.Windows.Forms.Label();
             this.label25 = new System.Windows.Forms.Label();
             this.dgvApproval = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.ApprovalColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn09 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ApprovalColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage4 = new System.Windows.Forms.TabPage();
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -285,24 +271,6 @@
             this.label7 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.dgvPersonApp = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn53 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column52 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column42 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column49 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column43 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column45 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column46 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn54 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn55 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn57 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column44 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn58 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column41 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn59 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn60 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn61 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn62 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column48 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label4 = new System.Windows.Forms.Label();
             this.tabPage5 = new System.Windows.Forms.TabPage();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
@@ -787,6 +755,38 @@
             this.btnConstrSearch = new System.Windows.Forms.Button();
             this.lblUpdateNotice = new System.Windows.Forms.Label();
             this.btnHelp = new System.Windows.Forms.Button();
+            this.ApprovalColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn09 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ApprovalColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn53 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column52 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column42 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column49 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column43 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column45 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column46 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn54 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn55 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn57 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column44 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn58 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column41 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn59 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn60 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn61 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn62 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column48 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabMenu.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvBusinessMessage)).BeginInit();
@@ -925,21 +925,21 @@
             this.dgvBusinessMessage.AllowUserToDeleteRows = false;
             this.dgvBusinessMessage.AllowUserToResizeColumns = false;
             this.dgvBusinessMessage.AllowUserToResizeRows = false;
-            dataGridViewCellStyle196.BackColor = System.Drawing.Color.SeaShell;
-            this.dgvBusinessMessage.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle196;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.SeaShell;
+            this.dgvBusinessMessage.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvBusinessMessage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvBusinessMessage.BackgroundColor = System.Drawing.Color.White;
             this.dgvBusinessMessage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle197.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle197.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle197.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle197.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle197.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle197.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle197.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvBusinessMessage.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle197;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvBusinessMessage.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvBusinessMessage.ColumnHeadersHeight = 20;
             this.dgvBusinessMessage.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvBusinessMessage.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -984,8 +984,8 @@
             // 
             // dataGridViewTextBoxColumn81
             // 
-            dataGridViewCellStyle198.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn81.DefaultCellStyle = dataGridViewCellStyle198;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn81.DefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridViewTextBoxColumn81.Frozen = true;
             this.dataGridViewTextBoxColumn81.HeaderText = "æ›¸è¾¼ã�¿è€…";
             this.dataGridViewTextBoxColumn81.Name = "dataGridViewTextBoxColumn81";
@@ -995,8 +995,8 @@
             // 
             // dataGridViewTextBoxColumn82
             // 
-            dataGridViewCellStyle199.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn82.DefaultCellStyle = dataGridViewCellStyle199;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn82.DefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridViewTextBoxColumn82.Frozen = true;
             this.dataGridViewTextBoxColumn82.HeaderText = "å¯¾è±¡è€…";
             this.dataGridViewTextBoxColumn82.Name = "dataGridViewTextBoxColumn82";
@@ -1005,8 +1005,8 @@
             // 
             // dataGridViewTextBoxColumn83
             // 
-            dataGridViewCellStyle200.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn83.DefaultCellStyle = dataGridViewCellStyle200;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn83.DefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridViewTextBoxColumn83.Frozen = true;
             this.dataGridViewTextBoxColumn83.HeaderText = "ä¼�è¨€ã‚¿ã‚¤ãƒˆãƒ«";
             this.dataGridViewTextBoxColumn83.Name = "dataGridViewTextBoxColumn83";
@@ -1024,8 +1024,8 @@
             // 
             // dataGridViewTextBoxColumn84
             // 
-            dataGridViewCellStyle201.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn84.DefaultCellStyle = dataGridViewCellStyle201;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn84.DefaultCellStyle = dataGridViewCellStyle6;
             this.dataGridViewTextBoxColumn84.Frozen = true;
             this.dataGridViewTextBoxColumn84.HeaderText = "æ›¸ã€€è¾¼ã€€æ—¥ã€€ä»˜";
             this.dataGridViewTextBoxColumn84.Name = "dataGridViewTextBoxColumn84";
@@ -1104,21 +1104,21 @@
             this.dgvMessageBoard.AllowUserToAddRows = false;
             this.dgvMessageBoard.AllowUserToDeleteRows = false;
             this.dgvMessageBoard.AllowUserToResizeRows = false;
-            dataGridViewCellStyle202.BackColor = System.Drawing.Color.GhostWhite;
-            this.dgvMessageBoard.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle202;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.GhostWhite;
+            this.dgvMessageBoard.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvMessageBoard.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvMessageBoard.BackgroundColor = System.Drawing.Color.White;
             this.dgvMessageBoard.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle203.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle203.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle203.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle203.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle203.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle203.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle203.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMessageBoard.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle203;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, 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.dgvMessageBoard.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvMessageBoard.ColumnHeadersHeight = 20;
             this.dgvMessageBoard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMessageBoard.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1162,8 +1162,8 @@
             // 
             // Column03
             // 
-            dataGridViewCellStyle204.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column03.DefaultCellStyle = dataGridViewCellStyle204;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column03.DefaultCellStyle = dataGridViewCellStyle9;
             this.Column03.Frozen = true;
             this.Column03.HeaderText = "æ›¸è¾¼ã�¿è€…";
             this.Column03.Name = "Column03";
@@ -1173,8 +1173,8 @@
             // 
             // Column01
             // 
-            dataGridViewCellStyle205.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column01.DefaultCellStyle = dataGridViewCellStyle205;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column01.DefaultCellStyle = dataGridViewCellStyle10;
             this.Column01.Frozen = true;
             this.Column01.HeaderText = "å¯¾è±¡è€…";
             this.Column01.Name = "Column01";
@@ -1184,8 +1184,8 @@
             // 
             // Column02
             // 
-            dataGridViewCellStyle206.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column02.DefaultCellStyle = dataGridViewCellStyle206;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column02.DefaultCellStyle = dataGridViewCellStyle11;
             this.Column02.Frozen = true;
             this.Column02.HeaderText = "ä¼�ã€€ã€€è¨€ã€€ã€€ã‚¿ã€€ã‚¤ã€€ãƒˆã€€ãƒ«";
             this.Column02.Name = "Column02";
@@ -1195,8 +1195,8 @@
             // 
             // Column04
             // 
-            dataGridViewCellStyle207.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column04.DefaultCellStyle = dataGridViewCellStyle207;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column04.DefaultCellStyle = dataGridViewCellStyle12;
             this.Column04.Frozen = true;
             this.Column04.HeaderText = "æ›¸ã€€è¾¼ã€€æ—¥ã€€ä»˜";
             this.Column04.Name = "Column04";
@@ -1298,21 +1298,21 @@
             this.dgvApproval.AllowUserToAddRows = false;
             this.dgvApproval.AllowUserToDeleteRows = false;
             this.dgvApproval.AllowUserToResizeRows = false;
-            dataGridViewCellStyle208.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvApproval.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle208;
+            dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvApproval.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
             this.dgvApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvApproval.BackgroundColor = System.Drawing.Color.White;
             this.dgvApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle209.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle209.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle209.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle209.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle209.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle209.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle209.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvApproval.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle209;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvApproval.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
             this.dgvApproval.ColumnHeadersHeight = 20;
             this.dgvApproval.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvApproval.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1345,179 +1345,8 @@
             this.dgvApproval.TabIndex = 6;
             this.dgvApproval.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvApproval_CellDoubleClick);
             this.dgvApproval.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvApproval.Sorted += new System.EventHandler(this.dgvApproval_Sorted);
             // 
-            // ApprovalColumn02
-            // 
-            dataGridViewCellStyle210.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle210.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle210.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn02.DefaultCellStyle = dataGridViewCellStyle210;
-            this.ApprovalColumn02.Frozen = true;
-            this.ApprovalColumn02.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
-            this.ApprovalColumn02.Name = "ApprovalColumn02";
-            this.ApprovalColumn02.ReadOnly = true;
-            this.ApprovalColumn02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ApprovalColumn02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn02.Visible = false;
-            this.ApprovalColumn02.Width = 5;
-            // 
-            // ApprovalColumn12
-            // 
-            this.ApprovalColumn12.Frozen = true;
-            this.ApprovalColumn12.HeaderText = "æ‰¿èª�æ©Ÿèƒ½ç•ªå�·";
-            this.ApprovalColumn12.Name = "ApprovalColumn12";
-            this.ApprovalColumn12.ReadOnly = true;
-            this.ApprovalColumn12.Visible = false;
-            this.ApprovalColumn12.Width = 5;
-            // 
-            // Column32
-            // 
-            this.Column32.Frozen = true;
-            this.Column32.HeaderText = "å�—ä»˜ç•ªå�·";
-            this.Column32.Name = "Column32";
-            this.Column32.ReadOnly = true;
-            this.Column32.Visible = false;
-            this.Column32.Width = 5;
-            // 
-            // ApprovalColumn01
-            // 
-            dataGridViewCellStyle211.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle211.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle211.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn01.DefaultCellStyle = dataGridViewCellStyle211;
-            this.ApprovalColumn01.Frozen = true;
-            this.ApprovalColumn01.HeaderText = "â„–";
-            this.ApprovalColumn01.Name = "ApprovalColumn01";
-            this.ApprovalColumn01.ReadOnly = true;
-            this.ApprovalColumn01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ApprovalColumn01.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn01.Width = 40;
-            // 
-            // ApprovalColumn03
-            // 
-            dataGridViewCellStyle212.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle212.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle212.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn03.DefaultCellStyle = dataGridViewCellStyle212;
-            this.ApprovalColumn03.Frozen = true;
-            this.ApprovalColumn03.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.ApprovalColumn03.Name = "ApprovalColumn03";
-            this.ApprovalColumn03.ReadOnly = true;
-            this.ApprovalColumn03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn03.Width = 320;
-            // 
-            // ApprovalColumn04
-            // 
-            dataGridViewCellStyle213.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle213.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle213.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn04.DefaultCellStyle = dataGridViewCellStyle213;
-            this.ApprovalColumn04.Frozen = true;
-            this.ApprovalColumn04.HeaderText = "ç”³è«‹é …ç›®";
-            this.ApprovalColumn04.Name = "ApprovalColumn04";
-            this.ApprovalColumn04.ReadOnly = true;
-            this.ApprovalColumn04.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn04.Width = 130;
-            // 
-            // ApprovalColumn05
-            // 
-            dataGridViewCellStyle214.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle214.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle214.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn05.DefaultCellStyle = dataGridViewCellStyle214;
-            this.ApprovalColumn05.Frozen = true;
-            this.ApprovalColumn05.HeaderText = "ç”³ã€€è«‹ã€€è€…";
-            this.ApprovalColumn05.Name = "ApprovalColumn05";
-            this.ApprovalColumn05.ReadOnly = true;
-            this.ApprovalColumn05.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn05.Width = 80;
-            // 
-            // ApprovalColumn06
-            // 
-            dataGridViewCellStyle215.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle215.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle215.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn06.DefaultCellStyle = dataGridViewCellStyle215;
-            this.ApprovalColumn06.Frozen = true;
-            this.ApprovalColumn06.HeaderText = "ç”³ã€€è«‹ã€€æ—¥";
-            this.ApprovalColumn06.Name = "ApprovalColumn06";
-            this.ApprovalColumn06.ReadOnly = true;
-            this.ApprovalColumn06.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ApprovalColumn06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // ApprovalColumn07
-            // 
-            dataGridViewCellStyle216.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle216.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle216.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn07.DefaultCellStyle = dataGridViewCellStyle216;
-            this.ApprovalColumn07.Frozen = true;
-            this.ApprovalColumn07.HeaderText = "æ‰¿èª�å¸Œæœ›æ—¥";
-            this.ApprovalColumn07.Name = "ApprovalColumn07";
-            this.ApprovalColumn07.ReadOnly = true;
-            this.ApprovalColumn07.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ApprovalColumn07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // ApprovalColumn08
-            // 
-            dataGridViewCellStyle217.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle217.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle217.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn08.DefaultCellStyle = dataGridViewCellStyle217;
-            this.ApprovalColumn08.HeaderText = "æ‰¿èª�è€…ï¼‘";
-            this.ApprovalColumn08.Name = "ApprovalColumn08";
-            this.ApprovalColumn08.ReadOnly = true;
-            this.ApprovalColumn08.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn08.Width = 80;
-            // 
-            // ApprovalColumn09
-            // 
-            dataGridViewCellStyle218.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle218.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle218.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn09.DefaultCellStyle = dataGridViewCellStyle218;
-            this.ApprovalColumn09.HeaderText = "æ‰¿èª�è€…ï¼’";
-            this.ApprovalColumn09.Name = "ApprovalColumn09";
-            this.ApprovalColumn09.ReadOnly = true;
-            this.ApprovalColumn09.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn09.Width = 80;
-            // 
-            // ApprovalColumn10
-            // 
-            dataGridViewCellStyle219.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle219.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle219.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn10.DefaultCellStyle = dataGridViewCellStyle219;
-            this.ApprovalColumn10.HeaderText = "æ‰¿èª�è€…ï¼“";
-            this.ApprovalColumn10.Name = "ApprovalColumn10";
-            this.ApprovalColumn10.ReadOnly = true;
-            this.ApprovalColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn10.Width = 80;
-            // 
-            // ApprovalColumn11
-            // 
-            dataGridViewCellStyle220.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle220.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle220.ForeColor = System.Drawing.Color.Black;
-            this.ApprovalColumn11.DefaultCellStyle = dataGridViewCellStyle220;
-            this.ApprovalColumn11.HeaderText = "æ‰¿èª�è€…ï¼”";
-            this.ApprovalColumn11.Name = "ApprovalColumn11";
-            this.ApprovalColumn11.ReadOnly = true;
-            this.ApprovalColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ApprovalColumn11.Width = 80;
-            // 
-            // Column47
-            // 
-            dataGridViewCellStyle221.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle221.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle221.ForeColor = System.Drawing.Color.Black;
-            this.Column47.DefaultCellStyle = dataGridViewCellStyle221;
-            this.Column47.HeaderText = "æ‰¿èª�è€…ï¼•";
-            this.Column47.Name = "Column47";
-            this.Column47.ReadOnly = true;
-            this.Column47.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column47.Width = 80;
-            // 
             // tabPage4
             // 
             this.tabPage4.BackColor = System.Drawing.Color.Black;
@@ -1590,21 +1419,21 @@
             this.dgvPersonApp.AllowUserToAddRows = false;
             this.dgvPersonApp.AllowUserToDeleteRows = false;
             this.dgvPersonApp.AllowUserToResizeRows = false;
-            dataGridViewCellStyle222.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvPersonApp.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle222;
+            dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvPersonApp.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27;
             this.dgvPersonApp.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPersonApp.BackgroundColor = System.Drawing.Color.White;
             this.dgvPersonApp.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle223.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle223.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle223.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle223.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle223.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle223.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle223.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPersonApp.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle223;
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPersonApp.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
             this.dgvPersonApp.ColumnHeadersHeight = 20;
             this.dgvPersonApp.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPersonApp.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1641,209 +1470,8 @@
             this.dgvPersonApp.TabIndex = 106;
             this.dgvPersonApp.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPersonApp_CellDoubleClick);
             this.dgvPersonApp.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvPersonApp.Sorted += new System.EventHandler(this.dgvPersonApp_Sorted);
             // 
-            // dataGridViewTextBoxColumn53
-            // 
-            dataGridViewCellStyle224.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle224.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle224.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn53.DefaultCellStyle = dataGridViewCellStyle224;
-            this.dataGridViewTextBoxColumn53.Frozen = true;
-            this.dataGridViewTextBoxColumn53.HeaderText = "æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn53.Name = "dataGridViewTextBoxColumn53";
-            this.dataGridViewTextBoxColumn53.ReadOnly = true;
-            this.dataGridViewTextBoxColumn53.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn53.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn53.Visible = false;
-            this.dataGridViewTextBoxColumn53.Width = 5;
-            // 
-            // Column52
-            // 
-            this.Column52.Frozen = true;
-            this.Column52.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
-            this.Column52.Name = "Column52";
-            this.Column52.ReadOnly = true;
-            this.Column52.Visible = false;
-            this.Column52.Width = 5;
-            // 
-            // Column42
-            // 
-            this.Column42.Frozen = true;
-            this.Column42.HeaderText = "æ‰¿èª�æ©Ÿèƒ½ç•ªå�·";
-            this.Column42.Name = "Column42";
-            this.Column42.ReadOnly = true;
-            this.Column42.Visible = false;
-            this.Column42.Width = 5;
-            // 
-            // Column49
-            // 
-            this.Column49.Frozen = true;
-            this.Column49.HeaderText = "å�—ä»˜æ—¥";
-            this.Column49.Name = "Column49";
-            this.Column49.ReadOnly = true;
-            this.Column49.Visible = false;
-            this.Column49.Width = 5;
-            // 
-            // Column43
-            // 
-            this.Column43.Frozen = true;
-            this.Column43.HeaderText = "å�—ä»˜ç•ªå�·";
-            this.Column43.Name = "Column43";
-            this.Column43.ReadOnly = true;
-            this.Column43.Visible = false;
-            this.Column43.Width = 5;
-            // 
-            // Column45
-            // 
-            this.Column45.Frozen = true;
-            this.Column45.HeaderText = "ãƒ‡ãƒ¼ã‚¿æ¤œç´¢ã‚­ãƒ¼ï¼‘";
-            this.Column45.Name = "Column45";
-            this.Column45.ReadOnly = true;
-            this.Column45.Visible = false;
-            this.Column45.Width = 5;
-            // 
-            // Column46
-            // 
-            this.Column46.Frozen = true;
-            this.Column46.HeaderText = "ãƒ‡ãƒ¼ã‚¿æ¤œç´¢ã‚­ãƒ¼ï¼’";
-            this.Column46.Name = "Column46";
-            this.Column46.ReadOnly = true;
-            this.Column46.Visible = false;
-            this.Column46.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn54
-            // 
-            dataGridViewCellStyle225.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle225.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle225.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn54.DefaultCellStyle = dataGridViewCellStyle225;
-            this.dataGridViewTextBoxColumn54.Frozen = true;
-            this.dataGridViewTextBoxColumn54.HeaderText = "â„–";
-            this.dataGridViewTextBoxColumn54.Name = "dataGridViewTextBoxColumn54";
-            this.dataGridViewTextBoxColumn54.ReadOnly = true;
-            this.dataGridViewTextBoxColumn54.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn54.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn54.Width = 40;
-            // 
-            // dataGridViewTextBoxColumn55
-            // 
-            this.dataGridViewTextBoxColumn55.Frozen = true;
-            this.dataGridViewTextBoxColumn55.HeaderText = "ç”³ã€€è«‹ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn55.Name = "dataGridViewTextBoxColumn55";
-            this.dataGridViewTextBoxColumn55.ReadOnly = true;
-            this.dataGridViewTextBoxColumn55.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn55.Width = 320;
-            // 
-            // dataGridViewTextBoxColumn57
-            // 
-            dataGridViewCellStyle226.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle226.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle226.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn57.DefaultCellStyle = dataGridViewCellStyle226;
-            this.dataGridViewTextBoxColumn57.Frozen = true;
-            this.dataGridViewTextBoxColumn57.HeaderText = "ç”³è«‹é …ç›®";
-            this.dataGridViewTextBoxColumn57.Name = "dataGridViewTextBoxColumn57";
-            this.dataGridViewTextBoxColumn57.ReadOnly = true;
-            this.dataGridViewTextBoxColumn57.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn57.Width = 130;
-            // 
-            // Column44
-            // 
-            dataGridViewCellStyle227.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column44.DefaultCellStyle = dataGridViewCellStyle227;
-            this.Column44.Frozen = true;
-            this.Column44.HeaderText = "ç”³ã€€è«‹ã€€è€…";
-            this.Column44.Name = "Column44";
-            this.Column44.ReadOnly = true;
-            this.Column44.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column44.Width = 80;
-            // 
-            // dataGridViewTextBoxColumn58
-            // 
-            dataGridViewCellStyle228.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle228.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle228.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn58.DefaultCellStyle = dataGridViewCellStyle228;
-            this.dataGridViewTextBoxColumn58.Frozen = true;
-            this.dataGridViewTextBoxColumn58.HeaderText = "ç”³ã€€è«‹ã€€æ—¥";
-            this.dataGridViewTextBoxColumn58.Name = "dataGridViewTextBoxColumn58";
-            this.dataGridViewTextBoxColumn58.ReadOnly = true;
-            this.dataGridViewTextBoxColumn58.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn58.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column41
-            // 
-            dataGridViewCellStyle229.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle229.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle229.ForeColor = System.Drawing.Color.Black;
-            this.Column41.DefaultCellStyle = dataGridViewCellStyle229;
-            this.Column41.Frozen = true;
-            this.Column41.HeaderText = "æ‰¿èª�å¸Œæœ›æ—¥";
-            this.Column41.Name = "Column41";
-            this.Column41.ReadOnly = true;
-            this.Column41.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column41.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // dataGridViewTextBoxColumn59
-            // 
-            dataGridViewCellStyle230.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle230.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle230.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn59.DefaultCellStyle = dataGridViewCellStyle230;
-            this.dataGridViewTextBoxColumn59.HeaderText = "æ‰¿èª�è€…ï¼‘";
-            this.dataGridViewTextBoxColumn59.Name = "dataGridViewTextBoxColumn59";
-            this.dataGridViewTextBoxColumn59.ReadOnly = true;
-            this.dataGridViewTextBoxColumn59.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn59.Width = 80;
-            // 
-            // dataGridViewTextBoxColumn60
-            // 
-            dataGridViewCellStyle231.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle231.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle231.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn60.DefaultCellStyle = dataGridViewCellStyle231;
-            this.dataGridViewTextBoxColumn60.HeaderText = "æ‰¿èª�è€…ï¼’";
-            this.dataGridViewTextBoxColumn60.Name = "dataGridViewTextBoxColumn60";
-            this.dataGridViewTextBoxColumn60.ReadOnly = true;
-            this.dataGridViewTextBoxColumn60.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn60.Width = 80;
-            // 
-            // dataGridViewTextBoxColumn61
-            // 
-            dataGridViewCellStyle232.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle232.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle232.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn61.DefaultCellStyle = dataGridViewCellStyle232;
-            this.dataGridViewTextBoxColumn61.HeaderText = "æ‰¿èª�è€…ï¼“";
-            this.dataGridViewTextBoxColumn61.Name = "dataGridViewTextBoxColumn61";
-            this.dataGridViewTextBoxColumn61.ReadOnly = true;
-            this.dataGridViewTextBoxColumn61.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn61.Width = 80;
-            // 
-            // dataGridViewTextBoxColumn62
-            // 
-            dataGridViewCellStyle233.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle233.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle233.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn62.DefaultCellStyle = dataGridViewCellStyle233;
-            this.dataGridViewTextBoxColumn62.HeaderText = "æ‰¿èª�è€…ï¼”";
-            this.dataGridViewTextBoxColumn62.Name = "dataGridViewTextBoxColumn62";
-            this.dataGridViewTextBoxColumn62.ReadOnly = true;
-            this.dataGridViewTextBoxColumn62.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn62.Width = 80;
-            // 
-            // Column48
-            // 
-            dataGridViewCellStyle234.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle234.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle234.ForeColor = System.Drawing.Color.Black;
-            this.Column48.DefaultCellStyle = dataGridViewCellStyle234;
-            this.Column48.HeaderText = "æ‰¿èª�è€…ï¼•";
-            this.Column48.Name = "Column48";
-            this.Column48.ReadOnly = true;
-            this.Column48.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column48.Width = 80;
-            // 
             // label4
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.Top;
@@ -1872,6 +1500,7 @@
             // 
             // comboBox1
             // 
+            this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox1.BackColor = System.Drawing.Color.White;
             this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
@@ -1890,21 +1519,21 @@
             this.dgvSalesInProjects.AllowUserToDeleteRows = false;
             this.dgvSalesInProjects.AllowUserToResizeColumns = false;
             this.dgvSalesInProjects.AllowUserToResizeRows = false;
-            dataGridViewCellStyle235.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvSalesInProjects.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle235;
+            dataGridViewCellStyle40.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvSalesInProjects.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle40;
             this.dgvSalesInProjects.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvSalesInProjects.BackgroundColor = System.Drawing.Color.White;
             this.dgvSalesInProjects.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle236.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle236.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle236.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle236.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle236.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle236.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle236.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSalesInProjects.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle236;
+            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle41.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSalesInProjects.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle41;
             this.dgvSalesInProjects.ColumnHeadersHeight = 20;
             this.dgvSalesInProjects.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvSalesInProjects.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1936,11 +1565,12 @@
             this.dgvSalesInProjects.TabIndex = 6;
             this.dgvSalesInProjects.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvSalesInProjects.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvSalesInProjects.Sorted += new System.EventHandler(this.dgvSalesInProjects_Sorted);
             // 
             // Column1
             // 
-            dataGridViewCellStyle237.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle237;
+            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle42;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.Column1.Name = "Column1";
@@ -1952,9 +1582,9 @@
             // 
             // Column15
             // 
-            dataGridViewCellStyle238.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle238.ForeColor = System.Drawing.Color.Black;
-            this.Column15.DefaultCellStyle = dataGridViewCellStyle238;
+            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle43.ForeColor = System.Drawing.Color.Black;
+            this.Column15.DefaultCellStyle = dataGridViewCellStyle43;
             this.Column15.Frozen = true;
             this.Column15.HeaderText = "â„–";
             this.Column15.Name = "Column15";
@@ -1965,8 +1595,8 @@
             // 
             // Column10
             // 
-            dataGridViewCellStyle239.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle239;
+            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle44;
             this.Column10.Frozen = true;
             this.Column10.HeaderText = "å–¶æ¥­æœŸ";
             this.Column10.Name = "Column10";
@@ -1977,8 +1607,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle240.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle240;
+            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle45;
             this.Column2.Frozen = true;
             this.Column2.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.Column2.Name = "Column2";
@@ -1989,10 +1619,10 @@
             // 
             // Column53
             // 
-            dataGridViewCellStyle241.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle241.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle241.ForeColor = System.Drawing.Color.Black;
-            this.Column53.DefaultCellStyle = dataGridViewCellStyle241;
+            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle46.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle46.ForeColor = System.Drawing.Color.Black;
+            this.Column53.DefaultCellStyle = dataGridViewCellStyle46;
             this.Column53.HeaderText = "æœŸå¾…ï¼…";
             this.Column53.Name = "Column53";
             this.Column53.ReadOnly = true;
@@ -2002,8 +1632,8 @@
             // 
             // Column9
             // 
-            dataGridViewCellStyle242.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle242;
+            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle47;
             this.Column9.HeaderText = "é€²æ�—çŠ¶æ…‹";
             this.Column9.Name = "Column9";
             this.Column9.ReadOnly = true;
@@ -2012,9 +1642,9 @@
             // 
             // Column29
             // 
-            dataGridViewCellStyle243.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle243.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column29.DefaultCellStyle = dataGridViewCellStyle243;
+            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle48.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column29.DefaultCellStyle = dataGridViewCellStyle48;
             this.Column29.HeaderText = "æ‰¿èª�çŠ¶æ³�";
             this.Column29.Name = "Column29";
             this.Column29.ReadOnly = true;
@@ -2023,8 +1653,8 @@
             // 
             // Column19
             // 
-            dataGridViewCellStyle244.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column19.DefaultCellStyle = dataGridViewCellStyle244;
+            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column19.DefaultCellStyle = dataGridViewCellStyle49;
             this.Column19.HeaderText = "è¦‹ç©�æ��å‡ºæœŸé™�";
             this.Column19.Name = "Column19";
             this.Column19.ReadOnly = true;
@@ -2033,8 +1663,8 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle245.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle245;
+            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle50;
             this.Column3.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
@@ -2043,8 +1673,8 @@
             // 
             // Column4
             // 
-            dataGridViewCellStyle246.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle246;
+            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle51;
             this.Column4.HeaderText = "å·¥äº‹äºˆå®šè€…";
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
@@ -2053,8 +1683,8 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle247.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle247;
+            dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle52;
             this.Column5.HeaderText = "ç�€å·¥äºˆå®šæ—¥";
             this.Column5.Name = "Column5";
             this.Column5.ReadOnly = true;
@@ -2063,8 +1693,8 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle248.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle248;
+            dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle53;
             this.Column6.HeaderText = "å®Œäº†äºˆå®šæ—¥";
             this.Column6.Name = "Column6";
             this.Column6.ReadOnly = true;
@@ -2073,8 +1703,8 @@
             // 
             // Column7
             // 
-            dataGridViewCellStyle249.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle249;
+            dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle54;
             this.Column7.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
@@ -2084,8 +1714,8 @@
             // 
             // Column8
             // 
-            dataGridViewCellStyle250.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle250;
+            dataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle55;
             this.Column8.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.Column8.Name = "Column8";
             this.Column8.ReadOnly = true;
@@ -2135,6 +1765,7 @@
             // 
             // comboBox2
             // 
+            this.comboBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox2.BackColor = System.Drawing.Color.White;
             this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
@@ -2166,21 +1797,21 @@
             this.dgvTenders.AllowUserToDeleteRows = false;
             this.dgvTenders.AllowUserToResizeColumns = false;
             this.dgvTenders.AllowUserToResizeRows = false;
-            dataGridViewCellStyle251.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvTenders.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle251;
+            dataGridViewCellStyle56.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvTenders.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle56;
             this.dgvTenders.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvTenders.BackgroundColor = System.Drawing.Color.White;
             this.dgvTenders.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle252.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle252.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle252.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle252.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle252.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle252.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle252.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvTenders.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle252;
+            dataGridViewCellStyle57.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle57.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle57.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle57.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle57.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle57.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle57.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvTenders.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle57;
             this.dgvTenders.ColumnHeadersHeight = 20;
             this.dgvTenders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvTenders.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -2212,11 +1843,12 @@
             this.dgvTenders.TabIndex = 8;
             this.dgvTenders.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvTenders.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvTenders.Sorted += new System.EventHandler(this.dgvTenders_Sorted);
             // 
             // dataGridViewTextBoxColumn20
             // 
-            dataGridViewCellStyle253.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle253;
+            dataGridViewCellStyle58.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle58;
             this.dataGridViewTextBoxColumn20.Frozen = true;
             this.dataGridViewTextBoxColumn20.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
@@ -2228,9 +1860,9 @@
             // 
             // dataGridViewTextBoxColumn21
             // 
-            dataGridViewCellStyle254.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle254.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle254;
+            dataGridViewCellStyle59.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle59.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle59;
             this.dataGridViewTextBoxColumn21.Frozen = true;
             this.dataGridViewTextBoxColumn21.HeaderText = "â„–";
             this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
@@ -2241,8 +1873,8 @@
             // 
             // dataGridViewTextBoxColumn22
             // 
-            dataGridViewCellStyle255.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle255;
+            dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle60;
             this.dataGridViewTextBoxColumn22.Frozen = true;
             this.dataGridViewTextBoxColumn22.HeaderText = "å–¶æ¥­æœŸ";
             this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
@@ -2253,8 +1885,8 @@
             // 
             // dataGridViewTextBoxColumn23
             // 
-            dataGridViewCellStyle256.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle256;
+            dataGridViewCellStyle61.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle61;
             this.dataGridViewTextBoxColumn23.Frozen = true;
             this.dataGridViewTextBoxColumn23.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
@@ -2265,10 +1897,10 @@
             // 
             // Column54
             // 
-            dataGridViewCellStyle257.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle257.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle257.ForeColor = System.Drawing.Color.Black;
-            this.Column54.DefaultCellStyle = dataGridViewCellStyle257;
+            dataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle62.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle62.ForeColor = System.Drawing.Color.Black;
+            this.Column54.DefaultCellStyle = dataGridViewCellStyle62;
             this.Column54.HeaderText = "æœŸå¾…ï¼…";
             this.Column54.Name = "Column54";
             this.Column54.ReadOnly = true;
@@ -2278,8 +1910,8 @@
             // 
             // Column21
             // 
-            dataGridViewCellStyle258.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column21.DefaultCellStyle = dataGridViewCellStyle258;
+            dataGridViewCellStyle63.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column21.DefaultCellStyle = dataGridViewCellStyle63;
             this.Column21.HeaderText = "é€²æ�—çŠ¶æ…‹";
             this.Column21.Name = "Column21";
             this.Column21.ReadOnly = true;
@@ -2288,9 +1920,9 @@
             // 
             // Column30
             // 
-            dataGridViewCellStyle259.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle259.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column30.DefaultCellStyle = dataGridViewCellStyle259;
+            dataGridViewCellStyle64.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle64.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column30.DefaultCellStyle = dataGridViewCellStyle64;
             this.Column30.HeaderText = "æ‰¿èª�çŠ¶æ³�";
             this.Column30.Name = "Column30";
             this.Column30.ReadOnly = true;
@@ -2299,8 +1931,8 @@
             // 
             // dataGridViewTextBoxColumn25
             // 
-            dataGridViewCellStyle260.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle260;
+            dataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle65;
             this.dataGridViewTextBoxColumn25.HeaderText = "è¦‹ç©�æ��å‡ºæœŸé™�";
             this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
             this.dataGridViewTextBoxColumn25.ReadOnly = true;
@@ -2309,8 +1941,8 @@
             // 
             // dataGridViewTextBoxColumn26
             // 
-            dataGridViewCellStyle261.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle261;
+            dataGridViewCellStyle66.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle66;
             this.dataGridViewTextBoxColumn26.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
             this.dataGridViewTextBoxColumn26.ReadOnly = true;
@@ -2319,8 +1951,8 @@
             // 
             // dataGridViewTextBoxColumn27
             // 
-            dataGridViewCellStyle262.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle262;
+            dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle67;
             this.dataGridViewTextBoxColumn27.HeaderText = "å·¥äº‹äºˆå®šè€…";
             this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
             this.dataGridViewTextBoxColumn27.ReadOnly = true;
@@ -2329,8 +1961,8 @@
             // 
             // dataGridViewTextBoxColumn28
             // 
-            dataGridViewCellStyle263.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle263;
+            dataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle68;
             this.dataGridViewTextBoxColumn28.HeaderText = "ç�€å·¥äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
             this.dataGridViewTextBoxColumn28.ReadOnly = true;
@@ -2339,8 +1971,8 @@
             // 
             // dataGridViewTextBoxColumn29
             // 
-            dataGridViewCellStyle264.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn29.DefaultCellStyle = dataGridViewCellStyle264;
+            dataGridViewCellStyle69.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn29.DefaultCellStyle = dataGridViewCellStyle69;
             this.dataGridViewTextBoxColumn29.HeaderText = "å®Œäº†äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29";
             this.dataGridViewTextBoxColumn29.ReadOnly = true;
@@ -2349,8 +1981,8 @@
             // 
             // dataGridViewTextBoxColumn30
             // 
-            dataGridViewCellStyle265.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn30.DefaultCellStyle = dataGridViewCellStyle265;
+            dataGridViewCellStyle70.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn30.DefaultCellStyle = dataGridViewCellStyle70;
             this.dataGridViewTextBoxColumn30.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.dataGridViewTextBoxColumn30.Name = "dataGridViewTextBoxColumn30";
             this.dataGridViewTextBoxColumn30.ReadOnly = true;
@@ -2360,8 +1992,8 @@
             // 
             // dataGridViewTextBoxColumn31
             // 
-            dataGridViewCellStyle266.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn31.DefaultCellStyle = dataGridViewCellStyle266;
+            dataGridViewCellStyle71.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn31.DefaultCellStyle = dataGridViewCellStyle71;
             this.dataGridViewTextBoxColumn31.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.dataGridViewTextBoxColumn31.Name = "dataGridViewTextBoxColumn31";
             this.dataGridViewTextBoxColumn31.ReadOnly = true;
@@ -2383,6 +2015,7 @@
             // 
             // comboBox3
             // 
+            this.comboBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox3.BackColor = System.Drawing.Color.White;
             this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
@@ -2414,21 +2047,21 @@
             this.dgvBudgetUp.AllowUserToDeleteRows = false;
             this.dgvBudgetUp.AllowUserToResizeColumns = false;
             this.dgvBudgetUp.AllowUserToResizeRows = false;
-            dataGridViewCellStyle267.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvBudgetUp.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle267;
+            dataGridViewCellStyle72.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvBudgetUp.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle72;
             this.dgvBudgetUp.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvBudgetUp.BackgroundColor = System.Drawing.Color.White;
             this.dgvBudgetUp.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle268.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle268.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle268.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle268.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle268.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle268.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle268.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvBudgetUp.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle268;
+            dataGridViewCellStyle73.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle73.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle73.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle73.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle73.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle73.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle73.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvBudgetUp.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle73;
             this.dgvBudgetUp.ColumnHeadersHeight = 20;
             this.dgvBudgetUp.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvBudgetUp.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -2460,11 +2093,12 @@
             this.dgvBudgetUp.TabIndex = 10;
             this.dgvBudgetUp.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvBudgetUp.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvBudgetUp.Sorted += new System.EventHandler(this.dgvBudgetUp_Sorted);
             // 
             // dataGridViewTextBoxColumn32
             // 
-            dataGridViewCellStyle269.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn32.DefaultCellStyle = dataGridViewCellStyle269;
+            dataGridViewCellStyle74.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn32.DefaultCellStyle = dataGridViewCellStyle74;
             this.dataGridViewTextBoxColumn32.Frozen = true;
             this.dataGridViewTextBoxColumn32.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn32.Name = "dataGridViewTextBoxColumn32";
@@ -2476,9 +2110,9 @@
             // 
             // dataGridViewTextBoxColumn33
             // 
-            dataGridViewCellStyle270.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle270.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn33.DefaultCellStyle = dataGridViewCellStyle270;
+            dataGridViewCellStyle75.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle75.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn33.DefaultCellStyle = dataGridViewCellStyle75;
             this.dataGridViewTextBoxColumn33.Frozen = true;
             this.dataGridViewTextBoxColumn33.HeaderText = "â„–";
             this.dataGridViewTextBoxColumn33.Name = "dataGridViewTextBoxColumn33";
@@ -2489,8 +2123,8 @@
             // 
             // dataGridViewTextBoxColumn34
             // 
-            dataGridViewCellStyle271.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn34.DefaultCellStyle = dataGridViewCellStyle271;
+            dataGridViewCellStyle76.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn34.DefaultCellStyle = dataGridViewCellStyle76;
             this.dataGridViewTextBoxColumn34.Frozen = true;
             this.dataGridViewTextBoxColumn34.HeaderText = "å–¶æ¥­æœŸ";
             this.dataGridViewTextBoxColumn34.Name = "dataGridViewTextBoxColumn34";
@@ -2501,8 +2135,8 @@
             // 
             // dataGridViewTextBoxColumn35
             // 
-            dataGridViewCellStyle272.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn35.DefaultCellStyle = dataGridViewCellStyle272;
+            dataGridViewCellStyle77.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn35.DefaultCellStyle = dataGridViewCellStyle77;
             this.dataGridViewTextBoxColumn35.Frozen = true;
             this.dataGridViewTextBoxColumn35.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.dataGridViewTextBoxColumn35.Name = "dataGridViewTextBoxColumn35";
@@ -2513,10 +2147,10 @@
             // 
             // Column55
             // 
-            dataGridViewCellStyle273.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle273.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle273.ForeColor = System.Drawing.Color.Black;
-            this.Column55.DefaultCellStyle = dataGridViewCellStyle273;
+            dataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle78.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle78.ForeColor = System.Drawing.Color.Black;
+            this.Column55.DefaultCellStyle = dataGridViewCellStyle78;
             this.Column55.HeaderText = "æœŸå¾…ï¼…";
             this.Column55.Name = "Column55";
             this.Column55.ReadOnly = true;
@@ -2526,8 +2160,8 @@
             // 
             // Column20
             // 
-            dataGridViewCellStyle274.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column20.DefaultCellStyle = dataGridViewCellStyle274;
+            dataGridViewCellStyle79.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column20.DefaultCellStyle = dataGridViewCellStyle79;
             this.Column20.HeaderText = "é€²æ�—çŠ¶æ…‹";
             this.Column20.Name = "Column20";
             this.Column20.ReadOnly = true;
@@ -2536,9 +2170,9 @@
             // 
             // Column31
             // 
-            dataGridViewCellStyle275.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle275.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column31.DefaultCellStyle = dataGridViewCellStyle275;
+            dataGridViewCellStyle80.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle80.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column31.DefaultCellStyle = dataGridViewCellStyle80;
             this.Column31.HeaderText = "æ‰¿èª�çŠ¶æ³�";
             this.Column31.Name = "Column31";
             this.Column31.ReadOnly = true;
@@ -2547,8 +2181,8 @@
             // 
             // dataGridViewTextBoxColumn37
             // 
-            dataGridViewCellStyle276.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn37.DefaultCellStyle = dataGridViewCellStyle276;
+            dataGridViewCellStyle81.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn37.DefaultCellStyle = dataGridViewCellStyle81;
             this.dataGridViewTextBoxColumn37.HeaderText = "è¦‹ç©�æ��å‡ºæœŸé™�";
             this.dataGridViewTextBoxColumn37.Name = "dataGridViewTextBoxColumn37";
             this.dataGridViewTextBoxColumn37.ReadOnly = true;
@@ -2557,8 +2191,8 @@
             // 
             // dataGridViewTextBoxColumn38
             // 
-            dataGridViewCellStyle277.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn38.DefaultCellStyle = dataGridViewCellStyle277;
+            dataGridViewCellStyle82.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn38.DefaultCellStyle = dataGridViewCellStyle82;
             this.dataGridViewTextBoxColumn38.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn38.Name = "dataGridViewTextBoxColumn38";
             this.dataGridViewTextBoxColumn38.ReadOnly = true;
@@ -2567,8 +2201,8 @@
             // 
             // dataGridViewTextBoxColumn39
             // 
-            dataGridViewCellStyle278.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn39.DefaultCellStyle = dataGridViewCellStyle278;
+            dataGridViewCellStyle83.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn39.DefaultCellStyle = dataGridViewCellStyle83;
             this.dataGridViewTextBoxColumn39.HeaderText = "å·¥äº‹äºˆå®šè€…";
             this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39";
             this.dataGridViewTextBoxColumn39.ReadOnly = true;
@@ -2577,8 +2211,8 @@
             // 
             // dataGridViewTextBoxColumn40
             // 
-            dataGridViewCellStyle279.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn40.DefaultCellStyle = dataGridViewCellStyle279;
+            dataGridViewCellStyle84.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn40.DefaultCellStyle = dataGridViewCellStyle84;
             this.dataGridViewTextBoxColumn40.HeaderText = "ç�€å·¥äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40";
             this.dataGridViewTextBoxColumn40.ReadOnly = true;
@@ -2587,8 +2221,8 @@
             // 
             // dataGridViewTextBoxColumn41
             // 
-            dataGridViewCellStyle280.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn41.DefaultCellStyle = dataGridViewCellStyle280;
+            dataGridViewCellStyle85.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn41.DefaultCellStyle = dataGridViewCellStyle85;
             this.dataGridViewTextBoxColumn41.HeaderText = "å®Œäº†äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41";
             this.dataGridViewTextBoxColumn41.ReadOnly = true;
@@ -2597,8 +2231,8 @@
             // 
             // dataGridViewTextBoxColumn42
             // 
-            dataGridViewCellStyle281.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn42.DefaultCellStyle = dataGridViewCellStyle281;
+            dataGridViewCellStyle86.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn42.DefaultCellStyle = dataGridViewCellStyle86;
             this.dataGridViewTextBoxColumn42.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42";
             this.dataGridViewTextBoxColumn42.ReadOnly = true;
@@ -2608,8 +2242,8 @@
             // 
             // dataGridViewTextBoxColumn43
             // 
-            dataGridViewCellStyle282.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn43.DefaultCellStyle = dataGridViewCellStyle282;
+            dataGridViewCellStyle87.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn43.DefaultCellStyle = dataGridViewCellStyle87;
             this.dataGridViewTextBoxColumn43.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43";
             this.dataGridViewTextBoxColumn43.ReadOnly = true;
@@ -2662,9 +2296,9 @@
             this.dgvOrderTotal.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
             this.dgvOrderTotal.BackgroundColor = System.Drawing.Color.White;
             this.dgvOrderTotal.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle283.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle283.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvOrderTotal.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle283;
+            dataGridViewCellStyle88.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle88.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvOrderTotal.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle88;
             this.dgvOrderTotal.ColumnHeadersHeight = 20;
             this.dgvOrderTotal.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvOrderTotal.ColumnHeadersVisible = false;
@@ -2682,10 +2316,10 @@
             this.dgvOrderTotal.Location = new System.Drawing.Point(87, 464);
             this.dgvOrderTotal.MultiSelect = false;
             this.dgvOrderTotal.Name = "dgvOrderTotal";
-            dataGridViewCellStyle292.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle292.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle292.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvOrderTotal.RowHeadersDefaultCellStyle = dataGridViewCellStyle292;
+            dataGridViewCellStyle97.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle97.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle97.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvOrderTotal.RowHeadersDefaultCellStyle = dataGridViewCellStyle97;
             this.dgvOrderTotal.RowHeadersVisible = false;
             this.dgvOrderTotal.RowHeadersWidth = 20;
             this.dgvOrderTotal.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
@@ -2695,8 +2329,8 @@
             // 
             // Column33
             // 
-            dataGridViewCellStyle284.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column33.DefaultCellStyle = dataGridViewCellStyle284;
+            dataGridViewCellStyle89.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column33.DefaultCellStyle = dataGridViewCellStyle89;
             this.Column33.Frozen = true;
             this.Column33.HeaderText = "éƒ¨ç½²å��";
             this.Column33.Name = "Column33";
@@ -2705,8 +2339,8 @@
             // 
             // Column34
             // 
-            dataGridViewCellStyle285.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column34.DefaultCellStyle = dataGridViewCellStyle285;
+            dataGridViewCellStyle90.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column34.DefaultCellStyle = dataGridViewCellStyle90;
             this.Column34.Frozen = true;
             this.Column34.HeaderText = "æ–½å·¥ä¸­é‡‘é¡�";
             this.Column34.Name = "Column34";
@@ -2715,8 +2349,8 @@
             // 
             // Column35
             // 
-            dataGridViewCellStyle286.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column35.DefaultCellStyle = dataGridViewCellStyle286;
+            dataGridViewCellStyle91.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column35.DefaultCellStyle = dataGridViewCellStyle91;
             this.Column35.Frozen = true;
             this.Column35.HeaderText = "éƒ¨ç½²å��";
             this.Column35.Name = "Column35";
@@ -2725,8 +2359,8 @@
             // 
             // Column36
             // 
-            dataGridViewCellStyle287.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column36.DefaultCellStyle = dataGridViewCellStyle287;
+            dataGridViewCellStyle92.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column36.DefaultCellStyle = dataGridViewCellStyle92;
             this.Column36.Frozen = true;
             this.Column36.HeaderText = "æ–½å·¥ä¸­é‡‘é¡�";
             this.Column36.Name = "Column36";
@@ -2735,8 +2369,8 @@
             // 
             // Column37
             // 
-            dataGridViewCellStyle288.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column37.DefaultCellStyle = dataGridViewCellStyle288;
+            dataGridViewCellStyle93.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column37.DefaultCellStyle = dataGridViewCellStyle93;
             this.Column37.Frozen = true;
             this.Column37.HeaderText = "éƒ¨ç½²å��";
             this.Column37.Name = "Column37";
@@ -2745,8 +2379,8 @@
             // 
             // Column38
             // 
-            dataGridViewCellStyle289.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column38.DefaultCellStyle = dataGridViewCellStyle289;
+            dataGridViewCellStyle94.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column38.DefaultCellStyle = dataGridViewCellStyle94;
             this.Column38.Frozen = true;
             this.Column38.HeaderText = "æ–½å·¥ä¸­é‡‘é¡�";
             this.Column38.Name = "Column38";
@@ -2755,8 +2389,8 @@
             // 
             // Column39
             // 
-            dataGridViewCellStyle290.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column39.DefaultCellStyle = dataGridViewCellStyle290;
+            dataGridViewCellStyle95.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column39.DefaultCellStyle = dataGridViewCellStyle95;
             this.Column39.Frozen = true;
             this.Column39.HeaderText = "éƒ¨ç½²å��";
             this.Column39.Name = "Column39";
@@ -2765,8 +2399,8 @@
             // 
             // Column40
             // 
-            dataGridViewCellStyle291.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column40.DefaultCellStyle = dataGridViewCellStyle291;
+            dataGridViewCellStyle96.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column40.DefaultCellStyle = dataGridViewCellStyle96;
             this.Column40.Frozen = true;
             this.Column40.HeaderText = "æ–½å·¥ä¸­é‡‘é¡�";
             this.Column40.Name = "Column40";
@@ -2893,21 +2527,21 @@
             this.dgvConstructionProjects.AllowUserToDeleteRows = false;
             this.dgvConstructionProjects.AllowUserToResizeColumns = false;
             this.dgvConstructionProjects.AllowUserToResizeRows = false;
-            dataGridViewCellStyle293.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvConstructionProjects.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle293;
+            dataGridViewCellStyle98.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvConstructionProjects.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle98;
             this.dgvConstructionProjects.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvConstructionProjects.BackgroundColor = System.Drawing.Color.White;
             this.dgvConstructionProjects.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle294.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle294.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle294.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle294.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle294.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle294.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle294.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvConstructionProjects.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle294;
+            dataGridViewCellStyle99.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle99.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle99.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle99.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle99.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle99.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle99.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvConstructionProjects.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle99;
             this.dgvConstructionProjects.ColumnHeadersHeight = 20;
             this.dgvConstructionProjects.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvConstructionProjects.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -2941,11 +2575,12 @@
             this.dgvConstructionProjects.TabIndex = 29;
             this.dgvConstructionProjects.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvConstructionProjects.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvConstructionProjects.Sorted += new System.EventHandler(this.dgvConstructionProjects_Sorted);
             // 
             // dataGridViewTextBoxColumn1
             // 
-            dataGridViewCellStyle295.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle295;
+            dataGridViewCellStyle100.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle100;
             this.dataGridViewTextBoxColumn1.Frozen = true;
             this.dataGridViewTextBoxColumn1.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
@@ -2957,9 +2592,9 @@
             // 
             // Column16
             // 
-            dataGridViewCellStyle296.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle296.ForeColor = System.Drawing.Color.Black;
-            this.Column16.DefaultCellStyle = dataGridViewCellStyle296;
+            dataGridViewCellStyle101.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle101.ForeColor = System.Drawing.Color.Black;
+            this.Column16.DefaultCellStyle = dataGridViewCellStyle101;
             this.Column16.Frozen = true;
             this.Column16.HeaderText = "â„–";
             this.Column16.Name = "Column16";
@@ -2970,8 +2605,8 @@
             // 
             // dataGridViewTextBoxColumn2
             // 
-            dataGridViewCellStyle297.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle297;
+            dataGridViewCellStyle102.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle102;
             this.dataGridViewTextBoxColumn2.Frozen = true;
             this.dataGridViewTextBoxColumn2.HeaderText = "å–¶æ¥­æœŸ";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
@@ -2982,8 +2617,8 @@
             // 
             // dataGridViewTextBoxColumn3
             // 
-            dataGridViewCellStyle298.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle298;
+            dataGridViewCellStyle103.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle103;
             this.dataGridViewTextBoxColumn3.Frozen = true;
             this.dataGridViewTextBoxColumn3.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
@@ -3002,8 +2637,8 @@
             // 
             // dataGridViewTextBoxColumn10
             // 
-            dataGridViewCellStyle299.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle299;
+            dataGridViewCellStyle104.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle104;
             this.dataGridViewTextBoxColumn10.HeaderText = "é€²æ�—çŠ¶æ…‹";
             this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
             this.dataGridViewTextBoxColumn10.ReadOnly = true;
@@ -3012,9 +2647,9 @@
             // 
             // Column25
             // 
-            dataGridViewCellStyle300.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle300.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column25.DefaultCellStyle = dataGridViewCellStyle300;
+            dataGridViewCellStyle105.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle105.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column25.DefaultCellStyle = dataGridViewCellStyle105;
             this.Column25.HeaderText = "æ‰¿èª�çŠ¶æ³�";
             this.Column25.Name = "Column25";
             this.Column25.ReadOnly = true;
@@ -3023,8 +2658,8 @@
             // 
             // dataGridViewTextBoxColumn4
             // 
-            dataGridViewCellStyle301.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle301;
+            dataGridViewCellStyle106.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle106;
             this.dataGridViewTextBoxColumn4.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.ReadOnly = true;
@@ -3033,8 +2668,8 @@
             // 
             // dataGridViewTextBoxColumn5
             // 
-            dataGridViewCellStyle302.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle302;
+            dataGridViewCellStyle107.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle107;
             this.dataGridViewTextBoxColumn5.HeaderText = "å·¥äº‹æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
             this.dataGridViewTextBoxColumn5.ReadOnly = true;
@@ -3043,8 +2678,8 @@
             // 
             // dataGridViewTextBoxColumn6
             // 
-            dataGridViewCellStyle303.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle303;
+            dataGridViewCellStyle108.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle108;
             this.dataGridViewTextBoxColumn6.HeaderText = "é–‹å§‹äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
             this.dataGridViewTextBoxColumn6.ReadOnly = true;
@@ -3053,8 +2688,8 @@
             // 
             // dataGridViewTextBoxColumn7
             // 
-            dataGridViewCellStyle304.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle304;
+            dataGridViewCellStyle109.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle109;
             this.dataGridViewTextBoxColumn7.HeaderText = "å®Œäº†äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
             this.dataGridViewTextBoxColumn7.ReadOnly = true;
@@ -3063,8 +2698,8 @@
             // 
             // Column12
             // 
-            dataGridViewCellStyle305.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle305;
+            dataGridViewCellStyle110.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle110;
             this.Column12.HeaderText = "å·¥äº‹æŒ‡å°Žå“¡";
             this.Column12.Name = "Column12";
             this.Column12.ReadOnly = true;
@@ -3073,8 +2708,8 @@
             // 
             // Column26
             // 
-            dataGridViewCellStyle306.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column26.DefaultCellStyle = dataGridViewCellStyle306;
+            dataGridViewCellStyle111.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column26.DefaultCellStyle = dataGridViewCellStyle111;
             this.Column26.HeaderText = "å·¥äº‹å‰¯æ‹…å½“è€…";
             this.Column26.Name = "Column26";
             this.Column26.ReadOnly = true;
@@ -3083,8 +2718,8 @@
             // 
             // dataGridViewTextBoxColumn8
             // 
-            dataGridViewCellStyle307.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle307;
+            dataGridViewCellStyle112.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle112;
             this.dataGridViewTextBoxColumn8.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
             this.dataGridViewTextBoxColumn8.ReadOnly = true;
@@ -3094,8 +2729,8 @@
             // 
             // dataGridViewTextBoxColumn9
             // 
-            dataGridViewCellStyle308.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle308;
+            dataGridViewCellStyle113.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle113;
             this.dataGridViewTextBoxColumn9.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
             this.dataGridViewTextBoxColumn9.ReadOnly = true;
@@ -3105,8 +2740,8 @@
             // 
             // Column11
             // 
-            dataGridViewCellStyle309.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column11.DefaultCellStyle = dataGridViewCellStyle309;
+            dataGridViewCellStyle114.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column11.DefaultCellStyle = dataGridViewCellStyle114;
             this.Column11.HeaderText = "å�—æ³¨é‡‘é¡�";
             this.Column11.Name = "Column11";
             this.Column11.ReadOnly = true;
@@ -3128,6 +2763,7 @@
             // 
             // comboBox5
             // 
+            this.comboBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox5.BackColor = System.Drawing.Color.White;
             this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
@@ -3159,21 +2795,21 @@
             this.dgvFluctuationProjects.AllowUserToDeleteRows = false;
             this.dgvFluctuationProjects.AllowUserToResizeColumns = false;
             this.dgvFluctuationProjects.AllowUserToResizeRows = false;
-            dataGridViewCellStyle310.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvFluctuationProjects.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle310;
+            dataGridViewCellStyle115.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvFluctuationProjects.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle115;
             this.dgvFluctuationProjects.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvFluctuationProjects.BackgroundColor = System.Drawing.Color.White;
             this.dgvFluctuationProjects.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle311.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle311.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle311.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle311.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle311.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle311.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle311.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvFluctuationProjects.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle311;
+            dataGridViewCellStyle116.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle116.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle116.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle116.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle116.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle116.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle116.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvFluctuationProjects.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle116;
             this.dgvFluctuationProjects.ColumnHeadersHeight = 20;
             this.dgvFluctuationProjects.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvFluctuationProjects.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -3207,11 +2843,12 @@
             this.dgvFluctuationProjects.TabIndex = 39;
             this.dgvFluctuationProjects.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvFluctuationProjects.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvFluctuationProjects.Sorted += new System.EventHandler(this.dgvFluctuationProjects_Sorted);
             // 
             // dataGridViewTextBoxColumn16
             // 
-            dataGridViewCellStyle312.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn16.DefaultCellStyle = dataGridViewCellStyle312;
+            dataGridViewCellStyle117.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn16.DefaultCellStyle = dataGridViewCellStyle117;
             this.dataGridViewTextBoxColumn16.Frozen = true;
             this.dataGridViewTextBoxColumn16.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
@@ -3222,9 +2859,9 @@
             // 
             // dataGridViewTextBoxColumn17
             // 
-            dataGridViewCellStyle313.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle313.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle313;
+            dataGridViewCellStyle118.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle118.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle118;
             this.dataGridViewTextBoxColumn17.Frozen = true;
             this.dataGridViewTextBoxColumn17.HeaderText = "â„–";
             this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
@@ -3235,8 +2872,8 @@
             // 
             // dataGridViewTextBoxColumn24
             // 
-            dataGridViewCellStyle314.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle314;
+            dataGridViewCellStyle119.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle119;
             this.dataGridViewTextBoxColumn24.Frozen = true;
             this.dataGridViewTextBoxColumn24.HeaderText = "å–¶æ¥­æœŸ";
             this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
@@ -3247,8 +2884,8 @@
             // 
             // dataGridViewTextBoxColumn36
             // 
-            dataGridViewCellStyle315.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn36.DefaultCellStyle = dataGridViewCellStyle315;
+            dataGridViewCellStyle120.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn36.DefaultCellStyle = dataGridViewCellStyle120;
             this.dataGridViewTextBoxColumn36.Frozen = true;
             this.dataGridViewTextBoxColumn36.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.dataGridViewTextBoxColumn36.Name = "dataGridViewTextBoxColumn36";
@@ -3268,8 +2905,8 @@
             // 
             // dataGridViewTextBoxColumn44
             // 
-            dataGridViewCellStyle316.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn44.DefaultCellStyle = dataGridViewCellStyle316;
+            dataGridViewCellStyle121.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn44.DefaultCellStyle = dataGridViewCellStyle121;
             this.dataGridViewTextBoxColumn44.HeaderText = "é€²æ�—çŠ¶æ…‹";
             this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44";
             this.dataGridViewTextBoxColumn44.ReadOnly = true;
@@ -3278,9 +2915,9 @@
             // 
             // Column27
             // 
-            dataGridViewCellStyle317.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle317.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column27.DefaultCellStyle = dataGridViewCellStyle317;
+            dataGridViewCellStyle122.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle122.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column27.DefaultCellStyle = dataGridViewCellStyle122;
             this.Column27.HeaderText = "æ‰¿èª�çŠ¶æ³�";
             this.Column27.Name = "Column27";
             this.Column27.ReadOnly = true;
@@ -3289,8 +2926,8 @@
             // 
             // dataGridViewTextBoxColumn45
             // 
-            dataGridViewCellStyle318.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn45.DefaultCellStyle = dataGridViewCellStyle318;
+            dataGridViewCellStyle123.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn45.DefaultCellStyle = dataGridViewCellStyle123;
             this.dataGridViewTextBoxColumn45.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn45.Name = "dataGridViewTextBoxColumn45";
             this.dataGridViewTextBoxColumn45.ReadOnly = true;
@@ -3299,8 +2936,8 @@
             // 
             // dataGridViewTextBoxColumn46
             // 
-            dataGridViewCellStyle319.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn46.DefaultCellStyle = dataGridViewCellStyle319;
+            dataGridViewCellStyle124.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn46.DefaultCellStyle = dataGridViewCellStyle124;
             this.dataGridViewTextBoxColumn46.HeaderText = "å·¥äº‹æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn46.Name = "dataGridViewTextBoxColumn46";
             this.dataGridViewTextBoxColumn46.ReadOnly = true;
@@ -3309,8 +2946,8 @@
             // 
             // dataGridViewTextBoxColumn48
             // 
-            dataGridViewCellStyle320.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn48.DefaultCellStyle = dataGridViewCellStyle320;
+            dataGridViewCellStyle125.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn48.DefaultCellStyle = dataGridViewCellStyle125;
             this.dataGridViewTextBoxColumn48.HeaderText = "é–‹å§‹äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48";
             this.dataGridViewTextBoxColumn48.ReadOnly = true;
@@ -3319,8 +2956,8 @@
             // 
             // dataGridViewTextBoxColumn49
             // 
-            dataGridViewCellStyle321.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn49.DefaultCellStyle = dataGridViewCellStyle321;
+            dataGridViewCellStyle126.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn49.DefaultCellStyle = dataGridViewCellStyle126;
             this.dataGridViewTextBoxColumn49.HeaderText = "å®Œäº†äºˆå®šæ—¥";
             this.dataGridViewTextBoxColumn49.Name = "dataGridViewTextBoxColumn49";
             this.dataGridViewTextBoxColumn49.ReadOnly = true;
@@ -3329,8 +2966,8 @@
             // 
             // dataGridViewTextBoxColumn47
             // 
-            dataGridViewCellStyle322.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn47.DefaultCellStyle = dataGridViewCellStyle322;
+            dataGridViewCellStyle127.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn47.DefaultCellStyle = dataGridViewCellStyle127;
             this.dataGridViewTextBoxColumn47.HeaderText = "å·¥äº‹æŒ‡å°Žå“¡";
             this.dataGridViewTextBoxColumn47.Name = "dataGridViewTextBoxColumn47";
             this.dataGridViewTextBoxColumn47.ReadOnly = true;
@@ -3347,8 +2984,8 @@
             // 
             // dataGridViewTextBoxColumn50
             // 
-            dataGridViewCellStyle323.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn50.DefaultCellStyle = dataGridViewCellStyle323;
+            dataGridViewCellStyle128.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn50.DefaultCellStyle = dataGridViewCellStyle128;
             this.dataGridViewTextBoxColumn50.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.dataGridViewTextBoxColumn50.Name = "dataGridViewTextBoxColumn50";
             this.dataGridViewTextBoxColumn50.ReadOnly = true;
@@ -3358,8 +2995,8 @@
             // 
             // dataGridViewTextBoxColumn51
             // 
-            dataGridViewCellStyle324.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn51.DefaultCellStyle = dataGridViewCellStyle324;
+            dataGridViewCellStyle129.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn51.DefaultCellStyle = dataGridViewCellStyle129;
             this.dataGridViewTextBoxColumn51.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.dataGridViewTextBoxColumn51.Name = "dataGridViewTextBoxColumn51";
             this.dataGridViewTextBoxColumn51.ReadOnly = true;
@@ -3369,8 +3006,8 @@
             // 
             // dataGridViewTextBoxColumn52
             // 
-            dataGridViewCellStyle325.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn52.DefaultCellStyle = dataGridViewCellStyle325;
+            dataGridViewCellStyle130.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn52.DefaultCellStyle = dataGridViewCellStyle130;
             this.dataGridViewTextBoxColumn52.HeaderText = "å�—æ³¨é‡‘é¡�";
             this.dataGridViewTextBoxColumn52.Name = "dataGridViewTextBoxColumn52";
             this.dataGridViewTextBoxColumn52.ReadOnly = true;
@@ -3396,6 +3033,7 @@
             // 
             // comboBox6
             // 
+            this.comboBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox6.BackColor = System.Drawing.Color.White;
             this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
@@ -3476,21 +3114,21 @@
             this.dgvNonOrders.AllowUserToDeleteRows = false;
             this.dgvNonOrders.AllowUserToResizeColumns = false;
             this.dgvNonOrders.AllowUserToResizeRows = false;
-            dataGridViewCellStyle326.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvNonOrders.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle326;
+            dataGridViewCellStyle131.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvNonOrders.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle131;
             this.dgvNonOrders.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvNonOrders.BackgroundColor = System.Drawing.Color.White;
             this.dgvNonOrders.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle327.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle327.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle327.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle327.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle327.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle327.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle327.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvNonOrders.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle327;
+            dataGridViewCellStyle132.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle132.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle132.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle132.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle132.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle132.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle132.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvNonOrders.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle132;
             this.dgvNonOrders.ColumnHeadersHeight = 20;
             this.dgvNonOrders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvNonOrders.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -3515,11 +3153,12 @@
             this.dgvNonOrders.TabIndex = 41;
             this.dgvNonOrders.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvNonOrders.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvNonOrders.Sorted += new System.EventHandler(this.dgvNonOrders_Sorted);
             // 
             // dataGridViewTextBoxColumn11
             // 
-            dataGridViewCellStyle328.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle328;
+            dataGridViewCellStyle133.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle133;
             this.dataGridViewTextBoxColumn11.Frozen = true;
             this.dataGridViewTextBoxColumn11.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
@@ -3531,9 +3170,9 @@
             // 
             // Column17
             // 
-            dataGridViewCellStyle329.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle329.ForeColor = System.Drawing.Color.Black;
-            this.Column17.DefaultCellStyle = dataGridViewCellStyle329;
+            dataGridViewCellStyle134.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle134.ForeColor = System.Drawing.Color.Black;
+            this.Column17.DefaultCellStyle = dataGridViewCellStyle134;
             this.Column17.Frozen = true;
             this.Column17.HeaderText = "â„–";
             this.Column17.Name = "Column17";
@@ -3544,8 +3183,8 @@
             // 
             // dataGridViewTextBoxColumn12
             // 
-            dataGridViewCellStyle330.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle330;
+            dataGridViewCellStyle135.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle135;
             this.dataGridViewTextBoxColumn12.Frozen = true;
             this.dataGridViewTextBoxColumn12.HeaderText = "å–¶æ¥­æœŸ";
             this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
@@ -3556,8 +3195,8 @@
             // 
             // dataGridViewTextBoxColumn13
             // 
-            dataGridViewCellStyle331.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle331;
+            dataGridViewCellStyle136.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle136;
             this.dataGridViewTextBoxColumn13.Frozen = true;
             this.dataGridViewTextBoxColumn13.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
@@ -3568,8 +3207,8 @@
             // 
             // dataGridViewTextBoxColumn14
             // 
-            dataGridViewCellStyle332.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle332;
+            dataGridViewCellStyle137.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle137;
             this.dataGridViewTextBoxColumn14.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
             this.dataGridViewTextBoxColumn14.ReadOnly = true;
@@ -3578,8 +3217,8 @@
             // 
             // dataGridViewTextBoxColumn19
             // 
-            dataGridViewCellStyle333.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle333;
+            dataGridViewCellStyle138.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle138;
             this.dataGridViewTextBoxColumn19.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
             this.dataGridViewTextBoxColumn19.ReadOnly = true;
@@ -3589,8 +3228,8 @@
             // 
             // dataGridViewTextBoxColumn18
             // 
-            dataGridViewCellStyle334.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle334;
+            dataGridViewCellStyle139.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle139;
             this.dataGridViewTextBoxColumn18.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
             this.dataGridViewTextBoxColumn18.ReadOnly = true;
@@ -3624,6 +3263,7 @@
             // 
             // comboBox7
             // 
+            this.comboBox7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBox7.BackColor = System.Drawing.Color.White;
             this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
@@ -3804,21 +3444,21 @@
             this.dgvCompletionOfConstruction.AllowUserToDeleteRows = false;
             this.dgvCompletionOfConstruction.AllowUserToResizeColumns = false;
             this.dgvCompletionOfConstruction.AllowUserToResizeRows = false;
-            dataGridViewCellStyle335.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvCompletionOfConstruction.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle335;
+            dataGridViewCellStyle140.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvCompletionOfConstruction.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle140;
             this.dgvCompletionOfConstruction.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvCompletionOfConstruction.BackgroundColor = System.Drawing.Color.White;
             this.dgvCompletionOfConstruction.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle336.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle336.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle336.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle336.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle336.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle336.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle336.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvCompletionOfConstruction.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle336;
+            dataGridViewCellStyle141.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle141.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle141.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle141.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle141.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle141.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle141.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvCompletionOfConstruction.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle141;
             this.dgvCompletionOfConstruction.ColumnHeadersHeight = 20;
             this.dgvCompletionOfConstruction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvCompletionOfConstruction.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -3851,11 +3491,12 @@
             this.dgvCompletionOfConstruction.TabIndex = 45;
             this.dgvCompletionOfConstruction.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSalesInProjects_CellDoubleClick);
             this.dgvCompletionOfConstruction.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.GridHeader_ColumnHeaderMouseClick);
+            this.dgvCompletionOfConstruction.Sorted += new System.EventHandler(this.dgvCompletionOfConstruction_Sorted);
             // 
             // dataGridViewTextBoxColumn15
             // 
-            dataGridViewCellStyle337.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle337;
+            dataGridViewCellStyle142.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle142;
             this.dataGridViewTextBoxColumn15.Frozen = true;
             this.dataGridViewTextBoxColumn15.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
@@ -3867,9 +3508,9 @@
             // 
             // Column18
             // 
-            dataGridViewCellStyle338.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle338.ForeColor = System.Drawing.Color.Black;
-            this.Column18.DefaultCellStyle = dataGridViewCellStyle338;
+            dataGridViewCellStyle143.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle143.ForeColor = System.Drawing.Color.Black;
+            this.Column18.DefaultCellStyle = dataGridViewCellStyle143;
             this.Column18.Frozen = true;
             this.Column18.HeaderText = "â„–";
             this.Column18.Name = "Column18";
@@ -3880,8 +3521,8 @@
             // 
             // dataGridViewTextBoxActionColDays13
             // 
-            dataGridViewCellStyle339.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxActionColDays13.DefaultCellStyle = dataGridViewCellStyle339;
+            dataGridViewCellStyle144.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxActionColDays13.DefaultCellStyle = dataGridViewCellStyle144;
             this.dataGridViewTextBoxActionColDays13.Frozen = true;
             this.dataGridViewTextBoxActionColDays13.HeaderText = "å–¶æ¥­æœŸ";
             this.dataGridViewTextBoxActionColDays13.Name = "dataGridViewTextBoxActionColDays13";
@@ -3892,8 +3533,8 @@
             // 
             // dataGridViewTextBoxActionColDays14
             // 
-            dataGridViewCellStyle340.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxActionColDays14.DefaultCellStyle = dataGridViewCellStyle340;
+            dataGridViewCellStyle145.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxActionColDays14.DefaultCellStyle = dataGridViewCellStyle145;
             this.dataGridViewTextBoxActionColDays14.Frozen = true;
             this.dataGridViewTextBoxActionColDays14.HeaderText = "ç�¾ã€€ã€€å ´ã€€ã€€å��ã€€ã€€ãƒ»ã€€ã€€å·¥ã€€ã€€äº‹ã€€ã€€å��";
             this.dataGridViewTextBoxActionColDays14.Name = "dataGridViewTextBoxActionColDays14";
@@ -3914,8 +3555,8 @@
             // 
             // Column23
             // 
-            dataGridViewCellStyle341.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column23.DefaultCellStyle = dataGridViewCellStyle341;
+            dataGridViewCellStyle146.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column23.DefaultCellStyle = dataGridViewCellStyle146;
             this.Column23.HeaderText = "çŠ¶ã€€ã€€ã€€æ…‹";
             this.Column23.Name = "Column23";
             this.Column23.ReadOnly = true;
@@ -3924,8 +3565,8 @@
             // 
             // dataGridViewTextBoxActionColDays15
             // 
-            dataGridViewCellStyle342.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxActionColDays15.DefaultCellStyle = dataGridViewCellStyle342;
+            dataGridViewCellStyle147.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxActionColDays15.DefaultCellStyle = dataGridViewCellStyle147;
             this.dataGridViewTextBoxActionColDays15.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
             this.dataGridViewTextBoxActionColDays15.Name = "dataGridViewTextBoxActionColDays15";
             this.dataGridViewTextBoxActionColDays15.ReadOnly = true;
@@ -3934,8 +3575,8 @@
             // 
             // Column13
             // 
-            dataGridViewCellStyle343.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column13.DefaultCellStyle = dataGridViewCellStyle343;
+            dataGridViewCellStyle148.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column13.DefaultCellStyle = dataGridViewCellStyle148;
             this.Column13.HeaderText = "å·¥äº‹æ‹…å½“è€…";
             this.Column13.Name = "Column13";
             this.Column13.ReadOnly = true;
@@ -3944,8 +3585,8 @@
             // 
             // Column14
             // 
-            dataGridViewCellStyle344.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column14.DefaultCellStyle = dataGridViewCellStyle344;
+            dataGridViewCellStyle149.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column14.DefaultCellStyle = dataGridViewCellStyle149;
             this.Column14.HeaderText = "å�—æ³¨æ—¥";
             this.Column14.Name = "Column14";
             this.Column14.ReadOnly = true;
@@ -3954,8 +3595,8 @@
             // 
             // Column51
             // 
-            dataGridViewCellStyle345.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column51.DefaultCellStyle = dataGridViewCellStyle345;
+            dataGridViewCellStyle150.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column51.DefaultCellStyle = dataGridViewCellStyle150;
             this.Column51.HeaderText = "æ˜¯æ­£å®Œäº†æ—¥";
             this.Column51.Name = "Column51";
             this.Column51.ReadOnly = true;
@@ -3964,8 +3605,8 @@
             // 
             // Column50
             // 
-            dataGridViewCellStyle346.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column50.DefaultCellStyle = dataGridViewCellStyle346;
+            dataGridViewCellStyle151.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column50.DefaultCellStyle = dataGridViewCellStyle151;
             this.Column50.HeaderText = "è«‹æ±‚ç¢ºèª�æ—¥";
             this.Column50.Name = "Column50";
             this.Column50.ReadOnly = true;
@@ -3974,8 +3615,8 @@
             // 
             // dataGridViewTextBoxActionColDays16
             // 
-            dataGridViewCellStyle347.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxActionColDays16.DefaultCellStyle = dataGridViewCellStyle347;
+            dataGridViewCellStyle152.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxActionColDays16.DefaultCellStyle = dataGridViewCellStyle152;
             this.dataGridViewTextBoxActionColDays16.HeaderText = "æ–½å·¥é–‹å§‹æ—¥";
             this.dataGridViewTextBoxActionColDays16.Name = "dataGridViewTextBoxActionColDays16";
             this.dataGridViewTextBoxActionColDays16.ReadOnly = true;
@@ -3984,8 +3625,8 @@
             // 
             // dataGridViewTextBoxActionColDays17
             // 
-            dataGridViewCellStyle348.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxActionColDays17.DefaultCellStyle = dataGridViewCellStyle348;
+            dataGridViewCellStyle153.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxActionColDays17.DefaultCellStyle = dataGridViewCellStyle153;
             this.dataGridViewTextBoxActionColDays17.HeaderText = "æ–½å·¥å®Œäº†æ—¥";
             this.dataGridViewTextBoxActionColDays17.Name = "dataGridViewTextBoxActionColDays17";
             this.dataGridViewTextBoxActionColDays17.ReadOnly = true;
@@ -3994,8 +3635,8 @@
             // 
             // dataGridViewTextBoxActionColDays18
             // 
-            dataGridViewCellStyle349.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxActionColDays18.DefaultCellStyle = dataGridViewCellStyle349;
+            dataGridViewCellStyle154.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxActionColDays18.DefaultCellStyle = dataGridViewCellStyle154;
             this.dataGridViewTextBoxActionColDays18.HeaderText = "ç�¾å ´ä½�æ‰€";
             this.dataGridViewTextBoxActionColDays18.Name = "dataGridViewTextBoxActionColDays18";
             this.dataGridViewTextBoxActionColDays18.ReadOnly = true;
@@ -4005,8 +3646,8 @@
             // 
             // dataGridViewTextBoxActionColDays19
             // 
-            dataGridViewCellStyle350.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxActionColDays19.DefaultCellStyle = dataGridViewCellStyle350;
+            dataGridViewCellStyle155.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxActionColDays19.DefaultCellStyle = dataGridViewCellStyle155;
             this.dataGridViewTextBoxActionColDays19.HeaderText = "å�–ã€€å¼•ã€€å…ˆ";
             this.dataGridViewTextBoxActionColDays19.Name = "dataGridViewTextBoxActionColDays19";
             this.dataGridViewTextBoxActionColDays19.ReadOnly = true;
@@ -4033,21 +3674,21 @@
             this.dgvActionSchedule.AllowUserToDeleteRows = false;
             this.dgvActionSchedule.AllowUserToResizeColumns = false;
             this.dgvActionSchedule.AllowUserToResizeRows = false;
-            dataGridViewCellStyle351.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvActionSchedule.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle351;
+            dataGridViewCellStyle156.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvActionSchedule.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle156;
             this.dgvActionSchedule.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvActionSchedule.BackgroundColor = System.Drawing.Color.White;
             this.dgvActionSchedule.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle352.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle352.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle352.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle352.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle352.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle352.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle352.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvActionSchedule.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle352;
+            dataGridViewCellStyle157.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle157.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle157.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle157.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle157.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle157.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle157.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvActionSchedule.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle157;
             this.dgvActionSchedule.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvActionSchedule.ColumnHeadersVisible = false;
             this.dgvActionSchedule.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -4122,9 +3763,9 @@
             // 
             // ActionCol01
             // 
-            dataGridViewCellStyle353.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle353.ForeColor = System.Drawing.Color.Black;
-            this.ActionCol01.DefaultCellStyle = dataGridViewCellStyle353;
+            dataGridViewCellStyle158.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle158.ForeColor = System.Drawing.Color.Black;
+            this.ActionCol01.DefaultCellStyle = dataGridViewCellStyle158;
             this.ActionCol01.Frozen = true;
             this.ActionCol01.HeaderText = "éƒ¨ç½²";
             this.ActionCol01.Name = "ActionCol01";
@@ -4145,9 +3786,9 @@
             // 
             // ActionCol02
             // 
-            dataGridViewCellStyle354.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle354.ForeColor = System.Drawing.Color.Black;
-            this.ActionCol02.DefaultCellStyle = dataGridViewCellStyle354;
+            dataGridViewCellStyle159.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle159.ForeColor = System.Drawing.Color.Black;
+            this.ActionCol02.DefaultCellStyle = dataGridViewCellStyle159;
             this.ActionCol02.Frozen = true;
             this.ActionCol02.HeaderText = "æ‹…å½“å��";
             this.ActionCol02.Name = "ActionCol02";
@@ -4158,9 +3799,9 @@
             // 
             // ActionCol04
             // 
-            dataGridViewCellStyle355.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle355.ForeColor = System.Drawing.Color.Black;
-            this.ActionCol04.DefaultCellStyle = dataGridViewCellStyle355;
+            dataGridViewCellStyle160.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle160.ForeColor = System.Drawing.Color.Black;
+            this.ActionCol04.DefaultCellStyle = dataGridViewCellStyle160;
             this.ActionCol04.Frozen = true;
             this.ActionCol04.HeaderText = "è¡Œå‹•";
             this.ActionCol04.Name = "ActionCol04";
@@ -4168,9 +3809,9 @@
             // 
             // ActionColDays01
             // 
-            dataGridViewCellStyle356.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle356.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays01.DefaultCellStyle = dataGridViewCellStyle356;
+            dataGridViewCellStyle161.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle161.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays01.DefaultCellStyle = dataGridViewCellStyle161;
             this.ActionColDays01.HeaderText = "1æ—¥";
             this.ActionColDays01.Name = "ActionColDays01";
             this.ActionColDays01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4178,9 +3819,9 @@
             // 
             // ActionColDays02
             // 
-            dataGridViewCellStyle357.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle357.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays02.DefaultCellStyle = dataGridViewCellStyle357;
+            dataGridViewCellStyle162.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle162.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays02.DefaultCellStyle = dataGridViewCellStyle162;
             this.ActionColDays02.HeaderText = "2æ—¥";
             this.ActionColDays02.Name = "ActionColDays02";
             this.ActionColDays02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4188,9 +3829,9 @@
             // 
             // ActionColDays03
             // 
-            dataGridViewCellStyle358.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle358.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays03.DefaultCellStyle = dataGridViewCellStyle358;
+            dataGridViewCellStyle163.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle163.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays03.DefaultCellStyle = dataGridViewCellStyle163;
             this.ActionColDays03.HeaderText = "3æ—¥";
             this.ActionColDays03.Name = "ActionColDays03";
             this.ActionColDays03.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4198,9 +3839,9 @@
             // 
             // ActionColDays04
             // 
-            dataGridViewCellStyle359.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle359.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays04.DefaultCellStyle = dataGridViewCellStyle359;
+            dataGridViewCellStyle164.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle164.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays04.DefaultCellStyle = dataGridViewCellStyle164;
             this.ActionColDays04.HeaderText = "4æ—¥";
             this.ActionColDays04.Name = "ActionColDays04";
             this.ActionColDays04.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4208,9 +3849,9 @@
             // 
             // ActionColDays05
             // 
-            dataGridViewCellStyle360.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle360.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays05.DefaultCellStyle = dataGridViewCellStyle360;
+            dataGridViewCellStyle165.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle165.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays05.DefaultCellStyle = dataGridViewCellStyle165;
             this.ActionColDays05.HeaderText = "5æ—¥";
             this.ActionColDays05.Name = "ActionColDays05";
             this.ActionColDays05.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4218,9 +3859,9 @@
             // 
             // ActionColDays06
             // 
-            dataGridViewCellStyle361.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle361.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays06.DefaultCellStyle = dataGridViewCellStyle361;
+            dataGridViewCellStyle166.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle166.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays06.DefaultCellStyle = dataGridViewCellStyle166;
             this.ActionColDays06.HeaderText = "6æ—¥";
             this.ActionColDays06.Name = "ActionColDays06";
             this.ActionColDays06.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4228,9 +3869,9 @@
             // 
             // ActionColDays07
             // 
-            dataGridViewCellStyle362.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle362.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays07.DefaultCellStyle = dataGridViewCellStyle362;
+            dataGridViewCellStyle167.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle167.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays07.DefaultCellStyle = dataGridViewCellStyle167;
             this.ActionColDays07.HeaderText = "7æ—¥";
             this.ActionColDays07.Name = "ActionColDays07";
             this.ActionColDays07.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4238,9 +3879,9 @@
             // 
             // ActionColDays08
             // 
-            dataGridViewCellStyle363.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle363.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays08.DefaultCellStyle = dataGridViewCellStyle363;
+            dataGridViewCellStyle168.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle168.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays08.DefaultCellStyle = dataGridViewCellStyle168;
             this.ActionColDays08.HeaderText = "8æ—¥";
             this.ActionColDays08.Name = "ActionColDays08";
             this.ActionColDays08.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4248,9 +3889,9 @@
             // 
             // ActionColDays09
             // 
-            dataGridViewCellStyle364.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle364.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays09.DefaultCellStyle = dataGridViewCellStyle364;
+            dataGridViewCellStyle169.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle169.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays09.DefaultCellStyle = dataGridViewCellStyle169;
             this.ActionColDays09.HeaderText = "9æ—¥";
             this.ActionColDays09.Name = "ActionColDays09";
             this.ActionColDays09.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4258,9 +3899,9 @@
             // 
             // ActionColDays10
             // 
-            dataGridViewCellStyle365.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle365.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays10.DefaultCellStyle = dataGridViewCellStyle365;
+            dataGridViewCellStyle170.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle170.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays10.DefaultCellStyle = dataGridViewCellStyle170;
             this.ActionColDays10.HeaderText = "10æ—¥";
             this.ActionColDays10.Name = "ActionColDays10";
             this.ActionColDays10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4268,9 +3909,9 @@
             // 
             // ActionColDays11
             // 
-            dataGridViewCellStyle366.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle366.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays11.DefaultCellStyle = dataGridViewCellStyle366;
+            dataGridViewCellStyle171.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle171.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays11.DefaultCellStyle = dataGridViewCellStyle171;
             this.ActionColDays11.HeaderText = "11æ—¥";
             this.ActionColDays11.Name = "ActionColDays11";
             this.ActionColDays11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4278,9 +3919,9 @@
             // 
             // ActionColDays12
             // 
-            dataGridViewCellStyle367.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle367.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays12.DefaultCellStyle = dataGridViewCellStyle367;
+            dataGridViewCellStyle172.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle172.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays12.DefaultCellStyle = dataGridViewCellStyle172;
             this.ActionColDays12.HeaderText = "12æ—¥";
             this.ActionColDays12.Name = "ActionColDays12";
             this.ActionColDays12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4288,9 +3929,9 @@
             // 
             // ActionColDays13
             // 
-            dataGridViewCellStyle368.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle368.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays13.DefaultCellStyle = dataGridViewCellStyle368;
+            dataGridViewCellStyle173.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle173.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays13.DefaultCellStyle = dataGridViewCellStyle173;
             this.ActionColDays13.HeaderText = "13æ—¥";
             this.ActionColDays13.Name = "ActionColDays13";
             this.ActionColDays13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4298,9 +3939,9 @@
             // 
             // ActionColDays14
             // 
-            dataGridViewCellStyle369.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle369.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays14.DefaultCellStyle = dataGridViewCellStyle369;
+            dataGridViewCellStyle174.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle174.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays14.DefaultCellStyle = dataGridViewCellStyle174;
             this.ActionColDays14.HeaderText = "14æ—¥";
             this.ActionColDays14.Name = "ActionColDays14";
             this.ActionColDays14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4308,9 +3949,9 @@
             // 
             // ActionColDays15
             // 
-            dataGridViewCellStyle370.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle370.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays15.DefaultCellStyle = dataGridViewCellStyle370;
+            dataGridViewCellStyle175.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle175.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays15.DefaultCellStyle = dataGridViewCellStyle175;
             this.ActionColDays15.HeaderText = "15æ—¥";
             this.ActionColDays15.Name = "ActionColDays15";
             this.ActionColDays15.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4318,9 +3959,9 @@
             // 
             // ActionColDays16
             // 
-            dataGridViewCellStyle371.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle371.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays16.DefaultCellStyle = dataGridViewCellStyle371;
+            dataGridViewCellStyle176.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle176.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays16.DefaultCellStyle = dataGridViewCellStyle176;
             this.ActionColDays16.HeaderText = "16æ—¥";
             this.ActionColDays16.Name = "ActionColDays16";
             this.ActionColDays16.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4328,9 +3969,9 @@
             // 
             // ActionColDays17
             // 
-            dataGridViewCellStyle372.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle372.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays17.DefaultCellStyle = dataGridViewCellStyle372;
+            dataGridViewCellStyle177.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle177.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays17.DefaultCellStyle = dataGridViewCellStyle177;
             this.ActionColDays17.HeaderText = "17æ—¥";
             this.ActionColDays17.Name = "ActionColDays17";
             this.ActionColDays17.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4338,9 +3979,9 @@
             // 
             // ActionColDays18
             // 
-            dataGridViewCellStyle373.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle373.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays18.DefaultCellStyle = dataGridViewCellStyle373;
+            dataGridViewCellStyle178.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle178.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays18.DefaultCellStyle = dataGridViewCellStyle178;
             this.ActionColDays18.HeaderText = "18æ—¥";
             this.ActionColDays18.Name = "ActionColDays18";
             this.ActionColDays18.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4348,9 +3989,9 @@
             // 
             // ActionColDays19
             // 
-            dataGridViewCellStyle374.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle374.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays19.DefaultCellStyle = dataGridViewCellStyle374;
+            dataGridViewCellStyle179.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle179.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays19.DefaultCellStyle = dataGridViewCellStyle179;
             this.ActionColDays19.HeaderText = "19æ—¥";
             this.ActionColDays19.Name = "ActionColDays19";
             this.ActionColDays19.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4358,9 +3999,9 @@
             // 
             // ActionColDays20
             // 
-            dataGridViewCellStyle375.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle375.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays20.DefaultCellStyle = dataGridViewCellStyle375;
+            dataGridViewCellStyle180.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle180.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays20.DefaultCellStyle = dataGridViewCellStyle180;
             this.ActionColDays20.HeaderText = "20æ—¥";
             this.ActionColDays20.Name = "ActionColDays20";
             this.ActionColDays20.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4368,9 +4009,9 @@
             // 
             // ActionColDays21
             // 
-            dataGridViewCellStyle376.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle376.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays21.DefaultCellStyle = dataGridViewCellStyle376;
+            dataGridViewCellStyle181.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle181.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays21.DefaultCellStyle = dataGridViewCellStyle181;
             this.ActionColDays21.HeaderText = "21æ—¥";
             this.ActionColDays21.Name = "ActionColDays21";
             this.ActionColDays21.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4378,9 +4019,9 @@
             // 
             // ActionColDays22
             // 
-            dataGridViewCellStyle377.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle377.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays22.DefaultCellStyle = dataGridViewCellStyle377;
+            dataGridViewCellStyle182.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle182.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays22.DefaultCellStyle = dataGridViewCellStyle182;
             this.ActionColDays22.HeaderText = "22æ—¥";
             this.ActionColDays22.Name = "ActionColDays22";
             this.ActionColDays22.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4388,9 +4029,9 @@
             // 
             // ActionColDays23
             // 
-            dataGridViewCellStyle378.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle378.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays23.DefaultCellStyle = dataGridViewCellStyle378;
+            dataGridViewCellStyle183.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle183.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays23.DefaultCellStyle = dataGridViewCellStyle183;
             this.ActionColDays23.HeaderText = "23æ—¥";
             this.ActionColDays23.Name = "ActionColDays23";
             this.ActionColDays23.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4398,9 +4039,9 @@
             // 
             // ActionColDays24
             // 
-            dataGridViewCellStyle379.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle379.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays24.DefaultCellStyle = dataGridViewCellStyle379;
+            dataGridViewCellStyle184.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle184.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays24.DefaultCellStyle = dataGridViewCellStyle184;
             this.ActionColDays24.HeaderText = "24æ—¥";
             this.ActionColDays24.Name = "ActionColDays24";
             this.ActionColDays24.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4408,9 +4049,9 @@
             // 
             // ActionColDays25
             // 
-            dataGridViewCellStyle380.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle380.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays25.DefaultCellStyle = dataGridViewCellStyle380;
+            dataGridViewCellStyle185.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle185.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays25.DefaultCellStyle = dataGridViewCellStyle185;
             this.ActionColDays25.HeaderText = "25æ—¥";
             this.ActionColDays25.Name = "ActionColDays25";
             this.ActionColDays25.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4418,9 +4059,9 @@
             // 
             // ActionColDays26
             // 
-            dataGridViewCellStyle381.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle381.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays26.DefaultCellStyle = dataGridViewCellStyle381;
+            dataGridViewCellStyle186.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle186.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays26.DefaultCellStyle = dataGridViewCellStyle186;
             this.ActionColDays26.HeaderText = "26æ—¥";
             this.ActionColDays26.Name = "ActionColDays26";
             this.ActionColDays26.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4428,9 +4069,9 @@
             // 
             // ActionColDays27
             // 
-            dataGridViewCellStyle382.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle382.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays27.DefaultCellStyle = dataGridViewCellStyle382;
+            dataGridViewCellStyle187.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle187.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays27.DefaultCellStyle = dataGridViewCellStyle187;
             this.ActionColDays27.HeaderText = "27æ—¥";
             this.ActionColDays27.Name = "ActionColDays27";
             this.ActionColDays27.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4438,9 +4079,9 @@
             // 
             // ActionColDays28
             // 
-            dataGridViewCellStyle383.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle383.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays28.DefaultCellStyle = dataGridViewCellStyle383;
+            dataGridViewCellStyle188.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle188.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays28.DefaultCellStyle = dataGridViewCellStyle188;
             this.ActionColDays28.HeaderText = "28æ—¥";
             this.ActionColDays28.Name = "ActionColDays28";
             this.ActionColDays28.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4448,9 +4089,9 @@
             // 
             // ActionColDays29
             // 
-            dataGridViewCellStyle384.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle384.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays29.DefaultCellStyle = dataGridViewCellStyle384;
+            dataGridViewCellStyle189.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle189.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays29.DefaultCellStyle = dataGridViewCellStyle189;
             this.ActionColDays29.HeaderText = "29æ—¥";
             this.ActionColDays29.Name = "ActionColDays29";
             this.ActionColDays29.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4458,9 +4099,9 @@
             // 
             // ActionColDays30
             // 
-            dataGridViewCellStyle385.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle385.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays30.DefaultCellStyle = dataGridViewCellStyle385;
+            dataGridViewCellStyle190.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle190.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays30.DefaultCellStyle = dataGridViewCellStyle190;
             this.ActionColDays30.HeaderText = "30æ—¥";
             this.ActionColDays30.Name = "ActionColDays30";
             this.ActionColDays30.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4468,9 +4109,9 @@
             // 
             // ActionColDays31
             // 
-            dataGridViewCellStyle386.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle386.ForeColor = System.Drawing.Color.Black;
-            this.ActionColDays31.DefaultCellStyle = dataGridViewCellStyle386;
+            dataGridViewCellStyle191.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle191.ForeColor = System.Drawing.Color.Black;
+            this.ActionColDays31.DefaultCellStyle = dataGridViewCellStyle191;
             this.ActionColDays31.HeaderText = "31æ—¥";
             this.ActionColDays31.Name = "ActionColDays31";
             this.ActionColDays31.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -4570,8 +4211,8 @@
             this.dgvStaffAssignment.RowHeadersVisible = false;
             this.dgvStaffAssignment.RowHeadersWidth = 20;
             this.dgvStaffAssignment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle390.BackColor = System.Drawing.Color.White;
-            this.dgvStaffAssignment.RowsDefaultCellStyle = dataGridViewCellStyle390;
+            dataGridViewCellStyle195.BackColor = System.Drawing.Color.White;
+            this.dgvStaffAssignment.RowsDefaultCellStyle = dataGridViewCellStyle195;
             this.dgvStaffAssignment.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             this.dgvStaffAssignment.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.White;
             this.dgvStaffAssignment.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Black;
@@ -4596,9 +4237,9 @@
             // 
             // StaffFixColumn01
             // 
-            dataGridViewCellStyle387.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle387.ForeColor = System.Drawing.Color.Black;
-            this.StaffFixColumn01.DefaultCellStyle = dataGridViewCellStyle387;
+            dataGridViewCellStyle192.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle192.ForeColor = System.Drawing.Color.Black;
+            this.StaffFixColumn01.DefaultCellStyle = dataGridViewCellStyle192;
             this.StaffFixColumn01.Frozen = true;
             this.StaffFixColumn01.HeaderText = "éƒ¨ç½²";
             this.StaffFixColumn01.Name = "StaffFixColumn01";
@@ -4620,9 +4261,9 @@
             // 
             // StaffFixColumn03
             // 
-            dataGridViewCellStyle388.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle388.ForeColor = System.Drawing.Color.Black;
-            this.StaffFixColumn03.DefaultCellStyle = dataGridViewCellStyle388;
+            dataGridViewCellStyle193.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle193.ForeColor = System.Drawing.Color.Black;
+            this.StaffFixColumn03.DefaultCellStyle = dataGridViewCellStyle193;
             this.StaffFixColumn03.Frozen = true;
             this.StaffFixColumn03.HeaderText = "æ‹…å½“å��";
             this.StaffFixColumn03.Name = "StaffFixColumn03";
@@ -4653,10 +4294,10 @@
             // 
             // StaffFixColumn06
             // 
-            dataGridViewCellStyle389.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle389.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle389.ForeColor = System.Drawing.Color.Black;
-            this.StaffFixColumn06.DefaultCellStyle = dataGridViewCellStyle389;
+            dataGridViewCellStyle194.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle194.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle194.ForeColor = System.Drawing.Color.Black;
+            this.StaffFixColumn06.DefaultCellStyle = dataGridViewCellStyle194;
             this.StaffFixColumn06.Frozen = true;
             this.StaffFixColumn06.HeaderText = "è¡Œå‹•";
             this.StaffFixColumn06.Name = "StaffFixColumn06";
@@ -4762,47 +4403,47 @@
             this.chartSalesGraph.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            chartArea2.Name = "ChartArea1";
-            this.chartSalesGraph.ChartAreas.Add(chartArea2);
-            legend2.Name = "Legend1";
-            this.chartSalesGraph.Legends.Add(legend2);
+            chartArea1.Name = "ChartArea1";
+            this.chartSalesGraph.ChartAreas.Add(chartArea1);
+            legend1.Name = "Legend1";
+            this.chartSalesGraph.Legends.Add(legend1);
             this.chartSalesGraph.Location = new System.Drawing.Point(6, 36);
             this.chartSalesGraph.Name = "chartSalesGraph";
-            series8.ChartArea = "ChartArea1";
-            series8.Color = System.Drawing.Color.Lime;
-            series8.Legend = "Legend1";
-            series8.Name = "å�—æ³¨é‡‘é¡�";
-            series9.ChartArea = "ChartArea1";
-            series9.Color = System.Drawing.Color.Yellow;
-            series9.Legend = "Legend1";
-            series9.Name = "å£²ä¸Šé‡‘é¡�";
-            series10.ChartArea = "ChartArea1";
-            series10.Color = System.Drawing.Color.Cyan;
-            series10.Legend = "Legend1";
-            series10.Name = "ä¼šç¤¾çµŒè²»";
-            series11.ChartArea = "ChartArea1";
-            series11.Color = System.Drawing.Color.Blue;
-            series11.Legend = "Legend1";
-            series11.Name = "éƒ¨ç½²çµŒè²»";
-            series12.ChartArea = "ChartArea1";
-            series12.Color = System.Drawing.Color.SkyBlue;
-            series12.Legend = "Legend1";
-            series12.Name = "å–¶æ¥­çµŒè²»";
-            series13.ChartArea = "ChartArea1";
-            series13.Color = System.Drawing.Color.NavajoWhite;
-            series13.Legend = "Legend1";
-            series13.Name = "ç²—åˆ©ç›Š";
-            series14.ChartArea = "ChartArea1";
-            series14.Color = System.Drawing.Color.Orange;
-            series14.Legend = "Legend1";
-            series14.Name = "ç´”åˆ©ç›Š(æ��ç›Š)";
-            this.chartSalesGraph.Series.Add(series8);
-            this.chartSalesGraph.Series.Add(series9);
-            this.chartSalesGraph.Series.Add(series10);
-            this.chartSalesGraph.Series.Add(series11);
-            this.chartSalesGraph.Series.Add(series12);
-            this.chartSalesGraph.Series.Add(series13);
-            this.chartSalesGraph.Series.Add(series14);
+            series1.ChartArea = "ChartArea1";
+            series1.Color = System.Drawing.Color.Lime;
+            series1.Legend = "Legend1";
+            series1.Name = "å�—æ³¨é‡‘é¡�";
+            series2.ChartArea = "ChartArea1";
+            series2.Color = System.Drawing.Color.Yellow;
+            series2.Legend = "Legend1";
+            series2.Name = "å£²ä¸Šé‡‘é¡�";
+            series3.ChartArea = "ChartArea1";
+            series3.Color = System.Drawing.Color.Cyan;
+            series3.Legend = "Legend1";
+            series3.Name = "ä¼šç¤¾çµŒè²»";
+            series4.ChartArea = "ChartArea1";
+            series4.Color = System.Drawing.Color.Blue;
+            series4.Legend = "Legend1";
+            series4.Name = "éƒ¨ç½²çµŒè²»";
+            series5.ChartArea = "ChartArea1";
+            series5.Color = System.Drawing.Color.SkyBlue;
+            series5.Legend = "Legend1";
+            series5.Name = "å–¶æ¥­çµŒè²»";
+            series6.ChartArea = "ChartArea1";
+            series6.Color = System.Drawing.Color.NavajoWhite;
+            series6.Legend = "Legend1";
+            series6.Name = "ç²—åˆ©ç›Š";
+            series7.ChartArea = "ChartArea1";
+            series7.Color = System.Drawing.Color.Orange;
+            series7.Legend = "Legend1";
+            series7.Name = "ç´”åˆ©ç›Š(æ��ç›Š)";
+            this.chartSalesGraph.Series.Add(series1);
+            this.chartSalesGraph.Series.Add(series2);
+            this.chartSalesGraph.Series.Add(series3);
+            this.chartSalesGraph.Series.Add(series4);
+            this.chartSalesGraph.Series.Add(series5);
+            this.chartSalesGraph.Series.Add(series6);
+            this.chartSalesGraph.Series.Add(series7);
             this.chartSalesGraph.Size = new System.Drawing.Size(1190, 470);
             this.chartSalesGraph.TabIndex = 0;
             this.chartSalesGraph.Text = "å£²ä¸Šã‚°ãƒ©ãƒ•";
@@ -5248,7 +4889,7 @@
             this.pnlConstruction.Controls.Add(this.tblLayoutConstruction);
             this.pnlConstruction.Location = new System.Drawing.Point(4, 2);
             this.pnlConstruction.Name = "pnlConstruction";
-            this.pnlConstruction.Size = new System.Drawing.Size(1190, 500);
+            this.pnlConstruction.Size = new System.Drawing.Size(1190, 526);
             this.pnlConstruction.TabIndex = 15;
             // 
             // tblLayoutConstruction
@@ -5398,7 +5039,7 @@
             this.tblLayoutConstruction.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
             this.tblLayoutConstruction.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
             this.tblLayoutConstruction.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
-            this.tblLayoutConstruction.Size = new System.Drawing.Size(1170, 1260);
+            this.tblLayoutConstruction.Size = new System.Drawing.Size(1068, 1260);
             this.tblLayoutConstruction.TabIndex = 15;
             // 
             // lblConstrLine01
@@ -5408,7 +5049,7 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstrLine01, 10);
             this.lblConstrLine01.Location = new System.Drawing.Point(3, 267);
             this.lblConstrLine01.Name = "lblConstrLine01";
-            this.lblConstrLine01.Size = new System.Drawing.Size(1164, 6);
+            this.lblConstrLine01.Size = new System.Drawing.Size(1062, 6);
             this.lblConstrLine01.TabIndex = 15;
             // 
             // btnConstruction0000
@@ -5415,10 +5056,10 @@
             // 
             this.btnConstruction0000.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0000.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0000.Location = new System.Drawing.Point(107, 39);
+            this.btnConstruction0000.Location = new System.Drawing.Point(98, 39);
             this.btnConstruction0000.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0000.Name = "btnConstruction0000";
-            this.btnConstruction0000.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0000.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0000.TabIndex = 15;
             this.btnConstruction0000.Text = "å�„å·¥äº‹è©³ç´°å�°å¸³é–²è¦§";
             this.btnConstruction0000.UseVisualStyleBackColor = false;
@@ -5431,9 +5072,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblConstrTitle01.AutoSize = true;
             this.lblConstrTitle01.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblConstrTitle01.Location = new System.Drawing.Point(106, 0);
+            this.lblConstrTitle01.Location = new System.Drawing.Point(97, 0);
             this.lblConstrTitle01.Name = "lblConstrTitle01";
-            this.lblConstrTitle01.Size = new System.Drawing.Size(192, 36);
+            this.lblConstrTitle01.Size = new System.Drawing.Size(174, 36);
             this.lblConstrTitle01.TabIndex = 15;
             this.lblConstrTitle01.Text = "æ—¥æ¬¡ï¼ˆæ–½å·¥ï¼‰ç®¡ç�†";
             this.lblConstrTitle01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5447,7 +5088,7 @@
             this.lblConstr00.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr00.Location = new System.Drawing.Point(3, 36);
             this.lblConstr00.Name = "lblConstr00";
-            this.lblConstr00.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr00.Size = new System.Drawing.Size(88, 36);
             this.lblConstr00.TabIndex = 15;
             this.lblConstr00.Text = "æ¯Žæ—¥";
             this.lblConstr00.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5456,10 +5097,10 @@
             // 
             this.btnConstruction0001.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0001.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0001.Location = new System.Drawing.Point(323, 39);
+            this.btnConstruction0001.Location = new System.Drawing.Point(295, 39);
             this.btnConstruction0001.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0001.Name = "btnConstruction0001";
-            this.btnConstruction0001.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0001.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0001.TabIndex = 15;
             this.btnConstruction0001.Text = "å�„å·¥äº‹æ—¥å ±";
             this.btnConstruction0001.UseVisualStyleBackColor = false;
@@ -5469,10 +5110,10 @@
             // 
             this.btnConstruction0002.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0002.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0002.Location = new System.Drawing.Point(539, 39);
+            this.btnConstruction0002.Location = new System.Drawing.Point(492, 39);
             this.btnConstruction0002.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0002.Name = "btnConstruction0002";
-            this.btnConstruction0002.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0002.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0002.TabIndex = 15;
             this.btnConstruction0002.Text = "å�„å·¥äº‹æ‰“å�ˆã‚�ã�›è­°äº‹éŒ²";
             this.btnConstruction0002.UseVisualStyleBackColor = false;
@@ -5482,10 +5123,10 @@
             // 
             this.btnConstruction0003.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0003.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0003.Location = new System.Drawing.Point(755, 39);
+            this.btnConstruction0003.Location = new System.Drawing.Point(689, 39);
             this.btnConstruction0003.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0003.Name = "btnConstruction0003";
-            this.btnConstruction0003.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0003.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0003.TabIndex = 15;
             this.btnConstruction0003.Text = "å�„å·¥äº‹äº¤é€šè²»ãƒ»è³¼å…¥å“�å…¥åŠ›";
             this.btnConstruction0003.UseVisualStyleBackColor = false;
@@ -5495,10 +5136,10 @@
             // 
             this.btnConstruction0004.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0004.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0004.Location = new System.Drawing.Point(971, 39);
+            this.btnConstruction0004.Location = new System.Drawing.Point(886, 39);
             this.btnConstruction0004.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0004.Name = "btnConstruction0004";
-            this.btnConstruction0004.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0004.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0004.TabIndex = 15;
             this.btnConstruction0004.Text = "å‡ºå‹¤ç®¡ç�†";
             this.btnConstruction0004.UseVisualStyleBackColor = false;
@@ -5508,10 +5149,10 @@
             // 
             this.btnConstruction0100.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0100.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0100.Location = new System.Drawing.Point(107, 111);
+            this.btnConstruction0100.Location = new System.Drawing.Point(98, 111);
             this.btnConstruction0100.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0100.Name = "btnConstruction0100";
-            this.btnConstruction0100.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0100.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0100.TabIndex = 15;
             this.btnConstruction0100.Text = "è¡Œå‹•äºˆå®šå…¥åŠ›";
             this.btnConstruction0100.UseVisualStyleBackColor = false;
@@ -5521,10 +5162,10 @@
             // 
             this.btnConstruction0101.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0101.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0101.Location = new System.Drawing.Point(323, 111);
+            this.btnConstruction0101.Location = new System.Drawing.Point(295, 111);
             this.btnConstruction0101.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0101.Name = "btnConstruction0101";
-            this.btnConstruction0101.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0101.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0101.TabIndex = 15;
             this.btnConstruction0101.Text = "è»Šä¸¡äºˆç´„";
             this.btnConstruction0101.UseVisualStyleBackColor = false;
@@ -5539,7 +5180,7 @@
             this.lblConstr01.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr01.Location = new System.Drawing.Point(3, 108);
             this.lblConstr01.Name = "lblConstr01";
-            this.lblConstr01.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr01.Size = new System.Drawing.Size(88, 36);
             this.lblConstr01.TabIndex = 15;
             this.lblConstr01.Text = "æ¯Žæ—¥";
             this.lblConstr01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5548,10 +5189,10 @@
             // 
             this.btnConstruction0102.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0102.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0102.Location = new System.Drawing.Point(539, 111);
+            this.btnConstruction0102.Location = new System.Drawing.Point(492, 111);
             this.btnConstruction0102.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0102.Name = "btnConstruction0102";
-            this.btnConstruction0102.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0102.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0102.TabIndex = 15;
             this.btnConstruction0102.UseVisualStyleBackColor = false;
             this.btnConstruction0102.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5560,10 +5201,10 @@
             // 
             this.btnConstruction0103.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0103.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0103.Location = new System.Drawing.Point(755, 111);
+            this.btnConstruction0103.Location = new System.Drawing.Point(689, 111);
             this.btnConstruction0103.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0103.Name = "btnConstruction0103";
-            this.btnConstruction0103.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0103.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0103.TabIndex = 15;
             this.btnConstruction0103.UseVisualStyleBackColor = false;
             this.btnConstruction0103.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5572,10 +5213,10 @@
             // 
             this.btnConstruction0104.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0104.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0104.Location = new System.Drawing.Point(971, 111);
+            this.btnConstruction0104.Location = new System.Drawing.Point(886, 111);
             this.btnConstruction0104.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0104.Name = "btnConstruction0104";
-            this.btnConstruction0104.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0104.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0104.TabIndex = 15;
             this.btnConstruction0104.UseVisualStyleBackColor = false;
             this.btnConstruction0104.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5589,7 +5230,7 @@
             this.lblConstr02.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr02.Location = new System.Drawing.Point(3, 180);
             this.lblConstr02.Name = "lblConstr02";
-            this.lblConstr02.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr02.Size = new System.Drawing.Size(88, 36);
             this.lblConstr02.TabIndex = 15;
             this.lblConstr02.Text = "æ¯Žå›ž";
             this.lblConstr02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5598,10 +5239,10 @@
             // 
             this.btnConstruction0200.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0200.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0200.Location = new System.Drawing.Point(107, 183);
+            this.btnConstruction0200.Location = new System.Drawing.Point(98, 183);
             this.btnConstruction0200.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0200.Name = "btnConstruction0200";
-            this.btnConstruction0200.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0200.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0200.TabIndex = 15;
             this.btnConstruction0200.Text = "è³‡æ��ä¸€è¦§";
             this.btnConstruction0200.UseVisualStyleBackColor = false;
@@ -5611,10 +5252,10 @@
             // 
             this.btnConstruction0201.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0201.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0201.Location = new System.Drawing.Point(323, 183);
+            this.btnConstruction0201.Location = new System.Drawing.Point(295, 183);
             this.btnConstruction0201.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0201.Name = "btnConstruction0201";
-            this.btnConstruction0201.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0201.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0201.TabIndex = 15;
             this.btnConstruction0201.Text = "è³‡æ��è²¸å‡º";
             this.btnConstruction0201.UseVisualStyleBackColor = false;
@@ -5624,10 +5265,10 @@
             // 
             this.btnConstruction0202.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0202.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0202.Location = new System.Drawing.Point(539, 183);
+            this.btnConstruction0202.Location = new System.Drawing.Point(492, 183);
             this.btnConstruction0202.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0202.Name = "btnConstruction0202";
-            this.btnConstruction0202.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0202.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0202.TabIndex = 15;
             this.btnConstruction0202.Text = "è³‡æ��è¿”å�´";
             this.btnConstruction0202.UseVisualStyleBackColor = false;
@@ -5637,10 +5278,10 @@
             // 
             this.btnConstruction0203.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0203.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0203.Location = new System.Drawing.Point(755, 183);
+            this.btnConstruction0203.Location = new System.Drawing.Point(689, 183);
             this.btnConstruction0203.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0203.Name = "btnConstruction0203";
-            this.btnConstruction0203.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0203.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0203.TabIndex = 15;
             this.btnConstruction0203.UseVisualStyleBackColor = false;
             this.btnConstruction0203.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5649,10 +5290,10 @@
             // 
             this.btnConstruction0204.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0204.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0204.Location = new System.Drawing.Point(971, 183);
+            this.btnConstruction0204.Location = new System.Drawing.Point(886, 183);
             this.btnConstruction0204.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0204.Name = "btnConstruction0204";
-            this.btnConstruction0204.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0204.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0204.TabIndex = 15;
             this.btnConstruction0204.UseVisualStyleBackColor = false;
             this.btnConstruction0204.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5666,7 +5307,7 @@
             this.lblConstr03.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr03.Location = new System.Drawing.Point(3, 324);
             this.lblConstr03.Name = "lblConstr03";
-            this.lblConstr03.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr03.Size = new System.Drawing.Size(88, 36);
             this.lblConstr03.TabIndex = 15;
             this.lblConstr03.Text = "ç�€å·¥å‰�";
             this.lblConstr03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5678,9 +5319,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblConstrTitle02.AutoSize = true;
             this.lblConstrTitle02.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblConstrTitle02.Location = new System.Drawing.Point(106, 288);
+            this.lblConstrTitle02.Location = new System.Drawing.Point(97, 288);
             this.lblConstrTitle02.Name = "lblConstrTitle02";
-            this.lblConstrTitle02.Size = new System.Drawing.Size(192, 36);
+            this.lblConstrTitle02.Size = new System.Drawing.Size(174, 36);
             this.lblConstrTitle02.TabIndex = 15;
             this.lblConstrTitle02.Text = "æ›¸é¡žç®¡ç�†";
             this.lblConstrTitle02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5689,10 +5330,10 @@
             // 
             this.btnConstruction0300.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0300.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0300.Location = new System.Drawing.Point(107, 327);
+            this.btnConstruction0300.Location = new System.Drawing.Point(98, 327);
             this.btnConstruction0300.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0300.Name = "btnConstruction0300";
-            this.btnConstruction0300.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0300.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0300.TabIndex = 15;
             this.btnConstruction0300.Text = "å·¥äº‹äºˆç®—æ›¸ä½œæˆ�";
             this.btnConstruction0300.UseVisualStyleBackColor = false;
@@ -5702,10 +5343,10 @@
             // 
             this.btnConstruction0301.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0301.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0301.Location = new System.Drawing.Point(323, 327);
+            this.btnConstruction0301.Location = new System.Drawing.Point(295, 327);
             this.btnConstruction0301.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0301.Name = "btnConstruction0301";
-            this.btnConstruction0301.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0301.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0301.TabIndex = 15;
             this.btnConstruction0301.Text = "å·¥äº‹äºˆç®—æ›¸æ‰¿èª�";
             this.btnConstruction0301.UseVisualStyleBackColor = false;
@@ -5715,10 +5356,10 @@
             // 
             this.btnConstruction0302.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0302.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0302.Location = new System.Drawing.Point(539, 327);
+            this.btnConstruction0302.Location = new System.Drawing.Point(492, 327);
             this.btnConstruction0302.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0302.Name = "btnConstruction0302";
-            this.btnConstruction0302.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0302.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0302.TabIndex = 15;
             this.btnConstruction0302.UseVisualStyleBackColor = false;
             this.btnConstruction0302.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5727,10 +5368,10 @@
             // 
             this.btnConstruction0303.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0303.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0303.Location = new System.Drawing.Point(755, 327);
+            this.btnConstruction0303.Location = new System.Drawing.Point(689, 327);
             this.btnConstruction0303.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0303.Name = "btnConstruction0303";
-            this.btnConstruction0303.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0303.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0303.TabIndex = 15;
             this.btnConstruction0303.UseVisualStyleBackColor = false;
             this.btnConstruction0303.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5739,10 +5380,10 @@
             // 
             this.btnConstruction0304.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0304.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0304.Location = new System.Drawing.Point(971, 327);
+            this.btnConstruction0304.Location = new System.Drawing.Point(886, 327);
             this.btnConstruction0304.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0304.Name = "btnConstruction0304";
-            this.btnConstruction0304.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0304.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0304.TabIndex = 15;
             this.btnConstruction0304.UseVisualStyleBackColor = false;
             this.btnConstruction0304.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5756,7 +5397,7 @@
             this.lblConstr04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr04.Location = new System.Drawing.Point(3, 396);
             this.lblConstr04.Name = "lblConstr04";
-            this.lblConstr04.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr04.Size = new System.Drawing.Size(88, 36);
             this.lblConstr04.TabIndex = 15;
             this.lblConstr04.Text = "ç�€å·¥å‰�";
             this.lblConstr04.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5765,10 +5406,10 @@
             // 
             this.btnConstruction0400.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0400.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0400.Location = new System.Drawing.Point(107, 399);
+            this.btnConstruction0400.Location = new System.Drawing.Point(98, 399);
             this.btnConstruction0400.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0400.Name = "btnConstruction0400";
-            this.btnConstruction0400.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0400.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0400.TabIndex = 15;
             this.btnConstruction0400.Text = "æ³¨æ–‡æ›¸ä½œæˆ�";
             this.btnConstruction0400.UseVisualStyleBackColor = false;
@@ -5778,10 +5419,10 @@
             // 
             this.btnConstruction0401.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0401.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0401.Location = new System.Drawing.Point(323, 399);
+            this.btnConstruction0401.Location = new System.Drawing.Point(295, 399);
             this.btnConstruction0401.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0401.Name = "btnConstruction0401";
-            this.btnConstruction0401.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0401.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0401.TabIndex = 15;
             this.btnConstruction0401.Text = "æ³¨æ–‡æ›¸æ‰¿èª�";
             this.btnConstruction0401.UseVisualStyleBackColor = false;
@@ -5791,10 +5432,10 @@
             // 
             this.btnConstruction0402.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0402.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0402.Location = new System.Drawing.Point(539, 399);
+            this.btnConstruction0402.Location = new System.Drawing.Point(492, 399);
             this.btnConstruction0402.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0402.Name = "btnConstruction0402";
-            this.btnConstruction0402.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0402.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0402.TabIndex = 15;
             this.btnConstruction0402.Text = "æ³¨æ–‡æ›¸çŠ¶æ³�ç¢ºèª�";
             this.btnConstruction0402.UseVisualStyleBackColor = false;
@@ -5804,10 +5445,10 @@
             // 
             this.btnConstruction0403.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0403.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0403.Location = new System.Drawing.Point(755, 399);
+            this.btnConstruction0403.Location = new System.Drawing.Point(689, 399);
             this.btnConstruction0403.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0403.Name = "btnConstruction0403";
-            this.btnConstruction0403.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0403.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0403.TabIndex = 15;
             this.btnConstruction0403.UseVisualStyleBackColor = false;
             this.btnConstruction0403.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5816,10 +5457,10 @@
             // 
             this.btnConstruction0404.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0404.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0404.Location = new System.Drawing.Point(971, 399);
+            this.btnConstruction0404.Location = new System.Drawing.Point(886, 399);
             this.btnConstruction0404.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0404.Name = "btnConstruction0404";
-            this.btnConstruction0404.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0404.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0404.TabIndex = 15;
             this.btnConstruction0404.UseVisualStyleBackColor = false;
             this.btnConstruction0404.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5833,7 +5474,7 @@
             this.lblConstr05.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr05.Location = new System.Drawing.Point(3, 468);
             this.lblConstr05.Name = "lblConstr05";
-            this.lblConstr05.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr05.Size = new System.Drawing.Size(88, 36);
             this.lblConstr05.TabIndex = 15;
             this.lblConstr05.Text = "ç�€å·¥å‰�";
             this.lblConstr05.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5842,10 +5483,10 @@
             // 
             this.btnConstruction0500.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0500.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0500.Location = new System.Drawing.Point(107, 471);
+            this.btnConstruction0500.Location = new System.Drawing.Point(98, 471);
             this.btnConstruction0500.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0500.Name = "btnConstruction0500";
-            this.btnConstruction0500.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0500.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0500.TabIndex = 15;
             this.btnConstruction0500.Text = "å·¥ç¨‹è¡¨ä½œæˆ�ãƒ»å�°åˆ·";
             this.btnConstruction0500.UseVisualStyleBackColor = false;
@@ -5855,10 +5496,10 @@
             // 
             this.btnConstruction0501.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0501.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0501.Location = new System.Drawing.Point(323, 471);
+            this.btnConstruction0501.Location = new System.Drawing.Point(295, 471);
             this.btnConstruction0501.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0501.Name = "btnConstruction0501";
-            this.btnConstruction0501.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0501.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0501.TabIndex = 15;
             this.btnConstruction0501.Text = "æ–½å·¥è¨ˆç”»æ›¸ä½œæˆ�ãƒ»å�°åˆ·";
             this.btnConstruction0501.UseVisualStyleBackColor = false;
@@ -5868,10 +5509,10 @@
             // 
             this.btnConstruction0502.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0502.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0502.Location = new System.Drawing.Point(539, 471);
+            this.btnConstruction0502.Location = new System.Drawing.Point(492, 471);
             this.btnConstruction0502.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0502.Name = "btnConstruction0502";
-            this.btnConstruction0502.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0502.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0502.TabIndex = 15;
             this.btnConstruction0502.Text = "æ–½å·¥ä½“åˆ¶å�°å¸³ä½œæˆ�ãƒ»å�°åˆ·";
             this.btnConstruction0502.UseVisualStyleBackColor = false;
@@ -5881,10 +5522,10 @@
             // 
             this.btnConstruction0503.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0503.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0503.Location = new System.Drawing.Point(755, 471);
+            this.btnConstruction0503.Location = new System.Drawing.Point(689, 471);
             this.btnConstruction0503.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0503.Name = "btnConstruction0503";
-            this.btnConstruction0503.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0503.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0503.TabIndex = 15;
             this.btnConstruction0503.UseVisualStyleBackColor = false;
             this.btnConstruction0503.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5893,10 +5534,10 @@
             // 
             this.btnConstruction0504.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0504.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0504.Location = new System.Drawing.Point(971, 471);
+            this.btnConstruction0504.Location = new System.Drawing.Point(886, 471);
             this.btnConstruction0504.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0504.Name = "btnConstruction0504";
-            this.btnConstruction0504.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0504.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0504.TabIndex = 15;
             this.btnConstruction0504.UseVisualStyleBackColor = false;
             this.btnConstruction0504.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5910,7 +5551,7 @@
             this.lblConstr06.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr06.Location = new System.Drawing.Point(3, 540);
             this.lblConstr06.Name = "lblConstr06";
-            this.lblConstr06.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr06.Size = new System.Drawing.Size(88, 36);
             this.lblConstr06.TabIndex = 15;
             this.lblConstr06.Text = "ç�€å·¥å‰�ãƒ»ä¸­";
             this.lblConstr06.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -5919,10 +5560,10 @@
             // 
             this.btnConstruction0600.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0600.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0600.Location = new System.Drawing.Point(107, 543);
+            this.btnConstruction0600.Location = new System.Drawing.Point(98, 543);
             this.btnConstruction0600.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0600.Name = "btnConstruction0600";
-            this.btnConstruction0600.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0600.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0600.TabIndex = 15;
             this.btnConstruction0600.Text = "å·¥äº‹æ–½å·¥å›³æ‰¿è«¾é¡˜ã�„";
             this.btnConstruction0600.UseVisualStyleBackColor = false;
@@ -5932,10 +5573,10 @@
             // 
             this.btnConstruction0601.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0601.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0601.Location = new System.Drawing.Point(323, 543);
+            this.btnConstruction0601.Location = new System.Drawing.Point(295, 543);
             this.btnConstruction0601.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0601.Name = "btnConstruction0601";
-            this.btnConstruction0601.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0601.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0601.TabIndex = 15;
             this.btnConstruction0601.Text = "å·¥äº‹ä½¿ç”¨æ��æ–™æ‰¿è«¾é¡˜ã�„";
             this.btnConstruction0601.UseVisualStyleBackColor = false;
@@ -5945,10 +5586,10 @@
             // 
             this.btnConstruction0602.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0602.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0602.Location = new System.Drawing.Point(539, 543);
+            this.btnConstruction0602.Location = new System.Drawing.Point(492, 543);
             this.btnConstruction0602.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0602.Name = "btnConstruction0602";
-            this.btnConstruction0602.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0602.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0602.TabIndex = 15;
             this.btnConstruction0602.Text = "å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«ç”³è«‹";
             this.btnConstruction0602.UseVisualStyleBackColor = false;
@@ -5958,10 +5599,10 @@
             // 
             this.btnConstruction0603.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0603.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0603.Location = new System.Drawing.Point(755, 543);
+            this.btnConstruction0603.Location = new System.Drawing.Point(689, 543);
             this.btnConstruction0603.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0603.Name = "btnConstruction0603";
-            this.btnConstruction0603.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0603.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0603.TabIndex = 15;
             this.btnConstruction0603.Text = "ç¤¾å†…æ¤œæŸ»ç”³è«‹";
             this.btnConstruction0603.UseVisualStyleBackColor = false;
@@ -5971,10 +5612,10 @@
             // 
             this.btnConstruction0604.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0604.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0604.Location = new System.Drawing.Point(971, 543);
+            this.btnConstruction0604.Location = new System.Drawing.Point(886, 543);
             this.btnConstruction0604.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0604.Name = "btnConstruction0604";
-            this.btnConstruction0604.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0604.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0604.TabIndex = 15;
             this.btnConstruction0604.UseVisualStyleBackColor = false;
             this.btnConstruction0604.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5983,10 +5624,10 @@
             // 
             this.btnConstruction0700.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0700.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0700.Location = new System.Drawing.Point(107, 615);
+            this.btnConstruction0700.Location = new System.Drawing.Point(98, 615);
             this.btnConstruction0700.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0700.Name = "btnConstruction0700";
-            this.btnConstruction0700.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0700.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0700.TabIndex = 15;
             this.btnConstruction0700.UseVisualStyleBackColor = false;
             this.btnConstruction0700.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -5995,10 +5636,10 @@
             // 
             this.btnConstruction0701.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0701.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0701.Location = new System.Drawing.Point(323, 615);
+            this.btnConstruction0701.Location = new System.Drawing.Point(295, 615);
             this.btnConstruction0701.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0701.Name = "btnConstruction0701";
-            this.btnConstruction0701.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0701.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0701.TabIndex = 15;
             this.btnConstruction0701.UseVisualStyleBackColor = false;
             this.btnConstruction0701.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6007,10 +5648,10 @@
             // 
             this.btnConstruction0702.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0702.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0702.Location = new System.Drawing.Point(539, 615);
+            this.btnConstruction0702.Location = new System.Drawing.Point(492, 615);
             this.btnConstruction0702.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0702.Name = "btnConstruction0702";
-            this.btnConstruction0702.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0702.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0702.TabIndex = 15;
             this.btnConstruction0702.UseVisualStyleBackColor = false;
             this.btnConstruction0702.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6019,10 +5660,10 @@
             // 
             this.btnConstruction0703.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0703.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0703.Location = new System.Drawing.Point(755, 615);
+            this.btnConstruction0703.Location = new System.Drawing.Point(689, 615);
             this.btnConstruction0703.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0703.Name = "btnConstruction0703";
-            this.btnConstruction0703.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0703.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0703.TabIndex = 15;
             this.btnConstruction0703.UseVisualStyleBackColor = false;
             this.btnConstruction0703.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6031,10 +5672,10 @@
             // 
             this.btnConstruction0704.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0704.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0704.Location = new System.Drawing.Point(971, 615);
+            this.btnConstruction0704.Location = new System.Drawing.Point(886, 615);
             this.btnConstruction0704.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0704.Name = "btnConstruction0704";
-            this.btnConstruction0704.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0704.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0704.TabIndex = 15;
             this.btnConstruction0704.UseVisualStyleBackColor = false;
             this.btnConstruction0704.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6048,7 +5689,7 @@
             this.lblConstr08.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr08.Location = new System.Drawing.Point(3, 684);
             this.lblConstr08.Name = "lblConstr08";
-            this.lblConstr08.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr08.Size = new System.Drawing.Size(88, 36);
             this.lblConstr08.TabIndex = 15;
             this.lblConstr08.Text = "ç�€å·¥ä¸­\r\nãƒ»å®Œäº†å¾Œ";
             this.lblConstr08.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6057,10 +5698,10 @@
             // 
             this.btnConstruction0800.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0800.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0800.Location = new System.Drawing.Point(107, 687);
+            this.btnConstruction0800.Location = new System.Drawing.Point(98, 687);
             this.btnConstruction0800.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0800.Name = "btnConstruction0800";
-            this.btnConstruction0800.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0800.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0800.TabIndex = 15;
             this.btnConstruction0800.Text = "å®Œæˆ�å›³æ›¸ä½œæˆ�ãƒ»å�°åˆ·";
             this.btnConstruction0800.UseVisualStyleBackColor = false;
@@ -6070,10 +5711,10 @@
             // 
             this.btnConstruction0801.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0801.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0801.Location = new System.Drawing.Point(323, 687);
+            this.btnConstruction0801.Location = new System.Drawing.Point(295, 687);
             this.btnConstruction0801.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0801.Name = "btnConstruction0801";
-            this.btnConstruction0801.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0801.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0801.TabIndex = 15;
             this.btnConstruction0801.UseVisualStyleBackColor = false;
             this.btnConstruction0801.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6082,10 +5723,10 @@
             // 
             this.btnConstruction0802.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0802.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0802.Location = new System.Drawing.Point(539, 687);
+            this.btnConstruction0802.Location = new System.Drawing.Point(492, 687);
             this.btnConstruction0802.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0802.Name = "btnConstruction0802";
-            this.btnConstruction0802.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0802.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0802.TabIndex = 15;
             this.btnConstruction0802.UseVisualStyleBackColor = false;
             this.btnConstruction0802.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6094,10 +5735,10 @@
             // 
             this.btnConstruction0803.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0803.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0803.Location = new System.Drawing.Point(755, 687);
+            this.btnConstruction0803.Location = new System.Drawing.Point(689, 687);
             this.btnConstruction0803.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0803.Name = "btnConstruction0803";
-            this.btnConstruction0803.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0803.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0803.TabIndex = 15;
             this.btnConstruction0803.UseVisualStyleBackColor = false;
             this.btnConstruction0803.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6106,10 +5747,10 @@
             // 
             this.btnConstruction0804.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0804.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0804.Location = new System.Drawing.Point(971, 687);
+            this.btnConstruction0804.Location = new System.Drawing.Point(886, 687);
             this.btnConstruction0804.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0804.Name = "btnConstruction0804";
-            this.btnConstruction0804.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0804.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0804.TabIndex = 15;
             this.btnConstruction0804.UseVisualStyleBackColor = false;
             this.btnConstruction0804.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6121,7 +5762,7 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstrLine02, 10);
             this.lblConstrLine02.Location = new System.Drawing.Point(3, 771);
             this.lblConstrLine02.Name = "lblConstrLine02";
-            this.lblConstrLine02.Size = new System.Drawing.Size(1164, 6);
+            this.lblConstrLine02.Size = new System.Drawing.Size(1062, 6);
             this.lblConstrLine02.TabIndex = 15;
             // 
             // lblConstrTitle03
@@ -6131,9 +5772,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblConstrTitle03.AutoSize = true;
             this.lblConstrTitle03.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblConstrTitle03.Location = new System.Drawing.Point(106, 792);
+            this.lblConstrTitle03.Location = new System.Drawing.Point(97, 792);
             this.lblConstrTitle03.Name = "lblConstrTitle03";
-            this.lblConstrTitle03.Size = new System.Drawing.Size(192, 36);
+            this.lblConstrTitle03.Size = new System.Drawing.Size(174, 36);
             this.lblConstrTitle03.TabIndex = 15;
             this.lblConstrTitle03.Text = "å�–å¼•å…ˆè«‹æ±‚ç®¡ç�†";
             this.lblConstrTitle03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6147,7 +5788,7 @@
             this.lblConstr09.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr09.Location = new System.Drawing.Point(3, 828);
             this.lblConstr09.Name = "lblConstr09";
-            this.lblConstr09.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr09.Size = new System.Drawing.Size(88, 36);
             this.lblConstr09.TabIndex = 15;
             this.lblConstr09.Text = "å‡ºæ�¥é«˜";
             this.lblConstr09.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6156,10 +5797,10 @@
             // 
             this.btnConstruction0900.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0900.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0900.Location = new System.Drawing.Point(107, 831);
+            this.btnConstruction0900.Location = new System.Drawing.Point(98, 831);
             this.btnConstruction0900.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0900.Name = "btnConstruction0900";
-            this.btnConstruction0900.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0900.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0900.TabIndex = 15;
             this.btnConstruction0900.Text = "è«‹æ±‚ãƒ‡ãƒ¼ã‚¿ä½œæˆ�";
             this.btnConstruction0900.UseVisualStyleBackColor = false;
@@ -6169,10 +5810,10 @@
             // 
             this.btnConstruction0901.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0901.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0901.Location = new System.Drawing.Point(323, 831);
+            this.btnConstruction0901.Location = new System.Drawing.Point(295, 831);
             this.btnConstruction0901.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0901.Name = "btnConstruction0901";
-            this.btnConstruction0901.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0901.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0901.TabIndex = 15;
             this.btnConstruction0901.Text = "è«‹æ±‚æ‰¿èª�";
             this.btnConstruction0901.UseVisualStyleBackColor = false;
@@ -6182,10 +5823,10 @@
             // 
             this.btnConstruction0902.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0902.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0902.Location = new System.Drawing.Point(539, 831);
+            this.btnConstruction0902.Location = new System.Drawing.Point(492, 831);
             this.btnConstruction0902.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0902.Name = "btnConstruction0902";
-            this.btnConstruction0902.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0902.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0902.TabIndex = 15;
             this.btnConstruction0902.Text = "è«‹æ±‚æ›¸å�°åˆ·";
             this.btnConstruction0902.UseVisualStyleBackColor = false;
@@ -6195,10 +5836,10 @@
             // 
             this.btnConstruction0903.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0903.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0903.Location = new System.Drawing.Point(755, 831);
+            this.btnConstruction0903.Location = new System.Drawing.Point(689, 831);
             this.btnConstruction0903.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0903.Name = "btnConstruction0903";
-            this.btnConstruction0903.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction0903.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction0903.TabIndex = 15;
             this.btnConstruction0903.Text = "è«‹æ±‚æ›¸éƒµé€�ãƒ»æ‰‹æ¸¡ã�—ç¢ºèª�";
             this.btnConstruction0903.UseVisualStyleBackColor = false;
@@ -6208,10 +5849,10 @@
             // 
             this.btnConstruction0904.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction0904.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction0904.Location = new System.Drawing.Point(971, 831);
+            this.btnConstruction0904.Location = new System.Drawing.Point(886, 831);
             this.btnConstruction0904.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction0904.Name = "btnConstruction0904";
-            this.btnConstruction0904.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction0904.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction0904.TabIndex = 15;
             this.btnConstruction0904.Text = "å�–å¼•å…ˆå…¥é‡‘ç¢ºèª�";
             this.btnConstruction0904.UseVisualStyleBackColor = false;
@@ -6221,10 +5862,10 @@
             // 
             this.btnConstruction1000.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1000.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1000.Location = new System.Drawing.Point(107, 903);
+            this.btnConstruction1000.Location = new System.Drawing.Point(98, 903);
             this.btnConstruction1000.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1000.Name = "btnConstruction1000";
-            this.btnConstruction1000.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1000.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1000.TabIndex = 15;
             this.btnConstruction1000.Text = "è«‹æ±‚ãƒ‡ãƒ¼ã‚¿ä½œæˆ�";
             this.btnConstruction1000.UseVisualStyleBackColor = false;
@@ -6234,10 +5875,10 @@
             // 
             this.btnConstruction1001.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1001.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1001.Location = new System.Drawing.Point(323, 903);
+            this.btnConstruction1001.Location = new System.Drawing.Point(295, 903);
             this.btnConstruction1001.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1001.Name = "btnConstruction1001";
-            this.btnConstruction1001.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1001.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1001.TabIndex = 15;
             this.btnConstruction1001.Text = "è«‹æ±‚æ‰¿èª�";
             this.btnConstruction1001.UseVisualStyleBackColor = false;
@@ -6247,10 +5888,10 @@
             // 
             this.btnConstruction1002.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1002.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1002.Location = new System.Drawing.Point(539, 903);
+            this.btnConstruction1002.Location = new System.Drawing.Point(492, 903);
             this.btnConstruction1002.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1002.Name = "btnConstruction1002";
-            this.btnConstruction1002.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1002.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1002.TabIndex = 15;
             this.btnConstruction1002.Text = "è«‹æ±‚æ›¸å�°åˆ·";
             this.btnConstruction1002.UseVisualStyleBackColor = false;
@@ -6260,10 +5901,10 @@
             // 
             this.btnConstruction1003.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1003.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1003.Location = new System.Drawing.Point(755, 903);
+            this.btnConstruction1003.Location = new System.Drawing.Point(689, 903);
             this.btnConstruction1003.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1003.Name = "btnConstruction1003";
-            this.btnConstruction1003.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1003.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1003.TabIndex = 15;
             this.btnConstruction1003.Text = "è«‹æ±‚æ›¸éƒµé€�ãƒ»æ‰‹æ¸¡ã�—ç¢ºèª�";
             this.btnConstruction1003.UseVisualStyleBackColor = false;
@@ -6273,10 +5914,10 @@
             // 
             this.btnConstruction1004.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1004.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1004.Location = new System.Drawing.Point(971, 903);
+            this.btnConstruction1004.Location = new System.Drawing.Point(886, 903);
             this.btnConstruction1004.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1004.Name = "btnConstruction1004";
-            this.btnConstruction1004.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction1004.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction1004.TabIndex = 15;
             this.btnConstruction1004.Text = "å�–å¼•å…ˆå…¥é‡‘ç¢ºèª�";
             this.btnConstruction1004.UseVisualStyleBackColor = false;
@@ -6289,7 +5930,7 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstrLine03, 10);
             this.lblConstrLine03.Location = new System.Drawing.Point(3, 987);
             this.lblConstrLine03.Name = "lblConstrLine03";
-            this.lblConstrLine03.Size = new System.Drawing.Size(1164, 6);
+            this.lblConstrLine03.Size = new System.Drawing.Size(1062, 6);
             this.lblConstrLine03.TabIndex = 15;
             // 
             // lblConstrTitle04
@@ -6299,9 +5940,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblConstrTitle04.AutoSize = true;
             this.lblConstrTitle04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblConstrTitle04.Location = new System.Drawing.Point(106, 1008);
+            this.lblConstrTitle04.Location = new System.Drawing.Point(97, 1008);
             this.lblConstrTitle04.Name = "lblConstrTitle04";
-            this.lblConstrTitle04.Size = new System.Drawing.Size(192, 36);
+            this.lblConstrTitle04.Size = new System.Drawing.Size(174, 36);
             this.lblConstrTitle04.TabIndex = 15;
             this.lblConstrTitle04.Text = "å�„æ¥­è€…ãƒ»è�·äººæ”¯æ‰•ã�„ç®¡ç�†";
             this.lblConstrTitle04.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6315,7 +5956,7 @@
             this.lblConstr11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr11.Location = new System.Drawing.Point(3, 1044);
             this.lblConstr11.Name = "lblConstr11";
-            this.lblConstr11.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr11.Size = new System.Drawing.Size(88, 36);
             this.lblConstr11.TabIndex = 15;
             this.lblConstr11.Text = "æ¯Žæœˆ";
             this.lblConstr11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6324,10 +5965,10 @@
             // 
             this.btnConstruction1100.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1100.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1100.Location = new System.Drawing.Point(107, 1047);
+            this.btnConstruction1100.Location = new System.Drawing.Point(98, 1047);
             this.btnConstruction1100.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1100.Name = "btnConstruction1100";
-            this.btnConstruction1100.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1100.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1100.TabIndex = 15;
             this.btnConstruction1100.Text = "æ‰‹é–“æ”¯æ‰•ç¢ºèª�";
             this.btnConstruction1100.UseVisualStyleBackColor = false;
@@ -6337,10 +5978,10 @@
             // 
             this.btnConstruction1101.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1101.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1101.Location = new System.Drawing.Point(323, 1047);
+            this.btnConstruction1101.Location = new System.Drawing.Point(295, 1047);
             this.btnConstruction1101.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1101.Name = "btnConstruction1101";
-            this.btnConstruction1101.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1101.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1101.TabIndex = 15;
             this.btnConstruction1101.Text = "æ¥­è€…æ”¯æ‰•ç¢ºèª�";
             this.btnConstruction1101.UseVisualStyleBackColor = false;
@@ -6350,10 +5991,10 @@
             // 
             this.btnConstruction1102.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1102.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1102.Location = new System.Drawing.Point(539, 1047);
+            this.btnConstruction1102.Location = new System.Drawing.Point(492, 1047);
             this.btnConstruction1102.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1102.Name = "btnConstruction1102";
-            this.btnConstruction1102.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1102.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1102.TabIndex = 15;
             this.btnConstruction1102.UseVisualStyleBackColor = false;
             this.btnConstruction1102.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6362,10 +6003,10 @@
             // 
             this.btnConstruction1103.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1103.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1103.Location = new System.Drawing.Point(755, 1047);
+            this.btnConstruction1103.Location = new System.Drawing.Point(689, 1047);
             this.btnConstruction1103.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1103.Name = "btnConstruction1103";
-            this.btnConstruction1103.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1103.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1103.TabIndex = 15;
             this.btnConstruction1103.UseVisualStyleBackColor = false;
             this.btnConstruction1103.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6374,10 +6015,10 @@
             // 
             this.btnConstruction1104.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1104.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1104.Location = new System.Drawing.Point(971, 1047);
+            this.btnConstruction1104.Location = new System.Drawing.Point(886, 1047);
             this.btnConstruction1104.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1104.Name = "btnConstruction1104";
-            this.btnConstruction1104.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction1104.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction1104.TabIndex = 15;
             this.btnConstruction1104.UseVisualStyleBackColor = false;
             this.btnConstruction1104.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6390,9 +6031,9 @@
             this.lblConstr1102.AutoSize = true;
             this.lblConstr1102.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr1102.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr1102.Location = new System.Drawing.Point(106, 1080);
+            this.lblConstr1102.Location = new System.Drawing.Point(97, 1080);
             this.lblConstr1102.Name = "lblConstr1102";
-            this.lblConstr1102.Size = new System.Drawing.Size(192, 36);
+            this.lblConstr1102.Size = new System.Drawing.Size(174, 36);
             this.lblConstr1102.TabIndex = 15;
             this.lblConstr1102.Text = "â€»æ¯Žæœˆ5æ—¥å¿…ç�€\r\nç¢ºèª�ã�¯8æ—¥ã�¾ã�§";
             this.lblConstr1102.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6405,9 +6046,9 @@
             this.lblConstr1103.AutoSize = true;
             this.lblConstr1103.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr1103.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr1103.Location = new System.Drawing.Point(322, 1080);
+            this.lblConstr1103.Location = new System.Drawing.Point(294, 1080);
             this.lblConstr1103.Name = "lblConstr1103";
-            this.lblConstr1103.Size = new System.Drawing.Size(192, 36);
+            this.lblConstr1103.Size = new System.Drawing.Size(174, 36);
             this.lblConstr1103.TabIndex = 15;
             this.lblConstr1103.Text = "â€»æ¯Žæœˆ5æ—¥å¿…ç�€\r\nç¢ºèª�ã�¯15æ—¥ã�¾ã�§";
             this.lblConstr1103.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6419,7 +6060,7 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstrLine04, 10);
             this.lblConstrLine04.Location = new System.Drawing.Point(3, 1131);
             this.lblConstrLine04.Name = "lblConstrLine04";
-            this.lblConstrLine04.Size = new System.Drawing.Size(1164, 6);
+            this.lblConstrLine04.Size = new System.Drawing.Size(1062, 6);
             this.lblConstrLine04.TabIndex = 15;
             // 
             // lblConstrTitle05
@@ -6429,9 +6070,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblConstrTitle05.AutoSize = true;
             this.lblConstrTitle05.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblConstrTitle05.Location = new System.Drawing.Point(106, 1152);
+            this.lblConstrTitle05.Location = new System.Drawing.Point(97, 1152);
             this.lblConstrTitle05.Name = "lblConstrTitle05";
-            this.lblConstrTitle05.Size = new System.Drawing.Size(192, 36);
+            this.lblConstrTitle05.Size = new System.Drawing.Size(174, 36);
             this.lblConstrTitle05.TabIndex = 15;
             this.lblConstrTitle05.Text = "ã��ã�®ä»–ç®¡ç�†";
             this.lblConstrTitle05.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6445,7 +6086,7 @@
             this.lblConstr12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr12.Location = new System.Drawing.Point(3, 1188);
             this.lblConstr12.Name = "lblConstr12";
-            this.lblConstr12.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr12.Size = new System.Drawing.Size(88, 36);
             this.lblConstr12.TabIndex = 15;
             this.lblConstr12.Text = "é�©æ™‚";
             this.lblConstr12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6454,10 +6095,10 @@
             // 
             this.btnConstruction1200.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1200.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1200.Location = new System.Drawing.Point(107, 1191);
+            this.btnConstruction1200.Location = new System.Drawing.Point(98, 1191);
             this.btnConstruction1200.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1200.Name = "btnConstruction1200";
-            this.btnConstruction1200.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1200.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1200.TabIndex = 15;
             this.btnConstruction1200.Text = "å‡ºç´�å¸³å…¥åŠ›";
             this.btnConstruction1200.UseVisualStyleBackColor = false;
@@ -6467,10 +6108,10 @@
             // 
             this.btnConstruction1201.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1201.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1201.Location = new System.Drawing.Point(323, 1191);
+            this.btnConstruction1201.Location = new System.Drawing.Point(295, 1191);
             this.btnConstruction1201.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1201.Name = "btnConstruction1201";
-            this.btnConstruction1201.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1201.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1201.TabIndex = 15;
             this.btnConstruction1201.UseVisualStyleBackColor = false;
             this.btnConstruction1201.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6479,10 +6120,10 @@
             // 
             this.btnConstruction1202.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1202.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1202.Location = new System.Drawing.Point(539, 1191);
+            this.btnConstruction1202.Location = new System.Drawing.Point(492, 1191);
             this.btnConstruction1202.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1202.Name = "btnConstruction1202";
-            this.btnConstruction1202.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1202.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1202.TabIndex = 15;
             this.btnConstruction1202.UseVisualStyleBackColor = false;
             this.btnConstruction1202.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6491,10 +6132,10 @@
             // 
             this.btnConstruction1203.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1203.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1203.Location = new System.Drawing.Point(755, 1191);
+            this.btnConstruction1203.Location = new System.Drawing.Point(689, 1191);
             this.btnConstruction1203.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1203.Name = "btnConstruction1203";
-            this.btnConstruction1203.Size = new System.Drawing.Size(190, 30);
+            this.btnConstruction1203.Size = new System.Drawing.Size(172, 30);
             this.btnConstruction1203.TabIndex = 15;
             this.btnConstruction1203.UseVisualStyleBackColor = false;
             this.btnConstruction1203.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6503,10 +6144,10 @@
             // 
             this.btnConstruction1204.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.btnConstruction1204.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.btnConstruction1204.Location = new System.Drawing.Point(971, 1191);
+            this.btnConstruction1204.Location = new System.Drawing.Point(886, 1191);
             this.btnConstruction1204.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnConstruction1204.Name = "btnConstruction1204";
-            this.btnConstruction1204.Size = new System.Drawing.Size(195, 30);
+            this.btnConstruction1204.Size = new System.Drawing.Size(178, 30);
             this.btnConstruction1204.TabIndex = 15;
             this.btnConstruction1204.UseVisualStyleBackColor = false;
             this.btnConstruction1204.Click += new System.EventHandler(this.btnConstruction_Click);
@@ -6520,7 +6161,7 @@
             this.lblConstr10.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr10.Location = new System.Drawing.Point(3, 900);
             this.lblConstr10.Name = "lblConstr10";
-            this.lblConstr10.Size = new System.Drawing.Size(97, 36);
+            this.lblConstr10.Size = new System.Drawing.Size(88, 36);
             this.lblConstr10.TabIndex = 15;
             this.lblConstr10.Text = "å®Œäº†å¾Œ";
             this.lblConstr10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6534,9 +6175,9 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstr0102, 5);
             this.lblConstr0102.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr0102.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr0102.Location = new System.Drawing.Point(538, 144);
+            this.lblConstr0102.Location = new System.Drawing.Point(491, 144);
             this.lblConstr0102.Name = "lblConstr0102";
-            this.lblConstr0102.Size = new System.Drawing.Size(629, 36);
+            this.lblConstr0102.Size = new System.Drawing.Size(574, 36);
             this.lblConstr0102.TabIndex = 15;
             this.lblConstr0102.Text = "â€»è©²å½“é …ç›®ã�¯æ¯Žæ—¥è¨˜å…¥ã�™ã‚‹ã�“ã�¨ã€‚";
             this.lblConstr0102.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -6550,9 +6191,9 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstr0202, 5);
             this.lblConstr0202.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr0202.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr0202.Location = new System.Drawing.Point(538, 216);
+            this.lblConstr0202.Location = new System.Drawing.Point(491, 216);
             this.lblConstr0202.Name = "lblConstr0202";
-            this.lblConstr0202.Size = new System.Drawing.Size(629, 36);
+            this.lblConstr0202.Size = new System.Drawing.Size(574, 36);
             this.lblConstr0202.TabIndex = 15;
             this.lblConstr0202.Text = "â€»è³‡æ��é …ç›®ã�¯è²¸å‡ºãƒ»è¿”å�´æ™‚ã�«æ¯Žå›žè¨˜å…¥ã�™ã‚‹ã�“ã�¨ã€‚";
             this.lblConstr0202.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -6566,9 +6207,9 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstr0502, 5);
             this.lblConstr0502.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr0502.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr0502.Location = new System.Drawing.Point(538, 504);
+            this.lblConstr0502.Location = new System.Drawing.Point(491, 504);
             this.lblConstr0502.Name = "lblConstr0502";
-            this.lblConstr0502.Size = new System.Drawing.Size(629, 36);
+            this.lblConstr0502.Size = new System.Drawing.Size(574, 36);
             this.lblConstr0502.TabIndex = 15;
             this.lblConstr0502.Text = "â€»ä¸Šè¨˜é …ç›®ã�¯æ–½å·¥é–‹å§‹ã�¾ã�§ã�«ä½œæˆ�ã�™ã‚‹ã�“ã�¨ã€‚";
             this.lblConstr0502.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -6582,9 +6223,9 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstr0602, 5);
             this.lblConstr0602.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr0602.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr0602.Location = new System.Drawing.Point(538, 576);
+            this.lblConstr0602.Location = new System.Drawing.Point(491, 576);
             this.lblConstr0602.Name = "lblConstr0602";
-            this.lblConstr0602.Size = new System.Drawing.Size(629, 36);
+            this.lblConstr0602.Size = new System.Drawing.Size(574, 36);
             this.lblConstr0602.TabIndex = 15;
             this.lblConstr0602.Text = "â€»ä¸Šè¨˜é …ç›®ã�¯å�„å·¥ç¨®ã�®å…¨ä½“æ–½å·¥ä¸­ã�®æ–½å·¥å‰�ã�¾ã�§ã�«ä½œæˆ�ãƒ»æ��å‡ºã�™ã‚‹ã�“ã�¨ã€‚";
             this.lblConstr0602.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -6598,9 +6239,9 @@
             this.tblLayoutConstruction.SetColumnSpan(this.lblConstr0802, 5);
             this.lblConstr0802.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblConstr0802.ForeColor = System.Drawing.Color.Brown;
-            this.lblConstr0802.Location = new System.Drawing.Point(538, 720);
+            this.lblConstr0802.Location = new System.Drawing.Point(491, 720);
             this.lblConstr0802.Name = "lblConstr0802";
-            this.lblConstr0802.Size = new System.Drawing.Size(629, 36);
+            this.lblConstr0802.Size = new System.Drawing.Size(574, 36);
             this.lblConstr0802.TabIndex = 15;
             this.lblConstr0802.Text = "â€»å®Œæˆ�å›³æ›¸ã�¯å¥‘ç´„å·¥æœŸå†…ã�«å†�æ��å‡ºã‚‚å�«ã‚�ã�¦å®Œäº†ã�™ã‚‹ã�“ã�¨ã€‚";
             this.lblConstr0802.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -6624,7 +6265,7 @@
             this.pnlAffairs.Controls.Add(this.tblLayoutAffairs);
             this.pnlAffairs.Location = new System.Drawing.Point(4, 2);
             this.pnlAffairs.Name = "pnlAffairs";
-            this.pnlAffairs.Size = new System.Drawing.Size(1190, 500);
+            this.pnlAffairs.Size = new System.Drawing.Size(1190, 526);
             this.pnlAffairs.TabIndex = 13;
             // 
             // tblLayoutAffairs
@@ -6704,7 +6345,7 @@
             this.tblLayoutAffairs.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
             this.tblLayoutAffairs.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
             this.tblLayoutAffairs.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
-            this.tblLayoutAffairs.Size = new System.Drawing.Size(1170, 684);
+            this.tblLayoutAffairs.Size = new System.Drawing.Size(1068, 684);
             this.tblLayoutAffairs.TabIndex = 13;
             // 
             // btnAffairs0000
@@ -6713,10 +6354,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0000.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0000.Location = new System.Drawing.Point(107, 39);
+            this.btnAffairs0000.Location = new System.Drawing.Point(98, 39);
             this.btnAffairs0000.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0000.Name = "btnAffairs0000";
-            this.btnAffairs0000.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0000.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0000.TabIndex = 0;
             this.btnAffairs0000.Text = "è¡Œå‹•äºˆå®šå…¥åŠ›";
             this.btnAffairs0000.UseVisualStyleBackColor = false;
@@ -6728,10 +6369,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0001.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0001.Location = new System.Drawing.Point(323, 39);
+            this.btnAffairs0001.Location = new System.Drawing.Point(295, 39);
             this.btnAffairs0001.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0001.Name = "btnAffairs0001";
-            this.btnAffairs0001.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0001.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0001.TabIndex = 0;
             this.btnAffairs0001.Text = "å‡ºå‹¤ç®¡ç�†";
             this.btnAffairs0001.UseVisualStyleBackColor = false;
@@ -6744,9 +6385,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblAffairsTitle01.AutoSize = true;
             this.lblAffairsTitle01.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblAffairsTitle01.Location = new System.Drawing.Point(106, 0);
+            this.lblAffairsTitle01.Location = new System.Drawing.Point(97, 0);
             this.lblAffairsTitle01.Name = "lblAffairsTitle01";
-            this.lblAffairsTitle01.Size = new System.Drawing.Size(192, 36);
+            this.lblAffairsTitle01.Size = new System.Drawing.Size(174, 36);
             this.lblAffairsTitle01.TabIndex = 18;
             this.lblAffairsTitle01.Text = "æ—¥æ¬¡ç®¡ç�†";
             this.lblAffairsTitle01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6757,10 +6398,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0002.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0002.Location = new System.Drawing.Point(539, 39);
+            this.btnAffairs0002.Location = new System.Drawing.Point(492, 39);
             this.btnAffairs0002.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0002.Name = "btnAffairs0002";
-            this.btnAffairs0002.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0002.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0002.TabIndex = 0;
             this.btnAffairs0002.Text = "è»Šä¸¡äºˆç´„";
             this.btnAffairs0002.UseVisualStyleBackColor = false;
@@ -6772,10 +6413,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0003.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0003.Location = new System.Drawing.Point(755, 39);
+            this.btnAffairs0003.Location = new System.Drawing.Point(689, 39);
             this.btnAffairs0003.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0003.Name = "btnAffairs0003";
-            this.btnAffairs0003.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0003.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0003.TabIndex = 0;
             this.btnAffairs0003.UseVisualStyleBackColor = false;
             this.btnAffairs0003.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6786,10 +6427,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0004.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0004.Location = new System.Drawing.Point(971, 39);
+            this.btnAffairs0004.Location = new System.Drawing.Point(886, 39);
             this.btnAffairs0004.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0004.Name = "btnAffairs0004";
-            this.btnAffairs0004.Size = new System.Drawing.Size(195, 30);
+            this.btnAffairs0004.Size = new System.Drawing.Size(178, 30);
             this.btnAffairs0004.TabIndex = 0;
             this.btnAffairs0004.UseVisualStyleBackColor = false;
             this.btnAffairs0004.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6800,10 +6441,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0100.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0100.Location = new System.Drawing.Point(107, 111);
+            this.btnAffairs0100.Location = new System.Drawing.Point(98, 111);
             this.btnAffairs0100.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0100.Name = "btnAffairs0100";
-            this.btnAffairs0100.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0100.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0100.TabIndex = 0;
             this.btnAffairs0100.UseVisualStyleBackColor = false;
             this.btnAffairs0100.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6814,10 +6455,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0101.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0101.Location = new System.Drawing.Point(323, 111);
+            this.btnAffairs0101.Location = new System.Drawing.Point(295, 111);
             this.btnAffairs0101.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0101.Name = "btnAffairs0101";
-            this.btnAffairs0101.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0101.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0101.TabIndex = 0;
             this.btnAffairs0101.UseVisualStyleBackColor = false;
             this.btnAffairs0101.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6828,10 +6469,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0102.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0102.Location = new System.Drawing.Point(539, 111);
+            this.btnAffairs0102.Location = new System.Drawing.Point(492, 111);
             this.btnAffairs0102.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0102.Name = "btnAffairs0102";
-            this.btnAffairs0102.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0102.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0102.TabIndex = 0;
             this.btnAffairs0102.UseVisualStyleBackColor = false;
             this.btnAffairs0102.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6842,10 +6483,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0103.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0103.Location = new System.Drawing.Point(755, 111);
+            this.btnAffairs0103.Location = new System.Drawing.Point(689, 111);
             this.btnAffairs0103.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0103.Name = "btnAffairs0103";
-            this.btnAffairs0103.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0103.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0103.TabIndex = 0;
             this.btnAffairs0103.UseVisualStyleBackColor = false;
             this.btnAffairs0103.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6856,10 +6497,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0104.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0104.Location = new System.Drawing.Point(971, 111);
+            this.btnAffairs0104.Location = new System.Drawing.Point(886, 111);
             this.btnAffairs0104.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0104.Name = "btnAffairs0104";
-            this.btnAffairs0104.Size = new System.Drawing.Size(195, 30);
+            this.btnAffairs0104.Size = new System.Drawing.Size(178, 30);
             this.btnAffairs0104.TabIndex = 0;
             this.btnAffairs0104.UseVisualStyleBackColor = false;
             this.btnAffairs0104.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -6873,7 +6514,7 @@
             this.lblAffairs00.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblAffairs00.Location = new System.Drawing.Point(3, 36);
             this.lblAffairs00.Name = "lblAffairs00";
-            this.lblAffairs00.Size = new System.Drawing.Size(97, 36);
+            this.lblAffairs00.Size = new System.Drawing.Size(88, 36);
             this.lblAffairs00.TabIndex = 19;
             this.lblAffairs00.Text = "æ¯Žæ—¥";
             this.lblAffairs00.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6885,7 +6526,7 @@
             this.tblLayoutAffairs.SetColumnSpan(this.lblAffairsLine01, 10);
             this.lblAffairsLine01.Location = new System.Drawing.Point(3, 195);
             this.lblAffairsLine01.Name = "lblAffairsLine01";
-            this.lblAffairsLine01.Size = new System.Drawing.Size(1164, 6);
+            this.lblAffairsLine01.Size = new System.Drawing.Size(1062, 6);
             this.lblAffairsLine01.TabIndex = 20;
             // 
             // btnAffairs0302
@@ -6894,10 +6535,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0302.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0302.Location = new System.Drawing.Point(539, 327);
+            this.btnAffairs0302.Location = new System.Drawing.Point(492, 327);
             this.btnAffairs0302.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0302.Name = "btnAffairs0302";
-            this.btnAffairs0302.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0302.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0302.TabIndex = 0;
             this.btnAffairs0302.Text = "è«‹æ±‚æ›¸ç™ºé€�çŠ¶æ³�å…¥åŠ›";
             this.btnAffairs0302.UseVisualStyleBackColor = false;
@@ -6909,10 +6550,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0300.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0300.Location = new System.Drawing.Point(107, 327);
+            this.btnAffairs0300.Location = new System.Drawing.Point(98, 327);
             this.btnAffairs0300.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0300.Name = "btnAffairs0300";
-            this.btnAffairs0300.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0300.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0300.TabIndex = 0;
             this.btnAffairs0300.Text = "æ³¨æ–‡æ›¸å�°åˆ·";
             this.btnAffairs0300.UseVisualStyleBackColor = false;
@@ -6924,10 +6565,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0301.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0301.Location = new System.Drawing.Point(323, 327);
+            this.btnAffairs0301.Location = new System.Drawing.Point(295, 327);
             this.btnAffairs0301.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0301.Name = "btnAffairs0301";
-            this.btnAffairs0301.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0301.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0301.TabIndex = 0;
             this.btnAffairs0301.Text = "æ³¨æ–‡æ›¸ç™ºçµ¦çŠ¶æ³�å…¥åŠ›";
             this.btnAffairs0301.UseVisualStyleBackColor = false;
@@ -6939,10 +6580,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0201.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0201.Location = new System.Drawing.Point(323, 255);
+            this.btnAffairs0201.Location = new System.Drawing.Point(295, 255);
             this.btnAffairs0201.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0201.Name = "btnAffairs0201";
-            this.btnAffairs0201.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0201.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0201.TabIndex = 0;
             this.btnAffairs0201.Text = "å·¥äº‹äºˆç®—é–²è¦§";
             this.btnAffairs0201.UseVisualStyleBackColor = false;
@@ -6954,10 +6595,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0200.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0200.Location = new System.Drawing.Point(107, 255);
+            this.btnAffairs0200.Location = new System.Drawing.Point(98, 255);
             this.btnAffairs0200.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0200.Name = "btnAffairs0200";
-            this.btnAffairs0200.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0200.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0200.TabIndex = 0;
             this.btnAffairs0200.Text = "å·¥äº‹æƒ…å ±å…¥åŠ›ãƒ»é–²è¦§";
             this.btnAffairs0200.UseVisualStyleBackColor = false;
@@ -6970,9 +6611,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblAffairsTitle02.AutoSize = true;
             this.lblAffairsTitle02.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblAffairsTitle02.Location = new System.Drawing.Point(106, 216);
+            this.lblAffairsTitle02.Location = new System.Drawing.Point(97, 216);
             this.lblAffairsTitle02.Name = "lblAffairsTitle02";
-            this.lblAffairsTitle02.Size = new System.Drawing.Size(192, 36);
+            this.lblAffairsTitle02.Size = new System.Drawing.Size(174, 36);
             this.lblAffairsTitle02.TabIndex = 18;
             this.lblAffairsTitle02.Text = "æƒ…å ±é–²è¦§å�Šã�³å…¥åŠ›";
             this.lblAffairsTitle02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -6983,10 +6624,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0202.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0202.Location = new System.Drawing.Point(539, 255);
+            this.btnAffairs0202.Location = new System.Drawing.Point(492, 255);
             this.btnAffairs0202.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0202.Name = "btnAffairs0202";
-            this.btnAffairs0202.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0202.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0202.TabIndex = 0;
             this.btnAffairs0202.Text = "è«‹æ±‚çŠ¶æ³�é–²è¦§";
             this.btnAffairs0202.UseVisualStyleBackColor = false;
@@ -6998,10 +6639,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0203.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0203.Location = new System.Drawing.Point(755, 255);
+            this.btnAffairs0203.Location = new System.Drawing.Point(689, 255);
             this.btnAffairs0203.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0203.Name = "btnAffairs0203";
-            this.btnAffairs0203.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0203.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0203.TabIndex = 0;
             this.btnAffairs0203.UseVisualStyleBackColor = false;
             this.btnAffairs0203.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -7012,10 +6653,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0204.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0204.Location = new System.Drawing.Point(971, 255);
+            this.btnAffairs0204.Location = new System.Drawing.Point(886, 255);
             this.btnAffairs0204.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0204.Name = "btnAffairs0204";
-            this.btnAffairs0204.Size = new System.Drawing.Size(195, 30);
+            this.btnAffairs0204.Size = new System.Drawing.Size(178, 30);
             this.btnAffairs0204.TabIndex = 0;
             this.btnAffairs0204.Text = "å�„ç¤¾å“¡å‡ºå‹¤æƒ…å ±é–²è¦§";
             this.btnAffairs0204.UseVisualStyleBackColor = false;
@@ -7027,10 +6668,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0303.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0303.Location = new System.Drawing.Point(755, 327);
+            this.btnAffairs0303.Location = new System.Drawing.Point(689, 327);
             this.btnAffairs0303.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0303.Name = "btnAffairs0303";
-            this.btnAffairs0303.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0303.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0303.TabIndex = 0;
             this.btnAffairs0303.UseVisualStyleBackColor = false;
             this.btnAffairs0303.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -7041,10 +6682,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0304.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0304.Location = new System.Drawing.Point(971, 327);
+            this.btnAffairs0304.Location = new System.Drawing.Point(886, 327);
             this.btnAffairs0304.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0304.Name = "btnAffairs0304";
-            this.btnAffairs0304.Size = new System.Drawing.Size(195, 30);
+            this.btnAffairs0304.Size = new System.Drawing.Size(178, 30);
             this.btnAffairs0304.TabIndex = 0;
             this.btnAffairs0304.UseVisualStyleBackColor = false;
             this.btnAffairs0304.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -7056,7 +6697,7 @@
             this.tblLayoutAffairs.SetColumnSpan(this.lblAffairsLine02, 10);
             this.lblAffairsLine02.Location = new System.Drawing.Point(3, 411);
             this.lblAffairsLine02.Name = "lblAffairsLine02";
-            this.lblAffairsLine02.Size = new System.Drawing.Size(1164, 6);
+            this.lblAffairsLine02.Size = new System.Drawing.Size(1062, 6);
             this.lblAffairsLine02.TabIndex = 20;
             // 
             // btnAffairs0400
@@ -7065,10 +6706,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0400.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0400.Location = new System.Drawing.Point(107, 471);
+            this.btnAffairs0400.Location = new System.Drawing.Point(98, 471);
             this.btnAffairs0400.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0400.Name = "btnAffairs0400";
-            this.btnAffairs0400.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0400.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0400.TabIndex = 0;
             this.btnAffairs0400.Text = "æ‰‹é–“æ”¯æ‰•ç¢ºèª�";
             this.btnAffairs0400.UseVisualStyleBackColor = false;
@@ -7080,10 +6721,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0401.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0401.Location = new System.Drawing.Point(323, 471);
+            this.btnAffairs0401.Location = new System.Drawing.Point(295, 471);
             this.btnAffairs0401.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0401.Name = "btnAffairs0401";
-            this.btnAffairs0401.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0401.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0401.TabIndex = 0;
             this.btnAffairs0401.Text = "æ¥­è€…æ”¯æ‰•ç¢ºèª�";
             this.btnAffairs0401.UseVisualStyleBackColor = false;
@@ -7095,10 +6736,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0402.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0402.Location = new System.Drawing.Point(539, 471);
+            this.btnAffairs0402.Location = new System.Drawing.Point(492, 471);
             this.btnAffairs0402.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0402.Name = "btnAffairs0402";
-            this.btnAffairs0402.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0402.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0402.TabIndex = 0;
             this.btnAffairs0402.Text = "ã�ŠçŸ¥ã‚‰ã�›å…¥åŠ›";
             this.btnAffairs0402.UseVisualStyleBackColor = false;
@@ -7110,10 +6751,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0403.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0403.Location = new System.Drawing.Point(755, 471);
+            this.btnAffairs0403.Location = new System.Drawing.Point(689, 471);
             this.btnAffairs0403.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0403.Name = "btnAffairs0403";
-            this.btnAffairs0403.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0403.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0403.TabIndex = 0;
             this.btnAffairs0403.UseVisualStyleBackColor = false;
             this.btnAffairs0403.Click += new System.EventHandler(this.btnAffairs_Click);
@@ -7124,10 +6765,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0404.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0404.Location = new System.Drawing.Point(971, 471);
+            this.btnAffairs0404.Location = new System.Drawing.Point(886, 471);
             this.btnAffairs0404.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0404.Name = "btnAffairs0404";
-            this.btnAffairs0404.Size = new System.Drawing.Size(195, 30);
+            this.btnAffairs0404.Size = new System.Drawing.Size(178, 30);
             this.btnAffairs0404.TabIndex = 0;
             this.btnAffairs0404.Text = "å�–å¼•å…ˆå…¥é‡‘å…¥åŠ›";
             this.btnAffairs0404.UseVisualStyleBackColor = false;
@@ -7140,9 +6781,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblAffairsTitle03.AutoSize = true;
             this.lblAffairsTitle03.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblAffairsTitle03.Location = new System.Drawing.Point(106, 432);
+            this.lblAffairsTitle03.Location = new System.Drawing.Point(97, 432);
             this.lblAffairsTitle03.Name = "lblAffairsTitle03";
-            this.lblAffairsTitle03.Size = new System.Drawing.Size(192, 36);
+            this.lblAffairsTitle03.Size = new System.Drawing.Size(174, 36);
             this.lblAffairsTitle03.TabIndex = 18;
             this.lblAffairsTitle03.Text = "è«‹æ±‚é–¢ä¿‚å…¥åŠ›ç®¡ç�†";
             this.lblAffairsTitle03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -7156,7 +6797,7 @@
             this.lblAffairs04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblAffairs04.Location = new System.Drawing.Point(3, 468);
             this.lblAffairs04.Name = "lblAffairs04";
-            this.lblAffairs04.Size = new System.Drawing.Size(97, 36);
+            this.lblAffairs04.Size = new System.Drawing.Size(88, 36);
             this.lblAffairs04.TabIndex = 19;
             this.lblAffairs04.Text = "æ¯Žæœˆ";
             this.lblAffairs04.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -7168,7 +6809,7 @@
             this.tblLayoutAffairs.SetColumnSpan(this.lblAffairsLine03, 10);
             this.lblAffairsLine03.Location = new System.Drawing.Point(3, 555);
             this.lblAffairsLine03.Name = "lblAffairsLine03";
-            this.lblAffairsLine03.Size = new System.Drawing.Size(1164, 6);
+            this.lblAffairsLine03.Size = new System.Drawing.Size(1062, 6);
             this.lblAffairsLine03.TabIndex = 20;
             // 
             // lblAffairsTitle04
@@ -7178,9 +6819,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblAffairsTitle04.AutoSize = true;
             this.lblAffairsTitle04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblAffairsTitle04.Location = new System.Drawing.Point(106, 576);
+            this.lblAffairsTitle04.Location = new System.Drawing.Point(97, 576);
             this.lblAffairsTitle04.Name = "lblAffairsTitle04";
-            this.lblAffairsTitle04.Size = new System.Drawing.Size(192, 36);
+            this.lblAffairsTitle04.Size = new System.Drawing.Size(174, 36);
             this.lblAffairsTitle04.TabIndex = 18;
             this.lblAffairsTitle04.Text = "ã��ã�®ä»–ç®¡ç�†";
             this.lblAffairsTitle04.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -7191,10 +6832,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0500.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0500.Location = new System.Drawing.Point(107, 615);
+            this.btnAffairs0500.Location = new System.Drawing.Point(98, 615);
             this.btnAffairs0500.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0500.Name = "btnAffairs0500";
-            this.btnAffairs0500.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0500.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0500.TabIndex = 0;
             this.btnAffairs0500.Text = "å‡ºç´�å¸³å…¥åŠ›";
             this.btnAffairs0500.UseVisualStyleBackColor = false;
@@ -7208,9 +6849,9 @@
             this.lblAffairs0402.AutoSize = true;
             this.lblAffairs0402.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblAffairs0402.ForeColor = System.Drawing.Color.Brown;
-            this.lblAffairs0402.Location = new System.Drawing.Point(106, 504);
+            this.lblAffairs0402.Location = new System.Drawing.Point(97, 504);
             this.lblAffairs0402.Name = "lblAffairs0402";
-            this.lblAffairs0402.Size = new System.Drawing.Size(192, 36);
+            this.lblAffairs0402.Size = new System.Drawing.Size(174, 36);
             this.lblAffairs0402.TabIndex = 18;
             this.lblAffairs0402.Text = "â€»åˆ°ç�€å¾Œé€Ÿã‚„ã�‹ã�«å…¥åŠ›";
             this.lblAffairs0402.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -7223,9 +6864,9 @@
             this.lblAffairs0403.AutoSize = true;
             this.lblAffairs0403.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblAffairs0403.ForeColor = System.Drawing.Color.Brown;
-            this.lblAffairs0403.Location = new System.Drawing.Point(322, 504);
+            this.lblAffairs0403.Location = new System.Drawing.Point(294, 504);
             this.lblAffairs0403.Name = "lblAffairs0403";
-            this.lblAffairs0403.Size = new System.Drawing.Size(192, 36);
+            this.lblAffairs0403.Size = new System.Drawing.Size(174, 36);
             this.lblAffairs0403.TabIndex = 18;
             this.lblAffairs0403.Text = "â€»åˆ°ç�€å¾Œé€Ÿã‚„ã�‹ã�«å…¥åŠ›";
             this.lblAffairs0403.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -7238,9 +6879,9 @@
             this.lblAffairs0404.AutoSize = true;
             this.lblAffairs0404.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblAffairs0404.ForeColor = System.Drawing.Color.Brown;
-            this.lblAffairs0404.Location = new System.Drawing.Point(970, 504);
+            this.lblAffairs0404.Location = new System.Drawing.Point(885, 504);
             this.lblAffairs0404.Name = "lblAffairs0404";
-            this.lblAffairs0404.Size = new System.Drawing.Size(197, 36);
+            this.lblAffairs0404.Size = new System.Drawing.Size(180, 36);
             this.lblAffairs0404.TabIndex = 18;
             this.lblAffairs0404.Text = "â€»åˆ°ç�€å¾Œé€Ÿã‚„ã�‹ã�«å…¥åŠ›";
             this.lblAffairs0404.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -7251,10 +6892,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0501.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0501.Location = new System.Drawing.Point(323, 615);
+            this.btnAffairs0501.Location = new System.Drawing.Point(295, 615);
             this.btnAffairs0501.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0501.Name = "btnAffairs0501";
-            this.btnAffairs0501.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0501.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0501.TabIndex = 0;
             this.btnAffairs0501.Text = "è³‡æ��ä¸€è¦§";
             this.btnAffairs0501.UseVisualStyleBackColor = false;
@@ -7266,10 +6907,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnAffairs0502.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.btnAffairs0502.Location = new System.Drawing.Point(539, 615);
+            this.btnAffairs0502.Location = new System.Drawing.Point(492, 615);
             this.btnAffairs0502.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnAffairs0502.Name = "btnAffairs0502";
-            this.btnAffairs0502.Size = new System.Drawing.Size(190, 30);
+            this.btnAffairs0502.Size = new System.Drawing.Size(172, 30);
             this.btnAffairs0502.TabIndex = 0;
             this.btnAffairs0502.Text = "æ‰‹æŒ�å·¥äº‹é«˜ä¸€è¦§";
             this.btnAffairs0502.UseVisualStyleBackColor = false;
@@ -8794,6 +8435,384 @@
             this.btnHelp.UseVisualStyleBackColor = false;
             this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
             // 
+            // ApprovalColumn02
+            // 
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn02.DefaultCellStyle = dataGridViewCellStyle15;
+            this.ApprovalColumn02.Frozen = true;
+            this.ApprovalColumn02.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
+            this.ApprovalColumn02.Name = "ApprovalColumn02";
+            this.ApprovalColumn02.ReadOnly = true;
+            this.ApprovalColumn02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ApprovalColumn02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn02.Visible = false;
+            this.ApprovalColumn02.Width = 5;
+            // 
+            // ApprovalColumn12
+            // 
+            this.ApprovalColumn12.Frozen = true;
+            this.ApprovalColumn12.HeaderText = "æ‰¿èª�æ©Ÿèƒ½ç•ªå�·";
+            this.ApprovalColumn12.Name = "ApprovalColumn12";
+            this.ApprovalColumn12.ReadOnly = true;
+            this.ApprovalColumn12.Visible = false;
+            this.ApprovalColumn12.Width = 5;
+            // 
+            // Column32
+            // 
+            this.Column32.Frozen = true;
+            this.Column32.HeaderText = "å�—ä»˜ç•ªå�·";
+            this.Column32.Name = "Column32";
+            this.Column32.ReadOnly = true;
+            this.Column32.Visible = false;
+            this.Column32.Width = 5;
+            // 
+            // ApprovalColumn01
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn01.DefaultCellStyle = dataGridViewCellStyle16;
+            this.ApprovalColumn01.Frozen = true;
+            this.ApprovalColumn01.HeaderText = "â„–";
+            this.ApprovalColumn01.Name = "ApprovalColumn01";
+            this.ApprovalColumn01.ReadOnly = true;
+            this.ApprovalColumn01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ApprovalColumn01.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn01.Width = 40;
+            // 
+            // ApprovalColumn03
+            // 
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle17.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn03.DefaultCellStyle = dataGridViewCellStyle17;
+            this.ApprovalColumn03.Frozen = true;
+            this.ApprovalColumn03.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.ApprovalColumn03.Name = "ApprovalColumn03";
+            this.ApprovalColumn03.ReadOnly = true;
+            this.ApprovalColumn03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn03.Width = 280;
+            // 
+            // ApprovalColumn04
+            // 
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle18.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn04.DefaultCellStyle = dataGridViewCellStyle18;
+            this.ApprovalColumn04.Frozen = true;
+            this.ApprovalColumn04.HeaderText = "ç”³è«‹é …ç›®";
+            this.ApprovalColumn04.Name = "ApprovalColumn04";
+            this.ApprovalColumn04.ReadOnly = true;
+            this.ApprovalColumn04.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn04.Width = 130;
+            // 
+            // ApprovalColumn05
+            // 
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle19.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn05.DefaultCellStyle = dataGridViewCellStyle19;
+            this.ApprovalColumn05.Frozen = true;
+            this.ApprovalColumn05.HeaderText = "ç”³ã€€è«‹ã€€è€…";
+            this.ApprovalColumn05.Name = "ApprovalColumn05";
+            this.ApprovalColumn05.ReadOnly = true;
+            this.ApprovalColumn05.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn05.Width = 90;
+            // 
+            // ApprovalColumn06
+            // 
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn06.DefaultCellStyle = dataGridViewCellStyle20;
+            this.ApprovalColumn06.Frozen = true;
+            this.ApprovalColumn06.HeaderText = "ç”³ã€€è«‹ã€€æ—¥";
+            this.ApprovalColumn06.Name = "ApprovalColumn06";
+            this.ApprovalColumn06.ReadOnly = true;
+            this.ApprovalColumn06.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ApprovalColumn06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn06.Width = 90;
+            // 
+            // ApprovalColumn07
+            // 
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle21.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle21.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn07.DefaultCellStyle = dataGridViewCellStyle21;
+            this.ApprovalColumn07.Frozen = true;
+            this.ApprovalColumn07.HeaderText = "æ‰¿èª�å¸Œæœ›æ—¥";
+            this.ApprovalColumn07.Name = "ApprovalColumn07";
+            this.ApprovalColumn07.ReadOnly = true;
+            this.ApprovalColumn07.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ApprovalColumn07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn07.Width = 90;
+            // 
+            // ApprovalColumn08
+            // 
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn08.DefaultCellStyle = dataGridViewCellStyle22;
+            this.ApprovalColumn08.HeaderText = "æ‰¿èª�è€…ï¼‘";
+            this.ApprovalColumn08.Name = "ApprovalColumn08";
+            this.ApprovalColumn08.ReadOnly = true;
+            this.ApprovalColumn08.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn08.Width = 90;
+            // 
+            // ApprovalColumn09
+            // 
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle23.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn09.DefaultCellStyle = dataGridViewCellStyle23;
+            this.ApprovalColumn09.HeaderText = "æ‰¿èª�è€…ï¼’";
+            this.ApprovalColumn09.Name = "ApprovalColumn09";
+            this.ApprovalColumn09.ReadOnly = true;
+            this.ApprovalColumn09.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn09.Width = 90;
+            // 
+            // ApprovalColumn10
+            // 
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle24.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn10.DefaultCellStyle = dataGridViewCellStyle24;
+            this.ApprovalColumn10.HeaderText = "æ‰¿èª�è€…ï¼“";
+            this.ApprovalColumn10.Name = "ApprovalColumn10";
+            this.ApprovalColumn10.ReadOnly = true;
+            this.ApprovalColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn10.Width = 90;
+            // 
+            // ApprovalColumn11
+            // 
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle25.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle25.ForeColor = System.Drawing.Color.Black;
+            this.ApprovalColumn11.DefaultCellStyle = dataGridViewCellStyle25;
+            this.ApprovalColumn11.HeaderText = "æ‰¿èª�è€…ï¼”";
+            this.ApprovalColumn11.Name = "ApprovalColumn11";
+            this.ApprovalColumn11.ReadOnly = true;
+            this.ApprovalColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ApprovalColumn11.Width = 90;
+            // 
+            // Column47
+            // 
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle26.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Black;
+            this.Column47.DefaultCellStyle = dataGridViewCellStyle26;
+            this.Column47.HeaderText = "æ‰¿èª�è€…ï¼•";
+            this.Column47.Name = "Column47";
+            this.Column47.ReadOnly = true;
+            this.Column47.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column47.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn53
+            // 
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle29.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle29.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn53.DefaultCellStyle = dataGridViewCellStyle29;
+            this.dataGridViewTextBoxColumn53.Frozen = true;
+            this.dataGridViewTextBoxColumn53.HeaderText = "æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn53.Name = "dataGridViewTextBoxColumn53";
+            this.dataGridViewTextBoxColumn53.ReadOnly = true;
+            this.dataGridViewTextBoxColumn53.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn53.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn53.Visible = false;
+            this.dataGridViewTextBoxColumn53.Width = 5;
+            // 
+            // Column52
+            // 
+            this.Column52.Frozen = true;
+            this.Column52.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column52.Name = "Column52";
+            this.Column52.ReadOnly = true;
+            this.Column52.Visible = false;
+            this.Column52.Width = 5;
+            // 
+            // Column42
+            // 
+            this.Column42.Frozen = true;
+            this.Column42.HeaderText = "æ‰¿èª�æ©Ÿèƒ½ç•ªå�·";
+            this.Column42.Name = "Column42";
+            this.Column42.ReadOnly = true;
+            this.Column42.Visible = false;
+            this.Column42.Width = 5;
+            // 
+            // Column49
+            // 
+            this.Column49.Frozen = true;
+            this.Column49.HeaderText = "å�—ä»˜æ—¥";
+            this.Column49.Name = "Column49";
+            this.Column49.ReadOnly = true;
+            this.Column49.Visible = false;
+            this.Column49.Width = 5;
+            // 
+            // Column43
+            // 
+            this.Column43.Frozen = true;
+            this.Column43.HeaderText = "å�—ä»˜ç•ªå�·";
+            this.Column43.Name = "Column43";
+            this.Column43.ReadOnly = true;
+            this.Column43.Visible = false;
+            this.Column43.Width = 5;
+            // 
+            // Column45
+            // 
+            this.Column45.Frozen = true;
+            this.Column45.HeaderText = "ãƒ‡ãƒ¼ã‚¿æ¤œç´¢ã‚­ãƒ¼ï¼‘";
+            this.Column45.Name = "Column45";
+            this.Column45.ReadOnly = true;
+            this.Column45.Visible = false;
+            this.Column45.Width = 5;
+            // 
+            // Column46
+            // 
+            this.Column46.Frozen = true;
+            this.Column46.HeaderText = "ãƒ‡ãƒ¼ã‚¿æ¤œç´¢ã‚­ãƒ¼ï¼’";
+            this.Column46.Name = "Column46";
+            this.Column46.ReadOnly = true;
+            this.Column46.Visible = false;
+            this.Column46.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn54
+            // 
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle30.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle30.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn54.DefaultCellStyle = dataGridViewCellStyle30;
+            this.dataGridViewTextBoxColumn54.Frozen = true;
+            this.dataGridViewTextBoxColumn54.HeaderText = "â„–";
+            this.dataGridViewTextBoxColumn54.Name = "dataGridViewTextBoxColumn54";
+            this.dataGridViewTextBoxColumn54.ReadOnly = true;
+            this.dataGridViewTextBoxColumn54.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn54.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn54.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn55
+            // 
+            this.dataGridViewTextBoxColumn55.Frozen = true;
+            this.dataGridViewTextBoxColumn55.HeaderText = "ç”³ã€€è«‹ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn55.Name = "dataGridViewTextBoxColumn55";
+            this.dataGridViewTextBoxColumn55.ReadOnly = true;
+            this.dataGridViewTextBoxColumn55.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn55.Width = 280;
+            // 
+            // dataGridViewTextBoxColumn57
+            // 
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle31.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle31.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn57.DefaultCellStyle = dataGridViewCellStyle31;
+            this.dataGridViewTextBoxColumn57.Frozen = true;
+            this.dataGridViewTextBoxColumn57.HeaderText = "ç”³è«‹é …ç›®";
+            this.dataGridViewTextBoxColumn57.Name = "dataGridViewTextBoxColumn57";
+            this.dataGridViewTextBoxColumn57.ReadOnly = true;
+            this.dataGridViewTextBoxColumn57.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn57.Width = 130;
+            // 
+            // Column44
+            // 
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column44.DefaultCellStyle = dataGridViewCellStyle32;
+            this.Column44.Frozen = true;
+            this.Column44.HeaderText = "ç”³ã€€è«‹ã€€è€…";
+            this.Column44.Name = "Column44";
+            this.Column44.ReadOnly = true;
+            this.Column44.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column44.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn58
+            // 
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle33.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle33.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn58.DefaultCellStyle = dataGridViewCellStyle33;
+            this.dataGridViewTextBoxColumn58.Frozen = true;
+            this.dataGridViewTextBoxColumn58.HeaderText = "ç”³ã€€è«‹ã€€æ—¥";
+            this.dataGridViewTextBoxColumn58.Name = "dataGridViewTextBoxColumn58";
+            this.dataGridViewTextBoxColumn58.ReadOnly = true;
+            this.dataGridViewTextBoxColumn58.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn58.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn58.Width = 90;
+            // 
+            // Column41
+            // 
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle34.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle34.ForeColor = System.Drawing.Color.Black;
+            this.Column41.DefaultCellStyle = dataGridViewCellStyle34;
+            this.Column41.Frozen = true;
+            this.Column41.HeaderText = "æ‰¿èª�å¸Œæœ›æ—¥";
+            this.Column41.Name = "Column41";
+            this.Column41.ReadOnly = true;
+            this.Column41.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column41.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column41.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn59
+            // 
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle35.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle35.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn59.DefaultCellStyle = dataGridViewCellStyle35;
+            this.dataGridViewTextBoxColumn59.HeaderText = "æ‰¿èª�è€…ï¼‘";
+            this.dataGridViewTextBoxColumn59.Name = "dataGridViewTextBoxColumn59";
+            this.dataGridViewTextBoxColumn59.ReadOnly = true;
+            this.dataGridViewTextBoxColumn59.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn59.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn60
+            // 
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle36.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle36.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn60.DefaultCellStyle = dataGridViewCellStyle36;
+            this.dataGridViewTextBoxColumn60.HeaderText = "æ‰¿èª�è€…ï¼’";
+            this.dataGridViewTextBoxColumn60.Name = "dataGridViewTextBoxColumn60";
+            this.dataGridViewTextBoxColumn60.ReadOnly = true;
+            this.dataGridViewTextBoxColumn60.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn60.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn61
+            // 
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle37.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle37.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn61.DefaultCellStyle = dataGridViewCellStyle37;
+            this.dataGridViewTextBoxColumn61.HeaderText = "æ‰¿èª�è€…ï¼“";
+            this.dataGridViewTextBoxColumn61.Name = "dataGridViewTextBoxColumn61";
+            this.dataGridViewTextBoxColumn61.ReadOnly = true;
+            this.dataGridViewTextBoxColumn61.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn61.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn62
+            // 
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle38.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle38.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn62.DefaultCellStyle = dataGridViewCellStyle38;
+            this.dataGridViewTextBoxColumn62.HeaderText = "æ‰¿èª�è€…ï¼”";
+            this.dataGridViewTextBoxColumn62.Name = "dataGridViewTextBoxColumn62";
+            this.dataGridViewTextBoxColumn62.ReadOnly = true;
+            this.dataGridViewTextBoxColumn62.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn62.Width = 90;
+            // 
+            // Column48
+            // 
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle39.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle39.ForeColor = System.Drawing.Color.Black;
+            this.Column48.DefaultCellStyle = dataGridViewCellStyle39;
+            this.Column48.HeaderText = "æ‰¿èª�è€…ï¼•";
+            this.Column48.Name = "Column48";
+            this.Column48.ReadOnly = true;
+            this.Column48.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column48.Width = 90;
+            // 
             // FrmMenu
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -9401,6 +9420,18 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn41;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn42;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn43;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.ComboBox comboBox3;
+        private System.Windows.Forms.ComboBox comboBox4;
+        private System.Windows.Forms.ComboBox comboBox5;
+        private System.Windows.Forms.ComboBox comboBox6;
+        private System.Windows.Forms.ComboBox comboBox7;
+        private System.Windows.Forms.Button btnAffairs0502;
+        private System.Windows.Forms.Button btnType2_71;
+        private System.Windows.Forms.Button btnType2_73;
+        private System.Windows.Forms.Button btnType2_74;
+        private System.Windows.Forms.Button btnType2_72;
         private System.Windows.Forms.DataGridViewTextBoxColumn ApprovalColumn02;
         private System.Windows.Forms.DataGridViewTextBoxColumn ApprovalColumn12;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column32;
@@ -9433,18 +9464,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn61;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn62;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column48;
-        private System.Windows.Forms.ComboBox comboBox1;
-        private System.Windows.Forms.ComboBox comboBox2;
-        private System.Windows.Forms.ComboBox comboBox3;
-        private System.Windows.Forms.ComboBox comboBox4;
-        private System.Windows.Forms.ComboBox comboBox5;
-        private System.Windows.Forms.ComboBox comboBox6;
-        private System.Windows.Forms.ComboBox comboBox7;
-        private System.Windows.Forms.Button btnAffairs0502;
-        private System.Windows.Forms.Button btnType2_71;
-        private System.Windows.Forms.Button btnType2_73;
-        private System.Windows.Forms.Button btnType2_74;
-        private System.Windows.Forms.Button btnType2_72;
     }
 }
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 483)
@@ -1047,7 +1047,7 @@
         /// <param name="e"></param>
         private async void FrmMenu_Shown(object sender, EventArgs e)
         {
-            await Task.Delay(300);
+            await Task.Delay(100);
 
             switch (ProductDefine.ProductType)
             {
@@ -2714,6 +2714,117 @@
         }
         #endregion
 
+        #region ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+
+        #region å·¥äº‹æ‰¿èª�ã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// å·¥äº‹æ‰¿èª�ã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvApproval_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGridApp1((DataGridView)sender);
+        }
+        #endregion
+
+        #region æ‹…å½“è€…æ‰¿èª�ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// æ‹…å½“è€…æ‰¿èª�ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvPersonApp_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGridApp2((DataGridView)sender);
+        }
+        #endregion
+
+        #region å®Œäº†å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// å®Œäº†å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvCompletionOfConstruction_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
+        #region é�žå�—æ³¨å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// é�žå�—æ³¨å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvNonOrders_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
+        #region å�—æ³¨å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// å�—æ³¨å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvConstructionProjects_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
+        #region å¢—æ¸›å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// å¢—æ¸›å·¥äº‹ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvFluctuationProjects_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
+        #region äºˆç®—å�–ã‚Šæ¡ˆä»¶ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// äºˆç®—å�–ã‚Šæ¡ˆä»¶ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvBudgetUp_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
+        #region å…¥æœ­æ¡ˆä»¶ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// å…¥æœ­æ¡ˆä»¶ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvTenders_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+
+        #region å·¥äº‹æ¡ˆä»¶ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// <summary>
+        /// å·¥äº‹æ¡ˆä»¶ã‚½ãƒ¼ãƒˆã‚¤ãƒ™ãƒ³ãƒˆ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvSalesInProjects_Sorted(object sender, EventArgs e)
+        {
+            ReNumberGrid((DataGridView)sender);
+        }
+        #endregion
+        #endregion
+
         #region ãƒ˜ãƒ«ãƒ—ãƒœã‚¿ãƒ³
         private FrmHelp helpfrm = null;
         /// <summary>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 483)
@@ -570,6 +570,72 @@
         }
         #endregion
 
+        #region ã‚°ãƒªãƒƒãƒ‰ã�®ç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ã�®ç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
+        /// </summary>
+        private void ReNumberGrid(DataGridView dgv)
+        {
+            try
+            {
+                long lNo = 1;
+                foreach(DataGridViewRow CurRow in dgv.Rows)
+                {
+                    int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[(int)MenuGridCount.ConstructionCode].Value);
+                    if (nConstrCode < 1) continue;
+
+                    CurRow.Cells[(int)MenuGridCount.ConstrNo].Value = lNo++;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ã�®ç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
+        /// </summary>
+        private void ReNumberGridApp1(DataGridView dgv)
+        {
+            try
+            {
+                long lNo = 1;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    int nAppNo = CommonMotions.cnvInt(CurRow.Cells[(int)ConstrAppGridCount.ApprovalCode].Value);
+                    if (nAppNo < 1) continue;
+
+                    CurRow.Cells[(int)ConstrAppGridCount.DisplayNo].Value = lNo++;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ã�®ç•ªå�·ã‚’æŒ¯ã‚Šã�ªã�Šã�™
+        /// </summary>
+        private void ReNumberGridApp2(DataGridView dgv)
+        {
+            try
+            {
+                long lNo = 1;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    int nAppNo = CommonMotions.cnvInt(CurRow.Cells[(int)PersonAppGridCount.ApprovalCode].Value);
+                    if (nAppNo < 1) continue;
+
+                    CurRow.Cells[(int)PersonAppGridCount.DisplayNo].Value = lNo++;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ãƒžã‚¹ã‚¿ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã‚¿ãƒ–è¡¨ç¤ºåˆ¶å¾¡
         /// <summary>
         /// ãƒžã‚¹ã‚¿ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã‚¿ãƒ–è¡¨ç¤ºåˆ¶å¾¡
@@ -3588,6 +3654,7 @@
                     case (int)ClsExcute.ApprovalListNo.Late:                                // 21:é�…ã€€åˆ»
                     case (int)ClsExcute.ApprovalListNo.LeaveEarly:                          // 22:æ—©ã€€é€€
                     case (int)ClsExcute.ApprovalListNo.GoOut:                               // 23:å¤–ã€€å‡º
+                    case (int)ClsExcute.ApprovalListNo.UniqueDay:                           // 24:ç‰¹æ®Šä¼‘æš‡
                         petitionDetail = string.Format("{0}å¹´{1}æœˆ {2}å›žç›® {3}", CommonMotions.cnvTruncate(iOrderDate / 100)
                                                                                 , (iOrderDate % 100).ToString("00")
                                                                                 , iOrderNo
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 482)
+++ trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 483)
@@ -139,8 +139,12 @@
     <Compile Include="DataModel\AttNoticeConstrction.cs" />
     <Compile Include="DataModel\AttendanceNoticeLink.cs" />
     <Compile Include="DataModel\AttendanceNotice.cs" />
+    <Compile Include="DataModel\BillingCostDataLink.cs" />
     <Compile Include="DataModel\CalenderDate.cs" />
     <Compile Include="DataModel\BeforeCreatingLedger.cs" />
+    <Compile Include="DataModel\CostDataTargetTypeExpenses.cs" />
+    <Compile Include="DataModel\CostDataType.cs" />
+    <Compile Include="DataModel\CostDataOfCompensation.cs" />
     <Compile Include="DataModel\MailContentsMaster.cs" />
     <Compile Include="DataModel\SubConMailQueue.cs" />
     <Compile Include="DataModel\SubContrMailDelivery.cs" />
@@ -248,6 +252,10 @@
     <Compile Include="DB\IOAccess\IOAttendanceNoticeLink.cs" />
     <Compile Include="DB\IOAccess\IOAttendanceNotice.cs" />
     <Compile Include="DB\IOAccess\IOBeforeCreatingLedger.cs" />
+    <Compile Include="DB\IOAccess\IOBillingCostDataLink.cs" />
+    <Compile Include="DB\IOAccess\IOMCostDataTargetTypeExpenses.cs" />
+    <Compile Include="DB\IOAccess\IOMCostDataType.cs" />
+    <Compile Include="DB\IOAccess\IOCostDataOfCompensation.cs" />
     <Compile Include="DB\IOAccess\IOMMailContentsMaster.cs" />
     <Compile Include="DB\IOAccess\IOMConsumptionTax.cs" />
     <Compile Include="DB\IOAccess\IOSubConMailQueue.cs" />
@@ -430,9 +438,18 @@
     <Compile Include="Forms\DataEntry\DepartmentCost\FrmDepartmentCost.designer.cs">
       <DependentUpon>FrmDepartmentCost.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\DataEntry\DepartmentCost\FrmDepCostDetail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\DataEntry\DepartmentCost\FrmDepCostSection.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DataEntry\DepartmentCost\FrmDepartmentCostAux.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\DataEntry\DepartmentCost\ProcessControl.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DataEntry\DepExpenssList\FrmDepExpenssList.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -889,6 +906,12 @@
     <Compile Include="Forms\DataEntry\Request\RequestSumList\FrmReqSumListAux.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\DataEntry\Request\RequestSumList\FrmSelectTarget.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\DataEntry\Request\RequestSumList\FrmSelectTarget.Designer.cs">
+      <DependentUpon>FrmSelectTarget.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\DataEntry\Request\RequestSumList\ProcessControl.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1177,10 +1200,10 @@
     <Compile Include="Forms\SubForms\FrmPeriodAvoidance.designer.cs">
       <DependentUpon>FrmPeriodAvoidance.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\SubForms\FrmConstrProgDiag.cs">
+    <Compile Include="Forms\DataEntry\ConstructionBaseInfo\FrmConstrProgDiag.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\SubForms\FrmConstrProgDiag.Designer.cs">
+    <Compile Include="Forms\DataEntry\ConstructionBaseInfo\FrmConstrProgDiag.Designer.cs">
       <DependentUpon>FrmConstrProgDiag.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\SubForms\FrmSelectCalenderData.cs">
@@ -1863,6 +1886,9 @@
     <EmbeddedResource Include="Forms\DataEntry\Request\RequestSumList\FrmReqSumList.resx">
       <DependentUpon>FrmReqSumList.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\DataEntry\Request\RequestSumList\FrmSelectTarget.resx">
+      <DependentUpon>FrmSelectTarget.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\DataEntry\Request\SalesConfirm\FrmSalesConfirm.resx">
       <DependentUpon>FrmSalesConfirm.cs</DependentUpon>
     </EmbeddedResource>
@@ -1977,7 +2003,7 @@
     <EmbeddedResource Include="Forms\SubForms\FrmPeriodAvoidance.resx">
       <DependentUpon>FrmPeriodAvoidance.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SubForms\FrmConstrProgDiag.resx">
+    <EmbeddedResource Include="Forms\DataEntry\ConstructionBaseInfo\FrmConstrProgDiag.resx">
       <DependentUpon>FrmConstrProgDiag.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\SubForms\FrmSelectCalenderData.resx">
