Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 238)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 57;
+        public static int s_SystemVersion = 59;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 238)
@@ -2588,7 +2588,9 @@
 
                 // ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 frm.ConstructionCode = CurrentPara.IntExecParameter[0];
-
+                frm.PersonCode = CommonMotions.LoginUserData.PersonCode;
+                if (CurrentPara.IntExecParameter.Count > 2) frm.OrderNo = CurrentPara.IntExecParameter[2];
+                
                 // ãƒ•ã‚©ãƒ¼ãƒ è¡¨ç¤º
                 frm.ShowDialog();
             }
@@ -3689,9 +3691,21 @@
                 frm.ConstructionCode = CurrentPara.IntExecParameter[0];
                 frm.ApprovalCode = CurrentPara.IntExecParameter[1];
                 frm.OrderNo = CurrentPara.IntExecParameter[2];
-                for (int i = 3; i < CurrentPara.IntExecParameter.Count; i++)
+                // ã‚µãƒ–ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                switch (frm.ApprovalCode)
                 {
-                    frm.PurchaseOrderSeqNo.Add(CurrentPara.IntExecParameter[i]);
+                    case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval:
+                        // æ³¨æ–‡æ›¸å‡¦ç�†æ™‚
+                        for (int i = 3; i < CurrentPara.IntExecParameter.Count; i++)
+                        {
+                            frm.PurchaseOrderSeqNo.Add(CurrentPara.IntExecParameter[i]);
+                        }
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.SafetyPatrol:
+                        // å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«æ™‚
+                        if (CurrentPara.IntExecParameter.Count > 3)
+                            frm.DataCount = CurrentPara.IntExecParameter[3];
+                        break;
                 }
 
                 // ãƒ•ã‚©ãƒ¼ãƒ è¡¨ç¤º
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 238)
@@ -104,60 +104,65 @@
         private string CreateSelectSQL()
         {
             StringBuilder strcmd = new StringBuilder();
-            
-            strcmd.Append("SELECT");
-            strcmd.Append("  ConstructionCode");
-            strcmd.Append(", TyingFlg");
-            strcmd.Append(", JoinFlg");
-            strcmd.Append(", ConstructionYear");
-            strcmd.Append(", ConstructionPeriod");
-            strcmd.Append(", DATE_FORMAT(RequestedDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(EstimatesSubmitDeadline, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(EstimatesSubmittedDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ProvisionalOrderDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(OrderDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(OrderStartingDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(OrderCompletionDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(PreparationStartDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ConstructionStartingDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ConstructionCompletionDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(NonOrderDate, '%Y/%m/%d')");
-            strcmd.Append(", OrdersDecisionPrice");
-            strcmd.Append(", OrdersDecisionPriceInTax");
-            strcmd.Append(", SalesPersonCode");
-            strcmd.Append(", ConstructionPersonCode");
-            strcmd.Append(", ConstrSubPersonCode");
-            strcmd.Append(", ConstructionInstructor");
-            strcmd.Append(", TransferConstruction");
-            strcmd.Append(", DATE_FORMAT(TransferConstructionDate, '%Y/%m/%d')");
-            strcmd.Append(", OrderersDivision");
-            strcmd.Append(", OrderersCode");
-            strcmd.Append(", DATE_FORMAT(EstimatesExpirationDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ConstructionPeriodStart, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ConstructionPeriodEnd, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ConstructionPeriodStart2, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(ConstructionPeriodEnd2, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(StartDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(EndDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(PurchaseOrderMailingDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(PurchaseOrderReturnDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(PurchaseOrderReturnCheckDate, '%Y/%m/%d')");
-            strcmd.Append(", ConsumptionTaxFlg");
-            strcmd.Append(", PrimeContractorFlg");
-            strcmd.Append(", SalesCostFlg");
-            strcmd.Append(", ConstructionStatusFlg");
-            strcmd.Append(", ConstructionType");
-            strcmd.Append(", EstimateType");
-            strcmd.Append(", DATE_FORMAT(BillingStartDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(BillingDate, '%Y/%m/%d')");
-            strcmd.Append(", BillingSplitFlg");
-            strcmd.Append(", DATE_FORMAT(BillingSendDate, '%Y/%m/%d')");
-            strcmd.Append(", DATE_FORMAT(LedgerComplateDate, '%Y/%m/%d')");
-            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 ConstructionBaseInfo");
+            try
+            {
+                strcmd.Append("SELECT");
 
-            return strcmd.ToString();
+                bool bColFirst = true;
+                string strWork = string.Empty;
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    strWork = gender.ToString();
+                    if (!bColFirst) strcmd.Append(",");
+                    if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                    {
+                        strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
+                    }
+                    else if (strWork.Equals("RequestedDate")
+                            || strWork.Equals("EstimatesSubmitDeadline")
+                            || strWork.Equals("EstimatesSubmittedDate")
+                            || strWork.Equals("ProvisionalOrderDate")
+                            || strWork.Equals("OrderDate")
+                            || strWork.Equals("OrderStartingDate")
+                            || strWork.Equals("OrderCompletionDate")
+                            || strWork.Equals("PreparationStartDate")
+                            || strWork.Equals("ConstructionStartingDate")
+                            || strWork.Equals("ConstructionCompletionDate")
+                            || strWork.Equals("NonOrderDate")
+                            || strWork.Equals("TransferConstructionDate")
+                            || strWork.Equals("EstimatesExpirationDate")
+                            || strWork.Equals("ConstructionPeriodStart")
+                            || strWork.Equals("ConstructionPeriodEnd")
+                            || strWork.Equals("ConstructionPeriodStart2")
+                            || strWork.Equals("ConstructionPeriodEnd2")
+                            || strWork.Equals("StartDate")
+                            || strWork.Equals("EndDate")
+                            || strWork.Equals("PurchaseOrderMailingDate")
+                            || strWork.Equals("PurchaseOrderReturnDate")
+                            || strWork.Equals("PurchaseOrderReturnCheckDate")
+                            || strWork.Equals("BillingStartDate")
+                            || strWork.Equals("BillingDate")
+                            || strWork.Equals("BillingSendDate")
+                            || strWork.Equals("LedgerComplateDate"))
+                    {
+                        strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d')", strWork);
+                    }
+                    else
+                    {
+                        strcmd.AppendFormat(" {0}", strWork);
+                    }
+                    bColFirst = false;
+                }
+
+                strcmd.Append(" FROM ConstructionBaseInfo");
+
+                return strcmd.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
+                return string.Empty;
+            }
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProcessApproval.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProcessApproval.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProcessApproval.cs	(revision 238)
@@ -444,17 +444,17 @@
         /// </summary>
         /// <param name="BusinessTypeCode"></param>
         /// <returns>Whereæ–‡å­—åˆ—</returns>
