Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 36)
@@ -208,11 +208,14 @@
             /// 4:æ³¨æ–‡æ›¸æ‰¿èª�
             /// </summary>
             PurchaseOrderEntryApproval,
-            // ----- ä»¥ä¸‹ãƒ—ãƒ­ã‚»ã‚¹æœªä½œæˆ�
             /// <summary>
             /// 5:è«‹æ±‚æ›¸æ‰¿èª�
             /// </summary>
             OrderBillingApproval,
+            /// <summary>
+            /// 6:å·¥äº‹æ—¥å ±æ‰¿èª�
+            /// </summary>
+            DRConstructionApproval,
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs	(revision 36)
@@ -354,13 +354,6 @@
                         object[] objRec = (object[])terList[i];
                         mbtDB.Reader2Struct(objRec, ref wrkRec);
 
-                        // ç®¡ç�†è€…å¯¾è±¡ãƒ•ãƒ©ã‚°å�–å¾—
-                        int ShareFlag = CommonMotions.cnvInt(objRec[TergetCnt + (int)GetTarget.ShareFlag]);
-                        // ç®¡ç�†è€…å¯¾è±¡ãƒ•ãƒ©ã‚°ã�ŒONã�®æ™‚ã�«ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œä¸€èˆ¬ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�®å ´å�ˆã�¯ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¦‹ã�›ã�ªã�„
-                        if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
-                        {
-                            if (ShareFlag != 0) return false;
-                        }
 
                         // ----------
                         int CurRecRank = 0;
@@ -371,6 +364,14 @@
                             // æ‰€å±žã�Œå¯¾è±¡ã�ªã‚‰ã�°OK
                             if (wrkRec.ToCode == CommonMotions.LoginUserData.DepartmentCode) return true;
 
+                            // ç®¡ç�†è€…å¯¾è±¡ãƒ•ãƒ©ã‚°å�–å¾—
+                            int ShareFlag = CommonMotions.cnvInt(objRec[TergetCnt + (int)GetTarget.ShareFlag]);
+                            // ç®¡ç�†è€…å¯¾è±¡ãƒ•ãƒ©ã‚°ã�ŒONã�®æ™‚ã�«ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œä¸€èˆ¬ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�®å ´å�ˆã�¯ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¦‹ã�›ã�ªã�„
+                            if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+                            {
+                                if (ShareFlag != 0) return false;
+                            }
+
                             string strSECSQL = "SELECT MAX(B.SECRANK) FROM PERSONINCHARGEMASTER A, SECURITYMASTER B";
                             strSECSQL += string.Format(" WHERE DEPARTMENTCODE = {0} AND B.SECCODE = A.SECCODE", wrkRec.ToCode);
                             ArrayList SecarList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMApproval.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMApproval.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMApproval.cs	(revision 36)
@@ -262,15 +262,15 @@
         /// </summary>
         /// <param name="BusinessTypeCode"></param>
         /// <returns>Whereæ–‡å­—åˆ—</returns>
-        public string CreatePrimarykeyString(int ApprovalCode, int DepartmentCode = 0, int SeqNo = 0)
+        public string CreatePrimarykeyString(int ApprovalCode, int DepartmentCode = -1, int SeqNo = -1)
         {
             string strWork = string.Empty;
             try
             {
                 strWork = string.Format(" Where ApprovalCode = {0}", ApprovalCode.ToString());
-                if (DepartmentCode!=0)
+                if (DepartmentCode != -1)
                     strWork += string.Format(" And DepartmentCode = {0}", DepartmentCode.ToString());
-                if (SeqNo != 0)
+                if (SeqNo != -1)
                     strWork += string.Format(" And SeqNo = {0}", SeqNo.ToString());
 
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 36)
@@ -193,9 +193,6 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-            InitCombBox();
-
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             m_bInitFlg = true;
             SetcmbDepartment();
@@ -202,6 +199,9 @@
             m_bInitFlg = true;
             SetcmbPersons();
 
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
+            InitCombBox();
+
             m_bInitFlg = true;
             // �‰Šú•\Ž¦
             InitDataLoad();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 36)
@@ -276,49 +276,55 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒŒ ŒÀ
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // •”��ƒRƒ“ƒ{”ñ•\Ž¦
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // �‰Šú�Ý’è‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // •”��ƒRƒ“ƒ{”ñ•\Ž¦
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
+
             }
             catch (Exception ex)
             {
@@ -410,18 +416,6 @@
                             cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
                 }
-                else
-                {
-                    // ‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
-                    for (int i = 0; i < cmbDepartment.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
-                        {
-                            cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                        }
-                    }
-                }
 
                 return true;
             }
@@ -536,17 +530,6 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
-                        {
-                            cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                        }
-                    }
-                }
 
                 return true;
             }
@@ -673,24 +656,19 @@
             try
             {
                 // ƒL�[’lŽæ“¾
-                int SAccKey = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // Œo‰cŽÒƒAƒNƒZƒX
-                int FAccKey = (int)CommonDefine.SecurityRankPos.FreeAuthority;      // “�Š‡ŽÒƒAƒNƒZƒX
-                int LAccKey = (int)CommonDefine.SecurityRankPos.LimitedAuthority;   // �Š‘®’·ƒAƒNƒZƒX
-                int NAccKey = (int)CommonDefine.SecurityRankPos.NormalAuthority;    // ˆê”ÊŽÒƒAƒNƒZƒX
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 // ƒf�[ƒ^ƒAƒNƒZƒX‚ÉŒ ŒÀ‚É‚æ‚è�§ŒÀ‚ª‚ ‚é
-                // ƒVƒXƒeƒ€Œ ŒÀ‚É‚æ‚Á‚Äƒf�[ƒ^ƒAƒNƒZƒX‚É�§ŒÀ‚ª‚ ‚é
-                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode)
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
-                    // ƒVƒXƒeƒ€ŠÇ—�ŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SAccKey].Key)
-                {
                     // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FAccKey].Key
-                        || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key
+                        || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key)
                 {
                     // ˆê•”�§ŒÀ—L
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
@@ -715,24 +693,20 @@
                     strSQL += string.Format(" Or (B.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
                     strSQL += string.Format(" And B.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
-                    
-                    strSQL += " And (B.SalesPersonCode IN (Select B1.PersonCode From PersonInChargeMaster B1";
-                    strSQL += string.Format(" Where B1.DepartmentCode IN (SELECT B2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER B2 WHERE B2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
 
+                    strSQL += string.Format(" And (B.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
+
                     strSQL += string.Format(" Or (B.ConstructionStatusFlg > {0}", iStatus);
 
-                    strSQL += " And (B.ConstructionPersonCode IN (Select B3.PersonCode From PersonInChargeMaster B3";
-                    strSQL += string.Format(" Where B3.DepartmentCode IN (SELECT B4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER B4 WHERE B4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (B.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or B.CONSTRSUBPERSONCODE IN (Select B5.PersonCode From PersonInChargeMaster B5";
-                    strSQL += string.Format(" Where B5.DepartmentCode IN (SELECT B6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER B6 WHERE B6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or B.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or B.ConstructionInstructor IN (Select B7.PersonCode From PersonInChargeMaster B7";
-                    strSQL += string.Format(" Where B7.DepartmentCode IN (SELECT B8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER B8 WHERE B8.PERSONCODE = {0})))))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or B.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
                 }
             }
             catch (Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 36)
@@ -164,6 +164,15 @@
         /// <param name="e"></param>
         private void FrmApprovalScreen_Load(object sender, EventArgs e)
         {
+            // �³”FŒo˜H‚ª�Ý’è‚³‚ê‚Ä‚¢‚È‚¢�ê�‡‚Í‹N“®‚µ‚È‚¢
+            int CurrentDepartmentCode = ClsApprovalPermission.GetFromConstructionAndApprovalTheDepartment(m_ConstructionCode, m_ApprovalCode);
+            if (ClsApprovalPermission.GetApprovalMasterCount(m_ApprovalCode, CurrentDepartmentCode) == 0)
+            {
+                m_bEndFlg = true;
+                this.Close();
+                return;
+            }
+
             //ƒRƒ“ƒgƒ��[ƒ‹ƒIƒuƒWƒFƒNƒgŽæ“¾
             SetDisplayObject();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 36)
@@ -56,6 +56,18 @@
                 case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval:
                     if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget) bAns = true;
                     break;
+                // 4:æ³¨æ–‡æ›¸æ‰¿èª�
+                case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval:
+                    if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry) bAns = true;
+                    break;
+                // 5:è«‹æ±‚æ›¸æ‰¿èª�
+                case (int)ClsExcute.ApprovalListNo.OrderBillingApproval:
+                    //if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget) bAns = true;
+                    break;
+                // 6:å·¥äº‹æ—¥å ±æ‰¿èª�
+                case (int)ClsExcute.ApprovalListNo.DRConstructionApproval:
+                    if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.DRConstruction) bAns = true;
+                    break;
             }
 
             return bAns;
@@ -521,7 +533,6 @@
         {
             IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
             IOMApproval mAppDB = new IOMApproval();
-            IOProcessApproval ApprovalDB = new IOProcessApproval();
             try
             {
                 // å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—
@@ -529,21 +540,7 @@
                 if (!cbiDB.SelectAction(strSQL, ref m_ConstructionBaseInfo)) return false;
 
                 // æ‹…å½“éƒ¨ç½²å�–å¾—
-                string strDep = "SELECT B.DEPARTMENTCODE FROM PROCESSAPPROVAL A, PERSONINCHARGEMASTER B";
-                strDep += string.Format(" WHERE A.CONSTRUCTIONCODE = {0} AND A.APPROVALCODE = {1} AND A.SEQNO = 1", m_ConstructionCode, m_ApprovalCode);
-                strDep += " AND B.PERSONCODE = A.PERSONCODE";
-                ArrayList DepList = new ArrayList();
-                if (!ApprovalDB.ExecuteReader(strDep, ref DepList)) return false;
-                int CurrentDepartmentCode = 0;
-                if (DepList.Count != 0)
-                {
-                    object[] DepCnt = (object[])DepList[0];
-                    CurrentDepartmentCode = CommonMotions.cnvInt(DepCnt[0]);
-                }
-                else
-                {
-                    CurrentDepartmentCode = ClsApprovalPermission.GetFromConstructionAndApprovalTheDepartment(m_ConstructionCode, m_ApprovalCode);
-                }
+                int CurrentDepartmentCode = ClsApprovalPermission.GetFromConstructionAndApprovalTheDepartment(m_ConstructionCode, m_ApprovalCode);
 
                 // æ‰¿èª�çµŒè·¯ãƒžã‚¹ã‚¿å�–å¾—
                 strSQL = mAppDB.CreatePrimarykeyString(m_ApprovalCode, CurrentDepartmentCode);
@@ -561,7 +558,6 @@
             {
                 cbiDB.close(); cbiDB = null;
                 mAppDB.close(); mAppDB = null;
-                ApprovalDB.close(); ApprovalDB = null;
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 36)
@@ -225,13 +225,13 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-            InitCombBox();
-
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
 
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
+            InitCombBox();
+
             // •\Ž¦ƒXƒ^ƒCƒ‹‚Ì•Ï�X
             InitDisplayStyle();
 
@@ -317,18 +317,18 @@
         }
         #endregion
 
-        #region ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+        #region •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
         /// <summary>
-        /// ’S“–ŽÒ•Ï�X
+        /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void cmbConstructionPerson_SelectedIndexChanged(object sender, EventArgs e)
+        private void cmbDepartment_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (m_initDataLoad) return;
 
-            // ’S“–ŽÒ‘I‘ðŽž•”��‘I‘ð‚ð�Ý’è‚·‚é
-            SetPerosonToDepartment();
+            // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+            SetcmbPersons();
 
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
@@ -335,18 +335,18 @@
         }
         #endregion
 
-        #region •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+        #region ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
         /// <summary>
-        /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+        /// ’S“–ŽÒ•Ï�X
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void cmbDepartment_SelectedIndexChanged(object sender, EventArgs e)
+        private void cmbConstructionPerson_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (m_initDataLoad) return;
 
-            // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
-            SetcmbPersons();
+            // ’S“–ŽÒ‘I‘ðŽž•”��‘I‘ð‚ð�Ý’è‚·‚é
+            SetPerosonToDepartment();
 
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 36)
@@ -198,18 +198,19 @@
             try
             {
                 // ƒL�[’lŽæ“¾
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // Œo‰cŽÒƒAƒNƒZƒX
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒƒAƒNƒZƒX
-                int LAccKey = (int)CommonDefine.SecurityRankPos.LimitedAuthority;   // �Š‘®’·ƒAƒNƒZƒX
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒƒAƒNƒZƒX
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 // ƒf�[ƒ^ƒAƒNƒZƒX‚ÉŒ ŒÀ‚É‚æ‚è�§ŒÀ‚ª‚ ‚é
-                if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key
-                        || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key
+                        || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key)
                 {
                     // ˆê•”�§ŒÀ—L
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
@@ -234,24 +235,20 @@
                     strSQL += string.Format(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
                     strSQL += string.Format(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
 
-                    strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
-                    strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (A.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
                     strSQL += string.Format(" Or (A.ConstructionStatusFlg > {0}", iStatus);
 
-                    strSQL += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
-                    strSQL += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (A.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
-                    strSQL += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or A.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
-                    strSQL += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0})))))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or A.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
                 }
             }
             catch (Exception ex)
@@ -1251,47 +1248,52 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒŒ ŒÀ
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // •”��ƒRƒ“ƒ{”ñ•\Ž¦
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // �‰Šú�Ý’è‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // •”��ƒRƒ“ƒ{”ñ•\Ž¦
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
             }
@@ -1364,7 +1366,7 @@
         /// <summary>
         /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚Ö•¶Žš‚ðƒZƒbƒg‚·‚é
         /// </summary>
-        private bool SetcmbDepartment()
+        private void SetcmbDepartment()
         {
             IOMDepartment depDB = new IOMDepartment();
             bool bSave = m_initDataLoad;
@@ -1414,7 +1416,7 @@
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
-                if (!depDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (!depDB.ExecuteReader(strSQL, ref arList)) return;
 
                 List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
                 ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
@@ -1437,25 +1439,12 @@
                     if (CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision)
                         cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                 }
-                else
-                {
-                    // ‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
-                    for (int i = 0; i < cmbDepartment.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
-                        {
-                            cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                        }
-                    }
-                }
 
-                return true;
+                return;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
             finally
             {
@@ -1469,7 +1458,7 @@
         /// <summary>
         /// ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX‚Ö•¶Žš‚ðƒZƒbƒg‚·‚é
         /// </summary>
-        private bool SetcmbPersons()
+        private void SetcmbPersons()
         {
             IOMPersonInCharge picDB = new IOMPersonInCharge();
             List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
@@ -1489,7 +1478,7 @@
                     strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
 
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
-                if (!picDB.SelectAction(strSQL, ref workList)) return false;
+                if (!picDB.SelectAction(strSQL, ref workList)) return;
 
                 List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
                 ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
@@ -1513,24 +1502,12 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
-                        {
-                            cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                        }
-                    }
-                }
 
-                return true;
+                return;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
             finally
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 36)
@@ -4989,7 +4989,7 @@
                     else
                     {
                         DateTime LastDay = DateTimeUtil.EndOfMonth(SDate);
-                        AfterDays = LastDay.Day;
+                        AfterDays = (LastDay.Day - SDate.Day) + 1;
                     }
 
                     string strDetail = "SELECT A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, MIN(B.COLUMNCOUNT), C.PERSONCODE, C.PERSONNAME, C.MONTHLYSALARY, A.SALARYDAYS";
