Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 294)
@@ -2640,7 +2640,7 @@
             {
                 int RetSalary = 0;
 
-                StringBuilder strSQL = new StringBuilder(1200);
+                StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("SELECT SUM(SAL.SALARY) FROM");
                 strSQL.Append(" (SELECT AX.hiduke,");
                 strSQL.AppendFormat(" ROUND((AX.salary * {0}) / DATE_FORMAT(LAST_DAY(AX.hiduke), '%d')) AS SALARY,", CommonDefine.s_SalaryCorrection);
Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 294)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 103;
+        public static int s_SystemVersion = 104;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/DataModel/ConstructionLedgerDetail.cs	(revision 294)
@@ -74,15 +74,15 @@
         public enum PurOrderFlgDef
         {
             /// <summary>
-            /// æœªä½œæˆ�
+            /// 0:æœªä½œæˆ�
             /// </summary>
             NoCreate = 0,
             /// <summary>
-            /// ä½œæˆ�æ¸ˆ
+            /// 1:ä½œæˆ�æ¸ˆ
             /// </summary>
             Making = 1,
             /// <summary>
-            /// ä½œæˆ�ã�—ã�ªã�„
+            /// 9:ä½œæˆ�ã�—ã�ªã�„
             /// </summary>
             NotMakingData = 9,
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmAppManAux.cs	(revision 294)
@@ -769,9 +769,9 @@
         }
         #endregion
 
-        #region æœ€çµ‚æ‰¿èª�æ™‚ï¼šæ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        #region æ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æ›´æ–°
         /// <summary>
-        /// æœ€çµ‚æ‰¿èª�æ™‚ï¼šæ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+        /// æ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æ›´æ–°
         /// </summary>
         /// <returns></returns>
         private bool PaymentDataDetailUpdate(IOPaymentDataDetail PayDetailDB, PaymentApprovalInfo PaIWork, int nAppStat)
@@ -778,6 +778,16 @@
         {
             try
             {
+                // ãƒ‡ãƒ¼ã‚¿å­˜åœ¨ç¢ºèª�
+                StringBuilder strSelectSQL = new StringBuilder();
+                strSelectSQL.Append(PayDetailDB.CreatePrimarykeyString(PaIWork.CompanyCode
+                                                                        , PaIWork.TargetDate
+                                                                        , PaIWork.SeqNo
+                                                                        , PaIWork.LineCount));
+                List<PaymentDataDetail> ExistList = new List<PaymentDataDetail>();
+                if (!PayDetailDB.SelectAction(strSelectSQL.ToString(), ref ExistList, false)) return false;
+                if (ExistList.Count < 1) return true;
+
                 StringBuilder strActionSQL = new StringBuilder();
                 // æ”¯æ‰•æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æ›´æ–°
                 switch (nAppStat)
@@ -805,7 +815,7 @@
                 StringBuilder strSQL = new StringBuilder();
                 strSQL.Append("UPDATE paymentdatadetail SET");
                 strSQL.Append(strActionSQL.ToString());
-                strSQL.Append(PayDetailDB.CreatePrimarykeyString(PaIWork.CompanyCode, PaIWork.TargetDate, PaIWork.SeqNo, PaIWork.LineCount));
+                strSQL.Append(strSelectSQL.ToString());
 
                 if (!PayDetailDB.ExecuteNonQuery(strSQL.ToString(), false)) return false;
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 294)
@@ -33,6 +33,7 @@
         #endregion
 
         #region ’è�”
+        #region •\Ž¦ƒJƒ‰ƒ€
         /// <summary>
         /// •\Ž¦ƒJƒ‰ƒ€
         /// </summary>
@@ -50,6 +51,7 @@
             ConstructionCode,
             OrderNo,
         }
+        #endregion
 
         #region ƒRƒ“ƒgƒ��[ƒ‹ƒCƒxƒ“ƒg’è‹`
         /// <summary>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 294)