-        public string CreatePrimarykeyString(int ConstructionCode, int ApprovalCode = 0, int OrderNo = 0, int SeqNo = 0, string APara = "")
+        public string CreatePrimarykeyString(int ConstructionCode, int ApprovalCode = -1, int OrderNo = -1, int SeqNo = -1, string APara = "")
         {
             string strWork = string.Empty;
             try
             {
                 strWork = string.Format(" Where {0}ConstructionCode = {1}", APara, ConstructionCode.ToString());
-                if (ApprovalCode != 0)
+                if (ApprovalCode != -1)
                     strWork += string.Format(" And {0}ApprovalCode = {1}", APara, ApprovalCode.ToString());
-                if (OrderNo != 0)
+                if (OrderNo != -1)
                     strWork += string.Format(" And {0}OrderNo = {1}", APara, OrderNo.ToString());
-                if (SeqNo != 0)
+                if (SeqNo != -1)
                     strWork += string.Format(" And {0}SeqNo = {1}", APara, SeqNo.ToString());
             }
             catch (Exception ex)
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSFPData.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSFPData.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSFPData.cs	(revision 238)
@@ -32,10 +32,11 @@
         /// <summary>
         /// å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
         /// </summary>
-        public enum DataColumn
+        public enum TableColumn
         {
             ConstructionCode = 0,
-            PettionDate,
+            DataCount,
+            RequestDate,
             PersonCode,
             StringValue,
             OrderNo,
@@ -69,14 +70,23 @@
 
             strcmd.Append("SELECT");
 
-            strcmd.Append("  ConstructionCode");
-            strcmd.Append(", PettionDate");
-            strcmd.Append(", PersonCode");
-            strcmd.Append(", StringValue");
-            strcmd.Append(", OrderNo");
+            bool bColFirst = true;
+            string strWork = string.Empty;
+            foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+            {
+                strWork = gender.ToString();
+                if (!bColFirst) strcmd.Append(",");
+                if (strWork.Equals("RequestDate") || strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
+                {
+                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
+                }
+                else
+                {
+                    strcmd.AppendFormat(" {0}", strWork);
+                }
+                bColFirst = false;
+            }
 
-            strcmd.Append(" ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
-            strcmd.Append(" ,DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
             strcmd.Append(" FROM SFPData");
 
             return strcmd.ToString();
@@ -173,7 +183,7 @@
                 bool bColFirst = true;
                 strcmd.Append("INSERT INTO SFPData");
                 strcmd.Append(" (");
-                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
                 {
                     if (!bColFirst) strcmd.Append(", ");
                     strcmd.Append(gender.ToString());
@@ -188,7 +198,8 @@
                     else strcmd.Append(", (");
 
                     strcmd.AppendFormat("  {0}", work.ConstructionCode);
-                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.PettionDate.ToShortDateString());
+                    strcmd.AppendFormat(", {0}", work.DataCount);
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.RequestDate);
                     strcmd.AppendFormat(", {0}", work.PersonCode);
                     strcmd.AppendFormat(",'{0}'", work.StringValue);
                     strcmd.AppendFormat(", {0}", work.OrderNo);
@@ -228,7 +239,7 @@
                 strcmd.Append(" (");
 
                 bool bFirst = true;
-                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
                 {
                     if (!bFirst) strcmd.Append(" ,");
                     strcmd.Append(gender.ToString());
@@ -238,7 +249,8 @@
                 strcmd.Append(") VALUES (");
 
                 strcmd.AppendFormat("  {0}", work.ConstructionCode);
-                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.PettionDate.ToShortDateString());
+                strcmd.AppendFormat(", {0}", work.DataCount);
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.RequestDate);
                 strcmd.AppendFormat(", {0}", work.PersonCode);
                 strcmd.AppendFormat(",'{0}'", work.StringValue);
                 strcmd.AppendFormat(", {0}", work.OrderNo);
@@ -277,7 +289,8 @@
                 strcmd.Append(" SET");
 
                 strcmd.AppendFormat("  ConstructionCode = {0}", data.ConstructionCode);
-                strcmd.AppendFormat(", PettionDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.PettionDate.ToShortDateString());
+                strcmd.AppendFormat(", DataCount = {0}", data.DataCount);
+                strcmd.AppendFormat(", RequestDate = STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.RequestDate);
                 strcmd.AppendFormat(", PersonCode = {0}", data.PersonCode);
                 strcmd.AppendFormat(", StringValue = '{0}'", data.StringValue);
                 strcmd.AppendFormat(", OrderNo = {0}", data.OrderNo);
@@ -335,14 +348,15 @@
             try
             {
                 // ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());
-                wrk.PettionDate = DateTime.Parse(objwrk[(int)DataColumn.PettionDate].ToString());
-                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());
-                wrk.StringValue = objwrk[(int)DataColumn.StringValue].ToString();
-                wrk.OrderNo = int.Parse(objwrk[(int)DataColumn.OrderNo].ToString());
+                wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString());
+                wrk.DataCount = int.Parse(objwrk[(int)TableColumn.DataCount].ToString());
+                wrk.RequestDate = DateTime.Parse(objwrk[(int)TableColumn.RequestDate].ToString());
+                wrk.PersonCode = int.Parse(objwrk[(int)TableColumn.PersonCode].ToString());
+                wrk.StringValue = objwrk[(int)TableColumn.StringValue].ToString();
+                wrk.OrderNo = int.Parse(objwrk[(int)TableColumn.OrderNo].ToString());
 
-                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
-                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
             }
             catch (MySqlException myex)
             {
@@ -361,15 +375,14 @@
         /// </summary>
         /// <param name="ItemCode">å¤§å·¥ç¨®ã‚­ãƒ¼</param>
         /// <returns>Whereæ–‡å­—åˆ—</returns>
-        public string CreatePrimarykeyString(int ConstructionCode, DateTime PettionDate, int PersonCode = 0)
+        public string CreatePrimarykeyString(int ConstructionCode, int DataCount = 0)
         {
             StringBuilder strWork = new StringBuilder();
             try
             {
                 strWork.AppendFormat(" Where ConstructionCode = {0}", ConstructionCode);
-                strWork.AppendFormat(" Adn PettionDate = STR_TO_DATE('{0}','%Y/%m/%d')", PettionDate.ToShortDateString());
-                if (PersonCode != 0)
-                    strWork.AppendFormat(" And PersonCode = {0}", PersonCode);
+                if (DataCount != 0)
+                    strWork.AppendFormat(" And DataCount = {0}", DataCount);
             }
             catch (Exception ex)
             {
@@ -379,5 +392,41 @@
             return strWork.ToString();
         }
         #endregion
+
+        #region å·¥äº‹ç•ªå�·ã�®æž�ç•ªã�Œæœ€å¤§å€¤ã�®ã‚‚ã�®ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å·¥äº‹ç•ªå�·ã�®æž�ç•ªã�Œæœ€å¤§å€¤ã�®ã‚‚ã�®ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <param name="NowCode"></param>
+        /// <returns></returns>
+        public int CreateNextDataCount(int ConstrCode)
+        {
+            IOSFPData sfpDB = new IOSFPData();
+            try
+            {
+                // æž�ç•ªæœ€å¤§å€¤ã�®å·¥äº‹ç•ªå�·å�–å¾—
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("Select IFNULL(MAX(DataCount), 0) FROM SFPData");
+                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", ConstrCode);
+
+                ArrayList arList = new ArrayList();
+                // ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�‘ã‚Œã�°æŠœã�‘ã‚‹
+                if (!sfpDB.ExecuteReader(strSQL.ToString(), ref arList)) return 0;
+
+                object[] wrkobj = (object[])arList[0];
+
+                return CommonMotions.cnvInt(wrkobj[0]);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+            finally
+            {
+                sfpDB.close(); sfpDB = null;
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSFPDataDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSFPDataDetail.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSFPDataDetail.cs	(revision 238)
@@ -32,11 +32,11 @@
         /// <summary>
         /// å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä¸¦ã�³
         /// </summary>
-        public enum DataColumn
+        public enum TableColumn
         {
             ConstructionCode = 0,
-            PettionDate,
-            PersonCode,
+            DataCount,
+            SeqNo,
             CompanyCode,
             EntryDate,
             UpdateDate,
@@ -69,8 +69,8 @@
             strcmd.Append("SELECT");
 
             strcmd.Append("  ConstructionCode");
-            strcmd.Append(", PettionDate");
-            strcmd.Append(", PersonCode");
+            strcmd.Append(", DataCount");
+            strcmd.Append(", SeqNo");
             strcmd.Append(", CompanyCode");
 
             strcmd.Append(" ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
@@ -171,7 +171,7 @@
                 bool bColFirst = true;
                 strcmd.Append("INSERT INTO SFPDataDetail");
                 strcmd.Append(" (");
-                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
                 {
                     if (!bColFirst) strcmd.Append(", ");
                     strcmd.Append(gender.ToString());
@@ -186,8 +186,8 @@
                     else strcmd.Append(", (");
 
                     strcmd.AppendFormat("  {0}", work.ConstructionCode);
-                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.PettionDate.ToShortDateString());
-                    strcmd.AppendFormat(", {0}", work.PersonCode);
+                    strcmd.AppendFormat(", {0}", work.DataCount);
+                    strcmd.AppendFormat(", {0}", work.SeqNo);
                     strcmd.AppendFormat(", {0}", work.CompanyCode);
 
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
@@ -225,7 +225,7 @@
                 strcmd.Append(" (");
 
                 bool bFirst = true;
-                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
                 {
                     if (!bFirst) strcmd.Append(" ,");
                     strcmd.Append(gender.ToString());
@@ -235,8 +235,8 @@
                 strcmd.Append(") VALUES (");
 
                 strcmd.AppendFormat("  {0}", work.ConstructionCode);
-                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.PettionDate.ToShortDateString());
-                strcmd.AppendFormat(", {0}", work.PersonCode);
+                strcmd.AppendFormat(", {0}", work.DataCount);
+                strcmd.AppendFormat(", {0}", work.SeqNo);
                 strcmd.AppendFormat(", {0}", work.CompanyCode);
 
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
@@ -273,8 +273,8 @@
                 strcmd.Append(" SET");
 
                 strcmd.AppendFormat("  ConstructionCode = {0}", data.ConstructionCode);
-                strcmd.AppendFormat(", PettionDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.PettionDate.ToShortDateString());
-                strcmd.AppendFormat(", PersonCode = {0}", data.PersonCode);
+                strcmd.AppendFormat(", DataCount = {0}", data.DataCount);
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
                 strcmd.AppendFormat(", CompanyCode = {0}", data.CompanyCode);
 
                 strcmd.Append(", UpdateDate = NOW()");
@@ -330,13 +330,13 @@
             try
             {
                 // ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());
-                wrk.PettionDate = DateTime.Parse(objwrk[(int)DataColumn.PettionDate].ToString());
-                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());
-                wrk.CompanyCode = int.Parse(objwrk[(int)DataColumn.CompanyCode].ToString());
+                wrk.ConstructionCode = int.Parse(objwrk[(int)TableColumn.ConstructionCode].ToString());
+                wrk.DataCount = int.Parse(objwrk[(int)TableColumn.DataCount].ToString());
+                wrk.SeqNo = int.Parse(objwrk[(int)TableColumn.SeqNo].ToString());
+                wrk.CompanyCode = int.Parse(objwrk[(int)TableColumn.CompanyCode].ToString());
 
-                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
-                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
+                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
+                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
             }
             catch (MySqlException myex)
             {
@@ -355,17 +355,16 @@
         /// </summary>
         /// <param name="ItemCode">å¤§å·¥ç¨®ã‚­ãƒ¼</param>
         /// <returns>Whereæ–‡å­—åˆ—</returns>
-        public string CreatePrimarykeyString(int ConstructionCode, DateTime PettionDate, int PersonCode = 0, int CompanyCode = 0)
+        public string CreatePrimarykeyString(int ConstructionCode, int DataCount = 0, int SeqNo = 0)
         {
             StringBuilder strWork = new StringBuilder();
             try
             {
                 strWork.AppendFormat(" Where ConstructionCode = {0}", ConstructionCode);
-                strWork.AppendFormat(" Adn PettionDate = STR_TO_DATE('{0}','%Y/%m/%d')", PettionDate.ToShortDateString());
-                if (PersonCode != 0)
-                    strWork.AppendFormat(" And PersonCode = {0}", PersonCode);
-                if (CompanyCode != 0)
-                    strWork.AppendFormat(" And CompanyCode = {0}", CompanyCode);
+                if (DataCount != 0)
+                    strWork.AppendFormat(" And DataCount = {0}", DataCount);
+                if (SeqNo != 0)
+                    strWork.AppendFormat(" And SeqNo = {0}", SeqNo);
             }
             catch (Exception ex)
             {
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/SFPData.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/SFPData.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/SFPData.cs	(revision 238)
@@ -14,31 +14,35 @@
         /// <summary>
         /// å·¥äº‹ç•ªå�·
         /// </summary>
-        private int m_ConstructionCode = 0;
+        private int         m_ConstructionCode = 0;
         /// <summary>
-        /// ç”³è«‹æ—¥æ™‚
+        /// ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«å›žæ•°
         /// </summary>
-        private DateTime m_PettionDate = DateTime.MinValue;
+        private int         m_DataCount = 0;
         /// <summary>
+        /// å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¦�è«‹æ—¥æ™‚
+        /// </summary>
+        private DateTime    m_RequestDate = DateTime.MinValue;
+        /// <summary>
         /// ç”³è«‹è€…ç•ªå�·
         /// </summary>
-        private int m_PersonCode = 0;
+        private int         m_PersonCode = 0;
         /// <summary>
         /// ã‚³ãƒ¡ãƒ³ãƒˆ
         /// </summary>
-        private string m_StringValue = string.Empty;
+        private string      m_StringValue = string.Empty;
         /// <summary>
-        /// ç”³è«‹å�—ä»˜ç•ªå�·
+        /// å�—ä»˜ç•ªå�·
         /// </summary>
-        private int m_OrderNo = 0;
+        private int         m_OrderNo = 0;
         /// <summary>
         /// ç™»éŒ²æ—¥ä»˜
         /// </summary>
-        private DateTime m_EntryDate = DateTime.Now;
+        private DateTime    m_EntryDate = DateTime.Now;
         /// <summary>
         /// æ›´æ–°æ—¥ä»˜
         /// </summary>
-        private DateTime m_UpdateDate = DateTime.Now;
+        private DateTime    m_UpdateDate = DateTime.Now;
         #endregion
 
         #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
@@ -54,13 +58,20 @@
             set { m_ConstructionCode = value; }
         }
         /// <summary>
-        /// ç”³è«‹æ—¥æ™‚
+        /// ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«å›žæ•°
         /// </summary>
-        public DateTime PettionDate
+        public int DataCount
         {
-            get { return m_PettionDate; }
-            set { m_PettionDate = value; }
+            get { return m_DataCount; }
+            set { m_DataCount = value; }
         }
+        /// å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¦�è«‹æ—¥æ™‚
+        /// </summary>
+        public DateTime RequestDate
+        {
+            get { return m_RequestDate; }
+            set { m_RequestDate = value; }
+        }
         /// <summary>
         /// ç”³è«‹è€…ç•ªå�·
         /// </summary>
@@ -78,7 +89,7 @@
             set { m_StringValue = value; }
         }
         /// <summary>
-        /// ç”³è«‹å�—ä»˜ç•ªå�·
+        /// å�—ä»˜ç•ªå�·
         /// </summary>
         public int OrderNo
         {
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/SFPDataDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/SFPDataDetail.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/SFPDataDetail.cs	(revision 238)
@@ -14,27 +14,27 @@
         /// <summary>
         /// å·¥äº‹ç•ªå�·
         /// </summary>
-        private int m_ConstructionCode = 0;
+        private int         m_ConstructionCode = 0;
         /// <summary>
-        /// ç”³è«‹æ—¥æ™‚
+        /// ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«å›žæ•°
         /// </summary>
-        private DateTime m_PettionDate = DateTime.MinValue;
+        private int         m_DataCount = 0;
         /// <summary>
-        /// ç”³è«‹è€…ç•ªå�·
+        /// ãƒ‡ãƒ¼ã‚¿æž�ç•ª
         /// </summary>
-        private int m_PersonCode = 0;
+        private int         m_SeqNo = 0;
         /// <summary>
         /// å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
         /// </summary>
-        private int m_CompanyCode = 0;
+        private int         m_CompanyCode = 0;
         /// <summary>
         /// ç™»éŒ²æ—¥ä»˜
         /// </summary>
-        private DateTime m_EntryDate = DateTime.Now;
+        private DateTime    m_EntryDate = DateTime.Now;
         /// <summary>
         /// æ›´æ–°æ—¥ä»˜
         /// </summary>
-        private DateTime m_UpdateDate = DateTime.Now;
+        private DateTime    m_UpdateDate = DateTime.Now;
         #endregion
 
         #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
@@ -50,20 +50,20 @@
             set { m_ConstructionCode = value; }
         }
         /// <summary>
-        /// ç”³è«‹æ—¥æ™‚
+        /// ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«å›žæ•°
         /// </summary>
-        public DateTime PettionDate
+        public int DataCount
         {
-            get { return m_PettionDate; }
-            set { m_PettionDate = value; }
+            get { return m_DataCount; }
+            set { m_DataCount = value; }
         }
         /// <summary>
-        /// ç”³è«‹è€…ç•ªå�·
+        /// ãƒ‡ãƒ¼ã‚¿æž�ç•ª
         /// </summary>
-        public int PersonCode
+        public int SeqNo
         {
-            get { return m_PersonCode; }
-            set { m_PersonCode = value; }
+            get { return m_SeqNo; }
+            set { m_SeqNo = value; }
         }
         /// <summary>
         /// å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/SourceUpdate.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/SourceUpdate.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/SourceUpdate.cs	(nonexistent)
@@ -1,566 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using System.Collections;
-using System.Linq;
-using System.Diagnostics;
-using System.Data.Common;
-
-using log4net;
-using log4net.Appender;
-using log4net.Repository.Hierarchy;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.DB.Core;
-using ProcessManagement.Forms.Master;
-using ProcessManagement.Forms.SubForms;
-using ProcessManagement.Forms.ControlsAction;
-using ProcessManagement.Forms.CustomControls;
-
-namespace ProcessManagement.Forms.DataEntry
-{
-    partial class FrmApprovalPerson
-    {
-        #region æœ€çµ‚æ‰¿èª�ã�Œæˆ�ã�•ã‚Œã�Ÿå¾Œã�®å‡¦ç�†
-        /// <summary>
-        /// æœ€çµ‚æ‰¿èª�ã�Œæˆ�ã�•ã‚Œã�Ÿå¾Œã�®å‡¦ç�†
-        /// </summary>
-        private void FinalUpdateSourceData()
-        {
-            try
-            {
-                switch (m_ApprovalCode)
-                {
-                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:
-                        // 8:å‡ºå‹¤ç®¡ç�†æ‰¿èª�
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:
-                        // 9:ç™ºæ³¨è€…ç™»éŒ²æ‰¿èª�
-                        CreateCostomerData();
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:
-                        // 10:å�”åŠ›ä¼šç¤¾ç™»éŒ²æ‰¿èª�
-                        CreateSubConstrData();
-                        break;
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
-        /// <summary>
-        /// ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
-        /// </summary>
-        private void CreateCostomerData()
-        {
-            IOMOrderers OrderDB = new IOMOrderers(); 
-            IOCostomerRegist RegistDB = new IOCostomerRegist();
-            try
-            {
-                // ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = RegistDB.CreatePrimarykeyString(m_PersonCode, m_SearchDate, m_SearchSeqNo);
-                CostomerRegist RegistRec = new CostomerRegist();
-                if (!RegistDB.SelectAction(strSQL, ref RegistRec))
-                {
-                    MessageBox.Show("ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�Œå­˜åœ¨ã�—ã�¾ã�›ã‚“ã€‚", "ç™»éŒ²ç¢ºèª�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-                
-                OrderDB.connect(); OrderDB.beginTran();
-                RegistDB.connect(); RegistDB.beginTran();
-
-                // æ–°è¦�ãƒ»ä¿®æ­£å‡¦ç�†
-                switch (RegistRec.DataMode)
-                {
-                    case (int)FrmCostomerRegist.DataMode.NewData:
-
-                        // ã‚½ãƒ¼ã‚¹ã�®ã‚³ãƒ¼ãƒ‰ã�Œã�‚ã‚Œã�°å†�åº¦ã�®ä½œæˆ�ã�¯ã�—ã�ªã�„
-                        if (RegistRec.SourceCode != 0) return;
-                        // æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                        CreateCostomer(OrderDB, RegistDB, ref RegistRec, strSQL);
-
-                        break;
-                    case (int)FrmCostomerRegist.DataMode.EditData:
-
-                        // æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-                        UpdateCostomer(OrderDB, RegistRec);
-                        break;
-                }
-
-                OrderDB.commit();
-                RegistDB.commit();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                RegistDB.close(); RegistDB = null;
-                OrderDB.close(); OrderDB = null;
-            }
-        }
-        #endregion
-
-        #region ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// <summary>
-        /// ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// </summary>
-        private bool CreateCostomer(IOMOrderers OrderDB, IOCostomerRegist RegistDB, ref CostomerRegist RegistRec, string SourceSQL)
-        {
-            try
-            {
-                // æ–°è¦�ç™ºæ³¨è€…ã‚³ãƒ¼ãƒ‰å�–å¾—
-                string strSQL = OrderDB.CreatePrimarykeyString(RegistRec.OrderCotegory);
-                int OrderersCode = OrderDB.SelectMaxOrderersCodeCount(strSQL, false) + 1;
-                // è¡¨ç¤ºé †å�–å¾—
-                int DispOrder = OrderDB.GetMaxDisplayOrder(strSQL, false) + 1;
-
-                strSQL = "INSERT INTO ORDERERSMASTER";
-                strSQL += " SELECT";
-                strSQL += " OrderCotegory,";
-                strSQL += string.Format(" {0},", OrderersCode);
-                strSQL += string.Format(" {0},", DispOrder);
-                strSQL += " OrderFlg,";
-                strSQL += " CorporateStatusName,";
-                strSQL += " CorporateStatusPoint,";
-                strSQL += " OrderersName1,";
-                strSQL += " OrderersName2,";
-                strSQL += " DepartmentName,";
-                strSQL += " ChargePersonName,";
-                strSQL += " ZipCode,";
-                strSQL += " Address1,";
-                strSQL += " Address2,";
-                strSQL += " Address3,";
-                strSQL += " PhoneNumber,";
-                strSQL += " FaxNumber,";
-                strSQL += " MailAddress,";
-                strSQL += " Note,";
-                strSQL += " 0,";
-                strSQL += " NOW(),";
-                strSQL += " NOW()";
-                strSQL += " FROM COSTOMERREGIST";
-
-                strSQL += SourceSQL;
-                if (!OrderDB.ExecuteNonQuery(strSQL, false))
-                {
-                    OrderDB.rollback();
-                    MessageBox.Show("ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // æ–°è¦�ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
-                RegistRec.SourceCode = OrderersCode;
-
-                // æˆ�åŠŸæ™‚ã�¯ç™ºæ³¨è€…ç™»éŒ²ãƒ‡ãƒ¼ã‚¿ã�«ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
-                strSQL = "UPDATE COSTOMERREGIST SET";
-                strSQL += string.Format(" SOURCECOTEGORY = {0}", RegistRec.OrderCotegory);
-                strSQL += string.Format(", SOURCECODE = {0}", RegistRec.SourceCode);
-                strSQL += RegistDB.CreatePrimarykeyString(m_PersonCode, m_SearchDate, m_SearchSeqNo);
-                if (!RegistDB.ExecuteNonQuery(strSQL, false))
-                {
-                    OrderDB.rollback();
-                    RegistDB.rollback();
-                    MessageBox.Show("ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// <summary>
-        /// ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// </summary>
-        private bool UpdateCostomer(IOMOrderers OrderDB, CostomerRegist RegistRec)
-        {
-            try
-            {
-                string strSQL = "UPDATE OrderersMaster";
-
-                strSQL += " SET";
-
-                strSQL += string.Format(" OrderFlg = {0}", RegistRec.OrderFlg);
-                strSQL += string.Format(", CorporateStatusName = '{0}'", RegistRec.CorporateStatusName);
-                strSQL += string.Format(", CorporateStatusPoint = {0}", RegistRec.CorporateStatusPoint);
-                strSQL += string.Format(", OrderersName1 = '{0}'", RegistRec.OrderersName1);
-                strSQL += string.Format(", OrderersName2 = '{0}'", RegistRec.OrderersName2);
-                strSQL += string.Format(", DepartmentName = '{0}'", RegistRec.DepartmentName);
-                strSQL += string.Format(", ChargePersonName = '{0}'", RegistRec.ChargePersonName);
-                strSQL += string.Format(", ZipCode = '{0}'", RegistRec.ZipCode);
-                strSQL += string.Format(", Address1 = '{0}'", RegistRec.Address1);
-                strSQL += string.Format(", Address2 = '{0}'", RegistRec.Address2);
-                strSQL += string.Format(", Address3 = '{0}'", RegistRec.Address3);
-                strSQL += string.Format(", PhoneNumber = '{0}'", RegistRec.PhoneNumber);
-                strSQL += string.Format(", FaxNumber = '{0}'", RegistRec.FaxNumber);
-                strSQL += string.Format(", Note = '{0}'", RegistRec.Note);
-                strSQL += string.Format(", MailAddress = '{0}'", RegistRec.MailAddress);
-
-                strSQL += ", UpdateDate = NOW()";
-
-                strSQL += OrderDB.CreatePrimarykeyString(RegistRec.SourceCotegory, RegistRec.SourceCode);
-                if (!OrderDB.ExecuteNonQuery(strSQL, false))
-                {
-                    OrderDB.rollback();
-                    MessageBox.Show("ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã€�æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
-        /// <summary>
-        /// å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
-        /// </summary>
-        private void CreateSubConstrData()
-        {
-            IOMSubContractor SubConstrDB = new IOMSubContractor();
-            IOSubConstrRegist RegistDB = new IOSubConstrRegist();
-            try
-            {
-                // å�”åŠ›ä¼šç¤¾ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                string strSQL = RegistDB.CreatePrimarykeyString(m_PersonCode, m_SearchDate, m_SearchSeqNo);
-                SubConstrRegist RegistRec = new SubConstrRegist();
-                if (!RegistDB.SelectAction(strSQL, ref RegistRec))
-                {
-                    MessageBox.Show("å�”åŠ›ä¼šç¤¾ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�Œå­˜åœ¨ã�—ã�¾ã�›ã‚“ã€‚", "ç™»éŒ²ç¢ºèª�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                SubConstrDB.connect(); SubConstrDB.beginTran();
-                RegistDB.connect(); RegistDB.beginTran();
-
-                // æ–°è¦�ãƒ»ä¿®æ­£å‡¦ç�†
-                switch (RegistRec.DataMode)
-                {
-                    case (int)FrmCostomerRegist.DataMode.NewData:
-
-                        // ã‚½ãƒ¼ã‚¹ã�®ã‚³ãƒ¼ãƒ‰ã�Œã�‚ã‚Œã�°å†�åº¦ã�®ä½œæˆ�ã�¯ã�—ã�ªã�„
-                        if (RegistRec.SourceCode != 0) break;
-
-                        // ----- æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                        // å�”åŠ›ä¼šç¤¾ç™»éŒ²
-                        if (!CreateSubConstr(SubConstrDB, RegistDB, ref RegistRec, strSQL)) break;
-                        // å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²
-                        if (!CreateSubConstrJobItem(SubConstrDB, RegistRec, strSQL))
-                        {
-                            RegistDB.rollback();
-                            break;
-                        }
-                        // å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²
-                        if (!CreateSubConstrJobLink(SubConstrDB, RegistRec, strSQL))
-                        {
-                            RegistDB.rollback();
-                            break;
-                        }
-
-                        break;
-
-                    case (int)FrmCostomerRegist.DataMode.EditData:
-                        // æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-                        if (!UpdateSubConstr(SubConstrDB, RegistRec)) break;
-                        // å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²
-                        if (!UpdateSubConstrJobItem(SubConstrDB, RegistRec, strSQL)) break;
-                        // å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²
-                        if (!UpdateSubConstrJobLink(SubConstrDB, RegistRec, strSQL)) break;
-
-                        break;
-                }
-                SubConstrDB.commit();
-                RegistDB.commit();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                RegistDB.close(); RegistDB = null;
-                SubConstrDB.close(); SubConstrDB = null;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// <summary>
-        /// å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// </summary>
-        private bool CreateSubConstr(IOMSubContractor SubDB, IOSubConstrRegist RegistDB, ref SubConstrRegist RegistRec, string SourceSQL)
-        {
-            try
-            {
-                // æ–°è¦�å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰å�–å¾—
-                int CompanyCode = SubDB.SelectMaxCompanyCodeCount("", false) + 1;
-                int DisplayOrder = SubDB.SelectMaxDisplayOrderCount("", false) + 1;
-
-                string strSQL = "INSERT INTO SUBCONTRACTORMASTER";
-                strSQL += " SELECT";
-                strSQL += string.Format(" {0},", CompanyCode);
-                strSQL += string.Format(" {0},", DisplayOrder);
-                strSQL += " CorporateStatusName,";
-                strSQL += " CorporateStatusPoint,";
-                strSQL += " CompanyName,";
-                strSQL += " CEOPositionName,";
-                strSQL += " CEOName,";
-                strSQL += " ContactPersonName,";
-                strSQL += " ZipCode,";
-                strSQL += " Address1,";
-                strSQL += " Address2,";
-                strSQL += " Address3,";
-                strSQL += " CellPhoneNumber,";
-                strSQL += " MailAddress,";
-                strSQL += " PhoneNumber,";
-                strSQL += " FaxNumber,";
-                strSQL += " JapaneseSyllabary,";
-                strSQL += " StartDate,";
-                strSQL += " Note,";
-                strSQL += " labourKind,";
-                strSQL += " 0,";
-                strSQL += " NOW(),";
-                strSQL += " NOW()";
-                strSQL += " FROM SUBCONSTRREGIST";
-
-                strSQL += SourceSQL;
-                if (!SubDB.ExecuteNonQuery(strSQL, false))
-                {
-                    SubDB.rollback();
-                    MessageBox.Show("å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // æ–°è¦�ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
-                RegistRec.SourceCode = CompanyCode;
-
-                // æˆ�åŠŸæ™‚ã�¯ç™ºæ³¨è€…ç™»éŒ²ãƒ‡ãƒ¼ã‚¿ã�«ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
-                strSQL = string.Format("UPDATE SUBCONSTRREGIST SET SOURCECODE = {0}", RegistRec.SourceCode);
-                strSQL += SourceSQL;
-                if (!RegistDB.ExecuteNonQuery(strSQL, false))
-                {
-                    SubDB.rollback();
-                    RegistDB.rollback();
-                    MessageBox.Show("ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
-        /// <summary>
-        /// å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
-        /// </summary>
-        private bool CreateSubConstrJobItem(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
-        {
-            try
-            {
-                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
-                string strSQL = "SELECT count(*) FROM SUBCONSTRJOBITEMREGIST";
-                strSQL += SourceSQL;
-                ArrayList arCnt = new ArrayList();
-                if (!SubDB.ExecuteReader(strSQL, ref arCnt, false)) return false;
-                if (arCnt.Count == 0) return false;
-                object[] Datacnt = (object[])arCnt[0];
-                if (CommonMotions.cnvInt(Datacnt[0]) == 0) return true;
-                
-                strSQL = "INSERT INTO SUBCONTRACTORJOBITEM";
-                strSQL += " SELECT";
-                strSQL += string.Format(" {0},", RegistRec.SourceCode);
-                strSQL += " ItemCode,";
-                strSQL += " DisplayOrder,";
-                strSQL += " NOW(),";
-                strSQL += " NOW()";
-                strSQL += " FROM SubConstrJobItemRegist";
-
-                strSQL += SourceSQL;
-                if (!SubDB.ExecuteNonQuery(strSQL, false))
-                {
-                    SubDB.rollback();
-                    MessageBox.Show("å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
-        /// <summary>
-        /// å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
-        /// </summary>
-        private bool CreateSubConstrJobLink(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
-        {
-            try
-            {
-                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
-                string strSQL = "SELECT count(*) FROM SubConstrJobLinkRegist";
-                strSQL += SourceSQL;
-                ArrayList arCnt = new ArrayList();
-                if (!SubDB.ExecuteReader(strSQL, ref arCnt, false)) return false;
-                if (arCnt.Count == 0) return false;
-                object[] Datacnt = (object[])arCnt[0];
-                if (CommonMotions.cnvInt(Datacnt[0]) == 0) return true;
-
-                strSQL = "INSERT INTO SubContractorJobLink";
-                strSQL += " SELECT";
-                strSQL += string.Format(" {0},", RegistRec.SourceCode);
-                strSQL += " JobCategoryCode,";
-                strSQL += " DisplayOrder,";
-                strSQL += " NOW(),";
-                strSQL += " NOW()";
-                strSQL += " FROM SubConstrJobLinkRegist";
-
-                strSQL += SourceSQL;
-                if (!SubDB.ExecuteNonQuery(strSQL, false))
-                {
-                    SubDB.rollback();
-                    MessageBox.Show("å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// <summary>
-        /// å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// </summary>
-        private bool UpdateSubConstr(IOMSubContractor SubDB, SubConstrRegist RegistRec)
-        {
-            try
-            {
-                string strSQL = "UPDATE SubContractorMaster";
-
-                strSQL += " SET";
-
-                strSQL += string.Format(" CompanyCode = {0}", RegistRec.SourceCode);
-                strSQL += string.Format(", CorporateStatusName = '{0}'", RegistRec.CorporateStatusName);
-                strSQL += string.Format(", CorporateStatusPoint = {0}", RegistRec.CorporateStatusPoint);
-                strSQL += string.Format(", CompanyName = '{0}'", RegistRec.CompanyName);
-                strSQL += string.Format(", CEOPositionName = '{0}'", RegistRec.CEOPositionName);
-                strSQL += string.Format(", CEOName = '{0}'", RegistRec.CEOName);
-                strSQL += string.Format(", ContactPersonName = '{0}'", RegistRec.ContactPersonName);
-                strSQL += string.Format(", ZipCode = '{0}'", RegistRec.ZipCode);
-                strSQL += string.Format(", Address1 = '{0}'", RegistRec.Address1);
-                strSQL += string.Format(", Address2 = '{0}'", RegistRec.Address2);
-                strSQL += string.Format(", Address3 = '{0}'", RegistRec.Address3);
-                strSQL += string.Format(", CellPhoneNumber = '{0}'", RegistRec.CellPhoneNumber);
-                strSQL += string.Format(", MailAddress = '{0}'", RegistRec.MailAddress);
-                strSQL += string.Format(", PhoneNumber = '{0}'", RegistRec.PhoneNumber);
-                strSQL += string.Format(", FaxNumber = '{0}'", RegistRec.FaxNumber);
-                strSQL += string.Format(", JapaneseSyllabary = '{0}'", RegistRec.JapaneseSyllabary);
-                strSQL += string.Format(", StartDate = STR_TO_DATE('{0}','%Y/%m/%d')", RegistRec.StartDate.ToShortDateString());
-                strSQL += string.Format(", Note = '{0}'", RegistRec.Note);
-                strSQL += string.Format(", labourKind = {0}", RegistRec.labourKind);
-
-                strSQL += ", UpdateDate = NOW()";
-
-                strSQL += SubDB.CreatePrimarykeyString(RegistRec.SourceCode);
-                if (!SubDB.ExecuteNonQuery(strSQL, false))
-                {
-                    SubDB.rollback();
-                    MessageBox.Show("å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã€�æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// <summary>
-        /// å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// </summary>
-        private bool UpdateSubConstrJobItem(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
-        {
-            try
-            {
-                // ã�¾ã�šå‰Šé™¤ã�—ã�¦
-                string strSQL = "DELETE FROM SubContractorJobItem";
-                strSQL += string.Format(" WHERE CompanyCode = {0}", RegistRec.SourceCode);
-                SubDB.ExecuteNonQuery(strSQL, false);
-
-                // æ–°è¦�ä½œæˆ�
-                return CreateSubConstrJobItem(SubDB, RegistRec, SourceSQL);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// <summary>
-        /// å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
-        /// </summary>
-        private bool UpdateSubConstrJobLink(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
-        {
-            try
-            {
-                // ã�¾ã�šå‰Šé™¤ã�—ã�¦
-                string strSQL = "DELETE FROM SubContractorJobLink";
-                strSQL += string.Format(" WHERE CompanyCode = {0}", RegistRec.SourceCode);
-                SubDB.ExecuteNonQuery(strSQL, false);
-
-                // æ–°è¦�ä½œæˆ�
-                return CreateSubConstrJobLink(SubDB, RegistRec, SourceSQL);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs	(revision 238)
@@ -0,0 +1,566 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.Linq;
+using System.Diagnostics;
+using System.Data.Common;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.Master;
+using ProcessManagement.Forms.SubForms;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.CustomControls;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmApprovalPerson
+    {
+        #region æœ€çµ‚æ‰¿èª�ã�Œæˆ�ã�•ã‚Œã�Ÿå¾Œã�®å‡¦ç�†
+        /// <summary>
+        /// æœ€çµ‚æ‰¿èª�ã�Œæˆ�ã�•ã‚Œã�Ÿå¾Œã�®å‡¦ç�†
+        /// </summary>
+        private void ApprovalNextProcess()
+        {
+            try
+            {
+                switch (m_ApprovalCode)
+                {
+                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:
+                        // 8:å‡ºå‹¤ç®¡ç�†æ‰¿èª�
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:
+                        // 9:ç™ºæ³¨è€…ç™»éŒ²æ‰¿èª�
+                        CreateCostomerData();
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:
+                        // 10:å�”åŠ›ä¼šç¤¾ç™»éŒ²æ‰¿èª�
+                        CreateSubConstrData();
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
+        /// <summary>
+        /// ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
+        /// </summary>
+        private void CreateCostomerData()
+        {
+            IOMOrderers OrderDB = new IOMOrderers(); 
+            IOCostomerRegist RegistDB = new IOCostomerRegist();
+            try
+            {
+                // ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                string strSQL = RegistDB.CreatePrimarykeyString(m_PersonCode, m_SearchDate, m_SearchSeqNo);
+                CostomerRegist RegistRec = new CostomerRegist();
+                if (!RegistDB.SelectAction(strSQL, ref RegistRec))
+                {
+                    MessageBox.Show("ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�Œå­˜åœ¨ã�—ã�¾ã�›ã‚“ã€‚", "ç™»éŒ²ç¢ºèª�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+                
+                OrderDB.connect(); OrderDB.beginTran();
+                RegistDB.connect(); RegistDB.beginTran();
+
+                // æ–°è¦�ãƒ»ä¿®æ­£å‡¦ç�†
+                switch (RegistRec.DataMode)
+                {
+                    case (int)FrmCostomerRegist.DataMode.NewData:
+
+                        // ã‚½ãƒ¼ã‚¹ã�®ã‚³ãƒ¼ãƒ‰ã�Œã�‚ã‚Œã�°å†�åº¦ã�®ä½œæˆ�ã�¯ã�—ã�ªã�„
+                        if (RegistRec.SourceCode != 0) return;
+                        // æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                        CreateCostomer(OrderDB, RegistDB, ref RegistRec, strSQL);
+
+                        break;
+                    case (int)FrmCostomerRegist.DataMode.EditData:
+
+                        // æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                        UpdateCostomer(OrderDB, RegistRec);
+                        break;
+                }
+
+                OrderDB.commit();
+                RegistDB.commit();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                RegistDB.close(); RegistDB = null;
+                OrderDB.close(); OrderDB = null;
+            }
+        }
+        #endregion
+
+        #region ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+        /// <summary>
+        /// ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+        /// </summary>
+        private bool CreateCostomer(IOMOrderers OrderDB, IOCostomerRegist RegistDB, ref CostomerRegist RegistRec, string SourceSQL)
+        {
+            try
+            {
+                // æ–°è¦�ç™ºæ³¨è€…ã‚³ãƒ¼ãƒ‰å�–å¾—
+                string strSQL = OrderDB.CreatePrimarykeyString(RegistRec.OrderCotegory);
+                int OrderersCode = OrderDB.SelectMaxOrderersCodeCount(strSQL, false) + 1;
+                // è¡¨ç¤ºé †å�–å¾—
+                int DispOrder = OrderDB.GetMaxDisplayOrder(strSQL, false) + 1;
+
+                strSQL = "INSERT INTO ORDERERSMASTER";
+                strSQL += " SELECT";
+                strSQL += " OrderCotegory,";
+                strSQL += string.Format(" {0},", OrderersCode);
+                strSQL += string.Format(" {0},", DispOrder);
+                strSQL += " OrderFlg,";
+                strSQL += " CorporateStatusName,";
+                strSQL += " CorporateStatusPoint,";
+                strSQL += " OrderersName1,";
+                strSQL += " OrderersName2,";
+                strSQL += " DepartmentName,";
+                strSQL += " ChargePersonName,";
+                strSQL += " ZipCode,";
+                strSQL += " Address1,";
+                strSQL += " Address2,";
+                strSQL += " Address3,";
+                strSQL += " PhoneNumber,";
+                strSQL += " FaxNumber,";
+                strSQL += " MailAddress,";
+                strSQL += " Note,";
+                strSQL += " 0,";
+                strSQL += " NOW(),";
+                strSQL += " NOW()";
+                strSQL += " FROM COSTOMERREGIST";
+
+                strSQL += SourceSQL;
+                if (!OrderDB.ExecuteNonQuery(strSQL, false))
+                {
+                    OrderDB.rollback();
+                    MessageBox.Show("ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // æ–°è¦�ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
+                RegistRec.SourceCode = OrderersCode;
+
+                // æˆ�åŠŸæ™‚ã�¯ç™ºæ³¨è€…ç™»éŒ²ãƒ‡ãƒ¼ã‚¿ã�«ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+                strSQL = "UPDATE COSTOMERREGIST SET";
+                strSQL += string.Format(" SOURCECOTEGORY = {0}", RegistRec.OrderCotegory);
+                strSQL += string.Format(", SOURCECODE = {0}", RegistRec.SourceCode);
+                strSQL += RegistDB.CreatePrimarykeyString(m_PersonCode, m_SearchDate, m_SearchSeqNo);
+                if (!RegistDB.ExecuteNonQuery(strSQL, false))
+                {
+                    OrderDB.rollback();
+                    RegistDB.rollback();
+                    MessageBox.Show("ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// <summary>
+        /// ç™ºæ³¨è€…ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// </summary>
+        private bool UpdateCostomer(IOMOrderers OrderDB, CostomerRegist RegistRec)
+        {
+            try
+            {
+                string strSQL = "UPDATE OrderersMaster";
+
+                strSQL += " SET";
+
+                strSQL += string.Format(" OrderFlg = {0}", RegistRec.OrderFlg);
+                strSQL += string.Format(", CorporateStatusName = '{0}'", RegistRec.CorporateStatusName);
+                strSQL += string.Format(", CorporateStatusPoint = {0}", RegistRec.CorporateStatusPoint);
+                strSQL += string.Format(", OrderersName1 = '{0}'", RegistRec.OrderersName1);
+                strSQL += string.Format(", OrderersName2 = '{0}'", RegistRec.OrderersName2);
+                strSQL += string.Format(", DepartmentName = '{0}'", RegistRec.DepartmentName);
+                strSQL += string.Format(", ChargePersonName = '{0}'", RegistRec.ChargePersonName);
+                strSQL += string.Format(", ZipCode = '{0}'", RegistRec.ZipCode);
+                strSQL += string.Format(", Address1 = '{0}'", RegistRec.Address1);
+                strSQL += string.Format(", Address2 = '{0}'", RegistRec.Address2);
+                strSQL += string.Format(", Address3 = '{0}'", RegistRec.Address3);
+                strSQL += string.Format(", PhoneNumber = '{0}'", RegistRec.PhoneNumber);
+                strSQL += string.Format(", FaxNumber = '{0}'", RegistRec.FaxNumber);
+                strSQL += string.Format(", Note = '{0}'", RegistRec.Note);
+                strSQL += string.Format(", MailAddress = '{0}'", RegistRec.MailAddress);
+
+                strSQL += ", UpdateDate = NOW()";
+
+                strSQL += OrderDB.CreatePrimarykeyString(RegistRec.SourceCotegory, RegistRec.SourceCode);
+                if (!OrderDB.ExecuteNonQuery(strSQL, false))
+                {
+                    OrderDB.rollback();
+                    MessageBox.Show("ç™ºæ³¨è€…ãƒžã‚¹ã‚¿ã€�æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
+        /// <summary>
+        /// å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã�®ç™»éŒ²
+        /// </summary>
+        private void CreateSubConstrData()
+        {
+            IOMSubContractor SubConstrDB = new IOMSubContractor();
+            IOSubConstrRegist RegistDB = new IOSubConstrRegist();
+            try
+            {
+                // å�”åŠ›ä¼šç¤¾ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                string strSQL = RegistDB.CreatePrimarykeyString(m_PersonCode, m_SearchDate, m_SearchSeqNo);
+                SubConstrRegist RegistRec = new SubConstrRegist();
+                if (!RegistDB.SelectAction(strSQL, ref RegistRec))
+                {
+                    MessageBox.Show("å�”åŠ›ä¼šç¤¾ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�Œå­˜åœ¨ã�—ã�¾ã�›ã‚“ã€‚", "ç™»éŒ²ç¢ºèª�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+
+                SubConstrDB.connect(); SubConstrDB.beginTran();
+                RegistDB.connect(); RegistDB.beginTran();
+
+                // æ–°è¦�ãƒ»ä¿®æ­£å‡¦ç�†
+                switch (RegistRec.DataMode)
+                {
+                    case (int)FrmCostomerRegist.DataMode.NewData:
+
+                        // ã‚½ãƒ¼ã‚¹ã�®ã‚³ãƒ¼ãƒ‰ã�Œã�‚ã‚Œã�°å†�åº¦ã�®ä½œæˆ�ã�¯ã�—ã�ªã�„
+                        if (RegistRec.SourceCode != 0) break;
+
+                        // ----- æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                        // å�”åŠ›ä¼šç¤¾ç™»éŒ²
+                        if (!CreateSubConstr(SubConstrDB, RegistDB, ref RegistRec, strSQL)) break;
+                        // å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²
+                        if (!CreateSubConstrJobItem(SubConstrDB, RegistRec, strSQL))
+                        {
+                            RegistDB.rollback();
+                            break;
+                        }
+                        // å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²
+                        if (!CreateSubConstrJobLink(SubConstrDB, RegistRec, strSQL))
+                        {
+                            RegistDB.rollback();
+                            break;
+                        }
+
+                        break;
+
+                    case (int)FrmCostomerRegist.DataMode.EditData:
+                        // æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                        if (!UpdateSubConstr(SubConstrDB, RegistRec)) break;
+                        // å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²
+                        if (!UpdateSubConstrJobItem(SubConstrDB, RegistRec, strSQL)) break;
+                        // å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²
+                        if (!UpdateSubConstrJobLink(SubConstrDB, RegistRec, strSQL)) break;
+
+                        break;
+                }
+                SubConstrDB.commit();
+                RegistDB.commit();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                RegistDB.close(); RegistDB = null;
+                SubConstrDB.close(); SubConstrDB = null;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+        /// <summary>
+        /// å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+        /// </summary>
+        private bool CreateSubConstr(IOMSubContractor SubDB, IOSubConstrRegist RegistDB, ref SubConstrRegist RegistRec, string SourceSQL)
+        {
+            try
+            {
+                // æ–°è¦�å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰å�–å¾—
+                int CompanyCode = SubDB.SelectMaxCompanyCodeCount("", false) + 1;
+                int DisplayOrder = SubDB.SelectMaxDisplayOrderCount("", false) + 1;
+
+                string strSQL = "INSERT INTO SUBCONTRACTORMASTER";
+                strSQL += " SELECT";
+                strSQL += string.Format(" {0},", CompanyCode);
+                strSQL += string.Format(" {0},", DisplayOrder);
+                strSQL += " CorporateStatusName,";
+                strSQL += " CorporateStatusPoint,";
+                strSQL += " CompanyName,";
+                strSQL += " CEOPositionName,";
+                strSQL += " CEOName,";
+                strSQL += " ContactPersonName,";
+                strSQL += " ZipCode,";
+                strSQL += " Address1,";
+                strSQL += " Address2,";
+                strSQL += " Address3,";
+                strSQL += " CellPhoneNumber,";
+                strSQL += " MailAddress,";
+                strSQL += " PhoneNumber,";
+                strSQL += " FaxNumber,";
+                strSQL += " JapaneseSyllabary,";
+                strSQL += " StartDate,";
+                strSQL += " Note,";
+                strSQL += " labourKind,";
+                strSQL += " 0,";
+                strSQL += " NOW(),";
+                strSQL += " NOW()";
+                strSQL += " FROM SUBCONSTRREGIST";
+
+                strSQL += SourceSQL;
+                if (!SubDB.ExecuteNonQuery(strSQL, false))
+                {
+                    SubDB.rollback();
+                    MessageBox.Show("å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // æ–°è¦�ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
+                RegistRec.SourceCode = CompanyCode;
+
+                // æˆ�åŠŸæ™‚ã�¯ç™ºæ³¨è€…ç™»éŒ²ãƒ‡ãƒ¼ã‚¿ã�«ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+                strSQL = string.Format("UPDATE SUBCONSTRREGIST SET SOURCECODE = {0}", RegistRec.SourceCode);
+                strSQL += SourceSQL;
+                if (!RegistDB.ExecuteNonQuery(strSQL, false))
+                {
+                    SubDB.rollback();
+                    RegistDB.rollback();
+                    MessageBox.Show("ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
+        /// <summary>
+        /// å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
+        /// </summary>
+        private bool CreateSubConstrJobItem(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
+                string strSQL = "SELECT count(*) FROM SUBCONSTRJOBITEMREGIST";
+                strSQL += SourceSQL;
+                ArrayList arCnt = new ArrayList();
+                if (!SubDB.ExecuteReader(strSQL, ref arCnt, false)) return false;
+                if (arCnt.Count == 0) return false;
+                object[] Datacnt = (object[])arCnt[0];
+                if (CommonMotions.cnvInt(Datacnt[0]) == 0) return true;
+                
+                strSQL = "INSERT INTO SUBCONTRACTORJOBITEM";
+                strSQL += " SELECT";
+                strSQL += string.Format(" {0},", RegistRec.SourceCode);
+                strSQL += " ItemCode,";
+                strSQL += " DisplayOrder,";
+                strSQL += " NOW(),";
+                strSQL += " NOW()";
+                strSQL += " FROM SubConstrJobItemRegist";
+
+                strSQL += SourceSQL;
+                if (!SubDB.ExecuteNonQuery(strSQL, false))
+                {
+                    SubDB.rollback();
+                    MessageBox.Show("å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
+        /// <summary>
+        /// å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
+        /// </summary>
+        private bool CreateSubConstrJobLink(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
+        {
+            try
+            {
+                // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
+                string strSQL = "SELECT count(*) FROM SubConstrJobLinkRegist";
+                strSQL += SourceSQL;
+                ArrayList arCnt = new ArrayList();
+                if (!SubDB.ExecuteReader(strSQL, ref arCnt, false)) return false;
+                if (arCnt.Count == 0) return false;
+                object[] Datacnt = (object[])arCnt[0];
+                if (CommonMotions.cnvInt(Datacnt[0]) == 0) return true;
+
+                strSQL = "INSERT INTO SubContractorJobLink";
+                strSQL += " SELECT";
+                strSQL += string.Format(" {0},", RegistRec.SourceCode);
+                strSQL += " JobCategoryCode,";
+                strSQL += " DisplayOrder,";
+                strSQL += " NOW(),";
+                strSQL += " NOW()";
+                strSQL += " FROM SubConstrJobLinkRegist";
+
+                strSQL += SourceSQL;
+                if (!SubDB.ExecuteNonQuery(strSQL, false))
+                {
+                    SubDB.rollback();
+                    MessageBox.Show("å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã€�ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// <summary>
+        /// å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿æ—¢å­˜ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// </summary>
+        private bool UpdateSubConstr(IOMSubContractor SubDB, SubConstrRegist RegistRec)
+        {
+            try
+            {
+                string strSQL = "UPDATE SubContractorMaster";
+
+                strSQL += " SET";
+
+                strSQL += string.Format(" CompanyCode = {0}", RegistRec.SourceCode);
+                strSQL += string.Format(", CorporateStatusName = '{0}'", RegistRec.CorporateStatusName);
+                strSQL += string.Format(", CorporateStatusPoint = {0}", RegistRec.CorporateStatusPoint);
+                strSQL += string.Format(", CompanyName = '{0}'", RegistRec.CompanyName);
+                strSQL += string.Format(", CEOPositionName = '{0}'", RegistRec.CEOPositionName);
+                strSQL += string.Format(", CEOName = '{0}'", RegistRec.CEOName);
+                strSQL += string.Format(", ContactPersonName = '{0}'", RegistRec.ContactPersonName);
+                strSQL += string.Format(", ZipCode = '{0}'", RegistRec.ZipCode);
+                strSQL += string.Format(", Address1 = '{0}'", RegistRec.Address1);
+                strSQL += string.Format(", Address2 = '{0}'", RegistRec.Address2);
+                strSQL += string.Format(", Address3 = '{0}'", RegistRec.Address3);
+                strSQL += string.Format(", CellPhoneNumber = '{0}'", RegistRec.CellPhoneNumber);
+                strSQL += string.Format(", MailAddress = '{0}'", RegistRec.MailAddress);
+                strSQL += string.Format(", PhoneNumber = '{0}'", RegistRec.PhoneNumber);
+                strSQL += string.Format(", FaxNumber = '{0}'", RegistRec.FaxNumber);
+                strSQL += string.Format(", JapaneseSyllabary = '{0}'", RegistRec.JapaneseSyllabary);
+                strSQL += string.Format(", StartDate = STR_TO_DATE('{0}','%Y/%m/%d')", RegistRec.StartDate.ToShortDateString());
+                strSQL += string.Format(", Note = '{0}'", RegistRec.Note);
+                strSQL += string.Format(", labourKind = {0}", RegistRec.labourKind);
+
+                strSQL += ", UpdateDate = NOW()";
+
+                strSQL += SubDB.CreatePrimarykeyString(RegistRec.SourceCode);
+                if (!SubDB.ExecuteNonQuery(strSQL, false))
+                {
+                    SubDB.rollback();
+                    MessageBox.Show("å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿ã€�æ›´æ–°ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// <summary>
+        /// å�”åŠ›æ¥­è€…æ–½å·¥å·¥ç¨®ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// </summary>
+        private bool UpdateSubConstrJobItem(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
+        {
+            try
+            {
+                // ã�¾ã�šå‰Šé™¤ã�—ã�¦
+                string strSQL = "DELETE FROM SubContractorJobItem";
+                strSQL += string.Format(" WHERE CompanyCode = {0}", RegistRec.SourceCode);
+                SubDB.ExecuteNonQuery(strSQL, false);
+
+                // æ–°è¦�ä½œæˆ�
+                return CreateSubConstrJobItem(SubDB, RegistRec, SourceSQL);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// <summary>
+        /// å�”åŠ›æ¥­è€…è�·ç¨®ãƒªãƒ³ã‚¯ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// </summary>
+        private bool UpdateSubConstrJobLink(IOMSubContractor SubDB, SubConstrRegist RegistRec, string SourceSQL)
+        {
+            try
+            {
+                // ã�¾ã�šå‰Šé™¤ã�—ã�¦
+                string strSQL = "DELETE FROM SubContractorJobLink";
+                strSQL += string.Format(" WHERE CompanyCode = {0}", RegistRec.SourceCode);
+                SubDB.ExecuteNonQuery(strSQL, false);
+
+                // æ–°è¦�ä½œæˆ�
+                return CreateSubConstrJobLink(SubDB, RegistRec, SourceSQL);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+    }
+}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 238)
@@ -142,7 +142,7 @@
                             ClsApprovalPermission.SetPrimaryRecStatus(m_PersonCode, m_ApprovalCode, m_OrderDate, m_OrderNo, (int)CommonDefine.ApprovalStatus.Approval);
 
                             // æœ€çµ‚æ‰¿èª�ã�Œæˆ�ã�•ã‚Œã�Ÿå¾Œã�®å‡¦ç�†
-                            FinalUpdateSourceData();
+                            ApprovalNextProcess();
                         }
                         break;
                     default:
@@ -163,31 +163,6 @@
         }
         #endregion
 
-        #region ç™ºæ³¨è€…æ‰¿èª�å‡¦ç�†å¾Œæ›´æ–°
-        /// <summary>
-        /// ç™ºæ³¨è€…æ‰¿èª�å‡¦ç�†å¾Œæ›´æ–°
-        /// </summary>
-        private void OAPCostomerRegistApproval()
-        {
-            IOCostomerRegist crDB = new IOCostomerRegist();
-            try
-            {
-                // å�—ä»˜æ—¥
-                crDB.UpdateFeild(m_PersonCode, m_SearchDate, m_SearchSeqNo, (int)IOCostomerRegist.TableColumn.OrderDate, m_OrderDate);
-                // å�—ä»˜ç•ªå�·æ›¸è¾¼ã�¿
-                crDB.UpdateFeild(m_PersonCode, m_SearchDate, m_SearchSeqNo, (int)IOCostomerRegist.TableColumn.OrderNo, m_OrderNo);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                crDB.close(); crDB = null;
-            }
-        }
-        #endregion
-
         #region æ‰¿èª�ãƒ¬ã‚³ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
         /// <summary>
         /// æ‰¿èª�ãƒ¬ã‚³ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
@@ -805,6 +780,7 @@
 
         #endregion
 
+        #region ---------- >> ç”³è«‹å¾Œå‡¦ç�†
         #region ç”³è«‹å…ƒãƒ‡ãƒ¼ã‚¿ã�«å�—ä»˜ç•ªå�·ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// <summary>
         /// ç”³è«‹å…ƒãƒ‡ãƒ¼ã‚¿ã�«å�—ä»˜ç•ªå�·ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
@@ -848,6 +824,8 @@
                         break;
                 }
 
+                if (strSQL.ToString().Length == 0) return true;
+
                 if (!AppDB.ExecuteNonQuery(strSQL.ToString())) return false;
 
                 return true;
@@ -1095,8 +1073,9 @@
             }
         }
         #endregion
+        #endregion
 
-        // ----- æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‡¦ç�†ã€€â†“â†“
+        #region ---------->> æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‡¦ç�†
         #region æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆè¡¨ç¤ºå‡¦ç�†
         /// <summary>
         /// æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆè¡¨ç¤ºå‡¦ç�†
@@ -1427,6 +1406,6 @@
             }
         }
         #endregion
-        // ----- æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‡¦ç�†ã€€â†‘â†‘
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs	(nonexistent)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs	(revision 238)
@@ -0,0 +1,348 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.Linq;
+using System.Diagnostics;
+using System.Data.Common;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.Master;
+using ProcessManagement.Forms.SubForms;
+using ProcessManagement.Forms.ControlsAction;
+using ProcessManagement.Forms.CustomControls;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmApprovalScreen
+    {
+        #region ---------->> æ‰¿èª�å¾Œå‡¦ç�†
+        #region æ‰¿èª�å¾Œå‡¦ç�†
+        /// <summary>
+        /// æ‰¿èª�å¾Œå‡¦ç�†
+        /// </summary>
+        private void ApprovalNextProcess()
+        {
+            try
+            {
+                switch (m_ApprovalCode)
+                {
+                    case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval:
+                        // å·¥äº‹äºˆç®—æ›¸ã‚’æ‰¿èª�æ™‚ã�«å·¥äº‹è©³ç´°å�°å¸³ã‚’ä½œæˆ�ã�™ã‚‹
+                        // å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                        CaretaLedgerData();
+                        break;
+
+                    case (int)ClsExcute.ApprovalListNo.SafetyPatrol:
+                        // å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«æ‰¿èª�å¾Œå‡¦ç�†
+                        // è¡Œå‹•äºˆå®šè¿½åŠ ã€�æŽ²ç¤ºæ�¿è¡¨ç¤ºã�™ã‚‹ã€‚
+                        CreateSafetyPatrol();
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+        /// <summary>
+        /// å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+        /// å·¥äº‹äºˆç®—æ›¸ã‚’æ‰¿èª�æ™‚ã�«å·¥äº‹è©³ç´°å�°å¸³ã‚’ä½œæˆ�ã�™ã‚‹
+        /// </summary>
+        private bool CaretaLedgerData()
+        {
+            try
+            {
+                int Code1 = ClsExcute.AppovalList.First(x => x.Value.Equals("å·¥äº‹äºˆç®—æ›¸æ‰¿èª�")).Key;
+                // å·¥äº‹äºˆç®—æ›¸æ‰¿èª�ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (m_ApprovalCode != Code1) return true;
+
+                // ------ å�°å¸³çµ�å�ˆå‡¦ç�†ã�®ãƒ�ã‚§ãƒƒã‚¯
+                if (m_ConstrBaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
+                {   // ------ çµ�å�ˆã�•ã‚Œã�¦ã�„ã�ªã�„ãƒ‡ãƒ¼ã‚¿
+                    // ç´�ä»˜ã��ãƒ‡ãƒ¼ã‚¿ã�‹ã�©ã�†ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯
+                    if (m_ConstrBaseRec.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Tying)
+                    {   // ç´�ä»˜ã��ãƒ‡ãƒ¼ã‚¿ã�§ã�¯ã�ªã�„å ´å�ˆã�¯ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                        if (!MakingLedgerData()) return false;
+                    }
+                    else
+                    {   // ç´�ä»˜ã��ã�®ãƒ‡ãƒ¼ã‚¿ã�¯ãƒ‡ãƒ¼ã‚¿ï¼ˆè¡Œï¼‰ã‚’è¿½åŠ ã�™ã‚‹
+                        if (!AddingLedgerData()) return false;
+                    }
+                }
+                else
+                {   // ----- çµ�å�ˆã�•ã‚Œã�¦ã�„ã‚‹ãƒ‡ãƒ¼ã‚¿ï¼ˆçµ�å�ˆã�®è¦ªã�¯æ‰¿èª�å¯¾è±¡ã�®ãƒ‡ãƒ¼ã‚¿ã�¯ä½œæˆ�ã�•ã‚Œã�ªã�„ï¼‰
+                    if (!JoinDataCreate()) return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
+        /// <summary>
+        /// å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
+        /// </summary>
+        private bool MakingLedgerData()
+        {
+            try
+            {
+                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                if (!ClsChangeLedgerData.MakingLedgerData(m_ConstructionCode))
+                {
+                    MessageBox.Show("å·¥äº‹è©³ç´°å�°å¸³ä½œæˆ�ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å�°å¸³ä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
+        /// <summary>
+        /// å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
+        /// </summary>
+        private bool AddingLedgerData()
+        {
+            try
+            {
+                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                if (!ClsChangeLedgerData.AddingLedgerData(m_ConstructionCode))
+                {
+                    MessageBox.Show("å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å�°å¸³ä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹å�°å¸³è¿½åŠ 
+        /// <summary>
+        /// å·¥äº‹å�°å¸³è¿½åŠ 
+        /// </summary>
+        /// <returns></returns>
+        private bool JoinDataCreate()
+        {
+            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
+            IOConstructionLink LinkDB = new IOConstructionLink();
+            IOConstructionLedger LedgerDB = new IOConstructionLedger();
+            try
+            {
+                BaseDB.connect(); BaseDB.beginTran();
+                LinkDB.connect(); LinkDB.beginTran();
+                LedgerDB.connect(); LedgerDB.beginTran();
+
+                // çµ�å�ˆè¦ªãƒ‡ãƒ¼ã‚¿ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
+                string strGetPCode = string.Format(" WHERE FLUCTUATIONCODE = {0}", m_ConstructionCode);
+                strGetPCode += string.Format(" AND LINKTYPE = {0}", (int)CommonDefine.LinkDataType.JoinType);
+                ConstructionLink LinkRec = new ConstructionLink();
+                if (!LinkDB.SelectAction(strGetPCode, ref LinkRec, false)) return false;
+
+                // å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šå·¥æœŸã‚’å�–å¾—ã�™ã‚‹
+                string strLedger = LedgerDB.CreatePrimarykeyString(m_ConstructionCode);
+                ConstructionLedger LedgerRec = new ConstructionLedger();
+                if (!LedgerDB.SelectAction(strLedger, ref LedgerRec, false)) return false;
+
+                // å¥‘ç´„å·¥æœŸé–‹å§‹
+                if (LedgerRec.ConstructionStart > m_ConstrBaseRec.ConstructionPeriodStart)
+                {
+                    if (!BaseDB.UpdateFeild(m_ConstructionCode, (int)IOConstructionBaseInfo.TableColumn.ConstructionPeriodStart
+                                            , m_ConstrBaseRec.ConstructionPeriodStart, false)) return false;
+                }
+                // å¥‘ç´„å·¥æœŸå®Œäº†
+                if (LedgerRec.ConstructionEnd < m_ConstrBaseRec.ConstructionPeriodEnd)
+                {
+                    if (!BaseDB.UpdateFeild(m_ConstructionCode, (int)IOConstructionBaseInfo.TableColumn.ConstructionPeriodEnd
+                                            , m_ConstrBaseRec.ConstructionPeriodEnd, false)) return false;
+                }
+
+                List<int> DateCodeList = new List<int>();
+                DateCodeList.Add(m_ConstructionCode);
+
+                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
+                if (!ClsChangeLedgerData.MakeJoinForBudgetData(LinkRec.ConstructionCode, DateCodeList))
+                {
+                    BaseDB.rollback();
+                    LinkDB.rollback();
+                    LedgerDB.rollback();
+                    MessageBox.Show("çµ�å�ˆå·¥äº‹è©³ç´°å�°å¸³è¿½åŠ ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å�°å¸³ä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                BaseDB.commit();
+                LinkDB.commit();
+                LedgerDB.commit();
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                BaseDB.close(); BaseDB = null;
+                LinkDB.close(); LinkDB = null;
+                LedgerDB.close(); LedgerDB = null;
+            }
+        }
+        #endregion
+
+        #region è¡Œå‹•äºˆå®šè¿½åŠ ã€�æŽ²ç¤ºæ�¿è¡¨ç¤ºã�™ã‚‹ã€‚
+        /// <summary>
+        /// è¡Œå‹•äºˆå®šè¿½åŠ ã€�æŽ²ç¤ºæ�¿è¡¨ç¤ºã�™ã‚‹ã€‚
+        /// </summary>
+        private void CreateSafetyPatrol()
+        {
+            try
+            {
+                // æŽ²ç¤ºæ�¿ã�¸è¡¨ç¤ºã�™ã‚‹
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #endregion
+
+        #region ---------->> ç”³è«‹å¾Œå‡¦ç�†
+        #region ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’ä½œæˆ�ã�™ã‚‹
+        /// <summary>
+        /// ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’ä½œæˆ�ã�™ã‚‹
+        /// </summary>
+        private void CreatePurchaseOrderLink()
+        {
+            IOProcessApprovalDetail DetailDB = new IOProcessApprovalDetail();
+            try
+            {
+                DetailDB.connect(); DetailDB.beginTran();
+                for (int i = 0; i < m_PurchaseOrderSeqNo.Count; i++)
+                {
+                    // æ‰¿èª�æ˜Žç´°ãƒ¬ã‚³ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
+                    if (!CreateApprovalDetailData(DetailDB, m_PurchaseOrderSeqNo[i]))
+                    {
+                        DetailDB.rollback();
+                        break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DetailDB.commit();
+                DetailDB.close(); DetailDB = null;
+            }
+        }
+        #endregion
+
+        #region ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
+        /// <summary>
+        /// ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
+        /// </summary>
+        private void RemoveApprovalLinkDetail()
+        {
+            IOProcessApprovalDetail DetailDB = new IOProcessApprovalDetail();
+            try
+            {
+                DetailDB.connect(); DetailDB.beginTran();
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode, m_ApprovalCode, m_OrderNo));
+                DetailDB.DeleteAction(strSQL.ToString(), false);
+
+                DetailDB.commit();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DetailDB.close(); DetailDB = null;
+            }
+        }
+        #endregion
+
+        #region ç”³è«‹å…ƒãƒ‡ãƒ¼ã‚¿ã�«å�—ä»˜ç•ªå�·ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// <summary>
+        /// ç”³è«‹å…ƒãƒ‡ãƒ¼ã‚¿ã�«å�—ä»˜ç•ªå�·ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private bool SetApprovalOrderNo()
+        {
+            IOPersonApproval AppDB = new IOPersonApproval();
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+
+                switch (m_ApprovalCode)
+                {
+                    case (int)ClsExcute.ApprovalListNo.SafetyPatrol:
+                        strSQL.AppendFormat("UPDATE sfpdata SET ORDERNO = {0}", m_OrderNo);
+                        strSQL.AppendFormat(" WHERE ConstructionCode = {0}", m_ConstructionCode);
+                        strSQL.AppendFormat(" AND DataCount = {0}", m_DataCount);
+                        break;
+                    default:
+                        break;
+                }
+                if (strSQL.ToString().Length == 0) return true;
+
+                if (!AppDB.ExecuteNonQuery(strSQL.ToString())) return false;
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                AppDB.close(); AppDB = null;
+            }
+        }
+        #endregion
+        #endregion
+    }
+}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 238)
@@ -126,6 +126,11 @@
         /// </summary>
         private List<int> m_PurchaseOrderSeqNo = new List<int>();
         /// <summary>
+        /// ƒf�[ƒ^Ž}”Ô
+        /// </summary>
+        private int m_DataCount = 0;
+
+        /// <summary>
         /// ŠY“–�HŽ–Šî–{�î•ñ
         /// </summary>
         private ConstructionBaseInfo m_ConstrBaseRec = new ConstructionBaseInfo();
@@ -168,6 +173,14 @@
             get { return m_PurchaseOrderSeqNo; }
             set { m_PurchaseOrderSeqNo = value; }
         }
+        /// <summary>
+        /// ƒf�[ƒ^Ž}”Ô
+        /// </summary>
+        public int DataCount
+        {
+            get { return m_DataCount; }
+            set { m_DataCount = value; }
+        }
 
         #endregion
 
@@ -539,6 +552,9 @@
                     CreatePurchaseOrderLink();
                 }
 
+                // �\�¿Œ³ƒf�[ƒ^‚ÉŽó•t”Ô�†‚ðƒZƒbƒg‚·‚é
+                SetApprovalOrderNo();
+
                 // ƒRƒ�ƒ“ƒg‚ªŽc‚Á‚Ä‚¢‚é�ê�‡‚Í�í�œ
                 RemoveCommentData();
 
@@ -712,6 +728,9 @@
                 case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval:                   // 7:‹cŽ–˜^�³”F
                     iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.Proceedings;
                     break;
+                case (int)ClsExcute.ApprovalListNo.SafetyPatrol:                            // 13:ˆÀ‘Sƒpƒgƒ��[ƒ‹
+                    iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SafetyPatrol;
+                    break;
             }
             if (iNextProcessNo == 0) return;
 
@@ -740,6 +759,8 @@
                     ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PetitionPerson);
                     ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true);        // ----- �V‹K�ì�¬ƒtƒ‰ƒO
                     break;
+                default:
+                    break;
             }
 
             m_bTargetFlg = true;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 238)
@@ -274,8 +274,8 @@
                                                                             m_OrderNo,
                                                                             statusCode)) return false;
                             
-                            // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚‹
-                            CaretaLedgerData();
+                            // æ‰¿èª�å®Œäº†å¾Œã�«å‡¦ç�†ã�Œã�‚ã‚‹ã‚‚ã�®ã�¯å‡¦ç�†ã�™ã‚‹
+                            ApprovalNextProcess();
                         }
                         break;
                     default:
@@ -1049,230 +1049,7 @@
         }
         #endregion
 
-        #region å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// <summary>
-        /// å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// å·¥äº‹äºˆç®—æ›¸ã‚’æ‰¿èª�æ™‚ã�«å·¥äº‹è©³ç´°å�°å¸³ã‚’ä½œæˆ�ã�™ã‚‹
-        /// </summary>
-        private bool CaretaLedgerData()
-        {
-            try
-            {
-                int Code1 = ClsExcute.AppovalList.First(x => x.Value.Equals("å·¥äº‹äºˆç®—æ›¸æ‰¿èª�")).Key;
-                // å·¥äº‹äºˆç®—æ›¸æ‰¿èª�ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (m_ApprovalCode != Code1) return true;
-
-                // ------ å�°å¸³çµ�å�ˆå‡¦ç�†ã�®ãƒ�ã‚§ãƒƒã‚¯
-                if (m_ConstrBaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
-                {   // ------ çµ�å�ˆã�•ã‚Œã�¦ã�„ã�ªã�„ãƒ‡ãƒ¼ã‚¿
-                    // ç´�ä»˜ã��ãƒ‡ãƒ¼ã‚¿ã�‹ã�©ã�†ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯
-                    if (m_ConstrBaseRec.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Tying)
-                    {   // ç´�ä»˜ã��ãƒ‡ãƒ¼ã‚¿ã�§ã�¯ã�ªã�„å ´å�ˆã�¯ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                        if (!MakingLedgerData()) return false;
-                    }
-                    else
-                    {   // ç´�ä»˜ã��ã�®ãƒ‡ãƒ¼ã‚¿ã�¯ãƒ‡ãƒ¼ã‚¿ï¼ˆè¡Œï¼‰ã‚’è¿½åŠ ã�™ã‚‹
-                        if (!AddingLedgerData()) return false;
-                    }
-                }
-                else
-                {   // ----- çµ�å�ˆã�•ã‚Œã�¦ã�„ã‚‹ãƒ‡ãƒ¼ã‚¿ï¼ˆçµ�å�ˆã�®è¦ªã�¯æ‰¿èª�å¯¾è±¡ã�®ãƒ‡ãƒ¼ã‚¿ã�¯ä½œæˆ�ã�•ã‚Œã�ªã�„ï¼‰
-                    if (!JoinDataCreate()) return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
-        /// <summary>
-        /// å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
-        /// </summary>
-        private bool MakingLedgerData()
-        {
-            try
-            {
-                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                if (!ClsChangeLedgerData.MakingLedgerData(m_ConstructionCode))
-                {
-                    MessageBox.Show("å·¥äº‹è©³ç´°å�°å¸³ä½œæˆ�ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å�°å¸³ä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
-        /// <summary>
-        /// å·¥äº‹å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
-        /// </summary>
-        private bool AddingLedgerData()
-        {
-            try
-            {
-                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                if (!ClsChangeLedgerData.AddingLedgerData(m_ConstructionCode))
-                {
-                    MessageBox.Show("å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å�°å¸³ä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹å�°å¸³è¿½åŠ 
-        /// <summary>
-        /// å·¥äº‹å�°å¸³è¿½åŠ 
-        /// </summary>
-        /// <returns></returns>
-        private bool JoinDataCreate()
-        {
-            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
-            IOConstructionLink LinkDB = new IOConstructionLink();
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            try
-            {
-                BaseDB.connect(); BaseDB.beginTran();
-                LinkDB.connect(); LinkDB.beginTran();
-                LedgerDB.connect(); LedgerDB.beginTran();
-
-                // çµ�å�ˆè¦ªãƒ‡ãƒ¼ã‚¿ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
-                string strGetPCode = string.Format(" WHERE FLUCTUATIONCODE = {0}", m_ConstructionCode);
-                strGetPCode += string.Format(" AND LINKTYPE = {0}", (int)CommonDefine.LinkDataType.JoinType);
-                ConstructionLink LinkRec = new ConstructionLink();
-                if (!LinkDB.SelectAction(strGetPCode, ref LinkRec, false)) return false;
-
-                // å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šå·¥æœŸã‚’å�–å¾—ã�™ã‚‹
-                string strLedger = LedgerDB.CreatePrimarykeyString(m_ConstructionCode);
-                ConstructionLedger LedgerRec = new ConstructionLedger();
-                if (!LedgerDB.SelectAction(strLedger, ref LedgerRec, false)) return false;
-
-                // å¥‘ç´„å·¥æœŸé–‹å§‹
-                if (LedgerRec.ConstructionStart > m_ConstrBaseRec.ConstructionPeriodStart)
-                {
-                    if (!BaseDB.UpdateFeild(m_ConstructionCode, (int)IOConstructionBaseInfo.TableColumn.ConstructionPeriodStart
-                                            , m_ConstrBaseRec.ConstructionPeriodStart, false)) return false;
-                }
-                // å¥‘ç´„å·¥æœŸå®Œäº†
-                if (LedgerRec.ConstructionEnd < m_ConstrBaseRec.ConstructionPeriodEnd)
-                {
-                    if (!BaseDB.UpdateFeild(m_ConstructionCode, (int)IOConstructionBaseInfo.TableColumn.ConstructionPeriodEnd
-                                            , m_ConstrBaseRec.ConstructionPeriodEnd, false)) return false;
-                }
-
-                List<int> DateCodeList = new List<int>();
-                DateCodeList.Add(m_ConstructionCode);
-
-                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿è¿½åŠ 
-                if (!ClsChangeLedgerData.MakeJoinForBudgetData(LinkRec.ConstructionCode, DateCodeList))
-                {
-                    BaseDB.rollback();
-                    LinkDB.rollback();
-                    LedgerDB.rollback();
-                    MessageBox.Show("çµ�å�ˆå·¥äº‹è©³ç´°å�°å¸³è¿½åŠ ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å�°å¸³ä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                BaseDB.commit();
-                LinkDB.commit();
-                LedgerDB.commit();
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                BaseDB.close(); BaseDB = null;
-                LinkDB.close(); LinkDB = null;
-                LedgerDB.close(); LedgerDB = null;
-            }
-        }
-        #endregion
-
-        #region æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’ä½œæˆ�ã�™ã‚‹
-        /// <summary>
-        /// æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’ä½œæˆ�ã�™ã‚‹
-        /// </summary>
-        private void CreatePurchaseOrderLink()
-        {
-            IOProcessApprovalDetail DetailDB = new IOProcessApprovalDetail();
-            try
-            {
-                DetailDB.connect(); DetailDB.beginTran();
-                for (int i = 0; i < m_PurchaseOrderSeqNo.Count; i++)
-                {
-                    // æ‰¿èª�æ˜Žç´°ãƒ¬ã‚³ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!CreateApprovalDetailData(DetailDB, m_PurchaseOrderSeqNo[i]))
-                    {
-                        DetailDB.rollback();
-                        break;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                DetailDB.commit();
-                DetailDB.close(); DetailDB = null;
-            }
-        }
-        #endregion
-
-        #region æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
-        /// <summary>
-        /// æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
-        /// </summary>
-        private void RemoveApprovalLinkDetail()
-        {
-            IOProcessApprovalDetail DetailDB = new IOProcessApprovalDetail();
-            try
-            {
-                DetailDB.connect(); DetailDB.beginTran();
-
-                StringBuilder strSQL = new StringBuilder();
-                strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode, m_ApprovalCode, m_OrderNo));
-                DetailDB.DeleteAction(strSQL.ToString(), false);
-
-                DetailDB.commit();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                DetailDB.close(); DetailDB = null;
-            }
-        }
-        #endregion
-
-        // ----- æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‡¦ç�†ã€€â†“â†“
+        #region ---------->> æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‡¦ç�†
         #region æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆè¡¨ç¤ºå‡¦ç�†
         /// <summary>
         /// æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆè¡¨ç¤ºå‡¦ç�†
@@ -1600,6 +1377,6 @@
             }
         }
         #endregion
-        // ----- æŒ‡ç¤ºé€£çµ¡ã‚³ãƒ¡ãƒ³ãƒˆå‡¦ç�†ã€€â†‘â†‘
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 238)
@@ -147,9 +147,14 @@
                 // ‘I‘ð�HŽ–”Ô�†ƒZƒbƒg
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_ConstructionCode);
                 // ’�•¶�‘ˆó�ü‚ÍŽó•t”Ô�†‚ðƒZƒbƒg‚·‚é
-                if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint)
+                switch (m_ExecuteFlg)
                 {
-                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_OrderNo);
+                    case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:
+                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_OrderNo);
+                        break;
+
+                    default:
+                        break;
                 }
             }
             catch (Exception ex)
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/FrmSafetyPatrol.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/FrmSafetyPatrol.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/FrmSafetyPatrol.cs	(revision 238)
@@ -43,8 +43,47 @@
         }
         #endregion
 
+        #region ƒOƒŠƒbƒh‚Ìƒ�ƒCƒ“ƒJƒ‰ƒ€•�
+        /// <summary>
+        /// ƒOƒŠƒbƒh‚Ìƒ�ƒCƒ“ƒJƒ‰ƒ€•�
+        /// </summary>
+        private int s_GridMainColWidth = 630;
         #endregion
 
+        #region ƒf�[ƒ^‘I‘ðƒtƒ‰ƒO
+        /// <summary>
+        /// ƒf�[ƒ^‘I‘ðƒtƒ‰ƒO
+        /// </summary>
+        private enum DataAction
+        {
+            /// <summary>
+            /// ‘I‘ð–³‚µ
+            /// </summary>
+            NonSelData = 0,
+            /// <summary>
+            /// ‘O
+            /// </summary>
+            PreviousData,
+            /// <summary>
+            /// ŽŸ
+            /// </summary>
+            NextData,
+            /// <summary>
+            /// “úŽžŽw’è
+            /// </summary>
+            SelectDate,
+        }
+        #endregion
+
+        #region Ž©ƒvƒ�ƒZƒX�³”F�ˆ—�–¼�Ì
+        /// <summary>
+        /// Ž©ƒvƒ�ƒZƒX�³”F�ˆ—�–¼�Ì
+        /// </summary>
+        private string s_MyApproval = ClsExcute.AppovalList[(int)ClsExcute.ApprovalListNo.SafetyPatrol];
+        #endregion
+
+        #endregion
+
         #region •Ï�”
         #region ’S“–ŽÒƒR�[ƒh
         /// <summary>
@@ -67,6 +106,20 @@
         private bool m_EditLock = false;
         #endregion
 
+        #region �\�¿Žó•t”Ô�†
+        /// <summary>
+        /// �\�¿Žó•t”Ô�†
+        /// </summary>
+        private int m_OrderNo = 0;
+        #endregion
+
+        #region ƒCƒxƒ“ƒgƒ�ƒbƒNƒtƒ‰ƒO
+        /// <summary>
+        /// ƒCƒxƒ“ƒgƒ�ƒbƒNƒtƒ‰ƒO
+        /// </summary>
+        private bool m_EventLock = true;
+        #endregion
+
         #region ŠY“–�HŽ–Šî–{�î•ñ
         /// <summary>
         /// ŠY“–�HŽ–Šî–{�î•ñ
@@ -94,7 +147,14 @@
         private bool m_ParentEnd = false;
         // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         #endregion
+
+        #region �I—¹ƒ{ƒ^ƒ“‰Ÿ‰ºƒtƒ‰ƒO
+        /// <summary>
+        /// �I—¹ƒ{ƒ^ƒ“‰Ÿ‰ºƒtƒ‰ƒO
+        /// </summary>
+        private bool m_CloseingProcessOn = true;
         #endregion
+        #endregion
 
         #region ƒvƒ�ƒpƒeƒB
         #region ’S“–ŽÒƒR�[ƒh
@@ -130,6 +190,17 @@
         }
         #endregion
 
+        #region �\�¿Žó•t”Ô�†
+        /// <summary>
+        /// �\�¿Žó•t”Ô�†
+        /// </summary>
+        public int OrderNo
+        {
+            get { return m_OrderNo; }
+            set { m_OrderNo = value; }
+        }
+        #endregion
+
         #region ‹¤’Ê�ˆ—��Ý’è
         // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         /// <summary>
@@ -191,10 +262,40 @@
             }
 
             // ‘Oƒvƒ�ƒZƒX‚É–ß‚é
-            ClsExcute.BackProcess();
+            if (m_CloseingProcessOn) ClsExcute.BackProcess();
         }
         #endregion
 
+        #region “o˜^ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// <summary>
+        /// “o˜^ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnDataEntry_Click(object sender, EventArgs e)
+        {
+            if (!DataEntryProcess()) return;
+
+            CommonMotions.EntryEndMessage("ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^");
+            this.Close();
+        }
+        #endregion
+
+        #region �í�œƒ{ƒ^ƒ“‰Ÿ‰º
+        /// <summary>
+        /// �í�œƒ{ƒ^ƒ“‰Ÿ‰º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnDataDelete_Click(object sender, EventArgs e)
+        {
+            if (!DataRemoveProcess()) return;
+
+            CommonMotions.RemoveEndMessage("ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^");
+            this.Close();
+        }
+        #endregion
+
         #region �I—¹ƒ{ƒ^ƒ“
         /// <summary>
         /// �I—¹ƒ{ƒ^ƒ“ƒNƒŠƒbƒN
@@ -229,23 +330,6 @@
             // �‰Šú•\Ž¦
             InitDataLoad();
 
-            // �\�¿�E�³”F•\Ž¦�ˆ—�
-            InitApprovalDisplay();
-
-            // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
-            bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-            if (bApproval)
-            {
-                // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
-                int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
-                // �³”F‘Î�ÛƒR�[ƒh‚ðŽæ“¾‚·‚é
-                int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
-                // ˆÄŒ�‚É‘Î‚µ‚Ä�\�¿‚ª‚³‚ê‚Ä‚¢‚é‚©‚ðŠm”F‚·‚é
-                bool Pettition = ClsApprovalPermission.CheckProcessPetition(m_ConstructionCode, ApprovalCode, CommonDefine.s_Default_OrderNo);
-                // ƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚©‚ðŠm”F‚·‚é
-                bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
-            }
-
             // ŽQ�Æƒ‚�[ƒh
             if (m_EditLock)
             {
@@ -255,6 +339,7 @@
 
             // •Ï�Xƒtƒ‰ƒOOFF
             m_DataChangeFlg = false;
+            m_EventLock = false;
         }
         #endregion
 
@@ -281,98 +366,39 @@
         }
         #endregion
 
-        #region �\�¿ƒ{ƒ^ƒ“‰Ÿ‰º
+        #region –¢�\�¿ƒ{ƒ^ƒ“‰Ÿ‰º
         /// <summary>
-        /// �\�¿ƒ{ƒ^ƒ“‰Ÿ‰º
+        /// –¢�\�¿ƒ{ƒ^ƒ“‰Ÿ‰º
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void btnPetition_Click(object sender, EventArgs e)
         {
-            IODailyDataConstruction ConstDB = new IODailyDataConstruction();
-            try
-            {
-                // �ÏŽZ—\ŽZƒf�[ƒ^‚ª–³‚¢�ê�‡‚Í“o˜^‚·‚é
-                DateTime dtWrk = CommonMotions.cnvDate(dtPatrolDate.Text);
-                string strSQL = ConstDB.CreatePrimarykeyString(m_PersonCode, dtWrk, m_ConstructionCode);
-                DailyDataConstruction DataRec = new DailyDataConstruction();
-                if (!ConstDB.SelectAction(strSQL, ref DataRec)) m_DataChangeFlg = true;
+            // –¢�\�¿ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+            PetitionButtonProc();
 
-                // ƒf�[ƒ^•Ï�X—LŽž‚Íƒf�[ƒ^“o˜^
-                if (m_DataChangeFlg)
-                {
-                    if (!DataEntryProcess()) return;
-                }
+            m_CloseingProcessOn = false;
 
-                // ‹N“®”Ô�†
-                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
-
-                // �HŽ–”Ô�†
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
-
-                // �³”F‹@”\”Ô�†
-                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
-
-                // Žó•t”Ô�†
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
-
-                // �eƒtƒH�[ƒ€�I—¹
-                m_ParentEnd = true;
-
-                // Ž©ƒtƒH�[ƒ€�I—¹
-                this.Close();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                ConstDB.close(); ConstDB = null;
-            }
+            // Ž©ƒtƒH�[ƒ€�I—¹
+            this.Close();
         }
         #endregion
 
-        #region �³”Fƒ{ƒ^ƒ“‰Ÿ‰º
+        #region –¢�³”Fƒ{ƒ^ƒ“‰Ÿ‰º
         /// <summary>
-        /// �³”Fƒ{ƒ^ƒ“‰Ÿ‰º
+        /// –¢�³”Fƒ{ƒ^ƒ“‰Ÿ‰º
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void btnApproval_Click(object sender, EventArgs e)
         {
-            try
-            {
-                // ƒf�[ƒ^•Ï�X—LŽž‚Íƒf�[ƒ^“o˜^
-                if (m_DataChangeFlg)
-                {
-                    if (!DataEntryProcess()) return;
-                }
+            // –¢�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+            ApprovalButtonProc();
 
-                // ‹N“®”Ô�†
-                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
+            m_CloseingProcessOn = false;
 
-                // �HŽ–”Ô�†
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
-
-                // �³”F‹@”\”Ô�†
-                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
-
-                // Žó•t”Ô�†
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
-
-                // �eƒtƒH�[ƒ€�I—¹
-                m_ParentEnd = true;
-
-                // Ž©ƒtƒH�[ƒ€�I—¹
-                this.Close();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
+            // Ž©ƒtƒH�[ƒ€�I—¹
+            this.Close();
         }
         #endregion
 
@@ -384,43 +410,16 @@
         /// <param name="e"></param>
         private void btnOnApproval_Click(object sender, EventArgs e)
         {
-            FrmApprovalScreen frm = new FrmApprovalScreen();
-            try
-            {
-                if (MessageBox.Show("ˆÄŒ�‚ð�³”F‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "�³”FŠm”F"
-                                , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
+            // �³”Fƒpƒlƒ‹�ipnlApproval�j�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+            OnApprovalButtonProc();
 
-                // �HŽ–”Ô�†
-                frm.ConstructionCode = m_ConstructionCode;
-                // �³”F‹@”\”Ô�†ƒZƒbƒg
-                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
-                // Žó•t”Ô�†
-                frm.OrderNo = CommonDefine.s_Default_OrderNo;
+            m_CloseingProcessOn = false;
 
-                // �\�¿�E�³”FƒŒƒR�[ƒh�X�V
-                if (!frm.ApprovalDataUpDate((int)CommonDefine.ApprovalStatus.Approval, false))
-                {
-                    MessageBox.Show("�³”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B", "�³”FƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
+            // ƒ�ƒjƒ…�[‚Ö–ß‚é
+            ClsExcute.ClearProcess();
 
-                // �eƒtƒH�[ƒ€�I—¹
-                m_ParentEnd = true;
-
-                // ƒ�ƒjƒ…�[‚Ö–ß‚é
-                ClsExcute.ClearProcess();
-
-                // ‰æ–ÊƒNƒ��[ƒY
-                this.Close();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                frm.Dispose(); frm = null;
-            }
+            // ‰æ–ÊƒNƒ��[ƒY
+            this.Close();
         }
         #endregion
 
@@ -432,43 +431,16 @@
         /// <param name="e"></param>
         private void btnOnHold_Click(object sender, EventArgs e)
         {
-            FrmApprovalScreen frm = new FrmApprovalScreen();
-            try
-            {
-                if (MessageBox.Show("ˆÄŒ�‚ð•Û—¯‚Æ‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "•Û—¯Šm”F"
-                                , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
+            // �³”Fƒpƒlƒ‹�ipnlApproval�j•Û—¯ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+            OnHoldButtonProc();
 
-                // �HŽ–”Ô�†
-                frm.ConstructionCode = m_ConstructionCode;
-                // �³”F‹@”\”Ô�†ƒZƒbƒg
-                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
-                // Žó•t”Ô�†
-                frm.OrderNo = CommonDefine.s_Default_OrderNo;
+            m_CloseingProcessOn = false;
 
-                // �\�¿�E�³”FƒŒƒR�[ƒh�X�V
-                if (!frm.ApprovalDataUpDate((int)CommonDefine.ApprovalStatus.Pending, false))
-                {
-                    MessageBox.Show("•Û—¯‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B", "•Û—¯ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
+            // ƒ�ƒjƒ…�[‚Ö–ß‚é
+            ClsExcute.ClearProcess();
 
-                // �eƒtƒH�[ƒ€�I—¹
-                m_ParentEnd = true;
-
-                // ƒ�ƒjƒ…�[‚Ö–ß‚é
-                ClsExcute.ClearProcess();
-
-                // ‰æ–ÊƒNƒ��[ƒY
-                this.Close();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                frm.Dispose(); frm = null;
-            }
+            // ‰æ–ÊƒNƒ��[ƒY
+            this.Close();
         }
         #endregion
 
@@ -480,43 +452,83 @@
         /// <param name="e"></param>
         private void btnNotApproval_Click(object sender, EventArgs e)
         {
-            FrmApprovalScreen frm = new FrmApprovalScreen();
-            try
-            {
-                if (MessageBox.Show("ˆÄŒ�‚ð•s�³”F‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "•s�³”FŠm”F"
-                                , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
+            // �³”Fƒpƒlƒ‹�ipnlApproval�j•s�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+            NotApprovalButtonProc();
 
-                // �HŽ–”Ô�†
-                frm.ConstructionCode = m_ConstructionCode;
-                // �³”F‹@”\”Ô�†ƒZƒbƒg
-                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
-                // Žó•t”Ô�†
-                frm.OrderNo = CommonDefine.s_Default_OrderNo;
+            m_CloseingProcessOn = false;
 
-                // �\�¿�E�³”FƒŒƒR�[ƒh�X�V
-                if (!frm.ApprovalDataUpDate((int)CommonDefine.ApprovalStatus.NotApproval, false))
-                {
-                    MessageBox.Show("•s�³”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B", "•s�³”FƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
+            // ƒ�ƒjƒ…�[‚Ö–ß‚é
+            ClsExcute.ClearProcess();
 
-                // �eƒtƒH�[ƒ€�I—¹
-                m_ParentEnd = true;
+            // ‰æ–ÊƒNƒ��[ƒY
+            this.Close();
+        }
+        #endregion
 
-                // ƒ�ƒjƒ…�[‚Ö–ß‚é
-                ClsExcute.ClearProcess();
-                // ‰æ–ÊƒNƒ��[ƒY
-                this.Close();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                frm.Dispose(); frm = null;
-            }
+        #region ‘O‚Ìƒf�[ƒ^
+        /// <summary>
+        /// ‘O‚Ìƒf�[ƒ^
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnProv_Click(object sender, EventArgs e)
+        {
+            InitDataLoad((int)DataAction.PreviousData);
         }
         #endregion
+
+        #region ŽŸ‚Ìƒf�[ƒ^
+        /// <summary>
+        /// ŽŸ‚Ìƒf�[ƒ^
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnNext_Click(object sender, EventArgs e)
+        {
+            InitDataLoad((int)DataAction.NextData);
+        }
+        #endregion
+
+        #region —v�¿“ú•Ï�X
+        /// <summary>
+        /// —v�¿“ú•Ï�X
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dtPatrolDate_ValueChanged(object sender, EventArgs e)
+        {
+            if (m_EventLock) return;
+
+            InitDataLoad((int)DataAction.SelectDate);
+        }
+        #endregion
+
+        #region ŽžŠÔ•Ï�X
+        /// <summary>
+        /// ŽžŠÔ•Ï�X
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void cmbTimeHour_TextChanged(object sender, EventArgs e)
+        {
+            if (m_EventLock) return;
+
+            InitDataLoad((int)DataAction.SelectDate);
+        }
+        #endregion
+
+        #region •ª•Ï�X
+        /// <summary>
+        /// •ª•Ï�X
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void cmbTimeMinutes_TextChanged(object sender, EventArgs e)
+        {
+            if (m_EventLock) return;
+
+            InitDataLoad((int)DataAction.SelectDate);
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/FrmSafetyPatrol.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/FrmSafetyPatrol.designer.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/FrmSafetyPatrol.designer.cs	(revision 238)
@@ -28,17 +28,16 @@
         /// </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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.lblLabel01 = new System.Windows.Forms.Label();
             this.lblConstrCode = new System.Windows.Forms.Label();
             this.lblConstructionCodelabel = new System.Windows.Forms.Label();
-            this.dtPatrolDate = new System.Windows.Forms.DateTimePicker();
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.lblLabel02 = new System.Windows.Forms.Label();
@@ -54,7 +53,18 @@
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.cmbTime = new System.Windows.Forms.ComboBox();
+            this.lblDataCount = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.cmbTimeMinutes = new System.Windows.Forms.ComboBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.cmbTimeHour = new System.Windows.Forms.ComboBox();
+            this.dtPatrolDate = new System.Windows.Forms.DateTimePicker();
+            this.label6 = new System.Windows.Forms.Label();
+            this.btnDataEntry = new System.Windows.Forms.Button();
+            this.btnProv = new System.Windows.Forms.Button();
+            this.btnNext = new System.Windows.Forms.Button();
+            this.btnDataDelete = new System.Windows.Forms.Button();
+            this.lblOrderNo = new System.Windows.Forms.Label();
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -72,7 +82,7 @@
             this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnEnd.BackColor = System.Drawing.Color.Blue;
             this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(655, 554);
+            this.btnEnd.Location = new System.Drawing.Point(655, 578);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
             this.btnEnd.TabIndex = 5;
@@ -113,7 +123,7 @@
             this.lblConstrCode.ForeColor = System.Drawing.Color.Black;
             this.lblConstrCode.Location = new System.Drawing.Point(10, 5);
             this.lblConstrCode.Name = "lblConstrCode";
-            this.lblConstrCode.Size = new System.Drawing.Size(110, 25);
+            this.lblConstrCode.Size = new System.Drawing.Size(50, 25);
             this.lblConstrCode.TabIndex = 16;
             this.lblConstrCode.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.lblConstrCode.Visible = false;
@@ -130,15 +140,6 @@
             this.lblConstructionCodelabel.Text = "å·¥äº‹å��ç§°";
             this.lblConstructionCodelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dtPatrolDate
-            // 
-            this.dtPatrolDate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.dtPatrolDate.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.dtPatrolDate.Location = new System.Drawing.Point(127, 4);
-            this.dtPatrolDate.Name = "dtPatrolDate";
-            this.dtPatrolDate.Size = new System.Drawing.Size(180, 26);
-            this.dtPatrolDate.TabIndex = 1;
-            // 
             // label4
             // 
             this.label4.BackColor = System.Drawing.Color.Black;
@@ -149,7 +150,7 @@
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(114, 25);
             this.label4.TabIndex = 117;
-            this.label4.Text = "ç”³è«‹æ—¥æ™‚";
+            this.label4.Text = "è¦� è«‹ æ—¥";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label5
@@ -300,7 +301,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.textBox1.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.textBox1.Location = new System.Drawing.Point(127, 36);
+            this.textBox1.Location = new System.Drawing.Point(127, 63);
             this.textBox1.MaxLength = 300;
             this.textBox1.Multiline = true;
             this.textBox1.Name = "textBox1";
@@ -309,10 +310,11 @@
             // 
             // label2
             // 
-            this.label2.BackColor = System.Drawing.Color.LightSkyBlue;
+            this.label2.BackColor = System.Drawing.Color.Black;
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.label2.Location = new System.Drawing.Point(5, 36);
+            this.label2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label2.ForeColor = System.Drawing.Color.LightSkyBlue;
+            this.label2.Location = new System.Drawing.Point(5, 63);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(114, 25);
             this.label2.TabIndex = 122;
@@ -323,29 +325,178 @@
             // 
             this.panel2.BackColor = System.Drawing.Color.DarkGreen;
             this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel2.Controls.Add(this.lblOrderNo);
+            this.panel2.Controls.Add(this.lblDataCount);
+            this.panel2.Controls.Add(this.label7);
+            this.panel2.Controls.Add(this.cmbTimeMinutes);
+            this.panel2.Controls.Add(this.label3);
             this.panel2.Controls.Add(this.textBox1);
             this.panel2.Controls.Add(this.label2);
-            this.panel2.Controls.Add(this.cmbTime);
+            this.panel2.Controls.Add(this.cmbTimeHour);
             this.panel2.Controls.Add(this.pnlApproval);
             this.panel2.Controls.Add(this.label4);
             this.panel2.Controls.Add(this.pnlApprovalButton);
             this.panel2.Controls.Add(this.dtPatrolDate);
+            this.panel2.Controls.Add(this.label6);
             this.panel2.Location = new System.Drawing.Point(5, 110);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(770, 110);
+            this.panel2.Size = new System.Drawing.Size(770, 134);
             this.panel2.TabIndex = 18;
             // 
-            // cmbTime
+            // lblDataCount
             // 
-            this.cmbTime.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbTime.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbTime.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cmbTime.FormattingEnabled = true;
-            this.cmbTime.Location = new System.Drawing.Point(315, 3);
-            this.cmbTime.Name = "cmbTime";
-            this.cmbTime.Size = new System.Drawing.Size(120, 28);
-            this.cmbTime.TabIndex = 2;
+            this.lblDataCount.BackColor = System.Drawing.Color.White;
+            this.lblDataCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblDataCount.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblDataCount.ForeColor = System.Drawing.Color.Black;
+            this.lblDataCount.Location = new System.Drawing.Point(313, 4);
+            this.lblDataCount.Name = "lblDataCount";
+            this.lblDataCount.Size = new System.Drawing.Size(50, 25);
+            this.lblDataCount.TabIndex = 128;
+            this.lblDataCount.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.lblDataCount.Visible = false;
             // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label7.ForeColor = System.Drawing.Color.Yellow;
+            this.label7.Location = new System.Drawing.Point(252, 34);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(41, 27);
+            this.label7.TabIndex = 127;
+            this.label7.Text = "ï½ž";
+            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cmbTimeMinutes
+            // 
+            this.cmbTimeMinutes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTimeMinutes.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbTimeMinutes.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmbTimeMinutes.FormattingEnabled = true;
+            this.cmbTimeMinutes.Location = new System.Drawing.Point(202, 32);
+            this.cmbTimeMinutes.Name = "cmbTimeMinutes";
+            this.cmbTimeMinutes.Size = new System.Drawing.Size(50, 28);
+            this.cmbTimeMinutes.TabIndex = 126;
+            this.cmbTimeMinutes.TextChanged += new System.EventHandler(this.cmbTimeMinutes_TextChanged);
+            // 
+            // label3
+            // 
+            this.label3.BackColor = System.Drawing.Color.Black;
+            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.LightSkyBlue;
+            this.label3.Location = new System.Drawing.Point(5, 34);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(114, 25);
+            this.label3.TabIndex = 124;
+            this.label3.Text = "è¦� è«‹ æ™‚ é–“";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cmbTimeHour
+            // 
+            this.cmbTimeHour.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTimeHour.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbTimeHour.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmbTimeHour.FormattingEnabled = true;
+            this.cmbTimeHour.Location = new System.Drawing.Point(128, 32);
+            this.cmbTimeHour.Name = "cmbTimeHour";
+            this.cmbTimeHour.Size = new System.Drawing.Size(50, 28);
+            this.cmbTimeHour.TabIndex = 2;
+            this.cmbTimeHour.TextChanged += new System.EventHandler(this.cmbTimeHour_TextChanged);
+            // 
+            // dtPatrolDate
+            // 
+            this.dtPatrolDate.BackColor = System.Drawing.SystemColors.Window;
+            this.dtPatrolDate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.dtPatrolDate.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.dtPatrolDate.Location = new System.Drawing.Point(127, 4);
+            this.dtPatrolDate.Name = "dtPatrolDate";
+            this.dtPatrolDate.Size = new System.Drawing.Size(180, 26);
+            this.dtPatrolDate.TabIndex = 1;
+            this.dtPatrolDate.ValueChanged += new System.EventHandler(this.dtPatrolDate_ValueChanged);
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label6.ForeColor = System.Drawing.Color.Yellow;
+            this.label6.Location = new System.Drawing.Point(170, 31);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(41, 27);
+            this.label6.TabIndex = 125;
+            this.label6.Text = "ï¼š";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // btnDataEntry
+            // 
+            this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDataEntry.BackColor = System.Drawing.Color.Green;
+            this.btnDataEntry.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDataEntry.ForeColor = System.Drawing.Color.White;
+            this.btnDataEntry.Location = new System.Drawing.Point(415, 578);
+            this.btnDataEntry.Name = "btnDataEntry";
+            this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
+            this.btnDataEntry.TabIndex = 19;
+            this.btnDataEntry.Text = "ç™»ã€€éŒ²";
+            this.btnDataEntry.UseVisualStyleBackColor = false;
+            this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
+            // 
+            // btnProv
+            // 
+            this.btnProv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnProv.BackColor = System.Drawing.Color.LimeGreen;
+            this.btnProv.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnProv.Location = new System.Drawing.Point(121, 578);
+            this.btnProv.Name = "btnProv";
+            this.btnProv.Size = new System.Drawing.Size(120, 30);
+            this.btnProv.TabIndex = 41;
+            this.btnProv.TabStop = false;
+            this.btnProv.Text = "ï¼œå‰�ç”³è«‹";
+            this.btnProv.UseVisualStyleBackColor = false;
+            this.btnProv.Click += new System.EventHandler(this.btnProv_Click);
+            // 
+            // btnNext
+            // 
+            this.btnNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnNext.BackColor = System.Drawing.Color.LimeGreen;
+            this.btnNext.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnNext.Location = new System.Drawing.Point(241, 578);
+            this.btnNext.Name = "btnNext";
+            this.btnNext.Size = new System.Drawing.Size(120, 30);
+            this.btnNext.TabIndex = 40;
+            this.btnNext.TabStop = false;
+            this.btnNext.Text = "æ¬¡ç”³è«‹ï¼ž";
+            this.btnNext.UseVisualStyleBackColor = false;
+            this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
+            // 
+            // btnDataDelete
+            // 
+            this.btnDataDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDataDelete.BackColor = System.Drawing.Color.Red;
+            this.btnDataDelete.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDataDelete.ForeColor = System.Drawing.Color.White;
+            this.btnDataDelete.Location = new System.Drawing.Point(535, 578);
+            this.btnDataDelete.Name = "btnDataDelete";
+            this.btnDataDelete.Size = new System.Drawing.Size(120, 30);
+            this.btnDataDelete.TabIndex = 42;
+            this.btnDataDelete.Text = "å‰Šã€€é™¤";
+            this.btnDataDelete.UseVisualStyleBackColor = false;
+            this.btnDataDelete.Click += new System.EventHandler(this.btnDataDelete_Click);
+            // 
+            // lblOrderNo
+            // 
+            this.lblOrderNo.BackColor = System.Drawing.Color.White;
+            this.lblOrderNo.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblOrderNo.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblOrderNo.ForeColor = System.Drawing.Color.Black;
+            this.lblOrderNo.Location = new System.Drawing.Point(369, 4);
+            this.lblOrderNo.Name = "lblOrderNo";
+            this.lblOrderNo.Size = new System.Drawing.Size(50, 25);
+            this.lblOrderNo.TabIndex = 128;
+            this.lblOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.lblOrderNo.Visible = false;
+            // 
             // dgvMaster
             // 
             this.dgvMaster.AllowUserToAddRows = false;
@@ -352,18 +503,18 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvMaster.ColumnHeadersHeight = 24;
             this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -371,16 +522,16 @@
             this.Column3,
             this.Column4,
             this.Column2});
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle10;
             this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvMaster.Location = new System.Drawing.Point(5, 224);
+            this.dgvMaster.Location = new System.Drawing.Point(5, 248);
             this.dgvMaster.MultiSelect = false;
             this.dgvMaster.Name = "dgvMaster";
             this.dgvMaster.RowHeadersVisible = false;
@@ -393,8 +544,8 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "â„–";
             this.Column1.Name = "Column1";
@@ -415,8 +566,8 @@
             // 
             // Column4
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle9;
             this.Column4.Frozen = true;
             this.Column4.HeaderText = "å�”åŠ›æ¥­è€…å��";
             this.Column4.Name = "Column4";
@@ -437,7 +588,11 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.SeaGreen;
-            this.ClientSize = new System.Drawing.Size(780, 587);
+            this.ClientSize = new System.Drawing.Size(780, 611);
+            this.Controls.Add(this.btnDataDelete);
+            this.Controls.Add(this.btnProv);
+            this.Controls.Add(this.btnNext);
+            this.Controls.Add(this.btnDataEntry);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.label1);
@@ -489,10 +644,20 @@
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.ComboBox cmbTime;
+        private System.Windows.Forms.ComboBox cmbTimeHour;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.ComboBox cmbTimeMinutes;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Button btnDataEntry;
+        private System.Windows.Forms.Button btnProv;
+        private System.Windows.Forms.Button btnNext;
+        private System.Windows.Forms.Label lblDataCount;
+        private System.Windows.Forms.Button btnDataDelete;
+        private System.Windows.Forms.Label lblOrderNo;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs	(revision 238)
@@ -56,14 +56,24 @@
         /// <summary>
         /// �‰ŠúŽžƒf�[ƒ^Žæ“¾
         /// </summary>
-        private void InitDataLoad()
+        private void InitDataLoad(int bInit = (int)DataAction.NonSelData)
         {
             try
             {
+                m_EventLock = true;
+
                 // ƒwƒbƒ_�[ƒZƒbƒg
-                SetHeaderData();
+                if (!SetHeaderData()) return;
+                // –¾�×ƒwƒbƒ_•\Ž¦�ˆ—�
+                SetDetailHeaderData(bInit);
                 // ƒOƒŠƒbƒh•\Ž¦
                 SetGridData();
+
+                // �³”F•\Ž¦�§Œä�ˆ—�
+                DispApprovalControl();
+                
+                m_EventLock = false;
+                m_DataChangeFlg = false;
             }
             catch (Exception ex)
             {
@@ -72,6 +82,119 @@
         }
         #endregion
 
+        #region –¾�×ƒwƒbƒ_�\ƒNƒŠƒA
+        /// <summary>
+        /// –¾�×ƒwƒbƒ_�\ƒNƒŠƒA
+        /// </summary>
+        private void ClrDetailHeader()
+        {
+            try
+            {
+                dtPatrolDate.Value = DateTime.Today.AddDays(1);
+                cmbTimeHour.SelectedValue = 10;
+                cmbTimeMinutes.SelectedValue = 0;
+                lblDataCount.Text = "0";
+                lblOrderNo.Text = "0";
+                textBox1.Text = string.Empty;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region –¾�×ƒwƒbƒ_•\Ž¦�ˆ—�
+        /// <summary>
+        /// –¾�×ƒwƒbƒ_•\Ž¦�ˆ—�
+        /// </summary>
+        private bool SetDetailHeaderData(int bInit = (int)DataAction.NonSelData)
+        {
+            IOSFPData sfpDB = new IOSFPData();
+            DataGridView dgv = dgvMaster;
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+
+                strSQL.Append("select");
+                strSQL.Append(" A.ConstructionCode");
+                strSQL.Append(", DATE_FORMAT(A.RequestDate, '%Y/%m/%d %H:%i:%s')");
+                strSQL.Append(", A.PersonCode");
+                strSQL.Append(", A.DataCount");
+                strSQL.Append(", A.StringValue");
+                strSQL.Append(", App.ApprovalStatus");
+                strSQL.Append(", App.PersonCode");
+                strSQL.Append(", B.PersonName");
+                strSQL.Append(", A.OrderNo");
+                strSQL.Append(" from sfpdata as A");
+                strSQL.Append(" LEFT JOIN processapproval as App");
+                strSQL.Append(" ON App.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.SafetyPatrol);
+                strSQL.Append(" AND App.OrderNo = A.OrderNo");
+                strSQL.Append(" AND App.SeqNo = 1");
+                strSQL.Append(" LEFT JOIN personinchargemaster as B on B.PersonCode = A.PersonCode");
+                strSQL.AppendFormat(" where A.ConstructionCode = {0}", m_ConstructionCode);
+
+                switch (bInit)
+                {
+                    case (int)DataAction.PreviousData:
+                        strSQL.AppendFormat(" AND A.RequestDate < STR_TO_DATE('{0}', '%Y/%m/%d %H:%i:%s')", GetSelectDateTime());
+                        strSQL.Append(" ORDER BY A.RequestDate DESC");
+                        break;
+                    case (int)DataAction.NextData:
+                        strSQL.AppendFormat(" AND A.RequestDate > STR_TO_DATE('{0}', '%Y/%m/%d %H:%i:%s')", GetSelectDateTime());
+                        strSQL.Append(" ORDER BY A.RequestDate ASC");
+                        break;
+                    case (int)DataAction.SelectDate:
+                        strSQL.AppendFormat(" AND A.RequestDate = STR_TO_DATE('{0}', '%Y/%m/%d %H:%i:%s')", GetSelectDateTime());
+                        break;
+                    default:
+                        if (m_OrderNo != 0) strSQL.AppendFormat(" AND A.OrderNo = {0}", m_OrderNo);
+                        strSQL.Append(" ORDER BY A.RequestDate DESC");
+                        break;
+                }
+
+                ArrayList arList = new ArrayList();
+                if (!sfpDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
+                if (arList.Count == 0)
+                {
+                    if (ActiveControl == btnProv || ActiveControl == btnNext)
+                    {
+                        MessageBox.Show("ƒf�[ƒ^‚ª‚ ‚è‚Ü‚¹‚ñ�B", "ƒf�[ƒ^–³", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    textBox1.Text = string.Empty;
+                    lblDataCount.Text = string.Format("{0}", (sfpDB.CreateNextDataCount(m_ConstructionCode) + 1));
+                    return false;
+                }
+                // –¾�×ƒwƒbƒ_ƒNƒŠƒA
+                ClrDetailHeader();
+
+                object[] obj0Rec = (object[])arList[0];
+                if (CommonMotions.cnvDate(obj0Rec[1]) != DateTime.MinValue)
+                {
+                    dtPatrolDate.Value = CommonMotions.cnvDate(obj0Rec[1]);
+                    cmbTimeHour.SelectedValue = CommonMotions.cnvDate(obj0Rec[1]).Hour;
+                    cmbTimeMinutes.SelectedValue = CommonMotions.cnvDate(obj0Rec[1]).Minute;
+                    lblDataCount.Text = CommonMotions.cnvInt(obj0Rec[3]).ToString();
+                    lblOrderNo.Text = CommonMotions.cnvInt(obj0Rec[8]).ToString();
+                    textBox1.Text = CommonMotions.cnvString(obj0Rec[4]);
+                    if (CommonMotions.cnvString(obj0Rec[7]).Length != 0) lblLabel02.Text = CommonMotions.cnvString(obj0Rec[7]);
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                sfpDB.close(); sfpDB = null;
+            }
+        }
+        #endregion
+
         #region ƒOƒŠƒbƒhƒf�[ƒ^•\Ž¦
         /// <summary>
         /// ƒOƒŠƒbƒhƒf�[ƒ^•\Ž¦
@@ -78,10 +201,11 @@
         /// </summary>
         private void SetGridData()
         {
-            IOSFPData sfpDB = new IOSFPData();
+            IOSFPDataDetail sfpDB = new IOSFPDataDetail();
             DataGridView dgv = dgvMaster;
             try
             {
+                dgv.Rows.Clear();
                 StringBuilder strSQL = new StringBuilder();
 
                 strSQL.Append("select");
@@ -88,21 +212,22 @@
                 strSQL.Append(" A.ConstructionCode");
                 strSQL.Append(", A.CompanyCode");
                 strSQL.Append(", SubCon.CompanyName");
-                strSQL.Append(", B.PettionDate");
+                strSQL.Append(", DATE_FORMAT(B.RequestDate, '%Y/%m/%d %H:%i:%s')");
                 strSQL.Append(", B.PersonCode");
                 strSQL.Append(", C.CompanyCode");
                 strSQL.Append(", App.ApprovalStatus");
                 strSQL.Append(", App.PersonCode");
-                strSQL.Append(" from");
-                strSQL.Append(" constructionledgerdetail as A");
+                strSQL.Append(" from constructionledgerdetail as A");
                 strSQL.Append(" LEFT JOIN subcontractormaster as SubCon");
                 strSQL.Append(" ON SubCon.CompanyCode = A.CompanyCode");
                 strSQL.Append(" LEFT JOIN sfpdata as B");
                 strSQL.Append(" ON B.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat(" AND B.RequestDate = STR_TO_DATE('{0}', '%Y/%m/%d %H:%i:%s')", GetSelectDateTime());
+                strSQL.AppendFormat(" AND B.DataCount = {0}", CommonMotions.cnvInt(lblDataCount.Text));
                 strSQL.Append(" LEFT JOIN sfpdatadetail as C");
                 strSQL.Append(" ON C.ConstructionCode = B.ConstructionCode");
-                strSQL.Append(" AND C.PettionDate = B.PettionDate");
-                strSQL.Append(" AND C.PersonCode = C.PersonCode");
+                strSQL.Append(" AND C.DataCount = B.DataCount");
+                strSQL.Append(" AND C.SeqNo = C.SeqNo");
                 strSQL.Append(" AND C.CompanyCode = A.CompanyCode");
                 strSQL.Append(" LEFT JOIN processapproval as App");
                 strSQL.Append(" ON App.ConstructionCode = A.ConstructionCode");
@@ -112,11 +237,24 @@
                 strSQL.Append(" where");
                 strSQL.AppendFormat(" A.ConstructionCode = {0}", m_ConstructionCode);
                 strSQL.AppendFormat(" AND A.CompanyType = {0}", (int)CommonDefine.CodeDataType.Subconstractor);
+                strSQL.Append(" GROUP BY A.CompanyCode");
                 strSQL.Append(" ORDER BY A.LineCount");
 
                 ArrayList arList = new ArrayList();
                 sfpDB.ExecuteReader(strSQL.ToString(), ref arList);
 
+                object[] obj0Rec = (object[])arList[0];
+                if (CommonMotions.cnvDate(obj0Rec[3]) == DateTime.MinValue)
+                {
+                    dtPatrolDate.Value = DateTime.Today.AddDays(1);
+                }
+                else
+                {
+                    dtPatrolDate.Value = CommonMotions.cnvDate(obj0Rec[3]);
+                    cmbTimeHour.Text = CommonMotions.cnvDate(obj0Rec[3]).Hour.ToString("00");
+                    cmbTimeMinutes.Text = CommonMotions.cnvDate(obj0Rec[3]).Minute.ToString("00");
+                }
+
                 int ino = 1;
                 bool bChk = false;
                 foreach (object[] objRec in arList)
@@ -128,11 +266,6 @@
                                 CommonMotions.cnvString(objRec[2]),
                                 bChk);
                 }
-                if (dgv.RowCount <= 15)
-                {
-                    DataGridViewColumn CurCol = dgv.Columns[2];
-                    CurCol.Width = 646;
-                }
             }
             catch (Exception ex)
             {
@@ -141,8 +274,16 @@
             finally
             {
                 sfpDB.close(); sfpDB = null;
+
+                DataGridViewColumn CurCol = dgv.Columns[2];
+                CurCol.Width = s_GridMainColWidth;
+                if (dgv.RowCount <= 15)
+                {   // •\Ž¦‰ºŒÀ‚æ‚è�¬‚³‚¢�ê�‡‚ÍƒOƒŠƒbƒh•�‚ðƒXƒNƒ��[ƒ‹•ª‘å‚«‚­‚·‚é
+                    CurCol.Width += (new VScrollBar().Width);
+                }
+
                 if (dgv.RowCount < 15)
-                {
+                {   // �s‚ª‘«‚è‚È‚¢�ê�‡‚Ì�ˆ—�
                     for (int i = 15 - dgv.RowCount; i > 0; i--)
                     {
                         dgv.Rows.Add(string.Empty, string.Empty, string.Empty, false);
@@ -157,7 +298,7 @@
         /// ƒwƒbƒ_�[ƒZƒbƒg
         /// </summary>
         /// <param name="objRec"></param>
-        private void SetHeaderData()
+        private bool SetHeaderData()
         {
             IOConstructionBaseInfoDetail DetailDB = new IOConstructionBaseInfoDetail();
             try
@@ -166,18 +307,26 @@
                 strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode,
                                                             (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName));
                 ConstructionBaseInfoDetail DetailRec = new ConstructionBaseInfoDetail();
-                DetailDB.SelectAction(strSQL.ToString(), ref DetailRec);
+                if (!DetailDB.SelectAction(strSQL.ToString(), ref DetailRec))
+                {
+                    MessageBox.Show("ƒf�[ƒ^“Ç�ž‚ÝƒGƒ‰�[", "ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
 
                 ToolTip HeaderToolTip = new ToolTip();
 
+                lblConstrCode.Text = m_ConstructionCode.ToString();
                 lblLabel01.Text = DetailRec.DetailString;
                 HeaderToolTip.SetToolTip(lblLabel01, lblLabel01.Text);
                 lblLabel02.Text = CommonMotions.LoginUserData.PersonName;
                 HeaderToolTip.SetToolTip(lblLabel02, lblLabel02.Text);
+
+                return true;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
             }
             finally
             {
@@ -194,23 +343,38 @@
         {
             try
             {
-                cmbTime.DataSource = null;
-                cmbTime.Items.Clear();
-                cmbTime.Text = "";
+                cmbTimeHour.DataSource = null;
+                cmbTimeHour.Items.Clear();
+                cmbTimeHour.Text = "";
 
-                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
-                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
+                List<KeyValuePair<int, string>> HourDataList = new List<KeyValuePair<int, string>>();
+                for (int i = 0; i < 24; i ++)
+                {
+                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(i, string.Format("{0}", i.ToString("00")));
 
-                for (int i = 0; i < 25; i += 2)
+                    HourDataList.Add(keyval);
+                }
+
+                // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
+                ComboBoxAction.InitDataSetCombBox(cmbTimeHour, HourDataList);
+                cmbTimeHour.SelectedValue = 10;
+
+                cmbTimeMinutes.DataSource = null;
+                cmbTimeMinutes.Items.Clear();
+                cmbTimeMinutes.Text = "";
+
+                List<KeyValuePair<int, string>> MinutesDataList = new List<KeyValuePair<int, string>>();
+                for (int i = 0; i < 60; i += 10)
                 {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(i * 100, string.Format("    {0}:00  �`", i));
+                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(i, string.Format("{0}", i.ToString("00")));
 
-                    ConstructionDataList.Add(keyval);
+                    MinutesDataList.Add(keyval);
                 }
 
                 // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-                ComboBoxAction.InitDataSetCombBox(cmbTime, ConstructionDataList);
-
+                ComboBoxAction.InitDataSetCombBox(cmbTimeMinutes, MinutesDataList);
+                cmbTimeMinutes.SelectedValue = 0;
+                
                 return;
             }
             catch (Exception ex)
@@ -227,9 +391,34 @@
         /// <returns></returns>
         private bool DataEntryProcess()
         {
+            IOSFPData sfpDB = new IOSFPData();
+            IOSFPDataDetail sfpdDB = new IOSFPDataDetail();
             try
             {
+                // ƒf�[ƒ^ƒ`ƒFƒbƒN
+                if (!DispFeildCheck()) return false;
 
+                sfpDB.connect(); sfpDB.beginTran();
+                sfpdDB.connect(); sfpdDB.beginTran();
+
+                // ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^“o˜^
+                if (!SFPDataEntry(sfpDB))
+                {
+                    sfpDB.rollback();
+                    sfpdDB.rollback();
+                    MessageBox.Show("ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^“o˜^ƒGƒ‰�[�B", "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^“o˜^
+                if (!SFPDetailDataEntry(sfpdDB))
+                {
+                    sfpDB.rollback();
+                    sfpdDB.rollback();
+                    MessageBox.Show("ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^“o˜^ƒGƒ‰�[�B", "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
                 return true;
             }
             catch (Exception ex)
@@ -239,10 +428,299 @@
             }
             finally
             {
+                sfpDB.commit();
+                sfpdDB.commit();
+
+                sfpDB.close(); sfpDB = null;
+                sfpdDB.close(); sfpdDB = null;
             }
         }
         #endregion
 
+        #region ‘I‘ð“úŽžŽæ“¾�ˆ—�
+        /// <summary>
+        /// ‘I‘ð“úŽžŽæ“¾�ˆ—�
+        /// </summary>
+        /// <returns></returns>
+        private DateTime GetSelectDateTime()
+        {
+            try
+            {
+                DateTime SelDate = new DateTime(dtPatrolDate.Value.Year
+                                                , dtPatrolDate.Value.Month
+                                                , dtPatrolDate.Value.Day
+                                                , CommonMotions.cnvInt(cmbTimeHour.SelectedValue)
+                                                , CommonMotions.cnvInt(cmbTimeMinutes.SelectedValue)
+                                                , 0);
+                return SelDate;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return DateTime.Now;
+            }
+
+        }
+        #endregion
+
+        #region ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^“o˜^�ˆ—�
+        /// <summary>
+        /// ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^“o˜^�ˆ—�
+        /// </summary>
+        /// <param name="sfpDB"></param>
+        /// <returns></returns>
+        private bool SFPDataEntry(IOSFPData sfpDB)
+        {
+            try
+            {
+                // ‘I‘ð“úŽžŽæ“¾
+                DateTime SelDate = GetSelectDateTime();
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(sfpDB.CreatePrimarykeyString(m_ConstructionCode, CommonMotions.cnvInt(lblDataCount.Text)));
+                SFPData sfpRec = new SFPData();
+             
+                sfpDB.DeleteAction(strSQL.ToString(), false);
+
+                sfpRec.ConstructionCode = m_ConstructionCode;
+                sfpRec.DataCount = CommonMotions.cnvInt(lblDataCount.Text);
+                sfpRec.RequestDate = SelDate;
+                sfpRec.PersonCode = m_PersonCode;
+                sfpRec.StringValue = textBox1.Text;
+
+                if (!sfpDB.InsertAction(sfpRec, false))
+                {
+                    MessageBox.Show("ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^“o˜^ƒGƒ‰�[‚Å‚·�B", "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error); 
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^“o˜^�ˆ—�
+        /// <summary>
+        /// ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^“o˜^�ˆ—�
+        /// </summary>
+        /// <param name="sfpdDB"></param>
+        /// <returns></returns>
+        private bool SFPDetailDataEntry(IOSFPDataDetail sfpdDB)
+        {
+            try
+            {
+
+                // ‘I‘ð“úŽžŽæ“¾
+                DateTime SelDate = GetSelectDateTime();
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(sfpdDB.CreatePrimarykeyString(m_ConstructionCode, CommonMotions.cnvInt(lblDataCount.Text)));
+                sfpdDB.DeleteAction(strSQL.ToString(), false);
+                
+                DataGridView dgv = dgvMaster;
+                int ino = 1;
+                SFPDataDetail sfpdRec = new SFPDataDetail();
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.SubCnstrCode].Value) == 0) continue;
+                    if ((bool)CurRow.Cells[(int)GridColumn.ChkVal].Value == false) continue;
+
+                    sfpdRec.ConstructionCode = m_ConstructionCode;
+                    sfpdRec.DataCount = CommonMotions.cnvInt(lblDataCount.Text);
+                    sfpdRec.SeqNo = ino++;
+                    sfpdRec.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.SubCnstrCode].Value);
+                    if (!sfpdDB.InsertAction(sfpdRec, false))
+                    {
+                        MessageBox.Show("ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^“o˜^ƒGƒ‰�[‚Å‚·�B", "“o˜^ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region ƒf�[ƒ^ƒ`ƒFƒbƒN
+        /// <summary>
+        /// ƒf�[ƒ^ƒ`ƒFƒbƒN
+        /// </summary>
+        /// <returns></returns>
+        private bool DispFeildCheck()
+        {
+            try
+            {
+                CommonMotions.chgBackColor(textBox1, true);
+                CommonMotions.chgBackColor(dtPatrolDate, true);
+                CommonMotions.chgBackColor(cmbTimeHour, true);
+                CommonMotions.chgBackColor(cmbTimeMinutes, true);
+
+                if (dtPatrolDate.Value.Date <= DateTime.Today.Date)
+                {
+                    CommonMotions.chgBackColor(dtPatrolDate, false);
+                    MessageBox.Show("–{“úˆÈ‘O‚Í�\�¿‚Å‚«‚Ü‚¹‚ñ�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                
+                if (cmbTimeHour.Text.Length == 0 || cmbTimeMinutes.Text.Length == 0)
+                {
+                    CommonMotions.chgBackColor(cmbTimeHour, false);
+                    CommonMotions.chgBackColor(cmbTimeMinutes, false);
+                    MessageBox.Show("ŽžŠÔ‚ª�Ý’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                if (textBox1.Text.Length > 300)
+                {
+                    CommonMotions.chgBackColor(textBox1, false);
+                    MessageBox.Show("ƒRƒ�ƒ“ƒg“ü—Í‚ª’·‚·‚¬‚Ü‚·�B", "“ü—ÍƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region ƒf�[ƒ^�í�œ�ˆ—�
+        /// <summary>
+        /// ƒf�[ƒ^�í�œ�ˆ—�
+        /// </summary>
+        /// <returns></returns>
+        private bool DataRemoveProcess()
+        {
+            IOSFPData sfpDB = new IOSFPData();
+            IOSFPDataDetail sfpdDB = new IOSFPDataDetail();
+            IOProcessApproval AppDB = new IOProcessApproval();
+            try
+            {
+
+                if (MessageBox.Show("•\Ž¦’†‚Ìƒf�[ƒ^‚ð�í�œ‚µ‚Ü‚·�B", "�í�œŠm”F"
+                        , MessageBoxButtons.YesNo, MessageBoxIcon.Information) != DialogResult.Yes) return false;
+
+                if (MessageBox.Show("�u‚Í‚¢(Y)�v‚ð‘I‘ð‚·‚é‚Æ•\Ž¦’†‚ÌˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^‚Í�í�œ‚³‚ê‚Ü‚·�I�I\n–{“–‚É‚æ‚ë‚µ‚¢‚Å‚·‚©�H", "�í�œŠm”F"
+                        , MessageBoxButtons.YesNo, MessageBoxIcon.Information) != DialogResult.Yes) return false;
+
+                sfpDB.connect(); sfpDB.beginTran();
+                sfpdDB.connect(); sfpdDB.beginTran();
+                AppDB.connect(); AppDB.beginTran();
+
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(sfpDB.CreatePrimarykeyString(m_ConstructionCode, CommonMotions.cnvInt(lblDataCount.Text)));
+
+                // ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^�í�œ
+                if (!sfpDB.DeleteAction(strSQL.ToString(), false))
+                {
+                    sfpDB.rollback();
+                    MessageBox.Show("ˆÀ‘Sƒpƒgƒ��[ƒ‹ƒf�[ƒ^�í�œƒGƒ‰�[�B", "�í�œƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^�í�œ
+                List<SFPDataDetail> DetailList = new List<SFPDataDetail>();
+                if (sfpdDB.SelectAction(strSQL.ToString(), ref DetailList, false) && DetailList.Count > 0)
+                {
+                    if (!sfpdDB.DeleteAction(strSQL.ToString(), false))
+                    {
+                        sfpDB.rollback();
+                        sfpdDB.rollback();
+                        MessageBox.Show("ˆÀ‘Sƒpƒgƒ��[ƒ‹–¾�×ƒf�[ƒ^�í�œƒGƒ‰�[�B", "�í�œƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        return false;
+                    }
+                }
+
+                // �³”Fƒf�[ƒ^�í�œ
+                int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                strSQL.Clear();
+                strSQL.Append(AppDB.CreatePrimarykeyString(m_ConstructionCode, ApprovalCode, CommonMotions.cnvInt(lblOrderNo.Text)));
+                List<ProcessApproval> AppList = new List<ProcessApproval>();
+                if (AppDB.SelectAction(strSQL.ToString(), ref AppList, false) && AppList.Count > 0)
+                {
+                    if (!AppDB.DeleteAction(strSQL.ToString(), false))
+                    {
+                        sfpDB.rollback();
+                        sfpdDB.rollback();
+                        AppDB.rollback();
+                        MessageBox.Show("�³”Fƒf�[ƒ^�í�œƒGƒ‰�[�B", "�í�œƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                sfpDB.commit();
+                sfpdDB.commit();
+                AppDB.commit();
+
+                sfpDB.close(); sfpDB = null;
+                sfpdDB.close(); sfpdDB = null;
+                AppDB.close(); AppDB = null;
+            }
+        }
+        #endregion
+
+        #region �³”F�ˆ—�•\Ž¦�§Œä
+        /// <summary>
+        /// �³”F�ˆ—�•\Ž¦�§Œä
+        /// </summary>
+        private void DispApprovalControl()
+        {
+            try
+            {
+                pnlApprovalButton.Visible = false;
+
+                // �\�¿�E�³”F•\Ž¦�ˆ—�
+                InitApprovalDisplay();
+
+                // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
+                bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
+                if (bApproval)
+                {
+                    // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
+                    int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
+                    // �³”F‘Î�ÛƒR�[ƒh‚ðŽæ“¾‚·‚é
+                    int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                    // ˆÄŒ�‚É‘Î‚µ‚Ä�\�¿‚ª‚³‚ê‚Ä‚¢‚é‚©‚ðŠm”F‚·‚é
+                    bool Pettition = ClsApprovalPermission.CheckProcessPetition(m_ConstructionCode, ApprovalCode, CommonMotions.cnvInt(lblOrderNo.Text));
+                    // ƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚©‚ðŠm”F‚·‚é
+                    bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
+                    // �\�¿’†‚Åƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚Ì�ê�‡‚Í�³”Fƒ{ƒ^ƒ“‚ð•\Ž¦‚·‚é
+                    if (Pettition && Approvaler)
+                    {
+                        pnlApprovalButton.Visible = true;
+                    }
+                    // ‘S‚Ä‚ÌƒRƒ“ƒgƒ��[ƒ‹ƒ�ƒbƒN
+                    SeeModeLock();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽž�\�¿�E�³”F•\Ž¦�ˆ—�
         /// <summary>
         /// �‰ŠúŽž�\�¿�E�³”F•\Ž¦�ˆ—�
@@ -252,7 +730,7 @@
             try
             {
                 // �³”FƒR�[ƒhŽæ“¾
-                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
+                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
 
                 // ‹N“®Œ³‚ÌƒŠƒXƒg‚É�³”F‰æ–Ê‚ª‚ ‚ê‚Î•\Ž¦‚µ‚È‚¢
                 if (ClsApprovalPermission.ExceApprovalScreen())
@@ -265,10 +743,13 @@
                 lblApprovalCount.Visible = false;
 
                 // ----- �‰ŠúŽž‚Í�\�¿ƒ{ƒ^ƒ“‚ÌƒTƒCƒY‚ð�Å‘å‚É‚·‚é
+                btnPetition.Text = CommonDefine.PetitionButtonString[0];
+                btnPetition.ForeColor = Color.Red;
                 btnPetition.Size = new Size(250, btnPetition.Size.Height);
+                btnPetition.Enabled = true;
 
                 // ----- �HŽ–ƒR�[ƒh�E�³”F‹@”\”Ô�†Žæ“¾�i�\�¿ƒŒƒR�[ƒh‚ª‚È‚¨�ê�‡‚Í–¢�\�¿�j
-                if (!ClsApprovalPermission.CheckProcessPetition(m_ConstructionCode, iApprovalCode, CommonDefine.s_Default_OrderNo)) return;
+                if (!ClsApprovalPermission.CheckProcessPetition(m_ConstructionCode, iApprovalCode, CommonMotions.cnvInt(lblOrderNo.Text))) return;
 
                 // ----- �\�¿�Ï‚Ì�ê�‡
                 // �\�¿ƒ{ƒ^ƒ“‚Ì•\Ž¦
@@ -281,7 +762,7 @@
                 btnApproval.Visible = true;
 
                 // ----- �³”F�Ï‚Ì�ê�‡
-                if (ClsApprovalPermission.CheckProcessApproval(m_ConstructionCode, iApprovalCode, CommonDefine.s_Default_OrderNo))
+                if (ClsApprovalPermission.CheckProcessApproval(m_ConstructionCode, iApprovalCode, CommonMotions.cnvInt(lblOrderNo.Text)))
                 {
                     btnApproval.Text = CommonDefine.ApprovalButtonString[1];
                     btnApproval.ForeColor = Color.Black;
@@ -313,13 +794,12 @@
                 lblApprovalCount.Text = "";
 
                 // �HŽ–ƒR�[ƒh�E�³”F‹@”\”Ô�†Žæ“¾
-                int iConstructionCode = m_ConstructionBaseInfo.ConstructionCode;
-                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("ˆÀ‘Sƒpƒgƒ��[ƒ‹�³”F")).Key;
+                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
                 // ’S“–•”��Žæ“¾
-                int DepartmentCode = ClsApprovalPermission.GetFromConstrAndAppTheDep(m_ConstructionBaseInfo.ConstructionCode, iApprovalCode, CommonDefine.s_Default_OrderNo);
+                int DepartmentCode = ClsApprovalPermission.GetFromConstrAndAppTheDep(m_ConstructionCode, iApprovalCode, CommonMotions.cnvInt(lblOrderNo.Text));
 
                 // �³”Fƒf�[ƒ^Žæ“¾
-                int ApprovalCount = ClsApprovalPermission.GetProcessApprovalDataCount(iConstructionCode, iApprovalCode, CommonDefine.s_Default_OrderNo);
+                int ApprovalCount = ClsApprovalPermission.GetProcessApprovalDataCount(m_ConstructionCode, iApprovalCode, CommonMotions.cnvInt(lblOrderNo.Text));
 
                 // �³”FŒo˜Hƒ}ƒXƒ^Žæ“¾
                 int MasterCount = ClsApprovalPermission.GetApprovalMasterCount(iApprovalCode, DepartmentCode);
@@ -343,7 +823,13 @@
         {
             try
             {
+                dtPatrolDate.Enabled = false;
+                cmbTimeHour.Enabled = false;
+                cmbTimeMinutes.Enabled = false;
+                textBox1.Enabled = false;
 
+                btnProv.Visible = false;
+                btnNext.Visible = false;
             }
             catch (Exception ex)
             {
@@ -351,5 +837,205 @@
             }
         }
         #endregion
+
+        #region –¢�\�¿ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// <summary>
+        /// –¢�\�¿ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// </summary>
+        /// <returns></returns>
+        private void PetitionButtonProc()
+        {
+            IOSFPData sfpDB = new IOSFPData();
+            IOProcessApproval ProAppDB = new IOProcessApproval();
+            try
+            {
+                // �ÏŽZ—\ŽZƒf�[ƒ^‚ª–³‚¢�ê�‡‚Í“o˜^‚·‚é
+                string strSQL = sfpDB.CreatePrimarykeyString(m_ConstructionCode, CommonMotions.cnvInt(lblDataCount.Text));
+                SFPData DataRec = new SFPData();
+                if (!sfpDB.SelectAction(strSQL, ref DataRec)) m_DataChangeFlg = true;
+
+                // ƒf�[ƒ^•Ï�X—LŽž‚Íƒf�[ƒ^“o˜^
+                if (m_DataChangeFlg)
+                {
+                    if (!DataEntryProcess()) return;
+                }
+
+                // ‹N“®”Ô�†
+                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
+
+                // �HŽ–”Ô�†
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
+
+                // �³”F‹@”\”Ô�†
+                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
+
+                // Žó•t”Ô�†
+                int nOrderNo = CommonMotions.cnvInt(lblOrderNo.Text);
+                if (nOrderNo < 1)
+                {
+                    nOrderNo = ProAppDB.SelectMaxOrderNoCount(ProAppDB.CreatePrimarykeyString(m_ConstructionCode, iApprovalCode)) + 1;
+                }
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(nOrderNo);
+
+                // ƒpƒgƒ��[ƒ‹‰ñ�”
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.cnvInt(lblDataCount.Text));
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                sfpDB.close(); sfpDB = null;
+                ProAppDB.close(); ProAppDB = null;
+            }
+        }
+        #endregion
+
+        #region –¢�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// <summary>
+        /// –¢�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// </summary>
+        private void ApprovalButtonProc()
+        {
+            try
+            {
+                // ƒf�[ƒ^•Ï�X—LŽž‚Íƒf�[ƒ^“o˜^
+                if (m_DataChangeFlg)
+                {
+                    if (!DataEntryProcess()) return;
+                }
+
+                // ‹N“®”Ô�†
+                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
+
+                // �HŽ–”Ô�†
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
+
+                // �³”F‹@”\”Ô�†
+                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
+
+                // Žó•t”Ô�†
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.cnvInt(lblOrderNo.Text));
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region �³”Fƒpƒlƒ‹�ipnlApproval�j�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// <summary>
+        /// �³”Fƒpƒlƒ‹�ipnlApproval�j�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// </summary>
+        private void OnApprovalButtonProc()
+        {
+            FrmApprovalScreen frm = new FrmApprovalScreen();
+            try
+            {
+                if (MessageBox.Show("ˆÄŒ�‚ð�³”F‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "�³”FŠm”F"
+                                , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
+
+                // �HŽ–”Ô�†
+                frm.ConstructionCode = m_ConstructionCode;
+                // �³”F‹@”\”Ô�†ƒZƒbƒg
+                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                // Žó•t”Ô�†
+                frm.OrderNo = CommonMotions.cnvInt(lblOrderNo.Text);
+
+                // �\�¿�E�³”FƒŒƒR�[ƒh�X�V
+                if (!frm.ApprovalDataUpDate((int)CommonDefine.ApprovalStatus.Approval, false))
+                {
+                    MessageBox.Show("�³”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B", "�³”FƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
+        #endregion
+
+        #region �³”Fƒpƒlƒ‹�ipnlApproval�j•Û—¯ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// <summary>
+        /// �³”Fƒpƒlƒ‹�ipnlApproval�j•Û—¯ƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// </summary>
+        private void OnHoldButtonProc()
+        {
+            FrmApprovalScreen frm = new FrmApprovalScreen();
+            try
+            {
+                if (MessageBox.Show("ˆÄŒ�‚ð•Û—¯‚Æ‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "•Û—¯Šm”F"
+                                , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
+
+                // �HŽ–”Ô�†
+                frm.ConstructionCode = m_ConstructionCode;
+                // �³”F‹@”\”Ô�†ƒZƒbƒg
+                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                // Žó•t”Ô�†
+                frm.OrderNo = CommonMotions.cnvInt(lblOrderNo.Text);
+
+                // �\�¿�E�³”FƒŒƒR�[ƒh�X�V
+                if (!frm.ApprovalDataUpDate((int)CommonDefine.ApprovalStatus.Pending, false))
+                {
+                    MessageBox.Show("•Û—¯‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B", "•Û—¯ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
+        #endregion
+
+        #region �³”Fƒpƒlƒ‹�ipnlApproval�j•s�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// <summary>
+        /// �³”Fƒpƒlƒ‹�ipnlApproval�j•s�³”Fƒ{ƒ^ƒ“‰Ÿ‰º�ˆ—�
+        /// </summary>
+        private void NotApprovalButtonProc()
+        {
+            FrmApprovalScreen frm = new FrmApprovalScreen();
+            try
+            {
+                if (MessageBox.Show("ˆÄŒ�‚ð•s�³”F‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "•s�³”FŠm”F"
+                                , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
+
+                // �HŽ–”Ô�†
+                frm.ConstructionCode = m_ConstructionCode;
+                // �³”F‹@”\”Ô�†ƒZƒbƒg
+                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyApproval)).Key;
+                // Žó•t”Ô�†
+                frm.OrderNo = CommonMotions.cnvInt(lblOrderNo.Text);
+
+                // �\�¿�E�³”FƒŒƒR�[ƒh�X�V
+                if (!frm.ApprovalDataUpDate((int)CommonDefine.ApprovalStatus.NotApproval, false))
+                {
+                    MessageBox.Show("•s�³”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B", "•s�³”FƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs	(revision 238)
@@ -29,6 +29,11 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = 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();
@@ -42,7 +47,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -56,7 +60,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -70,12 +73,45 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle61 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle62 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle63 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle64 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle65 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle66 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle70 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle73 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle74 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle75 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle76 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle77 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle78 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle79 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle80 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle81 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle82 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle83 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle84 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnEnd = new System.Windows.Forms.Button();
             this.TabControl1 = new System.Windows.Forms.TabControl();
@@ -90,6 +126,91 @@
             this.label55 = new System.Windows.Forms.Label();
             this.label40 = new System.Windows.Forms.Label();
             this.dgvPage1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.btnTab1LineDel = new System.Windows.Forms.Button();
+            this.btnTab1LineNew = new System.Windows.Forms.Button();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.dgvPage2 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.label61 = new System.Windows.Forms.Label();
+            this.label62 = new System.Windows.Forms.Label();
+            this.label63 = new System.Windows.Forms.Label();
+            this.label64 = new System.Windows.Forms.Label();
+            this.label65 = new System.Windows.Forms.Label();
+            this.btnTab2LineNew = new System.Windows.Forms.Button();
+            this.label66 = new System.Windows.Forms.Label();
+            this.label67 = new System.Windows.Forms.Label();
+            this.label68 = new System.Windows.Forms.Label();
+            this.label41 = new System.Windows.Forms.Label();
+            this.btnTab2LineDel = new System.Windows.Forms.Button();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.dgvPage3 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.label73 = new System.Windows.Forms.Label();
+            this.label74 = new System.Windows.Forms.Label();
+            this.label75 = new System.Windows.Forms.Label();
+            this.label76 = new System.Windows.Forms.Label();
+            this.label77 = new System.Windows.Forms.Label();
+            this.btnTab3LineNew = new System.Windows.Forms.Button();
+            this.label78 = new System.Windows.Forms.Label();
+            this.label79 = new System.Windows.Forms.Label();
+            this.label80 = new System.Windows.Forms.Label();
+            this.label42 = new System.Windows.Forms.Label();
+            this.btnTab3LineDel = new System.Windows.Forms.Button();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.dgvPage4 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.label85 = new System.Windows.Forms.Label();
+            this.label86 = new System.Windows.Forms.Label();
+            this.label87 = new System.Windows.Forms.Label();
+            this.label88 = new System.Windows.Forms.Label();
+            this.label89 = new System.Windows.Forms.Label();
+            this.btnTab4LineNew = new System.Windows.Forms.Button();
+            this.label90 = new System.Windows.Forms.Label();
+            this.label91 = new System.Windows.Forms.Label();
+            this.label92 = new System.Windows.Forms.Label();
+            this.label43 = new System.Windows.Forms.Label();
+            this.btnTab4LineDel = new System.Windows.Forms.Button();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.dgvPage5 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.label97 = new System.Windows.Forms.Label();
+            this.label98 = new System.Windows.Forms.Label();
+            this.label99 = new System.Windows.Forms.Label();
+            this.label100 = new System.Windows.Forms.Label();
+            this.label101 = new System.Windows.Forms.Label();
+            this.btnTab5LineNew = new System.Windows.Forms.Button();
+            this.label102 = new System.Windows.Forms.Label();
+            this.label103 = new System.Windows.Forms.Label();
+            this.label104 = new System.Windows.Forms.Label();
+            this.label44 = new System.Windows.Forms.Label();
+            this.btnTab5LineDel = new System.Windows.Forms.Button();
+            this.tabPage6 = new System.Windows.Forms.TabPage();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.btnTab6LineNew = new System.Windows.Forms.Button();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
+            this.btnTab6LineDel = new System.Windows.Forms.Button();
+            this.dgvPage6 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label2 = new System.Windows.Forms.Label();
+            this.cmbConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.pnlApproval = new System.Windows.Forms.Panel();
+            this.lblApprovalCount = new System.Windows.Forms.Label();
+            this.btnPetition = new System.Windows.Forms.Button();
+            this.btnApproval = new System.Windows.Forms.Button();
+            this.pnlApprovalButton = new System.Windows.Forms.Panel();
+            this.btnOnApproval = new System.Windows.Forms.Button();
+            this.btnNotApproval = new System.Windows.Forms.Button();
+            this.btnOnHold = new System.Windows.Forms.Button();
+            this.btnDataDelete = new System.Windows.Forms.Button();
+            this.btnDataEntry = new System.Windows.Forms.Button();
+            this.lblCellTotal = new System.Windows.Forms.Label();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn40 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -106,10 +227,8 @@
             this.dataGridViewTextBoxColumn45 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnTab1LineDel = new System.Windows.Forms.Button();
-            this.btnTab1LineNew = new System.Windows.Forms.Button();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.dgvPage2 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column14 = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.Column20 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -126,19 +245,8 @@
             this.dataGridViewTextBoxColumn38 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn48 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn49 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label61 = new System.Windows.Forms.Label();
-            this.label62 = new System.Windows.Forms.Label();
-            this.label63 = new System.Windows.Forms.Label();
-            this.label64 = new System.Windows.Forms.Label();
-            this.label65 = new System.Windows.Forms.Label();
-            this.btnTab2LineNew = new System.Windows.Forms.Button();
-            this.label66 = new System.Windows.Forms.Label();
-            this.label67 = new System.Windows.Forms.Label();
-            this.label68 = new System.Windows.Forms.Label();
-            this.label41 = new System.Windows.Forms.Label();
-            this.btnTab2LineDel = new System.Windows.Forms.Button();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.dgvPage3 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column15 = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.Column21 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -155,19 +263,8 @@
             this.dataGridViewTextBoxColumn39 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn50 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn51 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label73 = new System.Windows.Forms.Label();
-            this.label74 = new System.Windows.Forms.Label();
-            this.label75 = new System.Windows.Forms.Label();
-            this.label76 = new System.Windows.Forms.Label();
-            this.label77 = new System.Windows.Forms.Label();
-            this.btnTab3LineNew = new System.Windows.Forms.Button();
-            this.label78 = new System.Windows.Forms.Label();
-            this.label79 = new System.Windows.Forms.Label();
-            this.label80 = new System.Windows.Forms.Label();
-            this.label42 = new System.Windows.Forms.Label();
-            this.btnTab3LineDel = new System.Windows.Forms.Button();
-            this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.dgvPage4 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column16 = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.Column22 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -184,19 +281,8 @@
             this.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn52 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn53 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label85 = new System.Windows.Forms.Label();
-            this.label86 = new System.Windows.Forms.Label();
-            this.label87 = new System.Windows.Forms.Label();
-            this.label88 = new System.Windows.Forms.Label();
-            this.label89 = new System.Windows.Forms.Label();
-            this.btnTab4LineNew = new System.Windows.Forms.Button();
-            this.label90 = new System.Windows.Forms.Label();
-            this.label91 = new System.Windows.Forms.Label();
-            this.label92 = new System.Windows.Forms.Label();
-            this.label43 = new System.Windows.Forms.Label();
-            this.btnTab4LineDel = new System.Windows.Forms.Button();
-            this.tabPage5 = new System.Windows.Forms.TabPage();
-            this.dgvPage5 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column17 = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.Column23 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.dataGridViewTextBoxColumn27 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn29 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn30 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -213,30 +299,8 @@
             this.dataGridViewTextBoxColumn47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn54 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn55 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label97 = new System.Windows.Forms.Label();
-            this.label98 = new System.Windows.Forms.Label();
-            this.label99 = new System.Windows.Forms.Label();
-            this.label100 = new System.Windows.Forms.Label();
-            this.label101 = new System.Windows.Forms.Label();
-            this.btnTab5LineNew = new System.Windows.Forms.Button();
-            this.label102 = new System.Windows.Forms.Label();
-            this.label103 = new System.Windows.Forms.Label();
-            this.label104 = new System.Windows.Forms.Label();
-            this.label44 = new System.Windows.Forms.Label();
-            this.btnTab5LineDel = new System.Windows.Forms.Button();
-            this.tabPage6 = new System.Windows.Forms.TabPage();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.btnTab6LineNew = new System.Windows.Forms.Button();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.btnTab6LineDel = new System.Windows.Forms.Button();
-            this.dgvPage6 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column18 = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.Column24 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.dataGridViewTextBoxColumn56 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn57 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn58 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -253,24 +317,8 @@
             this.dataGridViewTextBoxColumn66 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn67 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn68 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.pnlApproval = new System.Windows.Forms.Panel();
-            this.lblApprovalCount = new System.Windows.Forms.Label();
-            this.btnPetition = new System.Windows.Forms.Button();
-            this.btnApproval = new System.Windows.Forms.Button();
-            this.pnlApprovalButton = new System.Windows.Forms.Panel();
-            this.btnOnApproval = new System.Windows.Forms.Button();
-            this.btnNotApproval = new System.Windows.Forms.Button();
-            this.btnOnHold = new System.Windows.Forms.Button();
-            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.label2 = new System.Windows.Forms.Label();
-            this.cmbConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.btnDataDelete = new System.Windows.Forms.Button();
-            this.btnDataEntry = new System.Windows.Forms.Button();
-            this.lblCellTotal = new System.Windows.Forms.Label();
+            this.Column19 = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.Column25 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.TabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvPage1)).BeginInit();
@@ -309,7 +357,7 @@
             this.btnEnd.BackColor = System.Drawing.Color.Blue;
             this.btnEnd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1215, 662);
+            this.btnEnd.Location = new System.Drawing.Point(1215, 654);
             this.btnEnd.Name = "btnEnd";
             this.btnEnd.Size = new System.Drawing.Size(120, 30);
             this.btnEnd.TabIndex = 98;
@@ -440,7 +488,7 @@
             this.label56.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label56.BackColor = System.Drawing.Color.White;
             this.label56.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label56.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label56.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label56.Location = new System.Drawing.Point(756, 492);
             this.label56.Name = "label56";
             this.label56.Size = new System.Drawing.Size(150, 27);
@@ -452,7 +500,7 @@
             this.label55.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label55.BackColor = System.Drawing.Color.White;
             this.label55.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label55.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label55.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label55.Location = new System.Drawing.Point(446, 492);
             this.label55.Name = "label55";
             this.label55.Size = new System.Drawing.Size(150, 27);
@@ -464,7 +512,7 @@
             this.label40.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label40.BackColor = System.Drawing.Color.White;
             this.label40.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label40.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label40.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label40.Location = new System.Drawing.Point(136, 492);
             this.label40.Name = "label40";
             this.label40.Size = new System.Drawing.Size(150, 27);
@@ -507,7 +555,9 @@
             this.dataGridViewTextBoxColumn44,
             this.dataGridViewTextBoxColumn45,
             this.Column2,
-            this.Column3});
+            this.Column3,
+            this.Column14,
+            this.Column20});
             this.dgvPage1.Enabled = false;
             this.dgvPage1.Location = new System.Drawing.Point(6, 6);
             this.dgvPage1.Name = "dgvPage1";
@@ -525,166 +575,6 @@
             this.dgvPage1.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPage_CellValueChanged);
             this.dgvPage1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPage_MouseUp);
             // 
-            // dataGridViewTextBoxColumn3
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridViewTextBoxColumn3.Frozen = true;
-            this.dataGridViewTextBoxColumn3.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn3.Width = 60;
-            // 
-            // Column1
-            // 
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "æ—¥ä»˜";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Visible = false;
-            this.Column1.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn40
-            // 
-            this.dataGridViewTextBoxColumn40.Frozen = true;
-            this.dataGridViewTextBoxColumn40.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40";
-            this.dataGridViewTextBoxColumn40.ReadOnly = true;
-            this.dataGridViewTextBoxColumn40.Visible = false;
-            this.dataGridViewTextBoxColumn40.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn41
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn41.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dataGridViewTextBoxColumn41.Frozen = true;
-            this.dataGridViewTextBoxColumn41.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41";
-            this.dataGridViewTextBoxColumn41.ReadOnly = true;
-            this.dataGridViewTextBoxColumn41.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn41.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn41.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn42
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn42.DefaultCellStyle = dataGridViewCellStyle4;
-            this.dataGridViewTextBoxColumn42.Frozen = true;
-            this.dataGridViewTextBoxColumn42.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42";
-            this.dataGridViewTextBoxColumn42.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn42.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn42.Width = 300;
-            // 
-            // Column6
-            // 
-            this.Column6.Frozen = true;
-            this.Column6.HeaderText = "å€‹";
-            this.Column6.Name = "Column6";
-            this.Column6.Width = 30;
-            // 
-            // Column7
-            // 
-            this.Column7.Frozen = true;
-            this.Column7.HeaderText = "ç�¾";
-            this.Column7.Name = "Column7";
-            this.Column7.Width = 30;
-            // 
-            // Column8
-            // 
-            this.Column8.Frozen = true;
-            this.Column8.HeaderText = "æ³•";
-            this.Column8.Name = "Column8";
-            this.Column8.Width = 30;
-            // 
-            // Column5
-            // 
-            this.Column5.Frozen = true;
-            this.Column5.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Visible = false;
-            this.Column5.Width = 5;
-            // 
-            // Column4
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column4.Frozen = true;
-            this.Column4.HeaderText = "æ”¯æ‰•æ–¹æ³•";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn43
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn43.DefaultCellStyle = dataGridViewCellStyle6;
-            this.dataGridViewTextBoxColumn43.Frozen = true;
-            this.dataGridViewTextBoxColumn43.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43";
-            this.dataGridViewTextBoxColumn43.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn43.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn43.Width = 110;
-            // 
-            // Column9
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column9.Frozen = true;
-            this.Column9.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
-            this.Column9.Name = "Column9";
-            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column9.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn44
-            // 
-            this.dataGridViewTextBoxColumn44.Frozen = true;
-            this.dataGridViewTextBoxColumn44.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44";
-            this.dataGridViewTextBoxColumn44.ReadOnly = true;
-            this.dataGridViewTextBoxColumn44.Visible = false;
-            this.dataGridViewTextBoxColumn44.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn45
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn45.DefaultCellStyle = dataGridViewCellStyle8;
-            this.dataGridViewTextBoxColumn45.Frozen = true;
-            this.dataGridViewTextBoxColumn45.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
-            this.dataGridViewTextBoxColumn45.Name = "dataGridViewTextBoxColumn45";
-            this.dataGridViewTextBoxColumn45.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn45.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn45.Width = 175;
-            // 
-            // Column2
-            // 
-            this.Column2.Frozen = true;
-            this.Column2.HeaderText = "å›ºå®šãƒ•ãƒ©ã‚°";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.Visible = false;
-            this.Column2.Width = 5;
-            // 
-            // Column3
-            // 
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Visible = false;
-            this.Column3.Width = 5;
-            // 
             // btnTab1LineDel
             // 
             this.btnTab1LineDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -709,7 +599,7 @@
             this.btnTab1LineNew.Size = new System.Drawing.Size(130, 30);
             this.btnTab1LineNew.TabIndex = 101;
             this.btnTab1LineNew.TabStop = false;
-            this.btnTab1LineNew.Text = "è¡Œã€€ä½œã€€æˆ�";
+            this.btnTab1LineNew.Text = "è¡Œæ–°è¦�ä½œæˆ�";
             this.btnTab1LineNew.UseVisualStyleBackColor = false;
             this.btnTab1LineNew.Click += new System.EventHandler(this.btnTabLineNew_Click);
             // 
@@ -746,14 +636,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPage2.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvPage2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPage2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPage2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvPage2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPage2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
@@ -771,7 +661,9 @@
             this.dataGridViewTextBoxColumn10,
             this.dataGridViewTextBoxColumn38,
             this.dataGridViewTextBoxColumn48,
-            this.dataGridViewTextBoxColumn49});
+            this.dataGridViewTextBoxColumn49,
+            this.Column15,
+            this.Column21});
             this.dgvPage2.Enabled = false;
             this.dgvPage2.Location = new System.Drawing.Point(6, 6);
             this.dgvPage2.Name = "dgvPage2";
@@ -789,165 +681,6 @@
             this.dgvPage2.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPage_CellValueChanged);
             this.dgvPage2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPage_MouseUp);
             // 
-            // dataGridViewTextBoxColumn1
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle10;
-            this.dataGridViewTextBoxColumn1.Frozen = true;
-            this.dataGridViewTextBoxColumn1.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn1.Width = 60;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.Frozen = true;
-            this.dataGridViewTextBoxColumn2.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.Visible = false;
-            this.dataGridViewTextBoxColumn2.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.Frozen = true;
-            this.dataGridViewTextBoxColumn4.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            this.dataGridViewTextBoxColumn4.Visible = false;
-            this.dataGridViewTextBoxColumn4.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle11;
-            this.dataGridViewTextBoxColumn5.Frozen = true;
-            this.dataGridViewTextBoxColumn5.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn5.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle12;
-            this.dataGridViewTextBoxColumn6.Frozen = true;
-            this.dataGridViewTextBoxColumn6.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn6.Width = 300;
-            // 
-            // dataGridViewButtonColumn1
-            // 
-            this.dataGridViewButtonColumn1.Frozen = true;
-            this.dataGridViewButtonColumn1.HeaderText = "å€‹";
-            this.dataGridViewButtonColumn1.Name = "dataGridViewButtonColumn1";
-            this.dataGridViewButtonColumn1.Width = 30;
-            // 
-            // dataGridViewButtonColumn2
-            // 
-            this.dataGridViewButtonColumn2.Frozen = true;
-            this.dataGridViewButtonColumn2.HeaderText = "ç�¾";
-            this.dataGridViewButtonColumn2.Name = "dataGridViewButtonColumn2";
-            this.dataGridViewButtonColumn2.Width = 30;
-            // 
-            // dataGridViewButtonColumn3
-            // 
-            this.dataGridViewButtonColumn3.Frozen = true;
-            this.dataGridViewButtonColumn3.HeaderText = "æ³•";
-            this.dataGridViewButtonColumn3.Name = "dataGridViewButtonColumn3";
-            this.dataGridViewButtonColumn3.Width = 30;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.Frozen = true;
-            this.dataGridViewTextBoxColumn7.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            this.dataGridViewTextBoxColumn7.Visible = false;
-            this.dataGridViewTextBoxColumn7.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle13;
-            this.dataGridViewTextBoxColumn8.Frozen = true;
-            this.dataGridViewTextBoxColumn8.HeaderText = "æ”¯æ‰•æ–¹æ³•";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            this.dataGridViewTextBoxColumn8.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle14;
-            this.dataGridViewTextBoxColumn9.Frozen = true;
-            this.dataGridViewTextBoxColumn9.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn9.Width = 110;
-            // 
-            // Column10
-            // 
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle15;
-            this.Column10.Frozen = true;
-            this.Column10.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
-            this.Column10.Name = "Column10";
-            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column10.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn10
-            // 
-            this.dataGridViewTextBoxColumn10.Frozen = true;
-            this.dataGridViewTextBoxColumn10.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            this.dataGridViewTextBoxColumn10.Visible = false;
-            this.dataGridViewTextBoxColumn10.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn38
-            // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn38.DefaultCellStyle = dataGridViewCellStyle16;
-            this.dataGridViewTextBoxColumn38.Frozen = true;
-            this.dataGridViewTextBoxColumn38.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
-            this.dataGridViewTextBoxColumn38.Name = "dataGridViewTextBoxColumn38";
-            this.dataGridViewTextBoxColumn38.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn38.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn38.Width = 175;
-            // 
-            // dataGridViewTextBoxColumn48
-            // 
-            this.dataGridViewTextBoxColumn48.Frozen = true;
-            this.dataGridViewTextBoxColumn48.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48";
-            this.dataGridViewTextBoxColumn48.ReadOnly = true;
-            this.dataGridViewTextBoxColumn48.Visible = false;
-            this.dataGridViewTextBoxColumn48.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn49
-            // 
-            this.dataGridViewTextBoxColumn49.Frozen = true;
-            this.dataGridViewTextBoxColumn49.HeaderText = "ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·";
-            this.dataGridViewTextBoxColumn49.Name = "dataGridViewTextBoxColumn49";
-            this.dataGridViewTextBoxColumn49.ReadOnly = true;
-            this.dataGridViewTextBoxColumn49.Visible = false;
-            this.dataGridViewTextBoxColumn49.Width = 5;
-            // 
             // label61
             // 
             this.label61.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1045,7 +778,7 @@
             this.label67.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label67.BackColor = System.Drawing.Color.White;
             this.label67.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label67.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label67.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label67.Location = new System.Drawing.Point(756, 492);
             this.label67.Name = "label67";
             this.label67.Size = new System.Drawing.Size(150, 27);
@@ -1057,7 +790,7 @@
             this.label68.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label68.BackColor = System.Drawing.Color.White;
             this.label68.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label68.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label68.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label68.Location = new System.Drawing.Point(446, 492);
             this.label68.Name = "label68";
             this.label68.Size = new System.Drawing.Size(150, 27);
@@ -1069,7 +802,7 @@
             this.label41.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label41.BackColor = System.Drawing.Color.White;
             this.label41.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label41.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label41.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label41.Location = new System.Drawing.Point(136, 492);
             this.label41.Name = "label41";
             this.label41.Size = new System.Drawing.Size(150, 27);
@@ -1122,14 +855,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPage3.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvPage3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPage3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPage3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
             this.dgvPage3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPage3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn11,
@@ -1147,7 +880,9 @@
             this.dataGridViewTextBoxColumn20,
             this.dataGridViewTextBoxColumn39,
             this.dataGridViewTextBoxColumn50,
-            this.dataGridViewTextBoxColumn51});
+            this.dataGridViewTextBoxColumn51,
+            this.Column16,
+            this.Column22});
             this.dgvPage3.Enabled = false;
             this.dgvPage3.Location = new System.Drawing.Point(6, 6);
             this.dgvPage3.Name = "dgvPage3";
@@ -1165,165 +900,6 @@
             this.dgvPage3.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPage_CellValueChanged);
             this.dgvPage3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPage_MouseUp);
             // 
-            // dataGridViewTextBoxColumn11
-            // 
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle18;
-            this.dataGridViewTextBoxColumn11.Frozen = true;
-            this.dataGridViewTextBoxColumn11.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
-            this.dataGridViewTextBoxColumn11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn11.Width = 60;
-            // 
-            // dataGridViewTextBoxColumn12
-            // 
-            this.dataGridViewTextBoxColumn12.Frozen = true;
-            this.dataGridViewTextBoxColumn12.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-            this.dataGridViewTextBoxColumn12.ReadOnly = true;
-            this.dataGridViewTextBoxColumn12.Visible = false;
-            this.dataGridViewTextBoxColumn12.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn13
-            // 
-            this.dataGridViewTextBoxColumn13.Frozen = true;
-            this.dataGridViewTextBoxColumn13.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
-            this.dataGridViewTextBoxColumn13.ReadOnly = true;
-            this.dataGridViewTextBoxColumn13.Visible = false;
-            this.dataGridViewTextBoxColumn13.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn14
-            // 
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle19;
-            this.dataGridViewTextBoxColumn14.Frozen = true;
-            this.dataGridViewTextBoxColumn14.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
-            this.dataGridViewTextBoxColumn14.ReadOnly = true;
-            this.dataGridViewTextBoxColumn14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn14.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn15
-            // 
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle20;
-            this.dataGridViewTextBoxColumn15.Frozen = true;
-            this.dataGridViewTextBoxColumn15.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
-            this.dataGridViewTextBoxColumn15.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn15.Width = 300;
-            // 
-            // dataGridViewButtonColumn4
-            // 
-            this.dataGridViewButtonColumn4.Frozen = true;
-            this.dataGridViewButtonColumn4.HeaderText = "å€‹";
-            this.dataGridViewButtonColumn4.Name = "dataGridViewButtonColumn4";
-            this.dataGridViewButtonColumn4.Width = 30;
-            // 
-            // dataGridViewButtonColumn5
-            // 
-            this.dataGridViewButtonColumn5.Frozen = true;
-            this.dataGridViewButtonColumn5.HeaderText = "ç�¾";
-            this.dataGridViewButtonColumn5.Name = "dataGridViewButtonColumn5";
-            this.dataGridViewButtonColumn5.Width = 30;
-            // 
-            // dataGridViewButtonColumn6
-            // 
-            this.dataGridViewButtonColumn6.Frozen = true;
-            this.dataGridViewButtonColumn6.HeaderText = "æ³•";
-            this.dataGridViewButtonColumn6.Name = "dataGridViewButtonColumn6";
-            this.dataGridViewButtonColumn6.Width = 30;
-            // 
-            // dataGridViewTextBoxColumn16
-            // 
-            this.dataGridViewTextBoxColumn16.Frozen = true;
-            this.dataGridViewTextBoxColumn16.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
-            this.dataGridViewTextBoxColumn16.ReadOnly = true;
-            this.dataGridViewTextBoxColumn16.Visible = false;
-            this.dataGridViewTextBoxColumn16.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn17
-            // 
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle21;
-            this.dataGridViewTextBoxColumn17.Frozen = true;
-            this.dataGridViewTextBoxColumn17.HeaderText = "æ”¯æ‰•æ–¹æ³•";
-            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
-            this.dataGridViewTextBoxColumn17.ReadOnly = true;
-            this.dataGridViewTextBoxColumn17.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn18
-            // 
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle22;
-            this.dataGridViewTextBoxColumn18.Frozen = true;
-            this.dataGridViewTextBoxColumn18.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
-            this.dataGridViewTextBoxColumn18.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn18.Width = 110;
-            // 
-            // Column11
-            // 
-            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
-            this.Column11.DefaultCellStyle = dataGridViewCellStyle23;
-            this.Column11.Frozen = true;
-            this.Column11.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
-            this.Column11.Name = "Column11";
-            this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column11.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn20
-            // 
-            this.dataGridViewTextBoxColumn20.Frozen = true;
-            this.dataGridViewTextBoxColumn20.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
-            this.dataGridViewTextBoxColumn20.ReadOnly = true;
-            this.dataGridViewTextBoxColumn20.Visible = false;
-            this.dataGridViewTextBoxColumn20.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn39
-            // 
-            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn39.DefaultCellStyle = dataGridViewCellStyle24;
-            this.dataGridViewTextBoxColumn39.Frozen = true;
-            this.dataGridViewTextBoxColumn39.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
-            this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39";
-            this.dataGridViewTextBoxColumn39.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn39.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn39.Width = 175;
-            // 
-            // dataGridViewTextBoxColumn50
-            // 
-            this.dataGridViewTextBoxColumn50.Frozen = true;
-            this.dataGridViewTextBoxColumn50.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn50.Name = "dataGridViewTextBoxColumn50";
-            this.dataGridViewTextBoxColumn50.ReadOnly = true;
-            this.dataGridViewTextBoxColumn50.Visible = false;
-            this.dataGridViewTextBoxColumn50.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn51
-            // 
-            this.dataGridViewTextBoxColumn51.Frozen = true;
-            this.dataGridViewTextBoxColumn51.HeaderText = "ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·";
-            this.dataGridViewTextBoxColumn51.Name = "dataGridViewTextBoxColumn51";
-            this.dataGridViewTextBoxColumn51.ReadOnly = true;
-            this.dataGridViewTextBoxColumn51.Visible = false;
-            this.dataGridViewTextBoxColumn51.Width = 5;
-            // 
             // label73
             // 
             this.label73.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1421,7 +997,7 @@
             this.label79.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label79.BackColor = System.Drawing.Color.White;
             this.label79.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label79.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label79.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label79.Location = new System.Drawing.Point(756, 492);
             this.label79.Name = "label79";
             this.label79.Size = new System.Drawing.Size(150, 27);
@@ -1433,7 +1009,7 @@
             this.label80.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label80.BackColor = System.Drawing.Color.White;
             this.label80.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label80.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label80.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label80.Location = new System.Drawing.Point(446, 492);
             this.label80.Name = "label80";
             this.label80.Size = new System.Drawing.Size(150, 27);
@@ -1445,7 +1021,7 @@
             this.label42.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label42.BackColor = System.Drawing.Color.White;
             this.label42.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label42.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label42.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label42.Location = new System.Drawing.Point(136, 492);
             this.label42.Name = "label42";
             this.label42.Size = new System.Drawing.Size(150, 27);
@@ -1498,14 +1074,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPage4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvPage4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPage4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle43.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPage4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43;
             this.dgvPage4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPage4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn19,
@@ -1523,7 +1099,9 @@
             this.dataGridViewTextBoxColumn35,
             this.dataGridViewTextBoxColumn46,
             this.dataGridViewTextBoxColumn52,
-            this.dataGridViewTextBoxColumn53});
+            this.dataGridViewTextBoxColumn53,
+            this.Column17,
+            this.Column23});
             this.dgvPage4.Enabled = false;
             this.dgvPage4.Location = new System.Drawing.Point(6, 6);
             this.dgvPage4.Name = "dgvPage4";
@@ -1541,165 +1119,6 @@
             this.dgvPage4.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPage_CellValueChanged);
             this.dgvPage4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPage_MouseUp);
             // 
-            // dataGridViewTextBoxColumn19
-            // 
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle26;
-            this.dataGridViewTextBoxColumn19.Frozen = true;
-            this.dataGridViewTextBoxColumn19.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
-            this.dataGridViewTextBoxColumn19.ReadOnly = true;
-            this.dataGridViewTextBoxColumn19.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn19.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn19.Width = 60;
-            // 
-            // dataGridViewTextBoxColumn21
-            // 
-            this.dataGridViewTextBoxColumn21.Frozen = true;
-            this.dataGridViewTextBoxColumn21.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
-            this.dataGridViewTextBoxColumn21.ReadOnly = true;
-            this.dataGridViewTextBoxColumn21.Visible = false;
-            this.dataGridViewTextBoxColumn21.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn22
-            // 
-            this.dataGridViewTextBoxColumn22.Frozen = true;
-            this.dataGridViewTextBoxColumn22.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
-            this.dataGridViewTextBoxColumn22.ReadOnly = true;
-            this.dataGridViewTextBoxColumn22.Visible = false;
-            this.dataGridViewTextBoxColumn22.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn23
-            // 
-            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle27.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle27;
-            this.dataGridViewTextBoxColumn23.Frozen = true;
-            this.dataGridViewTextBoxColumn23.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
-            this.dataGridViewTextBoxColumn23.ReadOnly = true;
-            this.dataGridViewTextBoxColumn23.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn23.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn23.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn24
-            // 
-            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle28.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle28;
-            this.dataGridViewTextBoxColumn24.Frozen = true;
-            this.dataGridViewTextBoxColumn24.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
-            this.dataGridViewTextBoxColumn24.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn24.Width = 300;
-            // 
-            // dataGridViewButtonColumn7
-            // 
-            this.dataGridViewButtonColumn7.Frozen = true;
-            this.dataGridViewButtonColumn7.HeaderText = "å€‹";
-            this.dataGridViewButtonColumn7.Name = "dataGridViewButtonColumn7";
-            this.dataGridViewButtonColumn7.Width = 30;
-            // 
-            // dataGridViewButtonColumn8
-            // 
-            this.dataGridViewButtonColumn8.Frozen = true;
-            this.dataGridViewButtonColumn8.HeaderText = "ç�¾";
-            this.dataGridViewButtonColumn8.Name = "dataGridViewButtonColumn8";
-            this.dataGridViewButtonColumn8.Width = 30;
-            // 
-            // dataGridViewButtonColumn9
-            // 
-            this.dataGridViewButtonColumn9.Frozen = true;
-            this.dataGridViewButtonColumn9.HeaderText = "æ³•";
-            this.dataGridViewButtonColumn9.Name = "dataGridViewButtonColumn9";
-            this.dataGridViewButtonColumn9.Width = 30;
-            // 
-            // dataGridViewTextBoxColumn25
-            // 
-            this.dataGridViewTextBoxColumn25.Frozen = true;
-            this.dataGridViewTextBoxColumn25.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
-            this.dataGridViewTextBoxColumn25.ReadOnly = true;
-            this.dataGridViewTextBoxColumn25.Visible = false;
-            this.dataGridViewTextBoxColumn25.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn26
-            // 
-            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle29;
-            this.dataGridViewTextBoxColumn26.Frozen = true;
-            this.dataGridViewTextBoxColumn26.HeaderText = "æ”¯æ‰•æ–¹æ³•";
-            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
-            this.dataGridViewTextBoxColumn26.ReadOnly = true;
-            this.dataGridViewTextBoxColumn26.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn28
-            // 
-            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle30.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle30;
-            this.dataGridViewTextBoxColumn28.Frozen = true;
-            this.dataGridViewTextBoxColumn28.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
-            this.dataGridViewTextBoxColumn28.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn28.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn28.Width = 110;
-            // 
-            // Column12
-            // 
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle31.ForeColor = System.Drawing.Color.Black;
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle31;
-            this.Column12.Frozen = true;
-            this.Column12.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
-            this.Column12.Name = "Column12";
-            this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column12.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn35
-            // 
-            this.dataGridViewTextBoxColumn35.Frozen = true;
-            this.dataGridViewTextBoxColumn35.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn35.Name = "dataGridViewTextBoxColumn35";
-            this.dataGridViewTextBoxColumn35.ReadOnly = true;
-            this.dataGridViewTextBoxColumn35.Visible = false;
-            this.dataGridViewTextBoxColumn35.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn46
-            // 
-            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle32.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn46.DefaultCellStyle = dataGridViewCellStyle32;
-            this.dataGridViewTextBoxColumn46.Frozen = true;
-            this.dataGridViewTextBoxColumn46.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
-            this.dataGridViewTextBoxColumn46.Name = "dataGridViewTextBoxColumn46";
-            this.dataGridViewTextBoxColumn46.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn46.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn46.Width = 175;
-            // 
-            // dataGridViewTextBoxColumn52
-            // 
-            this.dataGridViewTextBoxColumn52.Frozen = true;
-            this.dataGridViewTextBoxColumn52.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn52.Name = "dataGridViewTextBoxColumn52";
-            this.dataGridViewTextBoxColumn52.ReadOnly = true;
-            this.dataGridViewTextBoxColumn52.Visible = false;
-            this.dataGridViewTextBoxColumn52.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn53
-            // 
-            this.dataGridViewTextBoxColumn53.Frozen = true;
-            this.dataGridViewTextBoxColumn53.HeaderText = "ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·";
-            this.dataGridViewTextBoxColumn53.Name = "dataGridViewTextBoxColumn53";
-            this.dataGridViewTextBoxColumn53.ReadOnly = true;
-            this.dataGridViewTextBoxColumn53.Visible = false;
-            this.dataGridViewTextBoxColumn53.Width = 5;
-            // 
             // label85
             // 
             this.label85.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1797,7 +1216,7 @@
             this.label91.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label91.BackColor = System.Drawing.Color.White;
             this.label91.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label91.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label91.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label91.Location = new System.Drawing.Point(756, 492);
             this.label91.Name = "label91";
             this.label91.Size = new System.Drawing.Size(150, 27);
@@ -1809,7 +1228,7 @@
             this.label92.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label92.BackColor = System.Drawing.Color.White;
             this.label92.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label92.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label92.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label92.Location = new System.Drawing.Point(446, 492);
             this.label92.Name = "label92";
             this.label92.Size = new System.Drawing.Size(150, 27);
@@ -1821,7 +1240,7 @@
             this.label43.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label43.BackColor = System.Drawing.Color.White;
             this.label43.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label43.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label43.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label43.Location = new System.Drawing.Point(136, 492);
             this.label43.Name = "label43";
             this.label43.Size = new System.Drawing.Size(150, 27);
@@ -1874,14 +1293,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPage5.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvPage5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle33.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPage5.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33;
+            dataGridViewCellStyle57.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle57.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle57.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle57.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle57.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle57.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle57.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPage5.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle57;
             this.dgvPage5.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPage5.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn27,
@@ -1899,7 +1318,9 @@
             this.dataGridViewTextBoxColumn37,
             this.dataGridViewTextBoxColumn47,
             this.dataGridViewTextBoxColumn54,
-            this.dataGridViewTextBoxColumn55});
+            this.dataGridViewTextBoxColumn55,
+            this.Column18,
+            this.Column24});
             this.dgvPage5.Enabled = false;
             this.dgvPage5.Location = new System.Drawing.Point(6, 6);
             this.dgvPage5.Name = "dgvPage5";
@@ -1917,165 +1338,6 @@
             this.dgvPage5.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPage_CellValueChanged);
             this.dgvPage5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPage_MouseUp);
             // 
-            // dataGridViewTextBoxColumn27
-            // 
-            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle34.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle34;
-            this.dataGridViewTextBoxColumn27.Frozen = true;
-            this.dataGridViewTextBoxColumn27.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
-            this.dataGridViewTextBoxColumn27.ReadOnly = true;
-            this.dataGridViewTextBoxColumn27.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn27.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn27.Width = 60;
-            // 
-            // dataGridViewTextBoxColumn29
-            // 
-            this.dataGridViewTextBoxColumn29.Frozen = true;
-            this.dataGridViewTextBoxColumn29.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29";
-            this.dataGridViewTextBoxColumn29.ReadOnly = true;
-            this.dataGridViewTextBoxColumn29.Visible = false;
-            this.dataGridViewTextBoxColumn29.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn30
-            // 
-            this.dataGridViewTextBoxColumn30.Frozen = true;
-            this.dataGridViewTextBoxColumn30.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.dataGridViewTextBoxColumn30.Name = "dataGridViewTextBoxColumn30";
-            this.dataGridViewTextBoxColumn30.ReadOnly = true;
-            this.dataGridViewTextBoxColumn30.Visible = false;
-            this.dataGridViewTextBoxColumn30.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn31
-            // 
-            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle35.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn31.DefaultCellStyle = dataGridViewCellStyle35;
-            this.dataGridViewTextBoxColumn31.Frozen = true;
-            this.dataGridViewTextBoxColumn31.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn31.Name = "dataGridViewTextBoxColumn31";
-            this.dataGridViewTextBoxColumn31.ReadOnly = true;
-            this.dataGridViewTextBoxColumn31.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn31.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn31.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn32
-            // 
-            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle36.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn32.DefaultCellStyle = dataGridViewCellStyle36;
-            this.dataGridViewTextBoxColumn32.Frozen = true;
-            this.dataGridViewTextBoxColumn32.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn32.Name = "dataGridViewTextBoxColumn32";
-            this.dataGridViewTextBoxColumn32.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn32.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn32.Width = 300;
-            // 
-            // dataGridViewButtonColumn10
-            // 
-            this.dataGridViewButtonColumn10.Frozen = true;
-            this.dataGridViewButtonColumn10.HeaderText = "å€‹";
-            this.dataGridViewButtonColumn10.Name = "dataGridViewButtonColumn10";
-            this.dataGridViewButtonColumn10.Width = 30;
-            // 
-            // dataGridViewButtonColumn11
-            // 
-            this.dataGridViewButtonColumn11.Frozen = true;
-            this.dataGridViewButtonColumn11.HeaderText = "ç�¾";
-            this.dataGridViewButtonColumn11.Name = "dataGridViewButtonColumn11";
-            this.dataGridViewButtonColumn11.Width = 30;
-            // 
-            // dataGridViewButtonColumn12
-            // 
-            this.dataGridViewButtonColumn12.Frozen = true;
-            this.dataGridViewButtonColumn12.HeaderText = "æ³•";
-            this.dataGridViewButtonColumn12.Name = "dataGridViewButtonColumn12";
-            this.dataGridViewButtonColumn12.Width = 30;
-            // 
-            // dataGridViewTextBoxColumn33
-            // 
-            this.dataGridViewTextBoxColumn33.Frozen = true;
-            this.dataGridViewTextBoxColumn33.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn33.Name = "dataGridViewTextBoxColumn33";
-            this.dataGridViewTextBoxColumn33.ReadOnly = true;
-            this.dataGridViewTextBoxColumn33.Visible = false;
-            this.dataGridViewTextBoxColumn33.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn34
-            // 
-            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn34.DefaultCellStyle = dataGridViewCellStyle37;
-            this.dataGridViewTextBoxColumn34.Frozen = true;
-            this.dataGridViewTextBoxColumn34.HeaderText = "æ”¯æ‰•æ–¹æ³•";
-            this.dataGridViewTextBoxColumn34.Name = "dataGridViewTextBoxColumn34";
-            this.dataGridViewTextBoxColumn34.ReadOnly = true;
-            this.dataGridViewTextBoxColumn34.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn36
-            // 
-            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle38.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn36.DefaultCellStyle = dataGridViewCellStyle38;
-            this.dataGridViewTextBoxColumn36.Frozen = true;
-            this.dataGridViewTextBoxColumn36.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn36.Name = "dataGridViewTextBoxColumn36";
-            this.dataGridViewTextBoxColumn36.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn36.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn36.Width = 110;
-            // 
-            // Column13
-            // 
-            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle39.ForeColor = System.Drawing.Color.Black;
-            this.Column13.DefaultCellStyle = dataGridViewCellStyle39;
-            this.Column13.Frozen = true;
-            this.Column13.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
-            this.Column13.Name = "Column13";
-            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column13.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn37
-            // 
-            this.dataGridViewTextBoxColumn37.Frozen = true;
-            this.dataGridViewTextBoxColumn37.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn37.Name = "dataGridViewTextBoxColumn37";
-            this.dataGridViewTextBoxColumn37.ReadOnly = true;
-            this.dataGridViewTextBoxColumn37.Visible = false;
-            this.dataGridViewTextBoxColumn37.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn47
-            // 
-            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle40.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn47.DefaultCellStyle = dataGridViewCellStyle40;
-            this.dataGridViewTextBoxColumn47.Frozen = true;
-            this.dataGridViewTextBoxColumn47.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
-            this.dataGridViewTextBoxColumn47.Name = "dataGridViewTextBoxColumn47";
-            this.dataGridViewTextBoxColumn47.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn47.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn47.Width = 175;
-            // 
-            // dataGridViewTextBoxColumn54
-            // 
-            this.dataGridViewTextBoxColumn54.Frozen = true;
-            this.dataGridViewTextBoxColumn54.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn54.Name = "dataGridViewTextBoxColumn54";
-            this.dataGridViewTextBoxColumn54.ReadOnly = true;
-            this.dataGridViewTextBoxColumn54.Visible = false;
-            this.dataGridViewTextBoxColumn54.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn55
-            // 
-            this.dataGridViewTextBoxColumn55.Frozen = true;
-            this.dataGridViewTextBoxColumn55.HeaderText = "ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·";
-            this.dataGridViewTextBoxColumn55.Name = "dataGridViewTextBoxColumn55";
-            this.dataGridViewTextBoxColumn55.ReadOnly = true;
-            this.dataGridViewTextBoxColumn55.Visible = false;
-            this.dataGridViewTextBoxColumn55.Width = 5;
-            // 
             // label97
             // 
             this.label97.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -2173,7 +1435,7 @@
             this.label103.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label103.BackColor = System.Drawing.Color.White;
             this.label103.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label103.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label103.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label103.Location = new System.Drawing.Point(756, 492);
             this.label103.Name = "label103";
             this.label103.Size = new System.Drawing.Size(150, 27);
@@ -2185,7 +1447,7 @@
             this.label104.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label104.BackColor = System.Drawing.Color.White;
             this.label104.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label104.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label104.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label104.Location = new System.Drawing.Point(446, 492);
             this.label104.Name = "label104";
             this.label104.Size = new System.Drawing.Size(150, 27);
@@ -2197,7 +1459,7 @@
             this.label44.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label44.BackColor = System.Drawing.Color.White;
             this.label44.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label44.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label44.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label44.Location = new System.Drawing.Point(136, 492);
             this.label44.Name = "label44";
             this.label44.Size = new System.Drawing.Size(150, 27);
@@ -2316,6 +1578,7 @@
             this.btnTab6LineNew.TabStop = false;
             this.btnTab6LineNew.Text = "è¡Œæ–°è¦�ä½œæˆ�";
             this.btnTab6LineNew.UseVisualStyleBackColor = false;
+            this.btnTab6LineNew.Click += new System.EventHandler(this.btnTabLineNew_Click);
             // 
             // label10
             // 
@@ -2335,7 +1598,7 @@
             this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label11.BackColor = System.Drawing.Color.White;
             this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label11.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label11.Location = new System.Drawing.Point(756, 492);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(150, 27);
@@ -2347,7 +1610,7 @@
             this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label12.BackColor = System.Drawing.Color.White;
             this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label12.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label12.Location = new System.Drawing.Point(446, 492);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(150, 27);
@@ -2359,7 +1622,7 @@
             this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label13.BackColor = System.Drawing.Color.White;
             this.label13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label13.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label13.Location = new System.Drawing.Point(136, 492);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(150, 27);
@@ -2378,6 +1641,7 @@
             this.btnTab6LineDel.TabStop = false;
             this.btnTab6LineDel.Text = "è¡Œã€€å‰Šã€€é™¤";
             this.btnTab6LineDel.UseVisualStyleBackColor = false;
+            this.btnTab6LineDel.Click += new System.EventHandler(this.btnTabLineDel_Click);
             // 
             // dgvPage6
             // 
@@ -2390,14 +1654,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPage6.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvPage6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle41.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPage6.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle41;
+            dataGridViewCellStyle71.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle71.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle71.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle71.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle71.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle71.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle71.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPage6.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle71;
             this.dgvPage6.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPage6.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn56,
@@ -2415,7 +1679,9 @@
             this.dataGridViewTextBoxColumn65,
             this.dataGridViewTextBoxColumn66,
             this.dataGridViewTextBoxColumn67,
-            this.dataGridViewTextBoxColumn68});
+            this.dataGridViewTextBoxColumn68,
+            this.Column19,
+            this.Column25});
             this.dgvPage6.Enabled = false;
             this.dgvPage6.Location = new System.Drawing.Point(6, 6);
             this.dgvPage6.Name = "dgvPage6";
@@ -2433,165 +1699,6 @@
             this.dgvPage6.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPage_CellValueChanged);
             this.dgvPage6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPage_MouseUp);
             // 
-            // dataGridViewTextBoxColumn56
-            // 
-            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle42.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn56.DefaultCellStyle = dataGridViewCellStyle42;
-            this.dataGridViewTextBoxColumn56.Frozen = true;
-            this.dataGridViewTextBoxColumn56.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn56.Name = "dataGridViewTextBoxColumn56";
-            this.dataGridViewTextBoxColumn56.ReadOnly = true;
-            this.dataGridViewTextBoxColumn56.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn56.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn56.Width = 60;
-            // 
-            // dataGridViewTextBoxColumn57
-            // 
-            this.dataGridViewTextBoxColumn57.Frozen = true;
-            this.dataGridViewTextBoxColumn57.HeaderText = "æ—¥ä»˜";
-            this.dataGridViewTextBoxColumn57.Name = "dataGridViewTextBoxColumn57";
-            this.dataGridViewTextBoxColumn57.ReadOnly = true;
-            this.dataGridViewTextBoxColumn57.Visible = false;
-            this.dataGridViewTextBoxColumn57.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn58
-            // 
-            this.dataGridViewTextBoxColumn58.Frozen = true;
-            this.dataGridViewTextBoxColumn58.HeaderText = "å·¥äº‹ç•ªå�·";
-            this.dataGridViewTextBoxColumn58.Name = "dataGridViewTextBoxColumn58";
-            this.dataGridViewTextBoxColumn58.ReadOnly = true;
-            this.dataGridViewTextBoxColumn58.Visible = false;
-            this.dataGridViewTextBoxColumn58.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn59
-            // 
-            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle43.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn59.DefaultCellStyle = dataGridViewCellStyle43;
-            this.dataGridViewTextBoxColumn59.Frozen = true;
-            this.dataGridViewTextBoxColumn59.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn59.Name = "dataGridViewTextBoxColumn59";
-            this.dataGridViewTextBoxColumn59.ReadOnly = true;
-            this.dataGridViewTextBoxColumn59.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn59.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn59.Width = 300;
-            // 
-            // dataGridViewTextBoxColumn60
-            // 
-            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn60.DefaultCellStyle = dataGridViewCellStyle44;
-            this.dataGridViewTextBoxColumn60.Frozen = true;
-            this.dataGridViewTextBoxColumn60.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
-            this.dataGridViewTextBoxColumn60.Name = "dataGridViewTextBoxColumn60";
-            this.dataGridViewTextBoxColumn60.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn60.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn60.Width = 300;
-            // 
-            // dataGridViewButtonColumn13
-            // 
-            this.dataGridViewButtonColumn13.Frozen = true;
-            this.dataGridViewButtonColumn13.HeaderText = "å€‹";
-            this.dataGridViewButtonColumn13.Name = "dataGridViewButtonColumn13";
-            this.dataGridViewButtonColumn13.Width = 30;
-            // 
-            // dataGridViewButtonColumn14
-            // 
-            this.dataGridViewButtonColumn14.Frozen = true;
-            this.dataGridViewButtonColumn14.HeaderText = "ç�¾";
-            this.dataGridViewButtonColumn14.Name = "dataGridViewButtonColumn14";
-            this.dataGridViewButtonColumn14.Width = 30;
-            // 
-            // dataGridViewButtonColumn15
-            // 
-            this.dataGridViewButtonColumn15.Frozen = true;
-            this.dataGridViewButtonColumn15.HeaderText = "æ³•";
-            this.dataGridViewButtonColumn15.Name = "dataGridViewButtonColumn15";
-            this.dataGridViewButtonColumn15.Width = 30;
-            // 
-            // dataGridViewTextBoxColumn61
-            // 
-            this.dataGridViewTextBoxColumn61.Frozen = true;
-            this.dataGridViewTextBoxColumn61.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn61.Name = "dataGridViewTextBoxColumn61";
-            this.dataGridViewTextBoxColumn61.ReadOnly = true;
-            this.dataGridViewTextBoxColumn61.Visible = false;
-            this.dataGridViewTextBoxColumn61.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn62
-            // 
-            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn62.DefaultCellStyle = dataGridViewCellStyle45;
-            this.dataGridViewTextBoxColumn62.Frozen = true;
-            this.dataGridViewTextBoxColumn62.HeaderText = "æ”¯æ‰•æ–¹æ³•";
-            this.dataGridViewTextBoxColumn62.Name = "dataGridViewTextBoxColumn62";
-            this.dataGridViewTextBoxColumn62.ReadOnly = true;
-            this.dataGridViewTextBoxColumn62.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn63
-            // 
-            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle46.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn63.DefaultCellStyle = dataGridViewCellStyle46;
-            this.dataGridViewTextBoxColumn63.Frozen = true;
-            this.dataGridViewTextBoxColumn63.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn63.Name = "dataGridViewTextBoxColumn63";
-            this.dataGridViewTextBoxColumn63.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn63.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn63.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn64
-            // 
-            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle47.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn64.DefaultCellStyle = dataGridViewCellStyle47;
-            this.dataGridViewTextBoxColumn64.Frozen = true;
-            this.dataGridViewTextBoxColumn64.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
-            this.dataGridViewTextBoxColumn64.Name = "dataGridViewTextBoxColumn64";
-            this.dataGridViewTextBoxColumn64.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn64.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn64.Width = 110;
-            // 
-            // dataGridViewTextBoxColumn65
-            // 
-            this.dataGridViewTextBoxColumn65.Frozen = true;
-            this.dataGridViewTextBoxColumn65.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn65.Name = "dataGridViewTextBoxColumn65";
-            this.dataGridViewTextBoxColumn65.ReadOnly = true;
-            this.dataGridViewTextBoxColumn65.Visible = false;
-            this.dataGridViewTextBoxColumn65.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn66
-            // 
-            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle48.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn66.DefaultCellStyle = dataGridViewCellStyle48;
-            this.dataGridViewTextBoxColumn66.Frozen = true;
-            this.dataGridViewTextBoxColumn66.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
-            this.dataGridViewTextBoxColumn66.Name = "dataGridViewTextBoxColumn66";
-            this.dataGridViewTextBoxColumn66.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn66.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn66.Width = 175;
-            // 
-            // dataGridViewTextBoxColumn67
-            // 
-            this.dataGridViewTextBoxColumn67.Frozen = true;
-            this.dataGridViewTextBoxColumn67.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
-            this.dataGridViewTextBoxColumn67.Name = "dataGridViewTextBoxColumn67";
-            this.dataGridViewTextBoxColumn67.ReadOnly = true;
-            this.dataGridViewTextBoxColumn67.Visible = false;
-            this.dataGridViewTextBoxColumn67.Width = 5;
-            // 
-            // dataGridViewTextBoxColumn68
-            // 
-            this.dataGridViewTextBoxColumn68.Frozen = true;
-            this.dataGridViewTextBoxColumn68.HeaderText = "ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·";
-            this.dataGridViewTextBoxColumn68.Name = "dataGridViewTextBoxColumn68";
-            this.dataGridViewTextBoxColumn68.ReadOnly = true;
-            this.dataGridViewTextBoxColumn68.Visible = false;
-            this.dataGridViewTextBoxColumn68.Width = 5;
-            // 
             // panel3
             // 
             this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Top;
@@ -2608,6 +1715,84 @@
             this.panel3.Size = new System.Drawing.Size(1325, 44);
             this.panel3.TabIndex = 0;
             // 
+            // cmbDepartment
+            // 
+            this.cmbDepartment.BackColor = System.Drawing.Color.White;
+            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDepartment.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold);
+            this.cmbDepartment.FormattingEnabled = true;
+            this.cmbDepartment.Location = new System.Drawing.Point(437, 4);
+            this.cmbDepartment.Name = "cmbDepartment";
+            this.cmbDepartment.Size = new System.Drawing.Size(260, 29);
+            this.cmbDepartment.TabIndex = 1;
+            this.cmbDepartment.TextChanged += new System.EventHandler(this.cmbDepartment_TextChanged);
+            this.cmbDepartment.Enter += new System.EventHandler(this.cmbDepartment_Enter);
+            // 
+            // label2
+            // 
+            this.label2.BackColor = System.Drawing.Color.SandyBrown;
+            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(309, 5);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(120, 27);
+            this.label2.TabIndex = 108;
+            this.label2.Text = "æ‹…å½“éƒ¨ç½²";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cmbConstructionPerson
+            // 
+            this.cmbConstructionPerson.BackColor = System.Drawing.Color.White;
+            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstructionPerson.FormattingEnabled = true;
+            this.cmbConstructionPerson.Location = new System.Drawing.Point(841, 4);
+            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
+            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 29);
+            this.cmbConstructionPerson.TabIndex = 2;
+            this.cmbConstructionPerson.TextChanged += new System.EventHandler(this.cmbConstructionPerson_TextChanged);
+            this.cmbConstructionPerson.Enter += new System.EventHandler(this.cmbConstructionPerson_Enter);
+            // 
+            // label3
+            // 
+            this.label3.BackColor = System.Drawing.Color.SandyBrown;
+            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(713, 5);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(120, 27);
+            this.label3.TabIndex = 106;
+            this.label3.Text = "æ‹…ã€€å½“ã€€è€…";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label4
+            // 
+            this.label4.BackColor = System.Drawing.Color.SandyBrown;
+            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label4.Location = new System.Drawing.Point(5, 5);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(120, 27);
+            this.label4.TabIndex = 104;
+            this.label4.Text = "å¯¾è±¡å¹´æœˆ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(133, 4);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(160, 29);
+            this.comboBox1.TabIndex = 0;
+            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+            this.comboBox1.Enter += new System.EventHandler(this.comboBox1_Enter);
+            // 
             // pnlApproval
             // 
             this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -2709,84 +1894,6 @@
             this.btnOnHold.Text = "ä¿�ç•™";
             this.btnOnHold.UseVisualStyleBackColor = false;
             // 
-            // cmbDepartment
-            // 
-            this.cmbDepartment.BackColor = System.Drawing.Color.White;
-            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDepartment.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold);
-            this.cmbDepartment.FormattingEnabled = true;
-            this.cmbDepartment.Location = new System.Drawing.Point(437, 4);
-            this.cmbDepartment.Name = "cmbDepartment";
-            this.cmbDepartment.Size = new System.Drawing.Size(260, 29);
-            this.cmbDepartment.TabIndex = 1;
-            this.cmbDepartment.TextChanged += new System.EventHandler(this.cmbDepartment_TextChanged);
-            this.cmbDepartment.Enter += new System.EventHandler(this.cmbDepartment_Enter);
-            // 
-            // label2
-            // 
-            this.label2.BackColor = System.Drawing.Color.SandyBrown;
-            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(309, 5);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(120, 27);
-            this.label2.TabIndex = 108;
-            this.label2.Text = "æ‹…å½“éƒ¨ç½²";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // cmbConstructionPerson
-            // 
-            this.cmbConstructionPerson.BackColor = System.Drawing.Color.White;
-            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbConstructionPerson.FormattingEnabled = true;
-            this.cmbConstructionPerson.Location = new System.Drawing.Point(841, 4);
-            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
-            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 29);
-            this.cmbConstructionPerson.TabIndex = 2;
-            this.cmbConstructionPerson.TextChanged += new System.EventHandler(this.cmbConstructionPerson_TextChanged);
-            this.cmbConstructionPerson.Enter += new System.EventHandler(this.cmbConstructionPerson_Enter);
-            // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.SandyBrown;
-            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(713, 5);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(120, 27);
-            this.label3.TabIndex = 106;
-            this.label3.Text = "æ‹…ã€€å½“ã€€è€…";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label4
-            // 
-            this.label4.BackColor = System.Drawing.Color.SandyBrown;
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.Location = new System.Drawing.Point(5, 5);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(120, 27);
-            this.label4.TabIndex = 104;
-            this.label4.Text = "å¯¾è±¡å¹´æœˆ";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(133, 4);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(160, 29);
-            this.comboBox1.TabIndex = 0;
-            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
-            this.comboBox1.Enter += new System.EventHandler(this.comboBox1_Enter);
-            // 
             // btnDataDelete
             // 
             this.btnDataDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -2793,7 +1900,7 @@
             this.btnDataDelete.BackColor = System.Drawing.Color.Red;
             this.btnDataDelete.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataDelete.ForeColor = System.Drawing.Color.White;
-            this.btnDataDelete.Location = new System.Drawing.Point(1089, 662);
+            this.btnDataDelete.Location = new System.Drawing.Point(1089, 654);
             this.btnDataDelete.Name = "btnDataDelete";
             this.btnDataDelete.Size = new System.Drawing.Size(120, 30);
             this.btnDataDelete.TabIndex = 104;
@@ -2808,7 +1915,7 @@
             this.btnDataEntry.BackColor = System.Drawing.Color.Green;
             this.btnDataEntry.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(963, 662);
+            this.btnDataEntry.Location = new System.Drawing.Point(963, 654);
             this.btnDataEntry.Name = "btnDataEntry";
             this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
             this.btnDataEntry.TabIndex = 103;
@@ -2823,17 +1930,1288 @@
             this.lblCellTotal.BackColor = System.Drawing.Color.White;
             this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
-            this.lblCellTotal.Location = new System.Drawing.Point(60, 660);
+            this.lblCellTotal.Location = new System.Drawing.Point(60, 650);
             this.lblCellTotal.Name = "lblCellTotal";
             this.lblCellTotal.Size = new System.Drawing.Size(0, 16);
             this.lblCellTotal.TabIndex = 105;
             // 
+            // dataGridViewTextBoxColumn3
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dataGridViewTextBoxColumn3.Frozen = true;
+            this.dataGridViewTextBoxColumn3.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 60;
+            // 
+            // Column1
+            // 
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "æ—¥ä»˜";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Visible = false;
+            this.Column1.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn40
+            // 
+            this.dataGridViewTextBoxColumn40.Frozen = true;
+            this.dataGridViewTextBoxColumn40.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40";
+            this.dataGridViewTextBoxColumn40.ReadOnly = true;
+            this.dataGridViewTextBoxColumn40.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn40.Visible = false;
+            this.dataGridViewTextBoxColumn40.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn41
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn41.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dataGridViewTextBoxColumn41.Frozen = true;
+            this.dataGridViewTextBoxColumn41.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41";
+            this.dataGridViewTextBoxColumn41.ReadOnly = true;
+            this.dataGridViewTextBoxColumn41.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn41.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn41.Width = 240;
+            // 
+            // dataGridViewTextBoxColumn42
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn42.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dataGridViewTextBoxColumn42.Frozen = true;
+            this.dataGridViewTextBoxColumn42.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42";
+            this.dataGridViewTextBoxColumn42.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn42.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn42.Width = 240;
+            // 
+            // Column6
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column6.Frozen = true;
+            this.Column6.HeaderText = "å€‹";
+            this.Column6.Name = "Column6";
+            this.Column6.Width = 30;
+            // 
+            // Column7
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column7.Frozen = true;
+            this.Column7.HeaderText = "ç�¾";
+            this.Column7.Name = "Column7";
+            this.Column7.Width = 30;
+            // 
+            // Column8
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column8.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column8.Frozen = true;
+            this.Column8.HeaderText = "æ³•";
+            this.Column8.Name = "Column8";
+            this.Column8.Width = 30;
+            // 
+            // Column5
+            // 
+            this.Column5.Frozen = true;
+            this.Column5.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Visible = false;
+            this.Column5.Width = 5;
+            // 
+            // Column4
+            // 
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column4.Frozen = true;
+            this.Column4.HeaderText = "æ”¯æ‰•æ–¹æ³•";
+            this.Column4.Name = "Column4";
+            this.Column4.ReadOnly = true;
+            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column4.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn43
+            // 
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn43.DefaultCellStyle = dataGridViewCellStyle9;
+            this.dataGridViewTextBoxColumn43.Frozen = true;
+            this.dataGridViewTextBoxColumn43.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43";
+            this.dataGridViewTextBoxColumn43.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn43.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn43.Width = 110;
+            // 
+            // Column9
+            // 
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column9.Frozen = true;
+            this.Column9.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
+            this.Column9.Name = "Column9";
+            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column9.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn44
+            // 
+            this.dataGridViewTextBoxColumn44.Frozen = true;
+            this.dataGridViewTextBoxColumn44.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44";
+            this.dataGridViewTextBoxColumn44.ReadOnly = true;
+            this.dataGridViewTextBoxColumn44.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn44.Visible = false;
+            this.dataGridViewTextBoxColumn44.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn45
+            // 
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn45.DefaultCellStyle = dataGridViewCellStyle11;
+            this.dataGridViewTextBoxColumn45.Frozen = true;
+            this.dataGridViewTextBoxColumn45.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
+            this.dataGridViewTextBoxColumn45.Name = "dataGridViewTextBoxColumn45";
+            this.dataGridViewTextBoxColumn45.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn45.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn45.Width = 175;
+            // 
+            // Column2
+            // 
+            this.Column2.Frozen = true;
+            this.Column2.HeaderText = "å›ºå®šãƒ•ãƒ©ã‚°";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column2.Visible = false;
+            this.Column2.Width = 5;
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle12;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "ä¼�ç¥¨ç•ªå�·";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Width = 80;
+            // 
+            // Column14
+            // 
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column14.DefaultCellStyle = dataGridViewCellStyle13;
+            this.Column14.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column14.Frozen = true;
+            this.Column14.HeaderText = "ç¢º";
+            this.Column14.Name = "Column14";
+            this.Column14.Width = 20;
+            // 
+            // Column20
+            // 
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column20.DefaultCellStyle = dataGridViewCellStyle14;
+            this.Column20.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column20.Frozen = true;
+            this.Column20.HeaderText = "ç¢º";
+            this.Column20.Name = "Column20";
+            this.Column20.Width = 20;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle16;
+            this.dataGridViewTextBoxColumn1.Frozen = true;
+            this.dataGridViewTextBoxColumn1.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn1.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.Frozen = true;
+            this.dataGridViewTextBoxColumn2.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn2.Visible = false;
+            this.dataGridViewTextBoxColumn2.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.Frozen = true;
+            this.dataGridViewTextBoxColumn4.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn4.Visible = false;
+            this.dataGridViewTextBoxColumn4.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle17;
+            this.dataGridViewTextBoxColumn5.Frozen = true;
+            this.dataGridViewTextBoxColumn5.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn5.Width = 240;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle18;
+            this.dataGridViewTextBoxColumn6.Frozen = true;
+            this.dataGridViewTextBoxColumn6.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn6.Width = 240;
+            // 
+            // dataGridViewButtonColumn1
+            // 
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn1.DefaultCellStyle = dataGridViewCellStyle19;
+            this.dataGridViewButtonColumn1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn1.Frozen = true;
+            this.dataGridViewButtonColumn1.HeaderText = "å€‹";
+            this.dataGridViewButtonColumn1.Name = "dataGridViewButtonColumn1";
+            this.dataGridViewButtonColumn1.Width = 30;
+            // 
+            // dataGridViewButtonColumn2
+            // 
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn2.DefaultCellStyle = dataGridViewCellStyle20;
+            this.dataGridViewButtonColumn2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn2.Frozen = true;
+            this.dataGridViewButtonColumn2.HeaderText = "ç�¾";
+            this.dataGridViewButtonColumn2.Name = "dataGridViewButtonColumn2";
+            this.dataGridViewButtonColumn2.Width = 30;
+            // 
+            // dataGridViewButtonColumn3
+            // 
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn3.DefaultCellStyle = dataGridViewCellStyle21;
+            this.dataGridViewButtonColumn3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn3.Frozen = true;
+            this.dataGridViewButtonColumn3.HeaderText = "æ³•";
+            this.dataGridViewButtonColumn3.Name = "dataGridViewButtonColumn3";
+            this.dataGridViewButtonColumn3.Width = 30;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.Frozen = true;
+            this.dataGridViewTextBoxColumn7.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn7.Visible = false;
+            this.dataGridViewTextBoxColumn7.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle22;
+            this.dataGridViewTextBoxColumn8.Frozen = true;
+            this.dataGridViewTextBoxColumn8.HeaderText = "æ”¯æ‰•æ–¹æ³•";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn8.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle23;
+            this.dataGridViewTextBoxColumn9.Frozen = true;
+            this.dataGridViewTextBoxColumn9.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn9.Width = 110;
+            // 
+            // Column10
+            // 
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle24.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle24;
+            this.Column10.Frozen = true;
+            this.Column10.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
+            this.Column10.Name = "Column10";
+            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column10.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.Frozen = true;
+            this.dataGridViewTextBoxColumn10.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            this.dataGridViewTextBoxColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn10.Visible = false;
+            this.dataGridViewTextBoxColumn10.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn38
+            // 
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle25.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn38.DefaultCellStyle = dataGridViewCellStyle25;
+            this.dataGridViewTextBoxColumn38.Frozen = true;
+            this.dataGridViewTextBoxColumn38.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
+            this.dataGridViewTextBoxColumn38.Name = "dataGridViewTextBoxColumn38";
+            this.dataGridViewTextBoxColumn38.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn38.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn38.Width = 175;
+            // 
+            // dataGridViewTextBoxColumn48
+            // 
+            this.dataGridViewTextBoxColumn48.Frozen = true;
+            this.dataGridViewTextBoxColumn48.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48";
+            this.dataGridViewTextBoxColumn48.ReadOnly = true;
+            this.dataGridViewTextBoxColumn48.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn48.Visible = false;
+            this.dataGridViewTextBoxColumn48.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn49
+            // 
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle26.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn49.DefaultCellStyle = dataGridViewCellStyle26;
+            this.dataGridViewTextBoxColumn49.Frozen = true;
+            this.dataGridViewTextBoxColumn49.HeaderText = "ä¼�ç¥¨ç•ªå�·";
+            this.dataGridViewTextBoxColumn49.Name = "dataGridViewTextBoxColumn49";
+            this.dataGridViewTextBoxColumn49.ReadOnly = true;
+            this.dataGridViewTextBoxColumn49.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn49.Width = 80;
+            // 
+            // Column15
+            // 
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle27.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column15.DefaultCellStyle = dataGridViewCellStyle27;
+            this.Column15.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column15.Frozen = true;
+            this.Column15.HeaderText = "ç¢º";
+            this.Column15.Name = "Column15";
+            this.Column15.Width = 30;
+            // 
+            // Column21
+            // 
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle28.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column21.DefaultCellStyle = dataGridViewCellStyle28;
+            this.Column21.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column21.Frozen = true;
+            this.Column21.HeaderText = "ç¢º";
+            this.Column21.Name = "Column21";
+            this.Column21.Width = 20;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle30.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle30;
+            this.dataGridViewTextBoxColumn11.Frozen = true;
+            this.dataGridViewTextBoxColumn11.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            this.dataGridViewTextBoxColumn11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn11.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.Frozen = true;
+            this.dataGridViewTextBoxColumn12.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            this.dataGridViewTextBoxColumn12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn12.Visible = false;
+            this.dataGridViewTextBoxColumn12.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn13
+            // 
+            this.dataGridViewTextBoxColumn13.Frozen = true;
+            this.dataGridViewTextBoxColumn13.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.dataGridViewTextBoxColumn13.ReadOnly = true;
+            this.dataGridViewTextBoxColumn13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn13.Visible = false;
+            this.dataGridViewTextBoxColumn13.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn14
+            // 
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle31.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle31;
+            this.dataGridViewTextBoxColumn14.Frozen = true;
+            this.dataGridViewTextBoxColumn14.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
+            this.dataGridViewTextBoxColumn14.ReadOnly = true;
+            this.dataGridViewTextBoxColumn14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn14.Width = 240;
+            // 
+            // dataGridViewTextBoxColumn15
+            // 
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle32.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle32;
+            this.dataGridViewTextBoxColumn15.Frozen = true;
+            this.dataGridViewTextBoxColumn15.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
+            this.dataGridViewTextBoxColumn15.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn15.Width = 240;
+            // 
+            // dataGridViewButtonColumn4
+            // 
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle33.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn4.DefaultCellStyle = dataGridViewCellStyle33;
+            this.dataGridViewButtonColumn4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn4.Frozen = true;
+            this.dataGridViewButtonColumn4.HeaderText = "å€‹";
+            this.dataGridViewButtonColumn4.Name = "dataGridViewButtonColumn4";
+            this.dataGridViewButtonColumn4.Width = 30;
+            // 
+            // dataGridViewButtonColumn5
+            // 
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle34.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn5.DefaultCellStyle = dataGridViewCellStyle34;
+            this.dataGridViewButtonColumn5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn5.Frozen = true;
+            this.dataGridViewButtonColumn5.HeaderText = "ç�¾";
+            this.dataGridViewButtonColumn5.Name = "dataGridViewButtonColumn5";
+            this.dataGridViewButtonColumn5.Width = 30;
+            // 
+            // dataGridViewButtonColumn6
+            // 
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle35.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn6.DefaultCellStyle = dataGridViewCellStyle35;
+            this.dataGridViewButtonColumn6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn6.Frozen = true;
+            this.dataGridViewButtonColumn6.HeaderText = "æ³•";
+            this.dataGridViewButtonColumn6.Name = "dataGridViewButtonColumn6";
+            this.dataGridViewButtonColumn6.Width = 30;
+            // 
+            // dataGridViewTextBoxColumn16
+            // 
+            this.dataGridViewTextBoxColumn16.Frozen = true;
+            this.dataGridViewTextBoxColumn16.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
+            this.dataGridViewTextBoxColumn16.ReadOnly = true;
+            this.dataGridViewTextBoxColumn16.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn16.Visible = false;
+            this.dataGridViewTextBoxColumn16.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn17
+            // 
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle36;
+            this.dataGridViewTextBoxColumn17.Frozen = true;
+            this.dataGridViewTextBoxColumn17.HeaderText = "æ”¯æ‰•æ–¹æ³•";
+            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
+            this.dataGridViewTextBoxColumn17.ReadOnly = true;
+            this.dataGridViewTextBoxColumn17.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn17.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn18
+            // 
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle37.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle37.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle37;
+            this.dataGridViewTextBoxColumn18.Frozen = true;
+            this.dataGridViewTextBoxColumn18.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
+            this.dataGridViewTextBoxColumn18.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn18.Width = 110;
+            // 
+            // Column11
+            // 
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle38.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle38.ForeColor = System.Drawing.Color.Black;
+            this.Column11.DefaultCellStyle = dataGridViewCellStyle38;
+            this.Column11.Frozen = true;
+            this.Column11.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
+            this.Column11.Name = "Column11";
+            this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column11.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn20
+            // 
+            this.dataGridViewTextBoxColumn20.Frozen = true;
+            this.dataGridViewTextBoxColumn20.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
+            this.dataGridViewTextBoxColumn20.ReadOnly = true;
+            this.dataGridViewTextBoxColumn20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn20.Visible = false;
+            this.dataGridViewTextBoxColumn20.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn39
+            // 
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle39.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn39.DefaultCellStyle = dataGridViewCellStyle39;
+            this.dataGridViewTextBoxColumn39.Frozen = true;
+            this.dataGridViewTextBoxColumn39.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
+            this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39";
+            this.dataGridViewTextBoxColumn39.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn39.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn39.Width = 175;
+            // 
+            // dataGridViewTextBoxColumn50
+            // 
+            this.dataGridViewTextBoxColumn50.Frozen = true;
+            this.dataGridViewTextBoxColumn50.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn50.Name = "dataGridViewTextBoxColumn50";
+            this.dataGridViewTextBoxColumn50.ReadOnly = true;
+            this.dataGridViewTextBoxColumn50.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn50.Visible = false;
+            this.dataGridViewTextBoxColumn50.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn51
+            // 
+            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle40.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dataGridViewTextBoxColumn51.DefaultCellStyle = dataGridViewCellStyle40;
+            this.dataGridViewTextBoxColumn51.Frozen = true;
+            this.dataGridViewTextBoxColumn51.HeaderText = "ä¼�ç¥¨ç•ªå�·";
+            this.dataGridViewTextBoxColumn51.Name = "dataGridViewTextBoxColumn51";
+            this.dataGridViewTextBoxColumn51.ReadOnly = true;
+            this.dataGridViewTextBoxColumn51.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn51.Width = 80;
+            // 
+            // Column16
+            // 
+            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle41.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle41.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column16.DefaultCellStyle = dataGridViewCellStyle41;
+            this.Column16.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column16.Frozen = true;
+            this.Column16.HeaderText = "ç¢º";
+            this.Column16.Name = "Column16";
+            this.Column16.Width = 20;
+            // 
+            // Column22
+            // 
+            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle42.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column22.DefaultCellStyle = dataGridViewCellStyle42;
+            this.Column22.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column22.Frozen = true;
+            this.Column22.HeaderText = "ç¢º";
+            this.Column22.Name = "Column22";
+            this.Column22.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Column22.Width = 20;
+            // 
+            // dataGridViewTextBoxColumn19
+            // 
+            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle44;
+            this.dataGridViewTextBoxColumn19.Frozen = true;
+            this.dataGridViewTextBoxColumn19.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
+            this.dataGridViewTextBoxColumn19.ReadOnly = true;
+            this.dataGridViewTextBoxColumn19.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn19.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn19.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn21
+            // 
+            this.dataGridViewTextBoxColumn21.Frozen = true;
+            this.dataGridViewTextBoxColumn21.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
+            this.dataGridViewTextBoxColumn21.ReadOnly = true;
+            this.dataGridViewTextBoxColumn21.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn21.Visible = false;
+            this.dataGridViewTextBoxColumn21.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn22
+            // 
+            this.dataGridViewTextBoxColumn22.Frozen = true;
+            this.dataGridViewTextBoxColumn22.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
+            this.dataGridViewTextBoxColumn22.ReadOnly = true;
+            this.dataGridViewTextBoxColumn22.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn22.Visible = false;
+            this.dataGridViewTextBoxColumn22.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn23
+            // 
+            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle45.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle45;
+            this.dataGridViewTextBoxColumn23.Frozen = true;
+            this.dataGridViewTextBoxColumn23.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
+            this.dataGridViewTextBoxColumn23.ReadOnly = true;
+            this.dataGridViewTextBoxColumn23.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn23.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn23.Width = 240;
+            // 
+            // dataGridViewTextBoxColumn24
+            // 
+            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle46.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle46;
+            this.dataGridViewTextBoxColumn24.Frozen = true;
+            this.dataGridViewTextBoxColumn24.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
+            this.dataGridViewTextBoxColumn24.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn24.Width = 240;
+            // 
+            // dataGridViewButtonColumn7
+            // 
+            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle47.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn7.DefaultCellStyle = dataGridViewCellStyle47;
+            this.dataGridViewButtonColumn7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn7.Frozen = true;
+            this.dataGridViewButtonColumn7.HeaderText = "å€‹";
+            this.dataGridViewButtonColumn7.Name = "dataGridViewButtonColumn7";
+            this.dataGridViewButtonColumn7.Width = 30;
+            // 
+            // dataGridViewButtonColumn8
+            // 
+            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle48.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle48.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn8.DefaultCellStyle = dataGridViewCellStyle48;
+            this.dataGridViewButtonColumn8.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn8.Frozen = true;
+            this.dataGridViewButtonColumn8.HeaderText = "ç�¾";
+            this.dataGridViewButtonColumn8.Name = "dataGridViewButtonColumn8";
+            this.dataGridViewButtonColumn8.Width = 30;
+            // 
+            // dataGridViewButtonColumn9
+            // 
+            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle49.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn9.DefaultCellStyle = dataGridViewCellStyle49;
+            this.dataGridViewButtonColumn9.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn9.Frozen = true;
+            this.dataGridViewButtonColumn9.HeaderText = "æ³•";
+            this.dataGridViewButtonColumn9.Name = "dataGridViewButtonColumn9";
+            this.dataGridViewButtonColumn9.Width = 30;
+            // 
+            // dataGridViewTextBoxColumn25
+            // 
+            this.dataGridViewTextBoxColumn25.Frozen = true;
+            this.dataGridViewTextBoxColumn25.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
+            this.dataGridViewTextBoxColumn25.ReadOnly = true;
+            this.dataGridViewTextBoxColumn25.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn25.Visible = false;
+            this.dataGridViewTextBoxColumn25.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn26
+            // 
+            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle50;
+            this.dataGridViewTextBoxColumn26.Frozen = true;
+            this.dataGridViewTextBoxColumn26.HeaderText = "æ”¯æ‰•æ–¹æ³•";
+            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
+            this.dataGridViewTextBoxColumn26.ReadOnly = true;
+            this.dataGridViewTextBoxColumn26.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn26.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn28
+            // 
+            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle51.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle51.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn28.DefaultCellStyle = dataGridViewCellStyle51;
+            this.dataGridViewTextBoxColumn28.Frozen = true;
+            this.dataGridViewTextBoxColumn28.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
+            this.dataGridViewTextBoxColumn28.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn28.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn28.Width = 110;
+            // 
+            // Column12
+            // 
+            dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle52.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle52.ForeColor = System.Drawing.Color.Black;
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle52;
+            this.Column12.Frozen = true;
+            this.Column12.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
+            this.Column12.Name = "Column12";
+            this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column12.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn35
+            // 
+            this.dataGridViewTextBoxColumn35.Frozen = true;
+            this.dataGridViewTextBoxColumn35.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn35.Name = "dataGridViewTextBoxColumn35";
+            this.dataGridViewTextBoxColumn35.ReadOnly = true;
+            this.dataGridViewTextBoxColumn35.Visible = false;
+            this.dataGridViewTextBoxColumn35.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn46
+            // 
+            dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle53.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn46.DefaultCellStyle = dataGridViewCellStyle53;
+            this.dataGridViewTextBoxColumn46.Frozen = true;
+            this.dataGridViewTextBoxColumn46.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
+            this.dataGridViewTextBoxColumn46.Name = "dataGridViewTextBoxColumn46";
+            this.dataGridViewTextBoxColumn46.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn46.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn46.Width = 175;
+            // 
+            // dataGridViewTextBoxColumn52
+            // 
+            this.dataGridViewTextBoxColumn52.Frozen = true;
+            this.dataGridViewTextBoxColumn52.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn52.Name = "dataGridViewTextBoxColumn52";
+            this.dataGridViewTextBoxColumn52.ReadOnly = true;
+            this.dataGridViewTextBoxColumn52.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn52.Visible = false;
+            this.dataGridViewTextBoxColumn52.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn53
+            // 
+            dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle54.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle54.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn53.DefaultCellStyle = dataGridViewCellStyle54;
+            this.dataGridViewTextBoxColumn53.Frozen = true;
+            this.dataGridViewTextBoxColumn53.HeaderText = "ä¼�ç¥¨ç•ªå�·";
+            this.dataGridViewTextBoxColumn53.Name = "dataGridViewTextBoxColumn53";
+            this.dataGridViewTextBoxColumn53.ReadOnly = true;
+            this.dataGridViewTextBoxColumn53.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn53.Width = 80;
+            // 
+            // Column17
+            // 
+            dataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle55.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle55.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle55.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column17.DefaultCellStyle = dataGridViewCellStyle55;
+            this.Column17.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column17.Frozen = true;
+            this.Column17.HeaderText = "ç¢º";
+            this.Column17.Name = "Column17";
+            this.Column17.Width = 20;
+            // 
+            // Column23
+            // 
+            dataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle56.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle56.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column23.DefaultCellStyle = dataGridViewCellStyle56;
+            this.Column23.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column23.Frozen = true;
+            this.Column23.HeaderText = "ç¢º";
+            this.Column23.Name = "Column23";
+            this.Column23.Width = 20;
+            // 
+            // dataGridViewTextBoxColumn27
+            // 
+            dataGridViewCellStyle58.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle58.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle58;
+            this.dataGridViewTextBoxColumn27.Frozen = true;
+            this.dataGridViewTextBoxColumn27.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
+            this.dataGridViewTextBoxColumn27.ReadOnly = true;
+            this.dataGridViewTextBoxColumn27.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn27.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn27.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn29
+            // 
+            this.dataGridViewTextBoxColumn29.Frozen = true;
+            this.dataGridViewTextBoxColumn29.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29";
+            this.dataGridViewTextBoxColumn29.ReadOnly = true;
+            this.dataGridViewTextBoxColumn29.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn29.Visible = false;
+            this.dataGridViewTextBoxColumn29.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn30
+            // 
+            this.dataGridViewTextBoxColumn30.Frozen = true;
+            this.dataGridViewTextBoxColumn30.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.dataGridViewTextBoxColumn30.Name = "dataGridViewTextBoxColumn30";
+            this.dataGridViewTextBoxColumn30.ReadOnly = true;
+            this.dataGridViewTextBoxColumn30.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn30.Visible = false;
+            this.dataGridViewTextBoxColumn30.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn31
+            // 
+            dataGridViewCellStyle59.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle59.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn31.DefaultCellStyle = dataGridViewCellStyle59;
+            this.dataGridViewTextBoxColumn31.Frozen = true;
+            this.dataGridViewTextBoxColumn31.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn31.Name = "dataGridViewTextBoxColumn31";
+            this.dataGridViewTextBoxColumn31.ReadOnly = true;
+            this.dataGridViewTextBoxColumn31.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn31.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn31.Width = 240;
+            // 
+            // dataGridViewTextBoxColumn32
+            // 
+            dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle60.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn32.DefaultCellStyle = dataGridViewCellStyle60;
+            this.dataGridViewTextBoxColumn32.Frozen = true;
+            this.dataGridViewTextBoxColumn32.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn32.Name = "dataGridViewTextBoxColumn32";
+            this.dataGridViewTextBoxColumn32.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn32.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn32.Width = 240;
+            // 
+            // dataGridViewButtonColumn10
+            // 
+            dataGridViewCellStyle61.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle61.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle61.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn10.DefaultCellStyle = dataGridViewCellStyle61;
+            this.dataGridViewButtonColumn10.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn10.Frozen = true;
+            this.dataGridViewButtonColumn10.HeaderText = "å€‹";
+            this.dataGridViewButtonColumn10.Name = "dataGridViewButtonColumn10";
+            this.dataGridViewButtonColumn10.Width = 30;
+            // 
+            // dataGridViewButtonColumn11
+            // 
+            dataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle62.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle62.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn11.DefaultCellStyle = dataGridViewCellStyle62;
+            this.dataGridViewButtonColumn11.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn11.Frozen = true;
+            this.dataGridViewButtonColumn11.HeaderText = "ç�¾";
+            this.dataGridViewButtonColumn11.Name = "dataGridViewButtonColumn11";
+            this.dataGridViewButtonColumn11.Width = 30;
+            // 
+            // dataGridViewButtonColumn12
+            // 
+            dataGridViewCellStyle63.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle63.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle63.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn12.DefaultCellStyle = dataGridViewCellStyle63;
+            this.dataGridViewButtonColumn12.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn12.Frozen = true;
+            this.dataGridViewButtonColumn12.HeaderText = "æ³•";
+            this.dataGridViewButtonColumn12.Name = "dataGridViewButtonColumn12";
+            this.dataGridViewButtonColumn12.Width = 30;
+            // 
+            // dataGridViewTextBoxColumn33
+            // 
+            this.dataGridViewTextBoxColumn33.Frozen = true;
+            this.dataGridViewTextBoxColumn33.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn33.Name = "dataGridViewTextBoxColumn33";
+            this.dataGridViewTextBoxColumn33.ReadOnly = true;
+            this.dataGridViewTextBoxColumn33.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn33.Visible = false;
+            this.dataGridViewTextBoxColumn33.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn34
+            // 
+            dataGridViewCellStyle64.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn34.DefaultCellStyle = dataGridViewCellStyle64;
+            this.dataGridViewTextBoxColumn34.Frozen = true;
+            this.dataGridViewTextBoxColumn34.HeaderText = "æ”¯æ‰•æ–¹æ³•";
+            this.dataGridViewTextBoxColumn34.Name = "dataGridViewTextBoxColumn34";
+            this.dataGridViewTextBoxColumn34.ReadOnly = true;
+            this.dataGridViewTextBoxColumn34.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn34.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn36
+            // 
+            dataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle65.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle65.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn36.DefaultCellStyle = dataGridViewCellStyle65;
+            this.dataGridViewTextBoxColumn36.Frozen = true;
+            this.dataGridViewTextBoxColumn36.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn36.Name = "dataGridViewTextBoxColumn36";
+            this.dataGridViewTextBoxColumn36.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn36.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn36.Width = 110;
+            // 
+            // Column13
+            // 
+            dataGridViewCellStyle66.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle66.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle66.ForeColor = System.Drawing.Color.Black;
+            this.Column13.DefaultCellStyle = dataGridViewCellStyle66;
+            this.Column13.Frozen = true;
+            this.Column13.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
+            this.Column13.Name = "Column13";
+            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column13.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn37
+            // 
+            this.dataGridViewTextBoxColumn37.Frozen = true;
+            this.dataGridViewTextBoxColumn37.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn37.Name = "dataGridViewTextBoxColumn37";
+            this.dataGridViewTextBoxColumn37.ReadOnly = true;
+            this.dataGridViewTextBoxColumn37.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn37.Visible = false;
+            this.dataGridViewTextBoxColumn37.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn47
+            // 
+            dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle67.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn47.DefaultCellStyle = dataGridViewCellStyle67;
+            this.dataGridViewTextBoxColumn47.Frozen = true;
+            this.dataGridViewTextBoxColumn47.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
+            this.dataGridViewTextBoxColumn47.Name = "dataGridViewTextBoxColumn47";
+            this.dataGridViewTextBoxColumn47.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn47.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn47.Width = 175;
+            // 
+            // dataGridViewTextBoxColumn54
+            // 
+            this.dataGridViewTextBoxColumn54.Frozen = true;
+            this.dataGridViewTextBoxColumn54.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn54.Name = "dataGridViewTextBoxColumn54";
+            this.dataGridViewTextBoxColumn54.ReadOnly = true;
+            this.dataGridViewTextBoxColumn54.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn54.Visible = false;
+            this.dataGridViewTextBoxColumn54.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn55
+            // 
+            dataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle68.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle68.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn55.DefaultCellStyle = dataGridViewCellStyle68;
+            this.dataGridViewTextBoxColumn55.Frozen = true;
+            this.dataGridViewTextBoxColumn55.HeaderText = "ä¼�ç¥¨ç•ªå�·";
+            this.dataGridViewTextBoxColumn55.Name = "dataGridViewTextBoxColumn55";
+            this.dataGridViewTextBoxColumn55.ReadOnly = true;
+            this.dataGridViewTextBoxColumn55.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn55.Width = 80;
+            // 
+            // Column18
+            // 
+            dataGridViewCellStyle69.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle69.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle69.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle69.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column18.DefaultCellStyle = dataGridViewCellStyle69;
+            this.Column18.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column18.Frozen = true;
+            this.Column18.HeaderText = "ç¢º";
+            this.Column18.Name = "Column18";
+            this.Column18.Width = 20;
+            // 
+            // Column24
+            // 
+            dataGridViewCellStyle70.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle70.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle70.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle70.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column24.DefaultCellStyle = dataGridViewCellStyle70;
+            this.Column24.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column24.Frozen = true;
+            this.Column24.HeaderText = "ç¢º";
+            this.Column24.Name = "Column24";
+            this.Column24.Width = 20;
+            // 
+            // dataGridViewTextBoxColumn56
+            // 
+            dataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle72.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn56.DefaultCellStyle = dataGridViewCellStyle72;
+            this.dataGridViewTextBoxColumn56.Frozen = true;
+            this.dataGridViewTextBoxColumn56.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn56.Name = "dataGridViewTextBoxColumn56";
+            this.dataGridViewTextBoxColumn56.ReadOnly = true;
+            this.dataGridViewTextBoxColumn56.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn56.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn56.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn57
+            // 
+            this.dataGridViewTextBoxColumn57.Frozen = true;
+            this.dataGridViewTextBoxColumn57.HeaderText = "æ—¥ä»˜";
+            this.dataGridViewTextBoxColumn57.Name = "dataGridViewTextBoxColumn57";
+            this.dataGridViewTextBoxColumn57.ReadOnly = true;
+            this.dataGridViewTextBoxColumn57.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn57.Visible = false;
+            this.dataGridViewTextBoxColumn57.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn58
+            // 
+            this.dataGridViewTextBoxColumn58.Frozen = true;
+            this.dataGridViewTextBoxColumn58.HeaderText = "å·¥äº‹ç•ªå�·";
+            this.dataGridViewTextBoxColumn58.Name = "dataGridViewTextBoxColumn58";
+            this.dataGridViewTextBoxColumn58.ReadOnly = true;
+            this.dataGridViewTextBoxColumn58.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn58.Visible = false;
+            this.dataGridViewTextBoxColumn58.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn59
+            // 
+            dataGridViewCellStyle73.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle73.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn59.DefaultCellStyle = dataGridViewCellStyle73;
+            this.dataGridViewTextBoxColumn59.Frozen = true;
+            this.dataGridViewTextBoxColumn59.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn59.Name = "dataGridViewTextBoxColumn59";
+            this.dataGridViewTextBoxColumn59.ReadOnly = true;
+            this.dataGridViewTextBoxColumn59.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn59.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn59.Width = 240;
+            // 
+            // dataGridViewTextBoxColumn60
+            // 
+            dataGridViewCellStyle74.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle74.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn60.DefaultCellStyle = dataGridViewCellStyle74;
+            this.dataGridViewTextBoxColumn60.Frozen = true;
+            this.dataGridViewTextBoxColumn60.HeaderText = "æ”¯ã€€æ‰•ã€€å†…ã€€å®¹";
+            this.dataGridViewTextBoxColumn60.Name = "dataGridViewTextBoxColumn60";
+            this.dataGridViewTextBoxColumn60.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn60.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn60.Width = 240;
+            // 
+            // dataGridViewButtonColumn13
+            // 
+            dataGridViewCellStyle75.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle75.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle75.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn13.DefaultCellStyle = dataGridViewCellStyle75;
+            this.dataGridViewButtonColumn13.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn13.Frozen = true;
+            this.dataGridViewButtonColumn13.HeaderText = "å€‹";
+            this.dataGridViewButtonColumn13.Name = "dataGridViewButtonColumn13";
+            this.dataGridViewButtonColumn13.Width = 30;
+            // 
+            // dataGridViewButtonColumn14
+            // 
+            dataGridViewCellStyle76.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle76.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle76.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn14.DefaultCellStyle = dataGridViewCellStyle76;
+            this.dataGridViewButtonColumn14.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn14.Frozen = true;
+            this.dataGridViewButtonColumn14.HeaderText = "ç�¾";
+            this.dataGridViewButtonColumn14.Name = "dataGridViewButtonColumn14";
+            this.dataGridViewButtonColumn14.Width = 30;
+            // 
+            // dataGridViewButtonColumn15
+            // 
+            dataGridViewCellStyle77.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle77.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle77.SelectionBackColor = System.Drawing.Color.Transparent;
+            this.dataGridViewButtonColumn15.DefaultCellStyle = dataGridViewCellStyle77;
+            this.dataGridViewButtonColumn15.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.dataGridViewButtonColumn15.Frozen = true;
+            this.dataGridViewButtonColumn15.HeaderText = "æ³•";
+            this.dataGridViewButtonColumn15.Name = "dataGridViewButtonColumn15";
+            this.dataGridViewButtonColumn15.Width = 30;
+            // 
+            // dataGridViewTextBoxColumn61
+            // 
+            this.dataGridViewTextBoxColumn61.Frozen = true;
+            this.dataGridViewTextBoxColumn61.HeaderText = "æ”¯æ‰•ãƒ•ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn61.Name = "dataGridViewTextBoxColumn61";
+            this.dataGridViewTextBoxColumn61.ReadOnly = true;
+            this.dataGridViewTextBoxColumn61.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn61.Visible = false;
+            this.dataGridViewTextBoxColumn61.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn62
+            // 
+            dataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn62.DefaultCellStyle = dataGridViewCellStyle78;
+            this.dataGridViewTextBoxColumn62.Frozen = true;
+            this.dataGridViewTextBoxColumn62.HeaderText = "æ”¯æ‰•æ–¹æ³•";
+            this.dataGridViewTextBoxColumn62.Name = "dataGridViewTextBoxColumn62";
+            this.dataGridViewTextBoxColumn62.ReadOnly = true;
+            this.dataGridViewTextBoxColumn62.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn62.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn63
+            // 
+            dataGridViewCellStyle79.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle79.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle79.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn63.DefaultCellStyle = dataGridViewCellStyle79;
+            this.dataGridViewTextBoxColumn63.Frozen = true;
+            this.dataGridViewTextBoxColumn63.HeaderText = "ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn63.Name = "dataGridViewTextBoxColumn63";
+            this.dataGridViewTextBoxColumn63.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn63.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn63.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn64
+            // 
+            dataGridViewCellStyle80.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle80.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle80.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn64.DefaultCellStyle = dataGridViewCellStyle80;
+            this.dataGridViewTextBoxColumn64.Frozen = true;
+            this.dataGridViewTextBoxColumn64.HeaderText = "ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�";
+            this.dataGridViewTextBoxColumn64.Name = "dataGridViewTextBoxColumn64";
+            this.dataGridViewTextBoxColumn64.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn64.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn64.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn65
+            // 
+            this.dataGridViewTextBoxColumn65.Frozen = true;
+            this.dataGridViewTextBoxColumn65.HeaderText = "æ”¯æ‰•å…ˆã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn65.Name = "dataGridViewTextBoxColumn65";
+            this.dataGridViewTextBoxColumn65.ReadOnly = true;
+            this.dataGridViewTextBoxColumn65.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn65.Visible = false;
+            this.dataGridViewTextBoxColumn65.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn66
+            // 
+            dataGridViewCellStyle81.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle81.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn66.DefaultCellStyle = dataGridViewCellStyle81;
+            this.dataGridViewTextBoxColumn66.Frozen = true;
+            this.dataGridViewTextBoxColumn66.HeaderText = "æ”¯æ‰•å…ˆå��ç§°";
+            this.dataGridViewTextBoxColumn66.Name = "dataGridViewTextBoxColumn66";
+            this.dataGridViewTextBoxColumn66.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn66.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn66.Width = 175;
+            // 
+            // dataGridViewTextBoxColumn67
+            // 
+            this.dataGridViewTextBoxColumn67.Frozen = true;
+            this.dataGridViewTextBoxColumn67.HeaderText = "å›ºå®šè²»ãƒ©ã‚°";
+            this.dataGridViewTextBoxColumn67.Name = "dataGridViewTextBoxColumn67";
+            this.dataGridViewTextBoxColumn67.ReadOnly = true;
+            this.dataGridViewTextBoxColumn67.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn67.Visible = false;
+            this.dataGridViewTextBoxColumn67.Width = 5;
+            // 
+            // dataGridViewTextBoxColumn68
+            // 
+            dataGridViewCellStyle82.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle82.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle82.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn68.DefaultCellStyle = dataGridViewCellStyle82;
+            this.dataGridViewTextBoxColumn68.Frozen = true;
+            this.dataGridViewTextBoxColumn68.HeaderText = "ä¼�ç¥¨ç•ªå�·";
+            this.dataGridViewTextBoxColumn68.Name = "dataGridViewTextBoxColumn68";
+            this.dataGridViewTextBoxColumn68.ReadOnly = true;
+            this.dataGridViewTextBoxColumn68.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn68.Width = 80;
+            // 
+            // Column19
+            // 
+            dataGridViewCellStyle83.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle83.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle83.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle83.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column19.DefaultCellStyle = dataGridViewCellStyle83;
+            this.Column19.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column19.Frozen = true;
+            this.Column19.HeaderText = "ç¢º";
+            this.Column19.Name = "Column19";
+            this.Column19.Width = 20;
+            // 
+            // Column25
+            // 
+            dataGridViewCellStyle84.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle84.BackColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle84.ForeColor = System.Drawing.Color.Transparent;
+            dataGridViewCellStyle84.SelectionForeColor = System.Drawing.Color.Transparent;
+            this.Column25.DefaultCellStyle = dataGridViewCellStyle84;
+            this.Column25.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.Column25.Frozen = true;
+            this.Column25.HeaderText = "ç¢º";
+            this.Column25.Name = "Column25";
+            this.Column25.Width = 20;
+            // 
             // FrmTAndPCosts
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1344, 697);
+            this.ClientSize = new System.Drawing.Size(1344, 687);
             this.Controls.Add(this.pnlApproval);
             this.Controls.Add(this.lblCellTotal);
             this.Controls.Add(this.btnDataDelete);
@@ -2962,6 +3340,19 @@
         private CustomControls.DataGridViewEX dgvPage4;
         private CustomControls.DataGridViewEX dgvPage5;
         private System.Windows.Forms.Label lblCellTotal;
+        private System.Windows.Forms.TabPage tabPage6;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Button btnTab6LineNew;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Button btnTab6LineDel;
+        private CustomControls.DataGridViewEX dgvPage6;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn40;
@@ -2978,6 +3369,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn45;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewButtonColumn Column14;
+        private System.Windows.Forms.DataGridViewButtonColumn Column20;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
@@ -2994,6 +3387,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn38;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn48;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn49;
+        private System.Windows.Forms.DataGridViewButtonColumn Column15;
+        private System.Windows.Forms.DataGridViewButtonColumn Column21;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
@@ -3010,6 +3405,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn39;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn50;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn51;
+        private System.Windows.Forms.DataGridViewButtonColumn Column16;
+        private System.Windows.Forms.DataGridViewButtonColumn Column22;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
@@ -3026,6 +3423,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn46;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn52;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn53;
+        private System.Windows.Forms.DataGridViewButtonColumn Column17;
+        private System.Windows.Forms.DataGridViewButtonColumn Column23;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn27;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn29;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn30;
@@ -3042,19 +3441,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn47;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn54;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn55;
-        private System.Windows.Forms.TabPage tabPage6;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Button btnTab6LineNew;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.Button btnTab6LineDel;
-        private CustomControls.DataGridViewEX dgvPage6;
+        private System.Windows.Forms.DataGridViewButtonColumn Column18;
+        private System.Windows.Forms.DataGridViewButtonColumn Column24;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn56;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn57;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn58;
@@ -3071,5 +3459,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn66;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn67;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn68;
+        private System.Windows.Forms.DataGridViewButtonColumn Column19;
+        private System.Windows.Forms.DataGridViewButtonColumn Column25;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs	(revision 238)
@@ -133,9 +133,17 @@
             /// </summary>
             FixFlg,
             /// <summary>
-            /// 16:ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·
+            /// 16:ä¼�ç¥¨ç•ªå�·
             /// </summary>
-            DataAddCount,
+            SlipNo,
+            /// <summary>
+            /// ç¢ºèª�å›žæ•°1
+            /// </summary>
+            ApprovalCount1,
+            /// <summary>
+            /// ç¢ºèª�å›žæ•°2
+            /// </summary>
+            ApprovalCount2,
         }
         #endregion
 
@@ -221,8 +229,52 @@
         /// </summary>
         private const string s_SelectButton = "â—†";
         #endregion
+
+        #region è‰²ãƒ†ãƒ¼ãƒ–ãƒ«
+        /// <summary>
+        /// è‰²ãƒ†ãƒ¼ãƒ–ãƒ«
+        /// </summary>
+        private Color[] s_ApprovalColor = new Color[] { SystemColors.ButtonFace,
+                                                        Color.DodgerBlue};
+        private Color[] s_ApprovalColor2 = new Color[] { SystemColors.ButtonFace,
+                                                        Color.Red};
+        private Color[] s_ApprovalColor3 = new Color[] { SystemColors.ButtonFace,
+                                                        Color.LightGreen};
         #endregion
 
+        #region ç¢ºèª�æ¸ˆã�¿æ–‡å­—åˆ—
+        /// <summary>
+        /// ç¢ºèª�æ¸ˆã�¿æ–‡å­—åˆ—
+        /// </summary>
+        private string s_CheckString = "ç¢ºèª�æ¸ˆ";
+        #endregion
+
+        #region ã‚°ãƒªãƒƒãƒ‰ã‚«ãƒ©ãƒ ãƒ­ãƒƒã‚¯
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ã‚«ãƒ©ãƒ ãƒ­ãƒƒã‚¯
+        /// </summary>
+        private bool[] s_ColumnLock = new bool[] { true,        //  1:è¡¨ç¤ºæ—¥ä»˜
+                                                    true,       //  2:æ”¯æ‰•æ—¥æ—¥ä»˜
+                                                    true,       //  3:å·¥äº‹ç•ªå�·
+                                                    true,       //  4:å·¥äº‹å��ç§°
+                                                    false,      //  5:æ”¯æ‰•ã�„å†…å®¹
+                                                    false,      //  6:å€‹äººã‚¯ãƒ¬ã‚¸ãƒƒãƒˆ
+                                                    false,      //  7:ç�¾é‡‘
+                                                    false,      //  8:æ³•äººã‚¯ãƒ¬ã‚¸ãƒƒãƒˆ
+                                                    true,       //  9:æ”¯æ‰•ã�„æ–¹æ³•ç¨®åˆ¥
+                                                    true,       // 10:æ”¯æ‰•ã�„æ–¹æ³•ç¨®åˆ¥å��ç§°
+                                                    false,      // 11:ç¨ŽæŠœæ”¯æ‰•é‡‘é¡�
+                                                    false,      // 12:ç¨Žè¾¼æ”¯æ‰•é‡‘é¡�
+                                                    true,       // 13:ä»•å…¥ã‚Œå…ˆã‚³ãƒ¼ãƒ‰
+                                                    false,      // 14:ä»•å…¥ã‚Œå…ˆå��ç§°
+                                                    true,       // 15:å›ºå®šãƒ•ãƒ©ã‚°
+                                                    true,       // 16:ä¼�ç¥¨ç•ªå�·
+                                                    false,      // ç¢ºèª�å›žæ•°1
+                                                    false,      // ç¢ºèª�å›žæ•°2
+                                                    };
+        #endregion
+        #endregion
+
         #region å¤‰æ•°
         /// <summary>
         /// åˆ�æœŸè¡¨ç¤ºãƒ•ãƒ©ã‚°
@@ -544,6 +596,8 @@
                         m_bChengeAns = true;
                         // å�ˆè¨ˆã‚’è¡¨ç¤ºã�™ã‚‹
                         TotalPrice(CurTabCnt);
+                        // ä¼�ç¥¨ç•ªå�·ã‚»ãƒƒãƒˆ
+                        SetSlipNo(CurTabCnt, dgv);
                         break;
                     case (int)DispGridColumn.EntryPriceInTax:
                         CurValue = CommonMotions.cnvInt(CurCell.Value);
@@ -554,6 +608,8 @@
                         m_bChengeAns = true;
                         // å�ˆè¨ˆã‚’è¡¨ç¤ºã�™ã‚‹
                         TotalPrice(CurTabCnt);
+                        // ä¼�ç¥¨ç•ªå�·ã‚»ãƒƒãƒˆ
+                        SetSlipNo(CurTabCnt, dgv);
                         break;
                     default:
                         break;
@@ -775,23 +831,49 @@
                 if (dgv.ReadOnly) return;
 
                 bool bProc = true;
+                string strCount = string.Empty;
+                int nPaymentTypeCnt = (int)DispGridColumn.PaymentType;
+                int nPaymentTypeNameCnt = (int)DispGridColumn.PaymentTypeName;
                 switch (e.ColumnIndex)
                 {
                     case (int)DispGridColumn.PaymentButton1:
                         // å€‹äººã‚¯ãƒ¬ã‚¸ãƒƒãƒˆ
-                        dgvRow.Cells[(int)DispGridColumn.PaymentType].Value = (int)PaymentType.PersonalCredit;
-                        dgvRow.Cells[(int)DispGridColumn.PaymentTypeName].Value = s_PaymentTypeString[(int)PaymentType.PersonalCredit];
+                        dgvRow.Cells[nPaymentTypeCnt].Value = (int)PaymentType.PersonalCredit;
+                        dgvRow.Cells[nPaymentTypeNameCnt].Value = s_PaymentTypeString[(int)PaymentType.PersonalCredit];
+
+                        // æ”¯æ‰•ã�„ã‚¿ã‚¤ãƒ—é�¸æŠžå‡¦ç�†
+                        SetPayType(dgv, e.ColumnIndex);
                         break;
                     case (int)DispGridColumn.PaymentButton2:
                         // ç�¾é‡‘
-                        dgvRow.Cells[(int)DispGridColumn.PaymentType].Value = (int)PaymentType.Cash;
-                        dgvRow.Cells[(int)DispGridColumn.PaymentTypeName].Value = s_PaymentTypeString[(int)PaymentType.Cash];
+                        dgvRow.Cells[nPaymentTypeCnt].Value = (int)PaymentType.Cash;
+                        dgvRow.Cells[nPaymentTypeNameCnt].Value = s_PaymentTypeString[(int)PaymentType.Cash];
+
+                        // æ”¯æ‰•ã�„ã‚¿ã‚¤ãƒ—é�¸æŠžå‡¦ç�†
+                        SetPayType(dgv, e.ColumnIndex);
                         break;
                     case (int)DispGridColumn.PaymentButton3:
                         // æ³•äººã‚¯ãƒ¬ã‚¸ãƒƒãƒˆ
-                        dgvRow.Cells[(int)DispGridColumn.PaymentType].Value = (int)PaymentType.CorporateCredit;
-                        dgvRow.Cells[(int)DispGridColumn.PaymentTypeName].Value = s_PaymentTypeString[(int)PaymentType.CorporateCredit];
+                        dgvRow.Cells[nPaymentTypeCnt].Value = (int)PaymentType.CorporateCredit;
+                        dgvRow.Cells[nPaymentTypeNameCnt].Value = s_PaymentTypeString[(int)PaymentType.CorporateCredit];
+
+                        // æ”¯æ‰•ã�„ã‚¿ã‚¤ãƒ—é�¸æŠžå‡¦ç�†
+                        SetPayType(dgv, e.ColumnIndex);
                         break;
+                    case (int)DispGridColumn.ApprovalCount1:
+                    case (int)DispGridColumn.ApprovalCount2:
+                        // é‡‘é¡�è¨­å®šç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
+                        if (CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn.EntryPrice].Value) == 0
+                            && CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn.EntryPriceInTax].Value) == 0) return;
+
+                        // ç¢ºèª�ãƒ�ã‚§ãƒƒã‚¯
+                        strCount = CommonMotions.cnvString(dgvRow.Cells[e.ColumnIndex].Value);
+                        if (strCount.Length > 0) dgvRow.Cells[e.ColumnIndex].Value = string.Empty;
+                        else dgvRow.Cells[e.ColumnIndex].Value = s_CheckString;
+
+                        // ãƒœã‚¿ãƒ³è‰²å¤‰æ›´
+                        SetGridButtonColor((DataGridViewButtonCell)dgvRow.Cells[e.ColumnIndex]);
+                        break;
                     default:
                         bProc = false;
                         break;
@@ -798,18 +880,6 @@
                 }
                 if (!bProc) return;
 
-                // é�¸æŠžã�•ã‚Œã�Ÿãƒœã‚¿ãƒ³ãƒˆãƒƒãƒ—ã�®ç·¨é›†
-                for (int i = (int)DispGridColumn.PaymentButton1; i <= (int)DispGridColumn.PaymentButton3; i++)
-                {
-                    dgvRow.Cells[i].Value = string.Empty;
-                    if (i == e.ColumnIndex) dgvRow.Cells[i].Value = s_SelectButton;
-                }
-
-                // å¯¾è±¡ã‚¿ãƒ–ãƒšãƒ¼ã‚¸å�–å¾—
-                int CurTabCnt = TabControl1.SelectedIndex;
-                // å�ˆè¨ˆã‚’è¡¨ç¤ºã�™ã‚‹
-                TotalPrice(CurTabCnt);
-
                 m_bChengeAns = true;
             }
             catch (System.Exception ex)
@@ -842,8 +912,14 @@
                         SetConstruction(CurTabCnt, e.RowIndex);
                         break;
                     case (int)DispGridColumn.SuppliersName:
-                        // ä»•å…¥å…ˆé�¸æŠž
-                        ShowSuppliersDiag(CurTabCnt);
+                        if (CurTabCnt == (int)InputTabCount.DisposalCost)
+                        {   // å�”åŠ›ä¼šç¤¾é�¸æŠž
+                            ShowSubConstrDiag(CurTabCnt);
+                        }
+                        else
+                        {   // ä»•å…¥å…ˆé�¸æŠž
+                            ShowSuppliersDiag(CurTabCnt);
+                        }
                         break;
                     default:
                         break;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.resx	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.resx	(revision 238)
@@ -165,6 +165,12 @@
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -213,6 +219,12 @@
   <metadata name="dataGridViewTextBoxColumn49.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -261,6 +273,12 @@
   <metadata name="dataGridViewTextBoxColumn51.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -309,6 +327,12 @@
   <metadata name="dataGridViewTextBoxColumn53.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn27.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -357,6 +381,12 @@
   <metadata name="dataGridViewTextBoxColumn55.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column24.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn56.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -405,4 +435,10 @@
   <metadata name="dataGridViewTextBoxColumn68.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column25.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs	(revision 238)
@@ -165,7 +165,6 @@
             try
             {
                 // å­˜åœ¨æœˆã‚’æ‹…å½“è€…æ¯ŽçµŒè²»ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šå�–å¾—ã�™ã‚‹
-                //string strSQL = "SELECT DATE_FORMAT(ACTIONDATE,'YYYY/MM'), COUNT(*) FROM CostDataOfPerson GROUP BY DATE_FORMAT(ACTIONDATE,'YYYY/MM') ORDER BY 1";
                 string strSQL = "SELECT DATE_FORMAT(ACTIONDATE,'%Y/%m'), COUNT(*) FROM CostDataOfPerson GROUP BY DATE_FORMAT(ACTIONDATE,'%Y/%m') ORDER BY 1 DESC";
                 ArrayList arList = new ArrayList();
                 CostDB.ExecuteReader(strSQL, ref arList);
@@ -683,9 +682,9 @@
             /// </summary>
             ApprovalFlg,
             /// <summary>
-            /// ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·
+            /// ä¼�ç¥¨ç•ªå�·
             /// </summary>
-            DataAddCount,
+            SlipNumber,
             /// <summary>
             /// æ”¯æ‰•æ–¹æ³•ç¨®åˆ¥ãƒ•ãƒ©ã‚°
             /// </summary>
@@ -791,10 +790,9 @@
 
                 // ãƒ‡ãƒ¼ã‚¿èª­è¾¼
                 string strSQL = "SELECT";
-                //strSQL += " DATE_FORMAT(ACTIONDATE,'DD'), DATATYPE, CONSTRUCTIONCODE, PAYMENTCONTENT,";
                 strSQL += " DATE_FORMAT(ACTIONDATE,'%d'), DATATYPE, CONSTRUCTIONCODE, PAYMENTCONTENT,";
                 strSQL += " ENTRYPRICE, ENTRYPRICEINTAX, SUPPLIERSCODE, SUPPLIERSNAME, COMPLATEFLG,";
-                strSQL += " APPROVALFLG, DATAADDCOUNT, PaymentType";
+                strSQL += " APPROVALFLG, SlipNumber, PaymentType";
                 strSQL += " FROM CostDataOfPerson";
                 strSQL += string.Format(" WHERE PERSONCODE = {0}", PersonCode);
                 strSQL += string.Format(" AND TargetMonth = '{0}'", TargetMonth);
@@ -814,6 +812,13 @@
                     m_label_TabTotal[TargetTab, i].Text = "0";
                 }
 
+                dgv.Columns[(int)DispGridColumn.SlipNo].HeaderCell.Style.Font =
+                            new Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+                dgv.Columns[(int)DispGridColumn.ApprovalCount1].HeaderCell.Style.Font =
+                            new Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+                dgv.Columns[(int)DispGridColumn.ApprovalCount2].HeaderCell.Style.Font =
+                            new Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºã‚’è¡Œã�†
                 if (arDataList.Count == 0)
                 {
@@ -820,7 +825,6 @@
                     SetGridInit(dgv, mlength);
                     return;
                 }
-
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
                 for (int i = 1; i <= mlength; i++)
                 {
@@ -834,12 +838,11 @@
                     }
                     string strFirst = string.Format("{0}æ—¥", i);
                     string[] ButtonTop = new string[3];
+                    string[] AppButtonTop = new string[2];
+                    int nDataType = 0;
+                    string strSlipNo = string.Empty;
                     foreach (object[] wrkobj in DaysData)
                     {
-                        int FixFlg = 0;
-                        if (CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.ApprovalFlg]) != 0
-                            || CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.ComplateFlg]) != 0) FixFlg = 1;
-
                         int ConstructionCode = CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.ConstructionCode]);   // å·¥äº‹ç•ªå�·
                         string ConstructionName = string.Empty;
                         if (ConstructionCode != 0)
@@ -854,38 +857,44 @@
 
                         // æ”¯æ‰•æ–¹æ³•ç¨®åˆ¥å�–å¾—
                         int paymentType = CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.PaymentType]);
+                        
                         // ãƒœã‚¿ãƒ³ãƒˆãƒƒãƒ—ã�®ç·¨é›†
-                        for (int ix = 0; ix < 3; ix++)
-                        {
-                            ButtonTop[ix] = string.Empty;
-                        }
+                        Array.Clear(ButtonTop, 0, ButtonTop.Length);
                         ButtonTop[paymentType] = s_SelectButton;
 
-                        int Rowcnt =dgv.Rows.Add(strFirst,
-                                    i.ToString(),                                                                   // æ”¯æ‰•æ—¥
-                                    ConstructionCode,                                                               // å·¥äº‹ç•ªå�·
-                                    ConstructionName,                                                               // å·¥äº‹å��ç§°
-                                    wrkobj[(int)CostsDataCol.PaymentContent].ToString(),                            // æ”¯æ‰•å†…å®¹
-                                    ButtonTop[0], ButtonTop[1], ButtonTop[2],                                       // ç¨®åˆ¥ãƒœã‚¿ãƒ³
-                                    paymentType,                                                                    // æ”¯æ‰•æ–¹æ³•ç¨®åˆ¥
-                                    s_PaymentTypeString[paymentType],                                               // æ”¯æ‰•æ–¹æ³•ç¨®åˆ¥å��ç§°
-                                    CommonMotions.cnvDouble(wrkobj[(int)CostsDataCol.EntryPrice]).ToString("#,0"),     // å…¥åŠ›é‡‘é¡�(ç¨ŽæŠœ)
-                                    CommonMotions.cnvDouble(wrkobj[(int)CostsDataCol.EntryPriceInTax]).ToString("#,0"),// å…¥åŠ›é‡‘é¡�(ç¨Žè¾¼)
-                                    CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.SuppliersCode]),                  // ä»•å…¥å…ˆã‚³ãƒ¼ãƒ‰
-                                    wrkobj[(int)CostsDataCol.SuppliersName].ToString(),                             // ä»•å…¥å…ˆå��
-                                    FixFlg,                                                                         // å›ºå®šãƒ•ãƒ©ã‚°
-                                    CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.DataAddCount])                    // ãƒ‡ãƒ¼ã‚¿è¿½åŠ ç•ªå�·
-                                    );
+                        Array.Clear(AppButtonTop, 0, AppButtonTop.Length);
+                        if (CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.ComplateFlg]) > 0) AppButtonTop[0] = s_CheckString;
+                        if (CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.ApprovalFlg]) > 0) AppButtonTop[1] = s_CheckString;
 
-            // å·¥äº‹å��ç§°
-            //dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.ConstractionName].ToolTipText = ConstructionName;
-            //// æ”¯æ‰•ã�„å†…å®¹
-            //dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.PaymentContent].ToolTipText = wrkobj[(int)CostsDataCol.PaymentContent].ToString();
-            //// æ”¯æ‰•ã�„æ–¹æ³•ç¨®åˆ¥å��ç§°
-            //DispGridColumn.PaymentTypeName,
-            //// ä»•å…¥ã‚Œå…ˆå��ç§°
-            //DispGridColumn.SuppliersName,
+                        // ä¼�ç¥¨ç•ªå�·ç·¨é›†
+                        strSlipNo = CommonMotions.cnvString(wrkobj[(int)CostsDataCol.SlipNumber]);
+                        if (strSlipNo.Length > 0)
+                        {
+                            nDataType = CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.DataType]) - 1;
+                            strSlipNo = string.Format("{0}{1}", CommonMotions.cnvNumberToAlphaCharacter(nDataType), strSlipNo);
+                        }
+                        int Rowcnt = dgv.Rows.Add(strFirst,
+                                                    i.ToString(),                                                                   // æ”¯æ‰•æ—¥
+                                                    ConstructionCode,                                                               // å·¥äº‹ç•ªå�·
+                                                    ConstructionName,                                                               // å·¥äº‹å��ç§°
+                                                    wrkobj[(int)CostsDataCol.PaymentContent].ToString(),                            // æ”¯æ‰•å†…å®¹
+                                                    ButtonTop[0], ButtonTop[1], ButtonTop[2],                                       // ç¨®åˆ¥ãƒœã‚¿ãƒ³
+                                                    paymentType,                                                                    // æ”¯æ‰•æ–¹æ³•ç¨®åˆ¥
+                                                    s_PaymentTypeString[paymentType],                                               // æ”¯æ‰•æ–¹æ³•ç¨®åˆ¥å��ç§°
+                                                    CommonMotions.cnvDouble(wrkobj[(int)CostsDataCol.EntryPrice]).ToString("#,0"),     // å…¥åŠ›é‡‘é¡�(ç¨ŽæŠœ)
+                                                    CommonMotions.cnvDouble(wrkobj[(int)CostsDataCol.EntryPriceInTax]).ToString("#,0"),// å…¥åŠ›é‡‘é¡�(ç¨Žè¾¼)
+                                                    CommonMotions.cnvInt(wrkobj[(int)CostsDataCol.SuppliersCode]),                  // ä»•å…¥å…ˆã‚³ãƒ¼ãƒ‰
+                                                    wrkobj[(int)CostsDataCol.SuppliersName].ToString(),                             // ä»•å…¥å…ˆå��
+                                                    0,                                                                              // å›ºå®šãƒ•ãƒ©ã‚°
+                                                    strSlipNo,                                                                      // ä¼�ç¥¨ç•ªå�·
+                                                    AppButtonTop[0], AppButtonTop[1]
+                                                    );
 
+                        SetGridButtonColor((DataGridViewButtonCell)dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.PaymentButton1]);
+                        SetGridButtonColor((DataGridViewButtonCell)dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.PaymentButton2]);
+                        SetGridButtonColor((DataGridViewButtonCell)dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.PaymentButton3]);
+                        SetGridButtonColor((DataGridViewButtonCell)dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.ApprovalCount1]);
+                        SetGridButtonColor((DataGridViewButtonCell)dgv.Rows[Rowcnt].Cells[(int)DispGridColumn.ApprovalCount2]);
                         strFirst = string.Empty;
                     }
                 }
@@ -1379,11 +1388,20 @@
                 // é‡‘é¡�(ç¨Žè¾¼)
                 NewRec.EntryPriceInTax = CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn.EntryPriceInTax].Value);
                 // ä¼�ç¥¨ç•ªå�·
-                NewRec.SlipNumber = string.Empty;
+                string strSlipNo = CommonMotions.cnvString(dgvRow.Cells[(int)DispGridColumn.SlipNo].Value);
+                NewRec.SlipNumber = strSlipNo.Substring(1);
+
                 // å¼•è¾¼æ¸ˆã�¿ãƒ•ãƒ©ã‚°
-                NewRec.ComplateFlg = 0;
+                if (CommonMotions.cnvString(dgvRow.Cells[(int)DispGridColumn.ApprovalCount1].Value).Length == 0)
+                    NewRec.ComplateFlg = 0;
+                else
+                    NewRec.ComplateFlg = 1;
+
                 // æ‰¿èª�ãƒ•ãƒ©ã‚°
-                NewRec.ApprovalFlg = 0;
+                if (CommonMotions.cnvString(dgvRow.Cells[(int)DispGridColumn.ApprovalCount2].Value).Length == 0)
+                    NewRec.ApprovalFlg = 0;
+                else
+                    NewRec.ApprovalFlg = 1;
 
                 NewList.Add(NewRec);
             }
@@ -1647,6 +1665,44 @@
         }
         #endregion
 
+        #region å�”åŠ›ä¼šç¤¾é�¸æŠžãƒ€ã‚¤ã‚¢ãƒ­ã‚°è¡¨ç¤º
+        /// <summary>
+        /// å�”åŠ›ä¼šç¤¾é�¸æŠžãƒ€ã‚¤ã‚¢ãƒ­ã‚°è¡¨ç¤º
+        /// </summary>
+        private void ShowSubConstrDiag(int CurTabCnt)
+        {
+            FrmSubContractorDiag frm = new FrmSubContractorDiag();
+            try
+            {
+                // å¯¾è±¡ã‚°ãƒªãƒƒãƒ‰å�–å¾—
+                DataGridView dgv = m_dispGridControl[CurTabCnt];
+
+                // ã‚°ãƒªãƒƒãƒ‰ã�ŒREADONLYã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (dgv.ReadOnly) return;
+
+                frm.ConstructionCode = m_ConstructionCode;
+                //frm.ShowInTaskbar = false;
+                frm.ShowDialog();
+                if (frm.EndButton == System.Windows.Forms.DialogResult.OK)
+                {
+                    SubContractorMaster selRec = frm.SelectData;
+                    dgv.CurrentRow.Cells[(int)DispGridColumn.SuppliersCode].Value = selRec.CompanyCode;
+                    dgv.CurrentRow.Cells[(int)DispGridColumn.SuppliersName].Value = selRec.CompanyName;
+                    m_bChengeAns = true;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose();
+                frm = null;
+            }
+        }
+        #endregion
+
         #region å�‚ç…§ãƒ¢ãƒ¼ãƒ‰
         /// <summary>
         /// ã‚¿ãƒ–ä¸Šã�®ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�¸ãƒ­ãƒƒã‚¯ã‚’ã�‹ã�‘ã‚‹
@@ -1688,6 +1744,10 @@
                     // ã‚°ãƒªãƒƒãƒ‰å�–å¾—
                     DataGridView dgv = m_dispGridControl[i];
                     dgv.ReadOnly = false;
+                    foreach (DataGridViewColumn CurCol in dgv.Columns)
+                    {
+                        CurCol.ReadOnly = s_ColumnLock[CurCol.Index];
+                    }
                 }
 
                 // é�¸æŠžã�•ã‚Œã�¦ã�„ã‚Œã�°æŠœã�‘ã‚‹
@@ -1707,5 +1767,123 @@
             }
         }
         #endregion
+
+        #region æ”¯æ‰•ã�„ã‚¿ã‚¤ãƒ—é�¸æŠžå‡¦ç�†
+        /// <summary>
+        /// æ”¯æ‰•ã�„ã‚¿ã‚¤ãƒ—é�¸æŠžå‡¦ç�†
+        /// </summary>
+        /// <param name="dgv"></param>
+        /// <param name="nClick"></param>
+        private void SetPayType(DataGridView dgv, int nClick)
+        {
+            try
+            {
+                DataGridViewRow dgvRow = dgv.CurrentRow;
+
+                // é�¸æŠžã�•ã‚Œã�Ÿãƒœã‚¿ãƒ³ãƒˆãƒƒãƒ—ã�®ç·¨é›†
+                for (int i = (int)DispGridColumn.PaymentButton1; i <= (int)DispGridColumn.PaymentButton3; i++)
+                {
+                    dgvRow.Cells[i].Value = string.Empty;
+                    if (i == nClick) dgvRow.Cells[i].Value = s_SelectButton;
+
+                    // ãƒœã‚¿ãƒ³è‰²å¤‰æ›´
+                    SetGridButtonColor((DataGridViewButtonCell)dgvRow.Cells[i]);
+                }
+
+                // å¯¾è±¡ã‚¿ãƒ–ãƒšãƒ¼ã‚¸å�–å¾—
+                int CurTabCnt = TabControl1.SelectedIndex;
+                // å�ˆè¨ˆã‚’è¡¨ç¤ºã�™ã‚‹
+                TotalPrice(CurTabCnt);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ã‚°ãƒªãƒƒãƒ‰ãƒœã‚¿ãƒ³èƒŒæ™¯è‰²è¨­å®šå‡¦ç�†
+        /// <summary>
+        /// ã‚°ãƒªãƒƒãƒ‰ãƒœã‚¿ãƒ³èƒŒæ™¯è‰²è¨­å®šå‡¦ç�†
+        /// </summary>
+        /// <param name="CurCell"></param>
+        private void SetGridButtonColor(DataGridViewButtonCell CurCell)
+        {
+            try
+            {
+                if (CommonMotions.cnvString(CurCell.Value).Length == 0)
+                {
+                    CurCell.Style.SelectionBackColor = s_ApprovalColor[0];
+                    CurCell.Style.BackColor = s_ApprovalColor[0];
+                }
+                else
+                {
+                    if (CurCell.ColumnIndex == (int)DispGridColumn.ApprovalCount2)
+                    {
+                        CurCell.Style.SelectionBackColor = s_ApprovalColor2[1];
+                        CurCell.Style.BackColor = s_ApprovalColor2[1];
+                    }
+                    else if (CurCell.ColumnIndex == (int)DispGridColumn.ApprovalCount1)
+                    {
+                        CurCell.Style.SelectionBackColor = s_ApprovalColor[1];
+                        CurCell.Style.BackColor = s_ApprovalColor[1];
+                    }
+                    else
+                    {
+                        CurCell.Style.SelectionBackColor = s_ApprovalColor3[1];
+                        CurCell.Style.BackColor = s_ApprovalColor3[1];
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ä¼�ç¥¨ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
+        /// <summary>
+        /// ä¼�ç¥¨ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
+        /// </summary>
+        /// <param name="CurTabCnt"></param>
+        /// <param name="dgv"></param>
+        private void SetSlipNo(int CurTabCnt, DataGridView dgv)
+        {
+            try
+            {
+                // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispGridColumn.EntryPrice].Value) == 0
+                    && CommonMotions.cnvInt(dgv.CurrentRow.Cells[(int)DispGridColumn.EntryPriceInTax].Value) == 0) return;
+                
+                // ã‚»ãƒƒãƒˆã�•ã‚Œã�¦ã�„ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
+                if (CommonMotions.cnvString(dgv.CurrentRow.Cells[(int)DispGridColumn.SlipNo].Value).Length > 0) return;
+
+                // è¡¨ç¤ºã‚°ãƒªãƒƒãƒ‰ã�§æœ€å¤§ã‚’æ¤œç´¢ã�™ã‚‹
+                string strWrkMonth = GetTargetMonth().Substring(2);
+                int nMax = (CommonMotions.cnvInt(strWrkMonth.Replace("/", "")) * 1000);
+                int nWork = 0;
+                string strWork = string.Empty;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    strWork = CommonMotions.cnvString(CurRow.Cells[(int)DispGridColumn.SlipNo].Value);
+                    if (strWork.Length == 0) continue;
+
+                    nWork = CommonMotions.cnvInt(strWork.Substring(1));
+                    if (nWork > nMax) nMax = nWork;
+                }
+                // ä¼�ç¥¨ç•ªå�·ã‚’ä½œæˆ�ã�™ã‚‹
+                StringBuilder strSlipNo = new StringBuilder();
+                strSlipNo.AppendFormat("{0}{1}", CommonMotions.cnvNumberToAlphaCharacter(CurTabCnt), (nMax + 1));
+
+                // ä¼�ç¥¨ç•ªå�·ã‚»ãƒƒãƒˆ
+                dgv.CurrentRow.Cells[(int)DispGridColumn.SlipNo].Value = strSlipNo.ToString();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 238)
@@ -5245,11 +5245,11 @@
         }
         #endregion
 
-        #region ä¼šç¤¾è¡Œäº‹ãƒ»å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¡Œè¡¨ç¤º
+        #region ä¼šç¤¾è¡Œäº‹è¡Œè¡¨ç¤º
         /// <summary>
-        /// ä¼šç¤¾è¡Œäº‹ãƒ»å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¡Œè¡¨ç¤º
+        /// ä¼šç¤¾è¡Œäº‹è¡Œè¡¨ç¤º
         /// </summary>
-        private void DispActionFixRow(int DepartmentCode, int iCode, string sName)
+        private void DispCompanyEvent(int DepartmentCode, int iCode, string sName)
         {
             IOActionScheduleData asdDB = new IOActionScheduleData();
             try
@@ -5260,11 +5260,12 @@
 
                 // --------------- è¡Œå‹•äºˆå®šã�®è¡¨ç¤º
                 List<ActionScheduleData> asdList = new List<ActionScheduleData>();
-                string strSQL = String.Format(" Where (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(TargetDate) AND DATE(TargetDate) <= STR_TO_DATE('{1}','%Y/%m/%d'))"
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.AppendFormat(" Where (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(TargetDate) AND DATE(TargetDate) <= STR_TO_DATE('{1}','%Y/%m/%d'))"
                                         , ColenderStartDate.ToShortDateString(), ColenderEndDate.ToShortDateString());
-                strSQL += string.Format(" And PersonCode = {0}", iCode);
-                strSQL += " ORDER BY TargetDate ASC";
-                if (!asdDB.SelectAction(strSQL, ref asdList)) return;
+                strSQL.AppendFormat(" And PersonCode = {0}", iCode);
+                strSQL.Append(" ORDER BY TargetDate ASC");
+                if (!asdDB.SelectAction(strSQL.ToString(), ref asdList)) return;
                 //if (asdList.Count == 0) return;
 
                 // è¡Œã�®è¿½åŠ 
@@ -5307,6 +5308,104 @@
         }
         #endregion
 
+        #region æ¤œæŸ»ãƒ»å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¡Œè¡¨ç¤º
+        /// <summary>
+        /// æ¤œæŸ»ãƒ»å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¡Œè¡¨ç¤º
+        /// </summary>
+        private void DispPatrol(int DepartmentCode, int iCode, string sName)
+        {
+            IOActionScheduleData asdDB = new IOActionScheduleData();
+            try
+            {
+                // æœ€åˆ�ã�®æ—¥ã‚’æ±‚ã‚�ã‚‹
+                DateTime ColenderStartDate = DateTime.Now.AddDays(-15);
+                DateTime ColenderEndDate = DateTime.Now.AddDays(15);
+
+                // --------------- è¡Œå‹•äºˆå®šã�®è¡¨ç¤º
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("(Select 1");
+                strSQL.Append(", DATE_FORMAT(TargetDate, '%Y/%m/%d') AS ResDate");
+                strSQL.Append(", DATE_FORMAT(TargetDate, '%H:%i') As ResTime");
+                strSQL.Append(", ActionSchedule as ResValue");
+                strSQL.Append(" From actionscheduledata");
+                strSQL.AppendFormat(" Where (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(TargetDate)", ColenderStartDate.ToShortDateString());
+                strSQL.AppendFormat(" AND DATE(TargetDate) <= STR_TO_DATE('{0}','%Y/%m/%d'))", ColenderEndDate.ToShortDateString());
+                strSQL.AppendFormat(" And length(ActionSchedule) <> 0");
+                strSQL.AppendFormat(" And PersonCode = {0})", iCode);
+
+                strSQL.Append(" Union (Select 2");
+                strSQL.Append(", DATE_FORMAT(A.RequestDate, '%Y/%m/%d') AS ResDate");
+                strSQL.Append(", DATE_FORMAT(A.RequestDate, '%H:%i') As ResTime");
+                strSQL.Append(", B.DetailString as ResValue");
+                strSQL.Append(" From sfpdata AS A, constructionbaseinfodetail AS B, processapproval AS C");
+                strSQL.AppendFormat(" Where (STR_TO_DATE('{0}', '%Y/%m/%d') <= DATE (A.RequestDate)", ColenderStartDate.ToShortDateString());
+                strSQL.AppendFormat(" AND DATE (A.RequestDate) <= STR_TO_DATE('2017/08/04', '%Y/%m/%d'))", ColenderEndDate.ToShortDateString());
+                strSQL.Append(" AND B.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat(" AND B.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+                strSQL.Append(" And C.ConstructionCode = A.ConstructionCode");
+                strSQL.AppendFormat(" And C.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.SafetyPatrol);
+                strSQL.Append(" And C.OrderNo = A.OrderNo");
+                strSQL.Append(" And C.SeqNo = 1");
+                strSQL.AppendFormat(" And C.ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
+                strSQL.Append(" order by 2 Asc, 1 asc, 3 Asc");
+
+                ArrayList asdList = new ArrayList();
+                if (!asdDB.ExecuteReader(strSQL.ToString(), ref asdList)) return;
+                //if (asdList.Count == 0) return;
+
+                // è¡Œã�®è¿½åŠ 
+                int LineCnt = dgvActionSchedule.Rows.Add();
+                // è¡Œå›ºå®š
+                dgvActionSchedule.Rows[LineCnt].Frozen = true;
+
+                // éƒ¨ç½²ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+                dgvActionSchedule.Rows[LineCnt].Cells[(int)ActionSchduleGridCount.DepartmentCode].Value = DepartmentCode;
+                // æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+                dgvActionSchedule.Rows[LineCnt].Cells[(int)ActionSchduleGridCount.PersonCode].Value = iCode;
+                // æ‹…å½“è€…å��ã‚»ãƒƒãƒˆ
+                dgvActionSchedule.Rows[LineCnt].Cells[(int)ActionSchduleGridCount.PersonName].Value = sName;
+
+                // äºˆå®šãƒ»å®Ÿç¸¾æ–‡å­—ã�®è¡¨ç¤º
+                dgvActionSchedule.Rows[LineCnt].Cells[(int)ActionSchduleGridCount.Action].Value = s_ActionSchduleFixed[0];
+                dgvActionSchedule.Rows[LineCnt].Cells[(int)ActionSchduleGridCount.Action].Style.ForeColor = Color.Green;
+                dgvActionSchedule.Rows[LineCnt].ReadOnly = true;
+
+                int ColCnt = dgvActionSchedule.ColumnCount - (int)ActionSchduleGridCount.Days1;
+                StringBuilder strWork = new StringBuilder();
+                DateTime dtTargetDate = DateTime.MinValue;
+                foreach (object[] objRec in asdList)
+                {
+                    for (int ix = 0; ix < ColCnt; ix++)
+                    {
+                        // æ—¥ä»˜ã�Œé�•ã�ˆã�°è¡¨ç¤ºã�—ã�ªã�„
+                        dtTargetDate = CommonMotions.cnvDate(objRec[1]);
+                        if (ColenderStartDate.AddDays(ix).Date != dtTargetDate.Date) continue;
+                        
+                        // è¡Œå‹•äºˆå®šã‚»ãƒƒãƒˆ
+                        strWork.Clear();
+                        strWork.Append(CommonMotions.cnvString(dgvActionSchedule.Rows[LineCnt].Cells[ix + (int)ActionSchduleGridCount.Days1].Value));
+                        
+                        if (strWork.Length > 0) strWork.Append("ï¼š");
+                        
+                        strWork.AppendFormat("{0}", CommonMotions.cnvString(objRec[3]));
+                        
+                        if (CommonMotions.cnvInt(objRec[0]) > 1) strWork.AppendFormat("{0}ã‚ˆã‚Š", CommonMotions.cnvDate(objRec[2]).ToShortTimeString());
+                        
+                        dgvActionSchedule.Rows[LineCnt].Cells[ix + (int)ActionSchduleGridCount.Days1].Value = strWork.ToString();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                asdDB.close(); asdDB = null;
+            }
+        }
+        #endregion
+
         #region ã‚¿ã‚¤ãƒˆãƒ«è¡Œä½�ç½®
         /// <summary>
         ///  ã‚¿ã‚¤ãƒˆãƒ«è¡Œä½�ç½®
@@ -5320,32 +5419,34 @@
         /// <summary>
         /// è¡Œå‹•äºˆå®šå�–å¾—ï¼³ï¼±ï¼¬ä½œæˆ�
         /// </summary>
-        private void CreateActionSQL(DateTime ColenderStartDate, DateTime ColenderEndDate, int EmployeeClass, ref string strSQL)
+        private void CreateActionSQL(DateTime ColenderStartDate, DateTime ColenderEndDate, int EmployeeClass, ref StringBuilder strSQL)
         {
             try
             {
-                strSQL = "SELECT";
-                strSQL += " A.DEPARTMENTCODE,";                                     // 0
-                strSQL += " A.DEPARTMENTSTRING,";                                   // 1
-                strSQL += " A.DISPLAYORDER,";                                       // 2
-                strSQL += " B.PERSONCODE,";                                         // 3
-                strSQL += " B.PERSONNAME,";                                         // 4
-                strSQL += " B.DISPLAYORDER,";                                       // 5
-                strSQL += " DATE_FORMAT(C.TargetDate, '%Y/%m/%d') AS DateC,";       // 6
-                strSQL += " C.ActionSchedule,";                                     // 7
-                strSQL += " DATE_FORMAT(D.AttendanceDate, '%Y/%m/%d') AS DateD,";   // 8
-                strSQL += " D.ActionResult,";                                        // 9
-                strSQL += " D.SeqNo";
-                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B";
-                strSQL += " LEFT JOIN ACTIONSCHEDULEDATA C ON B.PERSONCODE = C.PERSONCODE";
-                strSQL += String.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(TargetDate) AND DATE(TargetDate) <= STR_TO_DATE('{1}','%Y/%m/%d'))"
+                strSQL.Clear();
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.DEPARTMENTCODE,");                                     // 0
+                strSQL.Append(" A.DEPARTMENTSTRING,");                                   // 1
+                strSQL.Append(" A.DISPLAYORDER,");                                       // 2
+                strSQL.Append(" B.PERSONCODE,");                                         // 3
+                strSQL.Append(" B.PERSONNAME,");                                         // 4
+                strSQL.Append(" B.DISPLAYORDER,");                                       // 5
+                strSQL.Append(" DATE_FORMAT(C.TargetDate, '%Y/%m/%d') AS DateC,");       // 6
+                strSQL.Append(" C.ActionSchedule,");                                     // 7
+                strSQL.Append(" DATE_FORMAT(D.AttendanceDate, '%Y/%m/%d') AS DateD,");   // 8
+                strSQL.Append(" D.ActionResult,");                                        // 9
+                strSQL.Append(" D.SeqNo");
+                strSQL.Append(" FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B");
+                strSQL.Append(" LEFT JOIN ACTIONSCHEDULEDATA C ON C.PERSONCODE = B.PERSONCODE");
+                strSQL.AppendFormat(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(C.TargetDate) AND DATE(C.TargetDate) <= STR_TO_DATE('{1}','%Y/%m/%d'))"
                                         , ColenderStartDate.ToShortDateString(), ColenderEndDate.ToShortDateString());
-                strSQL += " LEFT JOIN AttendanceDailyData AS D ON D.PersonCode = B.PERSONCODE AND DATE(D.AttendanceDate) = DATE(C.TargetDate)";
-                strSQL += " Where A.ACTIONSCHEDULEFLG = 0";
-                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
-                strSQL += string.Format(" And B.EmployeeClassFlg = {0}", EmployeeClass);
-                strSQL += " AND B.DELETEFLG = 0";
-                strSQL += " Order By A.DISPLAYORDER ASC, B.DISPLAYORDER ASC, DateC ASC, DateD ASC, D.SeqNo ASC";
+                strSQL.Append(" AND LENGTH(C.ActionSchedule) > 0");
+                strSQL.Append(" LEFT JOIN AttendanceDailyData AS D ON D.PersonCode = B.PERSONCODE AND DATE(D.AttendanceDate) = DATE(C.TargetDate)");
+                strSQL.Append(" Where A.ACTIONSCHEDULEFLG = 0");
+                strSQL.Append(" AND A.DEPARTMENTCODE = B.DEPARTMENTCODE");
+                strSQL.AppendFormat(" And B.EmployeeClassFlg = {0}", EmployeeClass);
+                strSQL.Append(" AND B.DELETEFLG = 0");
+                strSQL.Append(" Order By A.DISPLAYORDER ASC, B.DISPLAYORDER ASC, DateC ASC, DateD ASC, D.SeqNo ASC");
             }
             catch (Exception ex)
             {
@@ -5398,21 +5499,21 @@
                 dgvActionSchedule.FirstDisplayedScrollingColumnIndex = ((int)ActionSchduleGridCount.Days1 + 15) - 3;
 
                 // ä¼šç¤¾äºˆå®šè¡Œ
-                DispActionFixRow(CommonDefine.s_CompanyActionCode, CommonDefine.s_CompanyActionCode, CommonDefine.s_CompanyActionName);
+                DispCompanyEvent(CommonDefine.s_CompanyActionCode, CommonDefine.s_CompanyActionCode, CommonDefine.s_CompanyActionName);
                 // ä¼šç¤¾è¡Œäº‹è¡¨ç¤ºè¡Œ
                 m_CompanyActionRow = dgv.RowCount - 1;
-                // å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¡Œ
-                DispActionFixRow(CommonDefine.s_CompanyActionCode, CommonDefine.s_DivisionActionCode, CommonDefine.s_DivisionActionName);
+                // æ¤œæŸ»ãƒ»å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«è¡Œ
+                DispPatrol(CommonDefine.s_CompanyActionCode, CommonDefine.s_DivisionActionCode, CommonDefine.s_DivisionActionName);
                 // éƒ¨ç½²è¡Œäº‹è¡¨ç¤ºè¡Œ
                 m_DivisionActionRow = dgv.RowCount - 1;
 
                 // SQLä½œæˆ�
-                string strSQL = string.Empty;
+                StringBuilder strSQL = new StringBuilder();
                 CreateActionSQL(ColenderStartDate, ColenderEndDate, (int)CommonDefine.EmployeeClassFlg.Regular, ref strSQL);
                 
                 // ãƒ‡ãƒ¼ã‚¿å�–å¾—
                 ArrayList DataList = new ArrayList();
-                if (!asdDB.ExecuteReader(strSQL, ref DataList)) return;
+                if (!asdDB.ExecuteReader(strSQL.ToString(), ref DataList)) return;
 
                 DepartmentMaster DepartmentRec = new DepartmentMaster();
                 PersonInChargeMaster PersonRec = new PersonInChargeMaster();
@@ -5658,12 +5759,12 @@
                 int ColCnt = dgvActionSchedule.ColumnCount - (int)ActionSchduleGridCount.Days1;
 
                 // SQLä½œæˆ�
-                string strSQL = string.Empty;
+                StringBuilder strSQL = new StringBuilder();
                 CreateActionSQL(ColenderStartDate, ColenderEndDate, (int)CommonDefine.EmployeeClassFlg.OutSource, ref strSQL);
 
                 // ãƒ‡ãƒ¼ã‚¿å�–å¾—
                 ArrayList DataList = new ArrayList();
-                if (!asdDB.ExecuteReader(strSQL, ref DataList)) return;
+                if (!asdDB.ExecuteReader(strSQL.ToString(), ref DataList)) return;
 
                 DepartmentMaster DepartmentRec = new DepartmentMaster();
                 PersonInChargeMaster PersonRec = new PersonInChargeMaster();
Index: branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 238)
@@ -265,9 +265,12 @@
     <Compile Include="Forms\DataEntry\ApprovalPerson\FrmApprovalPersonAuxiliary.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\DataEntry\ApprovalPerson\SourceUpdate.cs">
+    <Compile Include="Forms\DataEntry\ApprovalPerson\FrmAppManAux.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\DataEntry\ApprovalScreen\FrmAppScrnAux.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DataEntry\ConstructionBaseInfo\DataChange.cs">
       <SubType>Form</SubType>
     </Compile>
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 237)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 238)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.57")]
-[assembly: AssemblyFileVersion("1.0.0.57")]
+[assembly: AssemblyVersion("1.0.0.59")]
+[assembly: AssemblyFileVersion("1.0.0.59")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
