Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 295)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 296)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 105;
+        public static int s_SystemVersion = 107;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsProcessExist.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsProcessExist.cs	(revision 295)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsProcessExist.cs	(revision 296)
@@ -119,6 +119,59 @@
         /// </summary>
         /// <param name="InputCode"></param>
         /// <returns></returns>
+        public static int GetParentConstrCode(int InputCode, int InputJoinFlg, int InputTyingFlg)
+        {
+            IOConstructionLink LinkDB = new IOConstructionLink();
+            try
+            {
+                if (InputJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard
+                    && InputTyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Standard)
+                {
+                    return InputCode;
+                }
+
+                if (InputJoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
+                {   // ----- çµ�å�ˆå·¥äº‹ã�®ãƒ�ã‚§ãƒƒã‚¯
+                    // çµ�å�ˆå·¥äº‹ã�¯çµ�å�ˆè¦ªå·¥äº‹ç•ªå�·ã‚’è¿”ã�™
+                    int FuncCnt = 0;
+                    ArrayList ParList = new ArrayList();
+                    ClsChangeBaseInfoData.GetParentData(InputCode, ref ParList, ref FuncCnt);
+                    // ãƒ‡ãƒ¼ã‚¿ç„¡ã�¯ã‚¨ãƒ©ãƒ¼
+                    if (ParList.Count == 0) return InputCode;
+
+                    object[] objRec = (object[])ParList[0];
+                    return CommonMotions.cnvInt(objRec[0]);
+                }
+                else
+                {
+                    // å¢—æ¸›å·¥äº‹ã�§ã�ªã�„å ´å�ˆã�¯ã��ã�®ã�¾ã�¾å·¥äº‹ã‚³ãƒ¼ãƒ‰ã‚’è¿”ã�™
+                    if (InputTyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Tying) return InputCode;
+                }
+                // å¢—æ¸›å·¥äº‹ã�®å ´å�ˆã�¯è¦ªã‚³ãƒ¼ãƒ‰ã‚’æ¤œç´¢ã�™ã‚‹
+                string strLink = string.Format(" WHERE FluctuationCode = {0}", InputCode);
+                ConstructionLink LinkRec = new ConstructionLink();
+                if (!LinkDB.SelectAction(strLink, ref LinkRec)) return InputCode;
+
+                return LinkRec.ConstructionCode;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return InputCode;
+            }
+            finally
+            {
+                LinkDB.close(); LinkDB = null;
+            }
+        }
+        #endregion
+
+        #region å¢—æ¸›å·¥äº‹ãƒ»çµ�å�ˆå·¥äº‹ã�®å ´å�ˆã�¯è¦ªã‚³ãƒ¼ãƒ‰ã‚’è¿”ã�™
+        /// <summary>
+        /// å¢—æ¸›å·¥äº‹ãƒ»çµ�å�ˆå·¥äº‹ã�®å ´å�ˆã�¯è¦ªã‚³ãƒ¼ãƒ‰ã‚’è¿”ã�™
+        /// </summary>
+        /// <param name="InputCode"></param>
+        /// <returns></returns>
         public static int GetParentConstrCode(int InputCode)
         {
             IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
@@ -130,9 +183,13 @@
                 ConstructionBaseInfo BaseRec = new ConstructionBaseInfo();
                 if (!BaseDB.SelectAction(strBase, ref BaseRec)) return InputCode;
 
-                // çµ�å�ˆå·¥äº‹ã�®ãƒ�ã‚§ãƒƒã‚¯
-                if (BaseRec.JoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
+                if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard
+                    && BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Standard)
                 {
+                    return InputCode;
+                }
+                else if (BaseRec.JoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
+                {   // ----- çµ�å�ˆå·¥äº‹ã�®ãƒ�ã‚§ãƒƒã‚¯
                     // çµ�å�ˆå·¥äº‹ã�¯çµ�å�ˆè¦ªå·¥äº‹ç•ªå�·ã‚’è¿”ã�™
                     int FuncCnt = 0;
                     ArrayList ParList = new ArrayList();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 295)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 296)
@@ -39,12 +39,16 @@
                                                             " C.PERSONCODE, C.PERSONNAME, C.DEPARTMENTCODE, C.DEPARTMENTNAME, C.MANDISPORDER, C.DEPDISPORDER,",
                                                             " D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER"};
 
-        private static string[] s_SQLPart1_1 = new string[] { " FROM CONSTRUCTIONBASEINFO A", 
+        private static string[] s_SQLPart1_1 = new string[] { ", -1, 0, A.JoinFlg, A.TyingFlg" };
+
+        private static string[] s_SQLPart1_2 = new string[] { ", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0), A.JoinFlg, A.TyingFlg" };
+
+        private static string[] s_SQLPart2 = new string[] { " FROM CONSTRUCTIONBASEINFO A", 
                                                             " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B",
                                                             " ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE",
                                                             string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName)};
 
-        private static string[] s_SQLPart2 = new string[] { " LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,",
+        private static string[] s_SQLPart3 = new string[] { " LEFT JOIN (SELECT CA.CONSTRUCTIONCODE, CA.SALESPERSONCODE PERSONCODE, CB.PERSONNAME PERSONNAME,",
                                                             " CB.DEPARTMENTCODE DEPARTMENTCODE, CC.DEPARTMENTSTRING DEPARTMENTNAME,",
                                                             " CB.DISPLAYORDER MANDISPORDER, CC.DISPLAYORDER DEPDISPORDER",
                                                             " FROM CONSTRUCTIONBASEINFO CA",
@@ -52,7 +56,7 @@
                                                             " LEFT JOIN DEPARTMENTMASTER CC ON CB.DEPARTMENTCODE = CC.DEPARTMENTCODE",
                                                             " WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE" };
 
-        private static string[] s_SQLPart3 = new string[] { " LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,",
+        private static string[] s_SQLPart3_1 = new string[] { " LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,",
                                                             " DB.DEPARTMENTCODE DEPARTMENTCODE, DC.DEPARTMENTSTRING DEPARTMENTNAME,",
                                                             " DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER",
                                                             " FROM CONSTRUCTIONBASEINFO DA",
@@ -60,12 +64,18 @@
                                                             " LEFT JOIN DEPARTMENTMASTER DC ON DB.DEPARTMENTCODE = DC.DEPARTMENTCODE",
                                                             " WHERE DA.CONSTRUCTIONPERIOD = {0}) D ON A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE" };
 
-        private static string[] s_SQLPart4 = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}" };
+        private static string[] s_SQLPart3_2 = new string[] { " LEFT JOIN processapproval AS App ON",
+                                                            "     App.ConstructionCode = A.ConstructionCode",
+                                                            " AND App.ApprovalCode = {0}",
+                                                            " And App.OrderNo = {0}",
+                                                            " And App.SeqNo = 1"};
 
-        private static string[] s_SQLPart4Tying = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}",
+        private static string[] s_SQLPart5 = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}" };
+
+        private static string[] s_SQLPart5Tying = new string[] { " WHERE A.CONSTRUCTIONPERIOD = {0}",
                                                                 string.Format(" AND A.TYINGFLG != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying) };
 
-        private static string[] s_SQLPart5 = new string[] { " ORDER BY A.CONSTRUCTIONSTATUSFLG ASC, C.DEPDISPORDER ASC, C.MANDISPORDER ASC,",
+        private static string[] s_SQLPart6 = new string[] { " ORDER BY A.CONSTRUCTIONSTATUSFLG ASC, C.DEPDISPORDER ASC, C.MANDISPORDER ASC,",
                                                             " D.DEPDISPORDER ASC, D.MANDISPORDER ASC, A.CONSTRUCTIONCODE DESC" };
         #endregion
 
@@ -93,6 +103,8 @@
             CONSTDEPDISPORDER,
             AppStatus,
             ORDERNO,
+            JOINFLG,
+            TYINGFLG,
         }
         #endregion
 
@@ -329,16 +341,16 @@
             {
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
+                wrkFormat.Append(s_SQLPart1_1[0]);
                 
                 // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                wrkFormat.Append(", 0, 0");
                 wrkFormat.Append(", A.EstimateType, A.RequestedDate, A.EstimatesSubmittedDate");
                 
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
-                for (int i = 0; i < s_SQLPart4Tying.Length; i++) wrkFormat.Append(s_SQLPart4Tying[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
+                for (int i = 0; i < s_SQLPart5Tying.Length; i++) wrkFormat.Append(s_SQLPart5Tying[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
 
@@ -354,7 +366,7 @@
                 strSQL.Append(wrkBuff);
 
                 // ORDER BY ’Ç‰Á
-                for (int i = 0; i < s_SQLPart5.Length; i++) strSQL.Append(s_SQLPart5[i]);
+                for (int i = 0; i < s_SQLPart6.Length; i++) strSQL.Append(s_SQLPart6[i]);
             }
             catch (Exception ex)
             {
@@ -381,12 +393,12 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", -1, 0");    // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_1[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                 strSQL.AppendFormat(" AND A.ConstructionStatusFlg < {0}", ProgressComplete);
@@ -405,18 +417,20 @@
                 strSQL.Append(" UNION ");
                 wrkFormat.Clear();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_2[0]);
+
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
 
-                wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
-                wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateApproval);
-                wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
-                wrkFormat.Append(" And App.SeqNo = 1");
+                wrkFormat.Append(s_SQLPart3_2[0]);
+                wrkFormat.Append(s_SQLPart3_2[1]);
+                wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateApproval);
+                wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
+                wrkFormat.Append(s_SQLPart3_2[4]);
                 
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
 
                 strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEDATA C WHERE C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
@@ -460,17 +474,25 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
+                wrkFormat.Append(s_SQLPart1_1[0]);
                 wrkFormat.Append(", DATE_FORMAT(A.EstimatesSubmittedDate, '%Y/%m/%d'), 0");    // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
-                wrkFormat.Append(", PROCESSAPPROVAL A1");
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
+                wrkFormat.Append(", PROCESSAPPROVAL App");
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-                strSQL.AppendFormat(" AND (A.CONSTRUCTIONCODE = A1.CONSTRUCTIONCODE And A1.ApprovalCode = {0} And A1.SeqNo = 1", ApprovalCode);
-                strSQL.AppendFormat(" And A1.ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
+                
+                // Left Join‚Í�È‚¢‚Ä�ðŒ�‚ð“ü‚ê‚é
+                strSQL.Append(" And (");
+                strSQL.Append(s_SQLPart3_2[1]);
+                strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateApproval);
+                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());
@@ -484,7 +506,7 @@
                 strSQL.Append(wrkBuff.ToString());
 
                 // ORDER BY ’Ç‰Á
-                for (int i = 0; i < s_SQLPart5.Length; i++) strSQL.Append(s_SQLPart5[i]);
+                for (int i = 0; i < s_SQLPart6.Length; i++) strSQL.Append(s_SQLPart6[i]);
             }
             catch (Exception ex)
             {
@@ -511,12 +533,12 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", -1, 0");    // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_1[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                 strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEDATA C WHERE C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
@@ -537,18 +559,19 @@
                 strSQL.Append(" UNION ");
                 wrkFormat.Clear();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_2[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
 
-                wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
-                wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
-                wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
-                wrkFormat.Append(" And App.SeqNo = 1");
+                wrkFormat.Append(s_SQLPart3_2[0]);
+                wrkFormat.Append(s_SQLPart3_2[1]);
+                wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
+                wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
+                wrkFormat.Append(s_SQLPart3_2[4]);
 
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                 strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEBUDGET A1 WHERE A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
@@ -598,13 +621,13 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", -1, 0");    // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_1[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
-                wrkFormat.Append(", PROCESSAPPROVAL A1");
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
+                wrkFormat.Append(", PROCESSAPPROVAL App");
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                 wrkFormat.Append(" AND A.CONSTRUCTIONPERSONCODE != 0");
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
 
@@ -612,8 +635,16 @@
                 strSQL.AppendFormat(" And {0} <= A.ConstructionStatusFlg", ProgressStart);
                 strSQL.AppendFormat(" And A.ConstructionStatusFlg < {0}", ProgressComplete);
                 strSQL.Append(" And A.ConstructionPersonCode != 0");
-                strSQL.AppendFormat(" AND (A.CONSTRUCTIONCODE = A1.CONSTRUCTIONCODE AND A1.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.EstimateApproval);
-                strSQL.AppendFormat(" AND SEQNO = 1 AND ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
+
+                // Left Join‚Í�È‚¢‚Ä�ðŒ�‚ð“ü‚ê‚é
+                strSQL.Append(" And (");
+                strSQL.Append(s_SQLPart3_2[1]);
+                strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateApproval);
+                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(") ");
+
                 strSQL.Append(" AND NOT EXISTS (SELECT * FROM CONSTRUCTIONBUDGET C WHERE C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
 
                 // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
@@ -628,19 +659,20 @@
                 strSQL.Append(" UNION ");
                 wrkFormat.Clear();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_2[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
 
-                wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
-                wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
-                wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
-                wrkFormat.Append(" And App.SeqNo = 1");
+                wrkFormat.Append(s_SQLPart3_2[0]);
+                wrkFormat.Append(s_SQLPart3_2[1]);
+                wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
+                wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
+                wrkFormat.Append(s_SQLPart3_2[4]);
 
                 wrkFormat.Append(", constructionbudget E");
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
                 wrkFormat.Append(" AND A.CONSTRUCTIONPERSONCODE != 0");
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
@@ -693,14 +725,14 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", -1, 0");   // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_1[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
 
-                wrkFormat.Append(", PROCESSAPPROVAL A1");
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                wrkFormat.Append(", PROCESSAPPROVAL App");
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
 
@@ -725,10 +757,16 @@
                 strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE");
 
                 strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice);
-                strSQL.Append(" AND (A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND A1.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
-                strSQL.Append(" AND A1.SEQNO = 1");
-                strSQL.AppendFormat(" AND A1.APPROVALSTATUS = {0})", (int)CommonDefine.ApprovalStatus.Approval);
+
+                // Left Join‚Í�È‚¢‚Ä�ðŒ�‚ð“ü‚ê‚é
+                strSQL.Append(" And (");
+                strSQL.Append(s_SQLPart3_2[1]);
+                strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
+                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(") ");
+                
                 strSQL.Append(" OR A.JOINFLG = 1)");
 
                 // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
@@ -742,21 +780,20 @@
 
                 wrkFormat.Clear();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1)");
-                wrkFormat.Append(", ifnull(App.OrderNo, 0)");
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_2[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
 
-                wrkFormat.Append(" LEFT JOIN processapproval AS App");
-                wrkFormat.Append(" ON App.ConstructionCode = A.ConstructionCode");
-                wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
-                wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
-                wrkFormat.Append(" And App.SeqNo = 1");
+                wrkFormat.Append(s_SQLPart3_2[0]);
+                wrkFormat.Append(s_SQLPart3_2[1]);
+                wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
+                wrkFormat.Append(s_SQLPart3_2[4]);
 
                 wrkFormat.Append(", PURCHASEORDER A1");
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.Append(" UNION (");
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
@@ -804,9 +841,6 @@
         {
             try
             {
-                // ’�•¶�‘‚ª�³”F‚³‚ê‚Ä‚¢‚é‚à‚Ì
-                int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("’�•¶�‘�³”F")).Key;
-
                 // ƒZƒLƒ…ƒŠƒeƒB•¶Žš—ñŽæ“¾
                 StringBuilder wrkBuff = new StringBuilder();
                 CreateSecuritySQL(ref wrkBuff);
@@ -813,18 +847,27 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", DATE_FORMAT(A2.PRINTOUTDATE, '%Y/%m/%d'), A1.ORDERNO");     // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_2[0]);
+                wrkFormat.Append(", DATE_FORMAT(A2.PRINTOUTDATE, '%Y/%m/%d')");                 // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
-                wrkFormat.Append(", PROCESSAPPROVAL A1, PURCHASEORDER A2");
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
+                wrkFormat.Append(", PROCESSAPPROVAL App, PURCHASEORDER A2");
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
                 strSQL.Append(" AND EXISTS (SELECT * FROM PURCHASEORDER B1 WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
-                strSQL.AppendFormat(" And (A.ConstructionCode = A1.ConstructionCode And A1.ApprovalCode = {0} And A1.SeqNo = 1 And A1.APPROVALSTATUS = {1})",
-                                                                                                ApprovalCode, (int)CommonDefine.ApprovalStatus.Approval);
+
+                // Left Join‚Í�È‚¢‚Ä�ðŒ�‚ð“ü‚ê‚é
+                strSQL.Append(" And (");
+                strSQL.Append(s_SQLPart3_2[1]);
+                strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                //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(") ");
+
                 strSQL.Append(" AND (A.CONSTRUCTIONCODE = A2.CONSTRUCTIONCODE AND A2.SEQNO = 1)");
 
                 // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
@@ -869,20 +912,21 @@
 
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
-                for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
+                wrkFormat.Append(s_SQLPart1_2[0]);
+                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
 
-                for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
+                for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]);
 
-                wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
-                wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
-                wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
-                wrkFormat.Append(" And App.SeqNo = 1");
+                wrkFormat.Append(s_SQLPart3_2[0]);
+                wrkFormat.Append(s_SQLPart3_2[1]);
+                wrkFormat.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
+                wrkFormat.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo);
+                wrkFormat.Append(s_SQLPart3_2[4]);
 
                 wrkFormat.Append(", constructionledger AS Ledger");
 
-                for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
+                for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]);
 
                 wrkFormat.AppendFormat(" AND ({0} <= A.CONSTRUCTIONSTATUSFLG AND A.CONSTRUCTIONSTATUSFLG <= {1})", nStat1, nStat2);
                 wrkFormat.Append(" AND Ledger.ConstructionCode = A.ConstructionCode");
