Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 438)
@@ -3617,7 +3617,7 @@
         /// éƒ¨ç½²ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ãƒ‡ãƒ¼ã‚¿å�–å¾—ï¼³ï¼±ï¼¬ä½œæˆ�
         /// </summary>
         /// <param name="strSQL"></param>
-        public static void CreateDepCombBoxSQL(ref StringBuilder strSQL, int nTargetCount, bool bInput = false)
+        public static void CreateDepCombBoxSQL(ref StringBuilder strSQL, int nTargetCount, bool bCompBase = true)
         {
             try
             {
@@ -3714,7 +3714,7 @@
 
                 if (bNowSeason)
                 {   // å¯¾è±¡ã�Œä»ŠæœŸã�®å ´å�ˆ
-                    if (!bInput) strSQL.Append(", CONSTRUCTIONBASEINFO C");
+                    if (!bCompBase) strSQL.Append(", CONSTRUCTIONBASEINFO C");
                     strSQL.Append(" WHERE");
 
                     // å‰Šé™¤ã�•ã‚Œã�¦ã�„ã�ªã�„ã‚‚ã�®
@@ -3722,7 +3722,7 @@
                     DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false);
 
                     strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
-                    if (!bInput) strSQL.Append(" And C.ConstrDepCode = A.DepartmentCode");
+                    if (!bCompBase) strSQL.Append(" And C.ConstrDepCode = A.DepartmentCode");
                     // é–‹å§‹æ—¥ã�Œä»Šæ—¥ã‚ˆã‚Šå°�ã�•ã�„
                     strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", DateTime.Today.ToShortDateString());
 
@@ -3763,7 +3763,7 @@
         /// </summary>
         /// <param name="strSQL"></param>
         /// <param name="nTargetYear"></param>
-        public static void CreateManCombBoxSQL(ref StringBuilder strSQL, int nTargetYear, int nDepCode = 0)
+        public static void CreateManCombBoxSQL(ref StringBuilder strSQL, int nTargetYear, int nDepCode = 0, bool bNewDataFlg = false)
         {
             try
             {
@@ -3782,6 +3782,11 @@
                 strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(B.CompDate)", dtDefaultStart.ToShortDateString());
                 strSQL.AppendFormat(" OR DATE('{0}') = DATE(B.CompDate)))", DateTime.MinValue.ToShortDateString());
 
+                // æ–°è¦�ã�®ãƒ‡ãƒ¼ã‚¿ã�¯å‰Šé™¤è€…ã‚’è¡¨ç¤ºã�—ã�ªã�„
+                if(bNewDataFlg)
+                {
+                    strSQL.AppendFormat(" And A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                }
                 // é–‹å§‹æ—¥ã�Œä»Šæ—¥ã‚ˆã‚Šå°�ã�•ã�„
                 strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", DateTime.Today.ToShortDateString());
 
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 438)
@@ -986,10 +986,15 @@
 
                 // ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 frm.ConstructionCode = CurrentPara.IntExecParameter[0];
+                
                 // ã‚³ãƒ”ãƒ¼ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
                 if (CurrentPara.BoolExecParameter.Count > 0)
                     frm.ConstructionCopy = CurrentPara.BoolExecParameter[0];
 
+                // æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
+                if (CurrentPara.BoolExecParameter.Count > 1)
+                    frm.bNewData = CurrentPara.BoolExecParameter[1];
+
                 // ãƒ•ã‚©ãƒ¼ãƒ è¡¨ç¤º
                 frm.ShowDialog();
             }
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/OrderersMaster.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/OrderersMaster.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/OrderersMaster.cs	(revision 438)
@@ -10,10 +10,32 @@
     /// </summary>
     public class OrderersMaster
     {
+
+        #region å®šæ•°
+        /// æ³•äººæ ¼å��ç§°ä½�ç½®
+        public enum CorporateStatusPointDef
+        {
+            /// <summary>
+            /// 0:ç„¡
+            /// </summary>
+            None = 0,
+            /// <summary>
+            /// 1:å‰�
+            /// </summary>
+            Front,
+            /// <summary>
+            /// 2:å¾Œ
+            /// </summary>
+            Rear
+        }
+        #endregion
+
+        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+
         /// <summary>
         /// å¤‰æ›´æ™‚ã�¯ç™ºæ³¨è€…ç™»éŒ²ç”³è«‹ãƒ‡ãƒ¼ã‚¿ï¼ˆCostomerRegistï¼‰ã�¨é€£å‹•ã�•ã�›ã‚‹ã�“ã�¨
         /// </summary>
-        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
+
         private int         m_OrderCotegory = 0;	            // ç™ºæ³¨è€…åŒºåˆ†
         private int         m_OrderersCode = 0;	                // ç™ºæ³¨è€…ã‚³ãƒ¼ãƒ‰
         private int         m_DisplayOrder = 0;	                // è¡¨ç¤ºé †
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 438)
@@ -171,7 +171,7 @@
         private void btnDataEntry_Click(object sender, EventArgs e)
         {
             // Še�ˆ—�‹N“®
-            SubProcessExecute();
+            SubProcessExecute(0, 0, true);
 
             // �‰Šú•\Ž¦
             //InitDataLoad();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 438)
@@ -171,7 +171,7 @@
         /// �HŽ–ˆê——‚æ‚è‹N“®‚·‚éƒvƒ�ƒZƒX‘I‘ð�ˆ—�
         /// </summary>
         /// <param name="para_ConstructionCode"></param>
-        private void SubProcessExecute(int para_ConstructionCode = 0, int para_OrderNo = 0)
+        private void SubProcessExecute(int para_ConstructionCode = 0, int para_OrderNo = 0, bool bNewDataFlg = false)
         {
             try
             {
@@ -219,6 +219,14 @@
                     default:
                         break;
                 }
+                // �V‹Kƒf�[ƒ^�ì�¬Žž‚Íƒtƒ‰ƒO‚ð—§‚Ä‚é
+                if (bNewDataFlg)
+                {
+                    // ˆê‚Â–Ú‚Ìƒtƒ‰ƒO‚ÍƒRƒs�[ƒf�[ƒ^�ì�¬‚ÉŽg—p‚µ‚Ä‚¢‚é‚½‚ßƒ_ƒ~�[‚ð—§‚Ä‚é
+                    ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
+                    // “ñ‚Â–Ú‚É�V‹Kƒf�[ƒ^�ì�¬ƒtƒ‰ƒO‚ðƒZƒbƒg‚·‚é
+                    ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(bNewDataFlg);
+                }
             }
             catch (Exception ex)
             {
@@ -2243,6 +2251,51 @@
         }
         #endregion
 
+        #region •”��ƒ}ƒXƒ^‚ð�HŽ–�î•ñ‚Ì�HŽ–’S“–•”��‚Æ”äŠr‚·‚é‚©‚ð”»’è‚·‚é
+        /// <summary>
+        /// •”��ƒ}ƒXƒ^‚ð�HŽ–�î•ñ‚Ì�HŽ–’S“–•”��‚Æ”äŠr‚·‚é‚©‚ð”»’è‚·‚é
+        /// </summary>
+        /// <returns></returns>
+        private bool SetCompDepartment4Base()
+        {
+            try
+            {
+                bool bCompBase = false;
+                if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo)
+                    // �HŽ–�î•ñ“ü—Í
+                    bCompBase = true;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.EstimateInput)
+                    // �ÏŽZŒ©�Ï�‘“ü—Í
+                    bCompBase = true;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.EstimatePrint)
+                    // �ÏŽZŒ©�Ï�‘ˆó�ü
+                    bCompBase = true;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.EstimateBudget)
+                    // �ÏŽZ—\ŽZ�‘“ü—Í
+                    bCompBase = true;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget)
+                    // �HŽ–—\ŽZ�‘“ü—Í
+                    bCompBase = false;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry)
+                    // ’�•¶�‘“ü—Í
+                    bCompBase = false;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint)
+                    // ’�•¶�‘ˆó�ü
+                    bCompBase = false;
+                else if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.SafetyPatrol)
+                    // ˆÀ‘Sƒpƒgƒ��[ƒ‹�\�¿
+                    bCompBase = true;
+
+                return bCompBase;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
         #region •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚Ö•¶Žš‚ðƒZƒbƒg‚·‚é
@@ -2255,9 +2308,13 @@
                 int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
 
                 int nTargetCount = (int)numUDConstPro.Value;
+
+                // •”��ƒ}ƒXƒ^‚ð�HŽ–�î•ñ‚Ì�HŽ–’S“–•”��‚Æ”äŠr‚·‚é‚©‚ð”»’è‚·‚é
+                bool bCompBase = SetCompDepartment4Base();
+
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, bCompBase);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 438)
@@ -886,6 +886,11 @@
         private bool m_ConstructionCopy = false;
 
         /// <summary>
+        /// ƒf�[ƒ^�V‹K�ì�¬ƒtƒ‰ƒO
+        /// </summary>
+        private bool m_bNewData = false;
+        
+        /// <summary>
         /// �‰Šú‰»ƒtƒ‰ƒO
         /// </summary>
         private bool bInitFlg = true;
@@ -956,6 +961,15 @@
             set { m_EditLock = value; }
         }
 
+        /// <summary>
+        /// ƒf�[ƒ^�V‹K�ì�¬ƒtƒ‰ƒO
+        /// </summary>
+        public bool bNewData
+        {
+            get { return m_bNewData; }
+            set { m_bNewData = value; }
+        }
+
         // *-----* ‹¤’Ê�ˆ—��Ý’è *-----*
         /// <summary>
         /// ƒTƒuƒtƒH�[ƒ€ƒtƒ‰ƒO
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 438)
@@ -1189,7 +1189,6 @@
                 {
                     // �V‹Kƒf�[ƒ^•\Ž¦
                     DisplayNewData();
-
                     return true;
                 }
                 
@@ -2211,7 +2210,7 @@
             {
                 int nTarget = 0;
 
-                if (m_DspCtrl[(int)DspCnt.ConstructionPeriod].Visible)
+                if (CommonMotions.BasePeriodYear())
                 {
                     // �HŽ–Šú
                     nTarget = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text);
@@ -2255,7 +2254,7 @@
                 // ’S“–ŽÒƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
                 int nTargetCount = GetTargetYear();
-                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, DepartmentCode);
+                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, DepartmentCode, m_bNewData);
 
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 ArrayList workList = new ArrayList();
@@ -2410,7 +2409,7 @@
                 // ’S“–ŽÒƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 int nTargetCount = GetTargetYear();
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, 0);
+                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, 0, m_bNewData);
 
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 ArrayList workList = new ArrayList();
@@ -2510,7 +2509,7 @@
                 // ’S“–ŽÒƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 int nTargetCount = GetTargetYear();
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, TransferCode);
+                CommonMotions.CreateManCombBoxSQL(ref strSQL, nTargetCount, TransferCode, m_bNewData);
 
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 ArrayList workList = new ArrayList();
@@ -2551,7 +2550,7 @@
         /// •”��ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒf�[ƒ^Žæ“¾‚r‚p‚k�ì�¬
         /// </summary>
         /// <param name="strSQL"></param>
