Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 305)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 119;
+        public static int s_SystemVersion = 120;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfo.cs	(revision 305)
@@ -80,6 +80,9 @@
             BillingSplitFlg,
             BillingSendDate,
             LedgerComplateDate,
+            InspectPlanningDate,
+            InspectExecuteDate,
+            RevCompleteDate,
             EntryDate,
             UpdateDate,
         }
@@ -143,7 +146,10 @@
                             || strWork.Equals("BillingStartDate")
                             || strWork.Equals("BillingDate")
                             || strWork.Equals("BillingSendDate")
-                            || strWork.Equals("LedgerComplateDate"))
+                            || strWork.Equals("LedgerComplateDate")
+                            || strWork.Equals("InspectPlanningDate")
+                            || strWork.Equals("InspectExecuteDate")
+                            || strWork.Equals("RevCompleteDate"))
                     {
                         strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d')", strWork);
                     }
@@ -313,6 +319,10 @@
                 strcmd.AppendFormat(", {0}", data.BillingSplitFlg);
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.BillingSendDate.ToShortDateString());
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.LedgerComplateDate.ToShortDateString());
+                
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.InspectPlanningDate.ToShortDateString());
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.InspectExecuteDate.ToShortDateString());
+                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.RevCompleteDate.ToShortDateString());
 
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.EntryDate);
                 strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.UpdateDate);
@@ -415,6 +425,10 @@
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.BillingSendDate.ToShortDateString());
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.LedgerComplateDate.ToShortDateString());
 
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.InspectPlanningDate.ToShortDateString());
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.InspectExecuteDate.ToShortDateString());
+                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.RevCompleteDate.ToShortDateString());
+
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
                     strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
                     strcmd.Append(")");
@@ -508,6 +522,10 @@
                 strcmd.AppendFormat(", BillingSendDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.BillingSendDate.ToShortDateString());
                 strcmd.AppendFormat(", LedgerComplateDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.LedgerComplateDate.ToShortDateString());
 
+                strcmd.AppendFormat(", InspectPlanningDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.InspectPlanningDate.ToShortDateString());
+                strcmd.AppendFormat(", InspectExecuteDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.InspectExecuteDate.ToShortDateString());
+                strcmd.AppendFormat(", RevCompleteDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.RevCompleteDate.ToShortDateString());
+
                 strcmd.Append(", UpdateDate = NOW()");
                 strcmd.Append(AddSQLString);
 
@@ -620,6 +638,10 @@
                 wrk.BillingSendDate = DateTime.Parse(objwrk[(int)TableColumn.BillingSendDate].ToString());
                 wrk.LedgerComplateDate = DateTime.Parse(objwrk[(int)TableColumn.LedgerComplateDate].ToString());
 
+                wrk.InspectPlanningDate = DateTime.Parse(objwrk[(int)TableColumn.InspectPlanningDate].ToString());
+                wrk.InspectExecuteDate = DateTime.Parse(objwrk[(int)TableColumn.InspectExecuteDate].ToString());
+                wrk.RevCompleteDate = DateTime.Parse(objwrk[(int)TableColumn.RevCompleteDate].ToString());
+
                 wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
                 wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
             }
@@ -796,6 +818,15 @@
                     case (int)TableColumn.LedgerComplateDate:
                         strcmd.AppendFormat(" LedgerComplateDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
                         break;
+                    case (int)TableColumn.InspectPlanningDate:
+                        strcmd.AppendFormat(" InspectPlanningDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
+                    case (int)TableColumn.InspectExecuteDate:
+                        strcmd.AppendFormat(" InspectExecuteDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
+                    case (int)TableColumn.RevCompleteDate:
+                        strcmd.AppendFormat(" RevCompleteDate = STR_TO_DATE('{0}','%Y/%m/%d')", ((DateTime)value).ToShortDateString());
+                        break;
                 }
 
                 strcmd.Append(", UpdateDate = NOW()");
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs	(revision 305)
@@ -31,6 +31,9 @@
                                                                                     {13,"BillingStartDate"},
                                                                                     {14,"BillingDate"},
                                                                                     {15,"ConstrPreparationDate"},   // 2016/10/07 è¿½åŠ 
+                                                                                    {16,"InspectPlanningDate"},     // 2017/12/21 Add
+                                                                                    {17,"InspectExecuteDate"},
+                                                                                    {18,"RevCompleteDate"},
                                                                                 };
         /// <summary>
         /// å·¥äº‹åŸºæœ¬æƒ…å ±æ—¥ä»˜é …ç›®å��ç§°ãƒ†ãƒ¼ãƒ–ãƒ«
@@ -42,7 +45,6 @@
                                                                                     {"OrderDate","å�—æ³¨æ—¥"},
                                                                                     {"OrderStartingDate","é–‹å§‹äºˆå®šæ—¥"},
                                                                                     {"OrderCompletionDate","å®Œäº†äºˆå®šæ—¥"},
-                                                                                    {"ConstrPreparationDate","æ–½å·¥é–‹å§‹æº–å‚™æ—¥"},
                                                                                     {"ConstructionStartingDate","æ–½å·¥é–‹å§‹æ—¥"},
                                                                                     {"ConstructionCompletionDate","æ–½å·¥å®Œäº†æ—¥"},
                                                                                     {"TransferConstructionDate","å·¥äº‹ç§»ç®¡æ—¥"},
@@ -51,6 +53,10 @@
                                                                                     {"ConstructionPeriodEnd","å¥‘ç´„å·¥æœŸå®Œäº†"},
                                                                                     {"BillingStartDate","è«‹æ±‚æº–å‚™é–‹å§‹æ—¥"},
                                                                                     {"BillingDate",	"è«‹æ±‚æ—¥"},
+                                                                                    {"ConstrPreparationDate","æ–½å·¥é–‹å§‹æº–å‚™æ—¥"},
+                                                                                    {"InspectPlanningDate","æ¤œæŸ»äºˆå®šæ—¥"},
+                                                                                    {"InspectExecuteDate","æ¤œæŸ»å®Ÿè¡Œæ—¥"},
+                                                                                    {"RevCompleteDate","æ¤œæŸ»æ˜¯æ­£å®Œäº†æ—¥"},
                                                                                 };
         /// <summary>
         /// å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯å¯¾è±¡æ—¥ä»˜ãƒ†ãƒ¼ãƒ–ãƒ«
@@ -117,6 +123,18 @@
             /// 15:æ–½å·¥é–‹å§‹æº–å‚™æ—¥
             /// </summary>
             ConstrPreparationDate,
+            /// <summary>
+            /// 16:æ¤œæŸ»äºˆå®šæ—¥
+            /// </summary>
+            InspectPlanningDate,
+            /// <summary>
+            /// 17:æ¤œæŸ»å®Ÿè¡Œæ—¥
+            /// </summary>
+            InspectExecuteDate,
+            /// <summary>
+            /// 18:æ¤œæŸ»æ˜¯æ­£å®Œäº†æ—¥
+            /// </summary>
+            RevCompleteDate,
         }
         #endregion
 
@@ -237,56 +255,59 @@
 
         #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
 
-        private int         m_ConstructionCode = 0;	                            // å·¥äº‹ã‚³ãƒ¼ãƒ‰
-        private int         m_TyingFlg = 0;                                     // ç´�ä»˜ãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
-        private int         m_JoinFlg = 0;                                      // çµ�å�ˆå¥‘ç´„å·¥äº‹ãƒ•ãƒ©ã‚°
-        private int         m_ConstructionYear = 0;	                            // å·¥äº‹å¹´åº¦
-        private int         m_ConstructionPeriod = 0;	                        // å·¥äº‹æœŸ
-        private DateTime    m_RequestedDate = DateTime.MinValue;                // ä¾�é ¼å�—ã�‘æ—¥
-        private DateTime    m_EstimatesSubmitDeadline = DateTime.MinValue;      // è¦‹ç©�æ��å‡ºæœŸé™�
-        private DateTime    m_EstimatesSubmittedDate = DateTime.MinValue;       // è¦‹ç©�æ��å‡ºæ—¥
-        private DateTime    m_ProvisionalOrderDate = DateTime.MinValue;         // ä»®å�—æ³¨æ—¥
-        private DateTime    m_OrderDate = DateTime.MinValue;	                // å�—æ³¨æ—¥
-        private DateTime    m_OrderStartingDate = DateTime.MinValue;	        // é–‹å§‹äºˆå®šæ—¥
-        private DateTime    m_OrderCompletionDate = DateTime.MinValue;	        // å®Œäº†äºˆå®šæ—¥
-        private DateTime    m_PreparationStartDate = DateTime.MinValue;         // æ–½å·¥æº–å‚™é–‹å§‹æ—¥
-        private DateTime    m_ConstructionStartingDate = DateTime.MinValue;	    // æ–½å·¥é–‹å§‹æ—¥
-        private DateTime    m_ConstructionCompletionDate = DateTime.MinValue;   // æ–½å·¥å®Œäº†æ—¥
-        private DateTime    m_NonOrderDate = DateTime.MinValue;                 // é�žå�—æ³¨æ—¥
-        private double      m_OrdersDecisionPrice = 0;	                        // ç¨ŽæŠœå�—æ³¨æ±ºå®šé‡‘é¡�
-        private double      m_OrdersDecisionPriceInTax = 0;	                    // ç¨Žè¾¼å�—æ³¨æ±ºå®šé‡‘é¡�
-        private int         m_SalesPersonCode = 0;	                            // å–¶æ¥­æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
-        private int         m_ConstructionPersonCode = 0;	                    // å·¥äº‹æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
-        private int         m_ConstrSubPersonCode = 0;	                        // å·¥äº‹å‰¯æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
-        private int         m_ConstructionInstructor = 0;                       // å·¥äº‹æŒ‡å°Žå“¡ã‚³ãƒ¼ãƒ‰
-        private int         m_TransferConstruction = 0;                         // ç§»ç®¡å…ˆã‚³ãƒ¼ãƒ‰
-        private DateTime    m_TransferConstructionDate = DateTime.MinValue;     // å·¥äº‹ç§»ç®¡æ—¥
-        private int         m_OrderersDivision = 0;                             // ç™ºæ³¨è€…åŒºåˆ†
-        private int         m_OrderersCode = 0;                                 // ç™ºæ³¨è€…ã‚³ãƒ¼ãƒ‰
-        private DateTime    m_EstimatesExpirationDate = DateTime.MinValue;      // è¦‹ç©�æœ‰åŠ¹æœŸé™�
-        private DateTime    m_ConstructionPeriodStart = DateTime.MinValue;      // å¥‘ç´„å·¥æœŸé–‹å§‹
-        private DateTime    m_ConstructionPeriodEnd = DateTime.MinValue;        // å¥‘ç´„å·¥æœŸå®Œäº†
-        private DateTime    m_ConstructionPeriodStart2 = DateTime.MinValue;     // å¥‘ç´„å·¥æœŸé–‹å§‹ï¼ˆå»¶é•·æ™‚ï¼‰
-        private DateTime    m_ConstructionPeriodEnd2 = DateTime.MinValue;       // å¥‘ç´„å·¥æœŸå®Œäº†ï¼ˆå»¶é•·æ™‚ï¼‰
-        private DateTime    m_StartDate = DateTime.MinValue;	                // å·¥äº‹é–‹å§‹æ—¥
-        private DateTime    m_EndDate = DateTime.MinValue;	                    // å·¥äº‹çµ‚äº†æ—¥
-        private DateTime    m_PurchaseOrderMailingDate = DateTime.MinValue;     // æ³¨æ–‡æ›¸éƒµé€�æ—¥
-        private DateTime    m_PurchaseOrderReturnDate = DateTime.MinValue;      // æ³¨æ–‡æ›¸è¿”é€�æ—¥
-        private DateTime    m_PurchaseOrderReturnCheckDate = DateTime.MinValue; // æ³¨æ–‡æ›¸è¿”é€�ç¢ºèª�æ—¥
-        private int         m_ConsumptionTaxFlg = 1;                            // æ¶ˆè²»ç¨Žãƒ•ãƒ©ã‚°
-        private int         m_PrimeContractorFlg = 1;	                        // å…ƒè«‹ãƒ•ãƒ©ã‚°
-        private int         m_SalesCostFlg = 1;	                                // å–¶æ¥­çµŒè²»ç™ºç”Ÿãƒ•ãƒ©ã‚°
-        private int         m_ConstructionStatusFlg = -1;	                    // å·¥äº‹çŠ¶æ…‹ãƒ•ãƒ©ã‚°
-        private int         m_ConstructionType = 0;                             // å·¥äº‹ç¨®åˆ¥åŒºåˆ†å��ç§°ã‚³ãƒ¼ãƒ‰
-        private int         m_EstimateType = 1;                                 // è¦‹ç©�ç¨®åˆ¥
-        private DateTime    m_BillingStartDate = DateTime.MinValue;	            // è«‹æ±‚æº–å‚™é–‹å§‹æ—¥
-        private DateTime    m_BillingDate = DateTime.MinValue;	                // è«‹æ±‚æ—¥
-        private int         m_BillingSplitFlg = 1;                              // è«‹æ±‚å›žæ•°ãƒ•ãƒ©ã‚°
-        private DateTime    m_BillingSendDate = DateTime.MinValue;              // è«‹æ±‚æ›¸éƒµé€�/æ‰‹æ¸¡ã�—æ—¥
-        private DateTime    m_LedgerComplateDate = DateTime.MinValue;           // å·¥äº‹è©³ç´°å�°å¸³å…¥åŠ›å®Œäº†æ—¥ä»˜
+        private int m_ConstructionCode = 0;	                            // å·¥äº‹ã‚³ãƒ¼ãƒ‰
+        private int m_TyingFlg = 0;                                     // ç´�ä»˜ãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
+        private int m_JoinFlg = 0;                                      // çµ�å�ˆå¥‘ç´„å·¥äº‹ãƒ•ãƒ©ã‚°
+        private int m_ConstructionYear = 0;	                            // å·¥äº‹å¹´åº¦
+        private int m_ConstructionPeriod = 0;	                        // å·¥äº‹æœŸ
+        private DateTime m_RequestedDate = DateTime.MinValue;                // ä¾�é ¼å�—ã�‘æ—¥
+        private DateTime m_EstimatesSubmitDeadline = DateTime.MinValue;      // è¦‹ç©�æ��å‡ºæœŸé™�
+        private DateTime m_EstimatesSubmittedDate = DateTime.MinValue;       // è¦‹ç©�æ��å‡ºæ—¥
+        private DateTime m_ProvisionalOrderDate = DateTime.MinValue;         // ä»®å�—æ³¨æ—¥
+        private DateTime m_OrderDate = DateTime.MinValue;	                // å�—æ³¨æ—¥
+        private DateTime m_OrderStartingDate = DateTime.MinValue;	        // é–‹å§‹äºˆå®šæ—¥
+        private DateTime m_OrderCompletionDate = DateTime.MinValue;	        // å®Œäº†äºˆå®šæ—¥
+        private DateTime m_PreparationStartDate = DateTime.MinValue;         // æ–½å·¥æº–å‚™é–‹å§‹æ—¥
+        private DateTime m_ConstructionStartingDate = DateTime.MinValue;	    // æ–½å·¥é–‹å§‹æ—¥
+        private DateTime m_ConstructionCompletionDate = DateTime.MinValue;   // æ–½å·¥å®Œäº†æ—¥
+        private DateTime m_NonOrderDate = DateTime.MinValue;                 // é�žå�—æ³¨æ—¥
+        private double m_OrdersDecisionPrice = 0;	                        // ç¨ŽæŠœå�—æ³¨æ±ºå®šé‡‘é¡�
+        private double m_OrdersDecisionPriceInTax = 0;	                    // ç¨Žè¾¼å�—æ³¨æ±ºå®šé‡‘é¡�
+        private int m_SalesPersonCode = 0;	                            // å–¶æ¥­æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
+        private int m_ConstructionPersonCode = 0;	                    // å·¥äº‹æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
+        private int m_ConstrSubPersonCode = 0;	                        // å·¥äº‹å‰¯æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
+        private int m_ConstructionInstructor = 0;                       // å·¥äº‹æŒ‡å°Žå“¡ã‚³ãƒ¼ãƒ‰
+        private int m_TransferConstruction = 0;                         // ç§»ç®¡å…ˆã‚³ãƒ¼ãƒ‰
+        private DateTime m_TransferConstructionDate = DateTime.MinValue;     // å·¥äº‹ç§»ç®¡æ—¥
+        private int m_OrderersDivision = 0;                             // ç™ºæ³¨è€…åŒºåˆ†
+        private int m_OrderersCode = 0;                                 // ç™ºæ³¨è€…ã‚³ãƒ¼ãƒ‰
+        private DateTime m_EstimatesExpirationDate = DateTime.MinValue;      // è¦‹ç©�æœ‰åŠ¹æœŸé™�
+        private DateTime m_ConstructionPeriodStart = DateTime.MinValue;      // å¥‘ç´„å·¥æœŸé–‹å§‹
+        private DateTime m_ConstructionPeriodEnd = DateTime.MinValue;        // å¥‘ç´„å·¥æœŸå®Œäº†
+        private DateTime m_ConstructionPeriodStart2 = DateTime.MinValue;     // å¥‘ç´„å·¥æœŸé–‹å§‹ï¼ˆå»¶é•·æ™‚ï¼‰
+        private DateTime m_ConstructionPeriodEnd2 = DateTime.MinValue;       // å¥‘ç´„å·¥æœŸå®Œäº†ï¼ˆå»¶é•·æ™‚ï¼‰
+        private DateTime m_StartDate = DateTime.MinValue;	                // å·¥äº‹é–‹å§‹æ—¥
+        private DateTime m_EndDate = DateTime.MinValue;	                    // å·¥äº‹çµ‚äº†æ—¥
+        private DateTime m_PurchaseOrderMailingDate = DateTime.MinValue;     // æ³¨æ–‡æ›¸éƒµé€�æ—¥
+        private DateTime m_PurchaseOrderReturnDate = DateTime.MinValue;      // æ³¨æ–‡æ›¸è¿”é€�æ—¥
+        private DateTime m_PurchaseOrderReturnCheckDate = DateTime.MinValue; // æ³¨æ–‡æ›¸è¿”é€�ç¢ºèª�æ—¥
+        private int m_ConsumptionTaxFlg = 1;                            // æ¶ˆè²»ç¨Žãƒ•ãƒ©ã‚°
+        private int m_PrimeContractorFlg = 1;	                        // å…ƒè«‹ãƒ•ãƒ©ã‚°
+        private int m_SalesCostFlg = 1;	                                // å–¶æ¥­çµŒè²»ç™ºç”Ÿãƒ•ãƒ©ã‚°
+        private int m_ConstructionStatusFlg = -1;	                    // å·¥äº‹çŠ¶æ…‹ãƒ•ãƒ©ã‚°
+        private int m_ConstructionType = 0;                             // å·¥äº‹ç¨®åˆ¥åŒºåˆ†å��ç§°ã‚³ãƒ¼ãƒ‰
+        private int m_EstimateType = 1;                                 // è¦‹ç©�ç¨®åˆ¥
+        private DateTime m_BillingStartDate = DateTime.MinValue;	            // è«‹æ±‚æº–å‚™é–‹å§‹æ—¥
+        private DateTime m_BillingDate = DateTime.MinValue;	                // è«‹æ±‚æ—¥
+        private int m_BillingSplitFlg = 1;                              // è«‹æ±‚å›žæ•°ãƒ•ãƒ©ã‚°
+        private DateTime m_BillingSendDate = DateTime.MinValue;              // è«‹æ±‚æ›¸éƒµé€�/æ‰‹æ¸¡ã�—æ—¥
+        private DateTime m_LedgerComplateDate = DateTime.MinValue;           // å·¥äº‹è©³ç´°å�°å¸³å…¥åŠ›å®Œäº†æ—¥ä»˜
+        private DateTime m_InspectPlanningDate = DateTime.MinValue;          // æ¤œæŸ»äºˆå®šæ—¥
+        private DateTime m_InspectExecuteDate = DateTime.MinValue;           // æ¤œæŸ»å®Ÿè¡Œæ—¥
+        private DateTime m_RevCompleteDate = DateTime.MinValue;              // æ¤œæŸ»æ˜¯æ­£å®Œäº†æ—¥
 
-        private DateTime    m_EntryDate = DateTime.Now;                         // ç™»éŒ²æ—¥ä»˜
-        private DateTime    m_UpdateDate = DateTime.Now;                        // æ›´æ–°æ—¥ä»˜
+        private DateTime m_EntryDate = DateTime.Now;                         // ç™»éŒ²æ—¥ä»˜
+        private DateTime m_UpdateDate = DateTime.Now;                        // æ›´æ–°æ—¥ä»˜
 
         #endregion
 
@@ -675,6 +696,30 @@
             set { m_LedgerComplateDate = value; }
         }
         /// <summary>
+        /// æ¤œæŸ»äºˆå®šæ—¥
+        /// </summary>
+        public DateTime InspectPlanningDate
+        {
+            get { return m_InspectPlanningDate; }
+            set { m_InspectPlanningDate = value; }
+        }
+        /// <summary>
+        /// æ¤œæŸ»å®Ÿè¡Œæ—¥
+        /// </summary>
+        public DateTime InspectExecuteDate
+        {
+            get { return m_InspectExecuteDate; }
+            set { m_InspectExecuteDate = value; }
+        }
+        /// <summary>
+        /// æ¤œæŸ»æ˜¯æ­£å®Œäº†æ—¥
+        /// </summary>
+        public DateTime RevCompleteDate
+        {
+            get { return m_RevCompleteDate; }
+            set { m_RevCompleteDate = value; }
+        }
+        /// <summary>
         /// ç™»éŒ²æ—¥ä»˜
         /// </summary>
         public DateTime EntryDate
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 305)
@@ -493,7 +493,6 @@
                 strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
                 strSQL.Append(s_SQLPart3_2[4]);
                 strSQL.AppendFormat(" And App.ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
-                strSQL.Append(") ");
 
                 // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
                 strSQL.Append(GetDepartmentString());
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 305)
@@ -378,6 +378,18 @@
             /// 82:�¿‹�‹æ•ª–¼�Ì
             /// </summary>
             BillingTypeName,
+            /// <summary>
+            /// 83:ŒŸ�¸—\’è“ú
+            /// </summary>
+            InspectPlanningDate,
+            /// <summary>
+            /// 84:ŒŸ�¸ŽÀ�s“ú
+            /// </summary>
+            InspectExecuteDate,
+            /// <summary>
+            /// 85:ŒŸ�¸�¥�³Š®—¹“ú
+            /// </summary>
+            RevCompleteDate,
         }
         #endregion
 