@@ -5021,7 +5021,7 @@
                         }
                         else
                         {
-                            SetSalary = CommonMotions.cnvRound(MONTHLYSALARY / 30) * AfterDays;
+                            SetSalary = CommonMotions.cnvRound((MONTHLYSALARY * CommonDefine.s_SalaryCorrection) / 30) * AfterDays;
                         }
 
                         if (!ExecDB.UpdateFeild(Constrcode, GROUPCOUNT, LINECOUNT, COLUMNCOUNT, (int)IOConstructionLedgerExcute.TableColumn.PaymentAmount, SetSalary, false))
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 36)
@@ -301,7 +301,6 @@
             this.pnlGroup1.Controls.Add(this.textBox1);
             this.pnlGroup1.Controls.Add(this.radioButton2);
             this.pnlGroup1.Controls.Add(this.radioButton3);
-            this.pnlGroup1.Enabled = false;
             this.pnlGroup1.Location = new System.Drawing.Point(959, 62);
             this.pnlGroup1.Name = "pnlGroup1";
             this.pnlGroup1.Size = new System.Drawing.Size(360, 30);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 36)
@@ -486,13 +486,13 @@
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-            InitCombBox();
-
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
 
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
+            InitCombBox();
+
             // ƒOƒŠƒbƒh�‰Šú�Ý’è
             SetDisplayObject();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 36)
@@ -183,24 +183,19 @@
             try
             {
                 // ƒL�[’lŽæ“¾
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // Œo‰cŽÒƒAƒNƒZƒX
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒƒAƒNƒZƒX
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·ƒAƒNƒZƒX
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒƒAƒNƒZƒX
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 // ƒf�[ƒ^ƒAƒNƒZƒX‚ÉŒ ŒÀ‚É‚æ‚è�§ŒÀ‚ª‚ ‚é
-                // ƒVƒXƒeƒ€Œ ŒÀ‚É‚æ‚Á‚Äƒf�[ƒ^ƒAƒNƒZƒX‚É�§ŒÀ‚ª‚ ‚é
-                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode)
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
-                    // ƒVƒXƒeƒ€ŠÇ—�ŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)
-                {
                     // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key
-                        || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key
+                        || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key)
                 {
                     // ˆê•”�§ŒÀ—L
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
@@ -225,24 +220,20 @@
                     strSecurity += string.Format(" Or (D.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
                     strSecurity += string.Format(" And D.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
 
-                    strSecurity = " And (D.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
-                    strSecurity += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity = string.Format(" And (D.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
                     strSecurity += string.Format(" Or (D.ConstructionStatusFlg > {0}", iStatus);
 
-                    strSecurity += " And (D.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
-                    strSecurity += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += string.Format(" And (D.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSecurity += " Or D.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
-                    strSecurity += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += string.Format(" Or D.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSecurity += " Or D.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
-                    strSecurity += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0})))))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += string.Format(" Or D.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
                 }
             }
             catch (Exception ex)
@@ -938,33 +929,46 @@
                 strSQL += " ,MAX(C.CONSTRUCTIONPERIODEND) M3, MAX(C.CONSTRUCTIONPERIODEND2) M4";
                 strSQL += " ,MAX(D.CONSTRUCTIONPERIODEND) S3, MAX(D.CONSTRUCTIONPERIODEND2) S4";
                 strSQL += " ,MAX(E.CONSTRUCTIONPERIODEND) I3, MAX(E.CONSTRUCTIONPERIODEND2) I4";
-                strSQL += " ,SUM(C2.EXECUTIONAMOUNT) M5, SUM(D2.EXECUTIONAMOUNT) S5, SUM(E2.EXECUTIONAMOUNT) I5";
-                strSQL += " ,COUNT(C2.EXECUTIONAMOUNT) M6, COUNT(D2.EXECUTIONAMOUNT) S6, COUNT(E2.EXECUTIONAMOUNT) I6";
+                strSQL += " ,SUM(C.EXECUTIONAMOUNT) M5, SUM(D.EXECUTIONAMOUNT) S5, SUM(E.EXECUTIONAMOUNT) I5";
+                strSQL += " ,COUNT(C.EXECUTIONAMOUNT) M6, COUNT(D.EXECUTIONAMOUNT) S6, COUNT(E.EXECUTIONAMOUNT) I6";
                 strSQL += " FROM PERSONINCHARGEMASTER P";
 
                 // �HŽ–’S“–ŽÒ‚Ìƒf�[ƒ^Žæ“¾
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO C ON C.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
+                strSQL += " LEFT JOIN (SELECT C1.CONSTRUCTIONPERSONCODE, C1.CONSTRUCTIONSTATUSFLG, C1.CONSTRUCTIONPERIOD";
+                strSQL += ", C1.CONSTRUCTIONPERIODSTART, C1.CONSTRUCTIONPERIODSTART2, C1.CONSTRUCTIONPERIODEND, C1.CONSTRUCTIONPERIODEND2, C2.EXECUTIONAMOUNT";
+                strSQL += " FROM CONSTRUCTIONBASEINFO C1, CONSTRUCTIONLEDGERDETAIL C2, CONSTRUCTIONLEDGER C3";
+                strSQL += " WHERE C2.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND C2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL += " AND C3.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE) C";
+                strSQL += " ON C.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
                 strSQL += string.Format(" AND C.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND C.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGERDETAIL C2 ON C2.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND C2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
 
                 // �HŽ–•›’S“–ŽÒ‚Ìƒf�[ƒ^Žæ“¾
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO D ON D.CONSTRSUBPERSONCODE = P.PERSONCODE";
+                strSQL += " LEFT JOIN (SELECT D1.CONSTRUCTIONPERSONCODE, D1.CONSTRUCTIONSTATUSFLG, D1.CONSTRUCTIONPERIOD";
+                strSQL += ", D1.CONSTRUCTIONPERIODSTART, D1.CONSTRUCTIONPERIODSTART2, D1.CONSTRUCTIONPERIODEND, D1.CONSTRUCTIONPERIODEND2, D2.EXECUTIONAMOUNT";
+                strSQL += " FROM CONSTRUCTIONBASEINFO D1, CONSTRUCTIONLEDGERDETAIL D2, CONSTRUCTIONLEDGER D3";
+                strSQL += " WHERE D2.CONSTRUCTIONCODE = D1.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND D2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
+                strSQL += " AND D3.CONSTRUCTIONCODE = D1.CONSTRUCTIONCODE) D";
+                strSQL += " ON D.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
                 strSQL += string.Format(" AND D.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND D.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGERDETAIL D2 ON D2.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND D2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
 
                 // �HŽ–Žw“±ˆõ‚Ìƒf�[ƒ^Žæ“¾
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO E ON E.CONSTRUCTIONINSTRUCTOR = P.PERSONCODE";
+                strSQL += " LEFT JOIN (SELECT E1.CONSTRUCTIONPERSONCODE, E1.CONSTRUCTIONSTATUSFLG, E1.CONSTRUCTIONPERIOD";
+                strSQL += ", E1.CONSTRUCTIONPERIODSTART, E1.CONSTRUCTIONPERIODSTART2, E1.CONSTRUCTIONPERIODEND, E1.CONSTRUCTIONPERIODEND2, E2.EXECUTIONAMOUNT";
+                strSQL += " FROM CONSTRUCTIONBASEINFO E1, CONSTRUCTIONLEDGERDETAIL E2, CONSTRUCTIONLEDGER E3";
+                strSQL += " WHERE E2.CONSTRUCTIONCODE = E1.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND E2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
+                strSQL += " AND E3.CONSTRUCTIONCODE = E1.CONSTRUCTIONCODE) E";
+                strSQL += " ON E.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
                 strSQL += string.Format(" AND E.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND E.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGERDETAIL E2 ON E2.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND E2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
 
                 strSQL += " WHERE P.DELETEFLG = 0";
                 strSQL += string.Format(" AND P.LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+
                 // �HŽ–‘ä’ ƒf�[ƒ^‚Ì•”��‚¾‚¯‚ª‘Î�Û
                 strSQL += " AND P.DEPARTMENTCODE IN";
                 strSQL += " (SELECT DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
@@ -973,6 +977,7 @@
                 strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
                 strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
                 strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
+
                 strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER))";
 
                 // 16ŠúŒÀ’èƒŠƒtƒH�[ƒ€‚ÍŒ_–ñŽÐˆõ‚à’Ç‰Á‚·‚é
@@ -986,6 +991,7 @@
                 // •”��ƒR�[ƒh‘I‘ðŽž‚Í•”��‚ðŒŸ�õ�ðŒ�‚Ö“ü‚ê‚é
                 if (DepartmentCode != 0) strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL += string.Format(" AND P.PERSONCODE = {0}", PersonCode);
+
                 strSQL += " GROUP BY P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary";
                 strSQL += " ORDER BY P.DISPLAYORDER";
 
@@ -2066,47 +2072,52 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒŒ ŒÀ
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // •”��ƒRƒ“ƒ{”ñ•\Ž¦
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // �‰Šú�Ý’è‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // •”��ƒRƒ“ƒ{”ñ•\Ž¦
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
             }
@@ -2170,7 +2181,7 @@
         /// <summary>
         /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚Ö•¶Žš‚ðƒZƒbƒg‚·‚é
         /// </summary>
-        private bool SetcmbDepartment()
+        private void SetcmbDepartment()
         {
             IOMDepartment depDB = new IOMDepartment();
             bool bSave = m_initDataLoad;
@@ -2220,7 +2231,7 @@
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
-                if (!depDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (!depDB.ExecuteReader(strSQL, ref arList)) return;
 
                 List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
                 ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
@@ -2249,25 +2260,12 @@
                             cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
                 }
-                else
-                {
-                    // ‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
-                    for (int i = 0; i < cmbDepartment.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
-                        {
-                            cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                        }
-                    }
-                }
 
-                return true;
+                return;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
             finally
             {
@@ -2281,7 +2279,7 @@
         /// <summary>
         /// ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX‚Ö•¶Žš‚ðƒZƒbƒg‚·‚é
         /// </summary>
-        private bool SetcmbPersons()
+        private void SetcmbPersons()
         {
             IOMPersonInCharge picDB = new IOMPersonInCharge();
             List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
@@ -2301,7 +2299,7 @@
                     strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
 
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
-                if (!picDB.SelectAction(strSQL, ref workList)) return false;
+                if (!picDB.SelectAction(strSQL, ref workList)) return;
 
                 List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
                 ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
@@ -2326,24 +2324,12 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
-                        {
-                            cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                        }
-                    }
-                }
 
-                return true;
+                return;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
             finally
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.cs	(revision 36)
@@ -195,13 +195,13 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            SetcmbDepartment();
+            SetcmbPersons();
+
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
             InitCombBox();
 
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
-            SetcmbDepartment();
-            SetcmbPersons();
-            
             // �‰Šú•\Ž¦
             // ƒOƒŠƒbƒh‚Ì�s‚ð0‚É–ß‚·
             dgvMaster.Rows.Clear();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs	(revision 36)
@@ -581,47 +581,52 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒŒ ŒÀ
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // •”��ƒRƒ“ƒ{”ñ•\Ž¦
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // �‰Šú�Ý’è‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // •”��ƒRƒ“ƒ{”ñ•\Ž¦
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
             }
@@ -773,18 +778,6 @@
                             cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
                 }
-                else
-                {
-                    // ‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
-                    for (int i = 0; i < cmbDepartment.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
-                        {
-                            cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                        }
-                    }
-                }
 
                 return true;
             }
@@ -850,17 +843,6 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
-                        {
-                            cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                        }
-                    }
-                }
 
                 return true;
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs	(revision 36)
@@ -249,8 +249,17 @@
             Next,
         }
         #endregion
+
+        #region ˆó�üƒ{ƒ^ƒ“’è‹`
+        /// <summary>
+        /// ˆó�üƒ{ƒ^ƒ“’è‹`
+        /// </summary>
+        private static string[] s_PrintButtonTop = new string[] { "“ú•ñˆó�ü", "ˆó�ü’†Ž~" };
+        private static Color[] s_PrintButtonColor = new Color[] { Color.DarkOliveGreen, Color.Red };
         #endregion
 
+        #endregion
+
         #region •Ï�”
         /// <summary>
         /// ƒtƒB�[ƒ‹ƒh’l•Ï‰»ƒtƒ‰ƒO
@@ -667,8 +676,8 @@
                         double Total = GetTotalHeadCount(false,
                                                         CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn1.JobCategoryCode].Value),
                                                         CommonMotions.cnvInt(dgvRow.Cells[(int)DispGridColumn1.CompanyCode].Value));
-                        dgvRow.Cells[(int)DispGridColumn1.TodayHeadCount].Value = ToDay.ToString("#,0.0");
-                        dgvRow.Cells[(int)DispGridColumn1.TotalHeadCount].Value = (ToDay + Total).ToString("#,0.0");
+                        dgvRow.Cells[(int)DispGridColumn1.TodayHeadCount].Value = ToDay.ToString("#,#.#");
+                        dgvRow.Cells[(int)DispGridColumn1.TotalHeadCount].Value = (ToDay + Total).ToString("#,#.#");
                         break;
                     default:
                         return;
@@ -1300,5 +1309,18 @@
             }
         }
         #endregion
+
+        #region “ú•ñˆó�üƒ{ƒ^ƒ“‰Ÿ‰º
+        /// <summary>
+        /// “ú•ñˆó�üƒ{ƒ^ƒ“‰Ÿ‰º
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnPrint_Click(object sender, EventArgs e)
+        {
+            // ˆó�ü�ˆ—�
+            PrintOutDR();
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs	(revision 36)
@@ -160,6 +160,8 @@
             this.btnOtherProc = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnWorkingList = new System.Windows.Forms.Button();
+            this.btnPrint = new System.Windows.Forms.Button();
+            this.PrintProgress = new System.Windows.Forms.ProgressBar();
             this.panel1.SuspendLayout();
             this.pnlApproval.SuspendLayout();
             this.pnlApprovalButton.SuspendLayout();
@@ -1424,7 +1426,7 @@
             this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
             this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
-            this.lblCellTotal.Location = new System.Drawing.Point(100, 27188);
+            this.lblCellTotal.Location = new System.Drawing.Point(100, 29760);
             this.lblCellTotal.Name = "lblCellTotal";
             this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
             this.lblCellTotal.TabIndex = 36;
@@ -1643,6 +1645,31 @@
             this.btnWorkingList.UseVisualStyleBackColor = false;
             this.btnWorkingList.Click += new System.EventHandler(this.btnWorkingList_Click);
             // 
+            // btnPrint
+            // 
+            this.btnPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnPrint.BackColor = System.Drawing.Color.DarkOliveGreen;
+            this.btnPrint.ForeColor = System.Drawing.Color.White;
+            this.btnPrint.Location = new System.Drawing.Point(7, 5);
+            this.btnPrint.Name = "btnPrint";
+            this.btnPrint.Size = new System.Drawing.Size(200, 30);
+            this.btnPrint.TabIndex = 98;
+            this.btnPrint.TabStop = false;
+            this.btnPrint.Text = "æ—¥å ±å�°åˆ·";
+            this.btnPrint.UseVisualStyleBackColor = false;
+            this.btnPrint.Visible = false;
+            this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
+            // 
+            // PrintProgress
+            // 
+            this.PrintProgress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.PrintProgress.Location = new System.Drawing.Point(33, 618);
+            this.PrintProgress.Name = "PrintProgress";
+            this.PrintProgress.Size = new System.Drawing.Size(1278, 36);
+            this.PrintProgress.TabIndex = 99;
+            this.PrintProgress.Visible = false;
+            // 
             // FrmDRConstruction
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1649,6 +1676,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1344, 692);
+            this.Controls.Add(this.PrintProgress);
+            this.Controls.Add(this.btnPrint);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.btnOtherProc);
             this.Controls.Add(this.btnProv);