-        public static void CreateDepCombBoxSQL(ref StringBuilder strSQL, int nTargetCount)
+        public static void CreateDepCombBoxSQL(ref StringBuilder strSQL, int nTargetCount, bool bNewDataFlg = false)
         {
             try
             {
@@ -2649,11 +2648,15 @@
                 {   // ‘Î�Û‚ª�¡Šú‚Ì�ê�‡
                     strSQL.Append(" WHERE");
 
-                    // �í�œ‚³‚ê‚Ä‚¢‚È‚¢‚à‚Ì
-                    strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
                     DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false);
+                    strSQL.AppendFormat(" DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
 
-                    strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString());
+                    // �V‹K‚Ìƒf�[ƒ^‚Í�í�œŽÒ‚ð•\Ž¦‚µ‚È‚¢
+                    if (bNewDataFlg)
+                    {
+                        // �í�œ‚³‚ê‚Ä‚¢‚È‚¢‚à‚Ì
+                        strSQL.AppendFormat(" And A.DELETEFLG = {0}", (int)CommonDefine.DataDeleteDef.Exists);
+                    }
                 }
                 else
                 {   // ‘Î�Û‚ª‰ß‹Ž‚Ì�ê�‡
@@ -2689,7 +2692,7 @@
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 int nPeriod = GetTargetYear();
                 StringBuilder strSQL = new StringBuilder();
-                CreateDepCombBoxSQL(ref strSQL, nPeriod);
+                CreateDepCombBoxSQL(ref strSQL, nPeriod, m_bNewData);
 
                 ArrayList dmList = new ArrayList();
                 // •”��ƒ}ƒXƒ^“Ç�ž
@@ -3657,9 +3660,9 @@
         }
         #endregion
 
-        #region ‘ä’ Œ‹�‡Œã‚ÌƒXƒe�[ƒ^ƒX•Ï�X“¯Šú�ˆ—�
+        #region ‘�Œ¸�HŽ–‚ÌƒXƒe�[ƒ^ƒX•Ï�X“¯Šú�ˆ—�
         /// <summary>
-        /// ‘ä’ Œ‹�‡Œã‚ÌƒXƒe�[ƒ^ƒX•Ï�X“¯Šú�ˆ—�
+        /// ‘�Œ¸�HŽ–‚ÌƒXƒe�[ƒ^ƒX•Ï�X“¯Šú�ˆ—�
         /// </summary>
         /// <returns></returns>
         private bool SyncFluctuationData(IOConstructionBaseInfo cbiDB, int nStatus)
@@ -3686,6 +3689,9 @@
 
                 // “¯Šúƒf�[ƒ^‘I‘ð
                 frm.ConstructionCode = m_ConstructionCode;
+                // �ˆ—�‚ð‹N“®‚·‚é‚©‚Ìƒ`ƒFƒbƒN‚ð�s‚¤
+                if (!frm.ChkExec) return true;
+
                 DialogResult drRwt = frm.ShowDialog();
                 if (drRwt == DialogResult.Cancel) return true;
 
@@ -5571,6 +5577,9 @@
                     SetProductRadioButton(rdbStatus6, rdbStatus7);      // Ž{�HŠ®—¹
                     SetProductRadioButton(rdbStatus4, rdbStatus9);      // �¿‹��€”õ
                     SetProductRadioButton(rdbStatus6, rdbStatus10);     // �¿‹�Šm”F
+
+                    // �³”FŠm”Fƒ{ƒ^ƒ“
+                    btnApprovalList.Text = "Šm�@”F�@�ó�@‹µ";
                     break;
                 default:
                     break;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 438)
@@ -1634,7 +1634,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.designer.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.designer.cs	(revision 438)
@@ -36,6 +36,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnDataSelect = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
@@ -356,7 +357,7 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column5.Frozen = true;
             this.Column5.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
@@ -368,7 +369,7 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column6.Frozen = true;
             this.Column6.HeaderText = "å·¥äº‹æ‹…å½“è€…";
@@ -380,6 +381,8 @@
             // 
             // Column7
             // 
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
             this.Column7.Frozen = true;
             this.Column7.HeaderText = "æ–½å·¥çŠ¶æ…‹";
             this.Column7.Name = "Column7";
@@ -428,13 +431,6 @@
         private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBox1;
         private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvMaster;
         private System.Windows.Forms.Button btnDataUpDate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.RadioButton radioButton2;
         private System.Windows.Forms.RadioButton radioButton1;
@@ -445,5 +441,12 @@
         private System.Windows.Forms.ComboBox cmbConstructionPerson;
         private System.Windows.Forms.ComboBox cmbDepartment;
         private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs	(revision 438)
@@ -306,14 +306,17 @@
         {
             try
             {
-                string strRet = string.Empty;
+                StringBuilder strRet = new StringBuilder();
 
                 int DepartmentCode = GetDepartmentCode();
-                if (DepartmentCode == 0) return strRet;
+                if (DepartmentCode == 0) return string.Empty;
 
-                strRet += string.Format(" AND (D.DEPARTMENTCODE = {0})", DepartmentCode);
+                if (radioButton1.Checked)
+                    strRet.AppendFormat(" AND (A.SalesDepCode = {0})", DepartmentCode);
+                else
+                    strRet.AppendFormat(" AND (A.ConstrDepCode = {0} Or A.ConstrSubDepCode ={0} Or A.ConstrInstrDepCode = {0})", DepartmentCode);
 
-                return strRet;
+                return strRet.ToString();
             }
             catch (Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistAuxiliary.cs	(revision 438)
@@ -1245,9 +1245,9 @@
                 cmbDivision.SelectedValue = OrderRec.OrderCotegory;
                 m_dispControl[(int)DispCtrl.CorporateStatusName].Text = OrderRec.CorporateStatusName;
 
-                if (OrderRec.CorporateStatusPoint == 0) rdbPoint1.Checked = true;
-                else if (OrderRec.CorporateStatusPoint == 1) rdbPoint2.Checked = true;
-                else if (OrderRec.CorporateStatusPoint == 2) rdbPoint3.Checked = true;
+                if (OrderRec.CorporateStatusPoint == (int)OrderersMaster.CorporateStatusPointDef.None) rdbPoint1.Checked = true;
+                else if (OrderRec.CorporateStatusPoint == (int)OrderersMaster.CorporateStatusPointDef.Front) rdbPoint2.Checked = true;
+                else if (OrderRec.CorporateStatusPoint == (int)OrderersMaster.CorporateStatusPointDef.Rear) rdbPoint3.Checked = true;
 
                 if (OrderRec.OrderFlg == 0) radioButton1.Checked = true;
                 else radioButton2.Checked = true;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 438)
@@ -925,7 +925,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs	(revision 438)
@@ -1002,7 +1002,7 @@
 
                 // éƒ¨ç½²ãƒžã‚¹ã‚¿ã‚’æ¤œç´¢ã�™ã‚‹
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // éƒ¨ç½²ãƒžã‚¹ã‚¿èª­è¾¼
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs	(revision 438)
@@ -855,7 +855,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, true);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs	(revision 438)
@@ -675,6 +675,12 @@
                 // •\Ž¦ƒNƒŠƒA
                 ClearDisplay();
 
+                // �\�¿�E�³”F•\Ž¦�ˆ—�
+                ClsCommonApproval.CtrlConstrAppPanel((int)ClsExcute.ApprovalListNo.EstimateBudgetApproval
+                                                        , m_ConstructionCode
+                                                        , 1
+                                                        , m_ApplPnlList);
+
                 // ƒwƒbƒ_�[‚Ì•\Ž¦
                 if (!DispHeader()) return;
 
@@ -700,12 +706,6 @@
                 CreateProcessContextMenu(m_SubForm);
                 // *-----* �ˆ—�ˆÚ“®ƒ{ƒ^ƒ“�Ý’è *-----*
 