@@ -538,19 +550,19 @@
         /// <summary>
         /// �HŽ–ŠT—v
         /// </summary>
-        private const int s_OverviewLength = 120;
+        private const int s_OverviewLength = 300;
         /// <summary>
         /// Žx‹‹•i
         /// </summary>
-        private const int s_PaidGoodsLength = 120;
+        private const int s_PaidGoodsLength = 300;
         /// <summary>
         /// •Ê“r�HŽ–
         /// </summary>
-        private const int s_SeparateProjectLength = 120;
+        private const int s_SeparateProjectLength = 300;
         /// <summary>
         /// ”õ�l
         /// </summary>
-        private const int s_NoteLength = 120;
+        private const int s_NoteLength = 300;
 
         /// <summary>
         /// •Ê“r�HŽ–ƒfƒtƒHƒ‹ƒg•¶Žš
@@ -662,6 +674,10 @@
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 80:�HŽ–•›’S“–ŽÒƒR�[ƒh
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 81:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
                         {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 82:�¿‹�‹æ•ª–¼�Ì
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 83:ŒŸ�¸—\’è“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 84:ŒŸ�¸ŽÀ�s“ú
+                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 85:ŒŸ�¸�¥�³Š®—¹“ú
+
         };
         //�@0:ˆË—ŠŽó‚¯’†�|1:Œ©�Ï’ñ�o�|2:ˆê”Ê•â�C�HŽ–�|3:‰¼ Žó ’��|4:Žó’��|5:•”��ˆøŒp
         //�|6:Ž{�H�€”õ�|7:Ž{�HŠJŽn�|8:Ž{�HŠ®—¹�|9:�¿‹��€”õ�|10:�¿‹�Š®—¹�|11:”ñŽó’�
@@ -762,6 +778,9 @@
                         { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 80:�HŽ–•›’S“–ŽÒƒR�[ƒh
                         { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 81:�HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
                         { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 82:�¿‹�‹æ•ª–¼�Ì
+                        { false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},    // 83:ŒŸ�¸—\’è“ú
+                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 84:ŒŸ�¸ŽÀ�s“ú
+                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 85:ŒŸ�¸�¥�³Š®—¹“ú
 
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 1:�Á”ï�Åƒtƒ‰ƒO
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 2:Œ³�¿ƒtƒ‰ƒO �¦–¢Žg—p
@@ -805,8 +824,11 @@
                                                     "textBoxEX3",		    // Ž{�H�€”õŠJŽn“ú
                                                     //"textBoxEX8",		    // ’�•¶�‘—X‘—“ú
                                                     //"textBoxEX9",		    // ’�•¶�‘•Ô‘—“ú
-                                                    //"textBoxEX10",		    // ’�•¶�‘•Ô‘—Šm”F“ú
+                                                    //"textBoxEX10",		// ’�•¶�‘•Ô‘—Šm”F“ú
                                                     //"textBoxEX6",		    // �¿‹��‘—X‘—/Žè“n‚µ“ú
+                                                    "textBoxEX7",           // ŒŸ�¸—\’è“ú
+                                                    "textBoxEX8",           // ŒŸ�¸ŽÀ�s“ú
+                                                    "textBoxEX9",           // ŒŸ�¸�¥�³Š®—¹“ú
                                                  };
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs	(revision 305)
@@ -78,14 +78,11 @@
             this.txtInput07 = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.comboBoxEX1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbDisplayPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label4 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
             this.rdbEstimateType2 = new System.Windows.Forms.RadioButton();
             this.rdbEstimateType3 = new System.Windows.Forms.RadioButton();
             this.rdbEstimateType1 = new System.Windows.Forms.RadioButton();
-            this.cmbConstructionType = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput08 = new System.Windows.Forms.TextBox();
             this.btnSerchZip = new System.Windows.Forms.Button();
             this.label20 = new System.Windows.Forms.Label();
@@ -118,12 +115,9 @@
             this.label44 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.cmbOrdersDivision = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.btnOrderer = new System.Windows.Forms.Button();
-            this.cmbDisplayOrderers = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput05 = new System.Windows.Forms.TextBox();
             this.panel4 = new System.Windows.Forms.Panel();
-            this.btnChangePrice = new System.Windows.Forms.Button();
             this.label101 = new System.Windows.Forms.Label();
             this.label100 = new System.Windows.Forms.Label();
             this.label99 = new System.Windows.Forms.Label();
@@ -130,24 +124,16 @@
             this.label97 = new System.Windows.Forms.Label();
             this.label39 = new System.Windows.Forms.Label();
             this.label30 = new System.Windows.Forms.Label();
-            this.txtInput28 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label27 = new System.Windows.Forms.Label();
-            this.txtInput25 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.lblTransferDate = new System.Windows.Forms.Label();
             this.label36 = new System.Windows.Forms.Label();
-            this.cmbTransferConstruction = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput26 = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
             this.txtInput01 = new System.Windows.Forms.TextBox();
             this.label33 = new System.Windows.Forms.Label();
-            this.txtInput27 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput02 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label24 = new System.Windows.Forms.Label();
-            this.txtInput06 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label22 = new System.Windows.Forms.Label();
-            this.txtInput12 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label12 = new System.Windows.Forms.Label();
-            this.txtInput13 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label15 = new System.Windows.Forms.Label();
             this.label38 = new System.Windows.Forms.Label();
             this.label68 = new System.Windows.Forms.Label();
@@ -158,17 +144,12 @@
             this.label23 = new System.Windows.Forms.Label();
             this.label70 = new System.Windows.Forms.Label();
             this.label71 = new System.Windows.Forms.Label();
-            this.textBoxEX2 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX1 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput03 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label62 = new System.Windows.Forms.Label();
             this.label72 = new System.Windows.Forms.Label();
             this.label73 = new System.Windows.Forms.Label();
             this.label61 = new System.Windows.Forms.Label();
             this.label55 = new System.Windows.Forms.Label();
-            this.txtInput38 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label54 = new System.Windows.Forms.Label();
-            this.txtInput34 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label66 = new System.Windows.Forms.Label();
             this.label56 = new System.Windows.Forms.Label();
             this.label75 = new System.Windows.Forms.Label();
@@ -187,9 +168,6 @@
             this.btnFluctuation = new System.Windows.Forms.Button();
             this.rdbExistsFluctuation = new System.Windows.Forms.RadioButton();
             this.rdbNotFluctuation = new System.Windows.Forms.RadioButton();
-            this.comboBoxEX4 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.comboBoxEX3 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbDisplayConstrSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label46 = new System.Windows.Forms.Label();
             this.txtInput32 = new System.Windows.Forms.TextBox();
             this.label47 = new System.Windows.Forms.Label();
@@ -197,15 +175,8 @@
             this.txtInput31 = new System.Windows.Forms.TextBox();
             this.label41 = new System.Windows.Forms.Label();
             this.label50 = new System.Windows.Forms.Label();
-            this.textBoxEX3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput35 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label25 = new System.Windows.Forms.Label();
-            this.txtInput04 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label42 = new System.Windows.Forms.Label();
-            this.textBoxEX5 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.textBoxEX4 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput29 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.txtInput30 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label81 = new System.Windows.Forms.Label();
             this.label82 = new System.Windows.Forms.Label();
             this.label77 = new System.Windows.Forms.Label();
@@ -214,9 +185,6 @@
             this.label67 = new System.Windows.Forms.Label();
             this.label79 = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
-            this.cmbConstructionInstructor = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.comboBoxEX2 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbDisplayConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label113 = new System.Windows.Forms.Label();
             this.label76 = new System.Windows.Forms.Label();
             this.label112 = new System.Windows.Forms.Label();
@@ -266,26 +234,36 @@
             this.BillingGridColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BillingGridColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label124 = new System.Windows.Forms.Label();
+            this.label90 = new System.Windows.Forms.Label();
+            this.label89 = new System.Windows.Forms.Label();
             this.label129 = new System.Windows.Forms.Label();
             this.label125 = new System.Windows.Forms.Label();
-            this.textBoxEX6 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label126 = new System.Windows.Forms.Label();
             this.label87 = new System.Windows.Forms.Label();
             this.label86 = new System.Windows.Forms.Label();
+            this.label88 = new System.Windows.Forms.Label();
             this.label60 = new System.Windows.Forms.Label();
-            this.txtInput36 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.label127 = new System.Windows.Forms.Label();
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.label128 = new System.Windows.Forms.Label();
             this.label91 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
+            this.label29 = new System.Windows.Forms.Label();
+            this.lblLastUpdate = new System.Windows.Forms.Label();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.btnOtherProc = new System.Windows.Forms.Button();
+            this.lblJointLabel = new System.Windows.Forms.Label();
+            this.btnPA = new System.Windows.Forms.Button();
+            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.btnApprovalList = new System.Windows.Forms.Button();
             this.rdbStatusHikitugiFlg = new System.Windows.Forms.RadioButton();
             this.lblConstructionCodelabel = new System.Windows.Forms.Label();
-            this.lblConstructionCode = new System.Windows.Forms.Label();
+            this.cmbConstructionYear = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtInput33 = new System.Windows.Forms.TextBox();
             this.label48 = new System.Windows.Forms.Label();
-            this.txtInput33 = new System.Windows.Forms.TextBox();
-            this.label49 = new System.Windows.Forms.Label();
+            this.cmbConstructionPeriod = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label28 = new System.Windows.Forms.Label();
+            this.lblConstructionCode = new System.Windows.Forms.Label();
             this.label16 = new System.Windows.Forms.Label();
             this.panel5 = new System.Windows.Forms.Panel();
             this.btnRestore = new System.Windows.Forms.Button();
@@ -306,16 +284,43 @@
             this.rdbStatus3 = new System.Windows.Forms.RadioButton();
             this.rdbStatus1 = new System.Windows.Forms.RadioButton();
             this.rdbStatus0 = new System.Windows.Forms.RadioButton();
-            this.label29 = new System.Windows.Forms.Label();
-            this.lblLastUpdate = new System.Windows.Forms.Label();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.cmbConstructionPeriod = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbConstructionYear = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.btnApprovalList = new System.Windows.Forms.Button();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.lblJointLabel = new System.Windows.Forms.Label();
-            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
-            this.btnPA = new System.Windows.Forms.Button();
+            this.label49 = new System.Windows.Forms.Label();
+            this.comboBoxEX1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDisplayPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbConstructionType = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbOrdersDivision = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDisplayOrderers = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.txtInput28 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput25 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.cmbTransferConstruction = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.txtInput27 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput02 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput06 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput12 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput13 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX2 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX1 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput03 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput38 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput34 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.comboBoxEX4 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.comboBoxEX3 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDisplayConstrSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.textBoxEX3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput35 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput04 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX5 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX4 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput29 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput30 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.cmbConstructionInstructor = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.comboBoxEX2 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbDisplayConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.textBoxEX9 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX8 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX6 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.textBoxEX7 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.txtInput36 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.BasePanel.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel10.SuspendLayout();
@@ -332,8 +337,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.dgvLink)).BeginInit();
             this.panel9.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvBillingDate)).BeginInit();
+            this.groupBoxEx1.SuspendLayout();
             this.panel5.SuspendLayout();
-            this.groupBoxEx1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
@@ -606,7 +611,7 @@
             this.textBox3.Multiline = true;
             this.textBox3.Name = "textBox3";
             this.textBox3.Size = new System.Drawing.Size(507, 54);
-            this.textBox3.TabIndex = 68;
+            this.textBox3.TabIndex = 64;
             this.textBox3.TextChanged += new System.EventHandler(this.valueChange);
             // 
             // label96
@@ -792,29 +797,6 @@
             this.label8.Text = "å·¥äº‹å ´æ‰€";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // comboBoxEX1
-            // 
-            this.comboBoxEX1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX1.FormattingEnabled = true;
-            this.comboBoxEX1.Location = new System.Drawing.Point(129, 724);
-            this.comboBoxEX1.Name = "comboBoxEX1";
-            this.comboBoxEX1.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX1.TabIndex = 22;
-            this.comboBoxEX1.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
-            this.comboBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbDisplayPerson
-            // 
-            this.cmbDisplayPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDisplayPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDisplayPerson.FormattingEnabled = true;
-            this.cmbDisplayPerson.Location = new System.Drawing.Point(384, 724);
-            this.cmbDisplayPerson.Name = "cmbDisplayPerson";
-            this.cmbDisplayPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbDisplayPerson.TabIndex = 23;
-            this.cmbDisplayPerson.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label4
             // 
             this.label4.BackColor = System.Drawing.Color.CornflowerBlue;
@@ -880,18 +862,6 @@
             this.rdbEstimateType1.UseVisualStyleBackColor = false;
             this.rdbEstimateType1.CheckedChanged += new System.EventHandler(this.valueChange);
             // 
-            // cmbConstructionType
-            // 
-            this.cmbConstructionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionType.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionType.FormattingEnabled = true;
-            this.cmbConstructionType.Location = new System.Drawing.Point(129, 602);
-            this.cmbConstructionType.Name = "cmbConstructionType";
-            this.cmbConstructionType.Size = new System.Drawing.Size(372, 27);
-            this.cmbConstructionType.TabIndex = 21;
-            this.cmbConstructionType.SelectedIndexChanged += new System.EventHandler(this.cmbConstructionType_SelectedIndexChanged);
-            this.cmbConstructionType.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput08
             // 
             this.txtInput08.ImeMode = System.Windows.Forms.ImeMode.Disable;
@@ -1279,27 +1249,6 @@
             this.label5.Text = "ç™ºã€€æ³¨ã€€è€…";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbOrdersDivision
-            // 
-            this.cmbOrdersDivision.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbOrdersDivision.AutoCompleteCustomSource.AddRange(new string[] {
-            "æ ªå¼�ä¼šç¤¾",
-            "æœ‰é™�ä¼šç¤¾",
-            "å�ˆå��ä¼šç¤¾",
-            "å�ˆè³‡ä¼šç¤¾",
-            "å�ˆå�Œä¼šç¤¾"});
-            this.cmbOrdersDivision.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbOrdersDivision.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbOrdersDivision.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbOrdersDivision.FormattingEnabled = true;
-            this.cmbOrdersDivision.Location = new System.Drawing.Point(129, 154);
-            this.cmbOrdersDivision.Name = "cmbOrdersDivision";
-            this.cmbOrdersDivision.Size = new System.Drawing.Size(507, 27);
-            this.cmbOrdersDivision.TabIndex = 7;
-            this.cmbOrdersDivision.SelectedIndexChanged += new System.EventHandler(this.cmbOrdersDivision_SelectedIndexChanged);
-            this.cmbOrdersDivision.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // btnOrderer
             // 
             this.btnOrderer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1315,20 +1264,6 @@
             this.btnOrderer.Visible = false;
             this.btnOrderer.Click += new System.EventHandler(this.btnOrderer_Click);
             // 
-            // cmbDisplayOrderers
-            // 
-            this.cmbDisplayOrderers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbDisplayOrderers.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDisplayOrderers.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDisplayOrderers.FormattingEnabled = true;
-            this.cmbDisplayOrderers.Location = new System.Drawing.Point(129, 184);
-            this.cmbDisplayOrderers.Name = "cmbDisplayOrderers";
-            this.cmbDisplayOrderers.Size = new System.Drawing.Size(376, 27);
-            this.cmbDisplayOrderers.TabIndex = 8;
-            this.cmbDisplayOrderers.SelectedIndexChanged += new System.EventHandler(this.cmbDisplayOrderers_SelectedIndexChanged);
-            this.cmbDisplayOrderers.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput05
             // 
             this.txtInput05.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -1350,7 +1285,6 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel4.BackColor = System.Drawing.Color.SkyBlue;
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel4.Controls.Add(this.btnChangePrice);
             this.panel4.Controls.Add(this.label101);
             this.panel4.Controls.Add(this.label100);
             this.panel4.Controls.Add(this.label99);
@@ -1412,20 +1346,6 @@
             this.panel4.Size = new System.Drawing.Size(651, 994);
             this.panel4.TabIndex = 2;
             // 
-            // btnChangePrice
-            // 
-            this.btnChangePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnChangePrice.BackColor = System.Drawing.Color.Gold;
-            this.btnChangePrice.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnChangePrice.Location = new System.Drawing.Point(395, 138);
-            this.btnChangePrice.Name = "btnChangePrice";
-            this.btnChangePrice.Size = new System.Drawing.Size(120, 30);
-            this.btnChangePrice.TabIndex = 192;
-            this.btnChangePrice.Text = "é‡‘é¡�å¤‰æ›´å±¥æ­´";
-            this.btnChangePrice.UseVisualStyleBackColor = false;
-            this.btnChangePrice.Visible = false;
-            this.btnChangePrice.Click += new System.EventHandler(this.btnChangePrice_Click);
-            // 
             // label101
             // 
             this.label101.BackColor = System.Drawing.Color.White;
@@ -1495,21 +1415,6 @@
             this.label30.Text = "ç¨Žè¾¼\r\nå�—æ³¨æ±ºå®šé‡‘é¡�";
             this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput28
-            // 
-            this.txtInput28.BackColor = System.Drawing.Color.White;
-            this.txtInput28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput28.ForeColor = System.Drawing.Color.Black;
-            this.txtInput28.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput28.Location = new System.Drawing.Point(128, 104);
-            this.txtInput28.MaxLength = 10;
-            this.txtInput28.Name = "txtInput28";
-            this.txtInput28.Size = new System.Drawing.Size(274, 34);
-            this.txtInput28.TabIndex = 28;
-            this.txtInput28.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput28.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput28.Validated += new System.EventHandler(this.txtInput25_Validated);
-            // 
             // label27
             // 
             this.label27.BackColor = System.Drawing.Color.MidnightBlue;
@@ -1523,21 +1428,6 @@
             this.label27.Text = "ç¨Žåˆ¥\r\nå�—æ³¨æ±ºå®šé‡‘é¡�";
             this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput25
-            // 
-            this.txtInput25.BackColor = System.Drawing.Color.White;
-            this.txtInput25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput25.ForeColor = System.Drawing.Color.Black;
-            this.txtInput25.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput25.Location = new System.Drawing.Point(128, 64);
-            this.txtInput25.MaxLength = 10;
-            this.txtInput25.Name = "txtInput25";
-            this.txtInput25.Size = new System.Drawing.Size(274, 34);
-            this.txtInput25.TabIndex = 27;
-            this.txtInput25.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput25.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput25.Validated += new System.EventHandler(this.txtInput25_Validated);
-            // 
             // lblTransferDate
             // 
             this.lblTransferDate.BackColor = System.Drawing.SystemColors.Window;