@@ -75,7 +75,7 @@
         /// </summary>
         private enum GetData
         {
-            CONSTRUCTIONCODE,
+            CONSTRUCTIONCODE = 0,
             CONSTRUCTIONPERIOD,
             CONSTRUCTIONNAME,
             CONSTRUCTIONSTATUSFLG,
@@ -703,18 +703,31 @@
                 for (int i = 0; i < s_SQLPart4.Length; i++) wrkFormat.Append(s_SQLPart4[i]);
 
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-                strSQL.Append(" AND NOT EXISTS (SELECT * FROM PURCHASEORDER B1 WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
-                strSQL.AppendFormat(" And ((A.TYINGFLG != {0} AND ({1} <= A.ConstructionStatusFlg And A.ConstructionStatusFlg <= {2}))",
-                                                                (int)ConstructionBaseInfo.TyingFlgDef.Tying, ProgressStart, ProgressComplete);
-                strSQL.AppendFormat(" OR (A.TYINGFLG = {0} AND ({1} <= A.ConstructionStatusFlg And A.ConstructionStatusFlg <= {2})))",
-                                                                (int)ConstructionBaseInfo.TyingFlgDef.Tying, ProgressStart, ProgressComplete2);
+
+                strSQL.Append(" AND NOT EXISTS");
+                strSQL.Append(" (SELECT * FROM PURCHASEORDER B1");
+                strSQL.Append(" WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
+                strSQL.AppendFormat(" And ((A.TYINGFLG != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying);
+                strSQL.AppendFormat(" AND ({0} <= A.ConstructionStatusFlg", ProgressStart);
+                strSQL.AppendFormat(" And A.ConstructionStatusFlg <= {0}))", ProgressComplete);
+
+                strSQL.AppendFormat(" OR (A.TYINGFLG = {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying);
+                strSQL.AppendFormat(" AND ({0} <= A.ConstructionStatusFlg", ProgressStart);
+                strSQL.AppendFormat(" And A.ConstructionStatusFlg <= {0})))", ProgressComplete2);
+                
                 strSQL.Append(" AND A.ConstructionPersonCode != 0");
                 strSQL.Append(" AND ((A.ConstructionCode IN ");
-                strSQL.Append(" (SELECT AA1.CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL AA1 WHERE (AA1.COMPANYCODE != 0 AND AA1.COMPANYCODE != -1)");
+                
+                strSQL.Append(" (SELECT AA1.CONSTRUCTIONCODE");
+                strSQL.Append(" FROM CONSTRUCTIONBUDGETDETAIL AA1");
+                strSQL.Append(" WHERE (AA1.COMPANYCODE != 0");
+                strSQL.Append(" AND AA1.COMPANYCODE != -1)");
                 strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE");
+
                 strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice);
                 strSQL.Append(" AND (A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND A1.APPROVALCODE = {0} AND A1.SEQNO = 1", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
+                strSQL.AppendFormat(" AND A1.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
+                strSQL.Append(" AND A1.SEQNO = 1");
                 strSQL.AppendFormat(" AND A1.APPROVALSTATUS = {0})", (int)CommonDefine.ApprovalStatus.Approval);
                 strSQL.Append(" OR A.JOINFLG = 1)");
 
@@ -729,13 +742,15 @@
 
                 wrkFormat.Clear();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1), ifnull(App.OrderNo, 0)");
+                wrkFormat.Append(", ifnull(App.ApprovalStatus, -1)");
+                wrkFormat.Append(", ifnull(App.OrderNo, 0)");
                 for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
 
                 for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
                 for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]);
 
-                wrkFormat.Append(" LEFT JOIN processapproval AS App ON App.ConstructionCode = A.ConstructionCode");
+                wrkFormat.Append(" LEFT JOIN processapproval AS App");
+                wrkFormat.Append(" ON App.ConstructionCode = A.ConstructionCode");
                 wrkFormat.AppendFormat(" AND App.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
                 wrkFormat.AppendFormat(" And App.OrderNo = {0}", CommonDefine.s_Default_OrderNo);
                 wrkFormat.Append(" And App.SeqNo = 1");
@@ -745,7 +760,11 @@
 
                 strSQL.Append(" UNION (");
                 strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value);
-                strSQL.Append(" AND EXISTS (SELECT * FROM PURCHASEORDER B1 WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
+                
+                strSQL.Append(" AND EXISTS");
+                strSQL.Append(" (SELECT * FROM PURCHASEORDER B1");
+                strSQL.Append(" WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
+                
                 strSQL.Append(" AND A.CONSTRUCTIONPERSONCODE != 0");
                 strSQL.Append(" AND A1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
 
@@ -980,8 +999,8 @@
                 strSQL.Append("    And A4.ApprovalCode = A3.ApprovalCode");
                 strSQL.Append("    And A4.OrderNo = A3.OrderNo");
                 strSQL.Append("    And A4.SeqNo = 1");
-                strSQL.Append(" WHERE");
-                strSQL.AppendFormat("  A1.CONSTRUCTIONCODE = {0}", ParentCode);
+                strSQL.AppendFormat(" WHERE A1.CONSTRUCTIONCODE = {0}", ParentCode);
+                strSQL.AppendFormat("  And A1.SOURCECODE = {0}", SourceCode);
                 strSQL.AppendFormat("  AND A1.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
                 strSQL.Append("  AND A1.COMPANYCODE > 0");
                 strSQL.AppendFormat("  And A1.EXECUTIONAMOUNT >= {0}", CommonDefine.s_PrintOutPrice);
@@ -998,6 +1017,7 @@
                 {
                     int OrderFlg = CommonMotions.cnvInt(objRec[0]);
                     int Status = CommonMotions.cnvInt(objRec[7]);
+
                     // �ì�¬–¢‚ª‚ ‚ê‚Î�ˆ—��I—¹
                     if (OrderFlg == (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate)
                     {
@@ -1461,7 +1481,6 @@
                 ProgressBar.Value = 0;
                 if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo) grpExample1.Visible = !bDisp;
 
-                btnDataEntry.Visible = !bDisp;
                 btnEnd.Visible = !bDisp;
                 btnDataCopy.Visible = !bDisp;
                 btnDataUpDate.Visible = !bDisp;
@@ -1472,6 +1491,8 @@
                 radioButton1.Enabled = !bDisp;
                 radioButton2.Enabled = !bDisp;
 
+                if (m_DataAddtionButton) btnDataEntry.Visible = !bDisp;
+
                 this.Update();
             }
             catch (Exception ex)
@@ -1605,10 +1626,7 @@
                 }
 
                 // ƒf�[ƒ^’Ç‰Á–³‚Íƒ{ƒ^ƒ“”ñ•\Ž¦
-                if (!m_DataAddtionButton)
-                {
-                    btnDataEntry.Visible = false;
-                }
+                btnDataEntry.Visible = m_DataAddtionButton;
 
                 switch (m_ExecuteFlg)
                 {
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs	(revision 294)
@@ -792,7 +792,7 @@
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(110, 25);
             this.label9.TabIndex = 0;
-            this.label9.Text = "å½“æœŸçµŒé�Žçµ¦ä¸Ž";
+            this.label9.Text = "å½“æœŸå¿…è¦�çµ¦ä¸Ž";
             this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // lblPayroll
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs	(revision 294)
@@ -43,6 +43,20 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
+            this.lblCellTotal = new System.Windows.Forms.Label();
+            this.ProgressBar = new System.Windows.Forms.ProgressBar();
+            this.btnLedgerStatus = new System.Windows.Forms.Button();
+            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.pnlPayroll = new System.Windows.Forms.Panel();
             this.label18 = new System.Windows.Forms.Label();
@@ -80,24 +94,10 @@
             this.numUDConstPro = new System.Windows.Forms.NumericUpDown();
             this.label4 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.lblCellTotal = new System.Windows.Forms.Label();
-            this.ProgressBar = new System.Windows.Forms.ProgressBar();
-            this.btnLedgerStatus = new System.Windows.Forms.Button();
-            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.pnlPayroll.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.SuspendLayout();
             // 
             // btnEnd
@@ -127,6 +127,226 @@
             this.label1.Text = "éƒ¨ã€€ç½²ã€€åˆ¥ã€€å�°ã€€å¸³ã€€ä¸€ã€€è¦§";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lblCellTotal
+            // 
+            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblCellTotal.AutoSize = true;
+            this.lblCellTotal.BackColor = System.Drawing.Color.Black;
+            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblCellTotal.ForeColor = System.Drawing.Color.White;
+            this.lblCellTotal.Location = new System.Drawing.Point(200, 628);
+            this.lblCellTotal.Name = "lblCellTotal";
+            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
+            this.lblCellTotal.TabIndex = 29;
+            // 
+            // ProgressBar
+            // 
+            this.ProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ProgressBar.Location = new System.Drawing.Point(5, 619);
+            this.ProgressBar.Name = "ProgressBar";
+            this.ProgressBar.Size = new System.Drawing.Size(388, 30);
+            this.ProgressBar.TabIndex = 30;
+            this.ProgressBar.Visible = false;
+            // 
+            // btnLedgerStatus
+            // 
+            this.btnLedgerStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnLedgerStatus.BackColor = System.Drawing.Color.DodgerBlue;
+            this.btnLedgerStatus.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnLedgerStatus.ForeColor = System.Drawing.Color.Black;
+            this.btnLedgerStatus.Location = new System.Drawing.Point(1185, 5);
+            this.btnLedgerStatus.Name = "btnLedgerStatus";
+            this.btnLedgerStatus.Size = new System.Drawing.Size(150, 30);
+            this.btnLedgerStatus.TabIndex = 48;
+            this.btnLedgerStatus.Text = "æœªä½œæˆ�å�°å¸³ç¢ºèª�";
+            this.btnLedgerStatus.UseVisualStyleBackColor = false;
+            this.btnLedgerStatus.Click += new System.EventHandler(this.btnLedgerStatus_Click);
+            // 
+            // dgvMaster
+            // 
+            this.dgvMaster.AllowUserToAddRows = false;
+            this.dgvMaster.AllowUserToDeleteRows = false;
+            this.dgvMaster.AllowUserToResizeColumns = false;
+            this.dgvMaster.AllowUserToResizeRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvMaster.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.dgvMaster.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column3,
+            this.Column1,
+            this.Column14,
+            this.Column5,
+            this.Column6,
+            this.Column7,
+            this.Column8,
+            this.Column9,
+            this.Column10,
+            this.Column12});
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
+            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvMaster.EnableHeadersVisualStyles = false;
+            this.dgvMaster.Location = new System.Drawing.Point(5, 168);
+            this.dgvMaster.Name = "dgvMaster";
+            this.dgvMaster.RowHeadersVisible = false;
+            this.dgvMaster.RowHeadersWidth = 20;
+            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvMaster.RowTemplate.Height = 21;
+            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvMaster.Size = new System.Drawing.Size(1330, 446);
+            this.dgvMaster.TabIndex = 5;
+            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
+            this.dgvMaster.SelectionChanged += new System.EventHandler(this.dgvMaster_SelectionChanged);
+            this.dgvMaster.Leave += new System.EventHandler(this.dgvMaster_Leave);
+            this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
+            // 
+            // Column3
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
+            this.Column3.Frozen = true;
+            this.Column3.HeaderText = "ã‚³ãƒ¼ãƒ‰";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column3.Visible = false;
+            this.Column3.Width = 5;
+            // 
+            // Column1
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle4;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "â„–";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 50;
+            // 
+            // Column14
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column14.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column14.Frozen = true;
+            this.Column14.HeaderText = "éƒ¨ã€€ç½²";
+            this.Column14.Name = "Column14";
+            this.Column14.ReadOnly = true;
+            this.Column14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column14.Width = 280;
+            // 
+            // Column5
+            // 
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle6;
+            this.Column5.Frozen = true;
+            this.Column5.HeaderText = "å�—æ³¨é‡‘é¡�";
+            this.Column5.Name = "Column5";
+            this.Column5.ReadOnly = true;
+            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column5.Width = 140;
+            // 
+            // Column6
+            // 
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Column6.Frozen = true;
+            this.Column6.HeaderText = "ä¼šç¤¾çµŒè²»";
+            this.Column6.Name = "Column6";
+            this.Column6.ReadOnly = true;
+            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column6.Width = 140;
+            // 
+            // Column7
+            // 
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column7.Frozen = true;
+            this.Column7.HeaderText = "éƒ¨ç½²çµŒè²»";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column7.Width = 140;
+            // 
+            // Column8
+            // 
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle9;
+            this.Column8.Frozen = true;
+            this.Column8.HeaderText = "å–¶æ¥­çµŒè²»";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column8.Width = 140;
+            // 
+            // Column9
+            // 
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column9.Frozen = true;
+            this.Column9.HeaderText = "ç·�æ”¯æ‰•é¡�";
+            this.Column9.Name = "Column9";
+            this.Column9.ReadOnly = true;
+            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column9.Width = 140;
+            // 
+            // Column10
+            // 
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle11;
+            this.Column10.Frozen = true;
+            this.Column10.HeaderText = "ç²—ã€€åˆ©";
+            this.Column10.Name = "Column10";
+            this.Column10.ReadOnly = true;
+            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column10.Width = 140;
+            // 
+            // Column12
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle12;
+            this.Column12.Frozen = true;
+            this.Column12.HeaderText = "ç´”åˆ©ç›Š";
+            this.Column12.Name = "Column12";
+            this.Column12.ReadOnly = true;
+            this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column12.Width = 140;
+            // 
             // groupBox1
             // 
             this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
@@ -496,7 +716,7 @@
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(110, 25);
             this.label6.TabIndex = 0;
-            this.label6.Text = "å½“æœŸçµŒé�Žçµ¦ä¸Ž";
+            this.label6.Text = "å½“æœŸå¿…è¦�çµ¦ä¸Ž";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // lblPayroll
@@ -621,226 +841,6 @@
             this.label7.Text = "ç¬¬";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // lblCellTotal
-            // 
-            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblCellTotal.AutoSize = true;
-            this.lblCellTotal.BackColor = System.Drawing.Color.Black;
-            this.lblCellTotal.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblCellTotal.ForeColor = System.Drawing.Color.White;
-            this.lblCellTotal.Location = new System.Drawing.Point(200, 628);
-            this.lblCellTotal.Name = "lblCellTotal";
-            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
-            this.lblCellTotal.TabIndex = 29;
-            // 
-            // ProgressBar
-            // 
-            this.ProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.ProgressBar.Location = new System.Drawing.Point(5, 619);
-            this.ProgressBar.Name = "ProgressBar";
-            this.ProgressBar.Size = new System.Drawing.Size(388, 30);
-            this.ProgressBar.TabIndex = 30;
-            this.ProgressBar.Visible = false;
-            // 
-            // btnLedgerStatus
-            // 
-            this.btnLedgerStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLedgerStatus.BackColor = System.Drawing.Color.DodgerBlue;
-            this.btnLedgerStatus.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnLedgerStatus.ForeColor = System.Drawing.Color.Black;
-            this.btnLedgerStatus.Location = new System.Drawing.Point(1185, 5);
-            this.btnLedgerStatus.Name = "btnLedgerStatus";
-            this.btnLedgerStatus.Size = new System.Drawing.Size(150, 30);
-            this.btnLedgerStatus.TabIndex = 48;
-            this.btnLedgerStatus.Text = "æœªä½œæˆ�å�°å¸³ç¢ºèª�";
-            this.btnLedgerStatus.UseVisualStyleBackColor = false;
-            this.btnLedgerStatus.Click += new System.EventHandler(this.btnLedgerStatus_Click);
-            // 
-            // dgvMaster
-            // 
-            this.dgvMaster.AllowUserToAddRows = false;
-            this.dgvMaster.AllowUserToDeleteRows = false;
-            this.dgvMaster.AllowUserToResizeColumns = false;
-            this.dgvMaster.AllowUserToResizeRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvMaster.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.dgvMaster.BackgroundColor = System.Drawing.Color.White;
-            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column3,
-            this.Column1,
-            this.Column14,
-            this.Column5,
-            this.Column6,
-            this.Column7,
-            this.Column8,
-            this.Column9,
-            this.Column10,
-            this.Column12});
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
-            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvMaster.EnableHeadersVisualStyles = false;
-            this.dgvMaster.Location = new System.Drawing.Point(5, 168);
-            this.dgvMaster.Name = "dgvMaster";
-            this.dgvMaster.RowHeadersVisible = false;
-            this.dgvMaster.RowHeadersWidth = 20;
-            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 21;
-            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1330, 446);
-            this.dgvMaster.TabIndex = 5;
-            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
-            this.dgvMaster.SelectionChanged += new System.EventHandler(this.dgvMaster_SelectionChanged);
-            this.dgvMaster.Leave += new System.EventHandler(this.dgvMaster_Leave);
-            this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "ã‚³ãƒ¼ãƒ‰";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Visible = false;
-            this.Column3.Width = 5;
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "â„–";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 50;
-            // 
-            // Column14
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column14.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column14.Frozen = true;
-            this.Column14.HeaderText = "éƒ¨ã€€ç½²";
-            this.Column14.Name = "Column14";
-            this.Column14.ReadOnly = true;
-            this.Column14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column14.Width = 280;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column5.Frozen = true;
-            this.Column5.HeaderText = "å�—æ³¨é‡‘é¡�";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 140;
-            // 
-            // Column6
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column6.Frozen = true;
-            this.Column6.HeaderText = "ä¼šç¤¾çµŒè²»";
-            this.Column6.Name = "Column6";
-            this.Column6.ReadOnly = true;
-            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 140;
-            // 
-            // Column7
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column7.Frozen = true;
-            this.Column7.HeaderText = "éƒ¨ç½²çµŒè²»";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column7.Width = 140;
-            // 
-            // Column8
-            // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle9;
-            this.Column8.Frozen = true;
-            this.Column8.HeaderText = "å–¶æ¥­çµŒè²»";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column8.Width = 140;
-            // 
-            // Column9
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle10;
-            this.Column9.Frozen = true;
-            this.Column9.HeaderText = "ç·�æ”¯æ‰•é¡�";
-            this.Column9.Name = "Column9";
-            this.Column9.ReadOnly = true;
-            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column9.Width = 140;
-            // 
-            // Column10
-            // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle11;
-            this.Column10.Frozen = true;
-            this.Column10.HeaderText = "ç²—ã€€åˆ©";
-            this.Column10.Name = "Column10";
-            this.Column10.ReadOnly = true;
-            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column10.Width = 140;
-            // 
-            // Column12
-            // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle12;
-            this.Column12.Frozen = true;
-            this.Column12.HeaderText = "ç´”åˆ©ç›Š";
-            this.Column12.Name = "Column12";
-            this.Column12.ReadOnly = true;
-            this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column12.Width = 140;
-            // 
             // FrmDepExpenssList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -866,11 +866,11 @@
             this.Load += new System.EventHandler(this.FrmConstructionBaseInfoList_Load);
             this.SizeChanged += new System.EventHandler(this.FrmDepExpenssList_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmDepExpenssList_KeyDown);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.pnlPayroll.ResumeLayout(false);
             this.pnlPayroll.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 294)
@@ -294,10 +294,8 @@
 
                         // ‹‹—^—Ý�ÏŽæ“¾
                         int workSalary = 0;
-                        if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
-                        {
-                            workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, CurPersonCode);
-                        }
+                        workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, CurPersonCode);
+
                         // —ÝŒv‰ÁŽZ
                         TotalSalary += workSalary;
                     }