@@ -901,7 +945,7 @@
                 strSQL.Append(wrkBuff);
 
                 // ORDER BY ’Ç‰Á
-                for (int i = 0; i < s_SQLPart5.Length; i++) strSQL.Append(s_SQLPart5[i]);
+                for (int i = 0; i < s_SQLPart6.Length; i++) strSQL.Append(s_SQLPart6[i]);
             }
             catch (Exception ex)
             {
@@ -1281,12 +1325,14 @@
             {
                 int nConstrCode = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONCODE]);
                 int nOrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]);
+                int nJoinFlg = CommonMotions.cnvInt(objwrk[(int)GetData.JOINFLG]);
+                int nTyingFlg = CommonMotions.cnvInt(objwrk[(int)GetData.TYINGFLG]);
                 int nAppStatus = 0;
                 string strAppStatus = string.Empty;
                 DateTime dtAppStatus = DateTime.MinValue;
 
                 // ----- ‹N“®�ˆ—�–ˆ‚Ì“®�ì
-                int ParentCode = ClsProcessExist.GetParentConstrCode(nConstrCode);
+                int ParentCode = ClsProcessExist.GetParentConstrCode(nConstrCode, nJoinFlg, nTyingFlg);
                 switch (m_ExecuteFlg)
                 {
                     case (int)ClsExcute.ProcessExecuteNo.EstimateInput:                     // �ÏŽZŒ©�Ï�‘“ü—Í
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 295)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 296)
@@ -4169,12 +4169,16 @@
                 sql.Append("  , ifnull(Picm.SealPrintName, '') as TantoNM ");
                 sql.AppendFormat("  , DATE('{0}') as ApprovalDate ", DateTime.MinValue.ToShortDateString());
                 sql.Append("  , 0 as ApprovalEndFlg ");