@@ -1798,5 +1827,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Button btnWorkingList;
+        private System.Windows.Forms.Button btnPrint;
+        private System.Windows.Forms.ProgressBar PrintProgress;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs	(revision 36)
@@ -885,7 +885,7 @@
                     dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Detail]);
                     // å�ˆè¨ˆè¡¨ç¤º
                     lblGrid1Total1.Text = "0.0";
-                    lblGrid1Total2.Text = GetTotalHeadCount().ToString("#,0.0");
+                    lblGrid1Total2.Text = GetTotalHeadCount().ToString("0,0.0");
                     lblGrid1Total3.Text = "0.0";
                     return;
                 }
@@ -1545,9 +1545,6 @@
                     }
                 }
 
-                // æœ¬æ—¥ä»¥é™�ã�®å·¥æ•°æ›´æ–°å‡¦ç�†
-                RecalcTotalHeadCount(); 
-
                 return true;
             }
             catch (System.Exception ex)
@@ -3002,72 +2999,6 @@
         }
         #endregion
 
-        /// <summary>
-        /// æœ¬æ—¥ä»¥é™�ã�®å·¥æ•°æ›´æ–°å‡¦ç�†
-        /// </summary>
-        /// <returns></returns>
-        private bool RecalcTotalHeadCount()
-        {
-            IODailyDataDetail DetailDB = new IODailyDataDetail();
-            try
-            {
-                string strSQL = string.Empty;
-                int JobCode = 0;
-                int CompanyCode = 0;
-                double StToDayCount = 0;
-                double StTotalCount = 0;
-
-                DetailDB.connect(); DetailDB.beginTran();
-                
-                DataGridView dgv = dgvAllDisplay;
-                foreach (DataGridViewRow CurRow in dgv.Rows)
-                {
-                    JobCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispGridColumn1.JobCategoryCode]);
-                    CompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispGridColumn1.CompanyCode]);
-                    StToDayCount = CommonMotions.cnvDouble(CurRow.Cells[(int)DispGridColumn1.TodayHeadCount]);
-                    StTotalCount = CommonMotions.cnvDouble(CurRow.Cells[(int)DispGridColumn1.TotalHeadCount]);
-
-                    strSQL = string.Format(" WHERE PersonCode = {0}", m_PersonCode);
-                    strSQL += string.Format(" AND ConstructionCode = {0}", m_ConstructionCode);
-                    if (JobCode != 0) strSQL += string.Format(" AND JobCategoryCode = {0}", JobCode);
-                    if (CompanyCode != 0) strSQL += string.Format(" AND CompanyCode = {0}", CompanyCode);
-                    strSQL += string.Format(" AND TRUNC(DailyDataDate) > TO_DATE('{0}')", GetTargetToday().ToShortDateString());
-                    strSQL += " ORDER BY DailyDataDate";
-
-                    List<DailyDataDetail> DetailList = new List<DailyDataDetail>();
-                    if (!DetailDB.SelectAction(strSQL, ref DetailList, false)) continue;
-
-                    foreach (DailyDataDetail CurRec in DetailList)
-                    {
-                        StTotalCount += CurRec.TodayHeadCount;
-                        if (!DetailDB.UpdateFeild(m_PersonCode,
-                                                CurRec.DailyDataDate,
-                                                m_ConstructionCode,
-                                                CurRec.SeqNo,
-                                                (int)IODailyDataDetail.DataColumn.TotalHeadCount,
-                                                StTotalCount,
-                                                false))
-                        {
-                            DetailDB.rollback();
-                            break;
-                        }
-                    }
-                }
-                DetailDB.commit();
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return true;
-            }
-            finally
-            {
-                DetailDB.close(); DetailDB = null;
-            }
-        }
-
         #region é�¸æŠžã�•ã‚Œã�Ÿæ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
         /// é�¸æŠžã�•ã‚Œã�Ÿæ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
@@ -3089,9 +3020,9 @@
         }
         #endregion
 
-        #region è©²å½“æ—¥å ±ãƒ‡ãƒ¼ã‚¿æ˜Žç´°ã�®ç´¯è¨ˆäººå“¡æ•°ã‚’æ›´æ–°æ—¥ã‚ˆã‚Šå¾Œã‚’æ›´æ–°ã�™ã‚‹
+        #region è©²å½“æ—¥å ±ãƒ‡ãƒ¼ã‚¿æ˜Žç´°ã�®ç´¯è¨ˆäººå“¡æ•°ã‚’æ›´æ–°æ—¥ã‚ˆã‚Šä»¥é™�æ›´æ–°ã�™ã‚‹
         /// <summary>
-        /// 
+        /// è©²å½“æ—¥å ±ãƒ‡ãƒ¼ã‚¿æ˜Žç´°ã�®ç´¯è¨ˆäººå“¡æ•°ã‚’æ›´æ–°æ—¥ã‚ˆã‚Šä»¥é™�æ›´æ–°ã�™ã‚‹
         /// </summary>
         /// <param name="JobCode"></param>
         /// <param name="CompanyCode"></param>
@@ -3196,5 +3127,121 @@
             }
         }
         #endregion