@@ -332,10 +330,7 @@
                     CreateLedgerSQL.GetPersonExpensesCostValue(CostDB, 0, PersonCode, dtDefaultStart, dtDefaultEnd, ref CostValue2);
 
                     // ‹‹—^—Ý�ÏŽæ“¾
-                    if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
-                    {
-                        TotalSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCode);
-                    }
+                    TotalSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCode);
 
                     // �U•ª‹‹—^‹àŠz�E�ƒ—˜‰v‹àŠz�E‘e—˜‰v‹àŠzŽæ“¾
                     CreateLedgerSQL.ProfitGeneral(LedgerDB, (int)numUDConstPro.Value, DepartmentCode, PersonCode, ref OnSalary, false);
@@ -357,7 +352,10 @@
                 // ‰ÁŽZ
                 wrkArray[(int)DBGetData.NetProfit] += CostValue3.Sum();         // �ƒ—˜‰v
                 // ------------------------------------------------------------------------------------------
+                // ‘S‘Ì•\Ž¦Žž�A‘S‚Ä‚O‚Í•\Ž¦‚µ‚È‚¢
+                if (PersonCode == 0 && wrkArray.Sum() == 0) { return; }
 
+                // ------------------------------------------------------------------------------------------
                 dgv.Rows.Add(objwrk[(int)DBGetData.DepartmentCode],
                                     ino++,
                                     CommonMotions.cnvString(objwrk[(int)DBGetData.DepartmentString]),
@@ -1045,10 +1043,9 @@
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                 strSQL.AppendFormat(" AND B.TyingFlg != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying);
                 strSQL.AppendFormat(" AND B.JoinFlg != {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
-                strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE,");
-                strSQL.Append(" DEPARTMENTMASTER D");
-                strSQL.Append(" WHERE B.CONSTRUCTIONPERSONCODE = C.PERSONCODE");
-                strSQL.Append(" AND C.DEPARTMENTCODE = D.DEPARTMENTCODE");
+                strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
+                strSQL.Append(", DEPARTMENTMASTER D");
+                strSQL.Append(" Where C.DEPARTMENTCODE = D.DEPARTMENTCODE");
 
                 strSQL.Append(" GROUP BY  C.DEPARTMENTCODE, D.DEPARTMENTSTRING, D.DISPLAYORDER");
                 strSQL.Append(" ORDER BY 3 ASC");
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 294)
@@ -213,14 +213,6 @@
                 strSQL.Append(" GROUP BY SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE, SUMTBL.PURCHASEORDERFLG");
                 strSQL.AppendFormat(" HAVING SUM(SUMTBL.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice);
 
-                //int SetConstructionCode = 0;
-                //if (SearchCode == 0)
-                //    SetConstructionCode = ParentCode;
-                //else
-                //    SetConstructionCode = SearchCode;
-                //strSQL.Append(" OR ((A.SOURCECODE, A.COMPANYCODE) IN");
-                //strSQL.AppendFormat(" (SELECT POR.CONSTRUCTIONCODE, POR.COMPANYCODE FROM PURCHASEORDER POR WHERE POR.CONSTRUCTIONCODE = {0})))", SetConstructionCode);
-
                 strSQL.Append(" AND NOT EXISTS (SELECT * FROM purchaseorderdetail AS C, purchaseorder AS D");
                 strSQL.Append(" WHERE C.ConstructionCode = A.SourceCode");
                 strSQL.Append(" AND D.ConstructionCode = C.ConstructionCode");
@@ -235,7 +227,14 @@
                 strSQL.Append(", A.SECONDSTRING");
                 strSQL.Append(", A.COMPANYCODE AS COMPANYCODE");
                 strSQL.Append(", A.COMPANYNAME");
-                strSQL.Append(", A.EXECUTIONAMOUNT");
+
+                //strSQL.Append(", A.EXECUTIONAMOUNT");
+                
+                strSQL.Append(", Case ifnull(F.OrderPrice, 0)");
+	            strSQL.Append(" When 0 Then A.EXECUTIONAMOUNT");
+	            strSQL.Append(" Else F.OrderPrice");
+                strSQL.Append(" End AS EXECUTIONAMOUNT");
+
                 strSQL.Append(", A.SOURCECODE");
                 strSQL.Append(", A.PURCHASEORDERFLG");
                 strSQL.Append(", B.DETAILSTRING");
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 294)
@@ -1702,6 +1702,9 @@
                 // å�”åŠ›ä¼šç¤¾ã�®å¤‰æ›´ãƒ�ã‚§ãƒƒã‚¯
                 ChangeCompany = ChangeCompanyTab(DataTab, ref  BeforeCode);
 
+                // å¤‰æ›´ã�Œã�ªã�„å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (!ChangeCompany) return true;
+
                 DataGridView dgv = DataTab.Group1DataGridView;
                 foreach (DataGridViewRow CurRow in dgv.Rows)
                 {
@@ -1715,32 +1718,28 @@
                     if (QuantityVal == 0 && PriceVal == 0) continue;
                     if (LedgerLine == 0) continue;
 
-                    // å¤‰æ›´ã�Œã�‚ã‚‹å ´å�ˆã�¯å�”åŠ›ä¼šç¤¾ã‚’å¤‰æ›´ã�™ã‚‹
-                    if (ChangeCompany)
+                    // ----- å¤‰æ›´ã�Œã�‚ã‚‹å ´å�ˆã�¯å�”åŠ›ä¼šç¤¾ã‚’å¯¾è±¡å¤–ã�«å¤‰æ›´ã�—è¡Œè¿½åŠ 
+                    // å�”åŠ›ä¼šç¤¾å��å¤‰æ›´
+                    TargetField = (int)IOConstructionLedgerDetail.TableColumn.CompanyName;
+                    strSQL.Clear();
+                    strSQL.Append(LDetailDB.CreatePrimarykeyString(TargetCode));
+                    strSQL.AppendFormat(" AND SOURCECODE = {0}", m_ConstructionCode);
+                    strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                    strSQL.AppendFormat(" AND COMPANYCODE = {0}", BeforeCode);
+                    strSQL.AppendFormat(" AND LINECOUNT = {0}", LedgerLine);
+                    if (!LDetailDB.UpdateFeild(strSQL.ToString(), TargetField, DataTab.EntryTab.Text, false))
                     {
-                        // å�”åŠ›ä¼šç¤¾å��å¤‰æ›´
-                        TargetField = (int)IOConstructionLedgerDetail.TableColumn.CompanyName;
-                        strSQL.Clear();
-                        strSQL.Append(LDetailDB.CreatePrimarykeyString(TargetCode));
-                        strSQL.AppendFormat(" AND SOURCECODE = {0}", m_ConstructionCode);
-                        strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
-                        strSQL.AppendFormat(" AND COMPANYCODE = {0}", BeforeCode);
-                        //strSQL += string.Format(" AND EXECUTIONAMOUNT = {0}", PriceVal);
-                        //if (LedgerLine != 0) strSQL.AppendFormat(" AND LINECOUNT = {0}", LedgerLine);
-                        strSQL.AppendFormat(" AND LINECOUNT = {0}", LedgerLine);
-                        if (!LDetailDB.UpdateFeild(strSQL.ToString(), TargetField, DataTab.EntryTab.Text, false))
-                        {
-                            LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šå�”åŠ›ä¼šç¤¾å��ç§°å¤‰æ›´ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
-                            return false;
-                        }
-                        // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰å¤‰æ›´
-                        TargetField = (int)IOConstructionLedgerDetail.TableColumn.CompanyCode;
-                        if (!LDetailDB.UpdateFeild(strSQL.ToString(), TargetField, DataTab.OrderCompanyCode, false))
-                        {
-                            LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šå�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰å¤‰æ›´ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
-                            return false;
-                        }
+                        LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šå�”åŠ›ä¼šç¤¾å��ç§°å¤‰æ›´ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
+                        return false;
                     }
+                    // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰å¤‰æ›´
+                    TargetField = (int)IOConstructionLedgerDetail.TableColumn.CompanyCode;
+                    if (!LDetailDB.UpdateFeild(strSQL.ToString(), TargetField, DataTab.OrderCompanyCode, false))
+                    {
+                        LogicalErrorMessage("æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ï¼šå�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰å¤‰æ›´ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ›´æ–°ã‚¨ãƒ©ãƒ¼", CommonMotions.GetMethodName());
+                        return false;
+                    }
+
                     // æ³¨æ–‡æ›¸ä½œæˆ�ãƒ•ãƒ©ã‚°ON
                     TargetField = (int)IOConstructionLedgerDetail.TableColumn.PurchaseOrderFlg;
                     strSQL.Clear();
@@ -1748,8 +1747,6 @@
                     strSQL.AppendFormat(" AND SOURCECODE = {0}", m_ConstructionCode);
                     strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
                     strSQL.AppendFormat(" AND COMPANYCODE = {0}", DataTab.OrderCompanyCode);
-                    //strSQL += string.Format(" AND EXECUTIONAMOUNT = {0}", PriceVal);
-                    //if (LedgerLine != 0) strSQL.AppendFormat(" AND LINECOUNT = {0}", LedgerLine);
                     strSQL.AppendFormat(" AND LINECOUNT = {0}", LedgerLine);
                     if (!LDetailDB.UpdateFeild(strSQL.ToString(), TargetField, (int)ConstructionLedgerDetail.PurOrderFlgDef.Making, false))
                     {
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs	(revision 294)
@@ -479,7 +479,7 @@
             // 
             dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.Column4.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column4.HeaderText = "æ³¨æ–‡æ›¸ä½œæˆ�æ—¥";
+            this.Column4.HeaderText = "æ³¨æ–‡æ›¸å�°åˆ·æ—¥";
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
             this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs	(revision 294)
@@ -198,62 +198,6 @@
         }
         #endregion
 
-        #region æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ï¼³ï¼±ï¼¬ä½œæˆ�
-        /// <summary>
-        /// æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ï¼³ï¼±ï¼¬ä½œæˆ�
-        /// </summary>
-        /// <param name="Alias"></param>
-        /// <returns></returns>
-        private string CerateFieldSQL(string Alias)
-        {
-            try
-            {
-                StringBuilder strcmd = new StringBuilder();
-
-                strcmd.AppendFormat(" {0}ConstructionCode", Alias);
-                strcmd.AppendFormat(",{0}SeqNo", Alias);
-                strcmd.AppendFormat(",{0}CompanyCode", Alias);
-                strcmd.AppendFormat(",DATE_FORMAT({0}CreateDate, '%Y/%m/%d')", Alias);
-                strcmd.AppendFormat(",{0}OrderPrice", Alias);
-                strcmd.AppendFormat(",DATE_FORMAT({0}LastRowStringDate, '%Y/%m/%d')", Alias);
-
-                strcmd.AppendFormat(",{0}OrderSheetType", Alias);
-                strcmd.AppendFormat(",{0}PaymentTerms", Alias);
-                strcmd.AppendFormat(",{0}CashRatio", Alias);
-                strcmd.AppendFormat(",{0}BillPeriod", Alias);
-
-                strcmd.AppendFormat(",{0}PrePayments", Alias);
-                strcmd.AppendFormat(",{0}PrePaymentsDays", Alias);
-                strcmd.AppendFormat(",{0}PrePaymentsPrice", Alias);
-                strcmd.AppendFormat(",{0}PartialPayment", Alias);
-                strcmd.AppendFormat(",{0}PartialPaymentMounth", Alias);
-                strcmd.AppendFormat(",{0}PartialPaymentDay1", Alias);
-                strcmd.AppendFormat(",{0}PartialPaymentDay2", Alias);
-                strcmd.AppendFormat(",{0}PartialPaymentPrice", Alias);
-                strcmd.AppendFormat(",{0}CompletionPayment", Alias);
-                strcmd.AppendFormat(",{0}CompletionPaymentDays", Alias);
-                strcmd.AppendFormat(",{0}CompletionPaymentPrice", Alias);
-                strcmd.AppendFormat(",{0}LeadEngineerCode", Alias);
-                strcmd.AppendFormat(",{0}LeadEngineerName", Alias);
-                strcmd.AppendFormat(",{0}SafetyOfficerCode", Alias);
-                strcmd.AppendFormat(",{0}SafetyOfficerName", Alias);
-                strcmd.AppendFormat(",{0}WorkersCount", Alias);
-                strcmd.AppendFormat(",DATE_FORMAT({0}PrintoutDate, '%Y/%m/%d')", Alias);
-
-                strcmd.AppendFormat(", DATE_FORMAT({0}EntryDate, '%Y/%m/%d %H:%i:%s')", Alias);
-                strcmd.AppendFormat(", DATE_FORMAT({0}UpdateDate, '%Y/%m/%d %H:%i:%s')", Alias);
-
-                return strcmd.ToString();
-
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return string.Empty;
-            }
-        }
-        #endregion
-
         #region æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—
         /// <summary>
         /// æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—ã�—ã�¦ç”»é�¢è¡¨ç¤ºã�™ã‚‹
@@ -266,24 +210,61 @@
             try
             {
                 // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿èª­è¾¼
-                string strSQL = "SELECT";
-                strSQL += CerateFieldSQL("A.");
-                strSQL += " FROM PURCHASEORDER A, PROCESSAPPROVALDETAIL B, PROCESSAPPROVAL C";
-                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                strSQL += " AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND B.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
-                strSQL += string.Format(" AND B.ORDERNO = {0}", m_OrderNo);
-                strSQL += " AND B.LINKCODE = A.SEQNO";
-                strSQL += " AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND C.APPROVALCODE = B.APPROVALCODE AND C.ORDERNO = B.ORDERNO AND C.SEQNO = 1";
-                strSQL += string.Format(" AND C.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval);
-                strSQL += " ORDER BY A.SEQNO";
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("SELECT");
 
+                strSQL.Append(" A.ConstructionCode");
+                strSQL.Append(",A.SeqNo");
+                strSQL.Append(",A.CompanyCode");
+                strSQL.Append(",DATE_FORMAT(A.CreateDate, '%Y/%m/%d')");
+                strSQL.Append(",A.OrderPrice");
+                strSQL.Append(",DATE_FORMAT(A.LastRowStringDate, '%Y/%m/%d')");
+
+                strSQL.Append(",A.OrderSheetType");
+                strSQL.Append(",A.PaymentTerms");
+                strSQL.Append(",A.CashRatio");
+                strSQL.Append(",A.BillPeriod");
+
+                strSQL.Append(",A.PrePayments");
+                strSQL.Append(",A.PrePaymentsDays");
+                strSQL.Append(",A.PrePaymentsPrice");
+                strSQL.Append(",A.PartialPayment");
+                strSQL.Append(",A.PartialPaymentMounth");
+                strSQL.Append(",A.PartialPaymentDay1");
+                strSQL.Append(",A.PartialPaymentDay2");
+                strSQL.Append(",A.PartialPaymentPrice");
+                strSQL.Append(",A.CompletionPayment");
+                strSQL.Append(",A.CompletionPaymentDays");
+                strSQL.Append(",A.CompletionPaymentPrice");
+                strSQL.Append(",A.LeadEngineerCode");
+                strSQL.Append(",A.LeadEngineerName");
+                strSQL.Append(",A.SafetyOfficerCode");
+                strSQL.Append(",A.SafetyOfficerName");
+                strSQL.Append(",A.WorkersCount");
+                strSQL.Append(",DATE_FORMAT(A.PrintoutDate, '%Y/%m/%d')");
+
+                strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')");
+                strSQL.Append(", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')");
+
+                strSQL.Append(" FROM PURCHASEORDER A");
+                strSQL.Append(", PROCESSAPPROVALDETAIL B");
+                strSQL.Append(", PROCESSAPPROVAL C");
+                strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL.Append(" AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
+                strSQL.AppendFormat(" AND B.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQL.AppendFormat(" AND B.ORDERNO = {0}", m_OrderNo);
+                strSQL.Append(" AND B.LINKCODE = A.SEQNO");
+                strSQL.Append(" AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND C.APPROVALCODE = B.APPROVALCODE AND C.ORDERNO = B.ORDERNO AND C.SEQNO = 1");
+                strSQL.AppendFormat(" AND C.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+                strSQL.Append(" ORDER BY A.SEQNO");
+
                 ArrayList arList = new ArrayList();
-                if (!OrderDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (!OrderDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
                 if (arList.Count == 0) return false;
 
                 int icnt = 1;
                 PurchaseOrder OrderRec = new PurchaseOrder();
+                string strPrintDate = string.Empty;
                 foreach (object[] objRec in arList)
                 {
                     OrderDB.Reader2Struct(objRec, ref OrderRec);
@@ -314,11 +295,15 @@
                             PurchaseString += "å¼•æ¸¡æ™‚æ‰•";      // å¼•æ¸¡ã�—æ™‚ã�®æ”¯æ‰•
                         }
                     }
+                    strPrintDate = OrderRec.PrintoutDate.ToShortDateString();
+                    if (OrderRec.PrintoutDate.Date == DateTime.MinValue.Date)
+                        strPrintDate = string.Empty;
+
                     dgvAllDisplay.Rows.Add(icnt,
                                             OrderRec.SeqNo,
                                             string.Format("{0}-{1}", OrderRec.ConstructionCode, OrderRec.SeqNo.ToString("000")),    // ç™ºæ³¨ç•ªå�·ã‚»ãƒƒãƒˆ
                                             SubConRec.CompanyName,                                                                  // ç™ºæ³¨å…ˆä¼šç¤¾å��
-                                            OrderRec.CreateDate.ToShortDateString(),                                                // æ³¨æ–‡æ›¸ä½œæˆ�æ—¥
+                                            strPrintDate,                                                                           // æ³¨æ–‡æ›¸å�°åˆ·æ—¥
                                             OrderRec.OrderPrice.ToString("#,0"),                                                    // ç™ºæ³¨é‡‘é¡�
                                             PurchaseString,                                                                         // æ”¯æ‰•æ�¡ä»¶
                                             true);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 294)
@@ -144,6 +144,7 @@
             TantoShoninCode,
             TantoShonin,
             TantoDate,
+            TantoDepCode,
             Shonin1Code,
             Shonin1,
             Shonin1Date,
@@ -198,8 +199,14 @@
             ShohiZeiRitu,
             ConstructionLedgerLineNo,
             ConstructionLedgerColNo,
-            DepartmentCode,
-            ConstructionPerson,
+            ConstrDepCode,
+            ConstrPerson,
+            SalesPerson,
+            AssistPerson,
+            InstrPerson,
+            SalesDepCode,
+            AssistDepCode,
+            InstrDepCode,
         }
         #endregion
 
@@ -234,12 +241,16 @@
             ApprovalPersonCode,         // �\�¿’S“–ŽÒ
             TantoNM,                    // �\�¿’S“–ŽÒ–¼
             ApprovalDate,               // �\�¿“ú•t
-            ApprovalEndFlg,
-            SalesPersonCode,
+            ApprovalEndFlg,             // �Å�I�³”Fƒtƒ‰ƒO
+            AppDepCode,                 // �\�¿ŽÒ•”��
+            SalesPersonCode,            // ‰c‹Æ’S“–ŽÒ
             ConstructionPersonCode,     // �HŽ–’S“–ŽÒ
             ConstrSubPersonCode,        // •›’S“–ŽÒ
             ConstructionInstructor,     // Žw“±ˆõ
-            DepartmentCode,             // �HŽ–’S“–ŽÒ•”��ƒR�[ƒh
+            ConstrDepCode,              // �HŽ–’S“–ŽÒ•”��ƒR�[ƒh
+            SalesDepCode,               // ‰c‹Æ’S“–ŽÒ•”��ƒR�[ƒh
+            AssistDepCode,              // •›’S“–ŽÒ•”��ƒR�[ƒh
+            InstrDepCode,               // Žw“±ˆõ•”��ƒR�[ƒh
             PurchaseOrderMailingDate,   // ’�•¶�‘—X‘—“ú
             PurchaseOrderReturnDate,    // ’�•¶�‘•Ô‘—“ú
             PaData,                     // —\ŽZ�‘
@@ -1404,7 +1415,20 @@
         }
         #endregion
 
+        #region �Å�V�ó‘Ô‚Ö�Ä•`‰æ
         /// <summary>
+        /// �Å�V�ó‘Ô‚Ö�Ä•`‰æ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnDataUpDate_Click(object sender, EventArgs e)
+        {
+            // ƒf�[ƒ^•\Ž¦
+            DispGridData();
+        }
+        #endregion
+
+        /// <summary>
         /// ŽèŠÔ�E’Ê�í‹ÆŽÒˆê——‰æ–Ê‚ð•\Ž¦‚·‚é�iƒeƒXƒg”Å�j
         /// </summary>
         /// <param name="sender"></param>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs	(revision 294)
@@ -30,8 +30,6 @@
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = 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();
@@ -57,6 +55,8 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = 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();
@@ -104,6 +104,8 @@
             this.button1 = new System.Windows.Forms.Button();
             this.btnOtherProc = new System.Windows.Forms.Button();
             this.DataProgressBar = new System.Windows.Forms.ProgressBar();
+            this.btnShowView = new System.Windows.Forms.Button();
+            this.btnDataUpDate = new System.Windows.Forms.Button();
             this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.label11 = new System.Windows.Forms.Label();
             this.cmbPerson = new System.Windows.Forms.ComboBox();
@@ -126,8 +128,6 @@
             this.cmbTargetMonth = new System.Windows.Forms.ComboBox();
             this.label3 = new System.Windows.Forms.Label();
             this.dgvCompany = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dgvProject = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.btnShowView = new System.Windows.Forms.Button();
             this.Column135 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column133 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column71 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -164,6 +164,7 @@
             this.Column36 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column66 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column155 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column37 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column65 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -220,6 +221,13 @@
             this.Column140 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column145 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column149 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column150 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column151 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column152 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column153 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column154 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgvProject = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column136 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column134 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -256,6 +264,7 @@
             this.Column50 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Project_Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column78 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column156 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column52 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Project_Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column79 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -312,6 +321,12 @@
             this.Column142 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column146 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column148 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.groupBoxEx1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -554,6 +569,33 @@
             this.DataProgressBar.TabIndex = 96;
             this.DataProgressBar.Visible = false;
             // 
+            // btnShowView
+            // 
+            this.btnShowView.BackColor = System.Drawing.Color.Blue;
+            this.btnShowView.ForeColor = System.Drawing.Color.White;
+            this.btnShowView.Location = new System.Drawing.Point(206, 6);
+            this.btnShowView.Margin = new System.Windows.Forms.Padding(4);
+            this.btnShowView.Name = "btnShowView";
+            this.btnShowView.Size = new System.Drawing.Size(120, 30);
+            this.btnShowView.TabIndex = 8;
+            this.btnShowView.Text = "è¡¨ã€€ç¤º";
+            this.btnShowView.UseVisualStyleBackColor = false;
+            this.btnShowView.Visible = false;
+            this.btnShowView.Click += new System.EventHandler(this.btnShowView_Click);
+            // 
+            // btnDataUpDate
+            // 
+            this.btnDataUpDate.BackColor = System.Drawing.Color.Aquamarine;
+            this.btnDataUpDate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDataUpDate.ForeColor = System.Drawing.Color.Black;
+            this.btnDataUpDate.Location = new System.Drawing.Point(206, 5);
+            this.btnDataUpDate.Name = "btnDataUpDate";
+            this.btnDataUpDate.Size = new System.Drawing.Size(120, 30);
+            this.btnDataUpDate.TabIndex = 97;
+            this.btnDataUpDate.Text = "æœ€æ–°çŠ¶æ…‹ã�«æ›´æ–°";
+            this.btnDataUpDate.UseVisualStyleBackColor = false;
+            this.btnDataUpDate.Click += new System.EventHandler(this.btnDataUpDate_Click);
+            // 
             // groupBoxEx1
             // 
             this.groupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -906,6 +948,7 @@
             this.Column36,
             this.Column17,
             this.Column66,
+            this.Column155,
             this.Column37,
             this.Column18,
             this.Column65,
@@ -961,7 +1004,13 @@
             this.Column139,
             this.Column140,
             this.Column145,
-            this.Column147});
+            this.Column147,
+            this.Column149,
+            this.Column150,
+            this.Column151,
+            this.Column152,
+            this.Column153,
+            this.Column154});
             dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Window;
             dataGridViewCellStyle27.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
@@ -991,160 +1040,6 @@
             this.dgvCompany.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellValueChanged);
             this.dgvCompany.CurrentCellDirtyStateChanged += new System.EventHandler(this.DataGridView_CurrentCellDirtyStateChanged);
             // 
-            // dgvProject
-            // 
-            this.dgvProject.AllowUserToAddRows = false;
-            this.dgvProject.AllowUserToDeleteRows = false;
-            this.dgvProject.AllowUserToResizeRows = false;
-            this.dgvProject.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.dgvProject.BackgroundColor = System.Drawing.Color.White;
-            this.dgvProject.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvProject.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
-            this.dgvProject.ColumnHeadersHeight = 45;
-            this.dgvProject.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvProject.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column136,
-            this.Column134,
-            this.dataGridViewTextBoxColumn1,
-            this.Column63,
-            this.Column35,
-            this.Project_Column1,
-            this.Column90,
-            this.Column51,
-            this.Project_Column2,
-            this.Project_Column3,
-            this.Project_Column4,
-            this.Project_Column5,
-            this.Project_Column6,
-            this.Column138,
-            this.Project_Column7,
-            this.Column144,
-            this.Project_Column8,
-            this.Project_Column9,
-            this.Project_Column10,
-            this.Project_Column11,
-            this.Project_Column12,
-            this.Project_Column13,
-            this.Project_Column14,
-            this.Project_Column15,
-            this.Project_Column16,
-            this.Project_Column17,
-            this.Project_Column18,
-            this.Project_Column19,
-            this.Column100,
-            this.KyouryokuKin_Pro,
-            this.Project_Column21,
-            this.Project_Column22,
-            this.Project_Column23,
-            this.Column50,
-            this.Project_Column24,
-            this.Column78,
-            this.Column52,
-            this.Project_Column25,
-            this.Column79,
-            this.Column113,
-            this.Column114,
-            this.Column53,
-            this.Project_Column26,
-            this.Column81,
-            this.Column115,
-            this.Column116,
-            this.Column54,
-            this.Project_Column27,
-            this.Column82,
-            this.Column117,
-            this.Column118,
-            this.Column55,
-            this.Project_Column28,
-            this.Column83,
-            this.Column119,
-            this.Column120,
-            this.Column56,
-            this.Project_Column29,
-            this.Column84,
-            this.Column121,
-            this.Column122,
-            this.Column57,
-            this.Project_Column30,
-            this.Column80,
-            this.Column123,
-            this.Column124,
-            this.Column58,
-            this.Project_Column31,
-            this.Column85,
-            this.Column125,
-            this.Column126,
-            this.Column59,
-            this.Project_Column32,
-            this.Column86,
-            this.Column127,
-            this.Column128,
-            this.Column60,
-            this.Project_Column33,
-            this.Column87,
-            this.Column129,
-            this.Column130,
-            this.Column61,
-            this.Project_Column34,
-            this.Column88,
-            this.Column131,
-            this.Column132,
-            this.Column21,
-            this.Column77,
-            this.Column141,
-            this.Column142,
-            this.Column146,
-            this.Column148});
-            dataGridViewCellStyle58.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle58.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle58.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle58.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle58.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
-            dataGridViewCellStyle58.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle58.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvProject.DefaultCellStyle = dataGridViewCellStyle58;
-            this.dgvProject.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvProject.EnableHeadersVisualStyles = false;
-            this.dgvProject.Location = new System.Drawing.Point(10, 114);
-            this.dgvProject.Margin = new System.Windows.Forms.Padding(4);
-            this.dgvProject.MultiSelect = false;
-            this.dgvProject.Name = "dgvProject";
-            this.dgvProject.RowHeadersVisible = false;
-            this.dgvProject.RowHeadersWidth = 20;
-            this.dgvProject.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvProject.RowTemplate.Height = 21;
-            this.dgvProject.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvProject.Size = new System.Drawing.Size(1320, 530);
-            this.dgvProject.TabIndex = 3;
-            this.dgvProject.Visible = false;
-            this.dgvProject.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.DataGridView_CellBeginEdit);
-            this.dgvProject.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellDoubleClick);
-            this.dgvProject.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellEnter);
-            this.dgvProject.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.DataGridView_CellFormatting);
-            this.dgvProject.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellValidated);
-            this.dgvProject.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellValueChanged);
-            this.dgvProject.CurrentCellDirtyStateChanged += new System.EventHandler(this.DataGridView_CurrentCellDirtyStateChanged);
-            // 
-            // btnShowView
-            // 
-            this.btnShowView.BackColor = System.Drawing.Color.Blue;
-            this.btnShowView.ForeColor = System.Drawing.Color.White;
-            this.btnShowView.Location = new System.Drawing.Point(206, 6);
-            this.btnShowView.Margin = new System.Windows.Forms.Padding(4);
-            this.btnShowView.Name = "btnShowView";
-            this.btnShowView.Size = new System.Drawing.Size(120, 30);
-            this.btnShowView.TabIndex = 8;
-            this.btnShowView.Text = "è¡¨ã€€ç¤º";
-            this.btnShowView.UseVisualStyleBackColor = false;
-            this.btnShowView.Visible = false;
-            this.btnShowView.Click += new System.EventHandler(this.btnShowView_Click);
-            // 
             // Column135
             // 
             this.Column135.HeaderText = "CompanyDispOrder";