-                // �\�¿�E�³”F•\Ž¦�ˆ—�
-                ClsCommonApproval.CtrlConstrAppPanel((int)ClsExcute.ApprovalListNo.EstimateBudgetApproval
-                                                        , m_ConstructionCode
-                                                        , 1
-                                                        , m_ApplPnlList);
-
                 // •Ï�Xƒtƒ‰ƒOOFF
                 m_bChengeAns = false;
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs	(revision 438)
@@ -3468,6 +3468,22 @@
             FrmApprovalScreen frm = new FrmApprovalScreen();
             try
             {
+                bool bDispMsg = true;
+                // ç©�ç®—äºˆç®—ãƒ‡ãƒ¼ã‚¿ã�Œå�Œã�˜ã‚‚ã�®ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯
+                if (!CheckBudgetData())
+                {
+                    if (MessageBox.Show("è¡¨ç¤ºå†…å®¹ã�§ç™»éŒ²ã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€�æ›´æ–°ã�—ã�¾ã�™ã�‹ï¼Ÿ", "ç™»éŒ²ç¢ºèª�"
+                                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
+                    m_bChengeAns = true;
+                    bDispMsg = false;
+                }
+
+                // ãƒ‡ãƒ¼ã‚¿å¤‰æ›´æœ‰æ™‚ã�¯ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
+                if (m_bChengeAns)
+                {
+                    if (!DataEntryProcess(bDispMsg)) return false;
+                }
+
                 if (MessageBox.Show("ç¢ºèª�å‡¦ç�†ã‚’è¡Œã�„ã�¾ã�™ã€�ç¢ºèª�å¾Œã�¯å¤‰æ›´ã�§ã��ã�¾ã�›ã‚“ã€‚\r\nã‚ˆã‚�ã�—ã�„ã�§ã�™ã�‹ï¼Ÿ", "å‡¦ç�†ç¢ºèª�"
                                     , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 438)
@@ -1245,6 +1245,12 @@
             //ƒRƒ“ƒgƒ��[ƒ‹ƒIƒuƒWƒFƒNƒgŽæ“¾
             SetDisplayObject();
 
+            // �\�¿�E�³”F•\Ž¦�ˆ—�
+            ClsCommonApproval.CtrlConstrAppPanel((int)ClsExcute.ApprovalListNo.EstimateApproval
+                                                    , m_ConstructionCode
+                                                    , CommonDefine.s_Default_OrderNo
+                                                    , m_ApplPnlList);
+
             // �‰Šú•\Ž¦
             if (!InitDataLoad()) return;
 
@@ -1267,12 +1273,6 @@
             CreateProcessContextMenu(m_SubForm);
             // *-----* �ˆ—�ˆÚ“®ƒ{ƒ^ƒ“�Ý’è *-----*
 
-            // �\�¿�E�³”F•\Ž¦�ˆ—�
-            ClsCommonApproval.CtrlConstrAppPanel((int)ClsExcute.ApprovalListNo.EstimateApproval
-                                                    , m_ConstructionCode
-                                                    , CommonDefine.s_Default_OrderNo
-                                                    , m_ApplPnlList);
-
             // 2‰æ–Êƒ‚�[ƒh‚Ì�e‰æ–Ê‚Í�³”FŠÖ˜A‚ð‚·‚×‚Ä•\Ž¦‚µ‚È‚¢
             if (m_DualModeFlg)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 438)
@@ -6651,8 +6651,18 @@
         private bool OneApprovalProcess()
         {
             FrmApprovalScreen frm = new FrmApprovalScreen();
+            IOEstimateData EstimateDB = new IOEstimateData();
             try
             {
+                // ç©�ç®—äºˆç®—ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�„å ´å�ˆã�¯ç™»éŒ²ã�™ã‚‹
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(EstimateDB.CreatePrimarykeyString(m_ConstructionCode));
+                EstimateData DataRec = new EstimateData();
+                if (!EstimateDB.SelectAction(strSQL.ToString(), ref DataRec)) m_bChengeAns = true;
+
+                // ãƒ‡ãƒ¼ã‚¿å¤‰æ›´æœ‰æ™‚ã�¯ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
+                if (m_bChengeAns) if (!DataEntryProcess()) return false;
+
                 if (MessageBox.Show("ç¢ºèª�å‡¦ç�†ã‚’è¡Œã�„ã�¾ã�™ã€�ç¢ºèª�å¾Œã�¯å¤‰æ›´ã�§ã��ã�¾ã�›ã‚“ã€‚\r\nã‚ˆã‚�ã�—ã�„ã�§ã�™ã�‹ï¼Ÿ", "å‡¦ç�†ç¢ºèª�"
                                     , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
 
@@ -6686,6 +6696,7 @@
             {
                 // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
                 frm.Close(); frm.Dispose(); frm = null;
+                EstimateDB.close(); EstimateDB = null;
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs	(revision 438)
@@ -286,10 +286,13 @@
                 StringBuilder strRet = new StringBuilder();
 
                 int DepartmentCode = GetDepartmentCode();
-                if (DepartmentCode == 0) return strRet.ToString();
-                    
-                strRet.AppendFormat(" AND (C.DEPARTMENTCODE = {0} OR D.DEPARTMENTCODE = {0})", DepartmentCode);
+                if (DepartmentCode == 0) return string.Empty;
 
+                if (radioButton1.Checked)
+                    strRet.AppendFormat(" AND (A.SalesDepCode = {0})", DepartmentCode);
+                else
+                    strRet.AppendFormat(" AND (A.ConstrDepCode = {0} Or A.ConstrSubDepCode ={0} Or A.ConstrInstrDepCode = {0})", DepartmentCode);
+
                 return strRet.ToString();
             }
             catch (Exception ex)
@@ -461,7 +464,7 @@
                     }
 
                     // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
-                    //strSQL.Append(GetDepartmentString());
+                    strSQL.Append(GetDepartmentString());
 
                     // ’S“–ŽÒ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
                     strSQL.Append(GetPersonString());
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 438)
@@ -1034,7 +1034,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs	(revision 438)
@@ -931,7 +931,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs	(revision 438)
@@ -1038,7 +1038,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInputList/FrmReqInputListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInputList/FrmReqInputListAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInputList/FrmReqInputListAuxiliary.cs	(revision 438)
@@ -27,7 +27,7 @@
     partial class FrmReqInputList
     {
         #region ’è�”
-       
+
         #region Žæ“¾—ñ’è‹`
         /// <summary>
         /// Žæ“¾—ñ’è‹`
@@ -54,22 +54,22 @@
             RequestValue,
             OrderValue,
         }
-    #endregion
+        #endregion
 
-    #endregion
+        #endregion
 
-    #region •Ï�”
-    #endregion
+        #region •Ï�”
+        #endregion
 
-    #region ƒvƒ�ƒpƒeƒB
-    #endregion
+        #region ƒvƒ�ƒpƒeƒB
+        #endregion
 
-    #region ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’Ç‰Á�ˆ—�
-    /// <summary>
-    /// ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’Ç‰Á�ˆ—�
-    /// </summary>
-    /// <param name="EventCon"></param>
-    private void SetControlEvent()
+        #region ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’Ç‰Á�ˆ—�
+        /// <summary>
+        /// ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’Ç‰Á�ˆ—�
+        /// </summary>
+        /// <param name="EventCon"></param>
+        private void SetControlEvent()
         {
             try
             {
@@ -282,14 +282,17 @@
         {
             try
             {
-                string strRet = string.Empty;
+                StringBuilder strRet = new StringBuilder();
 
                 int DepartmentCode = GetDepartmentCode();
-                if (DepartmentCode == 0) return strRet;
-                    
-                strRet += string.Format(" AND (C.DEPARTMENTCODE = {0} OR D.DEPARTMENTCODE = {0})", DepartmentCode);
+                if (DepartmentCode == 0) return string.Empty;
 
-                return strRet;
+                if (radioButton1.Checked)
+                    strRet.AppendFormat(" AND (A.SalesDepCode = {0})", DepartmentCode);
+                else
+                    strRet.AppendFormat(" AND (A.ConstrDepCode = {0} Or A.ConstrSubDepCode ={0} Or A.ConstrInstrDepCode = {0})", DepartmentCode);
+
+                return strRet.ToString();
             }
             catch (Exception ex)
             {
@@ -317,7 +320,7 @@
                 int Status2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Žó�@�@’�")).Key;
                 int Status3 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
 
-                string[] strLJoin = new string[]{ " LEFT JOIN", " INNER JOIN" };
+                string[] strLJoin = new string[] { " LEFT JOIN", " INNER JOIN" };
 
                 strSQL.Append("SELECT * FROM (");
                 for (int i = 0; i < 2; i++)
@@ -370,7 +373,7 @@
                         strSQL.AppendFormat("      WHERE CA.CONSTRUCTIONPERIOD = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE", numUDConstPro.Value);
                     else
                         strSQL.AppendFormat("      WHERE CA.ConstructionYear = {0}) C ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE", numUDConstPro.Value);
-                        
+
                     strSQL.Append(" LEFT JOIN (SELECT DA.CONSTRUCTIONCODE, DA.CONSTRUCTIONPERSONCODE PERSONCODE, DB.PERSONNAME PERSONNAME,");
                     strSQL.Append("                   ChgDB.DEPARTMENTCODE DEPARTMENTCODE, ChgDB.DepartmentName DEPARTMENTNAME,");
                     strSQL.Append("                   DB.DISPLAYORDER MANDISPORDER, DC.DISPLAYORDER DEPDISPORDER");
@@ -400,7 +403,7 @@
                     strSQL.Append(" Inner Join constructionledger As JB On JB.ConstructionCode = JA.REQCONSTRUCTIONCODE");
                     strSQL.Append(" Group By JA.REQCONSTRUCTIONCODE) AS J");
                     strSQL.Append(" ON J.ReqCode = A.CONSTRUCTIONCODE");
-            
+
                     if (CommonMotions.BasePeriodYear())
                         strSQL.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                     else
@@ -414,7 +417,8 @@
                     strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
 
                     strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG != {0}", Status3);
-                    if (i == 0) {
+                    if (i == 0)
+                    {
                         switch (m_ExecuteSubFlg)
                         {
                             case (int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling:
@@ -894,11 +898,11 @@
                 loc2.X = label2.Location.X;
                 radioButton1.Location = loc1;
                 radioButton2.Location = loc2;
-                
+
                 Point loc3 = label3.Location;
                 loc3.X = loc1.X + radioButton1.Width + 10;
                 label3.Location = loc3;
-                
+
                 Point loc4 = cmbConstructionPerson.Location;
                 loc4.X = label3.Location.X + label3.Width + 10;
                 cmbConstructionPerson.Location = loc4;
@@ -947,7 +951,7 @@
                 int nTargetCount = (int)numUDConstPro.Value;
                 // •”��ƒ}ƒXƒ^‚ðŒŸ�õ‚·‚é
                 StringBuilder strSQL = new StringBuilder();
-                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount);
+                CommonMotions.CreateDepCombBoxSQL(ref strSQL, nTargetCount, false);
 
                 // •”��ƒ}ƒXƒ^“Ç�ž
                 ArrayList arList = new ArrayList();
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs	(revision 438)
@@ -647,7 +647,7 @@
                 int SelPerson = CommonMotions.cnvInt(comboBox3.SelectedValue);
                 int SelDivision = CommonMotions.cnvInt(comboBox4.SelectedValue);
                 int SelOrderer = CommonMotions.cnvInt(comboBox5.SelectedValue);
-                int nNotStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
+                int nEndStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("�¿‹�Šm”F")).Key;
 
                 sql.Append("select");
 
@@ -708,7 +708,7 @@
                 else
                     sql.AppendFormat(" AND C1.ConstructionYear = {0}", numericUpDown2.Value);
 
-                sql.AppendFormat(" AND C1.ConstructionStatusFlg != {0}", nNotStatus);
+                sql.AppendFormat(" AND C1.ConstructionStatusFlg = {0}", nEndStatus);
 
                 if (SelMonth != 0) sql.AppendFormat(" AND A1.REQUESTMONTH = {0}", SelMonth);
                 if (SelDepartment != 0) sql.AppendFormat(" AND E1.DepartmentCode = {0}", SelDepartment);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs	(revision 438)
@@ -62,6 +62,9 @@
             {
                 m_EventLock = true;
 
+                // �³”F•\Ž¦�§Œä�ˆ—�
+                DispApprovalControl();
+
                 // ƒwƒbƒ_�[ƒZƒbƒg
                 if (!SetHeaderData()) return;
                 // –¾�×ƒwƒbƒ_•\Ž¦�ˆ—�
@@ -68,9 +71,6 @@
                 SetDetailHeaderData(bInit);
                 // ƒOƒŠƒbƒh•\Ž¦
                 SetGridData();
-
-                // �³”F•\Ž¦�§Œä�ˆ—�
-                DispApprovalControl();
                 
                 m_EventLock = false;
                 m_DataChangeFlg = false;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartment.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartment.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartment.cs	(revision 438)
@@ -500,7 +500,13 @@
         /// <param name="e"></param>
         private void dgvExpenses_CellValidated(object sender, DataGridViewCellEventArgs e)
         {
-            DataGridViewTextBoxCell wrkTxt = (DataGridViewTextBoxCell)dgvExpenses[e.ColumnIndex, e.RowIndex];
+            DataGridViewTextBoxCell wrkTxt = (DataGridViewTextBoxCell)dgvExpenses[2, e.RowIndex];
+            // çµŒè²»å��ã�Œè¡¨ç¤ºã�•ã‚Œã�¦ã�„ã�ªã�‘ã‚Œã�°ã‚¯ãƒªã‚¢
+            if (CommonMotions.cnvString(dgvExpenses[1, e.RowIndex].Value).Length < 1)
+            {
+                wrkTxt.Value = string.Empty;
+                return;
+            }
 
             if (wrkTxt.ReadOnly) return;
             wrkTxt.Value = CommonMotions.cnvDouble(wrkTxt.Value).ToString("0.00");
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartmentAux.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartmentAux.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Department/FrmDepartmentAux.cs	(revision 438)
@@ -194,7 +194,7 @@
                 switch (ProductDefine.ProductType)
                 {
                     case (int)ProductDefine.ProductTypeDef.Originals:
-                        // é€šå¸¸ç‰ˆ
+                        // ----- ã‚ªãƒªã‚¸ãƒŠãƒ«ç‰ˆ
                         // è¡Œå‹•äºˆå®šè¡¨ç¤º
                         InitActionScheduleDspCombBox();
                         // äººå“¡é…�ç½®è¡¨ç¤º
@@ -201,13 +201,22 @@
                         InitStaffAssignDspCombBox();
                         break;
                     case (int)ProductDefine.ProductTypeDef.MassProductionType1:
-                        // è£½å“�ç‰ˆ
+                        // ----- è£½å“�ç‰ˆ
+                        // è¡Œå‹•äºˆå®šè¡¨ç¤º
                         label3.Visible = false;
                         cmbActionScheduleDsp.Visible = false;
+                        cmbActionScheduleDsp.SelectedValue = (int)DepartmentMaster.ActionScheduleFlgDef.NotDisplay;
+                        // äººå“¡é…�ç½®è¡¨ç¤º
                         label4.Visible = false;
                         cmbStaStaffAssignDsp.Visible = false;
-                        cmbActionScheduleDsp.SelectedValue = (int)DepartmentMaster.ActionScheduleFlgDef.NotDisplay;
-                        cmbStaStaffAssignDsp.SelectedValue = (int)DepartmentMaster.StaffAssignFlgDef.NotDisplay;
+                        cmbStaStaffAssignDsp.SelectedValue = (int)DepartmentMaster.StaffAssignFlgDef.OnDisplay;
+                        // æ–°è¦�ä½œæˆ�
+                        btnDataLineEntry.Visible = false;
+                        // å‰Šé™¤
+                        btnDataDelete.Visible = false;
+                        // UpDown
+                        btnDispUp.Visible = false;
+                        btnDispDown.Visible = false;
                         break;
                     default:
                         break;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.cs	(revision 438)
@@ -921,15 +921,15 @@
                 work.DisplayOrder = 0;
 
                 // æ³•äººæ ¼å��ç§°ä½�ç½®
-                if (rdbPoint1.Checked == true) work.CorporateStatusPoint = 0;
-                else if (rdbPoint2.Checked == true) work.CorporateStatusPoint = 1;
-                else if (rdbPoint3.Checked == true) work.CorporateStatusPoint = 2;
+                if (rdbPoint1.Checked == true) work.CorporateStatusPoint = (int)OrderersMaster.CorporateStatusPointDef.None;
+                else if (rdbPoint2.Checked == true) work.CorporateStatusPoint = (int)OrderersMaster.CorporateStatusPointDef.Front;
+                else if (rdbPoint3.Checked == true) work.CorporateStatusPoint = (int)OrderersMaster.CorporateStatusPointDef.Rear;
 
                 if (radioButton1.Checked == true) work.OrderFlg = 0;
                 else if (radioButton2.Checked == true) work.OrderFlg = 1;
 
                 // æ³•äººæ ¼å��ç§°
-                if (work.CorporateStatusPoint != 0)
+                if (work.CorporateStatusPoint != (int)OrderersMaster.CorporateStatusPointDef.None)
                     if (m_dispControl[(int)DispCtrl.CorporateStatusName].Text.Length != 0)
                         work.CorporateStatusName = m_dispControl[(int)DispCtrl.CorporateStatusName].Text;
 
@@ -1158,9 +1158,9 @@
 
                 m_dispControl[(int)DispCtrl.CorporateStatusName].Text = odList.CorporateStatusName.ToString();      // æ³•äººæ ¼å��ç§°
 
-                if (odList.CorporateStatusPoint == 0) rdbPoint1.Checked = true;
-                else if (odList.CorporateStatusPoint == 1) rdbPoint2.Checked = true;
-                else if (odList.CorporateStatusPoint == 2) rdbPoint3.Checked = true;
+                if (odList.CorporateStatusPoint == (int)OrderersMaster.CorporateStatusPointDef.None) rdbPoint1.Checked = true;
+                else if (odList.CorporateStatusPoint == (int)OrderersMaster.CorporateStatusPointDef.Front) rdbPoint2.Checked = true;
+                else if (odList.CorporateStatusPoint == (int)OrderersMaster.CorporateStatusPointDef.Rear) rdbPoint3.Checked = true;
 
                 if (odList.OrderFlg == 0) radioButton1.Checked = true;
                 else if (odList.OrderFlg == 1) radioButton2.Checked = true;
@@ -1180,7 +1180,7 @@
                 m_dispControl[(int)DispCtrl.MailAddress].Text = odList.MailAddress.ToString();
                 m_dispControl[(int)DispCtrl.Note].Text = odList.Note.ToString();
 
-                cmbChangeOrdersDivision.SelectedValue = odList.OrderCotegory;
+                //cmbChangeOrdersDivision.SelectedValue = odList.OrderCotegory;
 
                 if (odList.DeleteFlg != (int)CommonDefine.DataDeleteDef.Exists)
                 {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.cs	(revision 438)
@@ -337,6 +337,9 @@
             // å›ºå®šãƒ©ãƒ™ãƒ«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«åˆ�æœŸå‡¦ç�†
             InitFixControl();
 
+            // åˆ�æœŸæ™‚ã‚¹ã‚¿ã‚¤ãƒ«è¨­å®š
+            SetInitStyle();
+
             // åˆ�æœŸè¡¨ç¤º
             DispGridData();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs	(revision 438)
@@ -28,20 +28,20 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
@@ -60,7 +60,6 @@
             this.label8 = new System.Windows.Forms.Label();
             this.txtInput2 = new System.Windows.Forms.TextBox();
             this.label9 = new System.Windows.Forms.Label();
-            this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.txtInput4 = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -76,24 +75,39 @@
             this.label13 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.label16 = new System.Windows.Forms.Label();
-            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput5 = new System.Windows.Forms.TextBox();
             this.txtInput8 = new System.Windows.Forms.TextBox();
             this.txtInput9 = new System.Windows.Forms.TextBox();
-            this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.label17 = new System.Windows.Forms.Label();
-            this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label12 = new System.Windows.Forms.Label();
+            this.btnRefDepDel = new System.Windows.Forms.Button();
+            this.btnRefDepAdd = new System.Windows.Forms.Button();
+            this.BtnDepartMentAdd = new System.Windows.Forms.Button();
+            this.BtnDepartMentDel = new System.Windows.Forms.Button();
+            this.txtInput13 = new System.Windows.Forms.TextBox();
+            this.label24 = new System.Windows.Forms.Label();
+            this.lblSecRange = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
             this.label18 = new System.Windows.Forms.Label();
             this.lblSecRank = new System.Windows.Forms.Label();
-            this.lblSecRange = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
+            this.label17 = new System.Windows.Forms.Label();
             this.label21 = new System.Windows.Forms.Label();
             this.txtInput11 = new System.Windows.Forms.TextBox();
             this.label22 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
             this.label15 = new System.Windows.Forms.Label();
             this.txtInput12 = new System.Windows.Forms.TextBox();
             this.label23 = new System.Windows.Forms.Label();
+            this.lblSecurtyManegement = new System.Windows.Forms.Label();
+            this.rdbMode2 = new System.Windows.Forms.RadioButton();
+            this.rdbMode1 = new System.Windows.Forms.RadioButton();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.label19 = new System.Windows.Forms.Label();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.btnChrgToEmp = new System.Windows.Forms.Button();
+            this.btnEmpToChrg = new System.Windows.Forms.Button();
+            this.label20 = new System.Windows.Forms.Label();
+            this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
+            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -102,25 +116,11 @@
             this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.btnRefDepDel = new System.Windows.Forms.Button();
-            this.btnRefDepAdd = new System.Windows.Forms.Button();
             this.dgvAssignment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BtnDepartMentAdd = new System.Windows.Forms.Button();
-            this.BtnDepartMentDel = new System.Windows.Forms.Button();
-            this.txtInput13 = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.lblSecurtyManegement = new System.Windows.Forms.Label();
-            this.rdbMode2 = new System.Windows.Forms.RadioButton();
-            this.rdbMode1 = new System.Windows.Forms.RadioButton();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.label19 = new System.Windows.Forms.Label();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.btnChrgToEmp = new System.Windows.Forms.Button();
-            this.btnEmpToChrg = new System.Windows.Forms.Button();
-            this.label20 = new System.Windows.Forms.Label();
+            this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -131,11 +131,11 @@
             this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAssignment)).BeginInit();
-            this.panel2.SuspendLayout();
-            this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.SuspendLayout();
             // 
@@ -296,19 +296,7 @@
             this.tableLayoutPanel1.Controls.Add(this.txtInput8, 1, 16);
             this.tableLayoutPanel1.Controls.Add(this.txtInput9, 1, 17);
             this.tableLayoutPanel1.Controls.Add(this.cmbLedgerFlg, 1, 18);
-            this.tableLayoutPanel1.Controls.Add(this.label17, 0, 19);
-            this.tableLayoutPanel1.Controls.Add(this.cmbSecManage, 1, 19);
-            this.tableLayoutPanel1.Controls.Add(this.label18, 0, 20);
-            this.tableLayoutPanel1.Controls.Add(this.lblSecRank, 1, 20);
-            this.tableLayoutPanel1.Controls.Add(this.lblSecRange, 1, 21);
-            this.tableLayoutPanel1.Controls.Add(this.label4, 0, 21);
-            this.tableLayoutPanel1.Controls.Add(this.label21, 0, 22);
-            this.tableLayoutPanel1.Controls.Add(this.txtInput11, 1, 22);
-            this.tableLayoutPanel1.Controls.Add(this.label22, 2, 22);
             this.tableLayoutPanel1.Controls.Add(this.label12, 0, 24);
-            this.tableLayoutPanel1.Controls.Add(this.label15, 0, 23);
-            this.tableLayoutPanel1.Controls.Add(this.txtInput12, 1, 23);
-            this.tableLayoutPanel1.Controls.Add(this.label23, 2, 23);
             this.tableLayoutPanel1.Controls.Add(this.dgvSalary, 1, 7);
             this.tableLayoutPanel1.Controls.Add(this.dgvRefDepartment, 1, 24);
             this.tableLayoutPanel1.Controls.Add(this.cmbRefDepartment, 1, 27);
@@ -319,6 +307,18 @@
             this.tableLayoutPanel1.Controls.Add(this.BtnDepartMentDel, 3, 11);
             this.tableLayoutPanel1.Controls.Add(this.txtInput13, 1, 11);
             this.tableLayoutPanel1.Controls.Add(this.label24, 0, 11);
+            this.tableLayoutPanel1.Controls.Add(this.lblSecRange, 1, 23);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 0, 23);
+            this.tableLayoutPanel1.Controls.Add(this.label18, 0, 22);
+            this.tableLayoutPanel1.Controls.Add(this.lblSecRank, 1, 22);
+            this.tableLayoutPanel1.Controls.Add(this.label17, 0, 21);
+            this.tableLayoutPanel1.Controls.Add(this.cmbSecManage, 1, 21);
+            this.tableLayoutPanel1.Controls.Add(this.label21, 0, 19);
+            this.tableLayoutPanel1.Controls.Add(this.txtInput11, 1, 19);
+            this.tableLayoutPanel1.Controls.Add(this.label22, 2, 19);
+            this.tableLayoutPanel1.Controls.Add(this.label15, 0, 20);
+            this.tableLayoutPanel1.Controls.Add(this.txtInput12, 1, 20);
+            this.tableLayoutPanel1.Controls.Add(this.label23, 2, 20);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(1, 1);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 29;
@@ -442,18 +442,6 @@
             this.label9.Text = "å°±æ¥­çµ‚äº†æ—¥";
             this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // txtInput3
-            // 
-            this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput3.Location = new System.Drawing.Point(148, 111);
-            this.txtInput3.MaxLength = 11;
-            this.txtInput3.Name = "txtInput3";
-            this.txtInput3.Size = new System.Drawing.Size(139, 23);
-            this.txtInput3.TabIndex = 3;
-            this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
-            this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated);
-            // 
             // txtInput4
             // 
             this.txtInput4.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -652,19 +640,6 @@
             this.label16.Text = "å�°å¸³è¨ˆç®—å¯¾è±¡";
             this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // cmbDepartment
-            // 
-            this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 3);
-            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDepartment.FormattingEnabled = true;
-            this.cmbDepartment.Location = new System.Drawing.Point(148, 362);
-            this.cmbDepartment.Name = "cmbDepartment";
-            this.cmbDepartment.Size = new System.Drawing.Size(429, 24);
-            this.cmbDepartment.TabIndex = 8;
-            this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // txtInput5
             // 
             this.txtInput5.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -700,79 +675,121 @@
             this.txtInput9.TabIndex = 12;
             this.txtInput9.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // cmbLedgerFlg
+            // label12
             // 
-            this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbLedgerFlg.FormattingEnabled = true;
-            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 647);
-            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
-            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
-            this.cmbLedgerFlg.TabIndex = 13;
-            this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange);
+            this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label12.ForeColor = System.Drawing.Color.Black;
+            this.label12.Location = new System.Drawing.Point(3, 855);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(139, 25);
+            this.label12.TabIndex = 30;
+            this.label12.Text = "å�‚ç…§éƒ¨ç½²";
+            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label17
+            // btnRefDepDel
             // 
-            this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label17.ForeColor = System.Drawing.Color.Black;
-            this.label17.Location = new System.Drawing.Point(3, 680);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(139, 25);
-            this.label17.TabIndex = 30;
-            this.label17.Text = "æ©Ÿå¯†åŒºåˆ†";
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.btnRefDepDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnRefDepDel.BackColor = System.Drawing.Color.Red;
+            this.btnRefDepDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnRefDepDel.ForeColor = System.Drawing.Color.White;
+            this.btnRefDepDel.Location = new System.Drawing.Point(438, 998);
+            this.btnRefDepDel.Name = "btnRefDepDel";
+            this.btnRefDepDel.Size = new System.Drawing.Size(139, 29);
+            this.btnRefDepDel.TabIndex = 33;
+            this.btnRefDepDel.TabStop = false;
+            this.btnRefDepDel.Text = "å�‚ç…§éƒ¨ç½²å‰Šé™¤";
+            this.btnRefDepDel.UseVisualStyleBackColor = false;
+            this.btnRefDepDel.Click += new System.EventHandler(this.btnRefDepDel_Click);
             // 
-            // cmbSecManage
+            // btnRefDepAdd
             // 
-            this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2);
-            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbSecManage.FormattingEnabled = true;
-            this.cmbSecManage.Location = new System.Drawing.Point(148, 682);
-            this.cmbSecManage.Name = "cmbSecManage";
-            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
-            this.cmbSecManage.TabIndex = 14;
-            this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged);
-            this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange);
+            this.btnRefDepAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnRefDepAdd.BackColor = System.Drawing.Color.Green;
+            this.btnRefDepAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnRefDepAdd.ForeColor = System.Drawing.Color.White;
+            this.btnRefDepAdd.Location = new System.Drawing.Point(293, 998);
+            this.btnRefDepAdd.Name = "btnRefDepAdd";
+            this.btnRefDepAdd.Size = new System.Drawing.Size(139, 29);
+            this.btnRefDepAdd.TabIndex = 32;
+            this.btnRefDepAdd.TabStop = false;
+            this.btnRefDepAdd.Text = "å�‚ç…§éƒ¨ç½²è¿½åŠ ";
+            this.btnRefDepAdd.UseVisualStyleBackColor = false;
+            this.btnRefDepAdd.Click += new System.EventHandler(this.btnRefDepAdd_Click);
             // 
-            // label18
+            // BtnDepartMentAdd
             // 
-            this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label18.ForeColor = System.Drawing.Color.Black;
-            this.label18.Location = new System.Drawing.Point(3, 715);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(139, 25);
-            this.label18.TabIndex = 30;
-            this.label18.Text = "ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£åŒºåˆ†";
-            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.BtnDepartMentAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.BtnDepartMentAdd.BackColor = System.Drawing.Color.Green;
+            this.BtnDepartMentAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.BtnDepartMentAdd.ForeColor = System.Drawing.Color.White;
+            this.BtnDepartMentAdd.Location = new System.Drawing.Point(293, 393);
+            this.BtnDepartMentAdd.Name = "BtnDepartMentAdd";
+            this.BtnDepartMentAdd.Size = new System.Drawing.Size(139, 29);
+            this.BtnDepartMentAdd.TabIndex = 32;
+            this.BtnDepartMentAdd.TabStop = false;
+            this.BtnDepartMentAdd.Text = "é…�å±žè¿½åŠ ";
+            this.BtnDepartMentAdd.UseVisualStyleBackColor = false;
+            this.BtnDepartMentAdd.Click += new System.EventHandler(this.BtnDepartMentAdd_Click);
             // 
-            // lblSecRank
+            // BtnDepartMentDel
             // 
-            this.lblSecRank.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lblSecRank.BackColor = System.Drawing.SystemColors.Window;
-            this.tableLayoutPanel1.SetColumnSpan(this.lblSecRank, 2);
-            this.lblSecRank.Location = new System.Drawing.Point(148, 716);
-            this.lblSecRank.Name = "lblSecRank";
-            this.lblSecRank.Size = new System.Drawing.Size(284, 23);
-            this.lblSecRank.TabIndex = 15;
-            this.lblSecRank.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.BtnDepartMentDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.BtnDepartMentDel.BackColor = System.Drawing.Color.Red;
+            this.BtnDepartMentDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.BtnDepartMentDel.ForeColor = System.Drawing.Color.White;
+            this.BtnDepartMentDel.Location = new System.Drawing.Point(438, 393);
+            this.BtnDepartMentDel.Name = "BtnDepartMentDel";
+            this.BtnDepartMentDel.Size = new System.Drawing.Size(139, 29);
+            this.BtnDepartMentDel.TabIndex = 33;
+            this.BtnDepartMentDel.TabStop = false;
+            this.BtnDepartMentDel.Text = "é…�å±žå±¥æ­´å‰Šé™¤";
+            this.BtnDepartMentDel.UseVisualStyleBackColor = false;
+            this.BtnDepartMentDel.Click += new System.EventHandler(this.BtnDepartMentDel_Click);
             // 
+            // txtInput13
+            // 
+            this.txtInput13.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput13.Location = new System.Drawing.Point(148, 396);
+            this.txtInput13.MaxLength = 11;
+            this.txtInput13.Name = "txtInput13";
+            this.txtInput13.Size = new System.Drawing.Size(139, 23);
+            this.txtInput13.TabIndex = 9;
+            this.txtInput13.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
+            this.txtInput13.Validated += new System.EventHandler(this.txtInput_Validated);
+            // 
+            // label24
+            // 
+            this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.label24.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label24.ForeColor = System.Drawing.Color.Black;
+            this.label24.Location = new System.Drawing.Point(3, 395);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(139, 25);
+            this.label24.TabIndex = 30;
+            this.label24.Text = "é…�å±žå¹´æœˆæ—¥";
+            this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // lblSecRange
             // 
             this.lblSecRange.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.lblSecRange.BackColor = System.Drawing.SystemColors.Window;
             this.tableLayoutPanel1.SetColumnSpan(this.lblSecRange, 2);
-            this.lblSecRange.Location = new System.Drawing.Point(148, 751);
+            this.lblSecRange.Location = new System.Drawing.Point(148, 821);
             this.lblSecRange.Name = "lblSecRange";
             this.lblSecRange.Size = new System.Drawing.Size(284, 23);
-            this.lblSecRange.TabIndex = 16;
+            this.lblSecRange.TabIndex = 18;
             this.lblSecRange.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // label4
@@ -782,7 +799,7 @@
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(3, 750);
+            this.label4.Location = new System.Drawing.Point(3, 820);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(139, 25);
             this.label4.TabIndex = 30;
@@ -789,6 +806,44 @@
             this.label4.Text = "ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ç¯„å›²";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // label18
+            // 
+            this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label18.ForeColor = System.Drawing.Color.Black;
+            this.label18.Location = new System.Drawing.Point(3, 785);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(139, 25);
+            this.label18.TabIndex = 30;
+            this.label18.Text = "ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£åŒºåˆ†";
+            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblSecRank
+            // 
+            this.lblSecRank.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.lblSecRank.BackColor = System.Drawing.SystemColors.Window;
+            this.tableLayoutPanel1.SetColumnSpan(this.lblSecRank, 2);
+            this.lblSecRank.Location = new System.Drawing.Point(148, 786);
+            this.lblSecRank.Name = "lblSecRank";
+            this.lblSecRank.Size = new System.Drawing.Size(284, 23);
+            this.lblSecRank.TabIndex = 17;
+            this.lblSecRank.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label17
+            // 
+            this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label17.ForeColor = System.Drawing.Color.Black;
+            this.label17.Location = new System.Drawing.Point(3, 750);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(139, 25);
+            this.label17.TabIndex = 30;
+            this.label17.Text = "æ©Ÿå¯†åŒºåˆ†";
+            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // label21
             // 
             this.label21.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -796,7 +851,7 @@
             this.label21.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label21.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label21.ForeColor = System.Drawing.Color.Black;
-            this.label21.Location = new System.Drawing.Point(3, 785);
+            this.label21.Location = new System.Drawing.Point(3, 680);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(139, 25);
             this.label21.TabIndex = 30;
@@ -807,11 +862,11 @@
             // 
             this.txtInput11.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtInput11.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput11.Location = new System.Drawing.Point(148, 786);
+            this.txtInput11.Location = new System.Drawing.Point(148, 681);
             this.txtInput11.MaxLength = 11;
             this.txtInput11.Name = "txtInput11";
             this.txtInput11.Size = new System.Drawing.Size(139, 23);
-            this.txtInput11.TabIndex = 17;
+            this.txtInput11.TabIndex = 14;
             this.txtInput11.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput11.Validated += new System.EventHandler(this.txtInputDecimal_Validated);
             // 
@@ -822,7 +877,7 @@
             this.label22.BackColor = System.Drawing.Color.Black;
             this.label22.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label22.ForeColor = System.Drawing.Color.White;
-            this.label22.Location = new System.Drawing.Point(293, 789);
+            this.label22.Location = new System.Drawing.Point(293, 684);
             this.label22.Name = "label22";
             this.label22.Size = new System.Drawing.Size(110, 16);
             this.label22.TabIndex = 30;
@@ -829,19 +884,6 @@
             this.label22.Text = "ï¼«ï½�ï¼ˆç‰‡é�“ï¼‰";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label12
-            // 
-            this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(3, 855);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(139, 25);
-            this.label12.TabIndex = 30;
-            this.label12.Text = "å�‚ç…§éƒ¨ç½²";
-            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // label15
             // 
             this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -849,7 +891,7 @@
             this.label15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label15.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label15.ForeColor = System.Drawing.Color.Black;
-            this.label15.Location = new System.Drawing.Point(3, 820);
+            this.label15.Location = new System.Drawing.Point(3, 715);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(139, 25);
             this.label15.TabIndex = 30;
@@ -860,11 +902,11 @@
             // 
             this.txtInput12.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.txtInput12.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput12.Location = new System.Drawing.Point(148, 821);
+            this.txtInput12.Location = new System.Drawing.Point(148, 716);
             this.txtInput12.MaxLength = 11;
             this.txtInput12.Name = "txtInput12";
             this.txtInput12.Size = new System.Drawing.Size(139, 23);
-            this.txtInput12.TabIndex = 18;
+            this.txtInput12.TabIndex = 15;
             this.txtInput12.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtInput12.Validated += new System.EventHandler(this.txtInputSalary_Validated);
             // 
@@ -875,7 +917,7 @@
             this.label23.BackColor = System.Drawing.Color.Black;
             this.label23.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label23.ForeColor = System.Drawing.Color.White;
-            this.label23.Location = new System.Drawing.Point(293, 824);
+            this.label23.Location = new System.Drawing.Point(293, 719);
             this.label23.Name = "label23";
             this.label23.Size = new System.Drawing.Size(110, 16);
             this.label23.TabIndex = 30;
@@ -882,6 +924,148 @@
             this.label23.Text = "å††ï¼ˆå…¬èª�åˆ†ï¼‰";
             this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lblSecurtyManegement
+            // 
+            this.lblSecurtyManegement.BackColor = System.Drawing.Color.White;
+            this.lblSecurtyManegement.Location = new System.Drawing.Point(1127, 4);
+            this.lblSecurtyManegement.Name = "lblSecurtyManegement";
+            this.lblSecurtyManegement.Size = new System.Drawing.Size(83, 26);
+            this.lblSecurtyManegement.TabIndex = 19;
+            this.lblSecurtyManegement.Visible = false;
+            // 
+            // rdbMode2
+            // 
+            this.rdbMode2.AutoSize = true;
+            this.rdbMode2.Location = new System.Drawing.Point(234, 5);
+            this.rdbMode2.Name = "rdbMode2";
+            this.rdbMode2.Size = new System.Drawing.Size(94, 20);
+            this.rdbMode2.TabIndex = 21;
+            this.rdbMode2.Text = "å‰Šé™¤ä¸€è¦§";
+            this.rdbMode2.UseVisualStyleBackColor = true;
+            this.rdbMode2.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged);
+            // 
+            // rdbMode1
+            // 
+            this.rdbMode1.AutoSize = true;
+            this.rdbMode1.Checked = true;
+            this.rdbMode1.Location = new System.Drawing.Point(132, 5);
+            this.rdbMode1.Name = "rdbMode1";
+            this.rdbMode1.Size = new System.Drawing.Size(94, 20);
+            this.rdbMode1.TabIndex = 21;
+            this.rdbMode1.TabStop = true;
+            this.rdbMode1.Text = "é€šå¸¸ä¸€è¦§";
+            this.rdbMode1.UseVisualStyleBackColor = true;
+            this.rdbMode1.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged);
+            // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.FloralWhite;
+            this.panel2.Controls.Add(this.label19);
+            this.panel2.Controls.Add(this.rdbMode2);
+            this.panel2.Controls.Add(this.rdbMode1);
+            this.panel2.Location = new System.Drawing.Point(8, 68);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(540, 30);
+            this.panel2.TabIndex = 23;
+            // 
+            // label19
+            // 
+            this.label19.BackColor = System.Drawing.Color.Transparent;
+            this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label19.ForeColor = System.Drawing.Color.Black;
+            this.label19.Location = new System.Drawing.Point(4, 5);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(120, 20);
+            this.label19.TabIndex = 24;
+            this.label19.Text = "ä¸€è¦§è¡¨ç¤ºå†…å®¹";
+            this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // panel3
+            // 
+            this.panel3.BackColor = System.Drawing.Color.FloralWhite;
+            this.panel3.Controls.Add(this.btnChrgToEmp);
+            this.panel3.Controls.Add(this.btnEmpToChrg);
+            this.panel3.Controls.Add(this.label20);
+            this.panel3.Location = new System.Drawing.Point(740, 41);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(470, 30);
+            this.panel3.TabIndex = 24;
+            // 
+            // btnChrgToEmp
+            // 
+            this.btnChrgToEmp.BackColor = System.Drawing.Color.LimeGreen;
+            this.btnChrgToEmp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnChrgToEmp.ForeColor = System.Drawing.Color.Black;
+            this.btnChrgToEmp.Location = new System.Drawing.Point(132, 0);
+            this.btnChrgToEmp.Name = "btnChrgToEmp";
+            this.btnChrgToEmp.Size = new System.Drawing.Size(160, 30);
+            this.btnChrgToEmp.TabIndex = 25;
+            this.btnChrgToEmp.Text = "æ­£ç¤¾å“¡ => å¸¸ç”¨è€…";
+            this.btnChrgToEmp.UseVisualStyleBackColor = false;
+            this.btnChrgToEmp.Click += new System.EventHandler(this.btnChrgToEmp_Click);
+            // 
+            // btnEmpToChrg
+            // 
+            this.btnEmpToChrg.BackColor = System.Drawing.Color.Green;
+            this.btnEmpToChrg.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnEmpToChrg.ForeColor = System.Drawing.Color.White;
+            this.btnEmpToChrg.Location = new System.Drawing.Point(300, 0);
+            this.btnEmpToChrg.Name = "btnEmpToChrg";
+            this.btnEmpToChrg.Size = new System.Drawing.Size(160, 30);
+            this.btnEmpToChrg.TabIndex = 26;
+            this.btnEmpToChrg.Text = "æ­£ç¤¾å“¡ <= å¸¸ç”¨è€…";
+            this.btnEmpToChrg.UseVisualStyleBackColor = false;
+            this.btnEmpToChrg.Click += new System.EventHandler(this.btnEmpToChrg_Click);
+            // 
+            // label20
+            // 
+            this.label20.BackColor = System.Drawing.Color.Transparent;
+            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label20.ForeColor = System.Drawing.Color.Black;
+            this.label20.Location = new System.Drawing.Point(4, 5);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(120, 20);
+            this.label20.TabIndex = 24;
+            this.label20.Text = "ãƒ‡ãƒ¼ã‚¿å¤‰æ›´";
+            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // txtInput3
+            // 
+            this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput3.Location = new System.Drawing.Point(148, 111);
+            this.txtInput3.MaxLength = 11;
+            this.txtInput3.Name = "txtInput3";
+            this.txtInput3.Size = new System.Drawing.Size(139, 23);
+            this.txtInput3.TabIndex = 3;
+            this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
+            this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated);
+            // 
+            // cmbDepartment
+            // 
+            this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 3);
+            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDepartment.FormattingEnabled = true;
+            this.cmbDepartment.Location = new System.Drawing.Point(148, 360);
+            this.cmbDepartment.Name = "cmbDepartment";
+            this.cmbDepartment.Size = new System.Drawing.Size(429, 24);
+            this.cmbDepartment.TabIndex = 8;
+            this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange);
+            // 
+            // cmbLedgerFlg
+            // 
+            this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbLedgerFlg.FormattingEnabled = true;
+            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 645);
+            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
+            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
+            this.cmbLedgerFlg.TabIndex = 13;
+            this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange);
+            // 
             // dgvSalary
             // 
             this.dgvSalary.AllowUserToAddRows = false;
