Index: branches/src/DataCheckExcute/DataCheckExcute/Common/Process/ClsSystemOnceExecute.cs
===================================================================
--- branches/src/DataCheckExcute/DataCheckExcute/Common/Process/ClsSystemOnceExecute.cs	(revision 322)
+++ branches/src/DataCheckExcute/DataCheckExcute/Common/Process/ClsSystemOnceExecute.cs	(revision 323)
@@ -1149,45 +1149,74 @@
         private bool UpDateSystemMaster()
         {
             IOMSystem SystemDB = new IOMSystem();
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
                 SystemDB.connect(); SystemDB.beginTran();
+                BizHisDB.connect(); BizHisDB.beginTran();
+
                 StringBuilder strSQL = new StringBuilder();
-
                 // å–¶æ¥­æœŸæ›´æ–°
-                strSQL.Append("Select SystemCode, BusinessPeriod, BusinessBeginningDate From systemmaster");
-                strSQL.Append(" Where DATE_FORMAT(NOW(), '%m/%d') = BusinessBeginningDate");
-                ArrayList arList = new ArrayList();
-                if (SystemDB.ExecuteReader(strSQL.ToString(), ref arList, false) && arList.Count > 0)
+                strSQL.Append(" Where DATE(NOW()) = DATE (BusinessCompDate)");
+                List<SystemMaster> SystemList = new List<SystemMaster>();
+                SystemDB.SelectAction(strSQL.ToString(), ref SystemList, false);
+                if (SystemList.Count > 0)
                 {
-                    object[] objRec = (object[])arList[0];
-                    int syscode = CommonMotions.cnvInt(objRec[0]);
-                    int BusinessPeriod = CommonMotions.cnvInt(objRec[1]);
-                    if (!SystemDB.UpdateFeild(syscode, (int)IOMSystem.SystemColumn.BUSINESSPERIOD, ++BusinessPeriod, false))
+                    SystemMaster BizSysRec = SystemList[0];
+                    strSQL.Clear();
+                    strSQL.AppendFormat(" Where SystemCode = {0}", BizSysRec.SystemCode);
+
+                    BizSysRec.BusinessPeriod++;
+                    BizSysRec.BusinessBeginDate = BizSysRec.BusinessCompDate.AddDays(1);
+                    BizSysRec.BusinessCompDate = BizSysRec.BusinessCompDate.AddYears(1);
+                    if (!SystemDB.UpdateAction(strSQL.ToString(), BizSysRec, false))
                     {
                         SystemDB.rollback();
                         return false;
                     }
+
+                    /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+                    if (!BizPeriodHistoryDataEntry(BizHisDB, BizSysRec, (int)BizPeriodHistory.PeriodFlagDef.BizPeriod))
+                    {
+                        SystemDB.rollback();
+                        BizHisDB.rollback();
+                        return false;
+                    }
                 }
 
                 // å·¥äº‹å¹´åº¦æ›´æ–°
                 strSQL.Clear();
-                strSQL.Append("Select SystemCode, ConstructionYear, ConstructionBeginningDate From systemmaster");
-                strSQL.Append(" Where DATE_FORMAT(NOW(), '%m/%d') = ConstructionBeginningDate");
-                arList.Clear();
-                if (SystemDB.ExecuteReader(strSQL.ToString(), ref arList, false) && arList.Count > 0)
+                strSQL.Append(" Where DATE(NOW()) = DATE (ConstrCompDate)");
+                SystemList.Clear();
+                SystemDB.SelectAction(strSQL.ToString(), ref SystemList, false);
+                if (SystemList.Count > 0)
                 {
-                    object[] objRec = (object[])arList[0];
-                    int syscode = CommonMotions.cnvInt(objRec[0]);
-                    int ConstrBeginDate = CommonMotions.cnvInt(objRec[1]);
-                    if (!SystemDB.UpdateFeild(syscode, (int)IOMSystem.SystemColumn.ConstructionYear, ++ConstrBeginDate, false))
+                    SystemMaster ConstrSysRec = SystemList[0];
+                    strSQL.Clear();
+                    strSQL.AppendFormat(" Where SystemCode = {0}", ConstrSysRec.SystemCode);
+
+                    ConstrSysRec.ConstrYear++;
+                    ConstrSysRec.ConstrBeginDate = ConstrSysRec.ConstrCompDate.AddDays(1);
+                    ConstrSysRec.ConstrCompDate = ConstrSysRec.ConstrCompDate.AddYears(1);
+                    if (!SystemDB.UpdateAction(strSQL.ToString(), ConstrSysRec, false))
                     {
                         SystemDB.rollback();
+                        BizHisDB.rollback();
                         return false;
                     }
+
+
+                    /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+                    if (!BizPeriodHistoryDataEntry(BizHisDB, ConstrSysRec, (int)BizPeriodHistory.PeriodFlagDef.ConstrYear))
+                    {
+                        SystemDB.rollback();
+                        BizHisDB.rollback();
+                        return false;
+                    }
                 }
 
                 SystemDB.commit();
+                BizHisDB.commit();
                 return true;
             }
             catch (Exception ex)
@@ -1198,8 +1227,101 @@
             finally
             {
                 SystemDB.close(); SystemDB = null;
+                BizHisDB.close(); BizHisDB = null;
             }
         }
         #endregion
+
+        #region é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+        /// <summary>
+        /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+        /// </summary>
+        /// <returns></returns>
+        private bool BizPeriodHistoryDataEntry(IOMBizPeriodHistory BizHisDB, SystemMaster SysRec, int nPeriodFlag)
+        {
+            try
+            {
+
+                int nData = 0;
+                DateTime[] dtData = new DateTime[2];
+                StringBuilder strSQL = new StringBuilder();
+                for (int ix = 0; ix < 2; ix++)
+                {
+                    switch (nPeriodFlag)
+                    {
+                        case (int)BizPeriodHistory.PeriodFlagDef.BizPeriod:
+                            if (ix == 0)
+                            {
+                                nData = SysRec.BusinessPeriod;
+                                dtData[0] = SysRec.BusinessBeginDate;
+                                dtData[1] = SysRec.BusinessCompDate;
+                            }
+                            else
+                            {
+                                nData = SysRec.BusinessPeriod + 1;
+                                dtData[0] = SysRec.BusinessCompDate.AddDays(1);
+                                dtData[1] = SysRec.BusinessCompDate.AddYears(1);
+                            }
+                            break;
+                        case (int)BizPeriodHistory.PeriodFlagDef.ConstrYear:
+                            if (ix == 0)
+                            {
+                                nData = SysRec.ConstrYear;
+                                dtData[0] = SysRec.ConstrBeginDate;
+                                dtData[1] = SysRec.ConstrCompDate;
+                            }
+                            else
+                            {
+                                nData = SysRec.ConstrYear + 1;
+                                dtData[0] = SysRec.ConstrCompDate.AddDays(1);
+                                dtData[1] = SysRec.ConstrCompDate.AddYears(1);
+                            }
+                            break;
+                    }
+
+                    strSQL.Clear();
+                    strSQL.Append(BizHisDB.CreatePrimarykeyString(nData, nPeriodFlag));
+                    List<BizPeriodHistory> BizHisList = new List<BizPeriodHistory>();
+                    if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisList))
+                    {
+                        return false;
+                    }
+
+                    BizPeriodHistory BizHisRec = new BizPeriodHistory();
+                    BizHisRec.PeriodYear = nData;               // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
+                    BizHisRec.PeriodFlag = nPeriodFlag;         // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+
+                    BizHisRec.BeginDate = dtData[0];            // æœŸé¦–æ—¥
+                    BizHisRec.CompleteDate = dtData[1];         // æœŸæœ«æ—¥
+
+                    if (BizHisList.Count < 1)
+                    {
+                        // ãƒ‡ãƒ¼ã‚¿ã�Œã�ªã�„å ´å�ˆ
+                        // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
+                        if (!BizHisDB.InsertAction(BizHisRec))
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚‹å ´å�ˆ
+                        // ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                        if (!BizHisDB.UpdateAction(strSQL.ToString(), BizHisRec))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/DataCheckExcute/DataCheckExcute/DataCheckExcute.csproj
===================================================================
--- branches/src/DataCheckExcute/DataCheckExcute/DataCheckExcute.csproj	(revision 322)
+++ branches/src/DataCheckExcute/DataCheckExcute/DataCheckExcute.csproj	(revision 323)
@@ -103,6 +103,9 @@
     <Compile Include="..\..\ProcessManagement\ProcessManagement\DataModel\BillingPaymentSummary.cs">
       <Link>DataModel\BillingPaymentSummary.cs</Link>
     </Compile>
+    <Compile Include="..\..\ProcessManagement\ProcessManagement\DataModel\BizPeriodHistory.cs">
+      <Link>DataModel\BizPeriodHistory.cs</Link>
+    </Compile>
     <Compile Include="..\..\ProcessManagement\ProcessManagement\DataModel\BusinessTypeMaster.cs">
       <Link>DataModel\BusinessTypeMaster.cs</Link>
     </Compile>
@@ -250,6 +253,9 @@
     <Compile Include="..\..\ProcessManagement\ProcessManagement\DataModel\ExpensesMaster.cs">
       <Link>DataModel\ExpensesMaster.cs</Link>
     </Compile>
+    <Compile Include="..\..\ProcessManagement\ProcessManagement\DataModel\GridCellStyleMember.cs">
+      <Link>DataModel\GridCellStyleMember.cs</Link>
+    </Compile>
     <Compile Include="..\..\ProcessManagement\ProcessManagement\DataModel\HolidayCalenderMaster.cs">
       <Link>DataModel\HolidayCalenderMaster.cs</Link>
     </Compile>
@@ -550,6 +556,9 @@
     <Compile Include="..\..\ProcessManagement\ProcessManagement\DB\IOAccess\IOMaterialTypes.cs">
       <Link>DB\IOAccess\IOMaterialTypes.cs</Link>
     </Compile>
+    <Compile Include="..\..\ProcessManagement\ProcessManagement\DB\IOAccess\IOMBizPeriodHistory.cs">
+      <Link>DB\IOAccess\IOMBizPeriodHistory.cs</Link>
+    </Compile>
     <Compile Include="..\..\ProcessManagement\ProcessManagement\DB\IOAccess\IOMBusinessType.cs">
       <Link>DB\IOAccess\IOMBusinessType.cs</Link>
     </Compile>
Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 323)
@@ -1630,33 +1630,6 @@
         }
         #endregion
 
-        #region æ—¥ä»˜ã‚ˆã‚Šå¹´ã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// æ—¥ä»˜ã‚ˆã‚Šå¹´ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        /// <returns></returns>
-        public static int DateToPeriodYear(DateTime TargetDate)
-        {
-            try
-            {
-                // ä»Šã�®å¹´ã‚’å�–å¾—ã�™ã‚‹
-                int iYear = DateTime.Now.Year;
-                // ä»Šå¹´ã�®æœŸé¦–æ—¥ã‚’å�–å¾—ã�™ã‚‹
-                DateTime BeginninDate = DateTime.Parse(iYear.ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginningDate);
-                // æ—¥ä»˜ã‚’ä»Šå¹´ã�®æœŸé¦–æ—¥ã�¨æ¯”è¼ƒã�—ã�¦å°�ã�•ã�„å ´å�ˆã�¯ä»Šã�®å¹´ã‚ˆã‚Š-1ã�—ã�¦æœŸé¦–å¹´ã‚’æ±‚ã‚�ã‚‹
-                if (TargetDate.Date < BeginninDate.Date)
-                    --iYear;
-
-                return iYear;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return 0;
-            }
-        }
-        #endregion
-
         #region æœŸæ•°ã�‹ã‚‰æœŸã�®å¹´ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
         /// æœŸæ•°ã�‹ã‚‰æœŸã�®å¹´ã‚’å�–å¾—ã�™ã‚‹
@@ -1665,26 +1638,23 @@
         /// <returns></returns>
         public static int PeriodCountToYear(int PeriodCount)
         {
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
                 // ä»Šã�®å¹´ã‚’å�–å¾—ã�™ã‚‹
                 int iYear = DateTime.Now.Year;
-                // ä»Šå¹´ã�®æœŸé¦–æ—¥ã‚’å�–å¾—ã�™ã‚‹
-                DateTime BeginninDate = DateTime.Parse(iYear.ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginningDate);
-                // ä»Šæ—¥ã‚’ä»Šå¹´ã�®æœŸé¦–æ—¥ã�¨æ¯”è¼ƒã�—ã�¦å°�ã�•ã�„å ´å�ˆã�¯ä»Šã�®å¹´ã‚ˆã‚Š-1ã�—ã�¦æœŸé¦–å¹´ã‚’æ±‚ã‚�ã‚‹
-                if (DateTime.Now.Date < BeginninDate.Date)
-                    --iYear;
 
-                // ç®¡ç�†ãƒžã‚¹ã‚¿ã�®æœŸæ•°ã�¨æ¯”è¼ƒã�—ã�¦å¹´ã‚’è¨ˆç®—ã�™ã‚‹
-                if (PeriodCount < CommonMotions.SystemMasterData.BusinessPeriod)
-                {
-                    iYear -= (CommonMotions.SystemMasterData.BusinessPeriod - PeriodCount);
-                }
-                else if (PeriodCount > CommonMotions.SystemMasterData.BusinessPeriod)
-                {
-                    iYear += (PeriodCount - CommonMotions.SystemMasterData.BusinessPeriod);
-                }
+                StringBuilder strSQL = new StringBuilder();
+                BizPeriodHistory BizHisRec = new BizPeriodHistory();
 
+                // å–¶æ¥­æœŸ
+                strSQL.Append(BizHisDB.CreatePrimarykeyString(PeriodCount, (int)BizPeriodHistory.PeriodFlagDef.BizPeriod));
+
+                // é�‹å–¶æœŸå±¥æ­´æƒ…å ±èª­è¾¼
+                if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisRec)) return iYear;
+
+                iYear = BizHisRec.BeginDate.Year;
+
                 return iYear;
             }
             catch (Exception ex)
@@ -1692,6 +1662,10 @@
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
                 return 0;
             }
+            finally
+            {
+                BizHisDB.close(); BizHisDB = null;
+            }
         }
         #endregion
 
@@ -1738,7 +1712,7 @@
             if (m_systemMaster.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod)
                 nRetVal = m_systemMaster.BusinessPeriod;
             else
-                nRetVal = m_systemMaster.ConstructionYear;
+                nRetVal = m_systemMaster.ConstrYear;
             try
             {
 
@@ -1902,12 +1876,8 @@
                 diffwork = Period - CommonMotions.SystemMasterData.BusinessPeriod;
 
                 // æœŸé¦–æœˆã‚’å�–å¾—ã�™ã‚‹
-                strwork = CommonMotions.SystemMasterData.BusinessBeginningDate;
-                strwork = strwork.Substring(0, strwork.IndexOf("/"));
+                Beginning = CommonMotions.SystemMasterData.BusinessBeginDate.Month;
 
-                // æœŸé¦–æœˆã‚’æ•°å€¤å¤‰æ�›
-                Beginning = CommonMotions.cnvInt(strwork);
-
                 // å¹´æ•°ã‚’æ±‚ã‚�ã‚‹
                 DateTime dateWork = DateTime.Now;
                 int nowMounth = DateTime.Now.Month;
@@ -2255,23 +2225,18 @@
                     diffwork = years - CommonMotions.SystemMasterData.BusinessPeriod;
 
                     // æœŸé¦–æœˆã‚’å�–å¾—ã�™ã‚‹
-                    strwork = CommonMotions.SystemMasterData.BusinessBeginningDate;
-                    strwork = strwork.Substring(0, strwork.IndexOf("/"));
+                    Beginning = CommonMotions.SystemMasterData.BusinessBeginDate.Month;
                 }
                 else
                 {   // ----- å–¶æ¥­å¹´åº¦ãƒ™ãƒ¼ã‚¹ã�®æ™‚
 
                     // ç�¾åœ¨æœŸã�¨ã�®å·®åˆ†ã‚’æ±‚ã‚�ã‚‹
-                    diffwork = years - CommonMotions.SystemMasterData.ConstructionYear;
+                    diffwork = years - CommonMotions.SystemMasterData.ConstrYear;
 
                     // æœŸé¦–æœˆã‚’å�–å¾—ã�™ã‚‹
-                    strwork = CommonMotions.SystemMasterData.ConstructionBeginningDate;
-                    strwork = strwork.Substring(0, strwork.IndexOf("/"));
+                    Beginning = CommonMotions.SystemMasterData.ConstrBeginDate.Month;
                 }
 
-                // æœŸé¦–æœˆã‚’æ•°å€¤å¤‰æ�›
-                Beginning = CommonMotions.cnvInt(strwork);
-
                 // å¹´æ•°ã‚’æ±‚ã‚�ã‚‹
                 DateTime dateWork = DateTime.Now;
                 int nowMounth = DateTime.Now.Month;
@@ -2300,23 +2265,20 @@
         /// <param name="bPeriod"></param>
         /// <param name="Mounth"></param>
         /// <param name="Days"></param>
-        public static void GetBeginningMonthDay(bool bPeriod, ref int Mounth, ref int Days)
+        public static void GetNowBeginMonthDay(bool bPeriod, ref int Mounth, ref int Days)
         {
             try
             {
-                string strwork = string.Empty;
                 if (bPeriod)
                 {   // å–¶æ¥­æœŸ
-                    strwork = CommonMotions.SystemMasterData.BusinessBeginningDate;
+                    Mounth = CommonMotions.SystemMasterData.BusinessBeginDate.Month;
+                    Days = CommonMotions.SystemMasterData.BusinessBeginDate.Day;
                 }
                 else
                 {   // å·¥äº‹å¹´åº¦
-                    strwork = CommonMotions.SystemMasterData.ConstructionBeginningDate;
+                    Mounth = CommonMotions.SystemMasterData.ConstrBeginDate.Month;
+                    Days = CommonMotions.SystemMasterData.ConstrBeginDate.Day;
                 }
-                string[] strArray = strwork.Split('/');
-                Mounth = CommonMotions.cnvInt(strArray[0]);
-                Days = CommonMotions.cnvInt(strArray[1]);
-
             }
             catch (System.Exception ex)
             {
@@ -2335,34 +2297,36 @@
         /// <returns></returns>
         public static DateTime GetOpeningEndDate(int nYear, bool bOpen = true, bool bPeriod = true)
         {
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
-                DateTime dtRet = DateTime.Today;
+                DateTime dtRet = DateTime.Now.Date;
 
-                string strwork = string.Empty;
-                int TargetYear = DateTime.Today.Year;
+                StringBuilder strSQL = new StringBuilder();
+                BizPeriodHistory BizHisRec = new BizPeriodHistory();
 
                 if (bPeriod)
                 {   // å–¶æ¥­æœŸ
-                    strwork = CommonMotions.SystemMasterData.BusinessBeginningDate;
-                    TargetYear = BusinessPeriodToConstructionYears(nYear);
+                    strSQL.Append(BizHisDB.CreatePrimarykeyString(nYear, (int)BizPeriodHistory.PeriodFlagDef.BizPeriod));
                 }
                 else
                 {   // å·¥äº‹å¹´åº¦
-                    strwork = CommonMotions.SystemMasterData.ConstructionBeginningDate;
-                    TargetYear = nYear;
+                    strSQL.Append(BizHisDB.CreatePrimarykeyString(nYear, (int)BizPeriodHistory.PeriodFlagDef.ConstrYear));
                 }
-                // æœˆãƒ»æ—¥åˆ†å‰²
-                string[] DateArray = strwork.Split('/');
 
-                // å¹´æœˆæ—¥ä½œæˆ�
-                dtRet = new DateTime(TargetYear, int.Parse(DateArray[0]), int.Parse(DateArray[1]));
+                // é�‹å–¶æœŸå±¥æ­´æƒ…å ±èª­è¾¼
+                if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisRec)) return dtRet;
 
-                // æœŸæœ«å�–å¾—æ™‚
-                if (!bOpen)
+                if (bOpen)
                 {
-                    dtRet = dtRet.AddYears(1).AddDays(-1);
+                    // æœŸé¦–å�–å¾—æ™‚
+                    dtRet = BizHisRec.BeginDate;
                 }
+                else
+                {
+                    // æœŸæœ«å�–å¾—æ™‚
+                    dtRet = BizHisRec.CompleteDate;
+                }
 
                 return dtRet;
             }
@@ -2371,6 +2335,10 @@
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
                 return DateTime.Today;
             }
+            finally
+            {
+                BizHisDB.close(); BizHisDB = null;
+            }
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 323)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 146;
+        public static int s_SystemVersion = 148;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs	(revision 323)
@@ -1158,45 +1158,74 @@
         private bool UpDateSystemMaster()
         {
             IOMSystem SystemDB = new IOMSystem();
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
                 SystemDB.connect(); SystemDB.beginTran();
+                BizHisDB.connect(); BizHisDB.beginTran();
+
                 StringBuilder strSQL = new StringBuilder();
-
                 // å–¶æ¥­æœŸæ›´æ–°
-                strSQL.Append("Select SystemCode, BusinessPeriod, BusinessBeginningDate From systemmaster");
-                strSQL.Append(" Where DATE_FORMAT(NOW(), '%m/%d') = BusinessBeginningDate");
-                ArrayList arList = new ArrayList();
-                if (SystemDB.ExecuteReader(strSQL.ToString(), ref arList, false) && arList.Count > 0)
+                strSQL.Append(" Where DATE(NOW()) = DATE (BusinessCompDate)");
+                List<SystemMaster> SystemList = new List<SystemMaster>();
+                SystemDB.SelectAction(strSQL.ToString(), ref SystemList, false);
+                if (SystemList.Count > 0)
                 {
-                    object[] objRec = (object[])arList[0];
-                    int syscode = CommonMotions.cnvInt(objRec[0]);
-                    int BusinessPeriod = CommonMotions.cnvInt(objRec[1]);
-                    if (!SystemDB.UpdateFeild(syscode, (int)IOMSystem.SystemColumn.BUSINESSPERIOD, ++BusinessPeriod, false))
+                    SystemMaster BizSysRec = SystemList[0];
+                    strSQL.Clear();
+                    strSQL.AppendFormat(" Where SystemCode = {0}", BizSysRec.SystemCode);
+
+                    BizSysRec.BusinessPeriod++;
+                    BizSysRec.BusinessBeginDate = BizSysRec.BusinessCompDate.AddDays(1);
+                    BizSysRec.BusinessCompDate = BizSysRec.BusinessCompDate.AddYears(1);
+                    if (!SystemDB.UpdateAction(strSQL.ToString(), BizSysRec, false))
                     {
                         SystemDB.rollback();
                         return false;
                     }
+
+                    /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+                    if (!BizPeriodHistoryDataEntry(BizHisDB, BizSysRec, (int)BizPeriodHistory.PeriodFlagDef.BizPeriod))
+                    {
+                        SystemDB.rollback();
+                        BizHisDB.rollback();
+                        return false;
+                    }
                 }
 
                 // å·¥äº‹å¹´åº¦æ›´æ–°
                 strSQL.Clear();
-                strSQL.Append("Select SystemCode, ConstructionYear, ConstructionBeginningDate From systemmaster");
-                strSQL.Append(" Where DATE_FORMAT(NOW(), '%m/%d') = ConstructionBeginningDate");
-                arList.Clear();
-                if (SystemDB.ExecuteReader(strSQL.ToString(), ref arList, false) && arList.Count > 0)
+                strSQL.Append(" Where DATE(NOW()) = DATE (ConstrCompDate)");
+                SystemList.Clear();
+                SystemDB.SelectAction(strSQL.ToString(), ref SystemList, false);
+                if (SystemList.Count > 0)
                 {
-                    object[] objRec = (object[])arList[0];
-                    int syscode = CommonMotions.cnvInt(objRec[0]);
-                    int ConstrBeginDate = CommonMotions.cnvInt(objRec[1]);
-                    if (!SystemDB.UpdateFeild(syscode, (int)IOMSystem.SystemColumn.ConstructionYear, ++ConstrBeginDate, false))
+                    SystemMaster ConstrSysRec = SystemList[0];
+                    strSQL.Clear();
+                    strSQL.AppendFormat(" Where SystemCode = {0}", ConstrSysRec.SystemCode);
+
+                    ConstrSysRec.ConstrYear++;
+                    ConstrSysRec.ConstrBeginDate = ConstrSysRec.ConstrCompDate.AddDays(1);
+                    ConstrSysRec.ConstrCompDate = ConstrSysRec.ConstrCompDate.AddYears(1);
+                    if (!SystemDB.UpdateAction(strSQL.ToString(), ConstrSysRec, false))
                     {
                         SystemDB.rollback();
+                        BizHisDB.rollback();
                         return false;
                     }
+
+
+                    /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+                    if (!BizPeriodHistoryDataEntry(BizHisDB, ConstrSysRec, (int)BizPeriodHistory.PeriodFlagDef.ConstrYear))
+                    {
+                        SystemDB.rollback();
+                        BizHisDB.rollback();
+                        return false;
+                    }
                 }
 
                 SystemDB.commit();
+                BizHisDB.commit();
                 return true;
             }
             catch (Exception ex)
@@ -1207,8 +1236,101 @@
             finally
             {
                 SystemDB.close(); SystemDB = null;
+                BizHisDB.close(); BizHisDB = null;
             }
         }
         #endregion