@@ -1464,6 +1359,12 @@
             this.Column66.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column66.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
+            // Column155
+            // 
+            this.Column155.HeaderText = "æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column155.Name = "Column155";
+            this.Column155.Visible = false;
+            // 
             // Column37
             // 
             this.Column37.HeaderText = "æ‰¿èª�è€…ï¼‘ã‚³ãƒ¼ãƒ‰";
@@ -1871,7 +1772,7 @@
             // 
             // Column145
             // 
-            this.Column145.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column145.HeaderText = "å·¥äº‹æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column145.Name = "Column145";
             this.Column145.ReadOnly = true;
             this.Column145.Visible = false;
@@ -1882,6 +1783,189 @@
             this.Column147.Name = "Column147";
             this.Column147.Visible = false;
             // 
+            // Column149
+            // 
+            this.Column149.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
+            this.Column149.Name = "Column149";
+            this.Column149.Visible = false;
+            // 
+            // Column150
+            // 
+            this.Column150.HeaderText = "å‰¯æ‹…å½“è€…";
+            this.Column150.Name = "Column150";
+            this.Column150.Visible = false;
+            // 
+            // Column151
+            // 
+            this.Column151.HeaderText = "æŒ‡å°Žå“¡";
+            this.Column151.Name = "Column151";
+            this.Column151.Visible = false;
+            // 
+            // Column152
+            // 
+            this.Column152.HeaderText = "å–¶æ¥­éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column152.Name = "Column152";
+            this.Column152.Visible = false;
+            // 
+            // Column153
+            // 
+            this.Column153.HeaderText = "å‰¯æ‹…å½“éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column153.Name = "Column153";
+            this.Column153.Visible = false;
+            // 
+            // Column154
+            // 
+            this.Column154.HeaderText = "æŒ‡å°Žå“¡éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column154.Name = "Column154";
+            this.Column154.Visible = false;
+            // 
+            // dgvProject
+            // 
+            this.dgvProject.AllowUserToAddRows = false;
+            this.dgvProject.AllowUserToDeleteRows = false;
+            this.dgvProject.AllowUserToResizeRows = false;
+            this.dgvProject.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.dgvProject.BackgroundColor = System.Drawing.Color.White;
+            this.dgvProject.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvProject.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
+            this.dgvProject.ColumnHeadersHeight = 45;
+            this.dgvProject.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvProject.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column136,
+            this.Column134,
+            this.dataGridViewTextBoxColumn1,
+            this.Column63,
+            this.Column35,
+            this.Project_Column1,
+            this.Column90,
+            this.Column51,
+            this.Project_Column2,
+            this.Project_Column3,
+            this.Project_Column4,
+            this.Project_Column5,
+            this.Project_Column6,
+            this.Column138,
+            this.Project_Column7,
+            this.Column144,
+            this.Project_Column8,
+            this.Project_Column9,
+            this.Project_Column10,
+            this.Project_Column11,
+            this.Project_Column12,
+            this.Project_Column13,
+            this.Project_Column14,
+            this.Project_Column15,
+            this.Project_Column16,
+            this.Project_Column17,
+            this.Project_Column18,
+            this.Project_Column19,
+            this.Column100,
+            this.KyouryokuKin_Pro,
+            this.Project_Column21,
+            this.Project_Column22,
+            this.Project_Column23,
+            this.Column50,
+            this.Project_Column24,
+            this.Column78,
+            this.Column156,
+            this.Column52,
+            this.Project_Column25,
+            this.Column79,
+            this.Column113,
+            this.Column114,
+            this.Column53,
+            this.Project_Column26,
+            this.Column81,
+            this.Column115,
+            this.Column116,
+            this.Column54,
+            this.Project_Column27,
+            this.Column82,
+            this.Column117,
+            this.Column118,
+            this.Column55,
+            this.Project_Column28,
+            this.Column83,
+            this.Column119,
+            this.Column120,
+            this.Column56,
+            this.Project_Column29,
+            this.Column84,
+            this.Column121,
+            this.Column122,
+            this.Column57,
+            this.Project_Column30,
+            this.Column80,
+            this.Column123,
+            this.Column124,
+            this.Column58,
+            this.Project_Column31,
+            this.Column85,
+            this.Column125,
+            this.Column126,
+            this.Column59,
+            this.Project_Column32,
+            this.Column86,
+            this.Column127,
+            this.Column128,
+            this.Column60,
+            this.Project_Column33,
+            this.Column87,
+            this.Column129,
+            this.Column130,
+            this.Column61,
+            this.Project_Column34,
+            this.Column88,
+            this.Column131,
+            this.Column132,
+            this.Column21,
+            this.Column77,
+            this.Column141,
+            this.Column142,
+            this.Column146,
+            this.Column148,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7});
+            dataGridViewCellStyle58.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle58.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle58.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle58.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle58.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle58.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle58.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvProject.DefaultCellStyle = dataGridViewCellStyle58;
+            this.dgvProject.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvProject.EnableHeadersVisualStyles = false;
+            this.dgvProject.Location = new System.Drawing.Point(10, 114);
+            this.dgvProject.Margin = new System.Windows.Forms.Padding(4);
+            this.dgvProject.MultiSelect = false;
+            this.dgvProject.Name = "dgvProject";
+            this.dgvProject.RowHeadersVisible = false;
+            this.dgvProject.RowHeadersWidth = 20;
+            this.dgvProject.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvProject.RowTemplate.Height = 21;
+            this.dgvProject.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvProject.Size = new System.Drawing.Size(1320, 530);
+            this.dgvProject.TabIndex = 3;
+            this.dgvProject.Visible = false;
+            this.dgvProject.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.DataGridView_CellBeginEdit);
+            this.dgvProject.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellDoubleClick);
+            this.dgvProject.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellEnter);
+            this.dgvProject.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.DataGridView_CellFormatting);
+            this.dgvProject.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellValidated);
+            this.dgvProject.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellValueChanged);
+            this.dgvProject.CurrentCellDirtyStateChanged += new System.EventHandler(this.DataGridView_CurrentCellDirtyStateChanged);
+            // 
             // Column136
             // 
             this.Column136.HeaderText = "CompanyDispOrder";