@@ -892,14 +1076,14 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.dgvSalary.BackgroundColor = System.Drawing.Color.White;
             this.dgvSalary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSalary.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSalary.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
             this.dgvSalary.ColumnHeadersHeight = 22;
             this.dgvSalary.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvSalary.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -923,8 +1107,8 @@
             // 
             // SalaryColumn1
             // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.SalaryColumn1.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.SalaryColumn1.DefaultCellStyle = dataGridViewCellStyle30;
             this.SalaryColumn1.Frozen = true;
             this.SalaryColumn1.HeaderText = "çµ¦ä¸Žé–‹å§‹å¹´æœˆæ—¥";
             this.SalaryColumn1.Name = "SalaryColumn1";
@@ -934,8 +1118,8 @@
             // 
             // SalaryColumn2
             // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.SalaryColumn2.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.SalaryColumn2.DefaultCellStyle = dataGridViewCellStyle31;
             this.SalaryColumn2.Frozen = true;
             this.SalaryColumn2.HeaderText = "æœˆçµ¦ä¸Žé¡�";
             this.SalaryColumn2.Name = "SalaryColumn2";
@@ -945,8 +1129,8 @@
             // 
             // SalaryColumn3
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.SalaryColumn3.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.SalaryColumn3.DefaultCellStyle = dataGridViewCellStyle32;
             this.SalaryColumn3.Frozen = true;
             this.SalaryColumn3.HeaderText = "å¹´çµ¦ä¸Žé¡�";
             this.SalaryColumn3.Name = "SalaryColumn3";