+
+        #region é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+        /// <summary>
+        /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+        /// </summary>
+        /// <returns></returns>
+        private bool BizPeriodHistoryDataEntry(IOMBizPeriodHistory BizHisDB, SystemMaster SysRec, int nPeriodFlag)
+        {
+            try
+            {
+
+                int nData = 0;
+                DateTime[] dtData = new DateTime[2];
+                StringBuilder strSQL = new StringBuilder();
+                for (int ix = 0; ix < 2; ix++)
+                {
+                    switch (nPeriodFlag)
+                    {
+                        case (int)BizPeriodHistory.PeriodFlagDef.BizPeriod:
+                            if (ix == 0)
+                            {
+                                nData = SysRec.BusinessPeriod;
+                                dtData[0] = SysRec.BusinessBeginDate;
+                                dtData[1] = SysRec.BusinessCompDate;
+                            }
+                            else
+                            {
+                                nData = SysRec.BusinessPeriod + 1;
+                                dtData[0] = SysRec.BusinessCompDate.AddDays(1);
+                                dtData[1] = SysRec.BusinessCompDate.AddYears(1);
+                            }
+                            break;
+                        case (int)BizPeriodHistory.PeriodFlagDef.ConstrYear:
+                            if (ix == 0)
+                            {
+                                nData = SysRec.ConstrYear;
+                                dtData[0] = SysRec.ConstrBeginDate;
+                                dtData[1] = SysRec.ConstrCompDate;
+                            }
+                            else
+                            {
+                                nData = SysRec.ConstrYear + 1;
+                                dtData[0] = SysRec.ConstrCompDate.AddDays(1);
+                                dtData[1] = SysRec.ConstrCompDate.AddYears(1);
+                            }
+                            break;
+                    }
+
+                    strSQL.Clear();
+                    strSQL.Append(BizHisDB.CreatePrimarykeyString(nData, nPeriodFlag));
+                    List<BizPeriodHistory> BizHisList = new List<BizPeriodHistory>();
+                    if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisList))
+                    {
+                        return false;
+                    }
+
+                    BizPeriodHistory BizHisRec = new BizPeriodHistory();
+                    BizHisRec.PeriodYear = nData;               // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
+                    BizHisRec.PeriodFlag = nPeriodFlag;         // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+
+                    BizHisRec.BeginDate = dtData[0];            // æœŸé¦–æ—¥
+                    BizHisRec.CompleteDate = dtData[1];         // æœŸæœ«æ—¥
+
+                    if (BizHisList.Count < 1)
+                    {
+                        // ãƒ‡ãƒ¼ã‚¿ã�Œã�ªã�„å ´å�ˆ
+                        // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
+                        if (!BizHisDB.InsertAction(BizHisRec))
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚‹å ´å�ˆ
+                        // ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                        if (!BizHisDB.UpdateAction(strSQL.ToString(), BizHisRec))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 323)
@@ -973,23 +973,18 @@
                     diffwork = PeriodValue - CommonMotions.SystemMasterData.BusinessPeriod;
 
                     // æœŸé¦–æœˆã‚’å�–å¾—ã�™ã‚‹
-                    strwork = CommonMotions.SystemMasterData.BusinessBeginningDate;
-                    strwork = strwork.Substring(0, strwork.IndexOf("/"));
+                    Beginning = CommonMotions.SystemMasterData.BusinessBeginDate.Month;
                 }
                 else
                 {   // ----- å–¶æ¥­å¹´åº¦ãƒ™ãƒ¼ã‚¹ã�®æ™‚
 
                     // ç�¾åœ¨æœŸã�¨ã�®å·®åˆ†ã‚’æ±‚ã‚�ã‚‹
-                    diffwork = PeriodValue - CommonMotions.SystemMasterData.ConstructionYear;
+                    diffwork = PeriodValue - CommonMotions.SystemMasterData.ConstrYear;
 
                     // æœŸé¦–æœˆã‚’å�–å¾—ã�™ã‚‹
-                    strwork = CommonMotions.SystemMasterData.ConstructionBeginningDate;
-                    strwork = strwork.Substring(0, strwork.IndexOf("/"));
+                    Beginning = CommonMotions.SystemMasterData.ConstrBeginDate.Month;
                 }
 
-                // æœŸé¦–æœˆã‚’æ•°å€¤å¤‰æ�›
-                Beginning = CommonMotions.cnvInt(strwork);
-
                 // å¹´æ•°ã‚’æ±‚ã‚�ã‚‹
                 DateTime dateWork = DateTime.Now;
                 int nowMounth = DateTime.Now.Month;
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMBizPeriodHistory.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMBizPeriodHistory.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMBizPeriodHistory.cs	(revision 323)
@@ -0,0 +1,425 @@
+ï»¿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 IOMBizPeriodHistory : MySqlProcess
+    {
+        #region å®šç¾©éƒ¨
+        /// <summary>
+        /// log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
+        /// </summary>
+        public enum TableColumn
+        {
+            PeriodYear = 0,
+            PeriodFlag,
+            BeginDate,
+            CompleteDate,
+            EntryDate,
+            UpdateDate
+        }
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        /// <param name="ConnectionString"></param>
+        public IOMBizPeriodHistory()
+            : base(DBCommon.Instance.DBConnectString)
+        {
+        }
+
+        #endregion
+
+        #region é�‹å–¶æœŸå±¥æ­´æƒ…å ±æ¤œç´¢æ–‡å­—ä½œæˆ�
+        /// <summary>
+        /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±æ¤œç´¢æ–‡å­—ä½œæˆ�
+        /// </summary>
+        /// <param name="AddSQLString">æ¤œç´¢æ�¡ä»¶SQLæ–‡å­—åˆ—</param>
+        /// <param name="data">ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        private string CreateSelectSQL()
+        {
+            // SQLä½œæˆ�
+            StringBuilder strcmd = new StringBuilder();
+            strcmd.Append("SELECT");
+            strcmd.Append(" PeriodYear");
+            strcmd.Append(", PeriodFlag");
+            strcmd.Append(", BeginDate");
+            strcmd.Append(", CompleteDate");
+            strcmd.Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
+            strcmd.Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
+            strcmd.Append(" FROM BizPeriodHistory");
+
+            return strcmd.ToString();
+        }
+        #endregion
+
+        #region é�‹å–¶æœŸå±¥æ­´æƒ…å ±æ¤œç´¢ï¼ˆè¤‡æ•°ï¼‰
+        /// <summary>
+        /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±æ¤œç´¢ï¼ˆè¤‡æ•°ï¼‰
+        /// </summary>
+        /// <param name="AddSQLString"></param>
+        /// <param name="data"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public bool SelectAction(string AddSQLString, ref List<BizPeriodHistory> 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)
+                {
+                    BizPeriodHistory work = new BizPeriodHistory();
+                    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>
+        /// <param name="AddSQLString"></param>
+        /// <param name="data"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public bool SelectAction(string AddSQLString, ref BizPeriodHistory 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;
+                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(BizPeriodHistory data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.Append("INSERT INTO BizPeriodHistory");
+
+                strcmd.Append("(");
+                bool bFirst = true;
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bFirst) strcmd.Append(" ,");
+                    strcmd.Append(gender.ToString());
+                    bFirst = false;
+                }
+                strcmd.Append(") VALUES (");
+
+                strcmd.AppendFormat("  {0}", data.PeriodYear);
+                strcmd.AppendFormat(", {0}", data.PeriodFlag);
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.BeginDate.ToShortDateString());
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.CompleteDate.ToShortDateString());
+
+                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);
+
+                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>
+        /// <param name="data">ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
+        public bool InsertAction(List<BizPeriodHistory> data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                bool bColFirst = true;
+                strcmd.Append("INSERT INTO BizPeriodHistory");
+                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 (BizPeriodHistory work in data)
+                {
+                    if (bDataFirst) strcmd.Append(" (");
+                    else strcmd.Append(", (");
+
+                    strcmd.AppendFormat("  {0}", work.PeriodYear);
+                    strcmd.AppendFormat(", {0}", work.PeriodFlag);
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.BeginDate.ToShortDateString());
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.CompleteDate.ToShortDateString());
+
+                    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(), false)) 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, BizPeriodHistory data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+
+                strcmd.Append("UPDATE BizPeriodHistory");
+
+                strcmd.Append(" SET");
+
+                strcmd.AppendFormat(" PeriodYear = {0}", data.PeriodYear);
+                strcmd.AppendFormat(", PeriodFlag = {0}", data.PeriodFlag);
+                strcmd.AppendFormat(", BeginDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.BeginDate.ToShortDateString());
+                strcmd.AppendFormat(", CompleteDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.CompleteDate.ToShortDateString());
+
+                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 SystemCode, int FeildNo, object value, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.Append("UPDATE BizPeriodHistory");
+
+                strcmd.Append(" SET");
+                switch (FeildNo)
+                {
+                    case (int)TableColumn.PeriodYear:
+                        strcmd.AppendFormat(" PeriodYear = {0}", ((int)value).ToString());
+                        break;
+                    case (int)TableColumn.PeriodFlag:
+                        strcmd.AppendFormat(" PeriodFlag = {0}", ((int)value).ToString());
+                        break;
+                    case (int)TableColumn.BeginDate:
+                        strcmd.AppendFormat(" BeginDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
+                    case (int)TableColumn.CompleteDate:
+                        strcmd.AppendFormat(" CompleteDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
+                }
+
+                strcmd.Append(", UpdateDate = NOW()");
+                strcmd.AppendFormat(" Where SystemCode = {0}", SystemCode);
+
+                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("DELETE FROM BizPeriodHistory{0}", 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="wrk">æ§‹é€ ä½“</param>
+        public void Reader2Struct(object[] objwrk, ref BizPeriodHistory wrk)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                wrk.PeriodYear = int.Parse(objwrk[(int)TableColumn.PeriodYear].ToString());
+                wrk.PeriodFlag = int.Parse(objwrk[(int)TableColumn.PeriodFlag].ToString());
+                wrk.BeginDate = DateTime.Parse(objwrk[(int)TableColumn.BeginDate].ToString());
+                wrk.CompleteDate = DateTime.Parse(objwrk[(int)TableColumn.CompleteDate].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>
+        /// <param name="ComponentCode"></param>
+        /// <param name="DetailNo"></param>
+        /// <returns></returns>
+        public string CreatePrimarykeyString(int PeriodYear, int PeriodFlag = 0)
+        {
+            StringBuilder strWork = new StringBuilder();
+            try
+            {
+                strWork.AppendFormat(" Where PeriodYear = {0}", PeriodYear);
+                if (PeriodFlag > 0)
+                {
+                    strWork.AppendFormat(" And PeriodFlag = {0}", PeriodFlag);
+                }
+
+                return strWork.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
+                return string.Empty;
+            }
+        }
+        #endregion
+    }
+}
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSystem.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSystem.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSystem.cs	(revision 323)
@@ -34,31 +34,30 @@
         /// </summary>
         public enum SystemColumn
         {
-            SYSTEMCODE = 0,
-            COMPANYNAME1,
-            COMPANYNAME2,
-            CEONAME,
-            CEOPOSITIONNAME,
-            ZIPCODE,
-            ADDRESS1,
-            ADDRESS2,
-            ADDRESS3,
-            PHONENUMBER,
-            FAXNUMBER,
-            HOMEPAGEURL,
-            CONSTRUCTIONEXPENSES,
-            OFFICEEXPENSES,
-            OPERATINGEXPENSES,
-            CONSUMPTIONTAX,
-            COOPERATIONRATE,
-            STATUTORYWELFARERATE,
+            SystemCode = 0,
+            CompanyName1,
+            CompanyName2,
+            CEOName,
+            CEOPositionName,
+            ZipCode,
+            Address1,
+            Address2,
+            Address3,
+            PhoneNumber,
+            FaxNumber,
+            HomePageURL,
+            ConsumptionTax,
+            CooperationRate,
+            StatutoryWelfareRate,
             FuelPrice,
             AreaDistance,
-            EXCELSAVEPATH,
-            BUSINESSPERIOD,
-            ConstructionYear,
-            BusinessBeginningDate,
-            ConstructionBeginningDate,
+            ExcelSavePath,
+            BusinessPeriod,
+            ConstrYear,
+            BusinessBeginDate,
+            ConstrBeginDate,
+            BusinessCompDate,
+            ConstrCompDate,
             ConstructionNoBase,
             SloganString1,
             SloganString2,
@@ -93,34 +92,33 @@
             StringBuilder strcmd = new StringBuilder();
             strcmd.Append("SELECT");
             strcmd.Append(" SystemCode");
-            strcmd.Append(", CompanyName1");
-            strcmd.Append(", CompanyName2");
-            strcmd.Append(", CEOName");
-            strcmd.Append(", CEOPositionName");
-            strcmd.Append(", ZipCode");
-            strcmd.Append(", Address1");
-            strcmd.Append(", Address2");
-            strcmd.Append(", Address3");
-            strcmd.Append(", PhoneNumber");
-            strcmd.Append(", FaxNumber");
-            strcmd.Append(", HomePageURL");
-            strcmd.Append(", ConstructionExpenses");
-            strcmd.Append(", OfficeExpenses");
-            strcmd.Append(", OperatingExpenses");
-            strcmd.Append(", ConsumptionTax");
-            strcmd.Append(", CooperationRate");
-            strcmd.Append(", StatutoryWelfareRate");
-            strcmd.Append(", FuelPrice");
-            strcmd.Append(", AreaDistance");
-            strcmd.Append(", ExcelSavePath");
-            strcmd.Append(", BusinessPeriod");
-            strcmd.Append(", ConstructionYear");
-            strcmd.Append(", BusinessBeginningDate");
-            strcmd.Append(", ConstructionBeginningDate");
-            strcmd.Append(", ConstructionNoBase");
-            strcmd.Append(", SloganString1");
-            strcmd.Append(", SloganString2");
-            strcmd.Append(", SloganString3");
+            strcmd.Append(",CompanyName1");
+            strcmd.Append(",CompanyName2");
+            strcmd.Append(",CEOName");
+            strcmd.Append(",CEOPositionName");
+            strcmd.Append(",ZipCode");
+            strcmd.Append(",Address1");
+            strcmd.Append(",Address2");
+            strcmd.Append(",Address3");
+            strcmd.Append(",PhoneNumber");
+            strcmd.Append(",FaxNumber");
+            strcmd.Append(",HomePageURL");
+            strcmd.Append(",ConsumptionTax");
+            strcmd.Append(",CooperationRate");
+            strcmd.Append(",StatutoryWelfareRate");
+            strcmd.Append(",FuelPrice");
+            strcmd.Append(",AreaDistance");
+            strcmd.Append(",ExcelSavePath");
+            strcmd.Append(",BusinessPeriod");
+            strcmd.Append(",ConstrYear");
+            strcmd.Append(",BusinessBeginDate");
+            strcmd.Append(",ConstrBeginDate");
+            strcmd.Append(",BusinessCompDate");
+            strcmd.Append(",ConstrCompDate");
+            strcmd.Append(",ConstructionNoBase");
+            strcmd.Append(",SloganString1");
+            strcmd.Append(",SloganString2");
+            strcmd.Append(",SloganString3");
             strcmd.Append(" ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
             strcmd.Append(" ,DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
             strcmd.Append(" FROM SystemMaster");
@@ -210,10 +208,78 @@
         }
         #endregion
 
-        #region ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿è¿½åŠ 
+        #region ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿è¿½åŠ ï¼ˆ1ä»¶ï¼‰
         /// <summary>
-        /// ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿è¿½åŠ 
+        /// ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿è¿½åŠ ï¼ˆ1ä»¶ï¼‰
         /// </summary>
+        public bool InsertAction(SystemMaster data, bool bConnect = true)
+        {
+            StringBuilder strcmd = new StringBuilder();
+            try
+            {
+                strcmd.Append("INSERT INTO SystemMaster");
+
+                strcmd.Append("(");
+                bool bFirst = true;
+                foreach (var gender in Enum.GetValues(typeof(SystemColumn)))
+                {
+                    if (!bFirst) strcmd.Append(" ,");
+                    strcmd.Append(gender.ToString());
+                    bFirst = false;
+                }
+                strcmd.Append(") VALUES (");
+
+                strcmd.AppendFormat("  {0}", data.SystemCode);
+                strcmd.AppendFormat(",'{0}'", data.CompanyName1);
+                strcmd.AppendFormat(",'{0}'", data.CompanyName2);
+                strcmd.AppendFormat(",'{0}'", data.CEOName);
+                strcmd.AppendFormat(",'{0}'", data.CEOPositionName);
+                strcmd.AppendFormat(",'{0}'", data.ZipCode);
+                strcmd.AppendFormat(",'{0}'", data.Address1);
+                strcmd.AppendFormat(",'{0}'", data.Address2);
+                strcmd.AppendFormat(",'{0}'", data.Address3);
+                strcmd.AppendFormat(",'{0}'", data.PhoneNumber);
+                strcmd.AppendFormat(",'{0}'", data.FaxNumber);
+                strcmd.AppendFormat(",'{0}'", data.HomePageURL);
+                strcmd.AppendFormat(", {0}", data.ConsumptionTax);
+                strcmd.AppendFormat(", {0}", data.CooperationRate);
+                strcmd.AppendFormat(", {0}", data.StatutoryWelfareRate);
+                strcmd.AppendFormat(", {0}", data.FuelPrice);
+                strcmd.AppendFormat(", {0}", data.AreaDistance);
+                strcmd.AppendFormat(",'{0}'", data.ExcelSavePath);
+
+                strcmd.AppendFormat(", {0}", data.BusinessPeriod);
+                strcmd.AppendFormat(", {0}", data.ConstrYear);
+                strcmd.AppendFormat(",DATE('{0}')", data.BusinessBeginDate.ToShortDateString());
+                strcmd.AppendFormat(",DATE('{0}')", data.ConstrBeginDate.ToShortDateString());
+                strcmd.AppendFormat(",DATE('{0}')", data.BusinessCompDate.ToShortDateString());
+                strcmd.AppendFormat(",DATE('{0}')", data.ConstrCompDate.ToShortDateString());
+                strcmd.AppendFormat(", {0}", data.ConstructionNoBase);
+
+                strcmd.AppendFormat(",'{0}'", data.SloganString1);
+                strcmd.AppendFormat(",'{0}'", data.SloganString2);
+                strcmd.AppendFormat(",'{0}'", data.SloganString3);
+
+                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);
+                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>
         /// <param name="data">ã‚·ã‚¹ãƒ†ãƒ ãƒžã‚¹ã‚¿ãƒ‡ãƒ¼ã‚¿</param>
         /// <returns>trueï¼šæˆ�åŠŸ falseï¼šå¤±æ•—</returns>
         public bool InsertAction(List<SystemMaster> data, bool bConnect = true)
@@ -250,9 +316,6 @@
                     strcmd.AppendFormat(",'{0}'", work.PhoneNumber);
                     strcmd.AppendFormat(",'{0}'", work.FaxNumber);
                     strcmd.AppendFormat(",'{0}'", work.HomePageURL);
-                    strcmd.AppendFormat(", {0}", work.ConstructionExpenses);
-                    strcmd.AppendFormat(", {0}", work.OfficeExpenses);
-                    strcmd.AppendFormat(", {0}", work.OperatingExpenses);
                     strcmd.AppendFormat(", {0}", work.ConsumptionTax);
                     strcmd.AppendFormat(", {0}", work.CooperationRate);
                     strcmd.AppendFormat(", {0}", work.StatutoryWelfareRate);
@@ -261,9 +324,11 @@
                     strcmd.AppendFormat(",'{0}'", work.ExcelSavePath);
 
                     strcmd.AppendFormat(", {0}", work.BusinessPeriod);
-                    strcmd.AppendFormat(", {0}", work.ConstructionYear);
-                    strcmd.AppendFormat(",'{0}'", work.BusinessBeginningDate);
-                    strcmd.AppendFormat(",'{0}'", work.ConstructionBeginningDate);
+                    strcmd.AppendFormat(", {0}", work.ConstrYear);
+                    strcmd.AppendFormat(",DATE('{0}')", work.BusinessBeginDate);
+                    strcmd.AppendFormat(",DATE('{0}')", work.ConstrBeginDate);
+                    strcmd.AppendFormat(",DATE('{0}')", work.BusinessCompDate);
+                    strcmd.AppendFormat(",DATE('{0}')", work.ConstrCompDate);
                     strcmd.AppendFormat(", {0}", work.ConstructionNoBase);
 
                     strcmd.AppendFormat(",'{0}'", work.SloganString1);
@@ -318,9 +383,6 @@
                 strcmd.AppendFormat(", PhoneNumber = '{0}'", data.PhoneNumber);
                 strcmd.AppendFormat(", FaxNumber = '{0}'", data.FaxNumber);
                 strcmd.AppendFormat(", HomePageURL = '{0}'", data.HomePageURL);
-                strcmd.AppendFormat(", ConstructionExpenses = {0}", data.ConstructionExpenses);
-                strcmd.AppendFormat(", OfficeExpenses = {0}", data.OfficeExpenses);
-                strcmd.AppendFormat(", OperatingExpenses = {0}", data.OperatingExpenses);
                 strcmd.AppendFormat(", ConsumptionTax = {0}", data.ConsumptionTax);
                 strcmd.AppendFormat(", CooperationRate = {0}", data.CooperationRate);
                 strcmd.AppendFormat(", StatutoryWelfareRate = {0}", data.StatutoryWelfareRate);
@@ -329,9 +391,11 @@
                 strcmd.AppendFormat(", ExcelSavePath = '{0}'", data.ExcelSavePath);
 
                 strcmd.AppendFormat(", BusinessPeriod = {0}", data.BusinessPeriod);
-                strcmd.AppendFormat(", ConstructionYear = {0}", data.ConstructionYear);
-                strcmd.AppendFormat(", BusinessBeginningDate = '{0}'", data.BusinessBeginningDate);
-                strcmd.AppendFormat(", ConstructionBeginningDate = '{0}'", data.ConstructionBeginningDate);
+                strcmd.AppendFormat(", ConstrYear = {0}", data.ConstrYear);
+                strcmd.AppendFormat(", BusinessBeginDate = DATE('{0}')", data.BusinessBeginDate.ToShortDateString());
+                strcmd.AppendFormat(", ConstrBeginDate = DATE('{0}')", data.ConstrBeginDate.ToShortDateString());
+                strcmd.AppendFormat(", BusinessCompDate = DATE('{0}')", data.BusinessCompDate.ToShortDateString());
+                strcmd.AppendFormat(", ConstrCompDate = DATE('{0}')", data.ConstrCompDate.ToShortDateString());
                 strcmd.AppendFormat(", ConstructionNoBase = {0}", data.ConstructionNoBase);
 
                 strcmd.AppendFormat(", SloganString1 = '{0}'", data.SloganString1);
@@ -368,58 +432,49 @@
                 strcmd.Append(" SET");
                 switch (FeildNo)
                 {
-                    case (int)SystemColumn.SYSTEMCODE:
+                    case (int)SystemColumn.SystemCode:
                         strcmd.AppendFormat(" SystemCode = {0}", ((int)value).ToString());
                         break;
-                    case (int)SystemColumn.COMPANYNAME1:
+                    case (int)SystemColumn.CompanyName1:
                         strcmd.AppendFormat(" CompanyName1 = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.COMPANYNAME2:
+                    case (int)SystemColumn.CompanyName2:
                         strcmd.AppendFormat(" CompanyName2 = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.CEONAME:
+                    case (int)SystemColumn.CEOName:
                         strcmd.AppendFormat(" CeoName = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.CEOPOSITIONNAME:
+                    case (int)SystemColumn.CEOPositionName:
                         strcmd.AppendFormat(" CeoName = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.ZIPCODE:
+                    case (int)SystemColumn.ZipCode:
                         strcmd.AppendFormat(" CeoName = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.ADDRESS1:
+                    case (int)SystemColumn.Address1:
                         strcmd.AppendFormat(" Address1 = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.ADDRESS2:
+                    case (int)SystemColumn.Address2:
                         strcmd.AppendFormat(" Address2 = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.ADDRESS3:
+                    case (int)SystemColumn.Address3:
                         strcmd.AppendFormat(" Address3 = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.PHONENUMBER:
+                    case (int)SystemColumn.PhoneNumber:
                         strcmd.AppendFormat(" PhoneNumber = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.FAXNUMBER:
+                    case (int)SystemColumn.FaxNumber:
                         strcmd.AppendFormat(" FaxNumber = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.HOMEPAGEURL:
+                    case (int)SystemColumn.HomePageURL:
                         strcmd.AppendFormat(" HomePageURL = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.CONSTRUCTIONEXPENSES:
-                        strcmd.AppendFormat(" ConstructionExpenses = {0}", ((int)value).ToString());
-                        break;
-                    case (int)SystemColumn.OFFICEEXPENSES:
-                        strcmd.AppendFormat(" OfficeExpenses = {0}", ((int)value).ToString());
-                        break;
-                    case (int)SystemColumn.OPERATINGEXPENSES:
-                        strcmd.AppendFormat(" PperatingExpenses = {0}", ((int)value).ToString());
-                        break;
-                    case (int)SystemColumn.CONSUMPTIONTAX:
+                    case (int)SystemColumn.ConsumptionTax:
                         strcmd.AppendFormat(" ConsumptionTax = {0}", ((int)value).ToString());
                         break;
-                    case (int)SystemColumn.COOPERATIONRATE:
+                    case (int)SystemColumn.CooperationRate:
                         strcmd.AppendFormat(" CooperationRate = {0}", ((int)value).ToString());
                         break;
-                    case (int)SystemColumn.STATUTORYWELFARERATE:
+                    case (int)SystemColumn.StatutoryWelfareRate:
                         strcmd.AppendFormat(" StatutoryWelfareRate = {0}", ((int)value).ToString());
                         break;
                     case (int)SystemColumn.FuelPrice:
@@ -428,21 +483,27 @@
                     case (int)SystemColumn.AreaDistance:
                         strcmd.AppendFormat(" AreaDistance = {0}", ((int)value).ToString());
                         break;
-                    case (int)SystemColumn.EXCELSAVEPATH:
+                    case (int)SystemColumn.ExcelSavePath:
                         strcmd.AppendFormat(" ExcelSavePath = '{0}'", value.ToString());
                         break;
-                    case (int)SystemColumn.BUSINESSPERIOD:
+                    case (int)SystemColumn.BusinessPeriod:
                         strcmd.AppendFormat(" BusinessPeriod = {0}", ((int)value).ToString());
                         break;
-                    case (int)SystemColumn.ConstructionYear:
-                        strcmd.AppendFormat(" ConstructionYear = {0}", ((int)value).ToString());
+                    case (int)SystemColumn.ConstrYear:
+                        strcmd.AppendFormat(" ConstrYear = {0}", ((int)value).ToString());
                         break;
-                    case (int)SystemColumn.BusinessBeginningDate:
-                        strcmd.AppendFormat(" BusinessBeginningDate = '{0}'", value.ToString());
+                    case (int)SystemColumn.BusinessBeginDate:
+                        strcmd.AppendFormat(" BusinessBeginDate = STR_TO_DATE('{0}', '%Y/%m/%d')", ((DateTime)value).ToShortDateString());
                         break;
-                    case (int)SystemColumn.ConstructionBeginningDate:
-                        strcmd.AppendFormat(" ConstructionBeginningDate = '{0}'", value.ToString());
+                    case (int)SystemColumn.ConstrBeginDate:
+                        strcmd.AppendFormat(" ConstrBeginDate = STR_TO_DATE('{0}', '%Y/%m/%d')", ((DateTime)value).ToShortDateString());
                         break;
+                    case (int)SystemColumn.BusinessCompDate:
+                        strcmd.AppendFormat(" BusinessCompDate = STR_TO_DATE('{0}', '%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
+                    case (int)SystemColumn.ConstrCompDate:
+                        strcmd.AppendFormat(" ConstrCompDate = STR_TO_DATE('{0}', '%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
                     case (int)SystemColumn.ConstructionNoBase:
                         strcmd.AppendFormat(" ConstructionNoBase = {0}", ((int)value).ToString());
                         break;
@@ -509,32 +570,31 @@
             try
             {
                 // ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                wrk.SystemCode = int.Parse(objwrk[(int)SystemColumn.SYSTEMCODE].ToString());
-                wrk.CompanyName1 = objwrk[(int)SystemColumn.COMPANYNAME1].ToString();
-                wrk.CompanyName2 = objwrk[(int)SystemColumn.COMPANYNAME2].ToString();
-                wrk.CEOName = objwrk[(int)SystemColumn.CEONAME].ToString();
-                wrk.CEOPositionName = objwrk[(int)SystemColumn.CEOPOSITIONNAME].ToString();
-                wrk.ZipCode = objwrk[(int)SystemColumn.ZIPCODE].ToString();
-                wrk.Address1 = objwrk[(int)SystemColumn.ADDRESS1].ToString();
-                wrk.Address2 = objwrk[(int)SystemColumn.ADDRESS2].ToString();
-                wrk.Address3 = objwrk[(int)SystemColumn.ADDRESS3].ToString();
-                wrk.PhoneNumber = objwrk[(int)SystemColumn.PHONENUMBER].ToString();
-                wrk.FaxNumber = objwrk[(int)SystemColumn.FAXNUMBER].ToString();
-                wrk.HomePageURL = objwrk[(int)SystemColumn.HOMEPAGEURL].ToString();
-                wrk.ConstructionExpenses = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.CONSTRUCTIONEXPENSES]);
-                wrk.OfficeExpenses = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.OFFICEEXPENSES]);
-                wrk.OperatingExpenses = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.OPERATINGEXPENSES]);
-                wrk.ConsumptionTax = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.CONSUMPTIONTAX]);
-                wrk.CooperationRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.COOPERATIONRATE]);
-                wrk.StatutoryWelfareRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.STATUTORYWELFARERATE]);
+                wrk.SystemCode = int.Parse(objwrk[(int)SystemColumn.SystemCode].ToString());
+                wrk.CompanyName1 = objwrk[(int)SystemColumn.CompanyName1].ToString();
+                wrk.CompanyName2 = objwrk[(int)SystemColumn.CompanyName2].ToString();
+                wrk.CEOName = objwrk[(int)SystemColumn.CEOName].ToString();
+                wrk.CEOPositionName = objwrk[(int)SystemColumn.CEOPositionName].ToString();
+                wrk.ZipCode = objwrk[(int)SystemColumn.ZipCode].ToString();
+                wrk.Address1 = objwrk[(int)SystemColumn.Address1].ToString();
+                wrk.Address2 = objwrk[(int)SystemColumn.Address2].ToString();
+                wrk.Address3 = objwrk[(int)SystemColumn.Address3].ToString();
+                wrk.PhoneNumber = objwrk[(int)SystemColumn.PhoneNumber].ToString();
+                wrk.FaxNumber = objwrk[(int)SystemColumn.FaxNumber].ToString();
+                wrk.HomePageURL = objwrk[(int)SystemColumn.HomePageURL].ToString();
+                wrk.ConsumptionTax = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.ConsumptionTax]);
+                wrk.CooperationRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.CooperationRate]);
+                wrk.StatutoryWelfareRate = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.StatutoryWelfareRate]);
                 wrk.FuelPrice = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.FuelPrice]);
                 wrk.AreaDistance = CommonMotions.cnvDouble(objwrk[(int)SystemColumn.AreaDistance]);
-                wrk.ExcelSavePath = objwrk[(int)SystemColumn.EXCELSAVEPATH].ToString();
+                wrk.ExcelSavePath = objwrk[(int)SystemColumn.ExcelSavePath].ToString();
 
-                wrk.BusinessPeriod = int.Parse(objwrk[(int)SystemColumn.BUSINESSPERIOD].ToString());
-                wrk.ConstructionYear = int.Parse(objwrk[(int)SystemColumn.ConstructionYear].ToString());
-                wrk.BusinessBeginningDate = objwrk[(int)SystemColumn.BusinessBeginningDate].ToString();
-                wrk.ConstructionBeginningDate = objwrk[(int)SystemColumn.ConstructionBeginningDate].ToString();
+                wrk.BusinessPeriod = int.Parse(objwrk[(int)SystemColumn.BusinessPeriod].ToString());
+                wrk.ConstrYear = int.Parse(objwrk[(int)SystemColumn.ConstrYear].ToString());
+                wrk.BusinessBeginDate = DateTime.Parse(objwrk[(int)SystemColumn.BusinessBeginDate].ToString());
+                wrk.ConstrBeginDate = DateTime.Parse(objwrk[(int)SystemColumn.ConstrBeginDate].ToString());
+                wrk.BusinessCompDate = DateTime.Parse(objwrk[(int)SystemColumn.BusinessCompDate].ToString());
+                wrk.ConstrCompDate = DateTime.Parse(objwrk[(int)SystemColumn.ConstrCompDate].ToString());
                 wrk.ConstructionNoBase = int.Parse(objwrk[(int)SystemColumn.ConstructionNoBase].ToString());
 
                 wrk.SloganString1 = objwrk[(int)SystemColumn.SloganString1].ToString();
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/BizPeriodHistory.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/BizPeriodHistory.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/BizPeriodHistory.cs	(revision 323)
@@ -0,0 +1,99 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ProcessManagement.DataModel
+{
+    /// <summary>
+    /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ãƒ‡ãƒ¼ã‚¿ãƒ¢ãƒ‡ãƒ«
+    /// </summary>
+    public class BizPeriodHistory
+    {
+        #region å®šæ•°
+        #region é�‹å–¶æœŸå±¥æ­´æƒ…å ±ï¼šå–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+        /// <summary>
+        /// å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public enum PeriodFlagDef
+        {
+            /// <summary>
+            /// 0ï¼šå–¶æ¥­æœŸæ•°
+            /// </summary>
+            BizPeriod = 0,
+            /// <summary>
+            /// 1ï¼šå·¥äº‹å¹´åº¦
+            /// </summary>
+            ConstrYear,
+        }
+        #endregion
+        #endregion
+
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+        private int         m_PeriodYear =0;                    // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
+        private int         m_PeriodFlag =0;                    // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+
+        private DateTime    m_BeginDate = DateTime.Now;         // æœŸé¦–æ—¥
+        private DateTime    m_CompleteDate  = DateTime.Now;     // æœŸæœ«æ—¥
+                
+        private DateTime    m_EntryDate = DateTime.Now;         // ç™»éŒ²æ—¥ä»˜
+        private DateTime    m_UpdateDate = DateTime.Now;        // æ›´æ–°æ—¥ä»˜
+
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
+        /// </summary>
+        public int PeriodYear
+        {
+            get { return m_PeriodYear; }
+            set { m_PeriodYear = value; }
+        }
+        /// <summary>
+        /// å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public int PeriodFlag
+        {
+            get { return m_PeriodFlag; }
+            set { m_PeriodFlag = value; }
+        }
+        /// <summary>
+        /// æœŸé¦–æ—¥
+        /// </summary>
+        public DateTime BeginDate
+        {
+            get { return m_BeginDate; }
+            set { m_BeginDate = value; }
+        }
+        /// <summary>
+        /// æœŸæœ«æ—¥
+        /// </summary>
+        public DateTime CompleteDate
+        {
+            get { return m_CompleteDate; }
+            set { m_CompleteDate = 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: branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfoDetail.cs	(revision 323)
@@ -108,6 +108,10 @@
             /// 23:å…¥é‡‘ã‚³ãƒ¡ãƒ³ãƒˆ
             /// </summary>
             PaymentComment,
+            /// <summary>
+            /// 24:æ¤œæŸ»æ˜¯æ­£å®Œäº†ã‚³ãƒ¡ãƒ³ãƒˆ
+            /// </summary>
+            RevCompleteComment,
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/GridCellStyleMember.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/GridCellStyleMember.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/GridCellStyleMember.cs	(revision 323)
@@ -0,0 +1,52 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace ProcessManagement.DataModel
+{
+    /// <summary>
+    /// DataGridView.Cell.styleãƒ¡ãƒ³ãƒ�ãƒ¼é€€é�¿ã‚¯ãƒ©ã‚¹
+    /// </summary>
+    public class GridCellStyleMember
+    {
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+        private Color   m_DrowBackColor = SystemColors.Control; // èƒŒæ™¯è‰²
+        private Font    m_DrowFont = null;                      // ãƒ•ã‚©ãƒ³ãƒˆ
+        private Color   m_DrowForeColor = SystemColors.Control; // å‰�æ™¯è‰²
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// èƒŒæ™¯è‰²
+        /// </summary>
+        public Color DrowBackColor
+        {
+            get { return m_DrowBackColor; }
+            set { m_DrowBackColor = value; }
+        }
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ³ãƒˆ
+        /// </summary>
+        public Font DrowFont
+        {
+            get { return m_DrowFont; }
+            set { m_DrowFont = value; }
+        }
+        /// <summary>
+        /// å‰�æ™¯è‰²
+        /// </summary>
+        public Color DrowForeColor
+        {
+            get { return m_DrowForeColor; }
+            set { m_DrowForeColor = value; }
+        }
+        #endregion
+    }
+}
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/SystemMaster.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/SystemMaster.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/SystemMaster.cs	(revision 323)
@@ -42,9 +42,6 @@
         private string      m_PhoneNumber = string.Empty;	    // é›»è©±ç•ªå�·
         private string      m_FaxNumber = string.Empty;	        // FAXç•ªå�·
         private string      m_HomePageURL = string.Empty;	    // ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸URL
-        private double      m_ConstructionExpenses = 0;	        // å·¥äº‹éƒ¨çµŒè²»
-        private double      m_OfficeExpenses = 0;	            // äº‹å‹™æ‰€çµŒè²»
-        private double      m_OperatingExpenses = 0;	        // å–¶æ¥­çµŒè²»
         private double      m_ConsumptionTax = 0;	            // æ¶ˆè²»ç¨Ž
         private double      m_CooperationRate = 0.5;            // å�”åŠ›é‡‘æ¯”çŽ‡
         private double      m_StatutoryWelfareRate = 8.0;       // æ³•å®šç¦�åˆ©è²»
@@ -54,9 +51,11 @@
         private string      m_ExcelSavePath = string.Empty;	    // Excelä¿�å­˜ãƒ‘ã‚¹
 
         private int         m_BusinessPeriod = 0;               // å–¶æ¥­æœŸæ•°
-        private int         m_ConstructionYear = 0;	            // å·¥äº‹å¹´åº¦
-        private string      m_BusinessBeginningDate = "04/01";  // æœŸé¦–æ—¥(äº‹æ¥­å¹´åº¦)
-        private string      m_ConstructionBeginningDate = "04/01";  // æœŸé¦–æ—¥(å·¥äº‹å¹´åº¦)
+        private int         m_ConstrYear = 0;	                // å·¥äº‹å¹´åº¦
+        private DateTime    m_BusinessBeginDate = DateTime.MinValue.Date;       // æœŸé¦–æ—¥(äº‹æ¥­å¹´åº¦)
+        private DateTime    m_ConstrBeginDate = DateTime.MinValue.Date;         // æœŸé¦–æ—¥(å·¥äº‹å¹´åº¦)
+        private DateTime    m_BusinessCompDate = DateTime.MinValue.Date;        // å–¶æ¥­æœŸæœŸæœ«æ—¥
+        private DateTime    m_ConstrCompDate = DateTime.MinValue.Date;          // å·¥äº‹å¹´åº¦æœŸæœ«æ—¥
         private int         m_ConstructionNoBase = 0;	        // å·¥äº‹ç•ªå�·åŸºæº–å€¤
 
         private string      m_SloganString1 = string.Empty;	    // æ¨™èªž
@@ -169,30 +168,6 @@
             set { m_HomePageURL = value; }
         }
         /// <summary>
-        /// å·¥äº‹éƒ¨çµŒè²»
-        /// </summary>
-        public double ConstructionExpenses
-        {
-            set { m_ConstructionExpenses = value; }
-            get { return m_ConstructionExpenses; }
-        }
-        /// <summary>
-        /// äº‹å‹™æ‰€çµŒè²»
-        /// </summary>
-        public double OfficeExpenses
-        {
-            set { m_OfficeExpenses = value; }
-            get { return m_OfficeExpenses; }
-        }
-        /// <summary>
-        /// å–¶æ¥­çµŒè²»
-        /// </summary>
-        public double OperatingExpenses
-        {
-            set { m_OperatingExpenses = value; }
-            get { return m_OperatingExpenses; }
-        }
-        /// <summary>
         /// æ¶ˆè²»ç¨Ž
         /// </summary>
         public double ConsumptionTax
@@ -251,28 +226,44 @@
         /// <summary>
         /// å–¶æ¥­å¹´åº¦
         /// </summary>
-        public int ConstructionYear
+        public int ConstrYear
         {
-            get { return m_ConstructionYear; }
-            set { m_ConstructionYear = value; }
+            get { return m_ConstrYear; }
+            set { m_ConstrYear = value; }
         }
         /// <summary>
         /// å–¶æ¥­æœŸé¦–æ—¥
         /// </summary>
-        public string BusinessBeginningDate
+        public DateTime BusinessBeginDate
         {
-            get { return m_BusinessBeginningDate; }
-            set { m_BusinessBeginningDate = value; }
+            get { return m_BusinessBeginDate; }
+            set { m_BusinessBeginDate = value; }
         }
         /// <summary>
         /// å·¥äº‹å¹´åº¦æœŸé¦–æ—¥
         /// </summary>
-        public string ConstructionBeginningDate
+        public DateTime ConstrBeginDate
         {
-            get { return m_ConstructionBeginningDate; }
-            set { m_ConstructionBeginningDate = value; }
+            get { return m_ConstrBeginDate; }
+            set { m_ConstrBeginDate = value; }
         }
         /// <summary>
+        /// å–¶æ¥­æœŸæœŸæœ«æ—¥
+        /// </summary>
+        public DateTime BusinessCompDate
+        {
+            get { return m_BusinessCompDate; }
+            set { m_BusinessCompDate = value; }
+        }
+        /// <summary>
+        /// å·¥äº‹å¹´åº¦æœŸæœ«æ—¥
+        /// </summary>
+        public DateTime ConstrCompDate
+        {
+            get { return m_ConstrCompDate; }
+            set { m_ConstrCompDate = value; }
+        }
+        /// <summary>
         /// å·¥äº‹ç•ªå�·åŸºæº–å€¤ãƒ•ãƒ©ã‚°
         /// </summary>
         public int ConstructionNoBase
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 323)
@@ -535,9 +535,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 323)
@@ -2167,9 +2167,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 323)
@@ -213,181 +213,186 @@
             /// <summary>
             /// 41:“ü‹àƒRƒ�ƒ“ƒg
             /// </summary>
-            PaymentComment,     // ------ ‚±‚±‚Ü‚Å–¾�×ƒf�[ƒ^�i•À‚Ñ‚ð•Ï‚¦‚Ä‚Í‚¢‚¯‚È‚¢�j
+            PaymentComment,
             /// <summary>
-            /// 42:�Å�I�X�V“ú
+            /// 42:ŒŸ�¸�¥�³Š®—¹ƒRƒ�ƒ“ƒg
             /// </summary>
+            RevCompleteComment,      // ------ ‚±‚±‚Ü‚Å–¾�×ƒf�[ƒ^�i•À‚Ñ‚ð•Ï‚¦‚Ä‚Í‚¢‚¯‚È‚¢�j
+
+            /// <summary>
+            /// 43:�Å�I�X�V“ú
+            /// </summary>
             LastUpDate,
             /// <summary>
-            /// 43:�HŽ–Ží•Ê
+            /// 44:�HŽ–Ží•Ê
             /// </summary>
             ConstructionType,
             /// <summary>
-            /// 44:Œ©�Ï’ñ�oŠúŒÀ
+            /// 45:Œ©�Ï’ñ�oŠúŒÀ
             /// </summary>
             EstimatesSubmitDeadline,
             /// <summary>
-            /// 45:�HŽ–Žw“±ˆõ
+            /// 46:�HŽ–Žw“±ˆõ
             /// </summary>
             ConstructionInstructor,
             /// <summary>
-            /// 46:�HŽ–ˆÚŠÇ�æƒR�[ƒh
+            /// 47:�HŽ–ˆÚŠÇ�æƒR�[ƒh
             /// </summary>
             TransferConstruction,
             /// <summary>
-            /// 47:�HŽ–ˆÚŠÇ“ú
+            /// 48:�HŽ–ˆÚŠÇ“ú
             /// </summary>
             TransferConstructionDate,
             /// <summary>
-            /// 48:�Å�žŽó’�Œˆ’è‹àŠz
+            /// 49:�Å�žŽó’�Œˆ’è‹àŠz
             /// </summary>
             OrdersDecisionPriceInTax,
             /// <summary>
-            /// 49:Œ_–ñ�HŠúŠJŽn
+            /// 50:Œ_–ñ�HŠúŠJŽn
             /// </summary>
             ConstructionPeriodStart,
             /// <summary>
-            /// 50:Œ_–ñ�HŠúŠ®—¹
+            /// 51:Œ_–ñ�HŠúŠ®—¹
             /// </summary>
             ConstructionPeriodEnd,
             /// <summary>
-            /// 51:�HŽ––¼�Ì(‰æ–Êƒgƒbƒv)
+            /// 52:�HŽ––¼�Ì(‰æ–Êƒgƒbƒv)
             /// </summary>
             ConstructionName2,
             /// <summary>
-            /// 52:�¿‹��€”õŠJŽn“ú
+            /// 53:�¿‹��€”õŠJŽn“ú
             /// </summary>
             BillingStartDate,
             /// <summary>
-            /// 53:�¿‹�Šm”F“ú
+            /// 54:�¿‹�Šm”F“ú
             /// </summary>
             BillingComplateDate,
             /// <summary>
-            /// 54:ŠJŽn—\’è“ú
+            /// 55:ŠJŽn—\’è“ú
             /// </summary>
             OrderStartingDate,
             /// <summary>
-            /// 55:‰c‹Æ’S“–•”��
+            /// 56:‰c‹Æ’S“–•”��
             /// </summary>
             SalesDepartment,
             /// <summary>
-            /// 56:�ÏŽZŒ©�ÏŠm”F�\�¿“ú
+            /// 57:�ÏŽZŒ©�ÏŠm”F�\�¿“ú
             /// </summary>
             EstimatePetition,
             /// <summary>
-            /// 57:�ÏŽZŒ©�Ï�³”F“ú
+            /// 58:�ÏŽZŒ©�Ï�³”F“ú
             /// </summary>
             EstimateApproval,
             /// <summary>
-            /// 58:�ÏŽZ—\ŽZŠm”F�\�¿“ú
+            /// 59:�ÏŽZ—\ŽZŠm”F�\�¿“ú
             /// </summary>
             EstimateBudgetPetition,
             /// <summary>
-            /// 59:�ÏŽZ—\ŽZ�³”F“ú
+            /// 60:�ÏŽZ—\ŽZ�³”F“ú
             /// </summary>
             EstimateBudgetApproval,
             /// <summary>
-            /// 60:‰¼Žó’�“ú
+            /// 61:‰¼Žó’�“ú
             /// </summary>
             ProvisionalOrderDate,
             /// <summary>
-            /// 61:”ñŽó’�“ú
+            /// 62:”ñŽó’�“ú
             /// </summary>
             NonOrderDate,
             /// <summary>
-            /// 62:�HŽ–’S“–•”��
+            /// 63:�HŽ–’S“–•”��
             /// </summary>
             ConstructionDepartment,
             /// <summary>
-            /// 63:Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
+            /// 64:Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
             /// </summary>
             ConstructionPeriodStart2,
             /// <summary>
-            /// 64:Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
+            /// 65:Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
             /// </summary>
             ConstructionPeriodEnd2,
             /// <summary>
-            /// 65:Ž{�H�€”õŠJŽn“ú
+            /// 66:Ž{�H�€”õŠJŽn“ú
             /// </summary>
             PreparationStartDate,
             /// <summary>
-            /// 66:�HŽ–—\ŽZ�\�¿“ú
+            /// 67:�HŽ–—\ŽZ�\�¿“ú
             /// </summary>
             ConstructionBudgetPetition,
             /// <summary>
-            /// 67:�HŽ–—\ŽZ�³”F“ú
+            /// 68:�HŽ–—\ŽZ�³”F“ú
             /// </summary>
             ConstructionBudgetApproval,
             /// <summary>
-            /// 68:’�•¶�‘�\�¿“ú       --------------------->> –¢Žg—p�«�«
+            /// 69:’�•¶�‘�\�¿“ú       --------------------->> –¢Žg—p�«�«
             /// </summary>
             PurchaseOrderEntryPetition,
             /// <summary>
-            /// 69:’�•¶�‘�³”F“ú
+            /// 70:’�•¶�‘�³”F“ú
             /// </summary>
             PurchaseOrderEntryApproval,
             /// <summary>
-            /// 70:’�•¶�‘”­‹‹“ú
+            /// 71:’�•¶�‘”­‹‹“ú
             /// </summary>
             PurchaseOrderOutPutDate,
             /// <summary>
-            /// 71:’�•¶�‘—X‘—“ú
+            /// 72:’�•¶�‘—X‘—“ú
             /// </summary>
             PurchaseOrderMailingDate,
             /// <summary>
-            /// 72:’�•¶�‘•Ô‘—“ú
+            /// 73:’�•¶�‘•Ô‘—“ú
             /// </summary>
             PurchaseOrderReturnDate,
             /// <summary>
-            /// 73:’�•¶�‘•Ô‘—Šm”F“ú
+            /// 74:’�•¶�‘•Ô‘—Šm”F“ú
             /// </summary>
             PurchaseOrderReturnCheckDate,
             /// <summary>
-            /// 74:�¿‹��‘�\�¿“ú
+            /// 75:�¿‹��‘�\�¿“ú
             /// </summary>
             BillingPetition,
             /// <summary>
-            /// 75:�¿‹��³”F“ú
+            /// 76:�¿‹��³”F“ú
             /// </summary>
             BillingApproval,
             /// <summary>
-            /// 76:�¿‹��‘”­‹‹“ú
+            /// 77:�¿‹��‘”­‹‹“ú
             /// </summary>
             BillingOutPutDate,
             /// <summary>
-            /// 77:�¿‹��‘—X‘—“ú
+            /// 78:�¿‹��‘—X‘—“ú
             /// </summary>
             BillingSendDate,        // --------------------->> –¢Žg—p�ª�ª
             /// <summary>
-            /// 78:�HŽ–•›’S“–•”��
+            /// 79:�HŽ–•›’S“–•”��
             /// </summary>
             ConstrSubDepartment,
             /// <summary>
-            /// 79:Žw“±ˆõ•”��
+            /// 80:Žw“±ˆõ•”��
             /// </summary>
             InstructorDepartment,
             /// <summary>
-            /// 80:�HŽ–•›’S“–ŽÒƒR�[ƒh
+            /// 81:�HŽ–•›’S“–ŽÒƒR�[ƒh
             /// </summary>
             ConstrSubPersonCode,
             /// <summary>
-            /// 81:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
+            /// 82:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
             /// </summary>
             LedgerComplateDate,
             /// <summary>
-            /// 82:�¿‹�‹æ•ª–¼�Ì
+            /// 83:�¿‹�‹æ•ª–¼�Ì
             /// </summary>
             BillingTypeName,
             /// <summary>
-            /// 83:ŒŸ�¸—\’è“ú
+            /// 84:ŒŸ�¸—\’è“ú
             /// </summary>
             InspectPlanningDate,
             /// <summary>
-            /// 84:ŒŸ�¸ŽÀ�s“ú
+            /// 85:ŒŸ�¸ŽÀ�s“ú
             /// </summary>
             InspectExecuteDate,
             /// <summary>
-            /// 85:ŒŸ�¸�¥�³Š®—¹“ú
+            /// 86:ŒŸ�¸�¥�³Š®—¹“ú
             /// </summary>
             RevCompleteDate,
         }
@@ -483,7 +488,9 @@
                                                                         new KeyValuePair<int, string>(82,"�¿‹�‹æ•ª–¼�Ì"),
                                                                         new KeyValuePair<int, string>(83,"ŒŸ�¸—\’è“ú"),
                                                                         new KeyValuePair<int, string>(84,"ŒŸ�¸ŽÀ�s“ú"),
-                                                                        new KeyValuePair<int, string>(85,",ŒŸ�¸�¥�³Š®—¹“ú") };
+                                                                        new KeyValuePair<int, string>(85,"ŒŸ�¸�¥�³Š®—¹“ú"),
+                                                                        new KeyValuePair<int, string>(86,"ŒŸ�¸�¥�³Š®—¹ƒRƒ�ƒ“ƒg")
+        };
         #endregion
 
         #region ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^ƒJƒ‰ƒ€