@@ -2199,6 +2283,12 @@
             this.Column78.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column78.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
+            // Column156
+            // 
+            this.Column156.HeaderText = "æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column156.Name = "Column156";
+            this.Column156.Visible = false;
+            // 
             // Column52
             // 
             this.Column52.HeaderText = "æ‰¿èª�è€…1ã‚³ãƒ¼ãƒ‰";
@@ -2613,7 +2703,7 @@
             // 
             // Column146
             // 
-            this.Column146.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column146.HeaderText = "æ‹…å½“è€…éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
             this.Column146.Name = "Column146";
             this.Column146.ReadOnly = true;
             this.Column146.Visible = false;
@@ -2624,6 +2714,42 @@
             this.Column148.Name = "Column148";
             this.Column148.Visible = false;
             // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.HeaderText = "å–¶æ¥­æ‹…å½“è€…";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.HeaderText = "å‰¯æ‹…å½“è€…";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.HeaderText = "æŒ‡å°Žå“¡";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.HeaderText = "å–¶æ¥­éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.HeaderText = "å‰¯æ‹…å½“éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.HeaderText = "æŒ‡å°Žå“¡éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.Visible = false;
+            // 
             // FrmRequestSummaryList
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2630,6 +2756,7 @@
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1340, 697);
+            this.Controls.Add(this.btnDataUpDate);
             this.Controls.Add(this.btnOtherProc);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.btnShowView);