@@ -964,14 +1148,14 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.White;
             this.dgvRefDepartment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRefDepartment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle33.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvRefDepartment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33;
             this.dgvRefDepartment.ColumnHeadersHeight = 24;
             this.dgvRefDepartment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvRefDepartment.ColumnHeadersVisible = false;
@@ -1003,8 +1187,8 @@
             // 
             // TextBoxColumn1
             // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.TextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.TextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle34;
             this.TextBoxColumn1.Frozen = true;
             this.TextBoxColumn1.HeaderText = "å�‚ã€€ç…§ã€€éƒ¨ã€€ç½²ã€€å��ã€€ç§°";
             this.TextBoxColumn1.Name = "TextBoxColumn1";
@@ -1020,46 +1204,12 @@
             this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbRefDepartment.FormattingEnabled = true;
-            this.cmbRefDepartment.Location = new System.Drawing.Point(148, 967);
+            this.cmbRefDepartment.Location = new System.Drawing.Point(148, 965);
             this.cmbRefDepartment.Name = "cmbRefDepartment";
             this.cmbRefDepartment.Size = new System.Drawing.Size(429, 24);
             this.cmbRefDepartment.TabIndex = 19;
             this.cmbRefDepartment.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // btnRefDepDel
-            // 
-            this.btnRefDepDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRefDepDel.BackColor = System.Drawing.Color.Red;
-            this.btnRefDepDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnRefDepDel.ForeColor = System.Drawing.Color.White;
-            this.btnRefDepDel.Location = new System.Drawing.Point(438, 998);
-            this.btnRefDepDel.Name = "btnRefDepDel";
-            this.btnRefDepDel.Size = new System.Drawing.Size(139, 29);
-            this.btnRefDepDel.TabIndex = 33;
-            this.btnRefDepDel.TabStop = false;
-            this.btnRefDepDel.Text = "å�‚ç…§éƒ¨ç½²å‰Šé™¤";
-            this.btnRefDepDel.UseVisualStyleBackColor = false;
-            this.btnRefDepDel.Click += new System.EventHandler(this.btnRefDepDel_Click);
-            // 
-            // btnRefDepAdd
-            // 
-            this.btnRefDepAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRefDepAdd.BackColor = System.Drawing.Color.Green;
-            this.btnRefDepAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnRefDepAdd.ForeColor = System.Drawing.Color.White;
-            this.btnRefDepAdd.Location = new System.Drawing.Point(293, 998);
-            this.btnRefDepAdd.Name = "btnRefDepAdd";
-            this.btnRefDepAdd.Size = new System.Drawing.Size(139, 29);
-            this.btnRefDepAdd.TabIndex = 32;
-            this.btnRefDepAdd.TabStop = false;
-            this.btnRefDepAdd.Text = "å�‚ç…§éƒ¨ç½²è¿½åŠ ";
-            this.btnRefDepAdd.UseVisualStyleBackColor = false;
-            this.btnRefDepAdd.Click += new System.EventHandler(this.btnRefDepAdd_Click);
-            // 
             // dgvAssignment
             // 
             this.dgvAssignment.AllowUserToAddRows = false;