+                sql.Append("  , Picm.DepartmentCode As AppDepCode");
                 sql.Append("  , ifnull(Cbi.SalesPersonCode, 0) as SalesPersonCode ");
                 sql.Append("  , ifnull(Cbi.ConstructionPersonCode, 0) as ConstructionPersonCode ");
                 sql.Append("  , ifnull(Cbi.ConstrSubPersonCode, 0) as ConstrSubPersonCode ");
                 sql.Append("  , ifnull(Cbi.ConstructionInstructor, 0) as ConstructionInstructor ");
-                sql.Append("  , Picm.DepartmentCode ");
-                
+                sql.Append("  , 0 As ConstrDepCode ");
+                sql.Append("  , 0 As SalesDepCode ");
+                sql.Append("  , 0 As AssistDepCode ");
+                sql.Append("  , 0 As InstrDepCode ");
+
                 sql.Append("  , case ifnull(DATE(Pod.SendDate), '') ");
                 sql.Append("    when '' then '�~' ");
                 sql.AppendFormat("    when '{0}' then '�~' ", DateTime.MinValue.ToShortDateString());
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.cs	(revision 295)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.cs	(revision 296)
@@ -379,7 +379,17 @@
                 if (data.MessageFlag == (int)MessageBoardData.MessageFlgDef.Secretary)
                 {
                     btnDataEntry.Visible = false;
-                    btnDelete.Visible = false;
+
+                    // ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œç®¡ç�†è€…ãƒ»æœ€é«˜è²¬ä»»è€…ã�ªã‚‰ã�°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å‰Šé™¤ã�§ã��ã‚‹
+                    int SecRank = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key;
+                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode || CommonMotions.LoginUserData.SecurityManagement == SecRank)
+                    {
+                        btnDelete.Visible = true;
+                    }
+                    else
+                    {
+                        btnDelete.Visible = false;
+                    }
                 }
 
                 // é–²è¦§å±¥æ­´è¡¨ç¤º