@@ -624,6 +631,8 @@
                         {false, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 16:Œ©�Ï—LŒøŠúŒÀ
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 17:�HŽ–ŠJŽn“ú
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 18:�HŽ–�I—¹“ú
+
+                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
                         {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 19:”­’�ŽÒ–¼
                         {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 20:�HŽ––¼�Ì
                         {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 21:—X•Ö”Ô�†
@@ -636,8 +645,6 @@
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 28:�HŽ–ŠT—v‚S
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 29:�HŽ–ŠT—v‚T
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 30:Žx‹‹•i‚P
-
-                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 31:Žx‹‹•i‚Q
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 32:•Ê“r�HŽ–‚P
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 33:•Ê“r�HŽ–‚Q
@@ -649,53 +656,56 @@
                         {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 39:‰c‹ÆƒRƒ�ƒ“ƒg
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 40:�¿‹�ƒRƒ�ƒ“ƒg
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 41:“ü‹àƒRƒ�ƒ“ƒg
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 42:�Å�I�X�V“ú
-                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 43:�HŽ–Ží•Ê
-                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 44:Œ©�Ï’ñ�oŠúŒÀ
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 45:�HŽ–Žw“±ˆõ
-                        {false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false, false},     // 46:�HŽ–ˆÚŠÇ�æƒR�[ƒh
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 47:�HŽ–ˆÚŠÇ“ú
-                        {false, false, false, false, true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false},     // 48:�Å�žŽó’�Œˆ’è‹àŠz
-                        {false, false, true,  false, false, false, true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 49:Œ_–ñ�HŠúŠJŽn
-                        {false, false, true,  false, false, false, true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 50:Œ_–ñ�HŠúŠ®—¹
-                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 51:”­’�ŽÒ–¼(‰æ–Êƒgƒbƒv)
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 52:�¿‹��€”õŠJŽn“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 53:�¿‹�Šm”F“ú
-                        {false, false, true,  false, true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 54:ŠJŽn—\’è“ú
-                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 55:‰c‹Æ’S“–•”��
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 56:�ÏŽZŒ©�ÏŠm”F�\�¿“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 57:�ÏŽZŒ©�Ï�³”F“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 58:�ÏŽZ—\ŽZŠm”F�\�¿“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 59:�ÏŽZ—\ŽZ�³”F“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 60:‰¼Žó’�“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 42:ŒŸ�¸�¥�³Š®—¹ƒRƒ�ƒ“ƒg
 
                         //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 61:”ñŽó’�“ú
-                        {false, false, true,  false, false, false, false, true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 62:�HŽ–’S“–•”��
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 63:Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 64:Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 65:Ž{�H�€”õŠJŽn“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 66:�HŽ–—\ŽZ�\�¿“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 67:�HŽ–—\ŽZ�³”F“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 68:’�•¶�‘�\�¿“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 69:’�•¶�‘�³”F“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 70:’�•¶�‘”­‹‹“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 71:’�•¶�‘—X‘—“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 72:’�•¶�‘•Ô‘—“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 73:’�•¶�‘•Ô‘—Šm”F“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 74:�¿‹��‘�\�¿“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 75:�¿‹��³”F“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 76:�¿‹��‘”­‹‹“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 77:�¿‹��‘—X‘—“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 78:�HŽ–•›’S“–•”��
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 79:Žw“±ˆõ•”��
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 80:�HŽ–•›’S“–ŽÒƒR�[ƒh
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 81:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 82:�¿‹�‹æ•ª–¼�Ì
-                        {false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},     // 83:ŒŸ�¸—\’è“ú
-                        {false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},     // 84:ŒŸ�¸ŽÀ�s“ú
-                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 85:ŒŸ�¸�¥�³Š®—¹“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 43:�Å�I�X�V“ú
+                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 44:�HŽ–Ží•Ê
+                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 45:Œ©�Ï’ñ�oŠúŒÀ
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 46:�HŽ–Žw“±ˆõ
+                        {false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false, false},     // 47:�HŽ–ˆÚŠÇ�æƒR�[ƒh
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 48:�HŽ–ˆÚŠÇ“ú
+                        {false, false, false, false, true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false},     // 49:�Å�žŽó’�Œˆ’è‹àŠz
+                        {false, false, true,  false, false, false, true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 50:Œ_–ñ�HŠúŠJŽn
+                        {false, false, true,  false, false, false, true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 51:Œ_–ñ�HŠúŠ®—¹
+                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 52:”­’�ŽÒ–¼(‰æ–Êƒgƒbƒv)
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 53:�¿‹��€”õŠJŽn“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 54:�¿‹�Šm”F“ú
+                        {false, false, true,  false, true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 55:ŠJŽn—\’è“ú
+                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 56:‰c‹Æ’S“–•”��
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 57:�ÏŽZŒ©�ÏŠm”F�\�¿“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 58:�ÏŽZŒ©�Ï�³”F“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 59:�ÏŽZ—\ŽZŠm”F�\�¿“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 60:�ÏŽZ—\ŽZ�³”F“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 61:‰¼Žó’�“ú
 
+                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 62:”ñŽó’�“ú
+                        {false, false, true,  false, false, false, false, true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 63:�HŽ–’S“–•”��
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 64:Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 65:Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 66:Ž{�H�€”õŠJŽn“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 67:�HŽ–—\ŽZ�\�¿“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 68:�HŽ–—\ŽZ�³”F“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 69:’�•¶�‘�\�¿“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 70:’�•¶�‘�³”F“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 71:’�•¶�‘”­‹‹“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 72:’�•¶�‘—X‘—“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 73:’�•¶�‘•Ô‘—“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 74:’�•¶�‘•Ô‘—Šm”F“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 75:�¿‹��‘�\�¿“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 76:�¿‹��³”F“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 77:�¿‹��‘”­‹‹“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 78:�¿‹��‘—X‘—“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 79:�HŽ–•›’S“–•”��
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 80:Žw“±ˆõ•”��
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 81:�HŽ–•›’S“–ŽÒƒR�[ƒh
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 82:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 83:�¿‹�‹æ•ª–¼�Ì
+                        {false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},     // 84:ŒŸ�¸—\’è“ú
+                        {false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},     // 85:ŒŸ�¸ŽÀ�s“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 86:ŒŸ�¸�¥�³Š®—¹“ú
+
         };
         #endregion
 
@@ -731,7 +741,7 @@
                         { false, false,  true, true,  true,  false, false, false, false, false, false, false, false, false, false, false, true,   true},    //  9:Žó’�“ú
                         { true,  true,   true, true,  true,  false, false, false, false, false, false, false, false, false, false, false, true,   true},    // 10:Š®�¬—\’è“ú
                         { false, false, true,  false, false, false, true,  true,  false, false, false, false, false, false, false, false, true,   true},    // 11:Ž{�HŠJŽn“ú
-                        { false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false},    // 12:Ž{�HŠ®—¹“ú
+                        { false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},    // 12:Ž{�HŠ®—¹“ú
                         { false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 13:�Å”²Žó’�Œˆ’è‹àŠz
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 14:”­’�ŽÒ‹æ•ª
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 15:”­’�ŽÒƒR�[ƒh
@@ -738,6 +748,8 @@
                         { false, true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 16:Œ©�Ï—LŒøŠúŒÀ
                         { true,  true,  false,  true,  true, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 17:�HŽ–ŠJŽn“ú
                         { true,  true,  false,  true,  true, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 18:�HŽ–�I—¹“ú
+
+                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 19:”­’�ŽÒ–¼
                         { true,  true,  false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 20:�HŽ––¼�Ì
                         { true,  true,  false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 21:—X•Ö”Ô�†
@@ -750,8 +762,6 @@
                         { true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 28:�HŽ–ŠT—v‚S
                         { true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 29:�HŽ–ŠT—v‚T
                         { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 30:Žx‹‹•i‚P
-
-                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
                         { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 31:Žx‹‹•i‚Q
                         { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 32:•Ê“r�HŽ–‚P
                         { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 33:•Ê“r�HŽ–‚Q
@@ -759,58 +769,61 @@
                         { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 35:”õ�l‚Q
                         { true,  true,  false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 36:Žó’�Œˆ’è�\‘—‚èƒRƒ�ƒ“ƒg
                         { false, false, true,  false, false, true,  true,  true,  true,  false, false, false, false, false, false, false,  true,  true},    // 37:�HŽ–’S“–ŽÒƒRƒ�ƒ“ƒg
-                        { false, false, false, false, false, false, false, false, true,  true,  true,  false, false, false, false, false, false, false},    // 38:Ž{�HŠ®—¹ƒRƒ�ƒ“ƒg
+                        { false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false},    // 38:Ž{�HŠ®—¹ƒRƒ�ƒ“ƒg
                         { true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 39:‰c‹ÆƒRƒ�ƒ“ƒg
                         { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 40:�¿‹�ƒRƒ�ƒ“ƒg
                         { false, false, false, false, false, false, false, false, false, true,  true,  false, true,  true,  false, false, false, false},    // 41:“ü‹àƒRƒ�ƒ“ƒg
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 42:�Å�I�X�V“ú
-                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 43:�HŽ–Ží•Ê
-                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 44:Œ©�Ï’ñ�oŠúŒÀ
-                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 45:�HŽ–Žw“±ˆõ
-                        { false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false, false},    // 46:�HŽ–ˆÚŠÇ�æƒR�[ƒh
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 47:�HŽ–ˆÚŠÇ“ú
-                        { false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 48:�Å�žŽó’�Œˆ’è‹àŠz
-                        { false, false, true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false,  true,  true},    // 49:Œ_–ñ�HŠúŠJŽn
-                        { false, false, true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false,  true,  true},    // 50:Œ_–ñ�HŠúŠ®—¹
-                        { true,  true,  false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 51:�HŽ––¼�Ìƒgƒbƒv•”
-                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 52:�¿‹��€”õŠJŽn“ú
-                        { false, false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false},    // 53:�¿‹�Šm”F“ú
-                        { true,   true,  true,  true,  true, false, false, false, false, false, false, false, false, false, false, false,  true,  true},    // 54:ŠJŽn—\’è“ú
-                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 55:‰c‹Æ’S“–•”��
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 56:�ÏŽZŒ©�ÏŠm”F�\�¿“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 57:�ÏŽZŒ©�Ï�³”F“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 58:�ÏŽZ—\ŽZŠm”F�\�¿“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 59:�ÏŽZ—\ŽZ�³”F“ú
-                        { false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 60:‰¼Žó’�“ú
+                        { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 42:ŒŸ�¸�¥�³Š®—¹ƒRƒ�ƒ“ƒg
 
                         //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
-                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 61:”ñŽó’�“ú
-                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 62:�HŽ–’S“–•”��
-                        { false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false},    // 63:Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
-                        { false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false},    // 64:Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
-                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 65:Ž{�H�€”õŠJŽn“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 66:�HŽ–—\ŽZ�\�¿“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 67:�HŽ–—\ŽZ�³”F“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 68:’�•¶�‘�\�¿“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 69:’�•¶�‘�³”F“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 70:’�•¶�‘”­‹‹“ú
-                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 71:’�•¶�‘—X‘—“ú
-                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 72:’�•¶�‘•Ô‘—“ú
-                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 73:’�•¶�‘•Ô‘—Šm”F“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 74:�¿‹��‘�\�¿“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 75:�¿‹��³”F“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 76:�¿‹��‘”­‹‹“ú
-                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 77:�¿‹��‘—X‘—“ú
-                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 78:�HŽ–•›’S“–•”��
-                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 79:Žw“±ˆõ•”��
-                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 80:�HŽ–•›’S“–ŽÒƒR�[ƒh
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 81:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
-                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 82:�¿‹�‹æ•ª–¼�Ì
-                        { false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},    // 83:ŒŸ�¸—\’è“ú
-                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 84:ŒŸ�¸ŽÀ�s“ú
-                        { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 85:ŒŸ�¸�¥�³Š®—¹“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 43:�Å�I�X�V“ú
+                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 44:�HŽ–Ží•Ê
+                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 45:Œ©�Ï’ñ�oŠúŒÀ
+                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 46:�HŽ–Žw“±ˆõ
+                        { false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false, false},    // 47:�HŽ–ˆÚŠÇ�æƒR�[ƒh
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 48:�HŽ–ˆÚŠÇ“ú
+                        { false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 49:�Å�žŽó’�Œˆ’è‹àŠz
+                        { false, false, true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false,  true,  true},    // 50:Œ_–ñ�HŠúŠJŽn
+                        { false, false, true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false,  true,  true},    // 51:Œ_–ñ�HŠúŠ®—¹
+                        { true,  true,  false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 52:�HŽ––¼�Ìƒgƒbƒv•”
+                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 53:�¿‹��€”õŠJŽn“ú
+                        { false, false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false},    // 54:�¿‹�Šm”F“ú
+                        { true,   true,  true,  true,  true, false, false, false, false, false, false, false, false, false, false, false,  true,  true},    // 55:ŠJŽn—\’è“ú
+                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 56:‰c‹Æ’S“–•”��
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 57:�ÏŽZŒ©�ÏŠm”F�\�¿“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 58:�ÏŽZŒ©�Ï�³”F“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 59:�ÏŽZ—\ŽZŠm”F�\�¿“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 60:�ÏŽZ—\ŽZ�³”F“ú
+                        { false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 61:‰¼Žó’�“ú
 
                         //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
+                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 62:”ñŽó’�“ú
+                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 63:�HŽ–’S“–•”��
+                        { false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false},    // 64:Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
+                        { false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false},    // 65:Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
+                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 66:Ž{�H�€”õŠJŽn“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 67:�HŽ–—\ŽZ�\�¿“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 68:�HŽ–—\ŽZ�³”F“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 69:’�•¶�‘�\�¿“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 70:’�•¶�‘�³”F“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 71:’�•¶�‘”­‹‹“ú
+                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 72:’�•¶�‘—X‘—“ú
+                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 73:’�•¶�‘•Ô‘—“ú
+                        { false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false},    // 74:’�•¶�‘•Ô‘—Šm”F“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 75:�¿‹��‘�\�¿“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 76:�¿‹��³”F“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 77:�¿‹��‘”­‹‹“ú
+                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 78:�¿‹��‘—X‘—“ú
+                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 79:�HŽ–•›’S“–•”��
+                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 80:Žw“±ˆõ•”��
+                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 81:�HŽ–•›’S“–ŽÒƒR�[ƒh
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 82:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
+                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 83:�¿‹�‹æ•ª–¼�Ì
+                        { false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},    // 84:ŒŸ�¸—\’è“ú
+                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 85:ŒŸ�¸ŽÀ�s“ú
+                        { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 86:ŒŸ�¸�¥�³Š®—¹“ú
+
+                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 1:�Á”ï�Åƒtƒ‰ƒO
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 2:Œ³�¿ƒtƒ‰ƒO �¦–¢Žg—p
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 3:‰c‹ÆŒo”ï”­�¶ƒtƒ‰ƒO
@@ -1439,9 +1452,6 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfo_Shown(object sender, EventArgs e)
         {
-            //if (!m_EditLock)
-                // �³”F�ó‹µ‰æ–Ê•\Ž¦
-                //DispApprovalStatusListControl();
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs	(revision 323)
@@ -321,6 +321,12 @@
             this.rdbStatus1 = new System.Windows.Forms.RadioButton();
             this.rdbStatus0 = new System.Windows.Forms.RadioButton();
             this.label49 = new System.Windows.Forms.Label();
+            this.label94 = new System.Windows.Forms.Label();
+            this.textBox4 = new System.Windows.Forms.TextBox();
+            this.label104 = new System.Windows.Forms.Label();
+            this.label105 = new System.Windows.Forms.Label();
+            this.label106 = new System.Windows.Forms.Label();
+            this.label107 = new System.Windows.Forms.Label();
             this.BasePanel.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel10.SuspendLayout();
@@ -687,6 +693,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.BackColor = System.Drawing.Color.RoyalBlue;
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel1.Controls.Add(this.label107);
             this.panel1.Controls.Add(this.label114);
             this.panel1.Controls.Add(this.label115);
             this.panel1.Controls.Add(this.txtInput07);
@@ -1356,6 +1363,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel4.BackColor = System.Drawing.Color.SkyBlue;
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel4.Controls.Add(this.label106);
             this.panel4.Controls.Add(this.label101);
             this.panel4.Controls.Add(this.label100);
             this.panel4.Controls.Add(this.label99);
@@ -2124,6 +2132,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel7.BackColor = System.Drawing.Color.YellowGreen;
             this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel7.Controls.Add(this.label105);
             this.panel7.Controls.Add(this.lblFluctuationText);
             this.panel7.Controls.Add(this.pnlFluctuation);
             this.panel7.Controls.Add(this.comboBoxEX4);
@@ -3212,6 +3221,8 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel9.BackColor = System.Drawing.Color.Orange;
             this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel9.Controls.Add(this.label104);
+            this.panel9.Controls.Add(this.label94);
             this.panel9.Controls.Add(this.dgvBillingDate);
             this.panel9.Controls.Add(this.label124);
             this.panel9.Controls.Add(this.label90);
@@ -3227,6 +3238,7 @@
             this.panel9.Controls.Add(this.label60);
             this.panel9.Controls.Add(this.txtInput36);
             this.panel9.Controls.Add(this.label127);
+            this.panel9.Controls.Add(this.textBox4);
             this.panel9.Controls.Add(this.textBox2);
             this.panel9.Controls.Add(this.label128);
             this.panel9.Controls.Add(this.label91);
@@ -4085,6 +4097,82 @@
             this.label49.Text = "â€»å·¥äº‹å��ç§°ã�¯ä¸‹è¨˜ã�®å·¥äº‹å��ç§°ã�®é …ç›®ã�¨é€£å‹•ã�—ã�¦è¨˜å…¥ã�•ã‚Œã�¾ã�™";
             this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // label94
+            // 
+            this.label94.BackColor = System.Drawing.Color.Moccasin;
+            this.label94.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label94.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label94.ForeColor = System.Drawing.Color.Black;
+            this.label94.Location = new System.Drawing.Point(1, 422);
+            this.label94.Name = "label94";
+            this.label94.Size = new System.Drawing.Size(120, 40);
+            this.label94.TabIndex = 168;
+            this.label94.Text = "æ˜¯æ­£å®Œäº†\r\nã‚³ãƒ¡ãƒ³ãƒˆ";
+            this.label94.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // textBox4
+            // 
+            this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBox4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.textBox4.ImeMode = System.Windows.Forms.ImeMode.On;
+            this.textBox4.Location = new System.Drawing.Point(127, 422);
+            this.textBox4.MaxLength = 120;
+            this.textBox4.Multiline = true;
+            this.textBox4.Name = "textBox4";
+            this.textBox4.Size = new System.Drawing.Size(507, 54);
+            this.textBox4.TabIndex = 64;
+            this.textBox4.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // label104
+            // 
+            this.label104.AutoSize = true;
+            this.label104.BackColor = System.Drawing.Color.Black;
+            this.label104.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label104.ForeColor = System.Drawing.Color.Red;
+            this.label104.Location = new System.Drawing.Point(288, 337);
+            this.label104.Name = "label104";
+            this.label104.Size = new System.Drawing.Size(347, 21);
+            this.label104.TabIndex = 169;
+            this.label104.Text = "â€»å�„ã‚³ãƒ¡ãƒ³ãƒˆã�¯å¿…ã�šè¨˜å…¥ã�™ã‚‹ã�“ã�¨ã€‚";
+            // 
+            // label105
+            // 
+            this.label105.AutoSize = true;
+            this.label105.BackColor = System.Drawing.Color.Black;
+            this.label105.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label105.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label105.ForeColor = System.Drawing.Color.Red;
+            this.label105.Location = new System.Drawing.Point(288, 503);
+            this.label105.Name = "label105";
+            this.label105.Size = new System.Drawing.Size(347, 21);
+            this.label105.TabIndex = 186;
+            this.label105.Text = "â€»å�„ã‚³ãƒ¡ãƒ³ãƒˆã�¯å¿…ã�šè¨˜å…¥ã�™ã‚‹ã�“ã�¨ã€‚";
+            // 
+            // label106
+            // 
+            this.label106.AutoSize = true;
+            this.label106.BackColor = System.Drawing.Color.Black;
+            this.label106.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label106.ForeColor = System.Drawing.Color.Red;
+            this.label106.Location = new System.Drawing.Point(289, 738);
+            this.label106.Name = "label106";
+            this.label106.Size = new System.Drawing.Size(347, 21);
+            this.label106.TabIndex = 191;
+            this.label106.Text = "â€»å�„ã‚³ãƒ¡ãƒ³ãƒˆã�¯å¿…ã�šè¨˜å…¥ã�™ã‚‹ã�“ã�¨ã€‚";
+            // 
+            // label107
+            // 
+            this.label107.AutoSize = true;
+            this.label107.BackColor = System.Drawing.Color.Black;
+            this.label107.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label107.ForeColor = System.Drawing.Color.Red;
+            this.label107.Location = new System.Drawing.Point(288, 759);
+            this.label107.Name = "label107";
+            this.label107.Size = new System.Drawing.Size(347, 21);
+            this.label107.TabIndex = 177;
+            this.label107.Text = "â€»å�„ã‚³ãƒ¡ãƒ³ãƒˆã�¯å¿…ã�šè¨˜å…¥ã�™ã‚‹ã�“ã�¨ã€‚";
+            // 
             // FrmConstructionBaseInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -4419,5 +4507,11 @@
         private System.Windows.Forms.Label label89;
         private CustomControls.TextBoxEX textBoxEX9;
         private CustomControls.TextBoxEX textBoxEX8;
+        private System.Windows.Forms.Label label107;
+        private System.Windows.Forms.Label label106;
+        private System.Windows.Forms.Label label105;
+        private System.Windows.Forms.Label label104;
+        private System.Windows.Forms.Label label94;
+        private System.Windows.Forms.TextBox textBox4;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 323)
@@ -535,6 +535,11 @@
                 if (!CommonMotions.DispFieldLengthCheck(m_DspCtrl[(int)DspCnt.CompleteComment], s_NoteLength))
                     iNGno = (int)DspCnt.CompleteComment;
 
+                // �¥�³Š®—¹ƒRƒ�ƒ“ƒg
+                if (m_DspCtrl[(int)DspCnt.RevCompleteComment].Text.Length != 0) iLength++;
+                if (!CommonMotions.DispFieldLengthCheck(m_DspCtrl[(int)DspCnt.RevCompleteComment], s_NoteLength))
+                    iNGno = (int)DspCnt.RevCompleteComment;
+
                 // �¿‹��€”õŠJŽn“ú
                 if (m_DspCtrl[(int)DspCnt.BillingStartDate].Text.Length != 0) iLength++;
                 bPara = FieldCheckMap[(int)DspCnt.BillingStartDate, iStatusCount];
@@ -1255,12 +1260,6 @@
                 // ’�•¶�‘�î•ñƒOƒŠƒbƒh•\Ž¦
                 DispPurchaseOrderGrid();
 
-                //m_DspCtrl[(int)DspCnt.PurchaseOrderMailingDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].PurchaseOrderMailingDate);        // ’�•¶�‘—X‘—“ú
-
-                //m_DspCtrl[(int)DspCnt.PurchaseOrderReturnDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].PurchaseOrderReturnDate);          // ’�•¶�‘•Ô‘—“ú
-
-                //m_DspCtrl[(int)DspCnt.PurchaseOrderReturnCheckDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].PurchaseOrderReturnCheckDate);    // ’�•¶�‘•Ô‘—Šm”F“ú
-
                 #region ‘�Œ¸�HŽ–
                 // ‘�Œ¸�HŽ–
                 if (worklist[0].TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Parent)
@@ -1287,7 +1286,6 @@
                     m_DspCtrl[(int)DspCnt.EstimatesPrice0].BackColor = Color.White;
                     m_DspCtrl[(int)DspCnt.EstimatesPrice1].BackColor = Color.LightPink;
                 }
-                //else if (worklist[0].ConsumptionTaxFlg == 0)
                 else if (worklist[0].ConsumptionTaxFlg == (int)ConstructionBaseInfo.ConsumptionTaxFlgDef.NotInclue)
                 {   //�Å”²
                     rdBConsumptionTaxOff.Checked = true;
@@ -1295,14 +1293,6 @@
                     m_DspCtrl[(int)DspCnt.EstimatesPrice1].BackColor = Color.White;
                 }
 
-                // ‰c‹ÆŒo”ïƒtƒ‰ƒO
-                ////if (worklist[0].SalesCostFlg == 1)
-                //if (worklist[0].SalesCostFlg == (int)CommonDefine.BaseInfoSalesCostFlg.On)
-                //    rdbSalesCostOn.Checked = true;
-                ////else if (worklist[0].SalesCostFlg == 0)
-                //else if (worklist[0].SalesCostFlg == (int)CommonDefine.BaseInfoSalesCostFlg.NotOn)
-                //    rdbSalesCostOff.Checked = true;
-
                 #region �HŽ–�ó‘Ôƒtƒ‰ƒO
                 // �HŽ–�ó‘Ôƒtƒ‰ƒO
                 switch (worklist[0].ConstructionStatusFlg)
@@ -1340,17 +1330,6 @@
                         break;
                     case (int)CommonDefine.StatNumArray.Status10:
                         rdbStatus10.Checked = true;
-                        // �¿‹�Šm”F‚Í�Å�‚�Ó”CŽÒˆÈŠO‚Í�G‚ê‚È‚¢
-                        int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;
-                        if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                            && CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)
-                        {
-
-                        }
-                        else
-                        {
-                            m_EditLock = true;
-                        }
                         break;
                     case (int)CommonDefine.StatNumArray.Status11:
                         rdbStatus3.Checked = true;
@@ -1400,12 +1379,6 @@
                 else
                     ((TextBox)m_DspCtrl[(int)DspCnt.BillingComplateDate]).TextAlign = HorizontalAlignment.Center;
 
-                //// �¿‹��‘—X‘—“ú
-                //if (DateTime.MinValue != worklist[0].BillingSendDate)
-                //    m_DspCtrl[(int)DspCnt.BillingSendDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].BillingSendDate);        // �¿‹��‘—X‘—/Žè“n‚µ“ú
-                //else
-                //    ((Label)m_DspCtrl[(int)DspCnt.BillingSendDate]).TextAlign = ContentAlignment.MiddleCenter;
-
                 // ŒŸ�¸—\’è“ú
                 if (DateTime.MinValue != worklist[0].InspectPlanningDate)
                     m_DspCtrl[(int)DspCnt.InspectPlanningDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].InspectPlanningDate);  // ŒŸ�¸—\’è“ú
@@ -2076,10 +2049,12 @@
             IOConstructionBaseInfoDetail cbiDB = new IOConstructionBaseInfoDetail();
             try
             {
-                string strSQL = string.Format(" Where ConstructionCode = {0}", m_ConstructionCode);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(" Where ConstructionCode = {0}", m_ConstructionCode);
+                strSQL.Append(" Order By DetailNo");
                 // �HŽ–Šî–{�î•ñŽæ“¾
                 List<ConstructionBaseInfoDetail> worklist = new List<ConstructionBaseInfoDetail>();
-                if (!cbiDB.SelectAction(strSQL, ref worklist)) return false;
+                if (!cbiDB.SelectAction(strSQL.ToString(), ref worklist)) return false;
                 if (worklist.Count == 0)
                 {
                     // �‰ŠúŽž‚ÉƒfƒtƒHƒ‹ƒg•¶ŽšƒZƒbƒg
@@ -2603,7 +2578,7 @@
                 //cmbConstructionYear.Items.Add((NowYear + 1).ToString());
                 //cmbConstructionYear.Items.Add((NowYear + 2).ToString());
 
-                int NowYear = CommonMotions.SystemMasterData.ConstructionYear;
+                int NowYear = CommonMotions.SystemMasterData.ConstrYear;
 
                 cmbConstructionYear.Items.Add((NowYear - 2).ToString());
                 cmbConstructionYear.Items.Add((NowYear - 1).ToString());
@@ -3155,11 +3130,14 @@
 
                 // •\Ž¦”Ô�†‚Æ–¾�×”Ô�†‚Ì�·•ª‚ð‚Æ‚é
                 int iDifference = (int)DspCnt.OrderersName - (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName;
-                for (int i = (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName; i <= (int)ConstructionBaseInfoDetail.DataNoDef.PaymentComment; i++)
+                int nStart = (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName;
+                int nComplate = (int)ConstructionBaseInfoDetail.DataNoDef.RevCompleteComment;
+                for (int i = nStart; i <= nComplate; i++)
                 {
                     // ƒf�[ƒ^–³‚µ‚Í�‘‚«�ž‚Ü‚È‚¢
-                    if (CommonMotions.chkObjectIsNull(((TextBox)m_DspCtrl[i + iDifference]).Text)) continue;
-                    if (((TextBox)m_DspCtrl[i + iDifference]).Text.Length == 0) continue;
+                    TextBox wrkTextBox = ((TextBox)m_DspCtrl[i + iDifference]);
+                    if (CommonMotions.chkObjectIsNull(wrkTextBox.Text)) continue;
+                    if (wrkTextBox.Text.Length == 0) continue;
 
                     List<ConstructionBaseInfoDetail> workList = new List<ConstructionBaseInfoDetail>();
                     ConstructionBaseInfoDetail work = new ConstructionBaseInfoDetail();
@@ -4222,50 +4200,51 @@
             m_DspCtrl[(int)DspCnt.SalesComment] = textBox1;                                      // 39: �HŽ–�î•ñƒRƒ�ƒ“ƒg
             m_DspCtrl[(int)DspCnt.BillingComment] = textBox2;                                    // 40: �¿‹�ƒRƒ�ƒ“ƒg
             m_DspCtrl[(int)DspCnt.PaymentComment] = textBox3;                                    // 41: “ü‹àƒRƒ�ƒ“ƒg
-            m_DspCtrl[(int)DspCnt.LastUpDate] = lblLastUpdate;                                   // 42: �Å�I�X�V“ú�iƒ‰ƒxƒ‹�j
-            m_DspCtrl[(int)DspCnt.ConstructionType] = cmbConstructionType;                       // 43: �HŽ–Ží•Ê
-            m_DspCtrl[(int)DspCnt.EstimatesSubmitDeadline] = txtInput27;                         // 44: Œ©�Ï’ñ�oŠúŒÀ
-            m_DspCtrl[(int)DspCnt.ConstructionInstructor] = cmbConstructionInstructor;           // 45: �HŽ–Žw“±ˆõ
-            m_DspCtrl[(int)DspCnt.TransferConstruction] = cmbTransferConstruction;               // 46: �HŽ–ˆÚŠÇ�æƒR�[ƒh
-            m_DspCtrl[(int)DspCnt.TransferConstructionDate] = lblTransferDate;                   // 47: �HŽ–ˆÚŠÇ“ú
-            m_DspCtrl[(int)DspCnt.OrdersDecisionPriceInTax] = txtInput28;                        // 48: �Å�žŽó’�Œˆ’è‹àŠz
-            m_DspCtrl[(int)DspCnt.ConstructionPeriodStart] = txtInput29;                         // 49: Œ_–ñ�HŠúŠJŽn
-            m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd] = txtInput30;                           // 50: Œ_–ñ�HŠúŠ®—¹
-            m_DspCtrl[(int)DspCnt.ConstructionName2] = txtInput33;                               // 51: �HŽ––¼�Ìƒgƒbƒv•”
-            m_DspCtrl[(int)DspCnt.BillingStartDate] = txtInput36;                                // 52: �¿‹��€”õŠJŽn“ú
-            m_DspCtrl[(int)DspCnt.BillingComplateDate] = textBoxEX6;                             // 53: �¿‹�Šm”F“ú
-            m_DspCtrl[(int)DspCnt.OrderStartingDate] = txtInput38;                               // 54: ŠJŽn—\’è“ú
-            m_DspCtrl[(int)DspCnt.SalesDepartment] = comboBoxEX1;                                // 55: ‰c‹Æ’S“–•”��
-            m_DspCtrl[(int)DspCnt.EstimatePetition] = label97;		                             // 56: �ÏŽZŒ©�ÏŠm”F�\�¿“ú
-            m_DspCtrl[(int)DspCnt.EstimateApproval] = label100;		                             // 57: �ÏŽZŒ©�Ï�³”F“ú
-            m_DspCtrl[(int)DspCnt.EstimateBudgetPetition] = label99;		                     // 58: �ÏŽZ—\ŽZŠm”F�\�¿“ú
-            m_DspCtrl[(int)DspCnt.EstimateBudgetApproval] = label101;		                     // 59: �ÏŽZ—\ŽZ�³”F“ú
-            m_DspCtrl[(int)DspCnt.ProvisionalOrderDate] = textBoxEX1;		                     // 60: ‰¼Žó’�“ú
-            m_DspCtrl[(int)DspCnt.NonOrderDate] = textBoxEX2;		                             // 61: ”ñŽó’�“ú
-            m_DspCtrl[(int)DspCnt.ConstructionDepartment] = comboBoxEX2;		                 // 62: �HŽ–’S“–•”��
-            m_DspCtrl[(int)DspCnt.ConstructionPeriodStart2] = textBoxEX4;		                 // 63: Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
-            m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd2] = textBoxEX5;		                     // 64: Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
-            m_DspCtrl[(int)DspCnt.PreparationStartDate] = textBoxEX3;		                     // 65: Ž{�H�€”õŠJŽn“ú
-            m_DspCtrl[(int)DspCnt.ConstructionBudgetPetition] = label102;		                 // 66: �HŽ–—\ŽZ�\�¿“ú
-            m_DspCtrl[(int)DspCnt.ConstructionBudgetApproval] = label103;		                 // 67: �HŽ–—\ŽZ�³”F“ú
-            //m_DspCtrl[(int)DspCnt.PurchaseOrderEntryPetition] = label110;		                 // 68: ’�•¶�‘�\�¿“ú
-            //m_DspCtrl[(int)DspCnt.PurchaseOrderEntryApproval] = label111;		                 // 69: ’�•¶�‘�³”F“ú
-            //m_DspCtrl[(int)DspCnt.PurchaseOrderOutPutDate] = label104;		                 // 70: ’�•¶�‘”­‹‹“ú
-            //m_DspCtrl[(int)DspCnt.PurchaseOrderMailingDate] = textBoxEX8;		                 // 71: ’�•¶�‘—X‘—“ú
-            //m_DspCtrl[(int)DspCnt.PurchaseOrderReturnDate] = textBoxEX9;		                 // 72: ’�•¶�‘•Ô‘—“ú
-            //m_DspCtrl[(int)DspCnt.PurchaseOrderReturnCheckDate] = textBoxEX10;		         // 73: ’�•¶�‘•Ô‘—Šm”F“ú
-            //m_DspCtrl[(int)DspCnt.BillingPetition] = label105;		                         // 74: �¿‹��‘�\�¿“ú
-            //m_DspCtrl[(int)DspCnt.BillingApproval] = label106;		                         // 75: �¿‹��³”F“ú
-            //m_DspCtrl[(int)DspCnt.BillingOutPutDate] = label107;		                         // 76: �¿‹��‘”­‹‹“ú
-            //m_DspCtrl[(int)DspCnt.BillingSendDate] = label122;		                         // 77: �¿‹��‘—X‘—/Žè“n‚µ“ú
-            m_DspCtrl[(int)DspCnt.ConstrSubDepartment] = comboBoxEX3;                            // 78: �HŽ–•›’S“–•”��
-            m_DspCtrl[(int)DspCnt.InstructorDepartment] = comboBoxEX4;                           // 79: Žw“±ˆõ•”��
-            m_DspCtrl[(int)DspCnt.ConstrSubPersonCode] = cmbDisplayConstrSubPerson;              // 80: �HŽ–•›’S“–ŽÒƒR�[ƒh
-            m_DspCtrl[(int)DspCnt.LedgerComplateDate] = label118;                                // 81: �HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
-            m_DspCtrl[(int)DspCnt.BillingTypeName] = label87;                                    // 82: �¿‹�‹æ•ª–¼�Ì
-            m_DspCtrl[(int)DspCnt.InspectPlanningDate] = textBoxEX7;                             // 83:ŒŸ�¸—\’è“ú
-            m_DspCtrl[(int)DspCnt.InspectExecuteDate] = textBoxEX8;                              // 84:ŒŸ�¸ŽÀ�s“ú
-            m_DspCtrl[(int)DspCnt.RevCompleteDate] = textBoxEX9;                                 // 85:ŒŸ�¸�¥�³Š®—¹“ú
+            m_DspCtrl[(int)DspCnt.RevCompleteComment] = textBox4;                                // 42:ŒŸ�¸�¥�³Š®—¹ƒRƒ�ƒ“ƒg
+            m_DspCtrl[(int)DspCnt.LastUpDate] = lblLastUpdate;                                   // 43: �Å�I�X�V“ú�iƒ‰ƒxƒ‹�j
+            m_DspCtrl[(int)DspCnt.ConstructionType] = cmbConstructionType;                       // 44: �HŽ–Ží•Ê
+            m_DspCtrl[(int)DspCnt.EstimatesSubmitDeadline] = txtInput27;                         // 45: Œ©�Ï’ñ�oŠúŒÀ
+            m_DspCtrl[(int)DspCnt.ConstructionInstructor] = cmbConstructionInstructor;           // 46: �HŽ–Žw“±ˆõ
+            m_DspCtrl[(int)DspCnt.TransferConstruction] = cmbTransferConstruction;               // 47: �HŽ–ˆÚŠÇ�æƒR�[ƒh
+            m_DspCtrl[(int)DspCnt.TransferConstructionDate] = lblTransferDate;                   // 48: �HŽ–ˆÚŠÇ“ú
+            m_DspCtrl[(int)DspCnt.OrdersDecisionPriceInTax] = txtInput28;                        // 49: �Å�žŽó’�Œˆ’è‹àŠz
+            m_DspCtrl[(int)DspCnt.ConstructionPeriodStart] = txtInput29;                         // 50: Œ_–ñ�HŠúŠJŽn
+            m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd] = txtInput30;                           // 51: Œ_–ñ�HŠúŠ®—¹
+            m_DspCtrl[(int)DspCnt.ConstructionName2] = txtInput33;                               // 52: �HŽ––¼�Ìƒgƒbƒv•”
+            m_DspCtrl[(int)DspCnt.BillingStartDate] = txtInput36;                                // 53: �¿‹��€”õŠJŽn“ú
+            m_DspCtrl[(int)DspCnt.BillingComplateDate] = textBoxEX6;                             // 54: �¿‹�Šm”F“ú
+            m_DspCtrl[(int)DspCnt.OrderStartingDate] = txtInput38;                               // 55: ŠJŽn—\’è“ú
+            m_DspCtrl[(int)DspCnt.SalesDepartment] = comboBoxEX1;                                // 56: ‰c‹Æ’S“–•”��
+            m_DspCtrl[(int)DspCnt.EstimatePetition] = label97;		                             // 57: �ÏŽZŒ©�ÏŠm”F�\�¿“ú
+            m_DspCtrl[(int)DspCnt.EstimateApproval] = label100;		                             // 58: �ÏŽZŒ©�Ï�³”F“ú
+            m_DspCtrl[(int)DspCnt.EstimateBudgetPetition] = label99;		                     // 59: �ÏŽZ—\ŽZŠm”F�\�¿“ú
+            m_DspCtrl[(int)DspCnt.EstimateBudgetApproval] = label101;		                     // 60: �ÏŽZ—\ŽZ�³”F“ú
+            m_DspCtrl[(int)DspCnt.ProvisionalOrderDate] = textBoxEX1;		                     // 61: ‰¼Žó’�“ú
+            m_DspCtrl[(int)DspCnt.NonOrderDate] = textBoxEX2;		                             // 62: ”ñŽó’�“ú
+            m_DspCtrl[(int)DspCnt.ConstructionDepartment] = comboBoxEX2;		                 // 63: �HŽ–’S“–•”��
+            m_DspCtrl[(int)DspCnt.ConstructionPeriodStart2] = textBoxEX4;		                 // 64: Œ_–ñ�HŠúŠJŽn�i‰„’·Žž�j
+            m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd2] = textBoxEX5;		                     // 65: Œ_–ñ�HŠúŠ®—¹�i‰„’·Žž�j
+            m_DspCtrl[(int)DspCnt.PreparationStartDate] = textBoxEX3;		                     // 66: Ž{�H�€”õŠJŽn“ú
+            m_DspCtrl[(int)DspCnt.ConstructionBudgetPetition] = label102;		                 // 67: �HŽ–—\ŽZ�\�¿“ú
+            m_DspCtrl[(int)DspCnt.ConstructionBudgetApproval] = label103;		                 // 68: �HŽ–—\ŽZ�³”F“ú
+            //m_DspCtrl[(int)DspCnt.PurchaseOrderEntryPetition] = label110;		                 // 69: ’�•¶�‘�\�¿“ú
+            //m_DspCtrl[(int)DspCnt.PurchaseOrderEntryApproval] = label111;		                 // 70: ’�•¶�‘�³”F“ú
+            //m_DspCtrl[(int)DspCnt.PurchaseOrderOutPutDate] = label104;		                 // 71: ’�•¶�‘”­‹‹“ú
+            //m_DspCtrl[(int)DspCnt.PurchaseOrderMailingDate] = textBoxEX8;		                 // 72: ’�•¶�‘—X‘—“ú
+            //m_DspCtrl[(int)DspCnt.PurchaseOrderReturnDate] = textBoxEX9;		                 // 73: ’�•¶�‘•Ô‘—“ú
+            //m_DspCtrl[(int)DspCnt.PurchaseOrderReturnCheckDate] = textBoxEX10;		         // 74: ’�•¶�‘•Ô‘—Šm”F“ú
+            //m_DspCtrl[(int)DspCnt.BillingPetition] = label105;		                         // 75: �¿‹��‘�\�¿“ú
+            //m_DspCtrl[(int)DspCnt.BillingApproval] = label106;		                         // 76: �¿‹��³”F“ú
+            //m_DspCtrl[(int)DspCnt.BillingOutPutDate] = label107;		                         // 77: �¿‹��‘”­‹‹“ú
+            //m_DspCtrl[(int)DspCnt.BillingSendDate] = label122;		                         // 78: �¿‹��‘—X‘—/Žè“n‚µ“ú
+            m_DspCtrl[(int)DspCnt.ConstrSubDepartment] = comboBoxEX3;                            // 79: �HŽ–•›’S“–•”��
+            m_DspCtrl[(int)DspCnt.InstructorDepartment] = comboBoxEX4;                           // 80: Žw“±ˆõ•”��
+            m_DspCtrl[(int)DspCnt.ConstrSubPersonCode] = cmbDisplayConstrSubPerson;              // 81: �HŽ–•›’S“–ŽÒƒR�[ƒh
+            m_DspCtrl[(int)DspCnt.LedgerComplateDate] = label118;                                // 82: �HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
+            m_DspCtrl[(int)DspCnt.BillingTypeName] = label87;                                    // 83: �¿‹�‹æ•ª–¼�Ì
+            m_DspCtrl[(int)DspCnt.InspectPlanningDate] = textBoxEX7;                             // 84:ŒŸ�¸—\’è“ú
+            m_DspCtrl[(int)DspCnt.InspectExecuteDate] = textBoxEX8;                              // 85:ŒŸ�¸ŽÀ�s“ú
+            m_DspCtrl[(int)DspCnt.RevCompleteDate] = textBoxEX9;                                 // 86:ŒŸ�¸�¥�³Š®—¹“ú
         }
         #endregion
 
@@ -4919,7 +4898,7 @@
                     iYear = CommonMotions.PeriodCountToYear(Period);
                     bPeriod = true;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
 
@@ -4993,19 +4972,41 @@
         {
             try
             {
+                // ‚Â‚¢‚Å‚ÉŠúŒÀƒ`ƒFƒbƒN‰ð�œƒ{ƒ^ƒ“‚à‚±‚±‚Å•\Ž¦(�V‹KŽž‚Í•\Ž¦‚µ‚È‚¢)
+                if (m_ConstructionCode > 0) btnPA.Visible = true;
+
+                // �¿‹�Šm”FŽž‚ÍˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (!rdbStatus10.Checked) return;
+
                 // �Å�‚�Ó”CŽÒ‚Í‰ð�œ‚Å‚«‚é
                 int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;
                 if (CommonMotions.LoginUserSecurity.SecRank != CommonDefine.SecurityRankList[SRank].Key) return;
 
-                // �¿‹�Šm”FŽž‚Í�¿‹�‰ð�œƒ{ƒ^ƒ“•\Ž¦
-                if (rdbStatus10.Checked)
+                // �¿‹�‰ð�œƒ{ƒ^ƒ“•\Ž¦
+                btnRestore.Enabled = true;
+                btnRestore.Visible = true;
+
+                // ŒŸ�¸�¥�³Š®—¹“ú‚ª“ü—Í‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î“ü—Í‚Ì‚½‚ßƒ�ƒbƒN‰ð�œ
+                if (m_DspCtrl[(int)DspCnt.RevCompleteDate].Text.Length > 1)
                 {
-                    btnRestore.Enabled = true;
-                    btnRestore.Visible = true;
-                    m_DspCtrl[(int)DspCnt.RevCompleteDate].Enabled = true;  // 85:ŒŸ�¸�¥�³Š®—¹“ú
+                    // ŒŸ�¸�¥�³Š®—¹“ú
+                    m_DspCtrl[(int)DspCnt.RevCompleteDate].Enabled = false;
+                    // ŒŸ�¸�¥�³Š®—¹ƒRƒ�ƒ“ƒg
+                    m_DspCtrl[(int)DspCnt.RevCompleteComment].Enabled = false;
                 }
-                // ‚Â‚¢‚Å‚ÉŠúŒÀƒ`ƒFƒbƒN‰ð�œƒ{ƒ^ƒ“‚à‚±‚±‚Å•\Ž¦(�V‹KŽž‚Í•\Ž¦‚µ‚È‚¢)
-                if (m_ConstructionCode > 0) btnPA.Visible = true;
+                else
+                {
+                    // “o˜^ƒ{ƒ^ƒ“•\Ž¦
+                    btnDataEntry.Visible = true;
+                }
+                // �¿‹�Šm”F“ú‚ª“ü—Í‚³‚ê‚Ä‚¢‚È‚¯‚ê‚Î“ü—Í‚Ì‚½‚ßƒ�ƒbƒN‰ð�œ
+                if (m_DspCtrl[(int)DspCnt.BillingComplateDate].Text.Length > 1)
+                {
+                    // �¿‹�Šm”F“ú
+                    m_DspCtrl[(int)DspCnt.BillingComplateDate].Enabled = false;
+                    // �¿‹�ƒRƒ�ƒ“ƒg
+                    m_DspCtrl[(int)DspCnt.BillingComment].Enabled = false;
+                }
             }
             catch (Exception ex)
             {
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs	(revision 323)
@@ -445,9 +445,9 @@
                 }
                 else
                 {   // å·¥äº‹å¹´åº¦
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // çµ‚äº†ã�¯ï¼‹1å¹´ï¼�1æ—¥
             }
@@ -1190,7 +1190,7 @@
                 {   // ----- å–¶æ¥­å¹´åº¦ãƒ™ãƒ¼ã‚¹ã�®æ™‚
 
                     // å–¶æ¥­å¹´ã‚’ã‚»ãƒƒãƒˆ
-                    PeriodValue = CommonMotions.SystemMasterData.ConstructionYear;
+                    PeriodValue = CommonMotions.SystemMasterData.ConstrYear;
                 }
                 // å·¥äº‹ç•ªå�·ã‚’ä½œæˆ�ã�™ã‚‹
                 return BaseDB.CreateNewCounstructionCode(PeriodValue);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 323)
@@ -8561,9 +8561,9 @@
                 }
                 else
                 {   // å·¥äº‹å¹´åº¦
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // çµ‚äº†ã�¯ï¼‹1å¹´ï¼�1æ—¥
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CreateLedgerSQL.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CreateLedgerSQL.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CreateLedgerSQL.cs	(revision 323)
@@ -218,9 +218,9 @@
                 }
                 else
                 {   // å·¥äº‹å¹´åº¦
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // çµ‚äº†ã�¯ï¼‹1å¹´ï¼�1æ—¥
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSplit/FrmConstructionSplitAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSplit/FrmConstructionSplitAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSplit/FrmConstructionSplitAuxiliary.cs	(revision 323)
@@ -790,7 +790,7 @@
                 {   // ----- å–¶æ¥­å¹´åº¦ãƒ™ãƒ¼ã‚¹ã�®æ™‚
 
                     // å–¶æ¥­å¹´ã‚’ã‚»ãƒƒãƒˆ
-                    PeriodValue = CommonMotions.SystemMasterData.ConstructionYear;
+                    PeriodValue = CommonMotions.SystemMasterData.ConstrYear;
                 }
                 // å·¥äº‹ç•ªå�·ã‚’ä½œæˆ�ã�™ã‚‹
                 return BaseDB.CreateNewCounstructionCode(PeriodValue);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.cs	(revision 323)
@@ -665,7 +665,7 @@
                 else
                 {
                     label7.Text = "å–¶æ¥­å¹´åº¦";
-                    int NowYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    int NowYear = CommonMotions.SystemMasterData.ConstrYear;
 
                     cmbConstructionPeriod.Items.Add((NowYear - 2).ToString());
                     cmbConstructionPeriod.Items.Add((NowYear - 1).ToString());
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 323)
@@ -1036,9 +1036,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 323)
@@ -1320,7 +1320,7 @@
                 DataGridView dgv = (DataGridView)sender;
                 //Console.WriteLine("{0}={1}", dgv.Name, dgv.ShowCellToolTips);
                 // “Ç�ž�ê—pƒZƒ‹‚Í�ˆ—�‚µ‚È‚¢
-                if (dgv.CurrentCell.ReadOnly) return;
+                if (dgv[e.ColumnIndex,e.RowIndex].ReadOnly) return;
 
                 //IME‚Ìƒ‚�[ƒh‚ð•Ï�X‚·‚é
                 switch (e.ColumnIndex)
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 323)
@@ -439,22 +439,6 @@
                 newpage.EnrtyCheckBoxColumn[0].ReadOnly = true;
                 newpage.EnrtyCheckBoxColumn[0].Width = 100;
 
-                // ãƒ©ã‚¤ãƒ³ã‚­ãƒ£ãƒ³ãƒ�ã‚¹è¿½åŠ 
-                //int iWidth = 0;
-                //foreach (DataGridViewColumn wrkcol in newpage.EntryDGV.Columns)
-                //{
-                //    iWidth += wrkcol.Width;
-                //}
-                //int iHeight = 0;
-                //foreach (DataGridViewRow wrkrow in newpage.EntryDGV.Rows)
-                //{
-                //    iHeight += wrkrow.Height;
-                //}
-                //newpage.CommentShapeContainer.Size = new Size(iWidth, iHeight);
-                //newpage.CommentShapeContainer.Size = new Size(newpage.EntryDGV.Width, newpage.EntryDGV.Height);
-                //newpage.EntryDGV.Controls.Add(newpage.CommentShapeContainer);
-                //newpage.CommentShapeContainer.BringToFront();
-
                 // è¡¨ç¤ºæ›´æ–°å†�é–‹
                 newpage.EntryTab.ResumeLayout(false);
                 newpage.EntryTab.PerformLayout();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/RequestPrint.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/RequestPrint.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/RequestPrint.cs	(revision 323)
@@ -0,0 +1,871 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections;
+using System.Windows.Forms;
+using System.Diagnostics;
+using System.Globalization;
+using Microsoft.VisualBasic;
+using Microsoft.Office.Interop.Excel;
+
+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.DataEntry;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.SubForms;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmEstimateInput
+    {
+
+        #region ã‚¹ãƒ¬ãƒƒãƒ‰ä½¿ç”¨å®šç¾©
+        //ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ‡ãƒªã‚²ãƒ¼ãƒˆ
+        private delegate void SetProgressValueDelegate(int num);
+        //ãƒ�ãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å‡¦ç�†ã�Œçµ‚ã‚�ã�£ã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ‡ãƒªã‚²ãƒ¼ãƒˆ
+        private delegate void ThreadCompletedDelegate();
+        //å‡¦ç�†ã�Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ‡ãƒªã‚²ãƒ¼ãƒˆ
+        private delegate void ThreadCanceledDelegate();
+
+        //åˆ¥å‡¦ç�†ã‚’ã�™ã‚‹ã�Ÿã‚�ã�®ã‚¹ãƒ¬ãƒƒãƒ‰
+        private System.Threading.Thread workerThread;
+
+        //ãƒ‡ãƒªã‚²ãƒ¼ãƒˆã�®ä½œæˆ�
+        SetProgressValueDelegate m_progressDlg = null;
+        ThreadCompletedDelegate m_completeDlg = null;
+        ThreadCanceledDelegate m_canceledDlg = null;
+        #endregion
+
+        #region å®šæ•°
+        private static readonly string[] s_SheetName = new string[] {"ç©�ç®—è¦‹ç©�æ›¸è¡¨ç´™",
+                                                                    "ç©�ç®—è¦‹ç©�æ›¸å†…è¨³"
+                                                                    };
+        /// <summary>
+        /// ã‚·ãƒ¼ãƒˆå��ç§°ã‚«ã‚¦ãƒ³ãƒˆ
+        /// </summary>
+        enum enumSheetName
+        {
+            Cover = 0,
+            Detail,
+        }
+
+        /// <summary>
+        /// æ˜Žç´°ãƒšãƒ¼ã‚¸ã�®å…ˆé ­è¡Œæ•°
+        /// </summary>
+        private int s_DetailNumberOfStartLine = 3;
+        /// <summary>
+        /// æ˜Žç´°ãƒšãƒ¼ã‚¸ã�®1ãƒšãƒ¼ã‚¸å†…ã�®è¡Œæ•°
+        /// </summary>
+        private int s_DetailNumberOfLine = 23;
+        /// <summary>
+        /// æ˜Žç´°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã�®è¡Œæ•°
+        /// </summary>
+        private int s_NumberOfRowInDetail = 26;
+
+        /// <summary>
+        /// Excelãƒ•ã‚¡ã‚¤ãƒ«å��
+        /// </summary>
+        private string s_ExcelBookName = "è¦‹ç©�ä¾�é ¼";
+
+        /// <summary>
+        /// æ¦‚ç®—è¦‹ç©�ã‚Šæ˜Žç´°ãƒšãƒ¼ã‚¸åˆ—æ•°
+        /// </summary>
+        private int s_EstimateDetailColumCount = 8;
+
+        /// <summary>
+        /// æ¦‚ç®—è¦‹ç©�ã‚Šæ˜Žç´°ãƒšãƒ¼ã‚¸åˆ—ã‚«ã‚¦ãƒ³ãƒˆ
+        /// </summary>
+        private enum DetailColumCharctor
+        {
+            ColumA = 0,
+            ColumB,
+            ColumC,
+            ColumD,
+            ColumE,
+            ColumF,
+            ColumG,
+            ColumH,
+        }
+
+        #endregion
+
+        #region å¤‰æ•°
+
+        /// <summary>
+        /// ã‚¨ã‚¯ã‚»ãƒ«å�°åˆ·ã‚¯ãƒ©ã‚¹ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ
+        /// </summary>
+        private UsedExcel m_UsedExcel = null;
+
+        /// <summary>
+        /// ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ä½¿ç”¨ã‚«ã‚¦ãƒ³ãƒˆ
+        /// </summary>
+        private int m_ProgressCount = 0;
+
+        /// <summary>
+        /// ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³ã�Œã‚¯ãƒªãƒƒã‚¯ã�•ã‚Œã�Ÿã�‹ã‚’ç¤ºã�™ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private volatile bool m_Canceled = false;
+
+        /// <summary>
+        /// çµ‚äº†ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        private CommonDefine.RetunAnswer m_rtAns = CommonDefine.RetunAnswer.Answer0;
+        #endregion
+
+        #region å�°åˆ·å‡¦ç�†
+        /// <summary>
+        /// å�°åˆ·å‡¦ç�†
+        /// </summary>
+        private void PrintProcess()
+        {
+            FrmSaveFilePath frm = new FrmSaveFilePath();
+            FrmPrintConfirmation frmCofimation = new FrmPrintConfirmation();
+            try
+            {
+                // å·¥äº‹ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
+                frmCofimation.ConstructionCode = m_ConstructionCode;
+
+                // å��ç§°ãƒ»è¡¨ç¤ºçŠ¶æ…‹
+                frmCofimation.ProcessName = "è¦‹ã€€ç©�ã€€ä¾�ã€€é ¼";
+                frmCofimation.DispRenge = false;
+
+                // ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦è¡¨ç¤º
+                //frmCofimation.ShowInTaskbar = false;
+                frmCofimation.ShowDialog();
+
+                // çµ‚äº†çŠ¶æ…‹
+                m_PrintresRet = frmCofimation.EndButton;
+
+                // ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (m_PrintresRet == DialogResult.Cancel) return;
+
+                // EXCELä¿�å­˜æ™‚é�¸æŠž
+                if (m_PrintresRet == DialogResult.No)
+                {
+                    // ä¿�å­˜å…ˆã‚’é�¸æŠžã�™ã‚‹
+                    frm.SaveType = (int)CommonDefine.SaveFileType.ExcelFile;
+                    //frm.ShowInTaskbar = false;
+                    frm.ShowDialog();
+                    if (frm.EndButton == DialogResult.Cancel) return;
+                    m_SelectSaveExcel = frm.SelectPath;
+                }
+
+
+                // å�°åˆ·ãƒ—ãƒ­ã‚»ã‚¹æ•°å�–å¾—
+                m_ProcessCount = GetProcessCount() + 3;       // æ˜Žç´°æžšæ•°ï¼‹ï¼¥ï¼¸ï¼£ï¼¥ï¼¬ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå�–å¾—(2)ï¼‹ç·�è¨ˆãƒšãƒ¼ã‚¸(1)
+                PrintProgress.Visible = true;
+                PrintProgress.Minimum = 0;
+                PrintProgress.Maximum = m_ProcessCount;
+                PrintProgress.Value = 0;
+                panel2.Update();
+
+                m_Canceled = false;
+                // ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
+                PrintButtonVisbleControl(true);
+
+                //å�°åˆ·ã‚’åˆ¥ã‚¹ãƒ¬ãƒƒãƒ‰ã�§å®Ÿè¡Œã�™ã‚‹
+                m_ProgressCount = 0;
+                workerThread = new System.Threading.Thread(new System.Threading.ThreadStart(PrintMain));
+                workerThread.IsBackground = true;
+                workerThread.Start();
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Close(); frm = null;
+                frmCofimation.Close(); frmCofimation = null;
+            }
+        }
+        #endregion
+
+        #region å�°åˆ·ãƒ¡ã‚¤ãƒ³
+        /// <summary>
+        /// å�°åˆ·å‡¦ç�†
+        /// </summary>
+        public void PrintMain()
+        {
+            //ãƒ‡ãƒªã‚²ãƒ¼ãƒˆã�®ä½œæˆ�
+            m_progressDlg = new SetProgressValueDelegate(SetProgressValue);
+            m_completeDlg = new ThreadCompletedDelegate(ThreadCompleted);
+            m_canceledDlg = new ThreadCanceledDelegate(ThreadCanceled);
+
+            try
+            {
+                // å�°åˆ·ã‚¯ãƒ©ã‚¹
+                m_UsedExcel = new UsedExcel();
+                m_ProgressCount = 0;
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+
+                //ã‚¨ã‚¯ã‚»ãƒ«ãƒ–ãƒƒã‚¯ã‚ªãƒ¼ãƒ—ãƒ³
+                if (!m_UsedExcel.ExcelBookOpen(System.Environment.CurrentDirectory + CommonDefine.s_ExcelOriginalFileName))
+                {
+                    m_rtAns = CommonDefine.RetunAnswer.Answer5;
+                    return;
+                }
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+
+                List<string> strParaList = new List<string>();
+                CommonDefine.RetunAnswer rtAns = CommonDefine.RetunAnswer.Answer0;
+
+                // ä¸­æ–­å‡¦ç�†
+                if (m_Canceled) return;
+
+                // æ˜Žç´°éƒ¨å�°åˆ·
+                if ((rtAns = PrintDetail(strParaList)) != CommonDefine.RetunAnswer.Answer0)
+                {
+                    m_rtAns = rtAns;
+                    return;
+                }
+
+                // ä¸­æ–­å‡¦ç�†
+                if (m_Canceled) return;
+
+                // å�°åˆ·ãƒ»Excelä¿�å­˜å‡¦ç�†
+                if (m_PrintresRet == DialogResult.Yes)
+                {
+                    // +++++++++++++++++++++++++ å�°åˆ· +++++++++++++++++++++++++
+                    m_UsedExcel.ExcelSheetPrint();
+                }
+                else if (m_PrintresRet == DialogResult.No)
+                {
+                    // +++++++++++++++++++++++++ ä¿�å­˜ +++++++++++++++++++++++++
+                    string strFilePath = @m_SelectSaveExcel;
+                    // ã‚¨ã‚¯ã‚»ãƒ«ä¿�å­˜
+                    if (CommonMotions.ChkDirPath(strFilePath, true))
+                    {
+                        string wrkFile = "1-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 + @s_ExcelBookName;
+
+                        m_UsedExcel.SaveSwitch = true;
+                        m_UsedExcel.ExcelSaveBook(strFilePath);
+                    }
+                }
+
+                m_rtAns = CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                m_rtAns = CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                // å®Œäº†ã�—ã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_completeDlg);
+
+                // ã‚¨ã‚¯ã‚»ãƒ«é–‹æ”¾
+                if (m_UsedExcel != null)
+                {
+                    m_UsedExcel.ExcelBookClose();
+                }
+                m_UsedExcel = null;
+
+                //ãƒ‡ãƒªã‚²ãƒ¼ãƒˆã�®å»ƒæ£„
+                m_progressDlg = null;
+                m_completeDlg = null;
+                m_canceledDlg = null;
+
+                // ã‚¬ãƒ¼ãƒ™ãƒ¼ã‚¸ã‚³ãƒ¬ã‚¯ãƒˆ
+                GC.Collect();
+            }
+        }
+        #endregion
+
+        #region ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// <summary>
+        /// ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// </summary>
+        /// <param name="num"></param>
+        private void SetProgressValue(int num)
+        {
+            // ProgressBarã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            PrintProgress.Value = num;
+            PrintProgress.Update();
+        }
+        #endregion
+
+        #region å‡¦ç�†ã�Œå®Œäº†ã�—ã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// <summary>
+        /// å‡¦ç�†ã�Œå®Œäº†ã�—ã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// </summary>
+        private void ThreadCompleted()
+        {
+            try
+            {
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å¤‰æ›´
+                PrintProgress.Visible = false;
+                panel2.Update();
+
+                // ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
+                PrintButtonVisbleControl(false);
+
+                // å�°åˆ·
+                if (m_rtAns == CommonDefine.RetunAnswer.Answer0)
+                {
+                    if (m_PrintresRet == DialogResult.No)
+                    {
+                        MessageBox.Show("ä¿�å­˜ã�Œçµ‚äº†ã�—ã�¾ã�—ã�Ÿã€‚", "çµ‚ã€€äº†", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    return;
+                }
+
+                string strMessage = "";
+                switch ((int)m_rtAns)
+                {
+                    case (int)CommonDefine.RetunAnswer.Answer1:
+                        strMessage = "ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer2:
+                        strMessage = "å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer3:
+                        strMessage = "å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer4:
+                        strMessage = "å·¥äº‹åŸºæœ¬æƒ…å ±å�°åˆ·ãƒ‡ãƒ¼ã‚¿ç„¡";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer5:
+                        strMessage = "å�°åˆ·ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer6:
+                        strMessage = "ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer7:
+                        strMessage = "ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�°åˆ·ãƒ‡ãƒ¼ã‚¿ç„¡";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer8:
+                        strMessage = "ç©�ç®—è¦‹ç©�ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                }
+                MessageBox.Show(strMessage, "å�°åˆ·ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                m_rtAns = CommonDefine.RetunAnswer.Answer1;
+            }
+        }
+        #endregion
+
+        #region å‡¦ç�†ã�Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// <summary>
+        /// å‡¦ç�†ã�Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// </summary>
+        private void ThreadCanceled()
+        {
+            // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å¤‰æ›´
+            PrintProgress.Visible = false;
+            panel2.Update();
+
+            // ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
+            PrintButtonVisbleControl(false);
+        }
+        #endregion
+
+        #region ã‚¨ãƒªã‚¢ã‚¹ã‚’ä»˜ã�‘ã�Ÿæ‹…å½“è€…ãƒžã‚¹ã‚¿ã�®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰æ–‡ã‚’ä½œæˆ�ã�™ã‚‹
+        /// <summary>
+        /// ã‚¨ãƒªã‚¢ã‚¹ã‚’ä»˜ã�‘ã�Ÿæ‹…å½“è€…ãƒžã‚¹ã‚¿ã�®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰æ–‡ã‚’ä½œæˆ�ã�™ã‚‹
+        /// </summary>
+        /// <param name="Alias"></param>
+        /// <param name="strSQL"></param>
+        private string CreatePersonSQL(string Alias)
+        {
+            try
+            {
+                StringBuilder strcmd = new StringBuilder();
+
+                bool bColFirst = true;
+                string strWork = string.Empty;
+                foreach (var gender in Enum.GetValues(typeof(IOMPersonInCharge.ColumnCnt)))
+                {
+                    strWork = gender.ToString();
+                    if (!bColFirst) strcmd.Append(", ");
+                    if (strWork.Equals("StartDate") || strWork.Equals("EndDate"))
+                    {
+                        strcmd.AppendFormat(" DATE_FORMAT({0}{1}, '%Y/%m/%d')", Alias, strWork);
+                    }
+                    else if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                    {
+                        strcmd.AppendFormat(" DATE_FORMAT({0}{1}, '%Y/%m/%d %H:%i:%s')", Alias, strWork);
+                    }
+                    else
+                    {
+                        strcmd.AppendFormat(" {0}{1}", Alias, strWork);
+                    }
+                    bColFirst = false;
+                }
+
+                return strcmd.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region Dictionaryã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šå‡ºã�™
+        /// <summary>
+        /// Dictionaryã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šå‡ºã�™
+        /// </summary>
+        /// <param name="Dic"></param>
+        /// <param name="Number"></param>
+        /// <returns></returns>
+        private string GetDictionaryMember(Dictionary<int, string> Dic, int Number)
+        {
+            try
+            {
+                return Dic[Number];
+            }
+            catch (Exception ex)
+            {
+                logger.DebugFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region å�°åˆ·ãƒšãƒ¼ã‚¸ã‚’å�–å¾—ã�™ã‚‹ã�Ÿã‚�ã�«è¦‹ç©�æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã�®å¯¾è±¡ä»¶æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å�°åˆ·ãƒšãƒ¼ã‚¸ã‚’å�–å¾—ã�™ã‚‹ã�Ÿã‚�ã�«è¦‹ç©�æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã�®å¯¾è±¡ä»¶æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private int GetProcessCount()
+        {
+            IOEstimateDataBody etbDB = new IOEstimateDataBody();
+            int RetCnt = 0;
+            try
+            {
+                // ++++++++++++++++++++++++++++++++++++++++ ç©�ç®—è¦‹ç©�ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿
+                ArrayList arData = new ArrayList();
+
+
+                // ç©�ç®—è¦‹ç©�ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                string strSQL = string.Format("Select count(*) from ESTIMATEDATABODY Where CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                // SQLå®Ÿè¡Œ
+                if (!etbDB.ExecuteReader(strSQL, ref arData)) return RetCnt;
+
+                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯æ¬¡å‡¦ç�†
+                if (arData.Count == 0) return RetCnt;
+
+                foreach (object[] objwrk in arData)
+                {
+                    RetCnt = CommonMotions.cnvInt(objwrk[0].ToString());
+                }
+
+                return RetCnt;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return RetCnt;
+            }
+            finally
+            {
+                etbDB.close(); etbDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ•ãƒƒãƒ€ãƒ¼å�°åˆ·
+        /// <summary>
+        /// ãƒšãƒ¼ã‚¸ä¸‹éƒ¨å�°åˆ·
+        /// </summary>
+        /// <param name="LineCount"></param>
+        /// <param name="CompanyName"></param>
+        /// <param name="PageCount"></param>
+        private void FooterTitle(ref object[,] objPrint, string CompanyName, int PageCountAll)
+        {
+            try
+            {
+                // ä¼šç¤¾å��ï¼‹ãƒšãƒ¼ã‚¸å�°åˆ·
+                objPrint[s_DetailNumberOfLine, (int)DetailColumCharctor.ColumC] = CompanyName; // ä¼šç¤¾å��
+                objPrint[s_DetailNumberOfLine, (int)DetailColumCharctor.ColumH] =
+                                "ï¼®ï½�" + Strings.StrConv(PageCountAll.ToString(), VbStrConv.Wide, 0);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region æ˜Žç´°å�°åˆ·
+        /// <summary>
+        /// æ˜Žç´°å�°åˆ·
+        /// </summary>
+        private CommonDefine.RetunAnswer PrintDetail(List<string> strParaList)
+        {
+            IOEstimateData etDB = new IOEstimateData();
+            IOEstimateDataBody etbDB = new IOEstimateDataBody();
+            IOEstimateDataDetail etdDB = new IOEstimateDataDetail();
+            IOMComponent ctDB = new IOMComponent();
+            IOMComponentLink linkDB = new IOMComponentLink();
+            IOConstructionBaseInfoDetail cbidDB = new IOConstructionBaseInfoDetail();
+            try
+            {
+                List<KouseiRelationClass> kouseiList = new List<KouseiRelationClass>();
+                List<EstimateData> LargeList = new List<EstimateData>();
+                List<EstimateDataBody> MiddleList = new List<EstimateDataBody>();
+                List<ComponentMaster> CompList = new List<ComponentMaster>();
+                List<EstimateDataDetail> SmallList = new List<EstimateDataDetail>();
+
+                etDB.connect();
+                etbDB.connect();
+                etdDB.connect();
+                ctDB.connect();
+                // ++++++++++++++++++++++++++++++++++++++++ ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿
+
+                // ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(etDB.CreatePrimarykeyString(m_ConstructionCode));
+                strSQL.Append(" Order By LineCount");
+                if (!etDB.SelectAction(strSQL.ToString(), ref LargeList, false)) return CommonDefine.RetunAnswer.Answer6;
+
+                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯è¡¨ç¤ºã�›ã�šã�«å…¥åŠ›ã�¸
+                if (LargeList.Count == 0) return CommonDefine.RetunAnswer.Answer7;
+
+                //ã‚·ãƒ¼ãƒˆã�®å�–å¾—
+                //m_UsedExcel.ExcelSheetGet(s_SheetName[(int)enumSheetName.Detail], true, TotalPageName);
+
+                // å·¥äº‹å��ç§°
+                List<ConstructionBaseInfoDetail> workdlist = new List<ConstructionBaseInfoDetail>();
+                strSQL.Clear();
+                strSQL.AppendFormat(" Where ConstructionCode = {0}", m_ConstructionCode);
+                strSQL.AppendFormat(" And DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                // å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°å�–å¾—
+                if (!cbidDB.SelectAction(strSQL.ToString(), ref workdlist)) return CommonDefine.RetunAnswer.Answer3;
+
+                string strwork = workdlist[0].DetailString;
+                strParaList.Add(strwork);
+
+                int LineCount = 2;
+                int pageCnt = 0;
+                int AllPageCnt = 0;
+                int APoint = 0;
+                int HPoint = 0;
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+
+                // ä¸­æ–­å‡¦ç�†
+                if (m_Canceled) return CommonDefine.RetunAnswer.Answer0;
+
+                // ++++++++++++++++++++++++++++++++++++++++ ç©�ç®—è¦‹ç©�ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿
+                MiddleList.Clear();
+                // ç©�ç®—è¦‹ç©�ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                strSQL.Clear();
+                strSQL.Append(etbDB.CreatePrimarykeyString(m_ConstructionCode));
+                strSQL.Append(" Order By PageCount");
+                if (!etbDB.SelectAction(strSQL.ToString(), ref MiddleList, false)) return CommonDefine.RetunAnswer.Answer8;
+
+                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯æ¬¡å‡¦ç�†
+                if (MiddleList.Count == 0) return CommonDefine.RetunAnswer.Answer0;
+
+                // å·¥ç¨®â„–
+                int LineCharCnt = 0;
+                string LineChar = "";
+                foreach (EstimateDataBody DataBody in MiddleList)
+                {
+                    // å�°åˆ·ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆä½œæˆ�
+                    object[,] objPrint2 = new object[s_DetailNumberOfLine + 1, s_EstimateDetailColumCount];
+                    // ãƒ©ã‚¤ãƒ³ã‚«ãƒ³ãƒˆ
+                    LineCount = 0;
+                    //ã‚·ãƒ¼ãƒˆã�®å�–å¾—
+                    m_UsedExcel.ExcelSheetGet(s_SheetName[(int)enumSheetName.Detail], true, DataBody.PageTitle);
+
+                    // ã‚¿ã‚¤ãƒˆãƒ«è¡Œã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                    if (DataBody.SelectComponent == 0)
+                    {
+                        // è¡Œç•ªå�·ã‚»ãƒƒãƒˆ
+                        LineCharCnt = GetTotalPageRow(DataBody.PageTitle);
+                        LineChar = CommonMotions.cnvNumberToAlphaCharacter(LineCharCnt);
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumA] = LineChar;
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumB] = CommonMotions.ComentSucstring(DataBody.PageTitle, "â€»"); // å��ç§°
+                    }
+                    else
+                    {
+                        // è¡Œç•ªå�·ã‚»ãƒƒãƒˆ
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumA] = LineChar + "-" + DataBody.DetailLineCount.ToString();
+
+                        // æ§‹æˆ�å��ç§°ã‚»ãƒƒãƒˆ
+                        strSQL.Clear();
+                        strSQL.Append(ctDB.CreatePrimarykeyString(DataBody.SelectComponent));
+                        ComponentMaster ctRec = new ComponentMaster();
+                        ctDB.SelectAction(strSQL.ToString(), ref ctRec);
+
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumB] = CommonMotions.ComentSucstring(ctRec.ComponentName, "â€»");    // å��ç§°
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumC] = DataBody.PageTitle;             // å“�è³ªãƒ»å½¢çŠ¶ãƒ»å¯¸æ³•
+                    }
+                    LineCount++;
+
+                    // ++++++++++++++++++++++++++++++++++++++++ ç©�ç®—è¦‹ç©�æ˜Žç´°ãƒ‡ãƒ¼ã‚¿(ä½œæ¥­)
+                    SmallList.Clear();
+                    // ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                    strSQL.Clear();
+                    strSQL.Append(etdDB.CreatePrimarykeyString(DataBody.ConstructionCode, DataBody.PageCount));
+                    strSQL.Append(" Order By LineCount");
+                    if (!etdDB.SelectAction(strSQL.ToString(), ref SmallList, false)) continue;
+
+                    // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯æ¬¡å‡¦ç�†
+                    //if (SmallList.Count == 0) continue;
+
+                    // 1ãƒšãƒ¼ã‚¸ã�«å�Žã�¾ã‚‰ã�ªã�„å ´å�ˆå¿…è¦�åˆ†ã€�å…ˆã�«ã‚³ãƒ”ãƒ¼ã�™ã‚‹ï¼ˆï¼‘æ˜Žç´°ï¼‘è¡Œï¼‹å·¥ç¨®å��+å°�è¨ˆï¼‰
+                    int workRow = (int)CommonMotions.cnvRoundUp((double)(SmallList.Count + 1 + 1) / (double)(s_DetailNumberOfLine));
+                    if (workRow > 1)
+                    {
+                        // ã‚½ãƒ¼ã‚¹ä½�ç½®ä½œæˆ�
+                        string SrcRow = string.Format("1:{0}", s_NumberOfRowInDetail);
+                        // ã‚³ãƒ”ãƒ¼å…ˆä½�ç½®ä½œæˆ�
+                        string DestRow = string.Format("{0}:{1}", (s_NumberOfRowInDetail + 1), (s_NumberOfRowInDetail * workRow));
+                        // å�°åˆ·é ˜åŸŸä½œæˆ�
+                        string PrintArea = string.Format("$A$1:$H${0}", (s_NumberOfRowInDetail * workRow));
+
+                        // ã‚·ãƒ¼ãƒˆã�®å�–å¾—
+                        m_UsedExcel.ExcelSheetGet(s_SheetName[(int)enumSheetName.Detail], false);
+                        // æ˜Žç´°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã�®ã‚³ãƒ”ãƒ¼
+                        m_UsedExcel.ExcelCopyRow(SrcRow, DestRow, PrintArea, workRow);
+                    }
+
+                    // ä¸­æ–­å‡¦ç�†
+                    if (m_Canceled) return CommonDefine.RetunAnswer.Answer0;
+
+                    // æ§‹æˆ�ã‚¿ãƒ–ã�®å ´å�ˆã�®ã�¿ä¸‹ä½�ã�«ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚‹ã�‹ã‚’ãƒ�ã‚§ãƒƒã‚¯ã�™ã‚‹
+                    bool subItems = true;
+                    if ((CommonDefine.TabCotegory)DataBody.Category == CommonDefine.TabCotegory.Component)
+                    {
+                        string strLink = linkDB.CreatePrimarykeyString(DataBody.ComponentCode);
+                        List<ComponentLinkMaster> linkList = new List<ComponentLinkMaster>();
+                        if (linkDB.SelectAction(strLink, ref linkList) && linkList.Count == 0)
+                        {
+                            subItems = false;
+                        }
+                    }
+
+                    pageCnt = 0;
+                    int INo = 1;
+                    foreach (EstimateDataDetail DataDetail in SmallList)
+                    {
+                        // ã‚«ãƒ†ã‚´ãƒªã‚»ãƒƒãƒˆ
+                        // è¡Œãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumB] = CommonMotions.ComentSucstring(DataDetail.ItemName, "â€»");    // å��ç§°
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumC] = DataDetail.SpecName;                                // å“�è³ªãƒ»å½¢çŠ¶ãƒ»å¯¸æ³•
+
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumD] = DataDetail.UnitCount.ToString("#,#.##");            // æ•°é‡�
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumE] = DataDetail.UnitName;                                // å�˜ä½�
+
+                        objPrint2[LineCount, (int)DetailColumCharctor.ColumH] = DataDetail.Note;                                    // å‚™è€ƒ
+
+                        // ãƒªãƒŠãƒ³ãƒ�ãƒªãƒ³ã‚°å·¥ç¨®ã�®ã�¿
+                        if ((CommonDefine.TabCotegory)DataBody.Category == CommonDefine.TabCotegory.Component && subItems)
+                        {
+                            // ä¸‹ä½�ã�«ä½œæ¥­é …ç›®ã�Œã�‚ã‚‹å ´å�ˆã�®ã�¿ãƒŠãƒ³ãƒ�ãƒªãƒ³ã‚°
+                            objPrint2[LineCount, (int)DetailColumCharctor.ColumA] = INo++;
+                        }
+
+                        LineCount++;
+
+                        // å�°å­—å�¯èƒ½è¡Œã‚’è¶…ã�ˆã‚‹æ™‚ã�¯æ¬¡é �
+                        if (LineCount >= s_DetailNumberOfLine)
+                        {
+                            // å·¥äº‹å��ã‚»ãƒƒãƒˆ
+                            m_UsedExcel.ExcelCellSet("A1", strwork);
+                            // ä¼šç¤¾å��ï¼‹ãƒšãƒ¼ã‚¸å�°åˆ·
+                            FooterTitle(ref objPrint2,
+                                        CommonMotions.SystemMasterData.CompanyName1.Trim(),
+                                        ++AllPageCnt);
+
+                            // ãƒšãƒ¼ã‚¸å�°åˆ·
+                            APoint = (pageCnt * s_NumberOfRowInDetail) + s_DetailNumberOfStartLine;
+                            HPoint = (pageCnt * s_NumberOfRowInDetail) + s_NumberOfRowInDetail;
+                            m_UsedExcel.ExcelCellSet("A" + APoint.ToString(), objPrint2, "H" + HPoint.ToString());
+
+                            LineCount = 0;
+                            pageCnt++;
+                            objPrint2 = new object[s_DetailNumberOfLine + 1, s_EstimateDetailColumCount];
+                        }
+
+                        // ä¸­æ–­å‡¦ç�†
+                        if (m_Canceled) return CommonDefine.RetunAnswer.Answer0;
+                    }
+
+                    // å·¥äº‹å��ã‚»ãƒƒãƒˆ
+                    m_UsedExcel.ExcelCellSet("A1", strwork);
+                    // ä¼šç¤¾å��ï¼‹ãƒšãƒ¼ã‚¸å�°åˆ·
+                    FooterTitle(ref objPrint2,
+                                CommonMotions.SystemMasterData.CompanyName1.Trim(),
+                                ++AllPageCnt);
+                    // ãƒšãƒ¼ã‚¸å�°åˆ·
+                    APoint = (pageCnt * s_NumberOfRowInDetail) + s_DetailNumberOfStartLine;
+                    HPoint = (pageCnt * s_NumberOfRowInDetail) + s_NumberOfRowInDetail;
+                    m_UsedExcel.ExcelCellSet("A" + APoint.ToString(), objPrint2, "H" + HPoint.ToString());
+                    // ++++++++++++++++++++++++++++++++++++++++ ç©�ç®—è¦‹ç©�æ˜Žç´°ãƒ‡ãƒ¼ã‚¿(ä½œæ¥­) End
+
+                    // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                    this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+
+                    // 0.05ç§’Wait
+                    //System.Threading.Thread.Sleep(50);
+                }
+                // ++++++++++++++++++++++++++++++++++++++++ ç©�ç®—è¦‹ç©�æ˜Žç´°ãƒ‡ãƒ¼ã‚¿(å·¥ç¨®)End
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_progressDlg, new object[] { m_ProcessCount });
+
+                // 0.5ç§’Wait
+                //System.Threading.Thread.Sleep(500);
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                etDB.close(); etDB = null;
+                etbDB.close(); etbDB = null;
+                etdDB.close(); etdDB = null;
+                ctDB.close(); ctDB = null;
+                linkDB.close(); linkDB = null;
+                cbidDB.close(); cbidDB = null;
+            }
+        }
+        #endregion
+
+        #region ç·�è¨ˆé �ã�§å�Œã�˜é …ç›®ã‚’æŽ¢ã�™
+        /// <summary>
+        /// ç·�è¨ˆé �ã�§å�Œã�˜é …ç›®ã‚’æŽ¢ã�™
+        /// </summary>
+        /// <param name="strName"></param>
+        /// <returns></returns>
+        private int GetTotalPageRow(string strName)
+        {
+            try
+            {
+                int iLineCnt = 0;
+                foreach (DataGridViewRow wrkRow in dgvEntryData.Rows)
+                {
+                    // ç„¡åŠ¹è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)GridTotalColumn.ItemName].Value)) break;
+                    string strSourceName = CommonMotions.ComentSucstring(strName, "â€»");
+                    string ItemName = CommonMotions.ComentSucstring(CommonMotions.cnvString(wrkRow.Cells[(int)GridTotalColumn.ItemName].Value), "â€»");
+                    // å�Œã�˜å¤§é …ç›®ã‚’æŽ¢ã�™
+                    if (strSourceName.Equals(ItemName)) break;
+                    iLineCnt++;
+                }
+
+                return iLineCnt;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹æƒ…å ±å�–å¾—å‡¦ç�†
+        /// <summary>
+        /// å·¥äº‹æƒ…å ±å�–å¾—
+        /// </summary>
+        /// <returns></returns>
+        private bool GetBaseInfoData()
+        {
+            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
+            try
+            {
+                string strSQL = cbDB.CreatePrimarykeyString(m_ConstructionCode);
+                if (!cbDB.SelectAction(strSQL, ref m_ConstructionBaseInfo)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                cbDB.close(); cbDB = null;
+            }
+        }
+        #endregion
+
+        #region å�°åˆ·æ™‚ãƒœã‚¿ãƒ³åˆ¶å¾¡
+        private List<Control> m_PrintSaveButton = new List<Control>();
+        /// <summary>
+        /// å�°åˆ·æ™‚ãƒœã‚¿ãƒ³åˆ¶å¾¡
+        /// </summary>
+        /// <param name="bprint"></param>
+        private void PrintButtonVisbleControl(bool bprint)
+        {
+            Control[] AllCtrl = CommonMotions.GetAllControls(this);
+            if (bprint)
+            {
+                // ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼è¡¨ç¤º
+                PrintProgress.Visible = true;
+                // é€€é�¿ã‚¨ãƒªã‚¢ã‚¯ãƒªã‚¢
+                m_PrintSaveButton.Clear();
+                // ãƒœã‚¿ãƒ³é�žè¡¨ç¤º
+                foreach (Control ctrl in AllCtrl)
+                {
+                    if (!ctrl.Visible) continue;
+                    if (!ctrl.GetType().Name.ToString().Equals("Button")) continue;
+                    if (!ctrl.Parent.Equals(this)) continue;
+                    
+                    ctrl.Visible = false;
+                    m_PrintSaveButton.Add(ctrl);
+                }
+                // ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³è¡¨ç¤º
+                btnCancel.Location = btnEnd.Location;
+                btnCancel.Visible = true;
+                // ãƒ˜ãƒƒãƒ€ãƒ¼å…¥åŠ›ç¦�æ­¢
+                panel1.Enabled = false;
+            }
+            else
+            {
+                // ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼é�žè¡¨ç¤º
+                PrintProgress.Visible = false;
+                // ãƒœã‚¿ãƒ³è¡¨ç¤º
+                foreach (Control ctrl in m_PrintSaveButton)
+                {
+                    ctrl.Visible = true;
+                }
+                // ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³é�žè¡¨ç¤º
+                btnCancel.Visible = false;
+                // ãƒ˜ãƒƒãƒ€ãƒ¼å…¥åŠ›ç¦�æ­¢è§£é™¤
+                panel1.Enabled = true;
+            }
+        }
+        #endregion
+    }
+}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs	(revision 323)
@@ -1122,9 +1122,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs	(revision 323)
@@ -782,9 +782,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 323)
@@ -1149,9 +1149,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs	(revision 323)
@@ -1101,9 +1101,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs	(revision 323)
@@ -1022,9 +1022,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 323)
@@ -3583,9 +3583,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs	(revision 323)
@@ -841,9 +841,9 @@
                 }
                 else
                 {   // �HŽ–”N“x
-                    iYear = CommonMotions.SystemMasterData.ConstructionYear;
+                    iYear = CommonMotions.SystemMasterData.ConstrYear;
                 }
-                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day);
                 dtStart = new DateTime(iYear, month, day);
                 dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/BankBusinessDay/FrmBBDAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/BankBusinessDay/FrmBBDAux.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/BankBusinessDay/FrmBBDAux.cs	(revision 323)
@@ -540,7 +540,7 @@
             try
             {
                 // å½“å¹´åº¦å�–å¾—
-                int ToYear = CommonMotions.SystemMasterData.ConstructionYear;
+                int ToYear = CommonMotions.SystemMasterData.ConstrYear;
 
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("SELECT");
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/Calender/FrmCalendarAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/Calender/FrmCalendarAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/Calender/FrmCalendarAuxiliary.cs	(revision 323)
@@ -240,14 +240,23 @@
         /// </summary>
         private void CreateNewCalender(bool bNoneData)
         {
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
                 // è¡¨ç¤ºã‚¯ãƒªã‚¢
                 ClearCalender();
 
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(" Where DATE_FORMAT(BeginDate, '%Y') = {0}", numUDYear.Value);
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod)
+                    strSQL.AppendFormat(" And PeriodFlag = {0}", (int)BizPeriodHistory.PeriodFlagDef.BizPeriod);
+                else
+                    strSQL.AppendFormat(" And PeriodFlag = {0}", (int)BizPeriodHistory.PeriodFlagDef.ConstrYear);
+                List<BizPeriodHistory> BizHisList = new List<BizPeriodHistory>();
+                if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisList)) return;
+                
                 // è¨­å®šå¹´æœˆæ—¥ä½œæˆ�
-                string CalenderDate = numUDYear.Value.ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginningDate;
-                DateTime wrkStartDate = CommonMotions.cnvDate(CalenderDate);
+                DateTime wrkStartDate = BizHisList[0].BeginDate;
 
                 tableLayoutPanel1.SuspendLayout();
 
@@ -326,6 +335,10 @@
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                BizHisDB.close(); BizHisDB = null;
+            }
         }
         #endregion
 
@@ -439,11 +452,20 @@
         /// </summary>
         private void CountHoliday()
         {
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(" Where DATE_FORMAT(BeginDate, '%Y') = {0}", numUDYear.Value);
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod)
+                    strSQL.AppendFormat(" And PeriodFlag = {0}", (int)BizPeriodHistory.PeriodFlagDef.BizPeriod);
+                else
+                    strSQL.AppendFormat(" And PeriodFlag = {0}", (int)BizPeriodHistory.PeriodFlagDef.ConstrYear);
+                List<BizPeriodHistory> BizHisList = new List<BizPeriodHistory>();
+                if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisList)) return;
+
                 // è¨­å®šå¹´æœˆæ—¥ä½œæˆ�
-                string CalenderDate = numUDYear.Value.ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginningDate;
-                DateTime wrkStartDate = CommonMotions.cnvDate(CalenderDate);
+                DateTime wrkStartDate = BizHisList[0].BeginDate;
                 // 12ã‚«æœˆå‡¦ç�†ã�™ã‚‹
                 int iAllDay = 0;
                 int iholiday = 0;
@@ -478,6 +500,10 @@
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                BizHisDB.close(); BizHisDB = null;
+            }
         }
         #endregion
 
@@ -501,7 +527,7 @@
 
                 List<HolidayCalenderMaster>DataList = new List<HolidayCalenderMaster>();
                 // è¨­å®šå¹´æœˆæ—¥ä½œæˆ�
-                string CalenderDate = numUDYear.Value.ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginningDate;
+                string CalenderDate = numUDYear.Value.ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginDate;
                 DateTime wrkStartDate = CommonMotions.cnvDate(CalenderDate);
                 // 12ã‚«æœˆå‡¦ç�†ã�™ã‚‹
                 for (int i = 0; i < m_CalendPage.lblMonthTitle.Length; i++)
@@ -602,7 +628,7 @@
             try
             {
                 // å½“å¹´åº¦å�–å¾—
-                int ToYear = CommonMotions.SystemMasterData.ConstructionYear;
+                int ToYear = CommonMotions.SystemMasterData.ConstrYear;
 
                 string strSQL = "SELECT DATE_FORMAT(Holiday ,'%Y'), COUNT(*) FROM HOLIDAYCALENDERMASTER";
                 strSQL += " GROUP BY DATE_FORMAT(Holiday ,'%Y') ORDER BY DATE_FORMAT(Holiday ,'%Y')";
@@ -697,7 +723,7 @@
             try
             {
                 // å·®åˆ†å¹´è¨ˆç®—
-                int DiffVal = (int)numUDYear.Value - CommonMotions.SystemMasterData.ConstructionYear;
+                int DiffVal = (int)numUDYear.Value - CommonMotions.SystemMasterData.ConstrYear;
                 // å–¶æ¥­æœŸè¨ˆç®—
                 int nPeriod = CommonMotions.SystemMasterData.BusinessPeriod + (DiffVal);
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.cs	(revision 323)
@@ -362,7 +362,7 @@
                 CommonMotions.EntryEndMessage("å�”åŠ›ä¼šç¤¾æƒ…å ±ãƒ‡ãƒ¼ã‚¿");
 
                 // æ›´æ–°ã‚¨ãƒªã‚¢ã‚¯ãƒªã‚¢
-                ClearDisplay();
+                ClearDisplay(true);
 
                 // ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãƒ­ãƒƒã‚¯
                 ControlLock(false);
@@ -457,7 +457,7 @@
                 CommonMotions.RemoveEndMessage("å�”åŠ›ä¼šç¤¾æƒ…å ±ãƒ‡ãƒ¼ã‚¿");
 
                 // æ›´æ–°ã‚¨ãƒªã‚¢ã‚¯ãƒªã‚¢
-                ClearDisplay();
+                ClearDisplay(true);
 
                 // ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãƒ­ãƒƒã‚¯
                 ControlLock(false);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs	(revision 323)
@@ -91,7 +91,7 @@
                 CommonMotions.cnvString(dgvMaster.CurrentRow.Cells[(int)DispListColumn.CompanyName].Value).Length == 0)
             {
                 // ã‚¯ãƒªã‚¢
-                ClearDisplay();
+                ClearDisplay(true);
                 // ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãƒ­ãƒƒã‚¯è§£é™¤
                 ControlLock(false);
                 return;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.Designer.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.Designer.cs	(revision 323)
@@ -0,0 +1,197 @@
+ï»¿namespace ProcessManagement.Forms.SubForms
+{
+    partial class FrmBizHisList
+    {
+        /// <summary>
+        /// å¿…è¦�ã�ªãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼å¤‰æ•°ã�§ã�™ã€‚
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// ä½¿ç”¨ä¸­ã�®ãƒªã‚½ãƒ¼ã‚¹ã‚’ã�™ã�¹ã�¦ã‚¯ãƒªãƒ¼ãƒ³ã‚¢ãƒƒãƒ—ã�—ã�¾ã�™ã€‚
+        /// </summary>
+        /// <param name="disposing">ãƒžãƒ�ãƒ¼ã‚¸ ãƒªã‚½ãƒ¼ã‚¹ã�Œç ´æ£„ã�•ã‚Œã‚‹å ´å�ˆ trueã€�ç ´æ£„ã�•ã‚Œã�ªã�„å ´å�ˆã�¯ false ã�§ã�™ã€‚</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows ãƒ•ã‚©ãƒ¼ãƒ  ãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã�§ç”Ÿæˆ�ã�•ã‚Œã�Ÿã‚³ãƒ¼ãƒ‰
+
+        /// <summary>
+        /// ãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ ã‚µãƒ�ãƒ¼ãƒˆã�«å¿…è¦�ã�ªãƒ¡ã‚½ãƒƒãƒ‰ã�§ã�™ã€‚ã�“ã�®ãƒ¡ã‚½ãƒƒãƒ‰ã�®å†…å®¹ã‚’
+        /// ã‚³ãƒ¼ãƒ‰ ã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼ã�§å¤‰æ›´ã�—ã�ªã�„ã�§ã��ã� ã�•ã�„ã€‚
+        /// </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();
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnEnd = new System.Windows.Forms.Button();
+            this.dgvDispData = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvDispData)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.SystemColors.Control;
+            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(4, 4);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(580, 20);
+            this.label1.TabIndex = 6;
+            this.label1.Text = "é�Žã€€åŽ»ã€€å±¥ã€€æ­´ã€€ä¸€ã€€è¦§";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // 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(464, 276);
+            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);
+            // 
+            // dgvDispData
+            // 
+            this.dgvDispData.AllowUserToAddRows = false;
+            this.dgvDispData.AllowUserToDeleteRows = false;
+            this.dgvDispData.AllowUserToResizeColumns = false;
+            this.dgvDispData.AllowUserToResizeRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvDispData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvDispData.BackgroundColor = System.Drawing.Color.White;
+            this.dgvDispData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.Gold;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDispData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvDispData.ColumnHeadersHeight = 21;
+            this.dgvDispData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvDispData.ColumnHeadersVisible = false;
+            this.dgvDispData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column02,
+            this.Column03,
+            this.Column06,
+            this.Column07});
+            this.dgvDispData.EnableHeadersVisualStyles = false;
+            this.dgvDispData.Location = new System.Drawing.Point(4, 27);
+            this.dgvDispData.Name = "dgvDispData";
+            this.dgvDispData.RowHeadersVisible = false;
+            this.dgvDispData.RowHeadersWidth = 20;
+            this.dgvDispData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvDispData.RowTemplate.Height = 24;
+            this.dgvDispData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvDispData.Size = new System.Drawing.Size(580, 244);
+            this.dgvDispData.TabIndex = 47;
+            this.dgvDispData.TabStop = false;
+            // 
+            // Column02
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
+            this.Column02.DefaultCellStyle = dataGridViewCellStyle3;
+            this.Column02.HeaderText = "â„–";
+            this.Column02.Name = "Column02";
+            this.Column02.ReadOnly = true;
+            this.Column02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column02.Width = 60;
+            // 
+            // Column03
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            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.Column03.DefaultCellStyle = dataGridViewCellStyle4;
+            this.Column03.HeaderText = "å–¶æ¥­æœŸãƒ»å·¥äº‹å¹´åº¦";
+            this.Column03.Name = "Column03";
+            this.Column03.ReadOnly = true;
+            this.Column03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // Column06
+            // 
+            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.Column06.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column06.HeaderText = "é–‹å§‹å¹´æœˆæ—¥";
+            this.Column06.Name = "Column06";
+            this.Column06.ReadOnly = true;
+            this.Column06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column06.Width = 200;
+            // 
+            // Column07
+            // 
+            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.Column07.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column07.HeaderText = "çµ‚äº†å¹´æœˆæ—¥";
+            this.Column07.Name = "Column07";
+            this.Column07.ReadOnly = true;
+            this.Column07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column07.Width = 200;
+            // 
+            // FrmBizHisList
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 16F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.Black;
+            this.ClientSize = new System.Drawing.Size(588, 310);
+            this.ControlBox = false;
+            this.Controls.Add(this.dgvDispData);
+            this.Controls.Add(this.btnEnd);
+            this.Controls.Add(this.label1);
+            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrmBizHisList";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmApprovalStatusList_FormClosing);
+            this.Load += new System.EventHandler(this.FrmApprovalStatusList_Load);
+            this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FrmApprovalStatusList_MouseDown);
+            this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.FrmApprovalStatusList_MouseMove);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvDispData)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button btnEnd;
+        private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvDispData;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column02;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column03;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column06;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column07;
+    }
+}
+
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.cs	(revision 323)
@@ -0,0 +1,188 @@
+ï»¿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 System.Collections;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.DataModel;
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.Forms.ControlsAction;
+
+namespace ProcessManagement.Forms.SubForms
+{
+    public partial class FrmBizHisList : Form
+    {
+        #region ä½¿ç”¨å®šç¾©
+        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        /// <summary>
+        /// è¡¨ç¤ºã‚«ãƒ©ãƒ 
+        /// </summary>
+        private enum GridColumn
+        {
+            DataNo = 0,
+            Period,
+            BeginData,
+            CompDate,
+        }
+
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ã‚¿ã‚¤ãƒˆãƒ«
+        /// </summary>
+        string[] s_TitleString = new string[] { "å–¶æ¥­æœŸæ•°", "å·¥äº‹å¹´åº¦" };
+        #endregion
+
+        #region å¤‰æ•°
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        public FrmBizHisList()
+        {
+            InitializeComponent();
+        }
+        #endregion
+
+        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
+        /// <summary>
+        /// ç”»é�¢ãƒ­ãƒ¼ãƒ‰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmApprovalStatusList_Load(object sender, EventArgs e)
+        {
+            // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
+            DispData();
+
+            // ãƒžã‚¦ã‚¹ã‚¤ãƒ™ãƒ³ãƒˆã‚»ãƒƒãƒˆ
+            label1.MouseDown += new MouseEventHandler(FrmApprovalStatusList_MouseDown);
+            label1.MouseMove += new MouseEventHandler(FrmApprovalStatusList_MouseMove);
+            dgvDispData.MouseDown += new MouseEventHandler(FrmApprovalStatusList_MouseDown);
+            dgvDispData.MouseMove += new MouseEventHandler(FrmApprovalStatusList_MouseMove);
+        }
+        #endregion
+
+        #region Ã—ãƒœã‚¿ãƒ³
+        /// <summary>
+        /// Ã—ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmApprovalStatusList_FormClosing(object sender, FormClosingEventArgs e)
+        {
+
+        }
+        #endregion
+
+        #region çµ‚äº†ãƒœã‚¿ãƒ³
+        /// <summary>
+        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnEnd_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
+        /// <summary>
+        /// æ‰¿èª�çŠ¶æ…‹ã‚’è¡¨ç¤ºã�™ã‚‹
+        /// </summary>
+        private void DispData()
+        {
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
+            try
+            {
+                dgvDispData.Rows.Clear();
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(" Order By PeriodFlag Asc, PeriodYear Asc");
+
+                List<BizPeriodHistory> BizList = new List<BizPeriodHistory>();
+                if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizList)) return;
+
+                int ino = 0;
+                int nPeriod = -1;
+                foreach (BizPeriodHistory curRec in BizList)
+                {
+                    if (nPeriod != curRec.PeriodFlag)
+                    {
+                        nPeriod = curRec.PeriodFlag;
+                        ino = 0;
+                        dgvDispData.Rows.Add("â„–",s_TitleString[nPeriod], "é–‹å§‹å¹´æœˆæ—¥", "çµ‚äº†å¹´æœˆæ—¥");
+                    }
+
+                    dgvDispData.Rows.Add(++ino
+                                        , curRec.PeriodYear
+                                        , curRec.BeginDate.ToShortDateString()
+                                        , curRec.CompleteDate.ToShortDateString());
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                BizHisDB.close(); BizHisDB = null;
+            }
+        }
+        #endregion
+
+        //ãƒžã‚¦ã‚¹ã�®ã‚¯ãƒªãƒƒã‚¯ä½�ç½®ã‚’è¨˜æ†¶
+        private Point mousePoint;
+
+        #region ãƒžã‚¦ã‚¹ãƒ€ã‚¦ãƒ³
+        /// <summary>
+        /// ãƒžã‚¦ã‚¹ã�®ãƒœã‚¿ãƒ³ã�ŒæŠ¼ã�•ã‚Œã�Ÿã�¨ã��
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmApprovalStatusList_MouseDown(object sender, MouseEventArgs e)
+        {
+            if ((e.Button & MouseButtons.Left) == MouseButtons.Left)
+            {
+                //ä½�ç½®ã‚’è¨˜æ†¶ã�™ã‚‹
+                mousePoint = new Point(e.X, e.Y);
+            }
+        }
+        #endregion
+
+        #region ãƒžã‚¦ã‚¹ãƒ ãƒ¼ãƒ–
+        /// <summary>
+        /// ãƒžã‚¦ã‚¹ã�Œå‹•ã�„ã�Ÿã�¨ã��
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmApprovalStatusList_MouseMove(object sender, MouseEventArgs e)
+        {
+            if ((e.Button & MouseButtons.Left) == MouseButtons.Left)
+            {
+                this.Left += e.X - mousePoint.X;
+                this.Top += e.Y - mousePoint.Y;
+            }
+        }
+        #endregion
+    }
+}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.resx	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.resx	(revision 323)
@@ -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="Column03.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column06.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column07.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs	(revision 323)
@@ -123,16 +123,24 @@
             /// <summary>
             /// å–¶æ¥­å¹´
             /// </summary>
-            ConstructionYear,
+            ConstrYear,
             /// <summary>
             /// å–¶æ¥­æœŸé¦–æœˆæ—¥
             /// </summary>
-            BusinessBeginningDate,
+            BusinessBeginDate,
             /// <summary>
             /// å·¥äº‹æœŸé¦–æœˆæ—¥
             /// </summary>
-            ConstructionBeginningDate,
+            ConstrBeginDate,
             /// <summary>
+            /// å–¶æ¥­æœŸæœ«æœˆæ—¥
+            /// </summary>
+            BusinessCompDate,
+            /// <summary>
+            /// å·¥äº‹æœŸæœ«æœˆæ—¥
+            /// </summary>
+            ConstrCompDate,
+            /// <summary>
             /// å·¥äº‹ç•ªå�·ç©�ç®—ï¼ˆå–¶æ¥­æœŸï¼‰
             /// </summary>
             ConstructionNoBase0,
@@ -327,6 +335,7 @@
         private void btnDataEntry_Click(object sender, EventArgs e)
         {
             IOMSystem ocDB = new IOMSystem();
+            IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory();
             try
             {
                 //ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
@@ -343,12 +352,35 @@
                     m_dispControl[(int)Dispcount.SystemCode].Text = (ocDB.SelectMaxSystemCodeCount(strWhere) + 1).ToString();
                 }
 
+                ocDB.connect(); ocDB.beginTran();
+                BizHisDB.connect(); BizHisDB.beginTran();
+
                 m_bChengeAns = false;
+
                 // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-                if (!SystemMasterDataEntry()) return;
+                if (!SystemMasterDataEntry(ocDB))
+                {
+                    ocDB.rollback();
+                    return;
+                }
+                if (!BizPeriodHistoryDataEntry(BizHisDB))
+                {
+                    ocDB.rollback();
+                    BizHisDB.rollback();
+                    return;
+                }
+                if (!BizPeriodHistoryDataEntry(BizHisDB, true))
+                {
+                    ocDB.rollback();
+                    BizHisDB.rollback();
+                    return;
+                }
 
                 CommonMotions.EntryEndMessage("ä¼šç¤¾æƒ…å ±ãƒ‡ãƒ¼ã‚¿");
 
+                ocDB.commit();
+                BizHisDB.commit();
+
                 // çµ‚äº†
                 btnEnd_Click(sender, e);
 
@@ -359,8 +391,8 @@
             }
             finally
             {
-                ocDB.close();
-                ocDB = null;
+                ocDB.close(); ocDB = null;
+                BizHisDB.close(); BizHisDB = null;
             }
         }
         #endregion
@@ -613,30 +645,10 @@
             try
             {
                 TextBox txtbox = (TextBox)sender;
-                // æ•°å­—ã�®å…¥åŠ›
-                if (CommonMotions.chkNumeric(txtbox.Text))
-                {
-                    int imounth = 0;
-                    int iday = 0;
-                    if (txtbox.Text.Length == 4)
-                    {
-                        imounth = CommonMotions.cnvInt(txtbox.Text.Substring(0, 2));
-                        iday = CommonMotions.cnvInt(txtbox.Text.Substring(3, 2));
-                    }
-                    else if (txtbox.Text.Length == 3)
-                    {
-                        imounth = CommonMotions.cnvInt(txtbox.Text.Substring(0, 1));
-                        iday = CommonMotions.cnvInt(txtbox.Text.Substring(2, 2));
-                    }
-                    txtbox.Text = imounth.ToString("00") + "/" + iday.ToString("00");
-                }
-                else
-                {
-                    int imounth = CommonMotions.cnvInt(txtbox.Text.Substring(0, txtbox.Text.IndexOf("/")));
-                    int iday = CommonMotions.cnvInt(txtbox.Text.Substring(txtbox.Text.IndexOf("/") + 1));
-                    txtbox.Text = imounth.ToString("00") + "/" + iday.ToString("00");
-                }
+                if (txtbox.Text.Length < 1) return;
 
+                DateTime wrkDate = CommonMotions.cnvDate(txtbox.Text);
+                txtbox.Text = wrkDate.ToShortDateString();
             }
             catch (Exception ex)
             {
@@ -668,9 +680,11 @@
             m_dispControl[(int)Dispcount.HomePageURL] = txtInput24;
             
             m_dispControl[(int)Dispcount.BusinessPeriod] = txtInput16;
-            m_dispControl[(int)Dispcount.ConstructionYear] = txtInput17;
-            m_dispControl[(int)Dispcount.BusinessBeginningDate] = txtInput21;
-            m_dispControl[(int)Dispcount.ConstructionBeginningDate] = txtInput22;
+            m_dispControl[(int)Dispcount.ConstrYear] = txtInput17;
+            m_dispControl[(int)Dispcount.BusinessBeginDate] = txtInput21;
+            m_dispControl[(int)Dispcount.ConstrBeginDate] = txtInput22;
+            m_dispControl[(int)Dispcount.BusinessCompDate] = txtInput27;
+            m_dispControl[(int)Dispcount.ConstrCompDate] = txtInput28;
             m_dispControl[(int)Dispcount.ConstructionNoBase0] = radioButton1;
             m_dispControl[(int)Dispcount.ConstructionNoBase1] = radioButton2;
 
@@ -726,9 +740,11 @@
                 m_dispControl[(int)Dispcount.FilePath1].Text = wrklist.ExcelSavePath;                               // Excelä¿�å­˜ãƒ‘ã‚¹
 
                 m_dispControl[(int)Dispcount.BusinessPeriod].Text = wrklist.BusinessPeriod.ToString();              // å–¶æ¥­æœŸæ•°
-                m_dispControl[(int)Dispcount.ConstructionYear].Text = wrklist.ConstructionYear.ToString();          // å·¥äº‹å¹´åº¦
-                m_dispControl[(int)Dispcount.BusinessBeginningDate].Text = wrklist.BusinessBeginningDate;           // å–¶æ¥­æœŸé¦–æ—¥
-                m_dispControl[(int)Dispcount.ConstructionBeginningDate].Text = wrklist.ConstructionBeginningDate;   // å·¥äº‹æœŸé¦–æ—¥
+                m_dispControl[(int)Dispcount.ConstrYear].Text = wrklist.ConstrYear.ToString();          // å·¥äº‹å¹´åº¦
+                m_dispControl[(int)Dispcount.BusinessBeginDate].Text = wrklist.BusinessBeginDate.ToShortDateString();// å–¶æ¥­æœŸé¦–æ—¥
+                m_dispControl[(int)Dispcount.ConstrBeginDate].Text = wrklist.ConstrBeginDate.ToShortDateString();   // å·¥äº‹æœŸé¦–æ—¥
+                m_dispControl[(int)Dispcount.BusinessCompDate].Text = wrklist.BusinessCompDate.ToShortDateString(); // å–¶æ¥­æœŸæœ«æ—¥
+                m_dispControl[(int)Dispcount.ConstrCompDate].Text = wrklist.ConstrCompDate.ToShortDateString();     // å·¥äº‹æœŸæœ«æ—¥
                 if (wrklist.ConstructionNoBase == 0)                                                                // å·¥äº‹å¹´åº¦
                     radioButton1.Checked = true;
                 else
@@ -847,49 +863,74 @@
                     {
                         bRet &= false;
                         // èƒŒæ™¯è‰²å¤‰æ›´
-                        CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessPeriod], bRet);
+                        CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessPeriod], false);
                     }
                 }
                 else bRet &= false;
 
                 // å–¶æ¥­å¹´åº¦
-                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstructionYear], true);
-                if (m_dispControl[(int)Dispcount.ConstructionYear].Text.Length != 0) iLength++;
-                if (CommonMotions.DispFieldIntCheck(m_dispControl[(int)Dispcount.ConstructionYear], true))
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstrYear], true);
+                if (m_dispControl[(int)Dispcount.ConstrYear].Text.Length != 0) iLength++;
+                if (CommonMotions.DispFieldIntCheck(m_dispControl[(int)Dispcount.ConstrYear], true))
                 {
-                    if (CommonMotions.cnvInt(m_dispControl[(int)Dispcount.ConstructionYear].Text) == 0)
+                    if (CommonMotions.cnvInt(m_dispControl[(int)Dispcount.ConstrYear].Text) == 0)
                     {
                         bRet &= false;
                         // èƒŒæ™¯è‰²å¤‰æ›´
-                        CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstructionYear], bRet);
+                        CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstrYear], false);
                     }
                 }
                 else bRet &= false;
 
+                bool bDate = true;
                 // å–¶æ¥­æœŸé¦–æ—¥
-                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessBeginningDate], true);
-                if (m_dispControl[(int)Dispcount.BusinessBeginningDate].Text.Length != 0)
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessBeginDate], true);
+                if (m_dispControl[(int)Dispcount.BusinessBeginDate].Text.Length != 0)
                 {
                     iLength++;
-                    string wrkdate = m_dispControl[(int)Dispcount.ConstructionYear].Text + "/" + m_dispControl[(int)Dispcount.BusinessBeginningDate].Text;
-                    bRet &= CommonMotions.chkDate(wrkdate);
-                    // èƒŒæ™¯è‰²å¤‰æ›´
-                    CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessBeginningDate], bRet);
+                    bDate &= CommonMotions.chkDate(m_dispControl[(int)Dispcount.BusinessBeginDate].Text);
                 }
-                else bRet &= false;
+                else bDate &= false;
+                // èƒŒæ™¯è‰²å¤‰æ›´
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessBeginDate], bDate);
+                bRet &= bDate;
 
                 // å·¥äº‹æœŸé¦–æ—¥
-                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstructionBeginningDate], true);
-                if (m_dispControl[(int)Dispcount.ConstructionBeginningDate].Text.Length != 0)
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstrBeginDate], true);
+                if (m_dispControl[(int)Dispcount.ConstrBeginDate].Text.Length != 0)
                 {
                     iLength++;
-                    string wrkdate = m_dispControl[(int)Dispcount.ConstructionYear].Text + "/" + m_dispControl[(int)Dispcount.ConstructionBeginningDate].Text;
-                    bRet &= CommonMotions.chkDate(wrkdate);
-                    // èƒŒæ™¯è‰²å¤‰æ›´
-                    CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstructionBeginningDate], bRet);
+                    bDate &= CommonMotions.chkDate(m_dispControl[(int)Dispcount.ConstrBeginDate].Text);
                 }
-                else bRet &= false;
+                else bDate &= false;
+                // èƒŒæ™¯è‰²å¤‰æ›´
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstrBeginDate], bDate);
+                bRet &= bDate;
 
+                // å–¶æ¥­æœŸæœ«æ—¥
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessCompDate], true);
+                if (m_dispControl[(int)Dispcount.BusinessCompDate].Text.Length != 0)
+                {
+                    iLength++;
+                    bDate &= CommonMotions.chkDate(m_dispControl[(int)Dispcount.BusinessCompDate].Text);
+                }
+                else bDate &= false;
+                // èƒŒæ™¯è‰²å¤‰æ›´
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.BusinessCompDate], bDate);
+                bRet &= bDate;
+
+                // å·¥äº‹æœŸæœ«æ—¥
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstrCompDate], true);
+                if (m_dispControl[(int)Dispcount.ConstrCompDate].Text.Length != 0)
+                {
+                    iLength++;
+                    bDate &= CommonMotions.chkDate(m_dispControl[(int)Dispcount.ConstrCompDate].Text);
+                }
+                else bDate &= false;
+                // èƒŒæ™¯è‰²å¤‰æ›´
+                CommonMotions.chgBackColor(m_dispControl[(int)Dispcount.ConstrCompDate], bDate);
+                bRet &= bDate;
+
                 // æ¶ˆè²»ç¨Ž
                 if (m_dispControl[(int)Dispcount.ConsumptionTax].Text.Length != 0) iLength++;
                 bRet &= CommonMotions.DispFieldDoubleCheck(m_dispControl[(int)Dispcount.ConsumptionTax], true);