@@ -1560,18 +1450,6 @@
             this.label36.Text = "éƒ¨ç½²å¼•ç¶™æ—¥";
             this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbTransferConstruction
-            // 
-            this.cmbTransferConstruction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbTransferConstruction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbTransferConstruction.FormattingEnabled = true;
-            this.cmbTransferConstruction.Location = new System.Drawing.Point(128, 843);
-            this.cmbTransferConstruction.Name = "cmbTransferConstruction";
-            this.cmbTransferConstruction.Size = new System.Drawing.Size(300, 27);
-            this.cmbTransferConstruction.TabIndex = 39;
-            this.cmbTransferConstruction.SelectedIndexChanged += new System.EventHandler(this.cmbTransferConstruction_SelectedIndexChanged);
-            this.cmbTransferConstruction.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput26
             // 
             this.txtInput26.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -1622,29 +1500,6 @@
             this.label33.Text = "è¦‹ç©�æ��å‡ºæœŸé™�";
             this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput27
-            // 
-            this.txtInput27.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput27.Location = new System.Drawing.Point(128, 33);
-            this.txtInput27.MaxLength = 10;
-            this.txtInput27.Name = "txtInput27";
-            this.txtInput27.Size = new System.Drawing.Size(120, 26);
-            this.txtInput27.TabIndex = 26;
-            this.txtInput27.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput27.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // txtInput02
-            // 
-            this.txtInput02.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput02.Location = new System.Drawing.Point(128, 182);
-            this.txtInput02.MaxLength = 10;
-            this.txtInput02.Name = "txtInput02";
-            this.txtInput02.Size = new System.Drawing.Size(120, 26);
-            this.txtInput02.TabIndex = 29;
-            this.txtInput02.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput02.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput02.Validated += new System.EventHandler(this.txtInput02_TextChanged);
-            // 
             // label24
             // 
             this.label24.BackColor = System.Drawing.Color.LightBlue;
@@ -1657,18 +1512,6 @@
             this.label24.Text = "è¦‹ç©�æ��å‡ºæ—¥";
             this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput06
-            // 
-            this.txtInput06.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput06.Location = new System.Drawing.Point(128, 212);
-            this.txtInput06.MaxLength = 10;
-            this.txtInput06.Name = "txtInput06";
-            this.txtInput06.Size = new System.Drawing.Size(120, 26);
-            this.txtInput06.TabIndex = 30;
-            this.txtInput06.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput06.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput06.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label22
             // 
             this.label22.BackColor = System.Drawing.Color.LightBlue;
@@ -1681,18 +1524,6 @@
             this.label22.Text = "è¦‹ç©�æœ‰åŠ¹æœŸé™�";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput12
-            // 
-            this.txtInput12.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput12.Location = new System.Drawing.Point(128, 302);
-            this.txtInput12.MaxLength = 10;
-            this.txtInput12.Name = "txtInput12";
-            this.txtInput12.Size = new System.Drawing.Size(120, 26);
-            this.txtInput12.TabIndex = 31;
-            this.txtInput12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput12.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput12.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label12
             // 
             this.label12.BackColor = System.Drawing.Color.LightBlue;
@@ -1705,18 +1536,6 @@
             this.label12.Text = "å·¥äº‹æœŸé–“ã€€é–‹å§‹";
             this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput13
-            // 
-            this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput13.Location = new System.Drawing.Point(128, 332);
-            this.txtInput13.MaxLength = 10;
-            this.txtInput13.Name = "txtInput13";
-            this.txtInput13.Size = new System.Drawing.Size(120, 26);
-            this.txtInput13.TabIndex = 32;
-            this.txtInput13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput13.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput13.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label15
             // 
             this.label15.BackColor = System.Drawing.Color.LightBlue;
@@ -1839,42 +1658,6 @@
             this.label71.Text = "é�žå�—æ³¨æ—¥";
             this.label71.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX2
-            // 
-            this.textBoxEX2.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX2.Location = new System.Drawing.Point(128, 562);
-            this.textBoxEX2.MaxLength = 10;
-            this.textBoxEX2.Name = "textBoxEX2";
-            this.textBoxEX2.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX2.TabIndex = 35;
-            this.textBoxEX2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX2.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX1
-            // 
-            this.textBoxEX1.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX1.Location = new System.Drawing.Point(128, 502);
-            this.textBoxEX1.MaxLength = 10;
-            this.textBoxEX1.Name = "textBoxEX1";
-            this.textBoxEX1.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX1.TabIndex = 33;
-            this.textBoxEX1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX1.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput03
-            // 
-            this.txtInput03.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput03.Location = new System.Drawing.Point(128, 532);
-            this.txtInput03.MaxLength = 10;
-            this.txtInput03.Name = "txtInput03";
-            this.txtInput03.Size = new System.Drawing.Size(120, 26);
-            this.txtInput03.TabIndex = 34;
-            this.txtInput03.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput03.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput03.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label62
             // 
             this.label62.BackColor = System.Drawing.Color.Black;
@@ -1940,18 +1723,6 @@
             this.label55.Text = "â€»ã€Œæ–½å·¥é–‹å§‹äºˆå®šæ—¥ã€�ã�¯ã�Šã�Šã‚ˆã��ã�®å·¥äº‹é–‹å§‹æ—¥(ç�¾å ´ç�€æ‰‹æ™‚æœŸ)ã‚’\r\nã€Œå�—æ³¨æ—¥ã€�å…¥åŠ›æ™‚ã�«å…¥åŠ›ã�—ã�¦ä¸‹ã�•ã�„";
             this.label55.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // txtInput38
-            // 
-            this.txtInput38.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput38.Location = new System.Drawing.Point(128, 632);
-            this.txtInput38.MaxLength = 10;
-            this.txtInput38.Name = "txtInput38";
-            this.txtInput38.Size = new System.Drawing.Size(120, 26);
-            this.txtInput38.TabIndex = 36;
-            this.txtInput38.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput38.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput38.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label54
             // 
             this.label54.BackColor = System.Drawing.Color.LightBlue;
@@ -1965,18 +1736,6 @@
             this.label54.Text = "å�—æ³¨æ™‚æ–½å·¥å®Œäº†äºˆå®šæ—¥";
             this.label54.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput34
-            // 
-            this.txtInput34.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput34.Location = new System.Drawing.Point(128, 662);
-            this.txtInput34.MaxLength = 10;
-            this.txtInput34.Name = "txtInput34";
-            this.txtInput34.Size = new System.Drawing.Size(120, 26);
-            this.txtInput34.TabIndex = 37;
-            this.txtInput34.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput34.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput34.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label66
             // 
             this.label66.BackColor = System.Drawing.Color.Black;
@@ -2238,41 +1997,6 @@
             this.rdbNotFluctuation.UseVisualStyleBackColor = true;
             this.rdbNotFluctuation.CheckedChanged += new System.EventHandler(this.rdbFluctuation_CheckedChanged);
             // 
-            // comboBoxEX4
-            // 
-            this.comboBoxEX4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBoxEX4.FormattingEnabled = true;
-            this.comboBoxEX4.Location = new System.Drawing.Point(129, 93);
-            this.comboBoxEX4.Name = "comboBoxEX4";
-            this.comboBoxEX4.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX4.TabIndex = 44;
-            this.comboBoxEX4.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
-            // 
-            // comboBoxEX3
-            // 
-            this.comboBoxEX3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBoxEX3.FormattingEnabled = true;
-            this.comboBoxEX3.Location = new System.Drawing.Point(129, 63);
-            this.comboBoxEX3.Name = "comboBoxEX3";
-            this.comboBoxEX3.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX3.TabIndex = 42;
-            this.comboBoxEX3.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
-            // 
-            // cmbDisplayConstrSubPerson
-            // 
-            this.cmbDisplayConstrSubPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDisplayConstrSubPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDisplayConstrSubPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbDisplayConstrSubPerson.FormattingEnabled = true;
-            this.cmbDisplayConstrSubPerson.Location = new System.Drawing.Point(384, 63);
-            this.cmbDisplayConstrSubPerson.Name = "cmbDisplayConstrSubPerson";
-            this.cmbDisplayConstrSubPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbDisplayConstrSubPerson.TabIndex = 43;
-            // 
             // label46
             // 
             this.label46.BackColor = System.Drawing.Color.Black;
@@ -2365,34 +2089,6 @@
             this.label50.Text = "æ–½å·¥é–‹å§‹æ—¥";
             this.label50.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX3
-            // 
-            this.textBoxEX3.Enabled = false;
-            this.textBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.textBoxEX3.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX3.Location = new System.Drawing.Point(129, 273);
-            this.textBoxEX3.MaxLength = 10;
-            this.textBoxEX3.Name = "textBoxEX3";
-            this.textBoxEX3.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX3.TabIndex = 50;
-            this.textBoxEX3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX3.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX3.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput35
-            // 
-            this.txtInput35.Enabled = false;
-            this.txtInput35.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput35.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput35.Location = new System.Drawing.Point(129, 303);
-            this.txtInput35.MaxLength = 10;
-            this.txtInput35.Name = "txtInput35";
-            this.txtInput35.Size = new System.Drawing.Size(120, 26);
-            this.txtInput35.TabIndex = 51;
-            this.txtInput35.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput35.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput35.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label25
             // 
             this.label25.BackColor = System.Drawing.Color.LightGreen;
@@ -2406,20 +2102,6 @@
             this.label25.Text = "æ–½å·¥å®Œäº†æ—¥";
             this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput04
-            // 
-            this.txtInput04.Enabled = false;
-            this.txtInput04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.txtInput04.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput04.Location = new System.Drawing.Point(129, 333);
-            this.txtInput04.MaxLength = 10;
-            this.txtInput04.Name = "txtInput04";
-            this.txtInput04.Size = new System.Drawing.Size(120, 26);
-            this.txtInput04.TabIndex = 52;
-            this.txtInput04.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput04.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput04.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label42
             // 
             this.label42.BackColor = System.Drawing.Color.Black;
@@ -2432,58 +2114,6 @@
             this.label42.Text = "â€»ã€Œç�€å·¥ã€�ãƒ»ã€Œå®Œæˆ�ã€�ã�¯å¥‘ç´„æ›¸ã�«åŸºã�¥ã��è¨˜å…¥ã�—ã�¦ä¸‹ã�•ã�„\r\nï¼ˆå½“ç¤¾ã€�ç™ºçµ¦ã�®å¥‘ç´„æ›¸ãƒ»æ–½å·¥è¨ˆç”»æ›¸ã�«è¨˜è¼‰ã�•ã‚Œã�¾ã�™ï¼‰";
             this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX5
-            // 
-            this.textBoxEX5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.textBoxEX5.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX5.Location = new System.Drawing.Point(393, 183);
-            this.textBoxEX5.MaxLength = 10;
-            this.textBoxEX5.Name = "textBoxEX5";
-            this.textBoxEX5.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX5.TabIndex = 49;
-            this.textBoxEX5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX5.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX5.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // textBoxEX4
-            // 
-            this.textBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.textBoxEX4.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX4.Location = new System.Drawing.Point(393, 153);
-            this.textBoxEX4.MaxLength = 10;
-            this.textBoxEX4.Name = "textBoxEX4";
-            this.textBoxEX4.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX4.TabIndex = 47;
-            this.textBoxEX4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX4.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX4.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput29
-            // 
-            this.txtInput29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.txtInput29.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput29.Location = new System.Drawing.Point(189, 153);
-            this.txtInput29.MaxLength = 10;
-            this.txtInput29.Name = "txtInput29";
-            this.txtInput29.Size = new System.Drawing.Size(120, 26);
-            this.txtInput29.TabIndex = 46;
-            this.txtInput29.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput29.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput29.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
-            // txtInput30
-            // 
-            this.txtInput30.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
-            this.txtInput30.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput30.Location = new System.Drawing.Point(189, 183);
-            this.txtInput30.MaxLength = 10;
-            this.txtInput30.Name = "txtInput30";
-            this.txtInput30.Size = new System.Drawing.Size(120, 26);
-            this.txtInput30.TabIndex = 48;
-            this.txtInput30.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput30.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput30.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label81
             // 
             this.label81.BackColor = System.Drawing.Color.LightGreen;
@@ -2581,44 +2211,6 @@
             this.label31.Text = "å·¥äº‹æŒ‡å°Ž";
             this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbConstructionInstructor
-            // 
-            this.cmbConstructionInstructor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionInstructor.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionInstructor.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbConstructionInstructor.FormattingEnabled = true;
-            this.cmbConstructionInstructor.Location = new System.Drawing.Point(384, 93);
-            this.cmbConstructionInstructor.Name = "cmbConstructionInstructor";
-            this.cmbConstructionInstructor.Size = new System.Drawing.Size(255, 27);
-            this.cmbConstructionInstructor.TabIndex = 45;
-            this.cmbConstructionInstructor.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // comboBoxEX2
-            // 
-            this.comboBoxEX2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxEX2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.comboBoxEX2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBoxEX2.FormattingEnabled = true;
-            this.comboBoxEX2.Location = new System.Drawing.Point(129, 33);
-            this.comboBoxEX2.Name = "comboBoxEX2";
-            this.comboBoxEX2.Size = new System.Drawing.Size(255, 27);
-            this.comboBoxEX2.TabIndex = 40;
-            this.comboBoxEX2.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
-            this.comboBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbDisplayConstructionPerson
-            // 
-            this.cmbDisplayConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDisplayConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDisplayConstructionPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbDisplayConstructionPerson.FormattingEnabled = true;
-            this.cmbDisplayConstructionPerson.Location = new System.Drawing.Point(384, 33);
-            this.cmbDisplayConstructionPerson.Name = "cmbDisplayConstructionPerson";
-            this.cmbDisplayConstructionPerson.Size = new System.Drawing.Size(255, 27);
-            this.cmbDisplayConstructionPerson.TabIndex = 41;
-            this.cmbDisplayConstructionPerson.SelectedIndexChanged += new System.EventHandler(this.cmbDisplayConstructionPerson_SelectedIndexChanged);
-            this.cmbDisplayConstructionPerson.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // label113
             // 
             this.label113.BackColor = System.Drawing.Color.LightGreen;
@@ -2723,7 +2315,7 @@
             this.label118.Location = new System.Drawing.Point(128, 641);
             this.label118.Name = "label118";
             this.label118.Size = new System.Drawing.Size(120, 26);
-            this.label118.TabIndex = 192;
+            this.label118.TabIndex = 57;
             this.label118.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label120
@@ -3074,7 +2666,7 @@
             this.label103.Location = new System.Drawing.Point(382, 41);
             this.label103.Name = "label103";
             this.label103.Size = new System.Drawing.Size(120, 26);
-            this.label103.TabIndex = 61;
+            this.label103.TabIndex = 56;
             this.label103.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label102
@@ -3193,13 +2785,19 @@
             this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel9.Controls.Add(this.dgvBillingDate);
             this.panel9.Controls.Add(this.label124);
+            this.panel9.Controls.Add(this.label90);
+            this.panel9.Controls.Add(this.label89);
             this.panel9.Controls.Add(this.label129);
             this.panel9.Controls.Add(this.label125);
+            this.panel9.Controls.Add(this.textBoxEX9);
+            this.panel9.Controls.Add(this.textBoxEX8);
             this.panel9.Controls.Add(this.textBoxEX6);
             this.panel9.Controls.Add(this.label126);
             this.panel9.Controls.Add(this.label87);
             this.panel9.Controls.Add(this.label86);
+            this.panel9.Controls.Add(this.label88);
             this.panel9.Controls.Add(this.label60);
+            this.panel9.Controls.Add(this.textBoxEX7);
             this.panel9.Controls.Add(this.txtInput36);
             this.panel9.Controls.Add(this.label127);
             this.panel9.Controls.Add(this.textBox2);
@@ -3235,7 +2833,7 @@
             this.BillingGridColumn3,
             this.BillingGridColumn4});
             this.dgvBillingDate.EnableHeadersVisualStyles = false;
-            this.dgvBillingDate.Location = new System.Drawing.Point(129, 93);
+            this.dgvBillingDate.Location = new System.Drawing.Point(129, 121);
             this.dgvBillingDate.Name = "dgvBillingDate";
             this.dgvBillingDate.RowHeadersVisible = false;
             this.dgvBillingDate.RowHeadersWidth = 20;
@@ -3294,7 +2892,7 @@
             this.label124.BackColor = System.Drawing.Color.Moccasin;
             this.label124.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label124.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label124.Location = new System.Drawing.Point(1, 141);
+            this.label124.Location = new System.Drawing.Point(1, 171);
             this.label124.Name = "label124";
             this.label124.Size = new System.Drawing.Size(120, 24);
             this.label124.TabIndex = 25;
@@ -3301,12 +2899,36 @@
             this.label124.Text = "è«‹æ±‚æ‰¿èª�æ—¥";
             this.label124.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // label90
+            // 
+            this.label90.BackColor = System.Drawing.Color.Moccasin;
+            this.label90.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label90.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label90.Location = new System.Drawing.Point(1, 345);
+            this.label90.Name = "label90";
+            this.label90.Size = new System.Drawing.Size(120, 30);
+            this.label90.TabIndex = 24;
+            this.label90.Text = "æ¤œæŸ»æ˜¯æ­£å®Œäº†æ—¥";
+            this.label90.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label89
+            // 
+            this.label89.BackColor = System.Drawing.Color.Moccasin;
+            this.label89.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label89.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label89.Location = new System.Drawing.Point(1, 315);
+            this.label89.Name = "label89";
+            this.label89.Size = new System.Drawing.Size(120, 30);
+            this.label89.TabIndex = 24;
+            this.label89.Text = "æ¤œã€€æŸ»ã€€æ—¥";
+            this.label89.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // label129
             // 
             this.label129.BackColor = System.Drawing.Color.Moccasin;
             this.label129.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label129.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label129.Location = new System.Drawing.Point(1, 255);
+            this.label129.Location = new System.Drawing.Point(1, 285);
             this.label129.Name = "label129";
             this.label129.Size = new System.Drawing.Size(120, 30);
             this.label129.TabIndex = 24;
@@ -3318,7 +2940,7 @@
             this.label125.BackColor = System.Drawing.Color.Moccasin;
             this.label125.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label125.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label125.Location = new System.Drawing.Point(1, 189);
+            this.label125.Location = new System.Drawing.Point(1, 219);
             this.label125.Name = "label125";
             this.label125.Size = new System.Drawing.Size(120, 24);
             this.label125.TabIndex = 26;
@@ -3325,24 +2947,12 @@
             this.label125.Text = "è«‹æ±‚æ›¸éƒµé€�æ—¥";
             this.label125.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // textBoxEX6
-            // 
-            this.textBoxEX6.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.textBoxEX6.Location = new System.Drawing.Point(129, 257);
-            this.textBoxEX6.MaxLength = 10;
-            this.textBoxEX6.Name = "textBoxEX6";
-            this.textBoxEX6.Size = new System.Drawing.Size(120, 26);
-            this.textBoxEX6.TabIndex = 63;
-            this.textBoxEX6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.textBoxEX6.TextChanged += new System.EventHandler(this.valueChange);
-            this.textBoxEX6.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label126
             // 
             this.label126.BackColor = System.Drawing.Color.Moccasin;
             this.label126.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label126.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label126.Location = new System.Drawing.Point(1, 165);
+            this.label126.Location = new System.Drawing.Point(1, 195);
             this.label126.Name = "label126";
             this.label126.Size = new System.Drawing.Size(120, 24);
             this.label126.TabIndex = 27;
@@ -3372,6 +2982,18 @@
             this.label86.Text = "è«‹æ±‚åŒºåˆ†";
             this.label86.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // label88
+            // 
+            this.label88.BackColor = System.Drawing.Color.Moccasin;
+            this.label88.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label88.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label88.Location = new System.Drawing.Point(1, 77);
+            this.label88.Name = "label88";
+            this.label88.Size = new System.Drawing.Size(120, 30);
+            this.label88.TabIndex = 23;
+            this.label88.Text = "æ¤œæŸ»äºˆå®šæ—¥";
+            this.label88.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // label60
             // 
             this.label60.BackColor = System.Drawing.Color.Moccasin;
@@ -3384,24 +3006,12 @@
             this.label60.Text = "è«‹æ±‚æº–å‚™é–‹å§‹æ—¥";
             this.label60.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput36