@@ -2716,6 +2843,7 @@
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.ComboBox cmbPerson;
         private System.Windows.Forms.Button btnShowView;
+        private System.Windows.Forms.Button btnDataUpDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column135;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column133;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column71;
@@ -2752,6 +2880,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column36;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column17;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column66;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column155;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column37;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column18;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column65;
@@ -2808,6 +2937,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column140;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column145;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column147;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column149;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column150;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column151;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column152;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column153;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column154;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column136;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column134;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
@@ -2844,6 +2979,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column50;
         private System.Windows.Forms.DataGridViewTextBoxColumn Project_Column24;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column78;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column156;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column52;
         private System.Windows.Forms.DataGridViewTextBoxColumn Project_Column25;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column79;
@@ -2900,5 +3036,11 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column142;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column146;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column148;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.resx	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.resx	(revision 294)
@@ -150,6 +150,9 @@
   <metadata name="Column66.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column155.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column37.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -285,6 +288,24 @@
   <metadata name="Column147.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column149.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column150.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column151.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column152.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column153.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column154.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column136.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -318,6 +339,9 @@
   <metadata name="Column78.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column156.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column52.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -453,4 +477,22 @@
   <metadata name="Column148.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 294)
@@ -3631,6 +3631,7 @@
                 dgv.Rows[LineCnt].Cells[(int)DispColumn.TantoDate].Value = FirstDate.ToShortDateString();
                 if (FirstDate.Date == DateTime.MinValue.Date)
                     dgv.Rows[LineCnt].Cells[(int)DispColumn.TantoShonin].Style.ForeColor = Color.Gray;
+                dgv.Rows[LineCnt].Cells[(int)DispColumn.TantoDepCode].Value = CommonMotions.cnvInt(objFirst[(int)ClickGetData.AppDepCode]);
 
                 // �³”FŽÒ�”ƒZƒbƒg
                 int AppCnt = 0;
@@ -3784,18 +3785,49 @@
             {
                 DataGridView dgv = getShowingView();
 
-                int RowDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.DepartmentCode].Value);
-                int RowPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstructionPerson].Value);
+                // ‘I‘ðƒf�[ƒ^Žæ“¾
                 int SelDepCode = GetDepartmentCode();
                 int SelPersonCode = GetConstrPersonCode();
 