@@ -959,24 +1000,28 @@
                 if (m_dispControl[(int)Dispcount.SloganString3].Text.Length != 0) iLength++;
                 bRet &= CommonMotions.DispFieldLengthCheck(m_dispControl[(int)Dispcount.SloganString3], s_SloganString);
 
+                return bRet;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+
                 if (iLength == 0)
                 {
                     MessageBox.Show("ãƒ‡ãƒ¼ã‚¿ã�Œå…¥åŠ›ã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€�ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚", "ãƒ‡ãƒ¼ã‚¿ç¢ºèª�", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return false;
                 }
-                if (!bRet)
+                else
                 {
-                    MessageBox.Show("å…¥åŠ›ã‚¨ãƒ©ãƒ¼ã�Œã�‚ã‚Šã�¾ã�™ã€�ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚", "ãƒ‡ãƒ¼ã‚¿ç¢ºèª�", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return false;
+                    if (!bRet)
+                    {
+                        MessageBox.Show("å…¥åŠ›ã‚¨ãƒ©ãƒ¼ã�Œã�‚ã‚Šã�¾ã�™ã€�ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚", "ãƒ‡ãƒ¼ã‚¿ç¢ºèª�", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    }
                 }
-
-                return true;
             }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
         }
         #endregion
 
@@ -984,9 +1029,8 @@
         /// <summary>
         /// ç®¡ç�†ãƒžã‚¹ã‚¿ç™»éŒ²
         /// </summary>
-        private bool SystemMasterDataEntry()
+        private bool SystemMasterDataEntry(IOMSystem ocDB)
         {
-            IOMSystem ocDB = new IOMSystem();
             try
             {
                 //ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
@@ -1045,17 +1089,25 @@
                     work.BusinessPeriod = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.BusinessPeriod].Text);
 
                 // å·¥äº‹å¹´åº¦
-                if (m_dispControl[(int)Dispcount.ConstructionYear].Text.Length != 0)
-                    work.ConstructionYear = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.ConstructionYear].Text);
+                if (m_dispControl[(int)Dispcount.ConstrYear].Text.Length != 0)
+                    work.ConstrYear = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.ConstrYear].Text);
 
                 // å–¶æ¥­æœŸé¦–æ—¥