-            // 
-            this.txtInput36.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput36.Location = new System.Drawing.Point(129, 49);
-            this.txtInput36.MaxLength = 10;
-            this.txtInput36.Name = "txtInput36";
-            this.txtInput36.Size = new System.Drawing.Size(120, 26);
-            this.txtInput36.TabIndex = 63;
-            this.txtInput36.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.txtInput36.TextChanged += new System.EventHandler(this.valueChange);
-            this.txtInput36.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
-            // 
             // label127
             // 
             this.label127.BackColor = System.Drawing.Color.Moccasin;
             this.label127.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label127.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label127.Location = new System.Drawing.Point(1, 117);
+            this.label127.Location = new System.Drawing.Point(1, 147);
             this.label127.Name = "label127";
             this.label127.Size = new System.Drawing.Size(120, 24);
             this.label127.TabIndex = 28;
@@ -3414,12 +3024,12 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.textBox2.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.textBox2.Location = new System.Drawing.Point(129, 301);
+            this.textBox2.Location = new System.Drawing.Point(129, 391);
             this.textBox2.MaxLength = 120;
             this.textBox2.Multiline = true;
             this.textBox2.Name = "textBox2";
             this.textBox2.Size = new System.Drawing.Size(507, 54);
-            this.textBox2.TabIndex = 68;
+            this.textBox2.TabIndex = 63;
             this.textBox2.TextChanged += new System.EventHandler(this.valueChange);
             // 
             // label128
@@ -3427,11 +3037,11 @@
             this.label128.BackColor = System.Drawing.Color.Moccasin;
             this.label128.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label128.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label128.Location = new System.Drawing.Point(1, 213);
+            this.label128.Location = new System.Drawing.Point(1, 243);
             this.label128.Name = "label128";
             this.label128.Size = new System.Drawing.Size(120, 24);
             this.label128.TabIndex = 29;
-            this.label128.Text = "è«‹æ±‚æ—¥";
+            this.label128.Text = "è«‹ã€€æ±‚ã€€æ—¥";
             this.label128.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label91
@@ -3440,7 +3050,7 @@
             this.label91.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label91.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label91.ForeColor = System.Drawing.Color.Black;
-            this.label91.Location = new System.Drawing.Point(1, 301);
+            this.label91.Location = new System.Drawing.Point(1, 391);
             this.label91.Name = "label91";
             this.label91.Size = new System.Drawing.Size(120, 40);
             this.label91.TabIndex = 145;
@@ -3447,18 +3057,113 @@
             this.label91.Text = "è«‹æ±‚\r\nç”³é€�ã‚Šã‚³ãƒ¡ãƒ³ãƒˆ";
             this.label91.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label2
+            // label29
             // 
-            this.label2.BackColor = System.Drawing.Color.RoyalBlue;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.Location = new System.Drawing.Point(516, 4);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(115, 25);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "å·¥äº‹å¹´åº¦";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.label2.Visible = false;
+            this.label29.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label29.AutoSize = true;
+            this.label29.BackColor = System.Drawing.Color.Transparent;
+            this.label29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label29.ForeColor = System.Drawing.Color.White;
+            this.label29.Location = new System.Drawing.Point(1033, 12);
+            this.label29.Name = "label29";
+            this.label29.Size = new System.Drawing.Size(161, 16);
+            this.label29.TabIndex = 32;
+            this.label29.Text = "æœ€çµ‚ãƒ‡ãƒ¼ã‚¿æ›´æ–°æ—¥ï¼š";
+            this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lblLastUpdate
+            // 
+            this.lblLastUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblLastUpdate.AutoSize = true;
+            this.lblLastUpdate.BackColor = System.Drawing.Color.Transparent;
+            this.lblLastUpdate.ForeColor = System.Drawing.Color.White;
+            this.lblLastUpdate.Location = new System.Drawing.Point(1194, 12);
+            this.lblLastUpdate.Name = "lblLastUpdate";
+            this.lblLastUpdate.Size = new System.Drawing.Size(131, 16);
+            this.lblLastUpdate.TabIndex = 32;
+            this.lblLastUpdate.Text = "2015å¹´12æœˆ31æ—¥";
+            this.lblLastUpdate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // btnOtherProc
+            // 
+            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
+            this.btnOtherProc.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnOtherProc.Location = new System.Drawing.Point(1, 657);
+            this.btnOtherProc.Name = "btnOtherProc";
+            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
+            this.btnOtherProc.TabIndex = 94;
+            this.btnOtherProc.TabStop = false;
+            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
+            this.btnOtherProc.UseVisualStyleBackColor = false;
+            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
+            // 
+            // lblJointLabel
+            // 
+            this.lblJointLabel.BackColor = System.Drawing.Color.Yellow;
+            this.lblJointLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblJointLabel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblJointLabel.ForeColor = System.Drawing.Color.Black;
+            this.lblJointLabel.Location = new System.Drawing.Point(20, 8);
+            this.lblJointLabel.Name = "lblJointLabel";
+            this.lblJointLabel.Size = new System.Drawing.Size(238, 25);
+            this.lblJointLabel.TabIndex = 97;
+            this.lblJointLabel.Text = "çµ�å�ˆå¥‘ç´„å·¥äº‹";
+            this.lblJointLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.lblJointLabel.Visible = false;
+            // 
+            // btnPA
+            // 
+            this.btnPA.BackColor = System.Drawing.Color.DimGray;
+            this.btnPA.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnPA.ForeColor = System.Drawing.Color.White;
+            this.btnPA.Location = new System.Drawing.Point(169, 657);
+            this.btnPA.Name = "btnPA";
+            this.btnPA.Size = new System.Drawing.Size(150, 30);
+            this.btnPA.TabIndex = 100;
+            this.btnPA.TabStop = false;
+            this.btnPA.Text = "æœŸé™�ãƒ�ã‚§ãƒƒã‚¯è§£é™¤";
+            this.btnPA.UseVisualStyleBackColor = false;
+            this.btnPA.Visible = false;
+            this.btnPA.Click += new System.EventHandler(this.btnPA_Click);
+            // 
+            // groupBoxEx1
+            // 
+            this.groupBoxEx1.BorderColor = System.Drawing.Color.White;
+            this.groupBoxEx1.Controls.Add(this.btnApprovalList);
+            this.groupBoxEx1.Controls.Add(this.rdbStatusHikitugiFlg);
+            this.groupBoxEx1.Controls.Add(this.lblConstructionCodelabel);
+            this.groupBoxEx1.Controls.Add(this.cmbConstructionYear);
+            this.groupBoxEx1.Controls.Add(this.label2);
+            this.groupBoxEx1.Controls.Add(this.txtInput33);
+            this.groupBoxEx1.Controls.Add(this.label48);
+            this.groupBoxEx1.Controls.Add(this.cmbConstructionPeriod);
+            this.groupBoxEx1.Controls.Add(this.label28);
+            this.groupBoxEx1.Controls.Add(this.lblConstructionCode);
+            this.groupBoxEx1.Controls.Add(this.label16);
+            this.groupBoxEx1.Controls.Add(this.panel5);
+            this.groupBoxEx1.Controls.Add(this.label49);
+            this.groupBoxEx1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.groupBoxEx1.Location = new System.Drawing.Point(3, 37);
+            this.groupBoxEx1.Name = "groupBoxEx1";
+            this.groupBoxEx1.Size = new System.Drawing.Size(1340, 126);
+            this.groupBoxEx1.TabIndex = 98;
+            this.groupBoxEx1.TabStop = false;
+            // 
+            // btnApprovalList
+            // 
+            this.btnApprovalList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnApprovalList.BackColor = System.Drawing.Color.Gold;
+            this.btnApprovalList.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnApprovalList.ForeColor = System.Drawing.Color.Black;
+            this.btnApprovalList.Location = new System.Drawing.Point(1133, 4);
+            this.btnApprovalList.Name = "btnApprovalList";
+            this.btnApprovalList.Size = new System.Drawing.Size(200, 24);
+            this.btnApprovalList.TabIndex = 44;
+            this.btnApprovalList.Text = "ç”³è«‹çŠ¶æ³�ç¢ºèª�";
+            this.btnApprovalList.UseVisualStyleBackColor = false;
+            this.btnApprovalList.Click += new System.EventHandler(this.btnApprovalList_Click);
+            // 
             // rdbStatusHikitugiFlg
             // 
             this.rdbStatusHikitugiFlg.AutoSize = true;
@@ -3485,27 +3190,29 @@
             this.lblConstructionCodelabel.Text = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.lblConstructionCodelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // lblConstructionCode
+            // cmbConstructionYear
             // 