+                // ‹ÆŽÒ�E�HŽ–ƒR�[ƒh
+                int CompCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[m_Company_Column].Value);
+                int ConstrCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[m_Genba_Column].Value);
+
+                // �\�¿’S“–ŽÒ
+                int RowAppDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.TantoDepCode].Value);
+                int RowApprovalPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.TantoShoninCode].Value);
+
+                // Še’S“–ŽÒƒR�[ƒh
+                int RowConstrPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstrPerson].Value);
+                int RowSalesPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.SalesPerson].Value);
+                int RowAssistPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.AssistPerson].Value);
+                int RowInstrPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.InstrPerson].Value);
+
+                // Še’S“–ŽÒ•”��
+                int RowConstrDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstrDepCode].Value);
+                int RowSalesDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.SalesDepCode].Value);
+                int RowAssistDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.AssistDepCode].Value);
+                int RowInstrDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.InstrDepCode].Value);
+
+                // •s–¾‚Í•\Ž¦‚·‚é
+                if (CompCode == 0 || ConstrCode == 0) return;
+
                 // •s–¾ˆÈŠO‚Íˆê’U•s‰ÂŽ‹‚É‚·‚é
                 dgv.Rows[LineCount].Visible = false;
                 dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
 
-                if (RowDepCode != SelDepCode) return;
-                if (SelPersonCode != 0 && RowPersonCode != SelPersonCode) return;
+                // •”��‘I‘ð–³‚Í‘S‘Î�Û‚É‚È‚é
+                if (RowAppDepCode != SelDepCode) return;
+                
+                if (RowApprovalPersonCode == 0)
+                {   // �\�¿–¢‚Í‰c‹Æ�E’S“–ŽÒ�E•›’S“–ŽÒ�EŽw“±ˆõ
 
+                }
+                else if (RowApprovalPersonCode != 0)
+                {   // �\�¿�Ï‚Í�\�¿ŽÒ
+                    if (SelPersonCode != 0 && RowApprovalPersonCode != SelPersonCode) return;
+                }
+
                 dgv.Rows[LineCount].Visible = true;
                 dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
             }
@@ -3871,8 +3903,6 @@
                 dgv.Rows[icnt].Cells[(int)DispColumn.CyuumonshoTouchaku].Value = CommonMotions.cnvString(work[(int)ClickGetData.PurchaseOrderReturnDate]);
                 dgv.Rows[icnt].Cells[(int)DispColumn.YosanSho].Value = CommonMotions.cnvString(work[(int)ClickGetData.PaData]);
 
-                dgv.Rows[icnt].Cells[(int)DispColumn.DepartmentCode].Value = CommonMotions.cnvInt(work[(int)ClickGetData.DepartmentCode]);
-
                 // ”õ�l�Ý’è
                 dgv.Rows[icnt].Cells[(int)DispColumn.Bikou].Value = CommonMotions.cnvString(work[(int)ClickGetData.Bikou]);
                 // �HŽ–�Ú�×‘ä’ ‚Ì�s”Ô�†�A—ñ”Ô�†‚ð�Ý’è
@@ -3882,8 +3912,18 @@
                 // –¾�×–¼�ÌƒZƒbƒg
                 dgv.Rows[icnt].Cells[(int)DispColumn.DetailName].Value = CommonMotions.cnvString(work[(int)ClickGetData.DetailName]);
 
-                // �HŽ–’S“–ŽÒ–¼ƒZƒbƒg
-                dgv.Rows[icnt].Cells[(int)DispColumn.ConstructionPerson].Value = CommonMotions.cnvString(work[(int)ClickGetData.ConstructionPersonCode]);
+                // �HŽ–’S“–ŽÒƒZƒbƒg
+                dgv.Rows[icnt].Cells[(int)DispColumn.ConstrPerson].Value = CommonMotions.cnvString(work[(int)ClickGetData.ConstructionPersonCode]);
+                dgv.Rows[icnt].Cells[(int)DispColumn.ConstrDepCode].Value = CommonMotions.cnvInt(work[(int)ClickGetData.ConstrDepCode]);
+                // ‰c‹Æ’S“–ŽÒƒZƒbƒg
+                dgv.Rows[icnt].Cells[(int)DispColumn.SalesPerson].Value = CommonMotions.cnvString(work[(int)ClickGetData.SalesPersonCode]);
+                dgv.Rows[icnt].Cells[(int)DispColumn.SalesDepCode].Value = CommonMotions.cnvInt(work[(int)ClickGetData.SalesDepCode]);
+                // •›’S“–ŽÒƒZƒbƒg
+                dgv.Rows[icnt].Cells[(int)DispColumn.AssistPerson].Value = CommonMotions.cnvString(work[(int)ClickGetData.ConstrSubPersonCode]);
+                dgv.Rows[icnt].Cells[(int)DispColumn.AssistDepCode].Value = CommonMotions.cnvInt(work[(int)ClickGetData.AssistDepCode]);
+                // Žw“±ˆõƒZƒbƒg
+                dgv.Rows[icnt].Cells[(int)DispColumn.InstrPerson].Value = CommonMotions.cnvString(work[(int)ClickGetData.ConstructionInstructor]);
+                dgv.Rows[icnt].Cells[(int)DispColumn.InstrDepCode].Value = CommonMotions.cnvInt(work[(int)ClickGetData.InstrDepCode]);
             }
             catch (Exception ex)
             {
@@ -4231,7 +4271,7 @@
                 else
                     Appcode = (int)ClsExcute.ApprovalListNo.SubConstrPayment;
 
-                sql.Append(" select ");
+                sql.Append(" Select ");
                 sql.Append("  ifnull(Bd.SeqNo, 1) as SeqNo ");
                 sql.Append("  , ifnull(Bdd.LineCount, 0) as LineCount ");
                 sql.Append("  , ifnull(Bdd.CompanyCode, 0) as CompanyCode ");
@@ -4264,11 +4304,15 @@
                 sql.Append("    , '%Y/%m/%d' ");
                 sql.Append("  ) as ApprovalDate ");
                 sql.Append("  , ifnull(Pdd.ApprovalEndFlg, 0) as ApprovalEndFlg ");
+                sql.Append("  , Picm.DepartmentCode As AppDepCode");
                 sql.Append("  , ifnull(Cbi.SalesPersonCode, 0) as SalesPersonCode ");
                 sql.Append("  , ifnull(Cbi.ConstructionPersonCode, 0) as ConstructionPersonCode ");
                 sql.Append("  , ifnull(Cbi.ConstrSubPersonCode, 0) as ConstrSubPersonCode ");
                 sql.Append("  , ifnull(Cbi.ConstructionInstructor, 0) as ConstructionInstructor ");
-                sql.Append("  , Picm2.DepartmentCode ");
+                sql.Append("  , Picm2.DepartmentCode As ConstrDepCode ");
+                sql.Append("  , Picm3.DepartmentCode As SalesDepCode ");
+                sql.Append("  , Picm4.DepartmentCode As AssistDepCode ");
+                sql.Append("  , Picm5.DepartmentCode As InstrDepCode ");
 
                 sql.Append("  , case ifnull(DATE(Pod.SendDate), '') ");
                 sql.Append("    when '' then '�~' ");
@@ -4315,9 +4359,15 @@
                 sql.Append("           and Bdd.SeqNo = Pdd.SeqNo ");
                 sql.Append("           and Bdd.LineCount = Pdd.LineCount ");
 
-                sql.Append("       join (ConstructionBaseInfo as Cbi ");
+                sql.Append("       inner join (ConstructionBaseInfo as Cbi ");
                 sql.Append("          left join PersonInChargeMaster as Picm2 ");
-                sql.Append("            on Cbi.ConstructionPersonCode = Picm2.PersonCode ");
+                sql.Append("            on Picm2.PersonCode = Cbi.ConstructionPersonCode ");
+                sql.Append("          left join PersonInChargeMaster as Picm3 ");
+                sql.Append("            on Picm3.PersonCode = Cbi.SalesPersonCode ");
+                sql.Append("          left join PersonInChargeMaster as Picm4 ");
+                sql.Append("            on Picm4.PersonCode = Cbi.ConstrSubPersonCode ");
+                sql.Append("          left join PersonInChargeMaster as Picm5 ");
+                sql.Append("            on Picm5.PersonCode = Cbi.ConstructionInstructor ");
                 sql.Append("          left join ProcessApproval as Pa ");
                 sql.Append("            on Pa.ConstructionCode = Cbi.ConstructionCode");
                 sql.AppendFormat("      and Pa.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
@@ -5064,125 +5114,114 @@
 
 
                         // Žx•¥–¾�×ƒf�[ƒ^-----------------------------------------------------------------
-                        if ((CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiSeikyu].Value) != 0
-                            || CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiNebiki].Value) != 0
-                            || CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiSousai].Value) != 0
-                            || CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiKosoku].Value) != 0
-                            || CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiKanamono].Value) != 0
-                            || CommonMotions.cnvInt(r.Cells[(int)DispColumn.KojiSannhaiZei].Value) != 0
-                            || CommonMotions.cnvInt(r.Cells[(int)DispColumn.KyoryokuUmu].Value) != -1)
-                            || r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
-                            //|| CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value) != 0)
+
+                        strPdDWhere = IoPdD.CreatePrimarykeyString(NowCompanyCode, TargetDate, NowSeqNo, iLineCount);
+                        // ƒf�[ƒ^Šm”F
+                        PdDList.Clear();
+                        if (!IoPdD.SelectAction(strPdDWhere, ref PdDList, false))
                         {
+                            throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F“o˜^Šm”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                        }
 
-                            strPdDWhere = IoPdD.CreatePrimarykeyString(NowCompanyCode, TargetDate, NowSeqNo, iLineCount);
-                            // ƒf�[ƒ^Šm”F
-                            PdDList.Clear();
-                            if (!IoPdD.SelectAction(strPdDWhere, ref PdDList, false))
-                            {
-                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F“o˜^Šm”F‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
-                            }
+                        // ƒf�[ƒ^ƒZƒbƒg
+                        PdDWork = new PaymentDataDetail();
+                        PdDWork.BillPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSeikyu].Value);
+                        PdDWork.DiscountPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiNebiki].Value);
+                        PdDWork.OffsetPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSousai].Value);
+                        PdDWork.NextCoPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.JikaiKurikosi].Value);
+                        PdDWork.HighwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiKosoku].Value);
+                        PdDWork.HardwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiKanamono].Value);
+                        PdDWork.IndsWasteTax = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSannhaiZei].Value);
+                        PdDWork.CnstrPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KyoryokuKin].Value);
+                        PdDWork.CnstrPriceExist = CommonMotions.cnvInt(r.Cells[(int)DispColumn.KyoryokuUmu].Value);
+                        //PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
 