-                if (m_dispControl[(int)Dispcount.BusinessBeginningDate].Text.Length != 0)
-                    work.BusinessBeginningDate = m_dispControl[(int)Dispcount.BusinessBeginningDate].Text;
+                if (m_dispControl[(int)Dispcount.BusinessBeginDate].Text.Length != 0)
+                    work.BusinessBeginDate = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.BusinessBeginDate].Text);
 
                 // å·¥äº‹å¹´åº¦æœŸé¦–æ—¥
-                if (m_dispControl[(int)Dispcount.ConstructionBeginningDate].Text.Length != 0)
-                    work.ConstructionBeginningDate = m_dispControl[(int)Dispcount.ConstructionBeginningDate].Text;
+                if (m_dispControl[(int)Dispcount.ConstrBeginDate].Text.Length != 0)
+                    work.ConstrBeginDate = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.ConstrBeginDate].Text);
 
+                // å–¶æ¥­æœŸæœ«æ—¥
+                if (m_dispControl[(int)Dispcount.BusinessCompDate].Text.Length != 0)
+                    work.BusinessCompDate = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.BusinessCompDate].Text);
+
+                // å·¥äº‹å¹´åº¦æœŸæœ«æ—¥
+                if (m_dispControl[(int)Dispcount.ConstrCompDate].Text.Length != 0)
+                    work.ConstrCompDate = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.ConstrCompDate].Text);
+
                 // å·¥äº‹ç•ªå�·åŸºæº–å€¤
                 if (radioButton1.Checked)
                     work.ConstructionNoBase = (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod;
@@ -1097,7 +1149,7 @@
                 // 
                 string strWhere = string.Format(" Where SystemCode = {0}", work.SystemCode);
 
-                if (!ocDB.SelectAction(strWhere, ref workList))
+                if (!ocDB.SelectAction(strWhere, ref workList, false))
                 {
                     MessageBox.Show("ç™»éŒ²ç¢ºèª�ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     return false;
@@ -1109,7 +1161,7 @@
                     workList.Clear();
                     workList.Add(work);
                     // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-                    if(!ocDB.InsertAction(workList))
+                    if(!ocDB.InsertAction(workList, false))
                     {
                         MessageBox.Show("ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return false;
@@ -1119,7 +1171,7 @@
                 {
                     // ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚‹å ´å�ˆ
                     // ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-                    if(!ocDB.UpdateAction(strWhere, work))
+                    if (!ocDB.UpdateAction(strWhere, work, false))
                     {
                         MessageBox.Show("æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return false;
@@ -1126,7 +1178,6 @@
                     }
                 }
 
-
                 // ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
                 m_SystemCode = work.SystemCode;
 
@@ -1136,19 +1187,109 @@
                 // ProcessCommonã�®ç®¡ç�†ãƒžã‚¹ã‚¿ã‚’æ›´æ–°ã�™ã‚‹
                 CommonMotions.SystemMasterData = work;
 
+                return true;
             }
             catch (System.Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
-            finally
+        }
+        #endregion
+
+        #region é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+        /// <summary>
+        /// é�‹å–¶æœŸå±¥æ­´æƒ…å ±ç™»éŒ²
+        /// </summary>
+        /// <returns></returns>
+        private bool BizPeriodHistoryDataEntry(IOMBizPeriodHistory BizHisDB, bool bNext = false)
+        {
+            try
             {
-                ocDB.close();
-                ocDB = null;
+
+                int nData = 0;
+                DateTime[] dtData = new DateTime[2];
+                StringBuilder strSQL = new StringBuilder();
+                for (int i = (int)BizPeriodHistory.PeriodFlagDef.BizPeriod; i <= (int)BizPeriodHistory.PeriodFlagDef.ConstrYear; i++)
+                {
+                    switch (i)
+                    {
+                        case (int)BizPeriodHistory.PeriodFlagDef.BizPeriod:
+                            if (!bNext)
+                            {
+                                nData = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.BusinessPeriod].Text);
+                                dtData[0] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.BusinessBeginDate].Text);
+                                dtData[1] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.BusinessCompDate].Text);
+                            }
+                            else
+                            {
+                                nData = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.BusinessPeriod].Text) + 1;
+                                dtData[0] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.BusinessCompDate].Text).AddDays(1);
+                                dtData[1] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.BusinessCompDate].Text).AddYears(1);
+                            }
+                            break;
+                        case (int)BizPeriodHistory.PeriodFlagDef.ConstrYear:
+                            if (!bNext)
+                            {
+                                nData = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.ConstrYear].Text);
+                                dtData[0] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.ConstrBeginDate].Text);
+                                dtData[1] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.ConstrCompDate].Text);
+                            }
+                            else
+                            {
+                                nData = CommonMotions.cnvInt(m_dispControl[(int)Dispcount.ConstrYear].Text) + 1;
+                                dtData[0] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.ConstrCompDate].Text).AddDays(1);
+                                dtData[1] = CommonMotions.cnvDate(m_dispControl[(int)Dispcount.ConstrCompDate].Text).AddYears(1);
+                            }
+                            break;
+                    }
+
+                    strSQL.Clear();
+                    strSQL.Append(BizHisDB.CreatePrimarykeyString(nData, i));
+                    List<BizPeriodHistory> BizHisList = new List<BizPeriodHistory>();
+                    if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizHisList))
+                    {
+                        MessageBox.Show("å±¥æ­´æƒ…å ±ï¼šç™»éŒ²ç¢ºèª�ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        return false;
+                    }
+
+                    BizPeriodHistory BizHisRec = new BizPeriodHistory();
+                    BizHisRec.PeriodYear = nData;               // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦
+                    BizHisRec.PeriodFlag = i;                   // å–¶æ¥­æœŸæ•°ãƒ»å·¥äº‹å¹´åº¦ãƒ•ãƒ©ã‚°
+
+                    BizHisRec.BeginDate = dtData[0];            // æœŸé¦–æ—¥
+                    BizHisRec.CompleteDate = dtData[1];         // æœŸæœ«æ—¥
+
+                    if (BizHisList.Count < 1)
+                    {
+                        // ãƒ‡ãƒ¼ã‚¿ã�Œã�ªã�„å ´å�ˆ
+                        // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
+                        if (!BizHisDB.InsertAction(BizHisRec))
+                        {
+                            MessageBox.Show("å±¥æ­´æƒ…å ±ï¼šç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚‹å ´å�ˆ
+                        // ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                        if (!BizHisDB.UpdateAction(strSQL.ToString(), BizHisRec))
+                        {
+                            MessageBox.Show("å±¥æ­´æƒ…å ±ï¼šæ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
             }
-            return true;
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
         }
-
         #endregion
 
         #region å�‚ç…§æ™‚ãƒ­ãƒƒã‚¯å‡¦ç�†
@@ -1193,5 +1334,29 @@
             }
         }
         #endregion
+
+        #region å–¶æ¥­æœŸé�ŽåŽ»å±¥æ­´è¡¨ç¤º
+        /// <summary>
+        /// å–¶æ¥­æœŸé�ŽåŽ»å±¥æ­´è¡¨ç¤º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnHistory_Click(object sender, EventArgs e)
+        {
+            FrmBizHisList frm = new FrmBizHisList();
+            try
+            {
+                frm.ShowDialog();
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.designer.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.designer.cs	(revision 323)
@@ -35,6 +35,8 @@
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.txtInput16 = new System.Windows.Forms.TextBox();
+            this.txtInput17 = new System.Windows.Forms.TextBox();
             this.groupBoxEx5 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
             this.txtInput18 = new System.Windows.Forms.TextBox();
@@ -43,19 +45,26 @@
             this.groupBoxEx4 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
             this.label22 = new System.Windows.Forms.Label();
-            this.txtInput16 = new System.Windows.Forms.TextBox();
             this.label24 = new System.Windows.Forms.Label();
             this.label23 = new System.Windows.Forms.Label();
-            this.txtInput17 = new System.Windows.Forms.TextBox();
             this.label25 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.txtInput21 = new System.Windows.Forms.TextBox();
             this.label11 = new System.Windows.Forms.Label();
             this.txtInput22 = new System.Windows.Forms.TextBox();
+            this.label12 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.label12 = new System.Windows.Forms.Label();
+            this.label32 = new System.Windows.Forms.Label();
+            this.label33 = new System.Windows.Forms.Label();
+            this.label34 = new System.Windows.Forms.Label();
+            this.label35 = new System.Windows.Forms.Label();
+            this.label36 = new System.Windows.Forms.Label();
+            this.label37 = new System.Windows.Forms.Label();
+            this.txtInput27 = new System.Windows.Forms.TextBox();
+            this.txtInput28 = new System.Windows.Forms.TextBox();
+            this.btnHistory = new System.Windows.Forms.Button();
             this.groupBoxEx3 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.label18 = new System.Windows.Forms.Label();
@@ -126,7 +135,7 @@
             this.btnDataEntry.Location = new System.Drawing.Point(1004, 663);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
-            this.btnDataEntry.TabIndex = 24;
+            this.btnDataEntry.TabIndex = 26;
             this.btnDataEntry.Text = "ç™»ã€€éŒ²";
             this.btnDataEntry.UseVisualStyleBackColor = false;
             this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
@@ -140,7 +149,7 @@
             this.btnEnd.Location = new System.Drawing.Point(1130, 663);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 25;
+            this.btnEnd.TabIndex = 27;
             this.btnEnd.Text = "çµ‚ã€€äº†";
             this.btnEnd.UseVisualStyleBackColor = false;
             this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
@@ -159,12 +168,40 @@
             this.label1.Text = "ä¼šã€€ç¤¾ã€€æƒ…ã€€å ±ã€€ç™»ã€€éŒ²ã€€ç”»ã€€é�¢";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // txtInput16
+            // 
+            this.txtInput16.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput16.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtInput16.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput16.Location = new System.Drawing.Point(123, 3);
+            this.txtInput16.MaxLength = 5;
+            this.txtInput16.Name = "txtInput16";
+            this.txtInput16.Size = new System.Drawing.Size(91, 27);
+            this.txtInput16.TabIndex = 11;
+            this.txtInput16.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.toolTip1.SetToolTip(this.txtInput16, "ï¼‘æœŸã�‹ã‚‰å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚ã€‚");
+            this.txtInput16.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // txtInput17
+            // 
+            this.txtInput17.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput17.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtInput17.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput17.Location = new System.Drawing.Point(366, 3);
+            this.txtInput17.MaxLength = 5;
+            this.txtInput17.Name = "txtInput17";
+            this.txtInput17.Size = new System.Drawing.Size(91, 27);
+            this.txtInput17.TabIndex = 14;
+            this.txtInput17.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.toolTip1.SetToolTip(this.txtInput17, "è¥¿æš¦ã�§å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚");
+            this.txtInput17.TextChanged += new System.EventHandler(this.valueChange);
+            // 
             // groupBoxEx5
             // 
             this.groupBoxEx5.BackColor = System.Drawing.Color.SkyBlue;
             this.groupBoxEx5.BorderColor = System.Drawing.Color.White;
             this.groupBoxEx5.Controls.Add(this.tableLayoutPanel5);
-            this.groupBoxEx5.Location = new System.Drawing.Point(10, 517);
+            this.groupBoxEx5.Location = new System.Drawing.Point(10, 514);
             this.groupBoxEx5.Name = "groupBoxEx5";
             this.groupBoxEx5.Size = new System.Drawing.Size(1240, 140);
             this.groupBoxEx5.TabIndex = 4;
@@ -195,7 +232,7 @@
             this.txtInput18.MaxLength = 100;
             this.txtInput18.Name = "txtInput18";
             this.txtInput18.Size = new System.Drawing.Size(1214, 23);
-            this.txtInput18.TabIndex = 21;
+            this.txtInput18.TabIndex = 23;
             this.txtInput18.TextChanged += new System.EventHandler(this.valueChange);
             // 
             // txtInput19
@@ -206,7 +243,7 @@
             this.txtInput19.MaxLength = 100;
             this.txtInput19.Name = "txtInput19";
             this.txtInput19.Size = new System.Drawing.Size(1214, 23);
-            this.txtInput19.TabIndex = 22;
+            this.txtInput19.TabIndex = 24;
             this.txtInput19.TextChanged += new System.EventHandler(this.valueChange);
             // 
             // txtInput20
@@ -217,7 +254,7 @@
             this.txtInput20.MaxLength = 100;
             this.txtInput20.Name = "txtInput20";
             this.txtInput20.Size = new System.Drawing.Size(1214, 23);
-            this.txtInput20.TabIndex = 23;
+            this.txtInput20.TabIndex = 25;
             this.txtInput20.TextChanged += new System.EventHandler(this.valueChange);
             // 
             // groupBoxEx4
@@ -225,9 +262,9 @@
             this.groupBoxEx4.BackColor = System.Drawing.Color.SkyBlue;
             this.groupBoxEx4.BorderColor = System.Drawing.Color.White;
             this.groupBoxEx4.Controls.Add(this.tableLayoutPanel4);
-            this.groupBoxEx4.Location = new System.Drawing.Point(10, 291);
+            this.groupBoxEx4.Location = new System.Drawing.Point(10, 258);
             this.groupBoxEx4.Name = "groupBoxEx4";
-            this.groupBoxEx4.Size = new System.Drawing.Size(500, 140);
+            this.groupBoxEx4.Size = new System.Drawing.Size(500, 180);
             this.groupBoxEx4.TabIndex = 1;
             this.groupBoxEx4.TabStop = false;
             this.groupBoxEx4.Text = "é�‹å–¶æœŸæƒ…å ±";
@@ -235,12 +272,12 @@
             // tableLayoutPanel4
             // 
             this.tableLayoutPanel4.ColumnCount = 6;
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 97F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 26F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 97F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 26F));
             this.tableLayoutPanel4.Controls.Add(this.label22, 0, 0);
             this.tableLayoutPanel4.Controls.Add(this.txtInput16, 1, 0);
             this.tableLayoutPanel4.Controls.Add(this.label24, 2, 0);
@@ -251,45 +288,43 @@
             this.tableLayoutPanel4.Controls.Add(this.txtInput21, 1, 1);
             this.tableLayoutPanel4.Controls.Add(this.label11, 3, 1);
             this.tableLayoutPanel4.Controls.Add(this.txtInput22, 4, 1);
-            this.tableLayoutPanel4.Controls.Add(this.panel1, 1, 2);
-            this.tableLayoutPanel4.Controls.Add(this.label12, 0, 2);
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(10, 25);
+            this.tableLayoutPanel4.Controls.Add(this.label12, 0, 4);
+            this.tableLayoutPanel4.Controls.Add(this.panel1, 1, 4);
+            this.tableLayoutPanel4.Controls.Add(this.label32, 0, 2);
+            this.tableLayoutPanel4.Controls.Add(this.label33, 3, 2);
+            this.tableLayoutPanel4.Controls.Add(this.label34, 2, 1);
+            this.tableLayoutPanel4.Controls.Add(this.label35, 2, 2);
+            this.tableLayoutPanel4.Controls.Add(this.label36, 5, 1);
+            this.tableLayoutPanel4.Controls.Add(this.label37, 5, 2);
+            this.tableLayoutPanel4.Controls.Add(this.txtInput27, 1, 2);
+            this.tableLayoutPanel4.Controls.Add(this.txtInput28, 4, 2);
+            this.tableLayoutPanel4.Controls.Add(this.btnHistory, 3, 3);
+            this.tableLayoutPanel4.Location = new System.Drawing.Point(10, 20);
             this.tableLayoutPanel4.Name = "tableLayoutPanel4";
-            this.tableLayoutPanel4.RowCount = 3;
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(480, 105);
+            this.tableLayoutPanel4.RowCount = 5;
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(486, 150);
             this.tableLayoutPanel4.TabIndex = 14;
             // 
             // label22
             // 
             this.label22.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label22.BackColor = System.Drawing.Color.Beige;
             this.label22.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label22.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label22.ForeColor = System.Drawing.Color.Black;
-            this.label22.Location = new System.Drawing.Point(3, 5);
+            this.label22.Location = new System.Drawing.Point(3, 2);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(123, 25);
+            this.label22.Size = new System.Drawing.Size(114, 25);
             this.label22.TabIndex = 31;
             this.label22.Text = "å–¶æ¥­æœŸæ•°";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput16
-            // 
-            this.txtInput16.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput16.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput16.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput16.Location = new System.Drawing.Point(133, 6);
-            this.txtInput16.MaxLength = 5;
-            this.txtInput16.Name = "txtInput16";
-            this.txtInput16.Size = new System.Drawing.Size(50, 23);
-            this.txtInput16.TabIndex = 11;
-            this.txtInput16.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip1.SetToolTip(this.txtInput16, "ï¼‘æœŸã�‹ã‚‰å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚ã€‚");
-            this.txtInput16.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label24
             // 
             this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -297,9 +332,9 @@
             this.label24.BackColor = System.Drawing.Color.Transparent;
             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(193, 9);
+            this.label24.Location = new System.Drawing.Point(220, 7);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(25, 16);
+            this.label24.Size = new System.Drawing.Size(20, 16);
             this.label24.TabIndex = 32;
             this.label24.Text = "æœŸ";
             this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -307,31 +342,17 @@
             // label23
             // 
             this.label23.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label23.BackColor = System.Drawing.Color.LightSteelBlue;
             this.label23.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label23.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label23.ForeColor = System.Drawing.Color.Black;
-            this.label23.Location = new System.Drawing.Point(243, 5);
+            this.label23.Location = new System.Drawing.Point(246, 2);
             this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(123, 25);
+            this.label23.Size = new System.Drawing.Size(114, 25);
             this.label23.TabIndex = 31;
             this.label23.Text = "å·¥äº‹å¹´åº¦";
             this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput17
-            // 
-            this.txtInput17.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput17.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput17.Location = new System.Drawing.Point(373, 6);
-            this.txtInput17.MaxLength = 5;
-            this.txtInput17.Name = "txtInput17";
-            this.txtInput17.Size = new System.Drawing.Size(50, 23);
-            this.txtInput17.TabIndex = 12;
-            this.txtInput17.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip1.SetToolTip(this.txtInput17, "è¥¿æš¦ã�§å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚");
-            this.txtInput17.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label25
             // 
             this.label25.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -339,9 +360,9 @@
             this.label25.BackColor = System.Drawing.Color.Transparent;
             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(433, 9);
+            this.label25.Location = new System.Drawing.Point(463, 7);
             this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(25, 16);
+            this.label25.Size = new System.Drawing.Size(20, 16);
             this.label25.TabIndex = 32;
             this.label25.Text = "å¹´";
             this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -349,13 +370,13 @@
             // label7
             // 
             this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label7.BackColor = System.Drawing.Color.Beige;
             this.label7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(3, 40);
+            this.label7.Location = new System.Drawing.Point(3, 32);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(123, 25);
+            this.label7.Size = new System.Drawing.Size(114, 25);
             this.label7.TabIndex = 31;
             this.label7.Text = "å–¶æ¥­æœŸé¦–æ—¥";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -363,13 +384,13 @@
             // txtInput21
             // 
             this.txtInput21.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput21.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput21.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput21.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput21.Location = new System.Drawing.Point(133, 41);
-            this.txtInput21.MaxLength = 5;
+            this.txtInput21.Location = new System.Drawing.Point(123, 33);
+            this.txtInput21.MaxLength = 10;
             this.txtInput21.Name = "txtInput21";
-            this.txtInput21.Size = new System.Drawing.Size(54, 23);
-            this.txtInput21.TabIndex = 13;
+            this.txtInput21.Size = new System.Drawing.Size(91, 26);
+            this.txtInput21.TabIndex = 12;
             this.txtInput21.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput21.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput21.Validated += new System.EventHandler(this.txtInput21_Validated);
@@ -377,13 +398,13 @@
             // label11
             // 
             this.label11.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label11.BackColor = System.Drawing.Color.LightSteelBlue;
             this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             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(243, 40);
+            this.label11.Location = new System.Drawing.Point(246, 32);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(123, 25);
+            this.label11.Size = new System.Drawing.Size(114, 25);
             this.label11.TabIndex = 31;
             this.label11.Text = "å·¥äº‹å¹´é¦–æ—¥";
             this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -391,17 +412,31 @@
             // txtInput22
             // 
             this.txtInput22.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput22.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput22.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput22.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput22.Location = new System.Drawing.Point(373, 41);
-            this.txtInput22.MaxLength = 5;
+            this.txtInput22.Location = new System.Drawing.Point(366, 33);
+            this.txtInput22.MaxLength = 10;
             this.txtInput22.Name = "txtInput22";
-            this.txtInput22.Size = new System.Drawing.Size(54, 23);
-            this.txtInput22.TabIndex = 14;
+            this.txtInput22.Size = new System.Drawing.Size(91, 26);
+            this.txtInput22.TabIndex = 15;
             this.txtInput22.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput22.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput22.Validated += new System.EventHandler(this.txtInput21_Validated);
             // 
+            // label12
+            // 
+            this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label12.BackColor = System.Drawing.Color.SteelBlue;
+            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label12.ForeColor = System.Drawing.Color.Black;
+            this.label12.Location = new System.Drawing.Point(3, 122);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(114, 25);
+            this.label12.TabIndex = 31;
+            this.label12.Text = "å·¥äº‹ç•ªå�·åŸºæº–";
+            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // panel1
             // 
             this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -410,15 +445,15 @@
             this.tableLayoutPanel4.SetColumnSpan(this.panel1, 3);
             this.panel1.Controls.Add(this.radioButton2);
             this.panel1.Controls.Add(this.radioButton1);
-            this.panel1.Location = new System.Drawing.Point(133, 73);
+            this.panel1.Location = new System.Drawing.Point(123, 123);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(234, 29);
+            this.panel1.Size = new System.Drawing.Size(234, 24);
             this.panel1.TabIndex = 33;
             // 
             // radioButton2
             // 
             this.radioButton2.AutoSize = true;
-            this.radioButton2.Location = new System.Drawing.Point(111, 4);
+            this.radioButton2.Location = new System.Drawing.Point(111, 1);
             this.radioButton2.Name = "radioButton2";
             this.radioButton2.Size = new System.Drawing.Size(94, 20);
             this.radioButton2.TabIndex = 0;
@@ -429,7 +464,7 @@
             // 
             this.radioButton1.AutoSize = true;
             this.radioButton1.Checked = true;
-            this.radioButton1.Location = new System.Drawing.Point(5, 4);
+            this.radioButton1.Location = new System.Drawing.Point(5, 1);
             this.radioButton1.Name = "radioButton1";
             this.radioButton1.Size = new System.Drawing.Size(77, 20);
             this.radioButton1.TabIndex = 0;
@@ -437,28 +472,142 @@
             this.radioButton1.Text = "å–¶æ¥­æœŸ";
             this.radioButton1.UseVisualStyleBackColor = true;
             // 
-            // label12
+            // label32
             // 
-            this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(3, 75);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(123, 25);
-            this.label12.TabIndex = 31;
-            this.label12.Text = "å·¥äº‹ç•ªå�·åŸºæº–";
-            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label32.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label32.BackColor = System.Drawing.Color.Beige;
+            this.label32.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label32.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label32.ForeColor = System.Drawing.Color.Black;
+            this.label32.Location = new System.Drawing.Point(3, 62);
+            this.label32.Name = "label32";
+            this.label32.Size = new System.Drawing.Size(114, 25);
+            this.label32.TabIndex = 31;
+            this.label32.Text = "å–¶æ¥­æœŸæœ«æ—¥";
+            this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // label33
+            // 
+            this.label33.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label33.BackColor = System.Drawing.Color.LightSteelBlue;
+            this.label33.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label33.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label33.ForeColor = System.Drawing.Color.Black;
+            this.label33.Location = new System.Drawing.Point(246, 62);
+            this.label33.Name = "label33";
+            this.label33.Size = new System.Drawing.Size(114, 25);
+            this.label33.TabIndex = 31;
+            this.label33.Text = "å·¥äº‹å¹´æœ«æ—¥";
+            this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label34
+            // 
+            this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label34.AutoSize = true;
+            this.label34.BackColor = System.Drawing.Color.Transparent;
+            this.label34.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label34.ForeColor = System.Drawing.Color.Black;
+            this.label34.Location = new System.Drawing.Point(220, 37);
+            this.label34.Name = "label34";
+            this.label34.Size = new System.Drawing.Size(20, 16);
+            this.label34.TabIndex = 32;
+            this.label34.Text = "æ—¥";
+            this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label35
+            // 
+            this.label35.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label35.AutoSize = true;
+            this.label35.BackColor = System.Drawing.Color.Transparent;
+            this.label35.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label35.ForeColor = System.Drawing.Color.Black;
+            this.label35.Location = new System.Drawing.Point(220, 67);
+            this.label35.Name = "label35";
+            this.label35.Size = new System.Drawing.Size(20, 16);
+            this.label35.TabIndex = 32;
+            this.label35.Text = "æ—¥";
+            this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label36
+            // 
+            this.label36.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label36.AutoSize = true;
+            this.label36.BackColor = System.Drawing.Color.Transparent;
+            this.label36.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label36.ForeColor = System.Drawing.Color.Black;
+            this.label36.Location = new System.Drawing.Point(463, 37);
+            this.label36.Name = "label36";
+            this.label36.Size = new System.Drawing.Size(20, 16);
+            this.label36.TabIndex = 32;
+            this.label36.Text = "æ—¥";
+            this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label37
+            // 
+            this.label37.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label37.AutoSize = true;
+            this.label37.BackColor = System.Drawing.Color.Transparent;
+            this.label37.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label37.ForeColor = System.Drawing.Color.Black;
+            this.label37.Location = new System.Drawing.Point(463, 67);
+            this.label37.Name = "label37";
+            this.label37.Size = new System.Drawing.Size(20, 16);
+            this.label37.TabIndex = 32;
+            this.label37.Text = "æ—¥";
+            this.label37.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // txtInput27
+            // 
+            this.txtInput27.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput27.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtInput27.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput27.Location = new System.Drawing.Point(123, 63);
+            this.txtInput27.MaxLength = 10;
+            this.txtInput27.Name = "txtInput27";
+            this.txtInput27.Size = new System.Drawing.Size(91, 26);
+            this.txtInput27.TabIndex = 13;
+            this.txtInput27.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtInput27.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput27.Validated += new System.EventHandler(this.txtInput21_Validated);
+            // 
+            // txtInput28
+            // 
+            this.txtInput28.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput28.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtInput28.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput28.Location = new System.Drawing.Point(366, 63);
+            this.txtInput28.MaxLength = 10;
+            this.txtInput28.Name = "txtInput28";
+            this.txtInput28.Size = new System.Drawing.Size(91, 26);
+            this.txtInput28.TabIndex = 16;
+            this.txtInput28.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtInput28.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput28.Validated += new System.EventHandler(this.txtInput21_Validated);
+            // 
+            // btnHistory
+            // 
+            this.btnHistory.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnHistory.BackColor = System.Drawing.Color.LightGray;
+            this.tableLayoutPanel4.SetColumnSpan(this.btnHistory, 3);
+            this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.btnHistory.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnHistory.Location = new System.Drawing.Point(246, 93);
+            this.btnHistory.Name = "btnHistory";
+            this.btnHistory.Size = new System.Drawing.Size(230, 24);
+            this.btnHistory.TabIndex = 41;
+            this.btnHistory.TabStop = false;
+            this.btnHistory.Text = "é�ŽåŽ»å±¥æ­´";
+            this.btnHistory.UseVisualStyleBackColor = false;
+            this.btnHistory.Click += new System.EventHandler(this.btnHistory_Click);
+            // 
             // groupBoxEx3
             // 
             this.groupBoxEx3.BackColor = System.Drawing.Color.SkyBlue;
             this.groupBoxEx3.BorderColor = System.Drawing.Color.White;
             this.groupBoxEx3.Controls.Add(this.tableLayoutPanel3);
-            this.groupBoxEx3.Location = new System.Drawing.Point(10, 439);
+            this.groupBoxEx3.Location = new System.Drawing.Point(10, 446);
             this.groupBoxEx3.Name = "groupBoxEx3";
-            this.groupBoxEx3.Size = new System.Drawing.Size(1240, 70);
+            this.groupBoxEx3.Size = new System.Drawing.Size(1240, 60);
             this.groupBoxEx3.TabIndex = 3;
             this.groupBoxEx3.TabStop = false;
             this.groupBoxEx3.Text = "ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±";
@@ -472,7 +621,7 @@
             this.tableLayoutPanel3.Controls.Add(this.label18, 0, 0);
             this.tableLayoutPanel3.Controls.Add(this.btnFilePath, 2, 0);
             this.tableLayoutPanel3.Controls.Add(this.txtInput14, 1, 0);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(10, 25);
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(10, 20);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
             this.tableLayoutPanel3.RowCount = 1;
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
@@ -482,7 +631,7 @@
             // label18
             // 
             this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label18.BackColor = System.Drawing.Color.MediumTurquoise;
             this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label18.ForeColor = System.Drawing.Color.Black;
@@ -517,7 +666,7 @@
             this.txtInput14.MaxLength = 120;
             this.txtInput14.Name = "txtInput14";
             this.txtInput14.Size = new System.Drawing.Size(900, 23);
-            this.txtInput14.TabIndex = 20;
+            this.txtInput14.TabIndex = 22;
             this.txtInput14.TextChanged += new System.EventHandler(this.valueChange);
             // 
             // groupBoxEx2
@@ -525,9 +674,9 @@
             this.groupBoxEx2.BackColor = System.Drawing.Color.SkyBlue;
             this.groupBoxEx2.BorderColor = System.Drawing.Color.White;
             this.groupBoxEx2.Controls.Add(this.tableLayoutPanel2);
-            this.groupBoxEx2.Location = new System.Drawing.Point(518, 291);
+            this.groupBoxEx2.Location = new System.Drawing.Point(518, 258);
             this.groupBoxEx2.Name = "groupBoxEx2";
-            this.groupBoxEx2.Size = new System.Drawing.Size(732, 140);
+            this.groupBoxEx2.Size = new System.Drawing.Size(732, 180);
             this.groupBoxEx2.TabIndex = 2;
             this.groupBoxEx2.TabStop = false;
             this.groupBoxEx2.Text = "ã‚·ã‚¹ãƒ†ãƒ è¨­å®šå®šæ•°";
@@ -585,13 +734,13 @@
             // txtInput13
             // 
             this.txtInput13.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput13.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput13.Location = new System.Drawing.Point(133, 6);
+            this.txtInput13.Location = new System.Drawing.Point(133, 4);
             this.txtInput13.MaxLength = 5;
             this.txtInput13.Name = "txtInput13";
-            this.txtInput13.Size = new System.Drawing.Size(64, 23);
-            this.txtInput13.TabIndex = 15;
+            this.txtInput13.Size = new System.Drawing.Size(64, 27);
+            this.txtInput13.TabIndex = 17;
             this.txtInput13.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput13.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput13.Validated += new System.EventHandler(this.txtInputPercent_Validated);
@@ -627,14 +776,14 @@
             // txtCoopRate
             // 
             this.txtCoopRate.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtCoopRate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtCoopRate.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtCoopRate.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtCoopRate.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtCoopRate.Location = new System.Drawing.Point(368, 6);
+            this.txtCoopRate.Location = new System.Drawing.Point(368, 4);
             this.txtCoopRate.MaxLength = 5;
             this.txtCoopRate.Name = "txtCoopRate";
-            this.txtCoopRate.Size = new System.Drawing.Size(64, 23);
-            this.txtCoopRate.TabIndex = 16;
+            this.txtCoopRate.Size = new System.Drawing.Size(64, 27);
+            this.txtCoopRate.TabIndex = 18;
             this.txtCoopRate.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtCoopRate.TextChanged += new System.EventHandler(this.valueChange);
             this.txtCoopRate.Validated += new System.EventHandler(this.txtInputPercent_Validated);
@@ -670,13 +819,13 @@
             // txtInput23
             // 
             this.txtInput23.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput23.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput23.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput23.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput23.Location = new System.Drawing.Point(603, 6);
+            this.txtInput23.Location = new System.Drawing.Point(603, 4);
             this.txtInput23.MaxLength = 5;
             this.txtInput23.Name = "txtInput23";
-            this.txtInput23.Size = new System.Drawing.Size(64, 23);
-            this.txtInput23.TabIndex = 17;
+            this.txtInput23.Size = new System.Drawing.Size(64, 27);
+            this.txtInput23.TabIndex = 19;
             this.txtInput23.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput23.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput23.Validated += new System.EventHandler(this.txtInputPercent_Validated);
@@ -712,13 +861,13 @@
             // txtInput25
             // 
             this.txtInput25.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput25.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput25.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput25.Location = new System.Drawing.Point(133, 41);
+            this.txtInput25.Location = new System.Drawing.Point(133, 39);
             this.txtInput25.MaxLength = 5;
             this.txtInput25.Name = "txtInput25";
-            this.txtInput25.Size = new System.Drawing.Size(64, 23);
-            this.txtInput25.TabIndex = 18;
+            this.txtInput25.Size = new System.Drawing.Size(64, 27);
+            this.txtInput25.TabIndex = 20;
             this.txtInput25.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput25.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput25.Validated += new System.EventHandler(this.txtInputPercent_Validated);
@@ -754,13 +903,13 @@
             // txtInput26
             // 
             this.txtInput26.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput26.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput26.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput26.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput26.Location = new System.Drawing.Point(368, 41);
+            this.txtInput26.Location = new System.Drawing.Point(368, 39);
             this.txtInput26.MaxLength = 5;
             this.txtInput26.Name = "txtInput26";
-            this.txtInput26.Size = new System.Drawing.Size(64, 23);
-            this.txtInput26.TabIndex = 19;
+            this.txtInput26.Size = new System.Drawing.Size(64, 27);
+            this.txtInput26.TabIndex = 21;
             this.txtInput26.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput26.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput26.Validated += new System.EventHandler(this.txtInputPercent_Validated);
@@ -786,7 +935,7 @@
             this.groupBoxEx1.Controls.Add(this.tableLayoutPanel1);
             this.groupBoxEx1.Location = new System.Drawing.Point(10, 40);
             this.groupBoxEx1.Name = "groupBoxEx1";
-            this.groupBoxEx1.Size = new System.Drawing.Size(1240, 245);
+            this.groupBoxEx1.Size = new System.Drawing.Size(1240, 210);
             this.groupBoxEx1.TabIndex = 0;
             this.groupBoxEx1.TabStop = false;
             this.groupBoxEx1.Text = "ä¼šç¤¾æƒ…å ±";
@@ -827,32 +976,26 @@
             this.tableLayoutPanel1.Controls.Add(this.txtInput9, 5, 5);
             this.tableLayoutPanel1.Controls.Add(this.label27, 0, 5);
             this.tableLayoutPanel1.Controls.Add(this.txtInput24, 1, 5);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 25);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 20);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 6;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1220, 210);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1220, 180);
             this.tableLayoutPanel1.TabIndex = 13;
             // 
             // label10
             // 
             this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label10.BackColor = System.Drawing.Color.SteelBlue;
             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(3, 5);