@@ -406,14 +416,13 @@
         {
             IOMessageBoardData mbdDB = new IOMessageBoardData();
             IOMessageBoardTerget mbtDB = new IOMessageBoardTerget();
+            IOMessageBrowsingHistory mbhDB = new IOMessageBrowsingHistory();
             try
             {
-                mbdDB.connect();
-                mbdDB.beginTran();
+                mbdDB.connect(); mbdDB.beginTran();
+                mbtDB.connect(); mbtDB.beginTran();
+                mbhDB.connect(); mbhDB.beginTran();
 
-                mbtDB.connect();
-                mbtDB.beginTran();
-
                 List<MessageBoardData> data = new List<MessageBoardData>();
                 string strWhere = mbdDB.CreatePrimarykeyString(m_RecordNumber, m_BranchNumber);
                 if (!mbdDB.SelectAction(strWhere, ref data, false))
@@ -427,7 +436,6 @@
                 {
                     MessageBox.Show("ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‰Šé™¤ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "å‰Šé™¤ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     mbdDB.rollback();
-                    mbtDB.rollback();
                     return false;
                 }
 
@@ -439,8 +447,11 @@
                     return false;
                 }
 
+                mbhDB.DeleteAction(strWhere, false);
+
                 mbdDB.commit();
                 mbtDB.commit();
+                mbhDB.commit();
 
                 return true;
             }
@@ -454,6 +465,7 @@
             {
                 mbdDB.close(); mbdDB = null;
                 mbtDB.close(); mbtDB = null;
+                mbhDB.close(); mbhDB = null;
             }
         }
         #endregion
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 295)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 296)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.5")]
-[assembly: AssemblyFileVersion("1.0.1.5")]
+[assembly: AssemblyVersion("1.0.1.7")]
+[assembly: AssemblyFileVersion("1.0.1.7")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