@@ -1070,14 +1220,14 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.dgvAssignment.BackgroundColor = System.Drawing.Color.White;
             this.dgvAssignment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAssignment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle35.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvAssignment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle35;
             this.dgvAssignment.ColumnHeadersHeight = 22;
             this.dgvAssignment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvAssignment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1101,8 +1251,8 @@
             // 
             // dataGridViewTextBoxColumn1
             // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle36;
             this.dataGridViewTextBoxColumn1.Frozen = true;
             this.dataGridViewTextBoxColumn1.HeaderText = "é…�å±žå¹´æœˆæ—¥";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
@@ -1112,8 +1262,8 @@
             // 
             // dataGridViewTextBoxColumn2
             // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle37;
             this.dataGridViewTextBoxColumn2.Frozen = true;
             this.dataGridViewTextBoxColumn2.HeaderText = "é…�å±žéƒ¨ç½²å��";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
@@ -1123,8 +1273,8 @@
             // 
             // dataGridViewTextBoxColumn3
             // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle38;
             this.dataGridViewTextBoxColumn3.Frozen = true;
             this.dataGridViewTextBoxColumn3.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
@@ -1133,170 +1283,20 @@
             this.dataGridViewTextBoxColumn3.Visible = false;
             this.dataGridViewTextBoxColumn3.Width = 5;
             // 
-            // BtnDepartMentAdd
+            // cmbSecManage
             // 
-            this.BtnDepartMentAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.BtnDepartMentAdd.BackColor = System.Drawing.Color.Green;
-            this.BtnDepartMentAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.BtnDepartMentAdd.ForeColor = System.Drawing.Color.White;
-            this.BtnDepartMentAdd.Location = new System.Drawing.Point(293, 393);
-            this.BtnDepartMentAdd.Name = "BtnDepartMentAdd";
-            this.BtnDepartMentAdd.Size = new System.Drawing.Size(139, 29);
-            this.BtnDepartMentAdd.TabIndex = 32;
-            this.BtnDepartMentAdd.TabStop = false;
-            this.BtnDepartMentAdd.Text = "é…�å±žè¿½åŠ ";
-            this.BtnDepartMentAdd.UseVisualStyleBackColor = false;
-            this.BtnDepartMentAdd.Click += new System.EventHandler(this.BtnDepartMentAdd_Click);
+            this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2);
+            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbSecManage.FormattingEnabled = true;
+            this.cmbSecManage.Location = new System.Drawing.Point(148, 750);
+            this.cmbSecManage.Name = "cmbSecManage";
+            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
+            this.cmbSecManage.TabIndex = 16;
+            this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged);
+            this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange);
             // 
-            // BtnDepartMentDel
-            // 
-            this.BtnDepartMentDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.BtnDepartMentDel.BackColor = System.Drawing.Color.Red;
-            this.BtnDepartMentDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.BtnDepartMentDel.ForeColor = System.Drawing.Color.White;
-            this.BtnDepartMentDel.Location = new System.Drawing.Point(438, 393);
-            this.BtnDepartMentDel.Name = "BtnDepartMentDel";
-            this.BtnDepartMentDel.Size = new System.Drawing.Size(139, 29);
-            this.BtnDepartMentDel.TabIndex = 33;
-            this.BtnDepartMentDel.TabStop = false;
-            this.BtnDepartMentDel.Text = "é…�å±žå±¥æ­´å‰Šé™¤";
-            this.BtnDepartMentDel.UseVisualStyleBackColor = false;
-            this.BtnDepartMentDel.Click += new System.EventHandler(this.BtnDepartMentDel_Click);
-            // 
-            // txtInput13
-            // 
-            this.txtInput13.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput13.Location = new System.Drawing.Point(148, 396);
-            this.txtInput13.MaxLength = 11;
-            this.txtInput13.Name = "txtInput13";
-            this.txtInput13.Size = new System.Drawing.Size(139, 23);
-            this.txtInput13.TabIndex = 9;
-            this.txtInput13.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
-            this.txtInput13.Validated += new System.EventHandler(this.txtInput_Validated);
-            // 
-            // label24
-            // 
-            this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            this.label24.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label24.ForeColor = System.Drawing.Color.Black;
-            this.label24.Location = new System.Drawing.Point(3, 395);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(139, 25);
-            this.label24.TabIndex = 30;
-            this.label24.Text = "é…�å±žå¹´æœˆæ—¥";
-            this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblSecurtyManegement
-            // 
-            this.lblSecurtyManegement.BackColor = System.Drawing.Color.White;
-            this.lblSecurtyManegement.Location = new System.Drawing.Point(1127, 4);
-            this.lblSecurtyManegement.Name = "lblSecurtyManegement";
-            this.lblSecurtyManegement.Size = new System.Drawing.Size(83, 26);
-            this.lblSecurtyManegement.TabIndex = 19;
-            this.lblSecurtyManegement.Visible = false;
-            // 
-            // rdbMode2
-            // 
-            this.rdbMode2.AutoSize = true;
-            this.rdbMode2.Location = new System.Drawing.Point(234, 5);
-            this.rdbMode2.Name = "rdbMode2";
-            this.rdbMode2.Size = new System.Drawing.Size(94, 20);
-            this.rdbMode2.TabIndex = 21;
-            this.rdbMode2.Text = "å‰Šé™¤ä¸€è¦§";
-            this.rdbMode2.UseVisualStyleBackColor = true;
-            this.rdbMode2.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged);
-            // 
-            // rdbMode1
-            // 
-            this.rdbMode1.AutoSize = true;
-            this.rdbMode1.Checked = true;
-            this.rdbMode1.Location = new System.Drawing.Point(132, 5);
-            this.rdbMode1.Name = "rdbMode1";
-            this.rdbMode1.Size = new System.Drawing.Size(94, 20);
-            this.rdbMode1.TabIndex = 21;
-            this.rdbMode1.TabStop = true;
-            this.rdbMode1.Text = "é€šå¸¸ä¸€è¦§";
-            this.rdbMode1.UseVisualStyleBackColor = true;
-            this.rdbMode1.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged);
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.Color.FloralWhite;
-            this.panel2.Controls.Add(this.label19);
-            this.panel2.Controls.Add(this.rdbMode2);
-            this.panel2.Controls.Add(this.rdbMode1);
-            this.panel2.Location = new System.Drawing.Point(8, 68);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(540, 30);
-            this.panel2.TabIndex = 23;
-            // 
-            // label19
-            // 
-            this.label19.BackColor = System.Drawing.Color.Transparent;
-            this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label19.ForeColor = System.Drawing.Color.Black;
-            this.label19.Location = new System.Drawing.Point(4, 5);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(120, 20);
-            this.label19.TabIndex = 24;
-            this.label19.Text = "ä¸€è¦§è¡¨ç¤ºå†…å®¹";
-            this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // panel3
-            // 
-            this.panel3.BackColor = System.Drawing.Color.FloralWhite;
-            this.panel3.Controls.Add(this.btnChrgToEmp);
-            this.panel3.Controls.Add(this.btnEmpToChrg);
-            this.panel3.Controls.Add(this.label20);
-            this.panel3.Location = new System.Drawing.Point(740, 41);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(470, 30);
-            this.panel3.TabIndex = 24;
-            // 
-            // btnChrgToEmp
-            // 
-            this.btnChrgToEmp.BackColor = System.Drawing.Color.LimeGreen;
-            this.btnChrgToEmp.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnChrgToEmp.ForeColor = System.Drawing.Color.Black;
-            this.btnChrgToEmp.Location = new System.Drawing.Point(132, 0);
-            this.btnChrgToEmp.Name = "btnChrgToEmp";
-            this.btnChrgToEmp.Size = new System.Drawing.Size(160, 30);
-            this.btnChrgToEmp.TabIndex = 25;
-            this.btnChrgToEmp.Text = "æ­£ç¤¾å“¡ => å¸¸ç”¨è€…";
-            this.btnChrgToEmp.UseVisualStyleBackColor = false;
-            this.btnChrgToEmp.Click += new System.EventHandler(this.btnChrgToEmp_Click);
-            // 
-            // btnEmpToChrg
-            // 
-            this.btnEmpToChrg.BackColor = System.Drawing.Color.Green;
-            this.btnEmpToChrg.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnEmpToChrg.ForeColor = System.Drawing.Color.White;
-            this.btnEmpToChrg.Location = new System.Drawing.Point(300, 0);
-            this.btnEmpToChrg.Name = "btnEmpToChrg";
-            this.btnEmpToChrg.Size = new System.Drawing.Size(160, 30);
-            this.btnEmpToChrg.TabIndex = 26;
-            this.btnEmpToChrg.Text = "æ­£ç¤¾å“¡ <= å¸¸ç”¨è€…";
-            this.btnEmpToChrg.UseVisualStyleBackColor = false;
-            this.btnEmpToChrg.Click += new System.EventHandler(this.btnEmpToChrg_Click);
-            // 
-            // label20
-            // 
-            this.label20.BackColor = System.Drawing.Color.Transparent;
-            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(4, 5);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(120, 20);
-            this.label20.TabIndex = 24;
-            this.label20.Text = "ãƒ‡ãƒ¼ã‚¿å¤‰æ›´";
-            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // dgvMaster
             // 
             this.dgvMaster.AllowUserToAddRows = false;