+            this.label10.Location = new System.Drawing.Point(3, 3);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(120, 24);
             this.label10.TabIndex = 30;
@@ -864,9 +1007,9 @@
             this.lblSystemCode.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.lblSystemCode.BackColor = System.Drawing.Color.White;
             this.lblSystemCode.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblSystemCode.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblSystemCode.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblSystemCode.ForeColor = System.Drawing.Color.Black;
-            this.lblSystemCode.Location = new System.Drawing.Point(133, 5);
+            this.lblSystemCode.Location = new System.Drawing.Point(133, 3);
             this.lblSystemCode.Name = "lblSystemCode";
             this.lblSystemCode.Size = new System.Drawing.Size(60, 24);
             this.lblSystemCode.TabIndex = 31;
@@ -878,7 +1021,7 @@
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput1, 2);
             this.txtInput1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput1.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput1.Location = new System.Drawing.Point(133, 41);
+            this.txtInput1.Location = new System.Drawing.Point(133, 33);
             this.txtInput1.MaxLength = 60;
             this.txtInput1.Name = "txtInput1";
             this.txtInput1.Size = new System.Drawing.Size(445, 23);
@@ -888,11 +1031,11 @@
             // label2
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label2.BackColor = System.Drawing.Color.SteelBlue;
             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(3, 40);