+
+        // -------------------- å�°åˆ·å‡¦ç�†
+        #region å�°åˆ·æ™‚ãƒœã‚¿ãƒ³åˆ¶å¾¡
+        /// <summary>
+        /// å�°åˆ·æ™‚ãƒœã‚¿ãƒ³åˆ¶å¾¡
+        /// </summary>
+        /// <param name="bprint"></param>
+        private void PrintButtonVisbleControl(bool bprint)
+        {
+            btnWorkingList.Visible = !bprint;
+            
+            panel1.Enabled = !bprint;
+            pnlBase.Enabled = !bprint;
+
+            btnOtherProc.Visible = !bprint;
+            btnProv.Visible = !bprint;
+            btnNext.Visible = !bprint;
+
+            btnLineAdd.Visible = !bprint;
+            btnLineDel.Visible = !bprint;
+
+            btnDataEntry.Visible = !bprint;
+            btnDataDelete.Visible = !bprint;
+            btnEnd.Visible = !bprint;
+
+            if (bprint)
+            {
+                btnPrint.Text = s_PrintButtonTop[0];
+                btnPrint.BackColor = s_PrintButtonColor[0];
+            }
+            else
+            {
+                btnPrint.Text = s_PrintButtonTop[1];
+                btnPrint.BackColor = s_PrintButtonColor[0];
+            }
+
+        }
+        #endregion
+
+        #region å�°åˆ·å‡¦ç�†
+        /// <summary>
+        /// å�°åˆ·å‡¦ç�†
+        /// </summary>
+        private void PrintOutDR()
+        {
+            FrmSaveFilePath frm = new FrmSaveFilePath();
+            FrmPrintConfirmation frmPrint = new FrmPrintConfirmation();
+            try
+            {
+                // å·¥äº‹ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
+                frmPrint.ConstructionCode = m_ConstructionCode;
+                // å‡¦ç�†ç•ªå�·ã‚»ãƒƒãƒˆ
+                frmPrint.ExecuteProcNo = (int)ClsExcute.ProcessExecuteNo.DRConstruction;
+
+                // ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦è¡¨ç¤º
+                frmPrint.ShowDialog();
+
+                // çµ‚äº†çŠ¶æ…‹
+                m_PrintresRet = frmPrint.EndButton;
+
+                // æ—¥ä»˜å�°åˆ·ãƒ•ãƒ©ã‚°
+                m_PrintDate = frmPrint.DatePrintFlg;
+
+                // ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (m_PrintresRet == DialogResult.Cancel) return;
+
+                bool bSimplePrint = true;
+                if (!btnPrint.Text.Equals(s_PrintButtonTop[1])) bSimplePrint = false;
+
+                // EXCELä¿�å­˜æ™‚é�¸æŠž
+                if (m_PrintresRet == DialogResult.No)
+                {
+                    // ä¿�å­˜å…ˆã‚’é�¸æŠžã�™ã‚‹
+                    if (bSimplePrint) frm.SaveType = (int)CommonDefine.SaveFileType.ExcelFile;
+                    else frm.SaveType = (int)CommonDefine.SaveFileType.WordFile;
+
+                    //frm.ShowInTaskbar = false;
+
+                    frm.ShowDialog();
+                    if (frm.EndButton == DialogResult.Cancel) return;
+                    m_SelectSaveExcel = frm.SelectPath;
+                    m_SelectSaveWord = frm.SelectPath;
+                }
+
+
+                // å�°åˆ·ãƒ—ãƒ­ã‚»ã‚¹æ•°å�–å¾—
+                m_ProcessCount = GetProcessCount() + 2;       // æžšæ•°ï¼‹ï¼¥ï¼¸ï¼£ï¼¥ï¼¬ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå�–å¾—(2)
+                PrintProgress.Visible = true;
+                PrintProgress.Minimum = 0;
+                PrintProgress.Maximum = m_ProcessCount;
+                PrintProgress.Value = 0;
+
+                m_Canceled = false;
+                // ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
+                PrintButtonVisbleControl(true);
+
+                //å�°åˆ·ã‚’åˆ¥ã‚¹ãƒ¬ãƒƒãƒ‰ã�§å®Ÿè¡Œã�™ã‚‹
+                m_ProgressCount = 0;
+                workerThread = new System.Threading.Thread(new System.Threading.ThreadStart(PrintMain));
+                workerThread.IsBackground = true;
+                workerThread.Start();
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Close(); frm = null;
+                frmPrint.Close(); frmPrint = null;
+            }
+        }
+        #endregion
+
+        // -------------------- å�°åˆ·å‡¦ç�†
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/PrintCommon.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/PrintCommon.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/PrintCommon.cs	(revision 36)
@@ -0,0 +1,235 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections;
+using System.Windows.Forms;
+using System.Diagnostics;
+using Microsoft.VisualBasic;
+using System.Globalization;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.DataEntry;
+using ProcessManagement.Forms.ControlsAction;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    /// <summary>
+    /// å�°åˆ·å‡¦ç�†å…±é€šå¤‰æ•°
+    /// </summary>
+    partial class FrmDRConstruction
+    {
+        #region ã‚¹ãƒ¬ãƒƒãƒ‰ä½¿ç”¨å®šç¾©
+        //ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ‡ãƒªã‚²ãƒ¼ãƒˆ
+        private delegate void SetProgressValueDelegate(int num);
+        //ãƒ�ãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å‡¦ç�†ã�Œçµ‚ã‚�ã�£ã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ‡ãƒªã‚²ãƒ¼ãƒˆ
+        private delegate void ThreadCompletedDelegate();
+        //å‡¦ç�†ã�Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿæ™‚ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ‡ãƒªã‚²ãƒ¼ãƒˆ
+        private delegate void ThreadCanceledDelegate();
+
+        //åˆ¥å‡¦ç�†ã‚’ã�™ã‚‹ã�Ÿã‚�ã�®ã‚¹ãƒ¬ãƒƒãƒ‰
+        private System.Threading.Thread workerThread;
+
+        //ãƒ‡ãƒªã‚²ãƒ¼ãƒˆã�®ä½œæˆ�
+        SetProgressValueDelegate m_progressDlg = null;
+        ThreadCompletedDelegate m_completeDlg = null;
+        ThreadCanceledDelegate m_canceledDlg = null;
+        #endregion
+
+        #region å®šæ•°
+        #region æ³¨æ–‡æ›¸æœ€çµ‚è¡Œæ–‡å­—ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ
+        /// <summary>
+        /// æ³¨æ–‡æ›¸æœ€çµ‚è¡Œæ–‡å­—ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ
+        /// </summary>
+        private const string s_LastRowString = "â€»åˆ¥ç´™{0}ä»˜ã�‘æ��å‡ºè¦‹ç©�ã‚‚ã‚Šã�«ã‚ˆã‚‹";
+        #endregion
+
+        #region ã‚·ãƒ¼ãƒˆå��ç§°
+        /// <summary>
+        /// ã‚·ãƒ¼ãƒˆå��ç§°
+        /// </summary>
+        //private static readonly string SheetName = "å·¥äº‹æ—¥å ±";
+        #endregion
+
+        #region Excelãƒ•ã‚¡ã‚¤ãƒ«å��
+        /// <summary>
+        /// Excelãƒ•ã‚¡ã‚¤ãƒ«å��
+        /// </summary>
+        private string s_ExcelBookName = "å·¥äº‹æ—¥å ±";
+        #endregion
+
+        /// <summary>
+        /// å›³å½¢ç½®ã��å ´ã‚·ãƒ¼ãƒˆ
+        /// </summary>
+        private const string s_shapeSheetName = "å›³å½¢ã‚·ãƒ¼ãƒˆ";
+        /// <summary>
+        /// å›³å½¢å��ç§°
+        /// </summary>
+        private const string s_shapeName = "SealStamp1";                                    // åˆ¤å­�ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå��
+        /// <summary>
+        /// å›³å½¢ã‚µã‚¤ã‚ºã€�ç¸¦ãƒ»æ¨ªã€‘ï¼ˆå›³å½¢å��ç§°é †ï¼‰
+        /// </summary>
+        private static float[,] s_ShapeSize = new float[1, 2] { { 25.51f, 25.51f } };       // åˆ¤å­�ã‚µã‚¤ã‚º
+        /// <summary>
+        /// åˆ¤å­�ãƒ•ã‚©ãƒ³ãƒˆã‚µã‚¤ã‚º
+        /// </summary>
+        private static float[] s_EstimateSeal1FontSize = { 16f, 8f, 8f, 8f, 6f };
+        /// <summary>
+        /// åˆ¤å­�ä½�ç½®(Key:X Value:Y)
+        /// </summary>
+        private static float[,] s_CoverSealPoint = new float[4, 2] {{323.25f, 183.75f},    // ç¤¾é•·
+                                                                    {392.50f, 183.75f},    // å°‚å‹™
+                                                                    {460.00f, 183.75f},    // æ‰€å±žé•·
+                                                                    {527.50f, 183.75f} };  // æ‹…å½“
+        #endregion
+
+        #region å¤‰æ•°
+
+        /// <summary>
+        /// ã‚¨ã‚¯ã‚»ãƒ«å�°åˆ·ã‚¯ãƒ©ã‚¹ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ
+        /// </summary>
+        private UsedExcel m_UsedExcel = null;
+
+        /// <summary>
+        /// ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³ã�Œã‚¯ãƒªãƒƒã‚¯ã�•ã‚Œã�Ÿã�‹ã‚’ç¤ºã�™ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private volatile bool m_Canceled = false;
+        /// <summary>
+        /// æ—¥ä»˜ã‚’å�°å­—ã�™ã‚‹ã�‹ã�®ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private volatile bool m_PrintDate = true;
+
+        /// <summary>
+        /// å�°åˆ·å‡¦ç�†ãƒ—ãƒ­ã‚»ã‚¹æ•°ã‚«ã‚¦ãƒ³ãƒˆï¼ˆä¸‹è¨˜ã�¨æ··å�Œæ³¨æ„�ï¼‰
+        /// </summary>
+        private int m_ProcessCount = 0;
+
+        /// <summary>
+        /// ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ã‚«ã‚¦ãƒ³ãƒˆ
+        /// </summary>
+        private int m_ProgressCount = 0;
+
+        /// <summary>
+        /// ä¿�å­˜æ™‚Excelãƒ‘ã‚¹
+        /// </summary>
+        private string m_SelectSaveExcel = "";
+        /// <summary>
+        /// ä¿�å­˜æ™‚Wordãƒ‘ã‚¹
+        /// </summary>
+        private string m_SelectSaveWord = "";
+        /// <summary>
+        /// å®Ÿè¡Œãƒ€ã‚¤ã‚¢ãƒ­ã‚°é�¸æŠžå€¤
+        /// </summary>
+        private DialogResult m_PrintresRet = DialogResult.Cancel;
+
+        /// <summary>
+        /// çµ‚äº†ã‚³ãƒ¼ãƒ‰
+        /// </summary>
+        private CommonDefine.RetunAnswer m_rtAns = CommonDefine.RetunAnswer.Answer0;
+        #endregion
+
+        #region ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// <summary>
+        /// ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// </summary>
+        /// <param name="num"></param>
+        private void SetProgressValue(int num)
+        {
+            // ProgressBarã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            PrintProgress.Value = num;
+            PrintProgress.Update();
+        }
+        #endregion
+
+        #region å‡¦ç�†ã�Œå®Œäº†ã�—ã�Ÿæ™‚ã�«ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// <summary>
+        /// å‡¦ç�†ã�Œå®Œäº†ã�—ã�Ÿæ™‚ã�«ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// </summary>
+        private void ThreadCompleted()
+        {
+            try
+            {
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å¤‰æ›´
+                PrintProgress.Visible = false;
+                //groupBox2.Invalidate();
+
+                // ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
+                PrintButtonVisbleControl(false);
+
+                // å�°åˆ·
+                if (m_rtAns == CommonDefine.RetunAnswer.Answer0)
+                {
+                    if (m_PrintresRet == DialogResult.No)
+                    {
+                        MessageBox.Show("ä¿�å­˜ã�Œçµ‚äº†ã�—ã�¾ã�—ã�Ÿã€‚", "çµ‚ã€€äº†", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    return;
+                }
+
+                // ã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚»ãƒƒãƒˆ
+                string strMessage = "";
+                switch ((int)m_rtAns)
+                {
+                    case (int)CommonDefine.RetunAnswer.Answer1:
+                        strMessage = "ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer2:
+                        strMessage = "å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer3:
+                        strMessage = "å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer4:
+                        strMessage = "æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer5:
+                        strMessage = "å�°åˆ·ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer6:
+                        strMessage = "å�”åŠ›ä¼šç¤¾ãƒžã‚¹ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer7:
+                        strMessage = "ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�°åˆ·ãƒ‡ãƒ¼ã‚¿ç„¡";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer8:
+                        strMessage = "ç©�ç®—è¦‹ç©�ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                    case (int)CommonDefine.RetunAnswer.Answer9:
+                        strMessage = "æ‹…å½“è€…ãƒžã‚¹ã‚¿å�–å¾—ã‚¨ãƒ©ãƒ¼";
+                        break;
+                }
+                MessageBox.Show(strMessage, "å�°åˆ·ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                m_rtAns = CommonDefine.RetunAnswer.Answer1;
+            }
+        }
+        #endregion
+
+        #region å‡¦ç�†ã�Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿæ™‚ã�«ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// <summary>
+        /// å‡¦ç�†ã�Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿæ™‚ã�«ãƒ—ãƒ­ã‚°ãƒ¬ã‚¹ãƒ�ãƒ¼ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+        /// </summary>
+        private void ThreadCanceled()
+        {
+            // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å¤‰æ›´
+            PrintProgress.Visible = false;
+            //groupBox2.Invalidate();
+
+            // ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
+            PrintButtonVisbleControl(false);
+        }
+        #endregion
+
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/PrintFormat.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/PrintFormat.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/PrintFormat.cs	(revision 36)
@@ -0,0 +1,790 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections;
+using System.Windows.Forms;
+using System.Diagnostics;
+using Microsoft.VisualBasic;
+using System.Globalization;
+
+using log4net;
+using log4net.Appender;
+using log4net.Repository.Hierarchy;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.DB.Core;
+using ProcessManagement.Forms.DataEntry;
+using ProcessManagement.Forms.ControlsAction;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmDRConstruction
+    {
+        #region å�°åˆ·ãƒ¡ã‚¤ãƒ³
+        /// <summary>
+        /// å�°åˆ·å‡¦ç�†
+        /// </summary>
+        public void PrintMain()
+        {
+            //ãƒ‡ãƒªã‚²ãƒ¼ãƒˆã�®ä½œæˆ�
+            m_progressDlg = new SetProgressValueDelegate(SetProgressValue);
+            m_completeDlg = new ThreadCompletedDelegate(ThreadCompleted);
+            m_canceledDlg = new ThreadCanceledDelegate(ThreadCanceled);
+
+            try
+            {
+                // å�°åˆ·ã‚¯ãƒ©ã‚¹
+                m_UsedExcel = new UsedExcel();
+                m_ProgressCount = 0;
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+
+                //ã‚¨ã‚¯ã‚»ãƒ«ãƒ–ãƒƒã‚¯ã‚ªãƒ¼ãƒ—ãƒ³
+                if (!m_UsedExcel.ExcelBookOpen(System.Environment.CurrentDirectory + CommonDefine.s_ExcelOriginalFileName))
+                {
+                    m_rtAns = CommonDefine.RetunAnswer.Answer5;
+                    return;
+                }
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+
+                // ãƒšãƒ¼ã‚¸å�°åˆ·
+                List<string> strParaList = new List<string>();
+                CommonDefine.RetunAnswer rtAns = PrintPage(strParaList);
+                if (rtAns != CommonDefine.RetunAnswer.Answer0)
+                {
+                    m_rtAns = rtAns;
+                    return;
+                }
+
+                // ä¸­æ–­å‡¦ç�†
+                if (m_Canceled) return;
+
+                // å�°åˆ·ãƒ»Excelä¿�å­˜å‡¦ç�†
+                if (m_PrintresRet == DialogResult.Yes)
+                {
+                    // +++++++++++++++++++++++++ å�°åˆ· +++++++++++++++++++++++++
+                    m_UsedExcel.ExcelSheetPrint();
+                }
+                else if (m_PrintresRet == DialogResult.No)
+                {
+                    // +++++++++++++++++++++++++ ä¿�å­˜ +++++++++++++++++++++++++
+                    string FilePath = @m_SelectSaveExcel;
+                    // ç®¡ç�†ãƒ•ã‚¡ã‚¤ãƒ«ã�«ã�‚ã‚‹ã�‹ï¼Ÿ
+                    //if (FilePath.Length == 0)
+                    //{
+                    //    FilePath = CommonMotions.DFRModel.ExcelExecuteAction.SavePath.ToString();
+                    //}
+                    // ã‚¨ã‚¯ã‚»ãƒ«ä¿�å­˜
+                    if (CommonMotions.ChkDirPath(FilePath, true))
+                    {
+                        string wrkFile = "3-2.";
+                        foreach (string ww in strParaList)
+                        {
+                            wrkFile += ww;
+                        }
+                        for (int ix = 0; ix < m_UsedExcel.ExcelBadCharcter.Length; ix++)
+                        {
+
+                            wrkFile = wrkFile.Replace(m_UsedExcel.ExcelBadCharcter[ix], "");
+                        }
+                        // ãƒ•ã‚¡ã‚¤ãƒ«å��ä½œæˆ�
+                        FilePath += @"\" + @wrkFile + @s_ExcelBookName;
+
+                        m_UsedExcel.SaveSwitch = true;
+                        m_UsedExcel.ExcelSaveBook(FilePath);
+                    }
+                }
+
+                m_rtAns = CommonDefine.RetunAnswer.Answer0;
+
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                m_rtAns = CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                // å®Œäº†ã�—ã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+                this.Invoke(m_completeDlg);
+
+                // ã‚¨ã‚¯ã‚»ãƒ«é–‹æ”¾
+                if (m_UsedExcel != null)
+                {
+                    m_UsedExcel.ExcelBookClose();
+                }
+                m_UsedExcel = null;
+
+                //ãƒ‡ãƒªã‚²ãƒ¼ãƒˆã�®å»ƒæ£„
+                m_progressDlg = null;
+                m_completeDlg = null;
+                m_canceledDlg = null;
+
+                // ã‚¬ãƒ¼ãƒ™ãƒ¼ã‚¸ã‚³ãƒ¬ã‚¯ãƒˆ
+                GC.Collect();
+            }
+        }
+        #endregion
+
+        #region ä»Šã�®å¹´å�·ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// ä»Šã�®å¹´å�·ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private string GetNameOfAnEra()
+        {
+            try
+            {
+                string strRet = string.Empty;
+
+                CultureInfo culture = new CultureInfo("ja-JP", true);
+                culture.DateTimeFormat.Calendar = new JapaneseCalendar();
+
+                string result = DateTime.Now.ToString("ggyyå¹´Mæœˆdæ—¥", culture);
+
+                strRet = result.Substring(0, 2);
+
+                return strRet;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return string.Empty;
+            }
+        }
+        #endregion
+
+        #region è¡¨ç´™å�°é‘‘è¡¨ç¤º
+        /// <summary>
+        ///  è¡¨ç´™å�°é‘‘è¡¨ç¤º
+        /// </summary>
+        private void ExcelPrintCoverSeal(int ChargePersonCode)
+        {
+            IOMPersonInCharge picDB = new IOMPersonInCharge();
+            IOProcessApproval paDB = new IOProcessApproval();
+            try
+            {
+                // å�°åˆ·ãƒ†ãƒ¼ãƒ–ãƒ«ä½œæˆ�
+                int[] PorsonTable = new int[4] { 0, 0, 0, 0 };
+                List<string> TitleTable = new List<string>();
+                List<string> NameTable = new List<string>();
+                for (int i = 0; i < PorsonTable.Length; i++)
+                {
+                    TitleTable.Add("");
+                    NameTable.Add("");
+                }
+
+                // æ‹…å½“è€…ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹                
+                PorsonTable[3] = ChargePersonCode;
+                PersonInChargeMaster SalesRec = new PersonInChargeMaster();
+                string strSales = picDB.CreatePrimarykeyString(ChargePersonCode);
+                picDB.SelectAction(strSales, ref SalesRec);
+                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 ConstructionCode = {0}", ConstructionCode.ToString());
+                strSQLSeal += string.Format(" And ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQLSeal += " AND SEQNO != 1";
+                strSQLSeal += " AND B.PERSONCODE = A.PERSONCODE";
+                strSQLSeal += " AND C.SECCODE = B.SECCODE";
+                strSQLSeal += " Order By C.SECRANK ASC, B.DISPLAYORDER ASC";
+
+                ArrayList arList = new ArrayList();
+                if (!paDB.ExecuteReader(strSQLSeal, ref arList)) return;
+
+                int ProcAppCnt = Enum.GetNames(typeof(IOProcessApproval.ColumnName)).Length;
+                // æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šæ‹…å½“è€…ã��ã�®ä»–ã‚’å�–å¾—ã�™ã‚‹
+                int PrintCnt = 0;
+                foreach (object[] curRec in arList)
+                {
+                    // æž ã�®ã‚»ãƒƒãƒˆã�¯ï¼“ã�¤ã�¾ã�§
+                    if (PrintCnt > 2) break;
+
+                    ProcessApproval parec = new ProcessApproval();
+                    paDB.Reader2Struct(curRec, ref parec);
+                    PorsonTable[PrintCnt] = parec.PersonCode;
+                    NameTable[PrintCnt] = CommonMotions.cnvString(curRec[ProcAppCnt + (int)IOMPersonInCharge.ColumnCnt.SealPrintName]);
+                    TitleTable[PrintCnt] = CommonMotions.cnvString(curRec[ProcAppCnt + (int)IOMPersonInCharge.ColumnCnt.DisplayString]);
+
+                    PrintCnt++;
+                }
+                // ãƒ†ãƒ¼ãƒ–ãƒ«å†…ã�«å�Œã�˜ã‚³ãƒ¼ãƒ‰ã�Œç„¡ã�„ã�‹å¾Œã�‹ã‚‰èª¿ã�¹ã‚‹
+                for (int i = PorsonTable.Length - 1; i >= 0; i--)
+                {
+                    for (int ii = i - 1; ii >= 0; ii--)
+                    {
+                        if (PorsonTable[i] == PorsonTable[ii])
+                        {
+                            PorsonTable[i] = 0;
+                            NameTable[i] = "";
+                            break;
+                        }
+                    }
+                }
+
+                // å�°é‘‘ã‚’æ��ç”»ã�™ã‚‹
+                OfficeShapeDefine shapedef = new OfficeShapeDefine();
+                shapedef.ShapeSheetName = s_shapeSheetName;     // å›³å½¢ã‚·ãƒ¼ãƒˆå��ç§°
+                shapedef.ShapeName = s_shapeName;               // å›³å½¢å��ç§°
+                shapedef.ShapeWidth = s_ShapeSize[0, 0];        // å›³å½¢æ��ç”»ã‚µã‚¤ã‚º Width
+                shapedef.ShapeHeight = s_ShapeSize[0, 1];       // å›³å½¢æ��ç”»ã‚µã‚¤ã‚º Height
+
+                int PrintPos = 9;   // Jã�¯9
+                for (int i = 0; i < 4; i++, PrintPos += 2)
+                {
+                    if (PorsonTable[i] == 0) continue;
+
+                    shapedef.ShapeDrowPointX = s_CoverSealPoint[i, 0];          // å›³å½¢æ��ç”»ä½�ç½® X
+                    shapedef.ShapeDrowPointY = s_CoverSealPoint[i, 1];          // å›³å½¢æ��ç”»ä½�ç½® Y
+                    shapedef.DrowText = NameTable[i];                           // æ��ç”»æ–‡å­—åˆ—
+                    int ifontSize = NameTable[i].Length - 1;
+                    if (ifontSize > 4) ifontSize = 4;
+                    shapedef.FontSize = s_EstimateSeal1FontSize[ifontSize];     // ãƒ•ã‚©ãƒ³ãƒˆã‚µã‚¤ã‚º
+                    // å›³å½¢æ��ç”»
+                    m_UsedExcel.ExcelCopyShape(shapedef);
+
+                    // ã‚¿ã‚¤ãƒˆãƒ«å�°å­—
+                    string strChar = CommonMotions.cnvNumberToAlphaCharacter(PrintPos);
+                    if (TitleTable[i].Length != 0) m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, 14), TitleTable[i]);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                paDB.close(); paDB = null;
+                picDB.close(); picDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒšãƒ¼ã‚¸å�°åˆ·
+        /// <summary>
+        /// ãƒšãƒ¼ã‚¸å�°åˆ·
+        /// </summary>
+        /// <returns></returns>
+        private CommonDefine.RetunAnswer PrintPage(List<string> strParaList)
+        {
+            IODailyDataConstruction DailyDB = new IODailyDataConstruction();
+            IOConstructionBaseInfoDetail InfoDetailDB = new IOConstructionBaseInfoDetail();
+            IOPurchaseOrderDetail OrderDetailDB = new IOPurchaseOrderDetail();
+            IOMSubContractor ContractorDB = new IOMSubContractor();
+            try
+            {
+            //    // å·¥äº‹å��ç§°å�–å¾—
+            //    string strSQL = InfoDetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+            //    ConstructionBaseInfoDetail workRec = new ConstructionBaseInfoDetail();
+            //    if (!InfoDetailDB.SelectAction(strSQL, ref workRec)) return CommonDefine.RetunAnswer.Answer2;
+            //    strParaList.Add(workRec.DetailString);
+
+            //    // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿å�–å¾—
+            //    strSQL = string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+            //    strSQL = string.Format(" AND PERSONCODE = {0}", m_ConstructionCode);
+            //    strSQL += " ORDER BY DAILYDATADATE";
+            //    List<DailyDataConstruction> DailyList = new List<DailyDataConstruction>();
+            //    if (!DailyDB.SelectAction(strSQL, ref DailyList)) return CommonDefine.RetunAnswer.Answer3;
+            //    if (DailyList.Count == 0) return CommonDefine.RetunAnswer.Answer3;
+
+            //    string strPageName = string.Empty;
+            //    foreach (DailyDataConstruction DailyRec in DailyList)
+            //    {
+            //        // å¯¾è±¡æ—¥æ–‡å­—åˆ—ä½œæˆ�
+            //        string strTargetDate = DailyRec.DailyDataDate.ToShortDateString();
+            //        // å·¥äº‹æ—¥å ±ã‚·ãƒ¼ãƒˆã�®å�–å¾—
+            //        m_UsedExcel.ExcelSheetGet(SheetName, true, strTargetDate.Replace("/", "-"));
+
+            //        // ----- ãƒšãƒ¼ã‚¸ç·¨é›†
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼‘ç·¨é›†
+            //        CommonDefine.RetunAnswer RARet = SetBlock1Data(DailyRec);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼’ç·¨é›†
+            //        RARet = SetBlock2Data(0, DailyRec, workRec.DetailString);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼“ç·¨é›†
+            //        RARet = SetBlock3Data(0, DailyRec);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼”ç·¨é›†
+            //        RARet = SetBlock4Data(0, DailyRec);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼•ç·¨é›†
+            //        RARet = SetBlock5Data(DailyRec);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼’ç·¨é›†
+            //        RARet = SetBlock2Data(63, DailyRec, workRec.DetailString);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼“ç·¨é›†
+            //        RARet = SetBlock3Data(63, DailyRec);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒ–ãƒ­ãƒƒã‚¯ï¼”ç·¨é›†
+            //        RARet = SetBlock4Data(63, DailyRec);
+            //        if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet;
+
+            //        // ä¸­æ–­å‡¦ç�†
+            //        if (m_Canceled)
+            //        {
+            //            //ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã�•ã‚Œã�Ÿã�¨ã��ã�«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®å€¤ã‚’å¤‰æ›´ã�™ã‚‹
+            //            this.Invoke(m_canceledDlg);
+            //            return CommonDefine.RetunAnswer.Answer0;
+            //        }
+
+            //        // ãƒšãƒ¼ã‚¸å��ç§°ã‚»ãƒƒãƒˆ
+            //        strPageName = string.Format("{0}ç´„æ¬¾", ContractorRec.CompanyName);
+            //        // ç´„æ¬¾ãƒšãƒ¼ã‚¸å�–å¾—
+            //        m_UsedExcel.ExcelSheetGet(SheetName[(int)enumSheetName.Clause], true, strPageName);
+            //        //// ç´„æ¬¾ãƒšãƒ¼ã‚¸è¡Œã‚µã‚¤ã‚ºå¤‰æ›´
+            //        //m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultRowSize);
+            //        //// ç´„æ¬¾ãƒšãƒ¼ã‚¸åˆ—ã‚µã‚¤ã‚ºå¤‰æ›´
+            //        //m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultColumnSize, false);
+            //        // ç´„æ¬¾ãƒšãƒ¼ã‚¸ç¸¦ãƒ»æ¨ªã‚»ãƒƒãƒˆ
+            //        m_UsedExcel.ExcelFitCountSet(2, 1);
+
+
+            //        // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+            //        this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
+            //    }
+
+            //    // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®è¡¨ç¤ºã‚’å¤‰æ›´ã�™ã‚‹
+            //    this.Invoke(m_progressDlg, new object[] { m_ProcessCount });
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                DailyDB.close(); DailyDB = null;
+                InfoDetailDB.close(); InfoDetailDB = null;
+                OrderDetailDB.close(); OrderDetailDB = null;
+                ContractorDB.close(); ContractorDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ–ãƒ­ãƒƒã‚¯ï¼‘ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆä½œæ¥­å†…å®¹ï¼‰
+        /// <summary>
+        /// ãƒ–ãƒ­ãƒƒã‚¯ï¼‘ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆä½œæ¥­å†…å®¹ï¼‰
+        /// </summary>
+        /// <returns></returns>
+        private CommonDefine.RetunAnswer SetBlock1Data(DailyDataConstruction DailyRec)
+        {
+            IODailyDataDetail DetailDB = new IODailyDataDetail();
+            try
+            {
+                //// å�”åŠ›ä¼šç¤¾å��å�–å¾—
+                //string strSQL = DetailDB.CreatePrimarykeyString(DailyRec.CompanyCode);
+                //SubContractorMaster ContractorRec = new SubContractorMaster();
+                //if (!DetailDB.SelectAction(strSQL, ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6;
+
+                //// ç›¸æ‰‹å…ˆä½�æ‰€é•·ã�•åˆ¤å®š
+                //string strA2 = ContractorRec.Address1 + ContractorRec.Address2 + ContractorRec.Address3;
+                //string strA3 = string.Empty;
+                //if (strA2.Length > 22)
+                //{
+                //    strA2 = ContractorRec.Address1 + ContractorRec.Address2;
+                //    strA3 = ContractorRec.Address3;
+                //}
+                //// ç›¸æ‰‹å…ˆä¼šç¤¾å��ç·¨é›†
+                //string strA4 = string.Empty;
+                //switch (ContractorRec.CorporateStatusPoint)
+                //{
+                //    case 0:
+                //        strA4 = ContractorRec.CompanyName;
+                //        break;
+                //    case 1:
+                //        strA4 = ContractorRec.CorporateStatusName + "ã€€" + ContractorRec.CompanyName;
+                //        break;
+                //    case 2:
+                //        strA4 = ContractorRec.CompanyName + "ã€€" + ContractorRec.CorporateStatusName;
+                //        break;
+                //}
+
+                //m_UsedExcel.ExcelCellSet("A6", "ã€’" + ContractorRec.ZipCode);                   // ç™ºæ³¨å…ˆ éƒµä¾¿ç•ªå�·
+                //m_UsedExcel.ExcelCellSet("A7", strA2);                                          // ç™ºæ³¨å…ˆ ä½�æ‰€1
+                //m_UsedExcel.ExcelCellSet("B8", strA3);                                          // ç™ºæ³¨å…ˆ ä½�æ‰€2
+                //m_UsedExcel.ExcelCellSet("B10", strA4);                                         // ç™ºæ³¨å…ˆ ä¼šç¤¾
+
+                //m_UsedExcel.ExcelCellSet("L8", "ã€’" + CommonMotions.SystemMasterData.ZipCode);          // è‡ªç¤¾ éƒµä¾¿ç•ªå�·
+                //m_UsedExcel.ExcelCellSet("L9", CommonMotions.SystemMasterData.Address1 +
+                //                                CommonMotions.SystemMasterData.Address2 +
+                //                                CommonMotions.SystemMasterData.Address3);               // è‡ªç¤¾ ä½�æ‰€1
+                //m_UsedExcel.ExcelCellSet("L10", CommonMotions.SystemMasterData.CompanyName1 +
+                //                                CommonMotions.SystemMasterData.CompanyName2);           // è‡ªç¤¾ ä¼šç¤¾å��
+                //m_UsedExcel.ExcelCellSet("L11", "TEL " + CommonMotions.SystemMasterData.PhoneNumber);   // è‡ªç¤¾ é›»è©±ç•ªå�·
+                //m_UsedExcel.ExcelCellSet("L12", "FAX " + CommonMotions.SystemMasterData.FaxNumber);     // è‡ªç¤¾ FAXç•ªå�·
+
+
+                //// åˆ¤å­�å�°å­—
+                //ExcelPrintCoverSeal(m_ConstructionBaseInfo.ConstructionPersonCode);
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                DetailDB.close(); DetailDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ–ãƒ­ãƒƒã‚¯ï¼’ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆãƒšãƒ¼ã‚¸ãƒ˜ãƒƒãƒ€ãƒ¼ï¼‰
+        /// <summary>
+        /// ãƒ–ãƒ­ãƒƒã‚¯ï¼’ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆãƒšãƒ¼ã‚¸ãƒ˜ãƒƒãƒ€ãƒ¼ï¼‰
+        /// </summary>
+        /// <param name="startLine"></param>
+        /// <param name="OrderRec"></param>
+        /// <param name="ConstractionName"></param>
+        /// <returns></returns>
+        private CommonDefine.RetunAnswer SetBlock2Data(int startLine, PurchaseOrder OrderRec, string ConstractionName)
+        {
+            IOConstructionBaseInfoDetail InfoDetailDB = new IOConstructionBaseInfoDetail();
+            IOMPersonInCharge PersonDB = new IOMPersonInCharge();
+            try
+            {
+                // å·¥äº‹å ´æ‰€å�–å¾—
+                string strSQL = InfoDetailDB.CreatePrimarykeyString(m_ConstructionCode);
+                strSQL += string.Format(" And (DetailNo = {0} Or DetailNo = {1} Or DetailNo = {2}) ORDER BY DetailNo",
+                                        (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace1,
+                                        (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace2,
+                                        (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace3);
+                List<ConstructionBaseInfoDetail> DetailList=new List<ConstructionBaseInfoDetail>();
+                if (!InfoDetailDB.SelectAction(strSQL, ref DetailList)) return CommonDefine.RetunAnswer.Answer2;
+
+                string PlaceString = string.Empty;
+                foreach (ConstructionBaseInfoDetail DetailRec in DetailList)
+                {
+                    PlaceString += DetailRec.DetailString;
+                }
+
+                // ç°¡æ˜“ç‰ˆæ”¯æ‰•ã�„æ�¡ä»¶
+                string PaymentTermsString = string.Empty;
+                if (OrderRec.PaymentTerms == 0)
+                    PaymentTermsString = "å½“ç¤¾è¦�å®šé€šã‚Š";
+                else
+                    PaymentTermsString = "å®Œæˆ�æ‰•ã�„";
+                    
+                // å·¥äº‹æ‹…å½“è€…å�–å¾—
+                strSQL = PersonDB.CreatePrimarykeyString(m_ConstructionBaseInfo.ConstructionPersonCode);
+                PersonInChargeMaster PersonRec = new PersonInChargeMaster();
+                PersonDB.SelectAction(strSQL, ref PersonRec);
+
+
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (21 + startLine)), ConstractionName);                                // å·¥äº‹å��ç§°
+                if (m_PrintDate)                                                                                                                // ä½œæˆ�æ—¥ä»˜
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("N", (21 + startLine)), OrderRec.CreateDate.ToShortDateString());
+                else
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("N", (21 + startLine)), GetNameOfAnEra() + "   å¹´   æœˆ   æ—¥");
+
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (22 + startLine)), PlaceString);                                     // æ–½å·¥å�Šã�³ç´�å…¥å ´æ‰€
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (23 + startLine)), m_ConstructionCode.ToString());                   // å·¥äº‹ç•ªå�·
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (23 + startLine)),
+                                                                string.Format("{0}-{1}", m_ConstructionCode, OrderRec.SeqNo.ToString("000")));  // ç™ºæ³¨ç•ªå�·
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", (23 + startLine)), PaymentTermsString);                              // æ”¯æ‰•ã�„æ�¡ä»¶
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (24 + startLine)),
+                                                                m_ConstructionBaseInfo.ConstructionPeriodStart.ToShortDateString());            // å·¥æœŸé–‹å§‹æ—¥
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (24 + startLine)),
+                                                                m_ConstructionBaseInfo.ConstructionPeriodEnd.ToShortDateString());              // å·¥äº‹çµ‚äº†æ—¥
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (25 + startLine)),
+                                                                            string.Format("ï¿¥{0}", OrderRec.OrderPrice.ToString("#,0")));       // ç™ºæ³¨é‡‘é¡�ï¼ˆç¨Žåˆ¥ï¼‰
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (25 + startLine)), PersonRec.PersonName);                            // ç�¾å ´æ‹…å½“è€…
+
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", (25 + startLine)),
+                                                                        string.Format("ç�¾é‡‘ã€€ã€€{0}ã€€ï¼…", OrderRec.CashRatio.ToString("0.0")));    // ç�¾é‡‘å‰²å�ˆ
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("O", (25 + startLine)),
+                                                                        string.Format("æ‰‹å½¢ã€€ã€€{0}ã€€ï¼…", (100 - OrderRec.CashRatio).ToString("0.0")));   // æ‰‹å½¢å‰²å�ˆ
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                InfoDetailDB.close(); InfoDetailDB = null;
+                PersonDB.close(); PersonDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ–ãƒ­ãƒƒã‚¯ï¼“ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆæ˜Žç´°ï¼‰
+        /// <summary>
+        /// ãƒ–ãƒ­ãƒƒã‚¯ï¼“ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆæ˜Žç´°ï¼‰
+        /// </summary>
+        /// <param name="startLine"></param>
+        /// <param name="OrderRec"></param>
+        /// <returns></returns>
+        private CommonDefine.RetunAnswer SetBlock3Data(int startLine, PurchaseOrder OrderRec)
+        {
+            IOPurchaseOrderDetail OrderDetailDB = new IOPurchaseOrderDetail();
+            try
+            {
+                // æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                string strSQL = OrderDetailDB.CreatePrimarykeyString(OrderRec.ConstructionCode, OrderRec.SeqNo);
+                strSQL += string.Format(" AND GROUPCOUNT = {0}", 0);
+                strSQL += " ORDER BY LINECOUNT";
+                List<PurchaseOrderDetail> DetailList = new List<PurchaseOrderDetail>();
+                if (!OrderDetailDB.SelectAction(strSQL, ref DetailList)) return CommonDefine.RetunAnswer.Answer4;
+                if (DetailList.Count == 0) return CommonDefine.RetunAnswer.Answer4;
+
+                int Linecnt = 28 + startLine;
+                foreach (PurchaseOrderDetail DetailRec in DetailList)
+                {
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("A", Linecnt), DetailRec.FirstString);                // å·¥ç¨®/å“�å��
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", Linecnt), DetailRec.SecondString);               // å†…å®¹å†…è¨³
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", Linecnt),
+                                                                                    DetailRec.UnitCount.ToString("#,0"));       // æ•°é‡�
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("M", Linecnt),
+                                                                                    DetailRec.UnitPrice.ToString("#,#"));       // å�˜ä¾¡
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("K", Linecnt), DetailRec.UnitName);                   // å�˜ä½�
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("O", Linecnt),
+                                                                                    DetailRec.OrdersLinePrice.ToString("#,0")); // é‡‘é¡�
+                    Linecnt++;
+                }
+                // ã‚»ãƒ«çµ�å�ˆ
+                m_UsedExcel.ExcelCellMerge(m_UsedExcel.CreateCellString("D", Linecnt), m_UsedExcel.CreateCellString("L", Linecnt));
+                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", Linecnt),
+                            string.Format(s_LastRowString, CommonMotions.cnvJapaneseCalendar(OrderRec.LastRowStringDate)));     // æœ€çµ‚è¡Œæ–‡å­—åˆ—
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                OrderDetailDB.close(); OrderDetailDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ–ãƒ­ãƒƒã‚¯ï¼”ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆç™ºæ³¨æ�¡ä»¶ï¼‰
+        /// <summary>
+        /// ãƒ–ãƒ­ãƒƒã‚¯ï¼”ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆç™ºæ³¨æ�¡ä»¶ï¼‰
+        /// </summary>
+        /// <param name="startLine"></param>
+        /// <param name="OrderRec"></param>
+        /// <returns></returns>
+        private CommonDefine.RetunAnswer SetBlock4Data(int startLine, PurchaseOrder OrderRec)
+        {
+            IOPurchaseOrderDetail OrderDetailDB = new IOPurchaseOrderDetail();
+            try
+            {
+                // æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿å�–å¾—
+                string strSQL = OrderDetailDB.CreatePrimarykeyString(OrderRec.ConstructionCode, OrderRec.SeqNo);
+                strSQL += string.Format(" AND GROUPCOUNT = {0}", 1);
+                strSQL += " ORDER BY LINECOUNT";
+                List<PurchaseOrderDetail> DetailList = new List<PurchaseOrderDetail>();
+                if (!OrderDetailDB.SelectAction(strSQL, ref DetailList)) return CommonDefine.RetunAnswer.Answer4;
+                // ç™ºæ³¨æ�¡ä»¶ã�¯ã�ªã�„å ´å�ˆã�Œã�‚ã‚‹
+                if (DetailList.Count == 0) return CommonDefine.RetunAnswer.Answer0;
+
+                int Linecnt = 44 + startLine;
+                foreach (PurchaseOrderDetail DetailRec in DetailList)
+                {
+                    m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("J", Linecnt), DetailRec.FirstString);      // ç™ºæ³¨æ�¡ä»¶
+                    Linecnt++;
+                }
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                OrderDetailDB.close(); OrderDetailDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ–ãƒ­ãƒƒã‚¯ï¼•ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆç™ºæ³¨å…ˆãƒ»è‡ªç¤¾ï¼‰
+        /// <summary>
+        /// ãƒ–ãƒ­ãƒƒã‚¯ï¼•ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆï¼ˆç™ºæ³¨å…ˆãƒ»è‡ªç¤¾ï¼‰
+        /// </summary>
+        /// <param name="OrderRec">æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿</param>
+        /// <returns></returns>
+        private CommonDefine.RetunAnswer SetBlock5Data(PurchaseOrder OrderRec)
+        {
+            IOMSubContractor ContractorDB = new IOMSubContractor();
+            try
+            {
+                m_UsedExcel.ExcelCellSet("A72", "ã€’" + CommonMotions.SystemMasterData.ZipCode);         // è‡ªç¤¾ éƒµä¾¿ç•ªå�·
+                m_UsedExcel.ExcelCellSet("A73", CommonMotions.SystemMasterData.Address1 +
+                                                CommonMotions.SystemMasterData.Address2 +
+                                                CommonMotions.SystemMasterData.Address3);               // è‡ªç¤¾ ä½�æ‰€
+                m_UsedExcel.ExcelCellSet("B76", CommonMotions.SystemMasterData.CompanyName1 +
+                                                CommonMotions.SystemMasterData.CompanyName2);           // è‡ªç¤¾ ä¼šç¤¾å��
+
+                // å�”åŠ›ä¼šç¤¾å��å�–å¾—
+                string strSQL = ContractorDB.CreatePrimarykeyString(OrderRec.CompanyCode);
+                SubContractorMaster ContractorRec = new SubContractorMaster();
+                if (!ContractorDB.SelectAction(strSQL, ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6;
+
+                // ç›¸æ‰‹å…ˆä½�æ‰€é•·ã�•åˆ¤å®š
+                string strA2 = ContractorRec.Address1 + ContractorRec.Address2 + ContractorRec.Address3;
+                string strA3 = string.Empty;
+                if (strA2.Length > 22)
+                {
+                    strA2 = ContractorRec.Address1 + ContractorRec.Address2;
+                    strA3 = ContractorRec.Address3;
+                }
+                // ç›¸æ‰‹å…ˆä¼šç¤¾å��ç·¨é›†
+                string strA4 = string.Empty;
+                switch (ContractorRec.CorporateStatusPoint)
+                {
+                    case 0:
+                        strA4 = ContractorRec.CompanyName;
+                        break;
+                    case 1:
+                        strA4 = ContractorRec.CorporateStatusName + "ã€€" + ContractorRec.CompanyName;
+                        break;
+                    case 2:
+                        strA4 = ContractorRec.CompanyName + "ã€€" + ContractorRec.CorporateStatusName;
+                        break;
+                }
+
+                m_UsedExcel.ExcelCellSet("L74", "ã€’" + ContractorRec.ZipCode);                  // ç™ºæ³¨å…ˆ éƒµä¾¿ç•ªå�·
+                m_UsedExcel.ExcelCellSet("L75", strA2);                                         // ç™ºæ³¨å…ˆ ä½�æ‰€1
+                m_UsedExcel.ExcelCellSet("L76", strA3);                                         // ç™ºæ³¨å…ˆ ä½�æ‰€2
+                m_UsedExcel.ExcelCellSet("L77", strA4);                                         // ç™ºæ³¨å…ˆ ä¼šç¤¾
+
+                return CommonDefine.RetunAnswer.Answer0;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return CommonDefine.RetunAnswer.Answer1;
+            }
+            finally
+            {
+                ContractorDB.close(); ContractorDB = null;
+            }
+        }
+
+        #endregion
+
+        #region å�°åˆ·ãƒšãƒ¼ã‚¸ã‚’å�–å¾—ã�™ã‚‹ã�Ÿã‚�ã�«å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ã�®å¯¾è±¡ä»¶æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// <summary>
+        /// å�°åˆ·ãƒšãƒ¼ã‚¸ã‚’å�–å¾—ã�™ã‚‹ã�Ÿã‚�ã�«å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ã�®å¯¾è±¡ä»¶æ•°ã‚’å�–å¾—ã�™ã‚‹
+        /// </summary>
+        /// <returns></returns>
+        private int GetProcessCount()
+        {
+            IODailyDataConstruction DailyDB = new IODailyDataConstruction();
+            try
+            {
+                ArrayList arData = new ArrayList();
+                string strSQL = "SELECT A.CONSTRUCTIONCODE, A.DAILYDATADATE FROM DailyDataConstruction A";
+                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL += " ORDER BY A.CONSTRUCTIONCODE, A.DAILYDATADATE";
+
+                // SQLå®Ÿè¡Œ
+                if (!DailyDB.ExecuteReader(strSQL, ref arData)) return arData.Count;
+
+                return arData.Count;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+            finally
+            {
+                DailyDB.close(); DailyDB = null;
+            }
+        }
+        #endregion
+
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs	(revision 36)
@@ -202,13 +202,13 @@
         /// <param name="e"></param>
         private void FrmDRList_Load(object sender, EventArgs e)
         {
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-            InitCombBox();
-
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
 
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
+            InitCombBox();
+
             // �‰Šú•\Ž¦
             InitDataLoad();
 
@@ -286,8 +286,8 @@
         {
             if (m_initDataLoad) return;
 
-            // ’S“–ŽÒ‘I‘ðŽž•”��‘I‘ð‚ð�Ý’è‚·‚é
-            SetPerosonToDepartment();
+            // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
+            SetcmbPersons();
 
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
@@ -304,8 +304,8 @@
         {
             if (m_initDataLoad) return;
 
-            // ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒX•Ï�X
-            SetcmbPersons();
+            // ’S“–ŽÒ‘I‘ðŽž•”��‘I‘ð‚ð�Ý’è‚·‚é
+            SetPerosonToDepartment();
 
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 36)
@@ -142,24 +142,20 @@
             try
             {
                 // ƒL�[’lŽæ“¾
-                int SAccKey = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // Œo‰cŽÒƒAƒNƒZƒX
-                int FAccKey = (int)CommonDefine.SecurityRankPos.FreeAuthority;      // “�Š‡ŽÒƒAƒNƒZƒX
-                int LAccKey = (int)CommonDefine.SecurityRankPos.LimitedAuthority;   // �Š‘®’·ƒAƒNƒZƒX
-                int NAccKey = (int)CommonDefine.SecurityRankPos.NormalAuthority;    // ˆê”ÊŽÒƒAƒNƒZƒX
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 // ƒf�[ƒ^ƒAƒNƒZƒX‚ÉŒ ŒÀ‚É‚æ‚è�§ŒÀ‚ª‚ ‚é
-                if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SAccKey].Key)
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key
+                        || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key)
                 {
-                    // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
-                }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LAccKey].Key)
-                {
                     // ˆê•”�§ŒÀ—L
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
@@ -183,24 +179,20 @@
                     strSQL += string.Format(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
                     strSQL += string.Format(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
 
-                    strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
-                    strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (A.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
                     strSQL += string.Format(" Or (A.ConstructionStatusFlg > {0}", iStatus);
 
-                    strSQL += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
-                    strSQL += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (A.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
-                    strSQL += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or A.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
-                    strSQL += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0})))))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or A.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
                 }
             }
             catch (Exception ex)