-            this.lblConstructionCode.BackColor = System.Drawing.SystemColors.Window;
-            this.lblConstructionCode.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblConstructionCode.Location = new System.Drawing.Point(131, 4);
-            this.lblConstructionCode.Name = "lblConstructionCode";
-            this.lblConstructionCode.Size = new System.Drawing.Size(115, 25);
-            this.lblConstructionCode.TabIndex = 92;
-            this.lblConstructionCode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.cmbConstructionYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionYear.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionYear.FormattingEnabled = true;
+            this.cmbConstructionYear.Location = new System.Drawing.Point(639, 4);
+            this.cmbConstructionYear.Name = "cmbConstructionYear";
+            this.cmbConstructionYear.Size = new System.Drawing.Size(134, 24);
+            this.cmbConstructionYear.TabIndex = 0;
+            this.toolTip1.SetToolTip(this.cmbConstructionYear, "å·¥äº‹ã�®ç�€å·¥é–‹å§‹å¹´åº¦ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
+            this.cmbConstructionYear.Visible = false;
             // 
-            // label48
+            // label2
             // 
-            this.label48.BackColor = System.Drawing.Color.RoyalBlue;
-            this.label48.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label48.ForeColor = System.Drawing.Color.Black;
-            this.label48.Location = new System.Drawing.Point(8, 31);
-            this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(115, 26);
-            this.label48.TabIndex = 0;
-            this.label48.Text = "å·¥äº‹å��ç§°";
-            this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label2.BackColor = System.Drawing.Color.RoyalBlue;
+            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label2.Location = new System.Drawing.Point(516, 4);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(115, 25);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "å·¥äº‹å¹´åº¦";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label2.Visible = false;
             // 
             // txtInput33
             // 
@@ -3521,19 +3228,29 @@
             this.txtInput33.TextChanged += new System.EventHandler(this.valueChange);
             this.txtInput33.Validated += new System.EventHandler(this.txtInput33_Validated);
             // 
-            // label49
+            // label48
             // 
-            this.label49.AutoSize = true;
-            this.label49.BackColor = System.Drawing.Color.Black;
-            this.label49.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label49.ForeColor = System.Drawing.Color.Red;
-            this.label49.Location = new System.Drawing.Point(137, 59);
-            this.label49.Name = "label49";
-            this.label49.Size = new System.Drawing.Size(467, 16);
-            this.label49.TabIndex = 0;
-            this.label49.Text = "â€»å·¥äº‹å��ç§°ã�¯ä¸‹è¨˜ã�®å·¥äº‹å��ç§°ã�®é …ç›®ã�¨é€£å‹•ã�—ã�¦è¨˜å…¥ã�•ã‚Œã�¾ã�™";
-            this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.label48.BackColor = System.Drawing.Color.RoyalBlue;
+            this.label48.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label48.ForeColor = System.Drawing.Color.Black;
+            this.label48.Location = new System.Drawing.Point(8, 31);
+            this.label48.Name = "label48";
+            this.label48.Size = new System.Drawing.Size(115, 26);
+            this.label48.TabIndex = 0;
+            this.label48.Text = "å·¥äº‹å��ç§°";
+            this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // cmbConstructionPeriod
+            // 
+            this.cmbConstructionPeriod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionPeriod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionPeriod.FormattingEnabled = true;
+            this.cmbConstructionPeriod.Location = new System.Drawing.Point(385, 4);
+            this.cmbConstructionPeriod.Name = "cmbConstructionPeriod";
+            this.cmbConstructionPeriod.Size = new System.Drawing.Size(115, 24);
+            this.cmbConstructionPeriod.TabIndex = 1;
+            this.toolTip1.SetToolTip(this.cmbConstructionPeriod, "å£²ã‚Šä¸Šã�’è¨ˆä¸Šã‚’è¡Œã�†å–¶æ¥­æœŸã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
+            // 
             // label28
             // 
             this.label28.BackColor = System.Drawing.Color.RoyalBlue;
@@ -3545,6 +3262,16 @@
             this.label28.Text = "è¨ˆä¸ŠæœŸ";
             this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lblConstructionCode
+            // 
+            this.lblConstructionCode.BackColor = System.Drawing.SystemColors.Window;
+            this.lblConstructionCode.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblConstructionCode.Location = new System.Drawing.Point(131, 4);
+            this.lblConstructionCode.Name = "lblConstructionCode";
+            this.lblConstructionCode.Size = new System.Drawing.Size(115, 25);
+            this.lblConstructionCode.TabIndex = 92;
+            this.lblConstructionCode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // label16
             // 
             this.label16.BackColor = System.Drawing.Color.Red;
@@ -3880,136 +3607,477 @@
             this.rdbStatus0.UseVisualStyleBackColor = false;
             this.rdbStatus0.CheckedChanged += new System.EventHandler(this.rdbStatusCheckedChanged);
             // 
-            // label29
+            // label49
             // 
-            this.label29.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label29.AutoSize = true;
-            this.label29.BackColor = System.Drawing.Color.Transparent;
-            this.label29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label29.ForeColor = System.Drawing.Color.White;
-            this.label29.Location = new System.Drawing.Point(1033, 12);
-            this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(161, 16);
-            this.label29.TabIndex = 32;
-            this.label29.Text = "æœ€çµ‚ãƒ‡ãƒ¼ã‚¿æ›´æ–°æ—¥ï¼š";
-            this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label49.AutoSize = true;
+            this.label49.BackColor = System.Drawing.Color.Black;
+            this.label49.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label49.ForeColor = System.Drawing.Color.Red;
+            this.label49.Location = new System.Drawing.Point(137, 59);
+            this.label49.Name = "label49";
+            this.label49.Size = new System.Drawing.Size(467, 16);
+            this.label49.TabIndex = 0;
+            this.label49.Text = "â€»å·¥äº‹å��ç§°ã�¯ä¸‹è¨˜ã�®å·¥äº‹å��ç§°ã�®é …ç›®ã�¨é€£å‹•ã�—ã�¦è¨˜å…¥ã�•ã‚Œã�¾ã�™";
+            this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // lblLastUpdate
+            // comboBoxEX1
             // 
-            this.lblLastUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblLastUpdate.AutoSize = true;
-            this.lblLastUpdate.BackColor = System.Drawing.Color.Transparent;
-            this.lblLastUpdate.ForeColor = System.Drawing.Color.White;
-            this.lblLastUpdate.Location = new System.Drawing.Point(1194, 12);
-            this.lblLastUpdate.Name = "lblLastUpdate";
-            this.lblLastUpdate.Size = new System.Drawing.Size(131, 16);
-            this.lblLastUpdate.TabIndex = 32;
-            this.lblLastUpdate.Text = "2015å¹´12æœˆ31æ—¥";
-            this.lblLastUpdate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.comboBoxEX1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX1.FormattingEnabled = true;
+            this.comboBoxEX1.Location = new System.Drawing.Point(129, 724);
+            this.comboBoxEX1.Name = "comboBoxEX1";
+            this.comboBoxEX1.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX1.TabIndex = 22;
+            this.comboBoxEX1.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
+            this.comboBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // cmbConstructionPeriod
+            // cmbDisplayPerson
             // 
-            this.cmbConstructionPeriod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionPeriod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionPeriod.FormattingEnabled = true;
-            this.cmbConstructionPeriod.Location = new System.Drawing.Point(385, 4);
-            this.cmbConstructionPeriod.Name = "cmbConstructionPeriod";
-            this.cmbConstructionPeriod.Size = new System.Drawing.Size(115, 24);
-            this.cmbConstructionPeriod.TabIndex = 1;
-            this.toolTip1.SetToolTip(this.cmbConstructionPeriod, "å£²ã‚Šä¸Šã�’è¨ˆä¸Šã‚’è¡Œã�†å–¶æ¥­æœŸã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
+            this.cmbDisplayPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDisplayPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDisplayPerson.FormattingEnabled = true;
+            this.cmbDisplayPerson.Location = new System.Drawing.Point(384, 724);
+            this.cmbDisplayPerson.Name = "cmbDisplayPerson";
+            this.cmbDisplayPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbDisplayPerson.TabIndex = 23;
+            this.cmbDisplayPerson.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // cmbConstructionYear
+            // cmbConstructionType
             // 
-            this.cmbConstructionYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionYear.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionYear.FormattingEnabled = true;
-            this.cmbConstructionYear.Location = new System.Drawing.Point(639, 4);
-            this.cmbConstructionYear.Name = "cmbConstructionYear";
-            this.cmbConstructionYear.Size = new System.Drawing.Size(134, 24);
-            this.cmbConstructionYear.TabIndex = 0;
-            this.toolTip1.SetToolTip(this.cmbConstructionYear, "å·¥äº‹ã�®ç�€å·¥é–‹å§‹å¹´åº¦ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„");
-            this.cmbConstructionYear.Visible = false;
+            this.cmbConstructionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionType.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionType.FormattingEnabled = true;
+            this.cmbConstructionType.Location = new System.Drawing.Point(129, 602);
+            this.cmbConstructionType.Name = "cmbConstructionType";
+            this.cmbConstructionType.Size = new System.Drawing.Size(372, 27);
+            this.cmbConstructionType.TabIndex = 21;
+            this.cmbConstructionType.SelectedIndexChanged += new System.EventHandler(this.cmbConstructionType_SelectedIndexChanged);
+            this.cmbConstructionType.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // btnApprovalList
+            // cmbOrdersDivision
             // 
-            this.btnApprovalList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApprovalList.BackColor = System.Drawing.Color.Gold;
-            this.btnApprovalList.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnApprovalList.ForeColor = System.Drawing.Color.Black;
-            this.btnApprovalList.Location = new System.Drawing.Point(1133, 4);
-            this.btnApprovalList.Name = "btnApprovalList";
-            this.btnApprovalList.Size = new System.Drawing.Size(200, 24);
-            this.btnApprovalList.TabIndex = 44;
-            this.btnApprovalList.Text = "ç”³è«‹çŠ¶æ³�ç¢ºèª�";
-            this.btnApprovalList.UseVisualStyleBackColor = false;
-            this.btnApprovalList.Click += new System.EventHandler(this.btnApprovalList_Click);
+            this.cmbOrdersDivision.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbOrdersDivision.AutoCompleteCustomSource.AddRange(new string[] {
+            "æ ªå¼�ä¼šç¤¾",
+            "æœ‰é™�ä¼šç¤¾",
+            "å�ˆå��ä¼šç¤¾",
+            "å�ˆè³‡ä¼šç¤¾",
+            "å�ˆå�Œä¼šç¤¾"});
+            this.cmbOrdersDivision.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbOrdersDivision.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbOrdersDivision.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbOrdersDivision.FormattingEnabled = true;
+            this.cmbOrdersDivision.Location = new System.Drawing.Point(129, 154);
+            this.cmbOrdersDivision.Name = "cmbOrdersDivision";
+            this.cmbOrdersDivision.Size = new System.Drawing.Size(507, 27);
+            this.cmbOrdersDivision.TabIndex = 7;
+            this.cmbOrdersDivision.SelectedIndexChanged += new System.EventHandler(this.cmbOrdersDivision_SelectedIndexChanged);
+            this.cmbOrdersDivision.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // btnOtherProc
+            // cmbDisplayOrderers
             // 
-            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
-            this.btnOtherProc.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnOtherProc.Location = new System.Drawing.Point(1, 657);
-            this.btnOtherProc.Name = "btnOtherProc";
-            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
-            this.btnOtherProc.TabIndex = 94;
-            this.btnOtherProc.TabStop = false;
-            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
-            this.btnOtherProc.UseVisualStyleBackColor = false;
-            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
+            this.cmbDisplayOrderers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbDisplayOrderers.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDisplayOrderers.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDisplayOrderers.FormattingEnabled = true;
+            this.cmbDisplayOrderers.Location = new System.Drawing.Point(129, 184);
+            this.cmbDisplayOrderers.Name = "cmbDisplayOrderers";
+            this.cmbDisplayOrderers.Size = new System.Drawing.Size(376, 27);
+            this.cmbDisplayOrderers.TabIndex = 8;
+            this.cmbDisplayOrderers.SelectedIndexChanged += new System.EventHandler(this.cmbDisplayOrderers_SelectedIndexChanged);
+            this.cmbDisplayOrderers.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // lblJointLabel
+            // txtInput28
             // 
-            this.lblJointLabel.BackColor = System.Drawing.Color.Yellow;
-            this.lblJointLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblJointLabel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblJointLabel.ForeColor = System.Drawing.Color.Black;
-            this.lblJointLabel.Location = new System.Drawing.Point(20, 8);
-            this.lblJointLabel.Name = "lblJointLabel";
-            this.lblJointLabel.Size = new System.Drawing.Size(238, 25);
-            this.lblJointLabel.TabIndex = 97;
-            this.lblJointLabel.Text = "çµ�å�ˆå¥‘ç´„å·¥äº‹";
-            this.lblJointLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.lblJointLabel.Visible = false;
+            this.txtInput28.BackColor = System.Drawing.Color.White;
+            this.txtInput28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput28.ForeColor = System.Drawing.Color.Black;
+            this.txtInput28.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput28.Location = new System.Drawing.Point(128, 104);
+            this.txtInput28.MaxLength = 10;
+            this.txtInput28.Name = "txtInput28";
+            this.txtInput28.Size = new System.Drawing.Size(274, 34);
+            this.txtInput28.TabIndex = 28;
+            this.txtInput28.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput28.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput28.Validated += new System.EventHandler(this.txtInput25_Validated);
             // 
-            // groupBoxEx1
+            // txtInput25
             // 
-            this.groupBoxEx1.BorderColor = System.Drawing.Color.White;
-            this.groupBoxEx1.Controls.Add(this.btnApprovalList);
-            this.groupBoxEx1.Controls.Add(this.rdbStatusHikitugiFlg);
-            this.groupBoxEx1.Controls.Add(this.lblConstructionCodelabel);
-            this.groupBoxEx1.Controls.Add(this.cmbConstructionYear);
-            this.groupBoxEx1.Controls.Add(this.label2);
-            this.groupBoxEx1.Controls.Add(this.txtInput33);
-            this.groupBoxEx1.Controls.Add(this.label48);
-            this.groupBoxEx1.Controls.Add(this.cmbConstructionPeriod);
-            this.groupBoxEx1.Controls.Add(this.label28);
-            this.groupBoxEx1.Controls.Add(this.lblConstructionCode);
-            this.groupBoxEx1.Controls.Add(this.label16);
-            this.groupBoxEx1.Controls.Add(this.panel5);
-            this.groupBoxEx1.Controls.Add(this.label49);
-            this.groupBoxEx1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.groupBoxEx1.Location = new System.Drawing.Point(3, 37);
-            this.groupBoxEx1.Name = "groupBoxEx1";
-            this.groupBoxEx1.Size = new System.Drawing.Size(1340, 126);
-            this.groupBoxEx1.TabIndex = 98;
-            this.groupBoxEx1.TabStop = false;
+            this.txtInput25.BackColor = System.Drawing.Color.White;
+            this.txtInput25.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput25.ForeColor = System.Drawing.Color.Black;
+            this.txtInput25.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput25.Location = new System.Drawing.Point(128, 64);
+            this.txtInput25.MaxLength = 10;
+            this.txtInput25.Name = "txtInput25";
+            this.txtInput25.Size = new System.Drawing.Size(274, 34);
+            this.txtInput25.TabIndex = 27;
+            this.txtInput25.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput25.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput25.Validated += new System.EventHandler(this.txtInput25_Validated);
             // 
-            // btnPA
+            // cmbTransferConstruction
             // 
-            this.btnPA.BackColor = System.Drawing.Color.DimGray;
-            this.btnPA.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnPA.ForeColor = System.Drawing.Color.White;
-            this.btnPA.Location = new System.Drawing.Point(169, 657);
-            this.btnPA.Name = "btnPA";
-            this.btnPA.Size = new System.Drawing.Size(150, 30);
-            this.btnPA.TabIndex = 100;
-            this.btnPA.TabStop = false;
-            this.btnPA.Text = "æœŸé™�ãƒ�ã‚§ãƒƒã‚¯è§£é™¤";
-            this.btnPA.UseVisualStyleBackColor = false;
-            this.btnPA.Visible = false;
-            this.btnPA.Click += new System.EventHandler(this.btnPA_Click);
+            this.cmbTransferConstruction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbTransferConstruction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbTransferConstruction.FormattingEnabled = true;
+            this.cmbTransferConstruction.Location = new System.Drawing.Point(128, 843);
+            this.cmbTransferConstruction.Name = "cmbTransferConstruction";
+            this.cmbTransferConstruction.Size = new System.Drawing.Size(300, 27);
+            this.cmbTransferConstruction.TabIndex = 39;
+            this.cmbTransferConstruction.SelectedIndexChanged += new System.EventHandler(this.cmbTransferConstruction_SelectedIndexChanged);
+            this.cmbTransferConstruction.TextChanged += new System.EventHandler(this.valueChange);
             // 
+            // txtInput27
+            // 
+            this.txtInput27.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput27.Location = new System.Drawing.Point(128, 33);
+            this.txtInput27.MaxLength = 10;
+            this.txtInput27.Name = "txtInput27";
+            this.txtInput27.Size = new System.Drawing.Size(120, 26);
+            this.txtInput27.TabIndex = 26;
+            this.txtInput27.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput27.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // txtInput02
+            // 
+            this.txtInput02.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput02.Location = new System.Drawing.Point(128, 182);
+            this.txtInput02.MaxLength = 10;
+            this.txtInput02.Name = "txtInput02";
+            this.txtInput02.Size = new System.Drawing.Size(120, 26);
+            this.txtInput02.TabIndex = 29;
+            this.txtInput02.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput02.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput02.Validated += new System.EventHandler(this.txtInput02_TextChanged);
+            // 
+            // txtInput06
+            // 
+            this.txtInput06.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput06.Location = new System.Drawing.Point(128, 212);
+            this.txtInput06.MaxLength = 10;
+            this.txtInput06.Name = "txtInput06";
+            this.txtInput06.Size = new System.Drawing.Size(120, 26);
+            this.txtInput06.TabIndex = 30;
+            this.txtInput06.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput06.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput06.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput12
+            // 
+            this.txtInput12.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput12.Location = new System.Drawing.Point(128, 302);
+            this.txtInput12.MaxLength = 10;
+            this.txtInput12.Name = "txtInput12";
+            this.txtInput12.Size = new System.Drawing.Size(120, 26);
+            this.txtInput12.TabIndex = 31;
+            this.txtInput12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput12.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput12.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput13
+            // 
+            this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput13.Location = new System.Drawing.Point(128, 332);
+            this.txtInput13.MaxLength = 10;
+            this.txtInput13.Name = "txtInput13";
+            this.txtInput13.Size = new System.Drawing.Size(120, 26);
+            this.txtInput13.TabIndex = 32;
+            this.txtInput13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput13.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput13.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX2
+            // 
+            this.textBoxEX2.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX2.Location = new System.Drawing.Point(128, 562);
+            this.textBoxEX2.MaxLength = 10;
+            this.textBoxEX2.Name = "textBoxEX2";
+            this.textBoxEX2.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX2.TabIndex = 35;
+            this.textBoxEX2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX2.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX1
+            // 
+            this.textBoxEX1.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX1.Location = new System.Drawing.Point(128, 502);
+            this.textBoxEX1.MaxLength = 10;
+            this.textBoxEX1.Name = "textBoxEX1";
+            this.textBoxEX1.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX1.TabIndex = 33;
+            this.textBoxEX1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX1.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX1.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput03
+            // 
+            this.txtInput03.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput03.Location = new System.Drawing.Point(128, 532);
+            this.txtInput03.MaxLength = 10;
+            this.txtInput03.Name = "txtInput03";
+            this.txtInput03.Size = new System.Drawing.Size(120, 26);
+            this.txtInput03.TabIndex = 34;
+            this.txtInput03.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput03.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput03.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput38
+            // 
+            this.txtInput38.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput38.Location = new System.Drawing.Point(128, 632);
+            this.txtInput38.MaxLength = 10;
+            this.txtInput38.Name = "txtInput38";
+            this.txtInput38.Size = new System.Drawing.Size(120, 26);
+            this.txtInput38.TabIndex = 36;
+            this.txtInput38.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput38.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput38.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput34
+            // 
+            this.txtInput34.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput34.Location = new System.Drawing.Point(128, 662);
+            this.txtInput34.MaxLength = 10;
+            this.txtInput34.Name = "txtInput34";
+            this.txtInput34.Size = new System.Drawing.Size(120, 26);
+            this.txtInput34.TabIndex = 37;
+            this.txtInput34.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput34.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput34.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // comboBoxEX4
+            // 
+            this.comboBoxEX4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBoxEX4.FormattingEnabled = true;
+            this.comboBoxEX4.Location = new System.Drawing.Point(129, 93);
+            this.comboBoxEX4.Name = "comboBoxEX4";
+            this.comboBoxEX4.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX4.TabIndex = 44;
+            this.comboBoxEX4.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
+            // 
+            // comboBoxEX3
+            // 
+            this.comboBoxEX3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBoxEX3.FormattingEnabled = true;
+            this.comboBoxEX3.Location = new System.Drawing.Point(129, 63);
+            this.comboBoxEX3.Name = "comboBoxEX3";
+            this.comboBoxEX3.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX3.TabIndex = 42;
+            this.comboBoxEX3.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
+            // 
+            // cmbDisplayConstrSubPerson
+            // 
+            this.cmbDisplayConstrSubPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDisplayConstrSubPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDisplayConstrSubPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbDisplayConstrSubPerson.FormattingEnabled = true;
+            this.cmbDisplayConstrSubPerson.Location = new System.Drawing.Point(384, 63);
+            this.cmbDisplayConstrSubPerson.Name = "cmbDisplayConstrSubPerson";
+            this.cmbDisplayConstrSubPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbDisplayConstrSubPerson.TabIndex = 43;
+            // 
+            // textBoxEX3
+            // 
+            this.textBoxEX3.Enabled = false;
+            this.textBoxEX3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.textBoxEX3.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX3.Location = new System.Drawing.Point(129, 273);
+            this.textBoxEX3.MaxLength = 10;
+            this.textBoxEX3.Name = "textBoxEX3";
+            this.textBoxEX3.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX3.TabIndex = 50;
+            this.textBoxEX3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX3.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX3.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput35
+            // 
+            this.txtInput35.Enabled = false;
+            this.txtInput35.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput35.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput35.Location = new System.Drawing.Point(129, 303);
+            this.txtInput35.MaxLength = 10;
+            this.txtInput35.Name = "txtInput35";
+            this.txtInput35.Size = new System.Drawing.Size(120, 26);
+            this.txtInput35.TabIndex = 51;
+            this.txtInput35.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput35.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput35.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput04
+            // 
+            this.txtInput04.Enabled = false;
+            this.txtInput04.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.txtInput04.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput04.Location = new System.Drawing.Point(129, 333);
+            this.txtInput04.MaxLength = 10;
+            this.txtInput04.Name = "txtInput04";
+            this.txtInput04.Size = new System.Drawing.Size(120, 26);
+            this.txtInput04.TabIndex = 52;
+            this.txtInput04.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput04.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput04.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX5
+            // 
+            this.textBoxEX5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.textBoxEX5.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX5.Location = new System.Drawing.Point(393, 183);
+            this.textBoxEX5.MaxLength = 10;
+            this.textBoxEX5.Name = "textBoxEX5";
+            this.textBoxEX5.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX5.TabIndex = 49;
+            this.textBoxEX5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX5.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX5.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX4
+            // 
+            this.textBoxEX4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.textBoxEX4.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX4.Location = new System.Drawing.Point(393, 153);
+            this.textBoxEX4.MaxLength = 10;
+            this.textBoxEX4.Name = "textBoxEX4";
+            this.textBoxEX4.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX4.TabIndex = 47;
+            this.textBoxEX4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX4.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX4.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput29
+            // 
+            this.txtInput29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.txtInput29.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput29.Location = new System.Drawing.Point(189, 153);
+            this.txtInput29.MaxLength = 10;
+            this.txtInput29.Name = "txtInput29";
+            this.txtInput29.Size = new System.Drawing.Size(120, 26);
+            this.txtInput29.TabIndex = 46;
+            this.txtInput29.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput29.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput29.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput30
+            // 
+            this.txtInput30.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold);
+            this.txtInput30.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput30.Location = new System.Drawing.Point(189, 183);
+            this.txtInput30.MaxLength = 10;
+            this.txtInput30.Name = "txtInput30";
+            this.txtInput30.Size = new System.Drawing.Size(120, 26);
+            this.txtInput30.TabIndex = 48;
+            this.txtInput30.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput30.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput30.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // cmbConstructionInstructor
+            // 
+            this.cmbConstructionInstructor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbConstructionInstructor.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbConstructionInstructor.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbConstructionInstructor.FormattingEnabled = true;
+            this.cmbConstructionInstructor.Location = new System.Drawing.Point(384, 93);
+            this.cmbConstructionInstructor.Name = "cmbConstructionInstructor";
+            this.cmbConstructionInstructor.Size = new System.Drawing.Size(255, 27);
+            this.cmbConstructionInstructor.TabIndex = 45;
+            this.cmbConstructionInstructor.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // comboBoxEX2
+            // 
+            this.comboBoxEX2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxEX2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.comboBoxEX2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.comboBoxEX2.FormattingEnabled = true;
+            this.comboBoxEX2.Location = new System.Drawing.Point(129, 33);
+            this.comboBoxEX2.Name = "comboBoxEX2";
+            this.comboBoxEX2.Size = new System.Drawing.Size(255, 27);
+            this.comboBoxEX2.TabIndex = 40;
+            this.comboBoxEX2.SelectedIndexChanged += new System.EventHandler(this.comboBoxEX1_SelectedIndexChanged);
+            this.comboBoxEX2.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbDisplayConstructionPerson
+            // 
+            this.cmbDisplayConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDisplayConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDisplayConstructionPerson.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.cmbDisplayConstructionPerson.FormattingEnabled = true;
+            this.cmbDisplayConstructionPerson.Location = new System.Drawing.Point(384, 33);
+            this.cmbDisplayConstructionPerson.Name = "cmbDisplayConstructionPerson";
+            this.cmbDisplayConstructionPerson.Size = new System.Drawing.Size(255, 27);
+            this.cmbDisplayConstructionPerson.TabIndex = 41;
+            this.cmbDisplayConstructionPerson.SelectedIndexChanged += new System.EventHandler(this.cmbDisplayConstructionPerson_SelectedIndexChanged);
+            this.cmbDisplayConstructionPerson.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // textBoxEX9
+            // 
+            this.textBoxEX9.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX9.Location = new System.Drawing.Point(129, 347);
+            this.textBoxEX9.MaxLength = 10;
+            this.textBoxEX9.Name = "textBoxEX9";
+            this.textBoxEX9.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX9.TabIndex = 62;
+            this.textBoxEX9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX9.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX9.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX8
+            // 
+            this.textBoxEX8.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX8.Location = new System.Drawing.Point(129, 317);
+            this.textBoxEX8.MaxLength = 10;
+            this.textBoxEX8.Name = "textBoxEX8";
+            this.textBoxEX8.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX8.TabIndex = 61;
+            this.textBoxEX8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX8.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX8.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX6
+            // 
+            this.textBoxEX6.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX6.Location = new System.Drawing.Point(129, 287);
+            this.textBoxEX6.MaxLength = 10;
+            this.textBoxEX6.Name = "textBoxEX6";
+            this.textBoxEX6.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX6.TabIndex = 60;
+            this.textBoxEX6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX6.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX6.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // textBoxEX7
+            // 
+            this.textBoxEX7.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.textBoxEX7.Location = new System.Drawing.Point(129, 79);
+            this.textBoxEX7.MaxLength = 10;
+            this.textBoxEX7.Name = "textBoxEX7";
+            this.textBoxEX7.Size = new System.Drawing.Size(120, 26);
+            this.textBoxEX7.TabIndex = 59;
+            this.textBoxEX7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.textBoxEX7.TextChanged += new System.EventHandler(this.valueChange);
+            this.textBoxEX7.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
+            // txtInput36
+            // 
+            this.txtInput36.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput36.Location = new System.Drawing.Point(129, 49);
+            this.txtInput36.MaxLength = 10;
+            this.txtInput36.Name = "txtInput36";
+            this.txtInput36.Size = new System.Drawing.Size(120, 26);
+            this.txtInput36.TabIndex = 58;
+            this.txtInput36.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.txtInput36.TextChanged += new System.EventHandler(this.valueChange);
+            this.txtInput36.Validated += new System.EventHandler(this.txtInputDate_TextChanged);
+            // 
             // FrmConstructionBaseInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -4062,10 +4130,10 @@
             this.panel9.ResumeLayout(false);
             this.panel9.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvBillingDate)).EndInit();
+            this.groupBoxEx1.ResumeLayout(false);
+            this.groupBoxEx1.PerformLayout();
             this.panel5.ResumeLayout(false);
             this.panel5.PerformLayout();
-            this.groupBoxEx1.ResumeLayout(false);
-            this.groupBoxEx1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -4297,7 +4365,6 @@
         private System.Windows.Forms.Label lblLinkTotal1;
         private System.Windows.Forms.Label label116;
         private System.Windows.Forms.RadioButton rdbStatus16;
-        private System.Windows.Forms.Button btnChangePrice;
         private System.Windows.Forms.Label label118;
         private System.Windows.Forms.Label label117;
         private System.Windows.Forms.Label lblJointLabel;
@@ -4339,5 +4406,11 @@
         private CustomControls.GroupBoxEx groupBoxEx1;
         private System.Windows.Forms.Button btnRestore;
         private System.Windows.Forms.Button btnPA;
+        private System.Windows.Forms.Label label88;
+        private CustomControls.TextBoxEX textBoxEX7;
+        private System.Windows.Forms.Label label90;
+        private System.Windows.Forms.Label label89;
+        private CustomControls.TextBoxEX textBoxEX9;
+        private CustomControls.TextBoxEX textBoxEX8;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 305)
@@ -112,6 +112,9 @@
                 //CommonMotions.SendMessage(textBoxEX9.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ’�•¶�‘•Ô‘—“ú
                 //CommonMotions.SendMessage(textBoxEX10.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ’�•¶�‘•Ô‘—Šm”F“ú
                 //CommonMotions.SendMessage(textBoxEX6.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// �¿‹��‘—X‘—/Žè“n‚µ“ú
+                CommonMotions.SendMessage(textBoxEX7.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);          // ŒŸ�¸—\’è“ú
+                CommonMotions.SendMessage(textBoxEX8.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);          // ŒŸ�¸ŽÀ�s“ú
+                CommonMotions.SendMessage(textBoxEX9.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);          // ŒŸ�¸�¥�³Š®—¹“ú
 
                 // Enable‚ÌŽž‚É•\Ž¦‚·‚é•¶Žš‚ð�Ý’è‚·‚é�i“ü—ÍƒRƒ“ƒgƒ��[ƒ‹‚Å•¶Žš‚Ì�Ý’è�E�Á‹Ž‚ð�s‚Á‚Ä‚¢‚é�j
                 txtInput25.Text = CommonDefine.s_UndecidedString;			// �Å”²Žó’�Œˆ’è‹àŠz
@@ -139,6 +142,9 @@
                 //textBoxEX9.Text = CommonDefine.s_UndecidedString;		    // ’�•¶�‘•Ô‘—“ú
                 //textBoxEX10.Text = CommonDefine.s_UndecidedString;		// ’�•¶�‘•Ô‘—Šm”F“ú
                 //textBoxEX6.Text = CommonDefine.s_UndecidedString;		    // �¿‹��‘—X‘—/Žè“n‚µ“ú