+            this.label2.Location = new System.Drawing.Point(3, 33);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(120, 24);
             this.label2.TabIndex = 32;
@@ -905,7 +1048,7 @@
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput2, 2);
             this.txtInput2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput2.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput2.Location = new System.Drawing.Point(133, 76);
+            this.txtInput2.Location = new System.Drawing.Point(133, 63);
             this.txtInput2.MaxLength = 60;
             this.txtInput2.Name = "txtInput2";
             this.txtInput2.Size = new System.Drawing.Size(445, 23);
@@ -918,7 +1061,7 @@
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput3, 2);
             this.txtInput3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput3.Location = new System.Drawing.Point(133, 111);
+            this.txtInput3.Location = new System.Drawing.Point(133, 93);
             this.txtInput3.MaxLength = 60;
             this.txtInput3.Name = "txtInput3";
             this.txtInput3.Size = new System.Drawing.Size(445, 23);
@@ -928,11 +1071,11 @@
             // label4
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label4.BackColor = System.Drawing.Color.SteelBlue;
             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(3, 110);
+            this.label4.Location = new System.Drawing.Point(3, 93);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(120, 24);
             this.label4.TabIndex = 37;
@@ -942,11 +1085,11 @@
             // label3
             // 
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label3.BackColor = System.Drawing.Color.SteelBlue;
             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(3, 145);