@@ -639,47 +631,52 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒŒ ŒÀ
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // •”��ƒRƒ“ƒ{”ñ•\Ž¦
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // �‰Šú�Ý’è‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // •”��ƒRƒ“ƒ{”ñ•\Ž¦
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
             }
@@ -782,7 +779,7 @@
                     else
                     {
                         // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                        strSQL += " AND A.DEPARTMENTCODE IN (SELECT A.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1";
+                        strSQL += " AND A.DEPARTMENTCODE IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1";
                         strSQL += string.Format(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
                     }
                 }
@@ -822,18 +819,6 @@
                             cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
                 }
-                else
-                {
-                    // ‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
-                    for (int i = 0; i < cmbDepartment.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
-                        {
-                            cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                        }
-                    }
-                }
 
                 return true;
             }
@@ -899,17 +884,6 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
-                        {
-                            cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                        }
-                    }
-                }
 
                 return true;
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DailyReportList/FrmDailyReportList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DailyReportList/FrmDailyReportList.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DailyReportList/FrmDailyReportList.cs	(revision 36)
@@ -196,13 +196,13 @@
         /// <param name="e"></param>
         private void FrmDailyReportList_Load(object sender, EventArgs e)
         {
-            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
-            InitCombBox();
-
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
 
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
+            InitCombBox();
+
             // �‰Šú•\Ž¦
             InitDataLoad();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DailyReportList/FrmDailyReportListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DailyReportList/FrmDailyReportListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DailyReportList/FrmDailyReportListAuxiliary.cs	(revision 36)
@@ -196,24 +196,20 @@
             try
             {
                 // ƒL�[’lŽæ“¾
-                int SAccKey = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // Œo‰cŽÒƒAƒNƒZƒX
-                int FAccKey = (int)CommonDefine.SecurityRankPos.FreeAuthority;      // “�Š‡ŽÒƒAƒNƒZƒX
-                int LAccKey = (int)CommonDefine.SecurityRankPos.LimitedAuthority;   // �Š‘®’·ƒAƒNƒZƒX
-                int NAccKey = (int)CommonDefine.SecurityRankPos.NormalAuthority;    // ˆê”ÊŽÒƒAƒNƒZƒX
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 // ƒf�[ƒ^ƒAƒNƒZƒX‚ÉŒ ŒÀ‚É‚æ‚è�§ŒÀ‚ª‚ ‚é
-                if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SAccKey].Key)
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key
+                        || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key)
                 {
-                    // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
-                }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LAccKey].Key)
-                {
                     // ˆê•”�§ŒÀ—L
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
@@ -237,24 +233,20 @@
                     strSQL += string.Format(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
                     strSQL += string.Format(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
 
-                    strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
-                    strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (A.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
                     strSQL += string.Format(" Or (A.ConstructionStatusFlg > {0}", iStatus);
 
-                    strSQL += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
-                    strSQL += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" And (A.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
-                    strSQL += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or A.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
-                    strSQL += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0})))))", CommonMotions.LoginUserData.PersonCode);
+                    strSQL += string.Format(" Or A.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
                 }
             }
             catch (Exception ex)