+                textBoxEX7.Text = CommonDefine.s_UndecidedString;           // ŒŸ�¸—\’è“ú
+                textBoxEX8.Text = CommonDefine.s_UndecidedString;           // ŒŸ�¸ŽÀ�s“ú
+                textBoxEX9.Text = CommonDefine.s_UndecidedString;           // ŒŸ�¸�¥�³Š®—¹“ú
             }
             catch (Exception ex)
             {
@@ -1395,6 +1401,22 @@
                 //else
                 //    ((Label)m_DspCtrl[(int)DspCnt.BillingSendDate]).TextAlign = ContentAlignment.MiddleCenter;
 
+                // ŒŸ�¸—\’è“ú
+                if (DateTime.MinValue != worklist[0].InspectPlanningDate)
+                    m_DspCtrl[(int)DspCnt.InspectPlanningDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].InspectPlanningDate);  // ŒŸ�¸—\’è“ú
+                else
+                    ((TextBox)m_DspCtrl[(int)DspCnt.InspectPlanningDate]).TextAlign = HorizontalAlignment.Center;
+                // ŒŸ�¸ŽÀ�s“ú
+                if (DateTime.MinValue != worklist[0].InspectExecuteDate)
+                    m_DspCtrl[(int)DspCnt.InspectExecuteDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].InspectExecuteDate);    // ŒŸ�¸ŽÀ�s“ú
+                else
+                    ((TextBox)m_DspCtrl[(int)DspCnt.InspectExecuteDate]).TextAlign = HorizontalAlignment.Center;
+                // ŒŸ�¸�¥�³Š®—¹“ú
+                if (DateTime.MinValue != worklist[0].RevCompleteDate)
+                    m_DspCtrl[(int)DspCnt.RevCompleteDate].Text = CommonMotions.cnvDateToUndecidedString(worklist[0].RevCompleteDate);          // ŒŸ�¸�¥�³Š®—¹“ú
+                else
+                    ((TextBox)m_DspCtrl[(int)DspCnt.RevCompleteDate]).TextAlign = HorizontalAlignment.Center;
+
                 // �¿‹�‰ñ�”ƒtƒ‰ƒO
                 switch (worklist[0].BillingSplitFlg)
                 {
@@ -2871,6 +2893,18 @@
                 if (m_DspCtrl[(int)DspCnt.LedgerComplateDate].Text.Length != 0)
                     work.LedgerComplateDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.LedgerComplateDate].Text);
 
+                // ŒŸ�¸—\’è“ú
+                if (m_DspCtrl[(int)DspCnt.InspectPlanningDate].Text.Length != 0)
+                    work.InspectPlanningDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.InspectPlanningDate].Text);
+
+                // ŒŸ�¸ŽÀ�s“ú
+                if (m_DspCtrl[(int)DspCnt.InspectExecuteDate].Text.Length != 0)
+                    work.InspectExecuteDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.InspectExecuteDate].Text);
+
+                // ŒŸ�¸�¥�³Š®—¹“ú
+                if (m_DspCtrl[(int)DspCnt.RevCompleteDate].Text.Length != 0)
+                    work.RevCompleteDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.RevCompleteDate].Text);
+
                 // �X�V‘O�ó‘Ô‚ÌŽæ“¾
                 int BeforeStatus = 0;
 
@@ -3847,7 +3881,7 @@
                 // ˆË—ŠŽó‚¯“ú
                 if (strTargetName.Equals(m_DspCtrl[(int)DspCnt.RequestedDate].Name))
                 {
-                    strwrkName = "�¡“ú";
+                    strwrkName = "–{“ú";
                 }
                 // Œ©�Ï’ñ�oŠúŒÀ‚Ì�ê�‡->ˆË—ŠŽó‚¯“ú
                 else if (strTargetName.Equals(m_DspCtrl[(int)DspCnt.EstimatesSubmitDeadline].Name))
@@ -3924,6 +3958,25 @@
                 {
                     strwrkName = ConstructionBaseInfo.DateNameDic["BillingStartDate"];
                 }
+                // ŒŸ�¸—\’è“ú‚Ì�ê�‡->Ž{�HŠ®—¹“ú
+                else if (strTargetName.Equals(m_DspCtrl[(int)DspCnt.InspectPlanningDate].Name))
+                {
+                    strwrkName = ConstructionBaseInfo.DateNameDic["ConstructionPeriodEnd"];
+                }
+                // ŒŸ�¸“ú‚Ì�ê�‡->ŒŸ�¸—\’è“ú
+                else if (strTargetName.Equals(m_DspCtrl[(int)DspCnt.InspectExecuteDate].Name))
+                {
+                    strwrkName = ConstructionBaseInfo.DateNameDic["InspectPlanningDate"];
+                }
+                // ŒŸ�¸�¥�³Š®—¹“ú‚Ì�ê�‡->ŒŸ�¸“ú
+                else if (strTargetName.Equals(m_DspCtrl[(int)DspCnt.RevCompleteDate].Name))
+                {
+                    strwrkName = ConstructionBaseInfo.DateNameDic["InspectExecuteDate"];
+                }
+                else
+                {
+                    strwrkName = "–{“ú";
+                }
 
                 return strwrkName;
             }
@@ -3944,8 +3997,13 @@
         //private DateTime DTNextYearChange(DateTime dtTagetDate)
         private DateTime DTNextYearChange(object sender)
         {
+            // ƒeƒLƒXƒgƒ{ƒbƒNƒXˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
             if (!sender.GetType().Equals(typeof(TextBox))
-                && !sender.GetType().Equals(typeof(TextBoxEX))) return DateTime.Now;
+                && !sender.GetType().Equals(typeof(TextBoxEX)))
+            {
+                return DateTime.Now;
+            }
+            // “ü—Í’lŽæ“¾
             DateTime dtTagetDate = CommonMotions.cnvDate(((TextBox)sender).Text);
             try
             {
@@ -4078,6 +4136,24 @@
                 {
                     wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.BillingStartDate].Text);
                 }
+                // ŒŸ�¸—\’è“ú‚Ì�ê�‡->Ž{�HŠ®—¹“ú
+                else if (strFieldName.Equals(m_DspCtrl[(int)DspCnt.InspectPlanningDate].Name))
+                {
+                    if (m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd2].Text.Equals(CommonDefine.s_UndecidedString))
+                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd2].Text);
+                    else
+                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd].Text);
+                }
+                // ŒŸ�¸“ú‚Ì�ê�‡->ŒŸ�¸—\’è“ú
+                else if (strFieldName.Equals(m_DspCtrl[(int)DspCnt.InspectExecuteDate].Name))
+                {
+                    wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.InspectPlanningDate].Text);
+                }
+                // ŒŸ�¸�¥�³Š®—¹“ú‚Ì�ê�‡->ŒŸ�¸“ú
+                else if (strFieldName.Equals(m_DspCtrl[(int)DspCnt.RevCompleteDate].Name))
+                {
+                    wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.InspectExecuteDate].Text);
+                }
 
                 if (wrkDate == DateTime.MinValue) wrkDate = DateTime.Now;
                 return wrkDate;
@@ -4182,6 +4258,9 @@
             m_DspCtrl[(int)DspCnt.ConstrSubPersonCode] = cmbDisplayConstrSubPerson;              // 80: �HŽ–•›’S“–ŽÒƒR�[ƒh
             m_DspCtrl[(int)DspCnt.LedgerComplateDate] = label118;                                // 81: �HŽ–�Ú�×‘ä’ “ü—ÍŠ®—¹“ú
             m_DspCtrl[(int)DspCnt.BillingTypeName] = label87;                                    // 82: �¿‹�‹æ•ª–¼�Ì
+            m_DspCtrl[(int)DspCnt.InspectPlanningDate] = textBoxEX7;                             // 83:ŒŸ�¸—\’è“ú
+            m_DspCtrl[(int)DspCnt.InspectExecuteDate] = textBoxEX8;                              // 84:ŒŸ�¸ŽÀ�s“ú
+            m_DspCtrl[(int)DspCnt.RevCompleteDate] = textBoxEX9;                                 // 85:ŒŸ�¸�¥�³Š®—¹“ú
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs	(revision 305)
@@ -92,7 +92,7 @@
         /// <summary>
         /// è¡¨ç´™ï¼‘ãƒšãƒ¼ã‚¸ç›®ã�®è¡Œæ•°
         /// </summary>
-        private int s_Cover1NumberOfLine = 19;
+        private int s_Cover1NumberOfLine = 20;
         /// <summary>
         /// è¡¨ç´™ï¼’ãƒšãƒ¼ã‚¸ç›®ã�®è¡Œæ•°
         /// </summary>
@@ -596,7 +596,7 @@
                     // å½¹è�·ã‚’å�°å­—ã�™ã‚‹(Mï½ž)
                     int orgNumber = 11 + i;
                     string strAlpha = CommonMotions.cnvNumberToAlphaCharacter(orgNumber);
-                    m_UsedExcel.ExcelCellSet(string.Format("{0}24", strAlpha), OrderOfPrecedenceTable[i]);
+                    m_UsedExcel.ExcelCellSet(string.Format("{0}25", strAlpha), OrderOfPrecedenceTable[i]);
                 }
             }
             catch (Exception ex)
@@ -645,7 +645,7 @@
                 if (worklist.Count == 0 || workdlist.Count == 0) return CommonDefine.RetunAnswer.Answer4;
 
                 // å·¥äº‹å��ç§°ã‚’é€€é�¿ã�™ã‚‹
-                strParaList.Add(GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName).Trim());     // å·¥äº‹å��ç§°
+                strParaList.Add(GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName).Trim());           // å·¥äº‹å��ç§°
                 //è¡¨ç´™ã‚·ãƒ¼ãƒˆã�®å�–å¾—
                 m_UsedExcel.ExcelSheetGet(s_SheetName[(int)enumSheetName.Cover]);
                 // ç´„æ¬¾ãƒšãƒ¼ã‚¸ç¸¦ãƒ»æ¨ªã‚»ãƒƒãƒˆ
@@ -668,7 +668,7 @@
                 }
 
                 objPrint0[5, (int)Cover1ColumCharctor.ColumC] =
-                            GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName).Trim() + keisyo;     // ç™ºæ³¨è€…å��
+                            GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.OrderersName).Trim() + keisyo;           // ç™ºæ³¨è€…å��
 
                 List<EstimateData> etList = new List<EstimateData>();
                 // å·¥äº‹é‡‘é¡�
@@ -715,24 +715,36 @@
 
                 objPrint0[12, (int)Cover1ColumCharctor.ColumC] = "å·¥äº‹å��ç§°";
                 objPrint0[12, (int)Cover1ColumCharctor.ColumD] =
-                            GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName).Trim();         // å·¥äº‹å��ç§°
+                            GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName).Trim();            // å·¥äº‹å��ç§°
 
-                objPrint0[14, (int)Cover1ColumCharctor.ColumL] = CommonMotions.SystemMasterData.CompanyName1.Trim();                    // ä¼šç¤¾å��
+                StringBuilder sbWork = new StringBuilder();
+                sbWork.AppendFormat("{0} {1}", CommonMotions.SystemMasterData.CompanyName1.Trim(), CommonMotions.SystemMasterData.CompanyName2.Trim());
+                objPrint0[14, (int)Cover1ColumCharctor.ColumL] = sbWork.ToString().Trim();                                              // ä¼šç¤¾å��
 
-                objPrint0[15, (int)Cover1ColumCharctor.ColumL] = "ã€’" + CommonMotions.SystemMasterData.ZipCode.Trim();                   // éƒµä¾¿ç•ªå�·
-                objPrint0[16, (int)Cover1ColumCharctor.ColumL] = CommonMotions.SystemMasterData.Address1.Trim()
-                                                                + CommonMotions.SystemMasterData.Address2.Trim()
-                                                                + CommonMotions.SystemMasterData.Address3.Trim();                       // ä½�æ‰€
-                string number1 = "TEL " + CommonMotions.SystemMasterData.PhoneNumber.Trim() + "(ä»£)";
-                string number2 = "FAX " + CommonMotions.SystemMasterData.FaxNumber.Trim();
-                objPrint0[17, (int)Cover1ColumCharctor.ColumL] = number1 + "  " + number2;                                              // é›»è©±ç•ªå�· FAXç•ªå�·
-                objPrint0[18, (int)Cover1ColumCharctor.ColumL] = CommonMotions.SystemMasterData.HomePageURL;                            // ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸URL
+                sbWork.Clear();
+                sbWork.AppendFormat("{0} {1}", CommonMotions.SystemMasterData.CEOPositionName.Trim(), CommonMotions.SystemMasterData.CEOName.Trim());
+                objPrint0[15, (int)Cover1ColumCharctor.ColumL] = sbWork.ToString().Trim();                                              // ä»£è¡¨è€…å��
 
+                objPrint0[16, (int)Cover1ColumCharctor.ColumL] = "ã€’" + CommonMotions.SystemMasterData.ZipCode.Trim();                   // éƒµä¾¿ç•ªå�·
+
+                sbWork.Clear();
+                sbWork.AppendFormat("{0}{1}{2}", CommonMotions.SystemMasterData.Address1.Trim()
+                                            , CommonMotions.SystemMasterData.Address2.Trim()
+                                            , CommonMotions.SystemMasterData.Address3.Trim());
+                objPrint0[17, (int)Cover1ColumCharctor.ColumL] = sbWork.ToString().Trim();                                              // ä½�æ‰€
+
+                sbWork.Clear();
+                sbWork.AppendFormat("TEL {0}(ä»£) FAX {1}", CommonMotions.SystemMasterData.PhoneNumber.Trim()
+                                                            , CommonMotions.SystemMasterData.FaxNumber.Trim());
+                objPrint0[18, (int)Cover1ColumCharctor.ColumL] = sbWork.ToString().Trim();                                              // é›»è©±ç•ªå�· FAXç•ªå�·
+
+                objPrint0[19, (int)Cover1ColumCharctor.ColumL] = CommonMotions.SystemMasterData.HomePageURL.Trim();                     // ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸URL
+
                 // åˆ¤å­�å�°å­—
                 PrintCoverSeal(worklist[0].SalesPersonCode);
 
                 // ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                m_UsedExcel.ExcelCellSet("C4", objPrint0, "N22");
+                m_UsedExcel.ExcelCellSet("C4", objPrint0, "N23");
 
                 // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
                 this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
@@ -783,7 +795,7 @@
                 objPrint[23, (int)Cover2ColumCharctor.ColumE] = GetDictionaryMember(workDic, (int)ConstructionBaseInfoDetail.DataNoDef.Note2).Trim();                   // å‚™è€ƒ
 
                 // ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                m_UsedExcel.ExcelCellSet("E29", objPrint, "M53");
+                m_UsedExcel.ExcelCellSet("E30", objPrint, "M53");
 
                 // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
                 this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintCommon.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintCommon.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintCommon.cs	(revision 305)
@@ -128,10 +128,10 @@
         /// <summary>
         /// åˆ¤å­�ä½�ç½®(Key:X Value:Y)å·¦ã�‹ã‚‰
         /// </summary>
-        private static float[,] s_CoverSealPoint = new float[4, 2] {{357.50f, 202.75f},    // æ‰¿èª�è€…1
-                                                                    {425.50f, 202.75f},    // æ‰¿èª�è€…2
-                                                                    {490.50f, 202.75f},    // æ‰¿èª�è€…3
-                                                                    {560.50f, 202.75f} };  // æ‰¿èª�è€…4
+        private static float[,] s_CoverSealPoint = new float[4, 2] {{357.50f, 214.75f},    // æ‰¿èª�è€…1
+                                                                    {425.50f, 214.75f},    // æ‰¿èª�è€…2
+                                                                    {490.50f, 214.75f},    // æ‰¿èª�è€…3
+                                                                    {560.50f, 214.75f} };  // æ‰¿èª�è€…4
         #endregion
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintFormat1.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintFormat1.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintFormat1.cs	(revision 305)
@@ -160,11 +160,6 @@
                 NameTable[3] = SalesRec.SealPrintName;
 
                 // æ‰¿èª�ãƒ‡ãƒ¼ã‚¿èª­è¾¼
-                //string strSQLSeal = paDB.CreatePrimarykeyString(m_ConstructionCode, (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
-                //strSQLSeal += " AND SEQNO != 1 Order By SeqNo Asc";
-                //List<ProcessApproval> paList = new List<ProcessApproval>();
-                //if (!paDB.SelectAction(strSQLSeal, ref paList)) return;
-
                 string strSQLSeal = "SELECT * FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B, SECURITYMASTER C";
                 strSQLSeal += string.Format(" Where A.ConstructionCode = {0}", ConstructionCode.ToString());
                 strSQLSeal += string.Format(" And A.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
@@ -230,7 +225,7 @@
 
                     // ã‚¿ã‚¤ãƒˆãƒ«å�°å­—
                     string strChar = CommonMotions.cnvNumberToAlphaCharacter(PrintPos);
-                    if (TitleTable[i].Length != 0) m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, 16), TitleTable[i]);
+                    if (TitleTable[i].Length != 0) m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, 17), TitleTable[i]);
                 }
             }
             catch (Exception ex)
@@ -361,7 +356,7 @@
                     }
 
                     // ãƒ–ãƒ­ãƒƒã‚¯ï¼’ç·¨é›†
-                    RARet = SetBlock2Data(OrderRec, workRec.DetailString, 159);
+                    RARet = SetBlock2Data(OrderRec, workRec.DetailString, 142);
                     if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
 
                     // ä¸­æ–­å‡¦ç�†
@@ -373,7 +368,7 @@
                     }
 
                     // ãƒ–ãƒ­ãƒƒã‚¯ï¼“ç·¨é›†
-                    RARet = SetBlock3Data(OrderRec, 159);
+                    RARet = SetBlock3Data(OrderRec, 142);
                     if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
 
                     // ä¸­æ–­å‡¦ç�†
@@ -385,7 +380,7 @@
                     }
 
                     // ãƒ–ãƒ­ãƒƒã‚¯ï¼”ç·¨é›†
-                    RARet = SetBlock4Data(OrderRec, 159);
+                    RARet = SetBlock4Data(OrderRec, 142);
                     if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
 
                     // ä¸­æ–­å‡¦ç�†