-                            // ƒf�[ƒ^ƒZƒbƒg
-                            PdDWork = new PaymentDataDetail();
-                            PdDWork.BillPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSeikyu].Value);
-                            PdDWork.DiscountPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiNebiki].Value);
-                            PdDWork.OffsetPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSousai].Value);
-                            PdDWork.NextCoPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.JikaiKurikosi].Value);
-                            PdDWork.HighwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiKosoku].Value);
-                            PdDWork.HardwPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiKanamono].Value);
-                            PdDWork.IndsWasteTax = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSannhaiZei].Value);
-                            PdDWork.CnstrPrice = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KyoryokuKin].Value);
-                            PdDWork.CnstrPriceExist = CommonMotions.cnvInt(r.Cells[(int)DispColumn.KyoryokuUmu].Value);
-                            //PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
+                        if (PdDList.Count == 0)
+                        {
+                            // �V‹K�iŽx•¥–¾�×ƒf�[ƒ^�j
+                            PdDWork.CompanyCode = NowCompanyCode;
+                            PdDWork.TargetDate = TargetDate;
+                            PdDWork.SeqNo = NowSeqNo;
+                            PdDWork.LineCount = iLineCount;
 
-                            if (PdDList.Count == 0)
+                            // ’S“–�³”F
+                            if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
                             {
-                                // �V‹K�iŽx•¥–¾�×ƒf�[ƒ^�j
-                                PdDWork.CompanyCode = NowCompanyCode;
-                                PdDWork.TargetDate = TargetDate;
-                                PdDWork.SeqNo = NowSeqNo;
-                                PdDWork.LineCount = iLineCount;
-
-                                // ’S“–�³”F
-                                if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
+                                PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
+                                if (r.Cells[(int)DispColumn.TantoDate].Value == null)
                                 {
-                                    PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
-                                    if (r.Cells[(int)DispColumn.TantoDate].Value == null)
-                                    {
-                                        PdDWork.ApprovalDate = DateTime.Now;
-                                    }
-                                    else
-                                    {
-                                        PdDWork.ApprovalDate = CommonMotions.cnvDate(r.Cells[(int)DispColumn.TantoDate].Value);
-                                    }
+                                    PdDWork.ApprovalDate = DateTime.Now;
                                 }
                                 else
                                 {
-                                    PdDWork.ApprovalDate = DateTime.MinValue;
+                                    PdDWork.ApprovalDate = CommonMotions.cnvDate(r.Cells[(int)DispColumn.TantoDate].Value);
                                 }
-                                PdDWork.ApprovalEndFlg = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ApprovalEndFlg].Value); // �Å�I�³”F”»’è•K—v
+                            }
+                            else
+                            {
+                                PdDWork.ApprovalDate = DateTime.MinValue;
+                            }
+                            PdDWork.ApprovalEndFlg = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ApprovalEndFlg].Value); // �Å�I�³”F”»’è•K—v
 
-                                PdDList.Clear();
-                                PdDList.Add(PdDWork);
+                            PdDList.Clear();
+                            PdDList.Add(PdDWork);
 
-                                if (!IoPdD.InsertAction(PdDList, false))
-                                {
-                                    throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
-                                }
+                            if (!IoPdD.InsertAction(PdDList, false))
+                            {
+                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
+                            }
 
-                            }
-                            else
+                        }
+                        else
+                        {
+                            // �X�V�iŽx•¥–¾�×ƒf�[ƒ^�j
+                            // ’S“–�³”F
+                            if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
                             {
-                                // �X�V�iŽx•¥–¾�×ƒf�[ƒ^�j
-                                // ’S“–�³”F
-                                if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
+                                if (PdDList[0].ApprovalPersonCode != 0)
                                 {
-                                    if (PdDList[0].ApprovalPersonCode != 0)
-                                    {
-                                        PdDWork.ApprovalPersonCode = PdDList[0].ApprovalPersonCode;
-                                        PdDWork.ApprovalDate = PdDList[0].ApprovalDate;
-                                    }
-                                    else
-                                    {
-                                        PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
-                                        PdDWork.ApprovalDate = DateTime.Now;
-                                    }
+                                    PdDWork.ApprovalPersonCode = PdDList[0].ApprovalPersonCode;
+                                    PdDWork.ApprovalDate = PdDList[0].ApprovalDate;
                                 }
                                 else
                                 {
-                                    PdDWork.ApprovalDate = DateTime.MinValue;
+                                    PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
+                                    PdDWork.ApprovalDate = DateTime.Now;
                                 }
-                                PdDWork.ApprovalEndFlg = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ApprovalEndFlg].Value); //�Å�I�³”F
+                            }
+                            else
+                            {
+                                PdDWork.ApprovalDate = DateTime.MinValue;
+                            }
+                            PdDWork.ApprovalEndFlg = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ApprovalEndFlg].Value); //�Å�I�³”F
 
 
-                                // ƒ�ƒbƒN
-                                if (!IoPdD.RowLock(iCompanyCode, TargetDate, iSeqNo, iLineCount, false))
-                                {
-                                    throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F‘¼‚Ìƒ†�[ƒU‚Å•Ò�W’†‚Ì‚½‚ß�A�ˆ—�‚Å‚«‚Ü‚¹‚ñ�B");
-                                }
+                            // ƒ�ƒbƒN
+                            if (!IoPdD.RowLock(iCompanyCode, TargetDate, iSeqNo, iLineCount, false))
+                            {
+                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F‘¼‚Ìƒ†�[ƒU‚Å•Ò�W’†‚Ì‚½‚ß�A�ˆ—�‚Å‚«‚Ü‚¹‚ñ�B");
+                            }
 
-                                // ƒf�[ƒ^�X�V
-                                if (!IoPdD.UpdateAction(strPdDWhere, PdDWork, false))
-                                {
-                                    throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
-                                }
-
+                            // ƒf�[ƒ^�X�V
+                            if (!IoPdD.UpdateAction(strPdDWhere, PdDWork, false))
+                            {
+                                throw new Exception("Žx•¥–¾�×ƒf�[ƒ^�F�X�V‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B");
                             }
 
-                            // ----- �HŽ–�Ú�×‘ä’ ‚ÌŽx•¥‹àŠz‚ÌˆêŠ‡“o˜^ƒŠƒXƒg‚Ö’Ç‰Á�i�s’PˆÊ‚Å’Ç‰Á�j
-                            ConstructionLedgerExcute CleEntry = new ConstructionLedgerExcute();
-                            CleEntry.ConstructionCode = CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value);
-                            CleEntry.GroupCount = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;
-                            CleEntry.LineCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerLineNo].Value);
-                            CleEntry.ColumnCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerColNo].Value);
-                            CleEntry.PaymentAmount = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSeikyu].Value);
-                            CleEntry.TargetMonth = CommonMotions.cnvDate(string.Format("{0}/01", cmbTargetMonth.Text));
-                            CleEntry.EntryDate = DateTime.Now;
-                            CleEntry.UpdateDate = DateTime.Now;
-                            CleEntryList.Add(CleEntry);
                         }
 
+                        // ----- �HŽ–�Ú�×‘ä’ ‚ÌŽx•¥‹àŠz‚ÌˆêŠ‡“o˜^ƒŠƒXƒg‚Ö’Ç‰Á�i�s’PˆÊ‚Å’Ç‰Á�j
+                        ConstructionLedgerExcute CleEntry = new ConstructionLedgerExcute();
+                        CleEntry.ConstructionCode = CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value);
+                        CleEntry.GroupCount = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;
+                        CleEntry.LineCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerLineNo].Value);
+                        CleEntry.ColumnCount = CommonMotions.cnvInt(r.Cells[(int)DispColumn.ConstructionLedgerColNo].Value);
+                        CleEntry.PaymentAmount = CommonMotions.cnvLong(r.Cells[(int)DispColumn.KojiSeikyu].Value);
+                        CleEntry.TargetMonth = CommonMotions.cnvDate(string.Format("{0}/01", cmbTargetMonth.Text));
+                        CleEntry.EntryDate = DateTime.Now;
+                        CleEntry.UpdateDate = DateTime.Now;
+                        CleEntryList.Add(CleEntry);
+
                         DataProgressBar.Value++;
                         DataProgressBar.Update();
                     }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalDisp.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalDisp.designer.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalDisp.designer.cs	(revision 294)
@@ -35,13 +35,13 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
+            this.lblLastAppColor = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
             this.dgvProcess = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lblLastAppColor = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dgvProcess)).BeginInit();
             this.SuspendLayout();
             // 
@@ -73,6 +73,25 @@
             this.label1.Text = "æ‰¿ã€€èª�ã€€çµŒã€€è·¯ã€€ä¸€ã€€è¦§";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lblLastAppColor
+            // 
+            this.lblLastAppColor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblLastAppColor.BackColor = System.Drawing.Color.White;
+            this.lblLastAppColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblLastAppColor.Location = new System.Drawing.Point(10, 658);
+            this.lblLastAppColor.Name = "lblLastAppColor";
+            this.lblLastAppColor.Size = new System.Drawing.Size(100, 20);
+            this.lblLastAppColor.TabIndex = 32;
+            // 
+            // label3
+            // 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label3.Location = new System.Drawing.Point(110, 660);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(100, 20);
+            this.label3.TabIndex = 33;
+            this.label3.Text = "æœ€çµ‚æ‰¿èª�è€…";
+            // 
             // dgvProcess
             // 
             this.dgvProcess.AllowUserToAddRows = false;
@@ -84,7 +103,7 @@
             this.dgvProcess.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.dgvProcess.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvProcess.BackgroundColor = System.Drawing.Color.White;
             this.dgvProcess.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.BottomCenter;
             dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
@@ -159,23 +178,6 @@
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column3.Width = 560;
             // 
-            // lblLastAppColor
-            // 
-            this.lblLastAppColor.BackColor = System.Drawing.Color.White;
-            this.lblLastAppColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblLastAppColor.Location = new System.Drawing.Point(10, 658);
-            this.lblLastAppColor.Name = "lblLastAppColor";
-            this.lblLastAppColor.Size = new System.Drawing.Size(100, 20);
-            this.lblLastAppColor.TabIndex = 32;
-            // 
-            // label3
-            // 
-            this.label3.Location = new System.Drawing.Point(110, 660);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(100, 20);
-            this.label3.TabIndex = 33;
-            this.label3.Text = "æœ€çµ‚æ‰¿èª�è€…";
-            // 
             // FrmApprovalDisp
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -192,8 +194,6 @@
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
             this.KeyPreview = true;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
             this.Name = "FrmApprovalDisp";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 293)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 294)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.3")]
-[assembly: AssemblyFileVersion("1.0.1.3")]
+[assembly: AssemblyVersion("1.0.1.4")]
+[assembly: AssemblyFileVersion("1.0.1.4")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