@@ -628,47 +620,52 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // “Á•ÊŒ ŒÀ
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // “�Š‡ŽÒŒ ŒÀ
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // �Š‘®’·Œ ŒÀ
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ˆê”ÊŽÒŒ ŒÀ
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // •”��ƒRƒ“ƒ{”ñ•\Ž¦
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // �‰Šú�Ý’è‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // •”��ƒRƒ“ƒ{”ñ•\Ž¦
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // •”���E’S“–ŽÒƒRƒ“ƒ{•\Ž¦
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
             }
@@ -811,18 +808,6 @@
                             cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
                 }
-                else
-                {
-                    // ‘Î�Û‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^‚É‚ ‚ê‚ÎƒZƒbƒg‚·‚é
-                    for (int i = 0; i < cmbDepartment.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
-                        {
-                            cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                        }
-                    }
-                }
 
                 return true;
             }
@@ -888,17 +873,6 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
-                    {
-                        KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
-                        if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
-                        {
-                            cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                        }
-                    }
-                }
 
                 return true;
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 36)
@@ -230,7 +230,7 @@
         /// ŒŸ�õSQL‚ÌƒZƒLƒ…ƒŠƒeƒB”»’è•”•ª‚ð�ì�¬‚·‚é
         /// </summary>
         /// <param name="strSQL"></param>