@@ -1305,14 +1305,14 @@
             this.dgvMaster.AllowUserToResizeRows = false;
             this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle39.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle39;
             this.dgvMaster.ColumnHeadersHeight = 24;
             this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1337,9 +1337,9 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle40.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle40;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "â„–";
             this.Column1.Name = "Column1";
@@ -1349,8 +1349,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle41.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle41;
             this.Column2.Frozen = true;
             this.Column2.HeaderText = "æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰";
             this.Column2.Name = "Column2";
@@ -1360,9 +1360,9 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle42.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle42;
             this.Column3.HeaderText = "æ‹…ã€€å½“ã€€è€…ã€€å��";
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
@@ -1430,12 +1430,12 @@
             this.panel1.ResumeLayout(false);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.panel3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAssignment)).EndInit();
-            this.panel2.ResumeLayout(false);
-            this.panel2.PerformLayout();
-            this.panel3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
             this.ResumeLayout(false);
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs	(revision 438)
@@ -25,6 +25,73 @@
     public partial class FrmPersonInCharge
     {
 
+        #region åˆ�æœŸæ™‚ã‚¹ã‚¿ã‚¤ãƒ«è¨­å®š
+        /// <summary>
+        /// åˆ�æœŸæ™‚ã‚¹ã‚¿ã‚¤ãƒ«è¨­å®š
+        /// </summary>
+        private void SetInitStyle()
+        {
+            try
+            {
+                switch (ProductDefine.ProductType)
+                {
+                    case (int)ProductDefine.ProductTypeDef.Originals:
+                        // ----- ã‚ªãƒªã‚¸ãƒŠãƒ«ç‰ˆ
+                        break;
+                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                        // ----- è£½å“�ç‰ˆ
+                        // ä¸€è¦§è¡¨ç¤º
+                        panel2.Visible = false;
+                        // ãƒ‡ãƒ¼ã‚¿å¤‰æ›´
+                        panel3.Visible = false;
+                        // æ–°è¦�ä½œæˆ�
+                        btnDataLineEntry.Visible = false;
+                        // å‰Šé™¤
+                        btnDataDelete.Visible = false;
+                        // UpDown
+                        btnDispUp.Visible = false;
+                        btnDispDown.Visible = false;
+                        // ----- éƒ¨ç½²é�žå¸¸æ™‚è¡¨ç¤º
+                        label6.Visible = false;
+                        cmbDepartment.Visible = false;
+                        label24.Visible = false;
+                        txtInput13.Visible = false;
+                        BtnDepartMentAdd.Visible = false;
+                        BtnDepartMentDel.Visible = false;
+                        dgvAssignment.Visible = false;
+                        // ----- å�°å¸³è¨ˆç®—å¯¾è±¡
+                        label16.Visible = false;
+                        cmbLedgerFlg.Visible = false;
+                        // ----- æ©Ÿå¯†åŒºåˆ†é�žè¡¨ç¤º
+                        // æ©Ÿå¯†åŒºåˆ†
+                        label17.Visible = false;
+                        cmbSecManage.Visible = false;
+                        // ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ç¯„å›²
+                        label4.Visible = false;
+                        lblSecRange.Visible = false;
+                        // ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£åŒºåˆ†
+                        label18.Visible = false;
+                        lblSecRank.Visible = false;
+                        // å�‚ç…§éƒ¨ç½²
+                        label12.Visible = false;
+                        dgvRefDepartment.Visible = false;
+                        cmbRefDepartment.Visible = false;
+                        btnRefDepAdd.Visible = false;
+                        btnRefDepDel.Visible = false;
+                        // ãƒ†ãƒ¼ãƒ–ãƒ«è£½å“�ç‰ˆè¡Œé�žè¡¨ç¤ºåˆ¶å¾¡
+                        SetTableStyle1();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region å›ºå®šãƒ©ãƒ™ãƒ«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«é…�åˆ—
         /// <summary>
         /// å›ºå®šãƒ©ãƒ™ãƒ«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«é…�åˆ—
@@ -130,6 +197,38 @@
         }
         #endregion
 
+        #region ãƒ†ãƒ¼ãƒ–ãƒ«è£½å“�ç‰ˆè¡Œé�žè¡¨ç¤ºåˆ¶å¾¡
+        /// <summary>
+        /// ãƒ†ãƒ¼ãƒ–ãƒ«è£½å“�ç‰ˆè¡Œé�žè¡¨ç¤ºåˆ¶å¾¡
+        /// </summary>
+        private void SetTableStyle1()
+        {
+            try
+            {
+                tableLayoutPanel1.RowStyles[10] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[11] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[12] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[13] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[14] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[18] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[21] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[22] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[23] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[24] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[25] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[26] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[27] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.RowStyles[28] = new RowStyle(SizeType.Absolute, 0F);
+                tableLayoutPanel1.Height = (35 * 14) + 40;
+
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ç”»é�¢ãƒ­ãƒƒã‚¯
         /// <summary>
         /// ç”»é�¢ãƒ­ãƒƒã‚¯
@@ -566,6 +665,19 @@
                 }
                 m_dispControl[(int)DispCtrl.SecRange].Text = SecRangeValue.Value;
 
+                bool bNoneExec = true;
+                switch (ProductDefine.ProductType)
+                {
+                    case (int)ProductDefine.ProductTypeDef.Originals:
+                        // ----- ã‚ªãƒªã‚¸ãƒŠãƒ«ç‰ˆ
+                        break;
+                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                        // ----- è£½å“�ç‰ˆ
+                        bNoneExec = false;
+                        break;
+                }
+                if (!bNoneExec) return;
+
                 // ----- å�‚ç…§éƒ¨ç½²ã�®è¡¨ç¤ºåˆ¶å¾¡
                 label12.Visible = false;
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmApprovalStatusList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmApprovalStatusList.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmApprovalStatusList.cs	(revision 438)
@@ -53,6 +53,21 @@
             ApprovalStatus,
             ApprovalDate,
         }
+
+        /// <summary>
+        /// ã‚ªãƒªã‚¸ãƒŠãƒ«å›ºå®šæ–‡å­—å®šç¾©
+        /// </summary>
+        private string[] s_OriginalStringArrary = new string[] { "æ‰¿ã€€èª�ã€€çŠ¶ã€€æ…‹ã€€ä¸€ã€€è¦§",
+                                                                "æ‰¿èª�æ©Ÿèƒ½",
+                                                                "æ‰¿èª�çŠ¶æ…‹",
+                                                                "æ‰¿èª�æ—¥ä»˜"};
+        /// <summary>
+        /// è£½å“�ç‰ˆã‚¿ã‚¤ãƒ—ï¼‘å›ºå®šæ–‡å­—å®šç¾©
+        /// </summary>
+        private string[] s_Product1StringArrary = new string[] { "ç¢ºã€€èª�ã€€çŠ¶ã€€æ…‹ã€€ä¸€ã€€è¦§",
+                                                                "ç¢ºèª�æ©Ÿèƒ½",
+                                                                "ç¢ºèª�çŠ¶æ…‹",
+                                                                "ç¢ºèª�æ—¥ä»˜"};
         #endregion
 
         #region å¤‰æ•°
@@ -155,6 +170,10 @@
             // è¡¨ç¤ºä½�ç½®ã‚»ãƒƒãƒˆ
             Point po = new Point(m_LocationPoint.X - this.Width, m_LocationPoint.Y);
             this.Location = po;
+
+            // åˆ�æœŸè¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«å¤‰æ›´
+            InitDispStyle();
+
             // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
             DataDispApproval();
 
@@ -200,8 +219,9 @@
         {
             try
             {
+                if (ProductDefine.ProductType == (int)ProductDefine.ProductTypeDef.MassProductionType1) return;
                 // å�‚ç…§æ™‚ã�¯å‡¦ç�†ã�—ã�ªã�„
-                if (m_EditLock) return;
+                //if (m_EditLock) return;
 
                 // ç„¡åŠ¹è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
                 if (e.ColumnIndex < 0 || e.RowIndex < 0) return;
@@ -294,17 +314,53 @@
                 }
                 // æ‰¿èª�æƒ…å ±è¡¨ç¤º
                 int ino = 0;
+                // æ‰¿èª�çŠ¶æ…‹æ–‡å­—
+                string ProcNameString = string.Empty;
+                string AppStatusString = string.Empty;
+                string AppDate = string.Empty;
+                string strData = string.Empty;
                 foreach (ApprovalMaster appRec in MasterList)
                 {
-                    // æ‰¿èª�çŠ¶æ…‹æ–‡å­—
-                    string AppStatusString = CommonDefine.ApprovalStatusString[(int)CommonDefine.ApprovalStatus.Unclaimed];
-                    string AppDate = string.Empty;
+                    switch (ProductDefine.ProductType)
+                    {
+                        case (int)ProductDefine.ProductTypeDef.Originals:
+                            AppStatusString = CommonDefine.ApprovalStatusString[(int)CommonDefine.ApprovalStatus.Unclaimed];
+                            break;
+                        case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                            // è£½å“�ç‰ˆ
+                            AppStatusString = CommonDefine.ApprovalStatusString2[(int)CommonDefine.ApprovalStatus.Unclaimed];
+                            break;
+                    }
 
-                    string strData = pAPPDB.CreatePrimarykeyString(m_ConstructionCode, appRec.ApprovalCode, m_OrderNo, 1);
+                    // æ‰¿èª�å‡¦ç�†å��ç§°
+                    switch (ProductDefine.ProductType)
+                    {
+                        case (int)ProductDefine.ProductTypeDef.Originals:
+                            // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                            ProcNameString = ClsExcute.AppovalList[appRec.ApprovalCode];
+                            break;
+                        case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                            // è£½å“�ç‰ˆ
+                            ProcNameString = ClsExcute.AppovalList[appRec.ApprovalCode].Replace("æ‰¿èª�", "ç¢ºèª�");
+                            break;
+                    }
+
+                    strData = pAPPDB.CreatePrimarykeyString(m_ConstructionCode, appRec.ApprovalCode, m_OrderNo, 1);
                     ProcessApproval dataRec = new ProcessApproval();
                     if (pAPPDB.SelectAction(strData, ref dataRec))
                     {
-                        AppStatusString = CommonDefine.ApprovalStatusString[dataRec.ApprovalStatus];
+                        switch (ProductDefine.ProductType)
+                        {
+                            case (int)ProductDefine.ProductTypeDef.Originals:
+                                // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                                AppStatusString = CommonDefine.ApprovalStatusString[dataRec.ApprovalStatus];
+                                break;
+                            case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                                // è£½å“�ç‰ˆ
+                                AppStatusString = CommonDefine.ApprovalStatusString2[dataRec.ApprovalStatus];
+                                break;
+                        }
+
                         AppDate = dataRec.PetitionApprovalDate.ToShortDateString();
                     }
 
@@ -311,7 +367,7 @@
                     dgvDispApproval.Rows.Add(appRec.ApprovalCode,
                                                 appRec.DepartmentCode,
                                                 ++ino,
-                                                ClsExcute.AppovalList[appRec.ApprovalCode],
+                                                ProcNameString,
                                                 AppStatusString,
                                                 AppDate
                                             );
@@ -340,6 +396,35 @@
         }
         #endregion
 
+        #region åˆ�æœŸè¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«å¤‰æ›´
+        /// <summary>
+        /// åˆ�æœŸè¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«å¤‰æ›´
+        /// </summary>
+        private void InitDispStyle()
+        {
+            try
+            {
+                switch (ProductDefine.ProductType)
+                {
+                    case (int)ProductDefine.ProductTypeDef.Originals:
+                        // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                        break;
+                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                        // è£½å“�ç‰ˆ
+                        label1.Text = s_Product1StringArrary[0];
+                        dgvDispApproval.Columns[3].HeaderText = s_Product1StringArrary[1];
+                        dgvDispApproval.Columns[4].HeaderText = s_Product1StringArrary[2];
+                        dgvDispApproval.Columns[5].HeaderText = s_Product1StringArrary[3];
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         //ãƒžã‚¦ã‚¹ã�®ã‚¯ãƒªãƒƒã‚¯ä½�ç½®ã‚’è¨˜æ†¶
         private Point mousePoint;
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstrProgDiag.cs	(revision 438)
@@ -87,6 +87,14 @@
             get { return m_TergetList; }
             set { m_TergetList = value; }
         }
+
+        /// <summary>
+        /// å‡¦ç�†ã‚’èµ·å‹•ã�™ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯ã‚’è¡Œã�†
+        /// </summary>
+        public bool ChkExec
+        {
+            get { return CheckExecuteProcess(); }
+        }
         #endregion
 
         #region ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
@@ -153,7 +161,15 @@
                     m_TergetList.Add(CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ConstructionCode].Value));
                 }
 
+                // é�¸æŠžç„¡ã�—ã�¯å‡¦ç�†ã�—ã�ªã�„ã€‚
+                if (m_TergetList.Count < 1)
+                {
+                    MessageBox.Show("é�¸æŠžã�•ã‚Œã�Ÿãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+
                 DialogResult = DialogResult.OK;
+
                 this.Close();
             }
             catch (Exception ex)
@@ -212,16 +228,23 @@
         }
         #endregion
 
-        #region å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
+        #region å‡¦ç�†ãƒªã‚¹ãƒˆ
         /// <summary>
-        /// å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
+        /// å‡¦ç�†ãƒªã‚¹ãƒˆ
         /// </summary>
-        private void DisplayConstruction()
+        private ArrayList m_BaseList = new ArrayList();
+        #endregion
+
+        #region å‡¦ç�†ã‚’èµ·å‹•ã�™ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯ã‚’è¡Œã�†
+        /// <summary>
+        /// å‡¦ç�†ã‚’èµ·å‹•ã�™ã‚‹ã�‹ã�®ãƒ�ã‚§ãƒƒã‚¯ã‚’è¡Œã�†
+        /// </summary>
+        /// <returns></returns>
+        private bool CheckExecuteProcess()
         {
             IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
             try
             {
-                dgvMaster.Rows.Clear();
 
                 int ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
 
@@ -239,7 +262,7 @@
                 strSQL.Append(" A.CONSTRUCTIONCODE");
                 strSQL.Append(", B.DETAILSTRING");
                 strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
-                
+
                 strSQL.Append(" Inner Join constructionbaseinfodetail As B");
                 strSQL.Append("        On B.ConstructionCode = A.ConstructionCode");
                 strSQL.AppendFormat("  And B.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
@@ -259,18 +282,55 @@
                                 , nStatArrary[3], nStatArrary[4], nStatArrary[5]);
                 strSQL.Append(" ORDER BY A.CONSTRUCTIONCODE");
 
-                ArrayList BaseList = new ArrayList();
-                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref BaseList)) return;
-                if (BaseList.Count < 1)
+                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref m_BaseList)) return false;
+                if (m_BaseList.Count < 1)
                 {   // ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
+                    return false;
+                }
+                else if (m_BaseList.Count == 1)
+                {
+                    // 1ä»¶ã�—ã�‹ã�ªã�„å ´å�ˆã�¯ä¸€è¦§ã‚’è¡¨ç¤ºã�—ã�ªã�„
+                    object[] Once = (object[])m_BaseList[0];
+                    // å·¥äº‹ç•ªå�·å�–å¾—
+                    m_ConstructionCode = CommonMotions.cnvInt(Once[0]);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                BaseDB.close(); BaseDB = null;
+            }
+        }
+        #endregion
+
+        #region å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
+        /// <summary>
+        /// å·¥äº‹ä¸€è¦§è¡¨ç¤ºå‡¦ç�†
+        /// </summary>
+        private void DisplayConstruction()
+        {
+            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
+            try
+            {
+                dgvMaster.Rows.Clear();
+
+                if (m_BaseList.Count < 1)
+                {   // ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
                     DialogResult = DialogResult.Cancel;
                     this.Close();
                     return;
                 }
-                else if (BaseList.Count == 1)
+                else if (m_BaseList.Count == 1)
                 {
                     // 1ä»¶ã�—ã�‹ã�ªã�„å ´å�ˆã�¯ä¸€è¦§ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                    object[] Once = (object[])BaseList[0];
+                    object[] Once = (object[])m_BaseList[0];
                     // å·¥äº‹ç•ªå�·å�–å¾—
                     m_ConstructionCode = CommonMotions.cnvInt(Once[0]);
                     DialogResult = DialogResult.OK;
@@ -280,7 +340,7 @@
 
                 // è¦�ç´ è¡¨ç¤º
                 int i = 0;
-                foreach (object[] wrk in BaseList)
+                foreach (object[] wrk in m_BaseList)
                 {
                     // è‡ªåˆ†ã�¯è¡¨ç¤ºã�—ã�ªã�„
                     if (m_ConstructionCode == CommonMotions.cnvInt(wrk[0])) continue;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 438)
@@ -1084,9 +1084,9 @@
         #endregion
 
         #region æ¡ˆä»¶æƒ…å ±ç³»ã‚¤ãƒ™ãƒ³ãƒˆãƒ¡ã‚½ãƒƒãƒ‰
-        #region å·¥äº‹æƒ…å ±ç™»éŒ²ç”»é�¢ã�¸
+        #region å·¥äº‹æƒ…å ±æ–°è¦�ç™»éŒ²ç”»é�¢ã�¸
         /// <summary>
-        /// å·¥äº‹æƒ…å ±ç™»éŒ²ç”»é�¢ã�¸
+        /// å·¥äº‹æƒ…å ±æ–°è¦�ç™»éŒ²ç”»é�¢ã�¸
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -1099,9 +1099,16 @@
 
                 // æ¬¡èµ·å‹•ãƒ—ãƒ­ã‚»ã‚¹ã‚»ãƒƒãƒˆ
                 int NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo);
+
                 // é�¸æŠžå·¥äº‹ç•ªå�·ã‚»ãƒƒãƒˆ
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0);
 
+                //ã€€----- æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�æ™‚ã�¯ãƒ•ãƒ©ã‚°ã‚’ç«‹ã�¦ã‚‹
+                // ä¸€ã�¤ç›®ã�®ãƒ•ãƒ©ã‚°ã�¯ã‚³ãƒ”ãƒ¼ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ã�«ä½¿ç”¨ã�—ã�¦ã�„ã‚‹ã�Ÿã‚�ãƒ€ãƒŸãƒ¼ã‚’ç«‹ã�¦ã‚‹
+                ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
+                // äºŒã�¤ç›®ã�«æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ãƒ•ãƒ©ã‚°ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+                ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true);
+
                 // å‡¦ç�†å®Ÿè¡Œ
                 ClsExcute.ProcesscExecute();
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 437)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 438)
@@ -5643,13 +5643,18 @@
             try
             {
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.Append("SELECT A.CONSTRUCTIONSTATUSFLG, SUM(A.ORDERSDECISIONPRICE), SUM(B.ORDERSDECISIONPRICE)");
+                strSQL.Append("SELECT");
+                strSQL.Append(" A.CONSTRUCTIONSTATUSFLG");
+                strSQL.Append(", SUM(A.ORDERSDECISIONPRICE)");
+                strSQL.Append(", SUM(B.ORDERSDECISIONPRICE)");
+                strSQL.Append(", SUM(C.REQUESTAMOUNT)");
                 strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
-                strSQL.Append(" LEFT JOIN  CONSTRUCTIONLEDGER B ON B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
+                strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER B ON B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
+                strSQL.Append(" LEFT JOIN REQUESTHEAD C ON C.REQCONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
                 if (CommonMotions.BasePeriodYear())
                     strSQL.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", Period);
                 else
-                    strSQL.AppendFormat(" WHERE A.ConstructionYear = {0}", Period); 
+                    strSQL.AppendFormat(" WHERE A.ConstructionYear = {0}", Period);
 
                 strSQL.AppendFormat(" AND A.JOINFLG != {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
                 strSQL.Append(" AND A.CONSTRUCTIONSTATUSFLG IN (");
@@ -5668,25 +5673,45 @@
 
                 long work1 = 0;
                 long work2 = 0;
+                long work3 = 0;
                 Array.Clear(lArrayRet, 0, lArrayRet.Length);
                 foreach (object[] getObj in arryList)
                 {
                     work1 = CommonMotions.cnvLong(getObj[1]);
                     work2 = CommonMotions.cnvLong(getObj[2]);
+                    work3 = CommonMotions.cnvLong(getObj[3]);
 
                     if (CommonMotions.cnvInt(getObj[0]) == Status[0])
                     {
-                        if (Period < 16)
-                            lArrayRet[0] = work1;
-                        else
-                            lArrayRet[0] = work2;
+                        switch (ProductDefine.ProductType)
+                        {
+                            case (int)ProductDefine.ProductTypeDef.Originals:
+                                if (Period < 16)
+                                    lArrayRet[0] = work1;
+                                else
+                                    //lArrayRet[0] = work2;
+                                    lArrayRet[0] = work3;
+                                break;
+                            case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                                lArrayRet[0] = work3;
+                                break;
+                        }
                     }
-                    else
+                    else if (CommonMotions.cnvInt(getObj[0]) == Status[1])
                     {
-                        if (Period < 16)
-                            lArrayRet[1] = work1;
-                        else
-                            lArrayRet[1] = work2;
+                        switch (ProductDefine.ProductType)
+                        {
+                            case (int)ProductDefine.ProductTypeDef.Originals:
+                                if (Period < 16)
+                                    lArrayRet[1] = work1;
+                                else
+                                    //lArrayRet[1] = work2;
+                                    lArrayRet[1] = work3;
+                                break;
+                            case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                                lArrayRet[1] = work3;
+                                break;
+                        }
                     }
                 }
             }