@@ -432,16 +427,20 @@
             try
             {
                 // å�”åŠ›ä¼šç¤¾å��å�–å¾—
-                string strSQL = ContractorDB.CreatePrimarykeyString(OrderRec.CompanyCode);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(ContractorDB.CreatePrimarykeyString(OrderRec.CompanyCode));
                 SubContractorMaster ContractorRec = new SubContractorMaster();
-                if (!ContractorDB.SelectAction(strSQL, ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6;
+                if (!ContractorDB.SelectAction(strSQL.ToString(), ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6;
 
                 // ç›¸æ‰‹å…ˆä½�æ‰€é•·ã�•åˆ¤å®š
-                string strA2 = ContractorRec.Address1 + ContractorRec.Address2 + ContractorRec.Address3;
+                string strA2 = string.Format("{0}{1}{2}", ContractorRec.Address1
+                                                        , ContractorRec.Address2
+                                                        , ContractorRec.Address3);
                 string strA3 = string.Empty;
                 if (strA2.Length > 22)
                 {
-                    strA2 = ContractorRec.Address1 + ContractorRec.Address2;
+                    strA2 = string.Format("{0}{1}", ContractorRec.Address1
+                                                    , ContractorRec.Address2);
                     strA3 = ContractorRec.Address3;
                 }
                 // ç›¸æ‰‹å…ˆä¼šç¤¾å��ç·¨é›†
@@ -449,31 +448,54 @@
                 switch (ContractorRec.CorporateStatusPoint)
                 {
                     case 0:
-                        strA4 = ContractorRec.CompanyName;
+                        strA4 = ContractorRec.CompanyName.Trim();
                         break;
                     case 1:
-                        strA4 = ContractorRec.CorporateStatusName + "ã€€" + ContractorRec.CompanyName;
+                        strA4 = string.Format("{0} {1}", ContractorRec.CorporateStatusName.Trim()
+                                                        , ContractorRec.CompanyName.Trim());
                         break;
                     case 2:
-                        strA4 = ContractorRec.CompanyName + "ã€€" + ContractorRec.CorporateStatusName;
+                        strA4 = string.Format("{0} {1}", ContractorRec.CompanyName.Trim()
+                                                        , ContractorRec.CorporateStatusName.Trim());
                         break;
                 }
 
-                m_UsedExcel.ExcelCellSet("B8", "ã€’" + ContractorRec.ZipCode);                   // ç™ºæ³¨å…ˆ éƒµä¾¿ç•ªå�·
-                m_UsedExcel.ExcelCellSet("B9", strA2);                                          // ç™ºæ³¨å…ˆ ä½�æ‰€1
-                m_UsedExcel.ExcelCellSet("C10", strA3);                                          // ç™ºæ³¨å…ˆ ä½�æ‰€2
-                m_UsedExcel.ExcelCellSet("C12", strA4);                                         // ç™ºæ³¨å…ˆ ä¼šç¤¾
+                StringBuilder sbWork = new StringBuilder();
+                sbWork.AppendFormat("ã€’{0}", ContractorRec.ZipCode);
+                m_UsedExcel.ExcelCellSet("B8", sbWork.ToString().Trim());                               // ç™ºæ³¨å…ˆ éƒµä¾¿ç•ªå�·
+                m_UsedExcel.ExcelCellSet("B9", strA2);                                                  // ç™ºæ³¨å…ˆ ä½�æ‰€1
+                m_UsedExcel.ExcelCellSet("C10", strA3);                                                 // ç™ºæ³¨å…ˆ ä½�æ‰€2
+                m_UsedExcel.ExcelCellSet("C12", strA4);                                                 // ç™ºæ³¨å…ˆ ä¼šç¤¾
 
-                m_UsedExcel.ExcelCellSet("M10", "ã€’" + CommonMotions.SystemMasterData.ZipCode);          // è‡ªç¤¾ éƒµä¾¿ç•ªå�·
-                m_UsedExcel.ExcelCellSet("M11", CommonMotions.SystemMasterData.Address1 +
-                                                CommonMotions.SystemMasterData.Address2 +
-                                                CommonMotions.SystemMasterData.Address3);               // è‡ªç¤¾ ä½�æ‰€1
-                m_UsedExcel.ExcelCellSet("M12", CommonMotions.SystemMasterData.CompanyName1 +
-                                                CommonMotions.SystemMasterData.CompanyName2);           // è‡ªç¤¾ ä¼šç¤¾å��
-                m_UsedExcel.ExcelCellSet("M13", "TEL " + CommonMotions.SystemMasterData.PhoneNumber);   // è‡ªç¤¾ é›»è©±ç•ªå�·
-                m_UsedExcel.ExcelCellSet("M14", "FAX " + CommonMotions.SystemMasterData.FaxNumber);     // è‡ªç¤¾ FAXç•ªå�·
+                sbWork.Clear();
+                sbWork.AppendFormat("ã€’{0}", CommonMotions.SystemMasterData.ZipCode);
+                m_UsedExcel.ExcelCellSet("M10", sbWork.ToString().Trim());                              // è‡ªç¤¾ éƒµä¾¿ç•ªå�·
 
+                sbWork.Clear();
+                sbWork.AppendFormat("{0}{1}{2}", CommonMotions.SystemMasterData.Address1.Trim()
+                                                , CommonMotions.SystemMasterData.Address2.Trim()
+                                                , CommonMotions.SystemMasterData.Address3.Trim());
+                m_UsedExcel.ExcelCellSet("M11", sbWork.ToString().Trim());                              // è‡ªç¤¾ ä½�æ‰€1
 
+                sbWork.Clear();
+                sbWork.AppendFormat("{0} {1}", CommonMotions.SystemMasterData.CompanyName1.Trim()
+                                            , CommonMotions.SystemMasterData.CompanyName2.Trim());
+                m_UsedExcel.ExcelCellSet("M12", sbWork.ToString().Trim());                              // è‡ªç¤¾ ä¼šç¤¾å��
+
+                sbWork.Clear();
+                sbWork.AppendFormat("{0} {1}", CommonMotions.SystemMasterData.CEOPositionName.Trim()
+                                                , CommonMotions.SystemMasterData.CEOName.Trim());
+                m_UsedExcel.ExcelCellSet("M13", sbWork.ToString().Trim());                              // è‡ªç¤¾ ä»£è¡¨è€…å��
+
+                sbWork.Clear();
+                sbWork.AppendFormat("TEL {0}", CommonMotions.SystemMasterData.PhoneNumber.Trim());
+                m_UsedExcel.ExcelCellSet("M14", sbWork.ToString().Trim());                              // è‡ªç¤¾ é›»è©±ç•ªå�·
+                
+                sbWork.Clear();
+                sbWork.AppendFormat("FAX {0}", CommonMotions.SystemMasterData.FaxNumber.Trim());
+                m_UsedExcel.ExcelCellSet("M15", sbWork.ToString().Trim());                              // è‡ªç¤¾ FAXç•ªå�·
+
+
                 // åˆ¤å­�å�°å­—
                 ExcelPrintCoverSeal(m_ConstructionBaseInfo.ConstructionPersonCode);
 
@@ -691,13 +713,21 @@
             IOMSubContractor ContractorDB = new IOMSubContractor();
             try
             {
-                m_UsedExcel.ExcelCellSet("B166", "ã€’" + CommonMotions.SystemMasterData.ZipCode);         // è‡ªç¤¾ éƒµä¾¿ç•ªå�·
-                m_UsedExcel.ExcelCellSet("B167", CommonMotions.SystemMasterData.Address1 +
-                                                CommonMotions.SystemMasterData.Address2 +
-                                                CommonMotions.SystemMasterData.Address3);               // è‡ªç¤¾ ä½�æ‰€
-                m_UsedExcel.ExcelCellSet("C170", CommonMotions.SystemMasterData.CompanyName1 +
-                                                CommonMotions.SystemMasterData.CompanyName2);           // è‡ªç¤¾ ä¼šç¤¾å��
+                StringBuilder sbWork = new StringBuilder();
+                sbWork.AppendFormat("ã€’{0}", CommonMotions.SystemMasterData.ZipCode);
+                m_UsedExcel.ExcelCellSet("B150", sbWork.ToString().Trim());                             // è‡ªç¤¾ éƒµä¾¿ç•ªå�·
 
+                sbWork.Clear();
+                sbWork.AppendFormat("{0}{1}{2}", CommonMotions.SystemMasterData.Address1.Trim()
+                                                , CommonMotions.SystemMasterData.Address2.Trim()
+                                                , CommonMotions.SystemMasterData.Address3.Trim());
+                m_UsedExcel.ExcelCellSet("B151", sbWork.ToString().Trim());                             // è‡ªç¤¾ ä½�æ‰€
+
+                sbWork.Clear();
+                sbWork.AppendFormat("{0} {1}", CommonMotions.SystemMasterData.CompanyName1.Trim()
+                                            , CommonMotions.SystemMasterData.CompanyName2.Trim());
+                m_UsedExcel.ExcelCellSet("C154", sbWork.ToString().Trim());                             // è‡ªç¤¾ ä¼šç¤¾å��
+
                 // å�”åŠ›ä¼šç¤¾å��å�–å¾—
                 string strSQL = ContractorDB.CreatePrimarykeyString(OrderRec.CompanyCode);
                 SubContractorMaster ContractorRec = new SubContractorMaster();
@@ -704,11 +734,14 @@
                 if (!ContractorDB.SelectAction(strSQL, ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6;
 
                 // ç›¸æ‰‹å…ˆä½�æ‰€é•·ã�•åˆ¤å®š
-                string strA2 = ContractorRec.Address1 + ContractorRec.Address2 + ContractorRec.Address3;
+                string strA2 = string.Format("{0}{1}{2}", ContractorRec.Address1
+                                                        , ContractorRec.Address2
+                                                        , ContractorRec.Address3);
                 string strA3 = string.Empty;
                 if (strA2.Length > 22)
                 {
-                    strA2 = ContractorRec.Address1 + ContractorRec.Address2;
+                    strA2 = string.Format("{0}{1}", ContractorRec.Address1
+                                                    , ContractorRec.Address2);
                     strA3 = ContractorRec.Address3;
                 }
                 // ç›¸æ‰‹å…ˆä¼šç¤¾å��ç·¨é›†
@@ -716,20 +749,24 @@
                 switch (ContractorRec.CorporateStatusPoint)
                 {
                     case 0:
-                        strA4 = ContractorRec.CompanyName;
+                        strA4 = ContractorRec.CompanyName.Trim();
                         break;
                     case 1:
-                        strA4 = ContractorRec.CorporateStatusName + "ã€€" + ContractorRec.CompanyName;
+                        strA4 = string.Format("{0} {1}", ContractorRec.CorporateStatusName.Trim()
+                                                        , ContractorRec.CompanyName.Trim());
                         break;
                     case 2:
-                        strA4 = ContractorRec.CompanyName + "ã€€" + ContractorRec.CorporateStatusName;
+                        strA4 = string.Format("{0} {1}", ContractorRec.CompanyName.Trim()
+                                                        , ContractorRec.CorporateStatusName.Trim());
                         break;
                 }
 
-                m_UsedExcel.ExcelCellSet("L166", "ã€’" + ContractorRec.ZipCode);                  // ç™ºæ³¨å…ˆ éƒµä¾¿ç•ªå�·
-                m_UsedExcel.ExcelCellSet("M167", strA2);                                         // ç™ºæ³¨å…ˆ ä½�æ‰€1
-                m_UsedExcel.ExcelCellSet("L168", strA3);                                         // ç™ºæ³¨å…ˆ ä½�æ‰€2
-                m_UsedExcel.ExcelCellSet("M170", strA4);                                         // ç™ºæ³¨å…ˆ ä¼šç¤¾
+                sbWork.Clear();
+                sbWork.AppendFormat("ã€’{0}", ContractorRec.ZipCode);
+                m_UsedExcel.ExcelCellSet("L150", sbWork.ToString().Trim());                     // ç™ºæ³¨å…ˆ éƒµä¾¿ç•ªå�·
+                m_UsedExcel.ExcelCellSet("L151", strA2);                                        // ç™ºæ³¨å…ˆ ä½�æ‰€1
+                m_UsedExcel.ExcelCellSet("L152", strA3);                                        // ç™ºæ³¨å…ˆ ä½�æ‰€2
+                m_UsedExcel.ExcelCellSet("K154", strA4);                                        // ç™ºæ³¨å…ˆ ä¼šç¤¾
 
                 return CommonDefine.RetunAnswer.Answer0;
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 305)
@@ -43,13 +43,14 @@
                                                             ClsExcute.AppovalList[(int)ClsExcute.ApprovalListNo.FeePayment] };
         #endregion
 
-        #region �‡Œv�s’è‹`
+        #region �s’è‹`
         /// <summary>
-        /// �‡Œv�s’è‹`
+        /// �s’è‹`
         /// </summary>
-        private enum GoukeiRows
+        private enum RowsTypeDef
         {
-            �¬Œv = 1,
+            –¾�× = 0,
+            �¬Œv,
             �Á”ï�Å,
             �‚‘¬‘ã,
             ‹à•¨‘ã,
@@ -958,7 +959,7 @@
                 // •Ï�Xƒtƒ‰ƒO
                 CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
 
-                if (dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)GoukeiRows.�¬Œv)
+                if (dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.�¬Œv)
                                                         .ToArray()
                                                         .Count() == 0) return;
 
@@ -1050,12 +1051,12 @@
         private void DataGridView_CellValidated(object sender, DataGridViewCellEventArgs e)
         {
             DataGridView dgv = (DataGridView)sender;
-            GoukeiRows TargetRowtype = (GoukeiRows)dgv[(int)DispColumn.RowType, e.RowIndex].Value;
+            RowsTypeDef TargetRowtype = (RowsTypeDef)dgv[(int)DispColumn.RowType, e.RowIndex].Value;
 
             // �s�E—ñ‚ª”ÍˆÍŠO‚Í�ˆ—�‚µ‚È‚¢
             if (e.ColumnIndex < (int)DispColumn.SomuSeikyu) return;
             if ((int)DispColumn.KyoryokuUmu < e.ColumnIndex) return;
-            if (TargetRowtype >= GoukeiRows.�¬Œv) return;
+            if (TargetRowtype >= RowsTypeDef.�¬Œv) return;
 
             int Code_Column = dgvCompany.Visible == true ? (int)DispColumn_Company.SubConstractorCode : (int)DispColumn_Project.GengaCode;
 
@@ -1097,10 +1098,10 @@
             if (e.ColumnIndex == (int)DispColumn.SomuSeikyu || e.ColumnIndex == (int)DispColumn.KojiSeikyu)
             {
                 // �Á”ï�Å�sŒŸ�õ
-                int ZeiRowIndex = SearchRowIndex(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), GoukeiRows.�Á”ï�Å);
+                int ZeiRowIndex = SearchRowIndex(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), RowsTypeDef.�Á”ï�Å);
 
                 // �¬Œv�sŒŸ�õ
-                int ShoukeiRowIndex = SearchRowIndex(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), GoukeiRows.�¬Œv);
+                int ShoukeiRowIndex = SearchRowIndex(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), RowsTypeDef.�¬Œv);
 
                 if (ShoukeiRowIndex >= 0)
                 {
@@ -1117,7 +1118,7 @@
                 int ColIndex = e.ColumnIndex == (int)DispColumn.SomuKosoku ? (int)DispColumn.SomuSeikyu : (int)DispColumn.KojiSeikyu;
 
                 // �‡Œv’l�Ý’è
-                SetSubGoukei(dgv, ColIndex, e.ColumnIndex, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), GoukeiRows.�‚‘¬‘ã);
+                SetSubGoukei(dgv, ColIndex, e.ColumnIndex, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), RowsTypeDef.�‚‘¬‘ã);
             }
 
 
@@ -1128,7 +1129,7 @@
                 int ColIndex = e.ColumnIndex == (int)DispColumn.SomuKanamono ? (int)DispColumn.SomuSeikyu : (int)DispColumn.KojiSeikyu;
 
                 // �‡Œv’l�Ý’è
-                SetSubGoukei(dgv, ColIndex, e.ColumnIndex, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), GoukeiRows.‹à•¨‘ã);
+                SetSubGoukei(dgv, ColIndex, e.ColumnIndex, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), RowsTypeDef.‹à•¨‘ã);
             }
 
             // ŽY”p�Å
@@ -1138,7 +1139,7 @@
                 int ColIndex = e.ColumnIndex == (int)DispColumn.SomuSannhaiZei ? (int)DispColumn.SomuSeikyu : (int)DispColumn.KojiSeikyu;
 
                 // �‡Œv’l�Ý’è
-                SetSubGoukei(dgv, ColIndex, e.ColumnIndex, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), GoukeiRows.ŽY”p�Å);
+                SetSubGoukei(dgv, ColIndex, e.ColumnIndex, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), RowsTypeDef.ŽY”p�Å);
             }
 
             // �‡Œv�s
@@ -1176,9 +1177,9 @@
                     dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = SystemColors.ControlText;
                 }
 
-                GoukeiRows TargetRowtype = (GoukeiRows)dgv[(int)DispColumn.RowType, e.RowIndex].Value;
+                RowsTypeDef TargetRowtype = (RowsTypeDef)dgv[(int)DispColumn.RowType, e.RowIndex].Value;
 
-                if (!(TargetRowtype > GoukeiRows.�¬Œv && e.ColumnIndex != (int)DispColumn.SomuSeikyu && e.ColumnIndex != (int)DispColumn.KojiSeikyu))
+                if (!(TargetRowtype > RowsTypeDef.�¬Œv && e.ColumnIndex != (int)DispColumn.SomuSeikyu && e.ColumnIndex != (int)DispColumn.KojiSeikyu))
                 {
                     dgv[e.ColumnIndex, e.RowIndex].Value = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value).ToString("#,0");
                 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 305)
@@ -930,7 +930,7 @@
         {
             DataGridView dgv = getShowingView();
 
-            DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+            DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible)
                                                                     .ToArray();
             if (Rows.Count() == 0)
@@ -1216,7 +1216,7 @@
                 // Šù‚É•\Ž¦‚³‚ê‚Ä‚¢‚é‹ÆŽÒ‚Í�A�¬Œv�s‚Ì�ã‚É•s–¾‚ð’Ç‰Á‚·‚é
                 if (!bInsertRow)
                 {
-                    MakeIndex -= (int)GoukeiRows.�‡Œv;
+                    MakeIndex -= (int)RowsTypeDef.�‡Œv;
                 }
 
                 // ƒf�[ƒ^“ü—Í�s
@@ -1278,7 +1278,7 @@
                 DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstrCode
                                                                                 && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
-                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                             .OrderBy(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value))
                                                                             .ToArray();
 
@@ -1346,7 +1346,7 @@
                 {
                     // ‹ÆŽÒŒŸ�õ
                     SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) > CompnayCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                 .FirstOrDefault();
                 }
                 else
@@ -1353,7 +1353,7 @@
                 {
                     // Œ»�êŒŸ�õ
                     SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompnayCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                 .LastOrDefault();
                 }
 
@@ -1385,7 +1385,7 @@
                 {
                     // Œ»�êŒŸ�õ
                     SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == ConstrCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                 .LastOrDefault();
                 }
                 else
@@ -1392,7 +1392,7 @@
                 {
                     // ‹ÆŽÒŒŸ�õ
                     SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) > ConstrCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                 .FirstOrDefault();
                 }
 
@@ -1438,7 +1438,7 @@
             {
                 // �‡Œv—p�s”Ô�†
                 string cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == iGoukeiCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                         && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                                 .Max(x => (string)x.Cells[(int)DispColumn.GoukeiSeqNo].Value.ToString());
                 if (cell == null)
@@ -1497,7 +1497,7 @@
                 dgv.Rows[iIndex].Cells[(int)DispColumn.UpdateDate].Value = "";
                 dgv.Rows[iIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Added;            // ’Ç‰Á
                 dgv.Rows[iIndex].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;  // ‰ÂŽ‹
-                dgv.Rows[iIndex].Cells[(int)DispColumn.RowType].Value = 0;
+                dgv.Rows[iIndex].Cells[(int)DispColumn.RowType].Value = (int)RowsTypeDef.–¾�×;
                 dgv.Rows[iIndex].Cells[(int)DispColumn.No].Value = No == 0 ? "" : CommonMotions.cnvString(No);
                 dgv.Rows[iIndex].Cells[(int)DispColumn.GoukeiSeqNo].Value = iGoukeiSeqNo;
                 dgv.Rows[iIndex].Cells[(int)DispColumn.GroupSeqNo].Value = iGroupSeqNo;
@@ -1702,7 +1702,7 @@
                 DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompanyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstructionCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
-                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                             .OrderBy(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value))
                                                                             .ToArray();
 
@@ -1835,7 +1835,7 @@
                     DisporderCol = (int)DispColumn_Company.SubConstractorCode;
 
                     // •\Ž¦‚³‚ê‚Ä‚¢‚é�i�í�œ‚³‚ê‚Ä‚¢‚È‚¢�j–¾�×�s‚ð‘Î�Û‚Æ‚·‚é
-                    var OrderRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                    var OrderRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible)
                                                                     .GroupBy(c => new
                                                                     {
@@ -1850,7 +1850,7 @@
                     foreach (var k in OrderRows)
                     {
                         // �HŽ–”Ô�†‚ª“¯‚¶‚à‚Ì‚ðŽæ“¾‚·‚é
-                        DataGridViewRow[] GoukeiRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                        DataGridViewRow[] GoukeiRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                                  && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == k.Key.GoukeiCode)
                                                                                       .OrderBy(x => x.Cells[(int)DispColumn.CompanyDispOrder].Value)
                                                                                       .ThenBy(x => x.Cells[(int)DispColumn.GroupSeqNo].Value)
@@ -1865,7 +1865,7 @@
                         }
 
                         DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                         && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == k.Key.GoukeiCode)
                                                                 .OrderBy(x => x.Cells[(int)DispColumn.GoukeiSeqNo].RowIndex)
                                                                 .ToArray();
@@ -1896,7 +1896,7 @@
                 {
                     DisporderCol = m_GoukeiCode_Column;
 
-                    var OrderRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                    var OrderRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible)
                                                                     .GroupBy(c => new
                                                                     {
@@ -1916,7 +1916,7 @@
                     iNo = 1;
                     foreach (var k in OrderRows)
                     {
-                        DataGridViewRow[] GoukeiRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                        DataGridViewRow[] GoukeiRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                                  && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == k.GoukeiCode)
                                                                                         .OrderBy(x => x.Cells[(int)DispColumn.CompanyDispOrder].Value)
                                                                                         .ThenBy(x => x.Cells[(int)DispColumn.GroupSeqNo].Value)
@@ -1930,7 +1930,7 @@
                         }
 
                         DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                         && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == k.GoukeiCode)
                                                                 .OrderBy(x => x.Cells[m_GoukeiCode_Column].RowIndex)
                                                                 .ToArray();
@@ -1974,7 +1974,7 @@
                 DataGridView dgv = getShowingView();
 
                 DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
-                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                         && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Added)
                         .ToArray();
 
@@ -1983,7 +1983,7 @@
                     int SeqNo = 1;
 
                     DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
-                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                             .ToArray();
                     int escSeqNo = 0;
                     int LineCount = 1;
@@ -2026,7 +2026,7 @@
 
             // “¯ƒOƒ‹�[ƒv‚ª‘S‚Ä–³‚­‚È‚Á‚½�ê�‡‚Í�A�‡Œv•\Ž¦‚ð�í�œ
             int cnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
-                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                             && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == iGoukeiCode)
                                                     .Count();
             if (cnt == 0)
@@ -2033,7 +2033,7 @@
             {
                 // �‡Œv�s�í�œ
                 DataGridViewRow[] RowsGoukei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == iGoukeiCode
-                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) != 0)
+                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) != (int)RowsTypeDef.–¾�×)
                                                             .ToArray();
 
                 foreach (DataGridViewRow r in RowsGoukei)