-        private void CreateSecuritySQL(ref List<string> strSecurity)
+        private void CreateSecuritySQL(ref string strSecurity)
         {
             try
             {
@@ -256,85 +256,68 @@
         /// ŒŸ�õSQL‚ÌƒZƒLƒ…ƒŠƒeƒB”»’è•”•ª‚ð�ì�¬‚·‚é�i�V‘Î‰ž�j
         /// </summary>
         /// <param name="strSQL"></param>
-        private void CreateNewSecuritySQL(ref List<string> strSecurity)
+        private void CreateNewSecuritySQL(ref string strSecurity)
         {
-            string strSQL = string.Empty;
             try
             {
                 // ƒL�[’lŽæ“¾
-                int SAccKey = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // Œo‰cŽÒƒAƒNƒZƒX
-                int FAccKey = (int)CommonDefine.SecurityRankPos.FreeAuthority;      // “�Š‡ŽÒƒAƒNƒZƒX
-                int LAccKey = (int)CommonDefine.SecurityRankPos.LimitedAuthority;   // �Š‘®’·ƒAƒNƒZƒX
-                int NAccKey = (int)CommonDefine.SecurityRankPos.NormalAuthority;    // ˆê”ÊŽÒƒAƒNƒZƒX
+                // ƒL�[’lŽæ“¾
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // ‘S•”��
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // •¡�”•”��
+                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // Ž©•”��‚Ì‚Ý
+                int None = (int)CommonDefine.SecurityRangePos.None;                 // Ž©’S“–ŽÒ‚Ì‚Ý
 
                 // ƒf�[ƒ^ƒAƒNƒZƒX‚ÉŒ ŒÀ‚É‚æ‚è�§ŒÀ‚ª‚ ‚é
-                // ƒVƒXƒeƒ€Œ ŒÀ‚É‚æ‚Á‚Äƒf�[ƒ^ƒAƒNƒZƒX‚É�§ŒÀ‚ª‚ ‚é
-                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
-                    // ƒVƒXƒeƒ€ŠÇ—�ŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SAccKey].Key)
-                {
                     // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key
+                        || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key)
                 {
-                    // ‚·‚×‚Ä‘Î�Û�i�§ŒÀSQL–³�j
-
-                }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LAccKey].Key)
-                {
                     // ˆê•”�§ŒÀ—L
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
                     int iStatus2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("•”��ˆøŒp")).Key;
 
-                    strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
-                    strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
+                    strSecurity += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
+                    strSecurity += string.Format(" Or (A.ConstructionStatusFlg >= {0}", iStatus);
 
-                    strSQL += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
-                    strSQL += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
+                    strSecurity += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
-                    strSQL += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
+                    strSecurity += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
-                    strSQL += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0}))))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
+                    strSecurity += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0}))))", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0} And A.ConstructionPersonCode = 0)", iStatus);          // �Š‘®’·‚ÍŒ©�Ï’ñ�oŒã‚Å�HŽ–’S“–ŽÒ‚ª“ü‚Á‚Ä‚¢‚È‚¢�ê�‡•\Ž¦
-                    strSQL += string.Format(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
-                    strSQL += string.Format(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
-
-                    strSecurity.Add(strSQL);
+                    strSecurity += string.Format(" Or (A.ConstructionStatusFlg >= {0} And A.ConstructionPersonCode = 0)", iStatus);          // �Š‘®’·‚ÍŒ©�Ï’ñ�oŒã‚Å�HŽ–’S“–ŽÒ‚ª“ü‚Á‚Ä‚¢‚È‚¢�ê�‡•\Ž¦
+                    strSecurity += string.Format(" Or (A.ConstructionStatusFlg = {0}", iStatus2);                                            // •”��ˆøŒpŽž‚ÍˆøŒp•”��‚Ì‚à‚Ì‚ÍŒ©‚¦‚é
+                    strSecurity += string.Format(" And A.TransferConstruction = {0}))", CommonMotions.LoginUserData.DepartmentCode);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NAccKey].Key)
+                else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ
                     int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
 
-                    strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
-                    strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += string.Format(" And (A.SalesPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += string.Format(" Or (A.ConstructionStatusFlg > {0}", iStatus);
+                    strSecurity += string.Format(" Or (A.ConstructionStatusFlg > {0}", iStatus);
 
-                    strSQL += " And (A.ConstructionPersonCode IN (Select A3.PersonCode From PersonInChargeMaster A3";
-                    strSQL += string.Format(" Where A3.DepartmentCode IN (SELECT A4.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A4 WHERE A4.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += string.Format(" And (A.ConstructionPersonCode = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.CONSTRSUBPERSONCODE IN (Select A5.PersonCode From PersonInChargeMaster A5";
-                    strSQL += string.Format(" Where A5.DepartmentCode IN (SELECT A6.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A6 WHERE A6.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
+                    strSecurity += string.Format(" Or A.CONSTRSUBPERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
 
-                    strSQL += " Or A.ConstructionInstructor IN (Select A7.PersonCode From PersonInChargeMaster A7";
-                    strSQL += string.Format(" Where A7.DepartmentCode IN (SELECT A8.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A8 WHERE A8.PERSONCODE = {0})))))", CommonMotions.LoginUserData.PersonCode);
-
-                    strSecurity.Add(strSQL);
+                    strSecurity += string.Format(" Or A.ConstructionInstructor = {0})))", CommonMotions.LoginUserData.PersonCode);
                 }
             }
             catch (Exception ex)
             {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSQL);
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSecurity);
             }
         }
         #endregion
@@ -344,10 +327,8 @@
         /// ŒŸ�õSQL‚ÌƒZƒLƒ…ƒŠƒeƒB”»’è•”•ª‚ð�ì�¬‚·‚é�i‹Œ—ˆ�j
         /// </summary>
         /// <param name="strSQL"></param>
-        private void CreateOldSecuritySQL(ref List<string> strSecurity)
+        private void CreateOldSecuritySQL(ref string strSecurity)
         {
-            string strSQL1 = string.Empty;
-            string strSQL2 = string.Empty;
             try
             {
                 // ‘�–±•”�Š‘®ŽÒ‚Íƒf�[ƒ^ŽQ�Æ�o—ˆ‚é�ˆ—�‚ª‚ ‚é
@@ -369,28 +350,24 @@
                 else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
                 {
                     // ‹@–§ŠÇ—�ŽÒ�iŽ©•”��‚Ì‚Ý�j
-                    strSQL1 = string.Format(" AND C.DepartmentCode = {0}", CommonMotions.LoginUserData.DepartmentCode);
-                    strSQL2 = string.Format(" AND (A.CREATORCODE = C.PERSONCODE AND C.DEPARTMENTCODE = {0})", CommonMotions.LoginUserData.DepartmentCode);
-                    strSecurity.Add(strSQL1);
-                    strSecurity.Add(strSQL2);
+                    strSecurity += string.Format(" AND C.DepartmentCode = {0}", CommonMotions.LoginUserData.DepartmentCode);
+                    strSecurity += string.Format(" AND (A.CREATORCODE = C.PERSONCODE AND C.DEPARTMENTCODE = {0})", CommonMotions.LoginUserData.DepartmentCode);
                 }
                 else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
                 {
                     // ˆê”ÊŽg—pŽÒ�iŽ©ƒf�[ƒ^‚Ì‚Ý�j
                     //strSQL1 = string.Format(" AND C.PERSONCODE = {0}", CommonMotions.LoginUserData.PersonCode);
-                    strSQL1 = string.Format(" AND (A.CONSTRUCTIONPERSONCODE = {0} OR A.CONSTRUCTIONINSTRUCTOR = {0})"
+                    strSecurity += string.Format(" AND (A.CONSTRUCTIONPERSONCODE = {0} OR A.CONSTRUCTIONINSTRUCTOR = {0})"
                                                                         , CommonMotions.LoginUserData.PersonCode);
                     //strSQL2 = string.Format(" AND (A.CREATORCODE = C.PERSONCODE AND C.DEPARTMENTCODE = {0})", CommonMotions.LoginUserData.DepartmentCode);
-                    strSQL2 = " AND A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE";
-                    strSQL2 += string.Format(" AND (D.CONSTRUCTIONPERSONCODE = {0} OR D.CONSTRUCTIONINSTRUCTOR = {0} OR D.CONSTRSUBPERSONCODE = {0})"
+                    strSecurity += " AND A.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE";
+                    strSecurity += string.Format(" AND (D.CONSTRUCTIONPERSONCODE = {0} OR D.CONSTRUCTIONINSTRUCTOR = {0} OR D.CONSTRSUBPERSONCODE = {0})"
                                                                         , CommonMotions.LoginUserData.PersonCode);
-                    strSecurity.Add(strSQL1);
-                    strSecurity.Add(strSQL2);
                 }
             }
             catch (Exception ex)
             {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}�F{2}", ex.Message, strSQL1, strSQL2);
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSecurity);
             }
         }
         #endregion
@@ -1506,7 +1483,7 @@
             try
             {
                 // SQL‚ÉƒAƒNƒZƒX�§ŒÀ‚ð‚©‚¯‚é
-                List<string> strSecurity = new List<string>();
+                string strSecurity = string.Empty;
                 CreateSecuritySQL(ref strSecurity);
 
                 int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
@@ -1550,7 +1527,7 @@
             try
             {
                 // SQL‚ÉƒAƒNƒZƒX�§ŒÀ‚ð‚©‚¯‚é
-                List<string> strSecurity = new List<string>();
+                string strSecurity = string.Empty;
                 CreateSecuritySQL(ref strSecurity);
 
                 int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs	(revision 36)
@@ -966,7 +966,7 @@
             // Œð�Â‹àŠzˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
             if (e.ColumnIndex != (int)DispGridColumn.NegotiationPrice) return;
 
-            // “ü—Í‚ª‚ ‚Á‚½ˆêˆÈŠO‚Íƒtƒ‰ƒO‚ð—§‚Ä‚È‚¢
+            // “ü—Í‚ª‚ ‚Á‚½ˆÊ’uˆÈŠO‚Íƒtƒ‰ƒO‚ð—§‚Ä‚È‚¢
             if (m_BeforeColumnCount == e.ColumnIndex && m_BeforeRowCount == e.RowIndex)
             {
                 // •Ï�Xƒtƒ‰ƒOON
@@ -992,13 +992,6 @@
             // ƒCƒ“ƒfƒbƒNƒXŠO‚Í�ˆ—�‚µ‚È‚¢
             if (e.RowIndex < 0) return;
             
-            // Œð�Â‹àŠzˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
-            if (e.ColumnIndex != (int)DispGridColumn.NegotiationPrice) return;
-            
-            // •Ò�WˆÊ’uŽæ“¾
-            m_BeforeColumnCount = e.ColumnIndex;
-            m_BeforeRowCount = e.RowIndex;
-
             // “Ç�ž�ê—pƒZƒ‹‚Í�ˆ—�‚µ‚È‚¢
             if (dgv.CurrentCell.ReadOnly) return;
 
@@ -1005,6 +998,9 @@
             //IME‚Ìƒ‚�[ƒh‚ð•Ï�X‚·‚é
             switch (e.ColumnIndex)
             {
+                case (int)DispGridColumn.NegotiationPrice:
+                    dgv.ImeMode = ImeMode.Disable;
+                    break;
                 case (int)DispGridColumn.Notes:                              // ”õ�l
                     dgv.ImeMode = ImeMode.On;
                     break;
@@ -1013,6 +1009,13 @@
                     break;
             }
 
+            // Œð�Â‹àŠzˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+            if (e.ColumnIndex != (int)DispGridColumn.NegotiationPrice) return;
+
+            // •Ò�WˆÊ’uŽæ“¾
+            m_BeforeColumnCount = e.ColumnIndex;
+            m_BeforeRowCount = e.RowIndex;
+
             // ƒZƒ‹“à—e‘I‘ð
             dgv.BeginEdit(true);
         }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs	(revision 36)
@@ -589,7 +589,6 @@
             FrmStatusAndDate frmStatus = new FrmStatusAndDate();
             try
             {
-
                 // å·¥äº‹ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
                 frmStatus.ConstructionCode = m_ConstructionCode;
 
@@ -599,6 +598,9 @@
 
                 // æ¶ˆè²»ç¨Žã�¯ä½¿ç”¨ã�—ã�ªã�„
                 frmStatus.TaxDisplayFlg = false;
+                // å�°åˆ·å‡¦ç�†ç•ªå�·ã‚»ãƒƒãƒˆ
+                frmStatus.ExecuteProcNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
+                
                 // ä½œæˆ�æ—¥ä»˜ã�®ã‚»ãƒƒãƒˆ
                 DateTime CreateDate = CommonMotions.cnvDate(lblNoLook.Text);
                 if (CreateDate == DateTime.MinValue)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs	(revision 36)
@@ -358,9 +358,6 @@
         {
             try
             {
-                // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆ�æœŸè¡¨ç¤º
-                InitCombBox();
-
                 // è¡¨ç¤ºã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã�®å�–å¾—
                 SetDisplayObject();
 
@@ -373,6 +370,9 @@
                 // æ‹…å½“è€…ã�®ã‚»ãƒƒãƒˆ
                 SetcombBoxPerson();
 
+                // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆ�æœŸè¡¨ç¤º
+                InitCombBox();
+
                 // åˆ�æœŸè¡¨ç¤º
                 InitDataLoad();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs	(revision 36)
@@ -252,47 +252,52 @@
         {
             try
             {
-                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // ç‰¹åˆ¥æ¨©é™�
-                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // çµ±æ‹¬è€…æ¨©é™�
-                int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;     // æ‰€å±žé•·æ¨©é™�
-                int NRank = (int)CommonDefine.SecurityRankPos.NormalAuthority;      // ä¸€èˆ¬è€…æ¨©é™�
-
+                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // å…¨éƒ¨ç½²
+                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // è¤‡æ•°éƒ¨ç½²
                 int Only = (int)CommonDefine.SecurityRangePos.Only;                 // è‡ªéƒ¨ç½²ã�®ã�¿
                 int None = (int)CommonDefine.SecurityRangePos.None;                 // è‡ªæ‹…å½“è€…ã�®ã�¿
 
                 if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key
-                    || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
+                    || CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key)
                 {
                     // éƒ¨ç½²ãƒ»æ‹…å½“è€…ã‚³ãƒ³ãƒœè¡¨ç¤º
                     DispAllCombBoxControl(true);
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
+                else 
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Multiple].Key)
                     {
+                        // éƒ¨ç½²ãƒ»æ‹…å½“è€…ã‚³ãƒ³ãƒœè¡¨ç¤º
+                        DispAllCombBoxControl(true);
+                    }
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key)
+                    {
                         // éƒ¨ç½²ã‚³ãƒ³ãƒœé�žè¡¨ç¤º
                         NonDispDepCombBox();
                     }
-                    else
+                    else if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
                     {
                         // éƒ¨ç½²ãƒ»æ‹…å½“è€…ã‚³ãƒ³ãƒœè¡¨ç¤º
-                        DispAllCombBoxControl(true);
+                        DispAllCombBoxControl(false);
                     }
                 }
-                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[NRank].Key)
+
+                // åˆ�æœŸè¨­å®šå¯¾è±¡ã�Œã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ãƒ‡ãƒ¼ã‚¿ã�«ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
+                for (int i = 0; i < cmbDepartment.Items.Count; i++)
                 {
-                    if (CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[Only].Key
-                        || CommonMotions.LoginUserSecurity.SecRange == (int)CommonDefine.SecurityRangeList[None].Key)
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbDepartment.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.DepartmentCode)
                     {
-                        // éƒ¨ç½²ã‚³ãƒ³ãƒœé�žè¡¨ç¤º
-                        NonDispDepCombBox();
+                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
-                    else
+                }
+
+                for (int i = 0; i < cmbConstructionPerson.Items.Count; i++)
+                {
+                    KeyValuePair<int, string> wrkPair = (KeyValuePair<int, string>)cmbConstructionPerson.Items[i];
+                    if (wrkPair.Key == CommonMotions.LoginUserData.PersonCode)
                     {
-                        // éƒ¨ç½²ãƒ»æ‹…å½“è€…ã‚³ãƒ³ãƒœè¡¨ç¤º
-                        DispAllCombBoxControl(true);
+                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
             }
@@ -432,12 +437,6 @@
                         cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     }
                 }
-                else
-                {
-                    // å¯¾è±¡ã�Œã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ãƒ‡ãƒ¼ã‚¿ã�«ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                    if (SearchDepartmentCombBoxItem(CommonMotions.LoginUserData.DepartmentCode))
-                        cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
-                }
 
                 return true;
             }
@@ -546,13 +545,6 @@
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
                     }
                 }