+            this.label3.Location = new System.Drawing.Point(3, 123);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(120, 24);
             this.label3.TabIndex = 35;
@@ -959,7 +1102,7 @@
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput4, 2);
             this.txtInput4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput4.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput4.Location = new System.Drawing.Point(133, 146);
+            this.txtInput4.Location = new System.Drawing.Point(133, 123);
             this.txtInput4.MaxLength = 60;
             this.txtInput4.Name = "txtInput4";
             this.txtInput4.Size = new System.Drawing.Size(445, 23);
@@ -969,11 +1112,11 @@
             // label5
             // 
             this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label5.BackColor = System.Drawing.Color.SteelBlue;
             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(633, 5);
+            this.label5.Location = new System.Drawing.Point(633, 3);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(120, 24);
             this.label5.TabIndex = 39;
@@ -983,12 +1126,12 @@
             // txtInput5
             // 
             this.txtInput5.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput5.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtInput5.Location = new System.Drawing.Point(763, 6);
+            this.txtInput5.Location = new System.Drawing.Point(763, 3);
             this.txtInput5.MaxLength = 8;
             this.txtInput5.Name = "txtInput5";
-            this.txtInput5.Size = new System.Drawing.Size(84, 23);
+            this.txtInput5.Size = new System.Drawing.Size(84, 27);
             this.txtInput5.TabIndex = 5;
             this.txtInput5.TextChanged += new System.EventHandler(this.valueChange);
             // 
@@ -995,24 +1138,26 @@
             // btnSerchZip
             // 
             this.btnSerchZip.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnSerchZip.BackColor = System.Drawing.SystemColors.Control;
+            this.btnSerchZip.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.btnSerchZip.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnSerchZip.Location = new System.Drawing.Point(863, 6);
+            this.btnSerchZip.Location = new System.Drawing.Point(863, 3);
             this.btnSerchZip.Name = "btnSerchZip";
-            this.btnSerchZip.Size = new System.Drawing.Size(120, 23);
+            this.btnSerchZip.Size = new System.Drawing.Size(120, 24);
             this.btnSerchZip.TabIndex = 41;
             this.btnSerchZip.TabStop = false;
             this.btnSerchZip.Text = "ä½�æ‰€æ¤œç´¢";
-            this.btnSerchZip.UseVisualStyleBackColor = true;
+            this.btnSerchZip.UseVisualStyleBackColor = false;
             this.btnSerchZip.Click += new System.EventHandler(this.btnSerchZip_Click);
             // 
             // label6
             // 
             this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label6.BackColor = System.Drawing.Color.SteelBlue;
             this.label6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(633, 40);
+            this.label6.Location = new System.Drawing.Point(633, 33);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(120, 24);
             this.label6.TabIndex = 42;
@@ -1022,10 +1167,10 @@
             // label19
             // 
             this.label19.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label19.BackColor = System.Drawing.Color.SteelBlue;
             this.label19.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label19.ForeColor = System.Drawing.Color.Black;
-            this.label19.Location = new System.Drawing.Point(763, 40);
+            this.label19.Location = new System.Drawing.Point(763, 32);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(84, 25);
             this.label19.TabIndex = 38;
@@ -1037,7 +1182,7 @@
             this.txtInput6.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtInput6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput6.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput6.Location = new System.Drawing.Point(863, 41);
+            this.txtInput6.Location = new System.Drawing.Point(863, 33);
             this.txtInput6.MaxLength = 60;
             this.txtInput6.Name = "txtInput6";
             this.txtInput6.Size = new System.Drawing.Size(345, 23);
@@ -1047,10 +1192,10 @@
             // label20
             // 
             this.label20.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label20.BackColor = System.Drawing.Color.SteelBlue;
             this.label20.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(763, 75);
+            this.label20.Location = new System.Drawing.Point(763, 62);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(84, 25);
             this.label20.TabIndex = 39;
@@ -1060,10 +1205,10 @@
             // label21
             // 
             this.label21.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label21.BackColor = System.Drawing.Color.SteelBlue;
             this.label21.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label21.ForeColor = System.Drawing.Color.Black;
-            this.label21.Location = new System.Drawing.Point(763, 110);
+            this.label21.Location = new System.Drawing.Point(763, 92);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(84, 25);
             this.label21.TabIndex = 40;
@@ -1073,11 +1218,11 @@
             // label8
             // 
             this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label8.BackColor = System.Drawing.Color.SteelBlue;
             this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(633, 145);
+            this.label8.Location = new System.Drawing.Point(633, 123);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(120, 24);
             this.label8.TabIndex = 45;
@@ -1087,11 +1232,11 @@
             // label9
             // 
             this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label9.BackColor = System.Drawing.Color.SteelBlue;
             this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label9.ForeColor = System.Drawing.Color.Black;
-            this.label9.Location = new System.Drawing.Point(633, 180);
+            this.label9.Location = new System.Drawing.Point(633, 153);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(120, 24);
             this.label9.TabIndex = 47;
@@ -1103,7 +1248,7 @@
             this.txtInput7.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtInput7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput7.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput7.Location = new System.Drawing.Point(863, 76);
+            this.txtInput7.Location = new System.Drawing.Point(863, 63);
             this.txtInput7.MaxLength = 60;
             this.txtInput7.Name = "txtInput7";
             this.txtInput7.Size = new System.Drawing.Size(345, 23);
@@ -1115,7 +1260,7 @@
             this.txtInput15.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtInput15.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput15.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtInput15.Location = new System.Drawing.Point(863, 111);
+            this.txtInput15.Location = new System.Drawing.Point(863, 93);
             this.txtInput15.MaxLength = 60;
             this.txtInput15.Name = "txtInput15";
             this.txtInput15.Size = new System.Drawing.Size(345, 23);
@@ -1126,12 +1271,12 @@
             // 
             this.txtInput8.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput8, 2);
-            this.txtInput8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput8.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput8.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtInput8.Location = new System.Drawing.Point(763, 146);
+            this.txtInput8.Location = new System.Drawing.Point(763, 123);
             this.txtInput8.MaxLength = 13;
             this.txtInput8.Name = "txtInput8";
-            this.txtInput8.Size = new System.Drawing.Size(150, 23);
+            this.txtInput8.Size = new System.Drawing.Size(150, 27);
             this.txtInput8.TabIndex = 9;
             this.txtInput8.TextChanged += new System.EventHandler(this.valueChange);
             // 
@@ -1139,12 +1284,12 @@
             // 
             this.txtInput9.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput9, 2);
-            this.txtInput9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput9.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtInput9.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtInput9.Location = new System.Drawing.Point(763, 181);
+            this.txtInput9.Location = new System.Drawing.Point(763, 153);
             this.txtInput9.MaxLength = 13;
             this.txtInput9.Name = "txtInput9";
-            this.txtInput9.Size = new System.Drawing.Size(150, 23);
+            this.txtInput9.Size = new System.Drawing.Size(150, 27);
             this.txtInput9.TabIndex = 10;
             this.txtInput9.TextChanged += new System.EventHandler(this.valueChange);
             // 
@@ -1151,11 +1296,11 @@
             // label27
             // 
             this.label27.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
+            this.label27.BackColor = System.Drawing.Color.SteelBlue;
             this.label27.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label27.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label27.ForeColor = System.Drawing.Color.Black;
-            this.label27.Location = new System.Drawing.Point(3, 180);
+            this.label27.Location = new System.Drawing.Point(3, 153);
             this.label27.Name = "label27";
             this.label27.Size = new System.Drawing.Size(120, 24);
             this.label27.TabIndex = 47;
@@ -1168,7 +1313,7 @@
             this.tableLayoutPanel1.SetColumnSpan(this.txtInput24, 2);
             this.txtInput24.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.txtInput24.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput24.Location = new System.Drawing.Point(133, 181);
+            this.txtInput24.Location = new System.Drawing.Point(133, 153);
             this.txtInput24.MaxLength = 60;
             this.txtInput24.Name = "txtInput24";
             this.txtInput24.Size = new System.Drawing.Size(445, 23);
@@ -1296,5 +1441,14 @@
         private System.Windows.Forms.Label label30;
         private System.Windows.Forms.TextBox txtInput26;
         private System.Windows.Forms.Label label31;
+        private System.Windows.Forms.Label label32;
+        private System.Windows.Forms.Label label33;
+        private System.Windows.Forms.Label label34;
+        private System.Windows.Forms.Label label35;
+        private System.Windows.Forms.Label label36;
+        private System.Windows.Forms.Label label37;
+        private System.Windows.Forms.TextBox txtInput27;
+        private System.Windows.Forms.TextBox txtInput28;
+        private System.Windows.Forms.Button btnHistory;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardWriter.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardWriter.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardWriter.cs	(revision 323)
@@ -382,14 +382,15 @@
                 else
                 {   // ä¿®æ­£
                     if (m_WritingCode == CommonMotions.LoginUserData.PersonCode)
-                        lblMode.Text = s_ModeString[1];
+                        lblMode.Text = s_ModeString[1];     // ç·¨é›†
                     else
-                        lblMode.Text = s_ModeString[2];
+                        lblMode.Text = s_ModeString[2];     // è¿”ä¿¡
                 }
 
                 // æ›¸è¾¼ã�¿è€…ã‚»ãƒƒãƒˆ
                 cmbWriter.SelectedValue = CommonMotions.LoginUserData.PersonCode;
 
+                // æ–°è¦�æ™‚ã�¯ä»¥ä¸‹ã‚’ã‚»ãƒƒãƒˆã�—ã�ªã�„
                 if (m_RecordNumber == 0) return;
 
                 // æŽ²ç¤ºæ�¿ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—ã�™ã‚‹
@@ -396,36 +397,55 @@
                 string strSQL = mbdDB.CreatePrimarykeyString(m_RecordNumber, m_BranchNumber);
                 MessageBoardData data = new MessageBoardData();
                 if (!mbdDB.SelectAction(strSQL, ref data)) return;
+                //  å¯¾è±¡è€…å��è¡¨ç¤º
+                string strTergetSQL = mbtDB.CreatePrimarykeyString(data.RecordNumber, data.BranchNumber) + " Order By SeqNum";
+                List<MessageBoardTerget> terList = new List<MessageBoardTerget>();
+                mbtDB.SelectAction(strTergetSQL, ref terList);
 
-                // æ›¸è¾¼ã�¿è€…ã‚»ãƒƒãƒˆ
-                cmbWriter.SelectedValue = data.FromCode;
-
                 // ç·¨é›†æ™‚
                 if (data.PersonCode == CommonMotions.LoginUserData.PersonCode)
                 {
+                    // è‡ªåˆ†ã�®æ›¸ã��è¾¼ã�¿ã�®å ´å�ˆã�¯å†…å®¹ã‚’è¡¨ç¤ºã�™ã‚‹
+                    txtTitle.Text = data.MessageTitle;
+                    txtMessage.Text = data.MessageContent;
+
                     //  å¯¾è±¡è€…å��è¡¨ç¤º
-                    string strTergetSQL = mbtDB.CreatePrimarykeyString(data.RecordNumber, data.BranchNumber) +" Order By SeqNum";
-                    List<MessageBoardTerget> terList = new List<MessageBoardTerget>();
-                    if (mbtDB.SelectAction(strTergetSQL, ref terList))
+                    foreach (MessageBoardTerget wrkterget in terList)
                     {
-                        foreach (MessageBoardTerget wrkterget in terList)
-                        {
-                            KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrkterget.ToCode, wrkterget.ToName);
-                            m_RecipientList.Add(keyval);
-                        }
+                        KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrkterget.ToCode, wrkterget.ToName);
+                        m_RecipientList.Add(keyval);
                     }
 
-                    // è‡ªåˆ†ã�®æ›¸ã��è¾¼ã�¿ã�®å ´å�ˆã�¯å†…å®¹ã‚’è¡¨ç¤ºã�™ã‚‹
-                    txtTitle.Text = data.MessageTitle;
-                    txtMessage.Text = data.MessageContent;
+                    // è¡¨ç¤ºæ›¸è¾¼ã�¿è€…ã‚³ãƒ¼ãƒ‰ã�Œéƒ¨ç½²ã�®å ´å�ˆã�¯æ›¸è¾¼ã�¿è€…ã‚’å¤‰ã�ˆã‚‹
+                    if (data.PersonCode != data.FromCode)
+                    {
+                        cmbWriter.SelectedValue = data.FromCode;
+                    }
                 }
                 else
                 {   // è¿”ä¿¡æ™‚
                     // è¿”ä¿¡è€…ã‚»ãƒƒãƒˆ
                     m_RecipientList.Add(new KeyValuePair<int, string>(data.FromCode, data.FromName));
+                    // è¿”ä¿¡ã‚¿ã‚¤ãƒˆãƒ«ã‚»ãƒƒãƒˆ
+                    txtTitle.Text = CommonDefine.s_PageType1GridResString[1] + data.MessageTitle;
 
-                    txtTitle.Text = CommonDefine.s_PageType1GridResString[1] + data.MessageTitle;
+                    // æ‹…å½“è€…ãƒªã‚¹ãƒˆã�«ç„¡ã�‘ã‚Œã�°éƒ¨ç½²ã‚’æŽ¢ã�™
+                    MessageBoardTerget wkToList = terList.Find(x => x.ToCode == CommonMotions.LoginUserData.PersonCode);
+                    if (wkToList == null)
+                    {
+                        // è¿”ä¿¡è€…ã�Œéƒ¨ç½²ã�®å ´å�ˆã�¯ã��ã‚Œã‚’ã‚»ãƒƒãƒˆ
+                        foreach (MessageBoardTerget wrkterget in terList)
+                        {
+                            // å¯¾è±¡ã�Œéƒ¨ç½²ã�®å ´å�ˆã�¯æ›¸è¾¼ã�¿è€…ã‚»ãƒƒãƒˆ
+                            if (wrkterget.ToCode == CommonMotions.LoginUserData.DepartmentCode)
+                            {
+                                cmbWriter.SelectedValue = wrkterget.ToCode;
+                                break;
+                            }
+                        }
+                    }
                 }
+                // å¯¾è±¡è€…ã‚»ãƒƒãƒˆ
                 ListBoxAction.InitDataSetListBox(lstRecipient, m_RecipientList);
             }
             catch (Exception ex)
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 323)
@@ -5581,7 +5581,7 @@
 
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
                 int ino = 1;
-                DateTime BreakPeriodDate = CommonMotions.cnvDate(DateTime.Now.FiscalYear().ToString() + "/" + CommonMotions.SystemMasterData.BusinessBeginningDate);
+
                 List<string> Details = new List<string>();
                 ArrayList personlist = new ArrayList();
                 // æœˆã�®ã‚«ã‚¦ãƒ³ãƒˆã�‹ã‚‰ç©ºç™½è¡Œæ•°ã‚’å�–å¾—ã�™ã‚‹
Index: branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 323)
@@ -145,6 +145,7 @@
     <Compile Include="Common\Process\ClsExcute.cs" />
     <Compile Include="Common\CommonDefine.cs" />
     <Compile Include="Common\Office\UsedWord.cs" />
+    <Compile Include="DataModel\GridCellStyleMember.cs" />
     <Compile Include="DataModel\PersonApprovalDetail.cs" />
     <Compile Include="DataModel\SFPDataDetail.cs" />
     <Compile Include="DataModel\SFPData.cs" />
@@ -213,6 +214,7 @@
     <Compile Include="DataModel\SuppliersMaster.cs" />
     <Compile Include="DataModel\SecurityMaster.cs" />
     <Compile Include="DataModel\PeriodAvoidance.cs" />
+    <Compile Include="DataModel\BizPeriodHistory.cs" />
     <Compile Include="DataModel\TranceportDailyData.cs" />
     <Compile Include="DataModel\TypeExpensesMaster.cs" />
     <Compile Include="DB\IOAccess\IOAttendanceDailyData.cs" />
@@ -235,6 +237,7 @@
     <Compile Include="DB\IOAccess\IOMaterialRecordInfo.cs" />
     <Compile Include="DB\IOAccess\IOMaterialTypes.cs" />
     <Compile Include="DB\IOAccess\IOMCategoryName.cs" />
+    <Compile Include="DB\IOAccess\IOMBizPeriodHistory.cs" />
     <Compile Include="DB\IOAccess\IOPeriodAvoidance.cs" />
     <Compile Include="DB\IOAccess\IOPersonApprovalDetail.cs" />
     <Compile Include="DB\IOAccess\IOSFPDataDetail.cs" />
@@ -356,6 +359,9 @@
     <Compile Include="Forms\DataEntry\DRWork\FrmDRWorkList.Designer.cs">
       <DependentUpon>FrmDRWorkList.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\DataEntry\EstimateInput\RequestPrint.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DataEntry\Material\MaterialReserveEntry\FrmMateResEntAux.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -859,6 +865,12 @@
     <Compile Include="Forms\Master\Suppliers\FrmSuppliers.designer.cs">
       <DependentUpon>FrmSuppliers.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\Master\System\FrmBizHisList.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\Master\System\FrmBizHisList.Designer.cs">
+      <DependentUpon>FrmBizHisList.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\SubForms\FrmInputComment.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1593,6 +1605,9 @@
     <EmbeddedResource Include="Forms\Master\Suppliers\FrmSuppliers.resx">
       <DependentUpon>FrmSuppliers.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\Master\System\FrmBizHisList.resx">
+      <DependentUpon>FrmBizHisList.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SubForms\FrmInputComment.resx">
       <DependentUpon>FrmInputComment.cs</DependentUpon>
     </EmbeddedResource>
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 322)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 323)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.146")]
-[assembly: AssemblyFileVersion("1.0.1.146")]
+[assembly: AssemblyVersion("1.0.1.148")]
+[assembly: AssemblyFileVersion("1.0.1.148")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