@@ -2054,7 +2054,7 @@
         /// <param name="Code">ƒR�[ƒh</param>
         /// <param name="RowType">ŒŸ�õ‘Î�Û�‡Œv�s</param>
         /// <returns></returns>
-        private int SearchRowIndex(int CodeCol, int Code, GoukeiRows RowType, int SeqNo = 0, int LineCode = 0, DataRowState NotRowState = DataRowState.Unchanged)
+        private int SearchRowIndex(int CodeCol, int Code, RowsTypeDef RowType, int SeqNo = 0, int LineCode = 0, DataRowState NotRowState = DataRowState.Unchanged)
         {
             DataGridView dgv = getShowingView();
             int type = (int)RowType;
@@ -2072,7 +2072,7 @@
                     Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)CodeCol].Value) == Code
                                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == SeqNo
                                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.LineCount].Value) == LineCode
-                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible).ToArray();
                 }
 
@@ -2244,7 +2244,7 @@
 
 
             // •K—v�s’Š�o ˜A”Ô�A�s”Ô�†�¸�‡
-            DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+            DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                               && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                               && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == GoukeiCd)
                                                                         .OrderBy(x => x.Cells[(int)DispColumn.GroupSeqNo].Value)
@@ -2280,22 +2280,22 @@
 
             // ‘�–±�‡Œv—“
             iColIndex = (int)DispColumn.SomuKosoku;
-            foreach (GoukeiRows i in Enum.GetValues(typeof(GoukeiRows)))
+            foreach (RowsTypeDef i in Enum.GetValues(typeof(RowsTypeDef)))
             {
-                if (i == GoukeiRows.�¬Œv)
+                if (i == RowsTypeDef.�¬Œv)
                     continue;
-                if (i == GoukeiRows.‹¦—Í‹à)
+                if (i == RowsTypeDef.‹¦—Í‹à)
                     break;
 
                 // —ñ�Ý’è
                 int ColIndex = (int)DispColumn.SomuSeikyu;
 
-                if (i == GoukeiRows.�Á”ï�Å)
+                if (i == RowsTypeDef.�Á”ï�Å)
                 {
                     // �sŒŸ�õ
                     int RowIndex = SearchRowIndex(m_GoukeiCode_Column, GoukeiCd, i);
                     // �¬Œv�sŒŸ�õ
-                    int ShoukeiRowIndex = SearchRowIndex(m_GoukeiCode_Column, GoukeiCd, GoukeiRows.�¬Œv);
+                    int ShoukeiRowIndex = SearchRowIndex(m_GoukeiCode_Column, GoukeiCd, RowsTypeDef.�¬Œv);
                     if (ShoukeiRowIndex == -1) return;
 
                     //�¦Œã‚É‰ïŽÐ�î•ñ‚©‚çŽæ“¾‚³‚ê‚é (Žb’è“I‚É’è�”’l—˜—p)                        �@
@@ -2316,20 +2316,20 @@
 
             // �HŽ–�‡Œv—“
             iColIndex = (int)DispColumn.KojiKosoku;
-            foreach (GoukeiRows i in Enum.GetValues(typeof(GoukeiRows)))
+            foreach (RowsTypeDef i in Enum.GetValues(typeof(RowsTypeDef)))
             {
-                if (i == GoukeiRows.�¬Œv)
+                if (i == RowsTypeDef.�¬Œv)
                     continue;
 
                 // —ñ�Ý’è
                 int ColIndex = (int)DispColumn.KojiSeikyu;
 
-                if (i == GoukeiRows.�Á”ï�Å)
+                if (i == RowsTypeDef.�Á”ï�Å)
                 {
                     // �sŒŸ�õ
                     int RowIndex = SearchRowIndex(m_GoukeiCode_Column, GoukeiCd, i);
                     // �¬Œv�sŒŸ�õ
-                    int ShoukeiRowIndex = SearchRowIndex(m_GoukeiCode_Column, GoukeiCd, GoukeiRows.�¬Œv);
+                    int ShoukeiRowIndex = SearchRowIndex(m_GoukeiCode_Column, GoukeiCd, RowsTypeDef.�¬Œv);
 
                     if (RowIndex < 0 || ShoukeiRowIndex < 0) return;
 
@@ -2390,7 +2390,7 @@
             ShoukeiSanshutu((int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value));
 
             // �‡Œv’lŽZ�o
-            SetSubGoukei(dgv, (int)DispColumn.KojiSeikyu, (int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value), GoukeiRows.‹¦—Í‹à);
+            SetSubGoukei(dgv, (int)DispColumn.KojiSeikyu, (int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value), RowsTypeDef.‹¦—Í‹à);
 
         }
         #endregion
@@ -2404,12 +2404,12 @@
         /// <param name="Code_Column">�‡Œv‚·‚é’PˆÊ‚Ì—ñ”Ô�†</param>
         /// <param name="Code">�‡Œv‚·‚é’PˆÊ‚Ì—ñ‚Ì’l</param>
         /// <param name="SetRow">‘Î�Û�‡Œv�s</param>
-        private void SetSubGoukei(DataGridView dgv, int ColIndex, int GetColIndex, int Code_Column, int Code, GoukeiRows SetRow)
+        private void SetSubGoukei(DataGridView dgv, int ColIndex, int GetColIndex, int Code_Column, int Code, RowsTypeDef SetRow)
         {
             // �sŒŸ�õ
             int RowIndex = SearchRowIndex(Code_Column, Code, SetRow);
             // �¬Œv�sŒŸ�õ
-            int GetRowIndex = SearchRowIndex(Code_Column, Code, GoukeiRows.�¬Œv);
+            int GetRowIndex = SearchRowIndex(Code_Column, Code, RowsTypeDef.�¬Œv);
 
             if (RowIndex < 0 || GetRowIndex < 0) return;
 
@@ -2436,11 +2436,11 @@
                     return;
                 }
                 // �¬Œv�sŒŸ�õ
-                int ShoukeiRowIndex = SearchRowIndex(Code_Column, Code, GoukeiRows.�¬Œv);
+                int ShoukeiRowIndex = SearchRowIndex(Code_Column, Code, RowsTypeDef.�¬Œv);
                 if (ShoukeiRowIndex == -1) return;
 
                 int Shoukei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[Code_Column].Value) == Code
-                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible)
                                                                 .Sum(y => CommonMotions.cnvInt(y.Cells[(int)TargetColumn].Value));
 
@@ -2467,26 +2467,26 @@
             try
             {
                 // �Ý’è�sŒŸ�õ
-                int RowIndex = SearchRowIndex(CompanyCode_Column, CompanyCode, GoukeiRows.�‡Œv);
+                int RowIndex = SearchRowIndex(CompanyCode_Column, CompanyCode, RowsTypeDef.�‡Œv);
                 if (RowIndex < 0) return;
 
                 int SoumuKei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[CompanyCode_Column].Value) == CompanyCode &&
-                                                                                                                    ((int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.�¬Œv ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.�Á”ï�Å ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.�‚‘¬‘ã ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.‹à•¨‘ã ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.ŽY”p�Å))
+                                                                                                                    ((int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�¬Œv ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�Á”ï�Å ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�‚‘¬‘ã ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.‹à•¨‘ã ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.ŽY”p�Å))
                                                                .Sum(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.SomuSeikyu].Value));
                 dgv[(int)DispColumn.SomuSeikyu, RowIndex].Value = SoumuKei;
 
                 int KojiKei = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[CompanyCode_Column].Value) == CompanyCode &&
-                                                                                                                    ((int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.�¬Œv ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.�Á”ï�Å ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.�‚‘¬‘ã ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.‹à•¨‘ã ||
-                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)GoukeiRows.ŽY”p�Å))
+                                                                                                                    ((int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�¬Œv ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�Á”ï�Å ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.�‚‘¬‘ã ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.‹à•¨‘ã ||
+                                                                                                                     (int)x.Cells[(int)DispColumn.RowType].Value == (int)RowsTypeDef.ŽY”p�Å))
                                                                .Sum(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.KojiSeikyu].Value));
-                KojiKei = KojiKei - CommonMotions.cnvInt(dgv[(int)DispColumn.KojiSeikyu, SearchRowIndex(CompanyCode_Column, CompanyCode, GoukeiRows.‹¦—Í‹à)].Value);
+                KojiKei = KojiKei - CommonMotions.cnvInt(dgv[(int)DispColumn.KojiSeikyu, SearchRowIndex(CompanyCode_Column, CompanyCode, RowsTypeDef.‹¦—Í‹à)].Value);
                 dgv[(int)DispColumn.KojiSeikyu, RowIndex].Value = KojiKei;
 
             }
@@ -2516,14 +2516,14 @@
                     cnt = StartIndex;
                 }
 
-                DataGridViewRow[] list = new DataGridViewRow[(int)GoukeiRows.�‡Œv];
-                foreach (GoukeiRows i in Enum.GetValues(typeof(GoukeiRows)))
+                DataGridViewRow[] list = new DataGridViewRow[(int)RowsTypeDef.�‡Œv];
+                foreach (RowsTypeDef i in Enum.GetValues(typeof(RowsTypeDef)))
                 {
                     DataGridViewRow row = new DataGridViewRow();
                     row.CreateCells(dgv);
 
                     string Money = "";
-                    if (i == GoukeiRows.�¬Œv)
+                    if (i == RowsTypeDef.�¬Œv)
                     {
                         Money = "0";
                     }
@@ -2545,7 +2545,7 @@
                                                         "",
                                                         "",
                                                         "",     // ’Ç‰Á�@2017/9/11
-                                                        Enum.GetName(typeof(GoukeiRows), i),
+                                                        Enum.GetName(typeof(RowsTypeDef), i),
                                                         0,
                                                         Money,
                                                         Money,
@@ -2579,7 +2579,7 @@
                                                         "",
                                                         "",
                                                         "",     // ’Ç‰Á�@2017/9/11
-                                                        Enum.GetName(typeof(GoukeiRows), i),
+                                                        Enum.GetName(typeof(RowsTypeDef), i),
                                                         0,
                                                         Money,
                                                         Money,
@@ -2599,11 +2599,11 @@
                     row.ReadOnly = true;
                     switch (i)
                     {
-                        case GoukeiRows.�¬Œv:
+                        case RowsTypeDef.�¬Œv:
                             //row.DefaultCellStyle.BackColor = Color.Khaki;
                             row.DefaultCellStyle.BackColor = Color.LightGoldenrodYellow;
                             break;
-                        case GoukeiRows.�‡Œv:
+                        case RowsTypeDef.�‡Œv:
                             //row.DefaultCellStyle.BackColor = Color.Yellow;
                             row.DefaultCellStyle.BackColor = Color.DarkGray;
                             break;
@@ -3503,7 +3503,7 @@
                         if (iGoukeiCd != -1)
                         {
                             // –¾�×•\Ž¦‚³‚ê‚Ä‚¢‚éƒf�[ƒ^Œ��”ƒ`ƒFƒbƒN
-                            iDataCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                            iDataCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                   && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                                   && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == iGoukeiCd)
                                                                          .Count();
@@ -3512,7 +3512,7 @@
                             {
                                 // �‡Œv�s’Ç‰Á
                                 MakeGoukeiGyo(dgv, iGoukeiCd);
-                                icnt += System.Enum.GetValues(typeof(GoukeiRows)).Length;
+                                icnt += System.Enum.GetValues(typeof(RowsTypeDef)).Length;
 
                                 // �‡Œv’l�Ý’è
                                 setGoukei_DataDisp(dgv, iGoukeiCd);
@@ -3565,7 +3565,7 @@
                 }
 
                 // –¾�×•\Ž¦‚³‚ê‚Ä‚¢‚éƒf�[ƒ^Œ��”ƒ`ƒFƒbƒN
-                iDataCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                iDataCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                         && CommonMotions.cnvInt(x.Cells[m_GoukeiCode_Column].Value) == iGoukeiCd)
                                                                 .Count();
@@ -3930,7 +3930,7 @@
                 else
                     dgv.Rows[icnt].Cells[(int)DispColumn.RowState].Value = DataRowState.Unchanged;
 
-                dgv.Rows[icnt].Cells[(int)DispColumn.RowType].Value = 0;
+                dgv.Rows[icnt].Cells[(int)DispColumn.RowType].Value = (int)RowsTypeDef.–¾�×;
                 dgv.Rows[icnt].Cells[(int)DispColumn.GoukeiSeqNo].Value = iGoukeiSeq;
                 dgv.Rows[icnt].Cells[(int)DispColumn.GroupSeqNo].Value = CommonMotions.cnvInt(work[(int)ClickGetData.SEQNO]);
                 dgv.Rows[icnt].Cells[(int)DispColumn.LineCount].Value = CommonMotions.cnvInt(work[(int)ClickGetData.LINECOUNT]);
@@ -4572,7 +4572,7 @@
             try
             {
 
-                Result = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                Result = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted
                                                                 && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode)
                     .Sum(y => CommonMotions.cnvLong(y.Cells[(int)TargetColumn].Value));
@@ -4600,7 +4600,7 @@
                 DataGridView dgv = getShowingView();
 
                 // •K—v�s’Š�o ‹ÆŽÒƒR�[ƒh�A˜A”Ô�A�s”Ô�†�¸�‡
-                DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                                          .OrderBy(x => x.Cells[m_Company_Column].Value)
                                                                          .ThenBy(x => x.Cells[(int)DispColumn.GroupSeqNo].Value)
@@ -4680,7 +4680,7 @@
                 DataGridView dgv = getShowingView();
 
                 //�@�í�œ‘Î�Û‚Ì‹ÆŽÒƒR�[ƒh�A˜A”Ô‚Ìƒf�[ƒ^‚Ì’†‚Ì‚¢‚¸‚ê‚©‚ª‘¼ŽÒ‚É‚æ‚Á‚Ä•Ï�X‚³‚ê‚Ä‚¢‚é‚©ƒ`ƒFƒbƒN
-                var rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                var rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Deleted)
                                                            .GroupBy(c => new
                                                            {
@@ -4712,7 +4712,7 @@
                     foreach (BillingDataDetail listRow in BdDList)
                     {
                         // ƒOƒŠƒbƒh•\Ž¦ƒf�[ƒ^‚ÌŽæ“¾
-                        DataGridViewRow[] checkRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                        DataGridViewRow[] checkRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Modified
                                                                                                 && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == listRow.CompanyCode
                                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == listRow.SeqNo
@@ -4756,7 +4756,7 @@
                 DataGridView dgv = getShowingView();
 
                 //�@�í�œ‘Î�Û‚Ì‹ÆŽÒƒR�[ƒh�A˜A”Ô‚Ìƒf�[ƒ^‚Ì’†‚Ì‚¢‚¸‚ê‚©‚ª‘¼ŽÒ‚É‚æ‚Á‚Ä•Ï�X‚³‚ê‚Ä‚¢‚é‚©ƒ`ƒFƒbƒN
-                var rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                var rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Deleted)
                                                            .GroupBy(c => new
                                                            {
@@ -4776,7 +4776,7 @@
                 foreach (var r in rows)
                 {
                     // �í�œ�@•K—v�s’Š�o�i�í�œ‚ª•K—v‚È‹ÆŽÒ�A˜A”Ô‚ð‘S‚Ä�í�œ�A•K—v‚È�s‚Ì�s”Ô�†‚ð�U‚è‚È‚¨‚·�j
-                    DataGridViewRow[] DeleteRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                    DataGridViewRow[] DeleteRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                             && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == r.Key.CompanyCode
                                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == r.Key.SeqNo)
                                                                                    .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_Column].Value))
@@ -4987,8 +4987,9 @@
                     DataProgressBar.Update();
 
                     // •K—v�s’Š�o ‹ÆŽÒƒR�[ƒh�A˜A”Ô�A�s”Ô�†�¸�‡
-                    DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
-                                                                                        && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
+                    DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
+                                                                                        && (cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Added
+                                                                                        || cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Modified))
                                                                              .OrderBy(x => x.Cells[m_Company_Column].Value)
                                                                              .ThenBy(x => x.Cells[(int)DispColumn.GroupSeqNo].Value)
                                                                              .ThenBy(x => x.Cells[(int)DispColumn.LineCount].Value)
@@ -5003,9 +5004,6 @@
                     int NowSeqNo = 0;
                     foreach (DataGridViewRow r in Rows)
                     {
-                        // •Ï�X‚È‚µ‚Í�ˆ—�‚µ‚È‚¢
-                        if (cnvRowState(r.Cells[(int)DispColumn.RowState].Value) == DataRowState.Unchanged) continue;
-
                         NowCompanyCode = CommonMotions.cnvInt(r.Cells[m_Company_Column].Value);
                         NowSeqNo = CommonMotions.cnvInt(r.Cells[(int)DispColumn.GroupSeqNo].Value);
 
@@ -5173,7 +5171,6 @@
                             {
                                 throw new Exception("‹Æ–±�¿‹�–¾�×ƒf�[ƒ^�F’Ç‰Á�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
                             }
-
                         }
                         else
                         {
@@ -5450,9 +5447,9 @@
                                 IOBillingPaymentSummary IoBps, List<BillingPaymentSummary> BpsList, BillingPaymentSummary BpsWork, string strBpsWhere)
         {
             // ‹ÆŽÒ�¿‹�Žx•¥ƒTƒ}ƒŠ�[ƒf�[ƒ^-----------------------------------------------
-            for (int ChargePKind = (int)BillingPaymentSummary.ChargePaymentKindDef.Billing
-                    ; ChargePKind <= (int)BillingPaymentSummary.ChargePaymentKindDef.Payment
-                    ; ChargePKind++)
+            int nStartIndex = (int)BillingPaymentSummary.ChargePaymentKindDef.Billing;
+            int nEndIndex = (int)BillingPaymentSummary.ChargePaymentKindDef.Payment;
+            for (int ChargePKind = nStartIndex; ChargePKind <= nEndIndex; ChargePKind++)
             {
                 strBpsWhere = IoBps.CreatePrimarykeyString(iCompanyCode, m_Select_TargetDate, ChargePKind);
                 BpsList = new List<BillingPaymentSummary>();
@@ -5576,7 +5573,7 @@
             try
             {
 
-                Result = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                Result = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted
                                                                 && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == SeqNo)
@@ -5672,13 +5669,13 @@
                 if (rdbCompany.Checked)
                 {
                     DetailRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompanyCode
-                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                              .ToArray();
                 }
                 else
                 {
                     // –¾�×ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-                    if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.RowType].Value) != 0) return;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.RowType].Value) != (int)RowsTypeDef.–¾�×) return;
                     DetailRows = new DataGridViewRow[1];
                     DetailRows[0] = CurRow;
                 }
@@ -5708,7 +5705,7 @@
                 {
                     // �‡Œv�sŽæ“¾
                     DataGridViewRow[] TotalRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompanyCode
-                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) != 0)
+                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) != (int)RowsTypeDef.–¾�×)
                                                                                     .ToArray();
 
                     // �‡Œv�s�í�œ
@@ -5776,7 +5773,7 @@
                 if (rdbCompany.Checked)
                 {
                     // –¾�×ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-                    if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.RowType].Value) != 0) return;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.RowType].Value) != (int)RowsTypeDef.–¾�×) return;
                     DetailRows = new DataGridViewRow[1];
                     DetailRows[0] = CurRow;
                 }
@@ -5783,7 +5780,7 @@
                 else
                 {
                     DetailRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstrCode
-                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0)
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                              .ToArray();
                 }
 
@@ -5812,7 +5809,7 @@
                 {
                     // �‡Œv�sŽæ“¾
                     DataGridViewRow[] TotalRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstrCode
-                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) != 0)
+                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) != (int)RowsTypeDef.–¾�×)
                                                                                     .ToArray();
 
                     // �‡Œv�s�í�œ
@@ -5869,7 +5866,7 @@
                 DataGridView dgv = getShowingView();
 
                 // •\Ž¦‰æ–Ê�ã‚É‹¦—Í‰ïŽÐ‚ª–³‚¢‚©‚ðƒ`ƒFƒbƒN‚·‚é
-                DataGridViewRow[] compRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                DataGridViewRow[] compRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted
                                                                                     && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompnyCode)
                                                                                 .ToArray();
Index: branches/src/ProcessManagement/ProcessManagement/ProcessManage.xlsx
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 304)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 305)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.19")]
-[assembly: AssemblyFileVersion("1.0.1.19")]
+[assembly: AssemblyVersion("1.0.1.20")]
+[assembly: AssemblyFileVersion("1.0.1.20")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