-                else
-                {
-                    // ãƒ­ã‚°ã‚¤ãƒ³è€…ã�Œã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�«ã�‚ã‚Œã�°ã‚»ãƒƒãƒˆã�™ã‚‹
-                    if (SearchPersonCombBoxItem(CommonMotions.LoginUserData.PersonCode))
-                        cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
-                }
-
             }
             catch (Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs	(revision 36)
@@ -438,7 +438,8 @@
                 ArrayList peList = new ArrayList();
                 secDB.ExecuteReader(strSQL, ref peList);
                 if (peList.Count == 0) return;
-                
+
+                m_SecMasterList.Clear();
                 int BreakSecCode = 0;
                 int Columncount = 0;
                 int ino = 0;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.Designer.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.Designer.cs	(revision 36)
@@ -0,0 +1,189 @@
+ï»¿namespace ProcessManagement.Forms.SubForms
+{
+    partial class FrmPrintConfirmation
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnExecProc1 = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnExecProc2 = new System.Windows.Forms.Button();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.lblMessageB = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.panel1.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnExecProc1
+            // 
+            this.btnExecProc1.BackColor = System.Drawing.Color.Green;
+            this.btnExecProc1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.btnExecProc1.ForeColor = System.Drawing.Color.White;
+            this.btnExecProc1.Location = new System.Drawing.Point(235, 10);
+            this.btnExecProc1.Name = "btnExecProc1";
+            this.btnExecProc1.Size = new System.Drawing.Size(140, 40);
+            this.btnExecProc1.TabIndex = 0;
+            this.btnExecProc1.Text = "å�°åˆ·ã�®ã�¿";
+            this.btnExecProc1.UseVisualStyleBackColor = false;
+            this.btnExecProc1.Click += new System.EventHandler(this.btnExecProc1_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.BackColor = System.Drawing.Color.Red;
+            this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(531, 10);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(140, 40);
+            this.btnCancel.TabIndex = 3;
+            this.btnCancel.Text = "ã‚­ãƒ£ãƒ³ã‚»ãƒ«";
+            this.btnCancel.UseVisualStyleBackColor = false;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnExecProc2
+            // 
+            this.btnExecProc2.BackColor = System.Drawing.Color.Green;
+            this.btnExecProc2.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.btnExecProc2.ForeColor = System.Drawing.Color.White;
+            this.btnExecProc2.Location = new System.Drawing.Point(383, 10);
+            this.btnExecProc2.Name = "btnExecProc2";
+            this.btnExecProc2.Size = new System.Drawing.Size(140, 40);
+            this.btnExecProc2.TabIndex = 1;
+            this.btnExecProc2.Text = "ä¿�å­˜ã�®ã�¿";
+            this.btnExecProc2.UseVisualStyleBackColor = false;
+            this.btnExecProc2.Click += new System.EventHandler(this.btnExecProc2_Click);
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.panel1.Controls.Add(this.btnCancel);
+            this.panel1.Controls.Add(this.btnExecProc1);
+            this.panel1.Controls.Add(this.btnExecProc2);
+            this.panel1.Location = new System.Drawing.Point(-3, 204);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(700, 60);
+            this.panel1.TabIndex = 3;
+            // 
+            // lblMessageB
+            // 
+            this.lblMessageB.AutoSize = true;
+            this.lblMessageB.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblMessageB.Location = new System.Drawing.Point(78, 178);
+            this.lblMessageB.Name = "lblMessageB";
+            this.lblMessageB.Size = new System.Drawing.Size(539, 21);
+            this.lblMessageB.TabIndex = 4;
+            this.lblMessageB.Text = "ã€�å�°åˆ·ã�®ã�¿ã€‘ã€�ã€�ä¿�å­˜ã�®ã�¿ã€‘ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Location = new System.Drawing.Point(17, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(660, 72);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "å·¥äº‹æ¡ˆä»¶";
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.White;
+            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label1.Location = new System.Drawing.Point(10, 30);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(640, 30);
+            this.label1.TabIndex = 0;
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.groupBox2.Controls.Add(this.label2);
+            this.groupBox2.Location = new System.Drawing.Point(17, 94);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(660, 72);
+            this.groupBox2.TabIndex = 8;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "å�°åˆ·å‡¦ç�†";
+            // 
+            // label2
+            // 
+            this.label2.BackColor = System.Drawing.Color.White;
+            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label2.Location = new System.Drawing.Point(10, 30);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(640, 30);
+            this.label2.TabIndex = 0;
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // FrmPrintConfirmation
+            // 
+            this.AcceptButton = this.btnExecProc1;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(694, 261);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.lblMessageB);
+            this.Controls.Add(this.panel1);
+            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.KeyPreview = true;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrmPrintConfirmation";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "å�°ã€€åˆ·ã€€å®Ÿã€€è¡Œã€€ç¢ºã€€èª�";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmStatusAndDate_FormClosed);
+            this.Load += new System.EventHandler(this.FrmCostStructureDiag_Load);
+            this.panel1.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox2.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnExecProc1;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnExecProc2;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label lblMessageB;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Label label2;
+    }
+}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.cs	(revision 36)
@@ -0,0 +1,262 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.Forms.ControlsAction;
+using System.Collections;
+
+namespace ProcessManagement.Forms.SubForms
+{
+    public partial class FrmPrintConfirmation : Form
+    {
+        #region ãƒ­ã‚°ä½¿ç”¨å®šç¾©
+        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
+        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region å®šæ•°
+        private enum Dispcount
+        {
+            ExeCuteDate = 0,
+            ProgressStatusA,
+            ProgressStatusB,
+            radioButtonA1,
+            radioButtonA2,
+            radioButtonB1,
+            radioButtonB2,
+            radioButtonC1,
+            radioButtonC2,
+        }
+        #endregion
+
+        #region å¤‰æ•°
+        /// <summary>
+        /// çµ‚äº†çŠ¶æ…‹ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private DialogResult m_EndButton = DialogResult.None;
+        
+        /// <summary>
+        /// å·¥äº‹ç•ªå�·
+        /// </summary>
+        private int m_ConstructionCode = 0;
+
+        /// <summary>
+        /// å®Ÿè¡Œå‡¦ç�†ç•ªå�·
+        /// </summary>
+        private int m_ExecuteProcNo = 0;
+
+        /// <summary>
+        /// æ—¥ä»˜å�°åˆ·
+        /// </summary>
+        private bool m_bDatePrintFlg = true;
+        
+        /// <summary>
+        /// ã‚³ãƒ³ãƒ­ãƒ¼ãƒ«ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ
+        /// </summary>
+        private Control[] m_dispControl = new Control[9];
+
+        /// <summary>
+        /// å·¥äº‹åŸºæœ¬æƒ…å ±
+        /// </summary>
+        private ConstructionBaseInfo m_ConstructionBaseInfo = new ConstructionBaseInfo();
+        /// <summary>
+        /// ãƒ„ãƒ¼ãƒ«ãƒ�ãƒƒãƒ—
+        /// </summary>
+        private ToolTip ToolTip1 = new ToolTip();
+        #endregion
+
+        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
+        /// <summary>
+        /// å·¥äº‹ç•ªå�·
+        /// </summary>
+        public int ConstructionCode
+        {
+            get { return m_ConstructionCode; }
+            set { m_ConstructionCode = value; }
+        }
+        /// <summary>
+        /// å®Ÿè¡Œå‡¦ç�†ç•ªå�·
+        /// </summary>
+        public int ExecuteProcNo
+        {
+            get { return m_ExecuteProcNo; }
+            set { m_ExecuteProcNo = value; }
+        }
+        /// <summary>
+        /// çµ‚äº†ãƒœã‚¿ãƒ³çŠ¶æ…‹
+        /// </summary>
+        public DialogResult EndButton
+        {
+            get { return m_EndButton; }
+        }
+        /// <summary>
+        /// æ—¥ä»˜å�°åˆ·ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public bool DatePrintFlg
+        {
+            get { return m_bDatePrintFlg; }
+            set { m_bDatePrintFlg = value; }
+        }
+        #endregion
+
+        #region Ã—ãƒœã‚¿ãƒ³
+        /// <summary>
+        /// Ã—ãƒœã‚¿ãƒ³æŠ¼ä¸‹å‡¦ç�†
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmStatusAndDate_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            if (m_EndButton == DialogResult.None) m_EndButton = DialogResult.Cancel;
+        }
+        #endregion
+
+        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
+        /// </summary>
+        public FrmPrintConfirmation()
+        {
+            InitializeComponent();
+        }
+        #endregion
+
+        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
+        /// <summary>
+        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmCostStructureDiag_Load(object sender, EventArgs e)
+        {
+            // ãƒ•ã‚©ãƒ¼ãƒ ã‚µã‚¤ã‚ºå›ºå®š
+            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
+         
+            // åˆ�æœŸè¡¨ç¤º
+            InitDataLoad();
+        }
+        #endregion
+
+        #region ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³
+        /// <summary>
+        /// ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³è¿½åŠ 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            m_EndButton = DialogResult.Cancel;
+            this.Close();
+        }
+        #endregion
+
+        #region å�°åˆ·ã�®ã�¿ãƒœã‚¿ãƒ³
+        /// <summary>
+        /// å�°åˆ·ã�®ã�¿ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnExecProc1_Click(object sender, EventArgs e)
+        {
+            m_EndButton = DialogResult.Yes;
+
+            this.Close();
+        }
+        #endregion
+
+        #region ä¿�å­˜ã�®ã�¿ãƒœã‚¿ãƒ³
+        /// <summary>
+        /// ä¿�å­˜ã�®ã�¿ãƒœã‚¿ãƒ³æŠ¼ä¸‹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnExecProc2_Click(object sender, EventArgs e)
+        {
+            m_EndButton = DialogResult.No;
+
+            this.Close();
+        }
+        #endregion
+
+        #region è¡¨ç¤ºé–¢é€£
+        /// <summary>
+        /// åˆ�æœŸè¡¨ç¤ºå‡¦ç�†
+        /// </summary>
+        private void InitDataLoad()
+        {
+            try
+            {
+                if (!DisplayData())
+                {
+                    m_EndButton = DialogResult.Cancel;
+                    this.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
+        /// </summary>
+        /// <returns></returns>
+        private bool DisplayData()
+        {
+            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
+            try
+            {
+                bool bRet = true;
+
+                string strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B";
+                strSQL += string.Format(" Where A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL += " AND (B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+                ArrayList arList = new ArrayList();
+                if (!cbDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (arList.Count == 0) return false;
+                object[] objRec = (object[])arList[0];
+
+                label1.Text = CommonMotions.cnvString(objRec[1]);
+                ToolTip1.SetToolTip(label1, CommonMotions.cnvString(objRec[1]));
+
+                string strProcess = ClsExcute.ProcessExecuteName[m_ExecuteProcNo];
+                switch(m_ExecuteProcNo)
+                {
+                    case (int)ClsExcute.ProcessExecuteNo.DRConstruction:
+                        label2.Text = strProcess.Substring(0, strProcess.IndexOf("ï¼�")) + "å�°åˆ·";
+                        break;
+                }
+
+                return bRet;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                cbDB.close(); cbDB = null;
+            }
+        }
+        #endregion
+
+        private void radioButton1_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.resx	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPrintConfirmation.resx	(revision 36)
@@ -0,0 +1,120 @@
+ï»¿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmStatusAndDate.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmStatusAndDate.cs	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmStatusAndDate.cs	(revision 36)
@@ -69,6 +69,11 @@
         private bool m_TaxDisplayFlg = true;
 
         /// <summary>
+        /// å®Ÿè¡Œå‡¦ç�†ç•ªå�·
+        /// </summary>
+        private int m_ExecuteProcNo = 0;
+
+        /// <summary>
         /// æ—¥ä»˜å�°åˆ·
         /// </summary>
         private bool m_bDatePrintFlg = true;
@@ -97,7 +102,17 @@
             get { return m_ConstructionCode; }
             set { m_ConstructionCode = value; }
         }
+
         /// <summary>
+        /// å®Ÿè¡Œå‡¦ç�†ç•ªå�·
+        /// </summary>
+        public int ExecuteProcNo
+        {
+            get { return m_ExecuteProcNo; }
+            set { m_ExecuteProcNo = value; }
+        }
+
+        /// <summary>
         /// æ¶ˆè²»ç¨Žãƒ•ãƒ©ã‚°
         /// </summary>
         public int ConsumptionTaxFlg
@@ -444,6 +459,18 @@
                 // æ¶ˆè²»ç¨Žæ“�ä½œãƒ‘ãƒ�ãƒ«ã�®è¡¨ç¤ºã‚’åˆ¶å¾¡ã�™ã‚‹
                 if (!TaxDisplayFlg) groupBox3.Visible = false;
 
+                switch (m_ExecuteProcNo)
+                {
+                    case (int)ClsExcute.ProcessExecuteNo.EstimatePrint:
+                        groupBox2.Text = "è¦‹ç©�æ��å‡ºæ—¥";
+                        break;
+                    case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:
+                        groupBox2.Text = "æ³¨æ–‡æ›¸ä½œæˆ�æ—¥";
+                        break;
+                    default:
+                        break;
+                }
+
                 // æ–‡å­—ã‚»ãƒƒãƒˆ
                 ToolTip1.SetToolTip(dateTimePicker1, "è¦‹ç©�æ��å‡ºæ—¥ã�Œè¡¨ç¤ºã�•ã‚Œã�¦ã�„ã‚‹æ—¥ä»˜ã�¨é�•ã�†å ´å�ˆã�¯ã€�å¤‰æ›´ã�—ã�¦ã��ã� ã�•ã�„ã€‚");
                 ToolTip1.SetToolTip(radioButton4, "è¦‹ç©�æ��å‡ºæ—¥ã‚’è¦‹ç©�æ›¸ã�¸ã€Œå�°åˆ·ã�™ã‚‹ã€�å ´å�ˆã�¯ã€�ã�“ã�¡ã‚‰ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚");
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManage.xlsx
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 35)
+++ trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 36)
@@ -184,6 +184,12 @@
     <Compile Include="Forms\DataEntry\ConstructionLedger\FrmSelectPerson.Designer.cs">
       <DependentUpon>FrmSelectPerson.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\DataEntry\DRConstruction\PrintCommon.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\DataEntry\DRConstruction\PrintFormat.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DataEntry\PurchaseOrderEntry\PurchaseOrderInputPage.cs" />
     <Compile Include="DataModel\PurchaseOrderDetail.cs" />
     <Compile Include="DataModel\PurchaseOrder.cs" />
@@ -440,6 +446,12 @@
     <Compile Include="Forms\Master\Suppliers\FrmSuppliers.designer.cs">
       <DependentUpon>FrmSuppliers.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\SubForms\FrmPrintConfirmation.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\SubForms\FrmPrintConfirmation.Designer.cs">
+      <DependentUpon>FrmPrintConfirmation.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\SubForms\FrmTyingConstrDiag.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -995,6 +1007,9 @@
     <EmbeddedResource Include="Forms\Master\Suppliers\FrmSuppliers.resx">
       <DependentUpon>FrmSuppliers.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\SubForms\FrmPrintConfirmation.resx">
+      <DependentUpon>FrmPrintConfirmation.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SubForms\FrmTyingConstrDiag.resx">
       <DependentUpon>FrmTyingConstrDiag.cs</DependentUpon>
     </EmbeddedResource>
Index: trunk/src/ProcessManagement/ProcessManagement.v12.suo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
