Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 143)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 29;
+        public static int s_SystemVersion = 30;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ControlsAction/TabPageManager.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ControlsAction/TabPageManager.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ControlsAction/TabPageManager.cs	(revision 143)
@@ -8,6 +8,8 @@
 using log4net.Appender;
 using log4net.Repository.Hierarchy;
 
+using ProcessManagement.Common;
+
 namespace ProcessManagement.Forms.ControlsAction
 {
     /// <summary>
@@ -74,21 +76,28 @@
         /// <param name="crl">åŸºã�«ã�ªã‚‹TabControlã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ</param>
         public TabPageManager(TabControl crl)
         {
-            // ã‚¿ãƒ–ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚’å�–å¾—
-            m_tabControl = crl;
+            try
+            {
+                // ã‚¿ãƒ–ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚’å�–å¾—
+                m_tabControl = crl;
 
-            if (m_tabPageInfos != null)
-            {
-                m_tabPageInfos.Initialize();
-                m_tabPageInfos = null;
+                if (m_tabPageInfos != null)
+                {
+                    m_tabPageInfos.Initialize();
+                    m_tabPageInfos = null;
+                }
+                // ã‚¿ãƒ–æƒ…å ±é…�åˆ—ã‚’åˆ�æœŸåŒ–
+                m_tabPageInfos = new PageInfo[m_tabControl.TabPages.Count];
+
+                // ã‚¿ãƒ–æƒ…å ±ã‚’å�–å¾—ã�™ã‚‹
+                for (int i = 0; i < m_tabControl.TabPages.Count; i++)
+                {
+                    m_tabPageInfos[i] = new PageInfo(m_tabControl.TabPages[i], true);
+                }
             }
-            // ã‚¿ãƒ–æƒ…å ±é…�åˆ—ã‚’åˆ�æœŸåŒ–
-            m_tabPageInfos = new PageInfo[m_tabControl.TabPages.Count];
-
-            // ã‚¿ãƒ–æƒ…å ±ã‚’å�–å¾—ã�™ã‚‹
-            for (int i = 0; i < m_tabControl.TabPages.Count; i++)
+            catch (Exception ex)
             {
-                m_tabPageInfos[i] = new PageInfo(m_tabControl.TabPages[i], true);
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
         }
         #endregion
@@ -101,24 +110,31 @@
         /// <param name="bReq">è¡¨ç¤ºã�™ã‚‹ã�¨ã��ã�¯Trueã€�é�žè¡¨ç¤ºã�«ã�™ã‚‹ã�¨ã��ã�¯Falseã€‚</param>
         public void ChangeTabPageVisible(int menucnt, bool bReq)
         {
-            // ç�¾åœ¨ã�®çŠ¶æ…‹ã�Œå�Œã�˜ã�ªã‚‰ã�°å‡¦ç�†ã�—ã�ªã�„
-            if (m_tabPageInfos[menucnt].Visible == bReq) return;
+            try
+            {
+                // ç�¾åœ¨ã�®çŠ¶æ…‹ã�Œå�Œã�˜ã�ªã‚‰ã�°å‡¦ç�†ã�—ã�ªã�„
+                if (m_tabPageInfos[menucnt].Visible == bReq) return;
 
-            // ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä¿�å­˜ã�™ã‚‹
-            m_tabPageInfos[menucnt].Visible = bReq;
-            // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆãƒ­ã‚¸ãƒƒã‚¯ã‚’ä¸€æ™‚ä¸­æ–­ã�™ã‚‹
-            m_tabControl.SuspendLayout();
-            // å…¨ã‚¿ãƒ–ãƒšãƒ¼ã‚¸ã�®æ¶ˆåŽ»
-            m_tabControl.TabPages.Clear();
+                // ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä¿�å­˜ã�™ã‚‹
+                m_tabPageInfos[menucnt].Visible = bReq;
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆãƒ­ã‚¸ãƒƒã‚¯ã‚’ä¸€æ™‚ä¸­æ–­ã�™ã‚‹
+                m_tabControl.SuspendLayout();
+                // å…¨ã‚¿ãƒ–ãƒšãƒ¼ã‚¸ã�®æ¶ˆåŽ»
+                m_tabControl.TabPages.Clear();
 
-            foreach (PageInfo wrk in m_tabPageInfos)
+                foreach (PageInfo wrk in m_tabPageInfos)
+                {
+                    // ãƒªã‚¯ã‚¨ã‚¹ãƒˆã�Œtrueã�ªã‚‰ã�°ã‚¿ãƒ–ãƒšãƒ¼ã‚¸æƒ…å ±ã‚’è¿½åŠ ã�™ã‚‹
+                    if (wrk.Visible) m_tabControl.TabPages.Add(wrk.TabPage);
+                }
+
+                // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆãƒ­ã‚¸ãƒƒã‚¯ã‚’å†�é–‹ã�™ã‚‹
+                m_tabControl.ResumeLayout();
+            }
+            catch (Exception ex)
             {
-                // ãƒªã‚¯ã‚¨ã‚¹ãƒˆã�Œtrueã�ªã‚‰ã�°ã‚¿ãƒ–ãƒšãƒ¼ã‚¸æƒ…å ±ã‚’è¿½åŠ ã�™ã‚‹
-                if (wrk.Visible) m_tabControl.TabPages.Add(wrk.TabPage);
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-
-            // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆãƒ­ã‚¸ãƒƒã‚¯ã‚’å†�é–‹ã�™ã‚‹
-            m_tabControl.ResumeLayout();
         }
         #endregion
     }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.resx	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.resx	(nonexistent)
@@ -1,120 +0,0 @@
-ï»¿<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransporttAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransporttAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransporttAuxiliary.cs	(nonexistent)
@@ -1,303 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
-
-using ProcessManagement.Forms.ControlsAction;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.SubForms;
-using ProcessManagement.Forms.Master;
-using ProcessManagement.DataModel;
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-
-namespace ProcessManagement.Forms.DataEntry
-{
-    partial class FrmDRTransport
-    {
-
-        #region äº¤é€šè²»ãƒ•ã‚©ãƒ¼ãƒ ã�®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆä½œæˆ�
-        /// <summary>
-        /// äº¤é€šè²»ãƒ•ã‚©ãƒ¼ãƒ ã�®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆä½œæˆ�
-        /// </summary>
-        private void CreateTransportFormLayout()
-        {
-            try
-            {
-                // åˆ�æœŸã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚»ãƒƒãƒˆ
-                SetInitTransportControl();
-
-                for (int i = 1; i < TransPortRow.Length; i++)
-                {
-                    TransPortRow[i] = new DailyReportRow();
-
-                    // ãƒ†ã‚­ã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã�®é…�ç½®
-                    this.panel1.Controls.Add(TransPortRow[i].textBox1);
-                    this.panel1.Controls.Add(TransPortRow[i].textBox2);
-                    this.panel1.Controls.Add(TransPortRow[i].textBox3);
-
-                    Size txtSize = new Size(90, 27);
-                    Point txtPo1 = new Point(33, 1 + (i * 27));
-                    Point txtPo2 = new Point(153, 1 + (i * 27));
-                    Point txtPo3 = new Point(273, 1 + (i * 27));
-
-                    SetTextBoxPropaty(TransPortRow[i].textBox1, 1, i + 1, txtPo1, txtSize);
-                    SetTextBoxPropaty(TransPortRow[i].textBox2, 1, i + 1, txtPo2, txtSize);
-                    SetTextBoxPropaty(TransPortRow[i].textBox3, 1, i + 1, txtPo3, txtSize);
-
-                    // Kmãƒ©ãƒ™ãƒ«ã�®é…�ç½®
-                    this.panel1.Controls.Add(TransPortRow[i].lblkm1);
-                    this.panel1.Controls.Add(TransPortRow[i].lblkm2);
-                    this.panel1.Controls.Add(TransPortRow[i].lblkm3);
-
-                    Size kmlblSize = new Size(30, 27);
-                    Point kmlblPo1 = new Point(123, 1 + (i * 27));
-                    Point kmlblPo2 = new Point(243, 1 + (i * 27));
-                    Point kmlblPo3 = new Point(363, 1 + (i * 27));
-
-                    SetKmLabelPropaty(TransPortRow[i].lblkm1, 1, i + 1, kmlblPo1, kmlblSize);
-                    SetKmLabelPropaty(TransPortRow[i].lblkm2, 1, i + 1, kmlblPo2, kmlblSize);
-                    SetKmLabelPropaty(TransPortRow[i].lblkm3, 1, i + 1, kmlblPo3, kmlblSize);
-
-                    // ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’è¼‰ã�›ã‚‹ãƒ‘ãƒ�ãƒ«ã�®é…�ç½®
-                    this.panel1.Controls.Add(TransPortRow[i].pnlcheckBox1);
-                    this.panel1.Controls.Add(TransPortRow[i].pnlcheckBox2);
-                    this.panel1.Controls.Add(TransPortRow[i].pnlcheckBox3);
-                    this.panel1.Controls.Add(TransPortRow[i].pnlcheckBox4);
-
-                    Size pnlchkboxSize = new Size(72, 27);
-                    Point pnlchkboxPo1 = new Point(393, 1 + (i * 27));
-                    Point pnlchkboxPo2 = new Point(465, 1 + (i * 27));
-                    Point pnlchkboxPo3 = new Point(537, 1 + (i * 27));
-                    Point pnlchkboxPo4 = new Point(609, 1 + (i * 27));
-
-                    SetCheckBoxPropaty(TransPortRow[i].pnlcheckBox1, 1, i + 1, pnlchkboxPo1, pnlchkboxSize);
-                    SetCheckBoxPropaty(TransPortRow[i].pnlcheckBox2, 1, i + 1, pnlchkboxPo2, pnlchkboxSize);
-                    SetCheckBoxPropaty(TransPortRow[i].pnlcheckBox3, 1, i + 1, pnlchkboxPo3, pnlchkboxSize);
-                    SetCheckBoxPropaty(TransPortRow[i].pnlcheckBox4, 1, i + 1, pnlchkboxPo4, pnlchkboxSize);
-
-                    // ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã�®é…�ç½®
-                    TransPortRow[i].pnlcheckBox1.Controls.Add(TransPortRow[i].checkBox1);
-                    TransPortRow[i].pnlcheckBox2.Controls.Add(TransPortRow[i].checkBox2);
-                    TransPortRow[i].pnlcheckBox3.Controls.Add(TransPortRow[i].checkBox3);
-                    TransPortRow[i].pnlcheckBox4.Controls.Add(TransPortRow[i].checkBox4);
-
-                    Size chkboxSize = new Size(16, 16);
-                    Point chkboxPo1 = new Point(26, 5);
-                    Point chkboxPo2 = new Point(26, 5);
-                    Point chkboxPo3 = new Point(26, 5);
-                    Point chkboxPo4 = new Point(26, 5);
-
-                    SetCheckBoxPropaty(TransPortRow[i].checkBox1, 1, i + 1, chkboxPo1, chkboxSize);
-                    SetCheckBoxPropaty(TransPortRow[i].checkBox2, 1, i + 1, chkboxPo2, chkboxSize);
-                    SetCheckBoxPropaty(TransPortRow[i].checkBox3, 1, i + 1, chkboxPo3, chkboxSize);
-                    SetCheckBoxPropaty(TransPortRow[i].checkBox4, 1, i + 1, chkboxPo4, chkboxSize);
-                }
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚»ãƒƒãƒˆ
-        /// <summary>
-        /// äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚»ãƒƒãƒˆ
-        /// </summary>
-        private void SetInitTransportControl()
-        {
-            try
-            {
-                TransPortRow[0].lblDay = this.lblDay01;
-                TransPortRow[1].lblDay = this.lblDay02;
-                TransPortRow[2].lblDay = this.lblDay03;
-                TransPortRow[3].lblDay = this.lblDay04;
-                TransPortRow[4].lblDay = this.lblDay05;
-                TransPortRow[5].lblDay = this.lblDay06;
-                TransPortRow[6].lblDay = this.lblDay07;
-                TransPortRow[7].lblDay = this.lblDay08;
-                TransPortRow[8].lblDay = this.lblDay09;
-                TransPortRow[9].lblDay = this.lblDay10;
-                TransPortRow[10].lblDay = this.lblDay11;
-                TransPortRow[11].lblDay = this.lblDay12;
-                TransPortRow[12].lblDay = this.lblDay13;
-                TransPortRow[13].lblDay = this.lblDay14;
-                TransPortRow[14].lblDay = this.lblDay15;
-                TransPortRow[15].lblDay = this.lblDay16;
-                TransPortRow[16].lblDay = this.lblDay17;
-                TransPortRow[17].lblDay = this.lblDay18;
-                TransPortRow[18].lblDay = this.lblDay19;
-                TransPortRow[19].lblDay = this.lblDay20;
-                TransPortRow[20].lblDay = this.lblDay21;
-                TransPortRow[21].lblDay = this.lblDay22;
-                TransPortRow[22].lblDay = this.lblDay23;
-                TransPortRow[23].lblDay = this.lblDay24;
-                TransPortRow[24].lblDay = this.lblDay25;
-                TransPortRow[25].lblDay = this.lblDay26;
-                TransPortRow[26].lblDay = this.lblDay27;
-                TransPortRow[27].lblDay = this.lblDay28;
-                TransPortRow[28].lblDay = this.lblDay29;
-                TransPortRow[29].lblDay = this.lblDay30;
-                TransPortRow[30].lblDay = this.lblDay31;
-
-                TransPortRow[0].checkBox1 = this.checkBox1_01;
-                TransPortRow[0].checkBox2 = this.checkBox2_01;
-                TransPortRow[0].checkBox3 = this.checkBox3_01;
-                TransPortRow[0].checkBox4 = this.checkBox4_01;
-
-                TransPortRow[0].lblkm1 = this.lblkm1;
-                TransPortRow[0].lblkm2 = this.lblkm2;
-                TransPortRow[0].lblkm3 = this.lblkm3;
-
-                TransPortRow[0].pnlcheckBox1 = this.pnlCheck1;
-                TransPortRow[0].pnlcheckBox2 = this.pnlCheck2;
-                TransPortRow[0].pnlcheckBox3 = this.pnlCheck3;
-                TransPortRow[0].pnlcheckBox4 = this.pnlCheck4;
-
-                TransPortRow[0].textBox1 = this.textBox1_01;
-                TransPortRow[0].textBox2 = this.textBox2_01;
-                TransPortRow[0].textBox3 = this.textBox3_01;
-
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›TextBoxãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// <summary>
-        /// äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›TextBoxãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// </summary>
-        /// <param name="txtbox"></param>
-        /// <param name="Group"></param>
-        /// <param name="Count"></param>
-        /// <param name="po"></param>
-        /// <param name="ctrlSize"></param>
-        private void SetTextBoxPropaty(TextBox txtbox,int Group,int Count, Point po, Size ctrlSize)
-        {
-            try
-            {
-                txtbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-                txtbox.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-                txtbox.Location = po;
-                txtbox.Name = string.Format("textBox{0}_{1}", Group, Count.ToString("00"));
-                txtbox.Size = ctrlSize;
-                txtbox.TabIndex = 0;
-                txtbox.Text = "";
-                txtbox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›Labelãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// <summary>
-        /// äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›Labelãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// </summary>
-        /// <param name="label"></param>
-        /// <param name="Group"></param>
-        /// <param name="Count"></param>
-        /// <param name="po"></param>
-        /// <param name="ctrlSize"></param>
-        private void SetKmLabelPropaty(Label label, int Group, int Count, Point po, Size ctrlSize)
-        {
-            try
-            {
-                label.BackColor = System.Drawing.Color.White;
-                label.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-                label.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-                label.Location = po;
-                label.Name = string.Format("lblkm{0}_{1}", Group, Count.ToString("00"));
-                label.Size = ctrlSize;
-                label.TabIndex = 0;
-                label.Text = "Km";
-                label.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        /// <summary>
-        /// äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›CheckBoxã‚’è¼‰ã�›ã‚‹ãƒ‘ãƒ�ãƒ«ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// </summary>
-        /// <param name="pnl"></param>
-        /// <param name="Group"></param>
-        /// <param name="Count"></param>
-        /// <param name="po"></param>
-        /// <param name="ctrlSize"></param>
-        private void SetCheckBoxPropaty(Panel pnl, int Group, int Count, Point po, Size ctrlSize)
-        {
-            try
-            {
-                pnl.BackColor = System.Drawing.Color.White;
-                pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-                pnl.Location = po;
-                pnl.Name = string.Format("pnlCheck1", Group, Count.ToString("00"));
-                pnl.Size = ctrlSize;
-                pnl.TabIndex = 0;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        #region äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›CheckBoxãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// <summary>
-        /// äº¤é€šè²»ãƒ‡ãƒ¼ã‚¿å…¥åŠ›CheckBoxãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚»ãƒƒãƒˆ
-        /// </summary>
-        /// <param name="chkBox"></param>
-        /// <param name="Group"></param>
-        /// <param name="Count"></param>
-        /// <param name="po"></param>
-        /// <param name="ctrlSize"></param>
-        private void SetCheckBoxPropaty(CheckBox chkBox, int Group, int Count, Point po, Size ctrlSize)
-        {
-            try
-            {
-                chkBox.Location = po;
-                chkBox.Name = string.Format("checkBox{0}_{1}", Group, Count.ToString("00"));
-                chkBox.Size = ctrlSize;
-                chkBox.TabIndex = 0;
-                chkBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-                chkBox.UseVisualStyleBackColor = true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-        /// <summary>
-        /// ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-        /// </summary>
-        /// <returns></returns>
-        private bool DataEntryProcess()
-        {
-            try
-            {
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.Designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.Designer.cs	(nonexistent)
@@ -1,1955 +0,0 @@
-ï»¿namespace ProcessManagement.Forms.DataEntry
-{
-    partial class FrmDRTransport
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label1 = new System.Windows.Forms.Label();
-            this.btnLineDel = new System.Windows.Forms.Button();
-            this.btnLineAdd = new System.Windows.Forms.Button();
-            this.btnDataDelete = new System.Windows.Forms.Button();
-            this.btnDataEntry = new System.Windows.Forms.Button();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.pnlTransport = new System.Windows.Forms.Panel();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label60 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label59 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label58 = new System.Windows.Forms.Label();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label57 = new System.Windows.Forms.Label();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.label56 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label55 = new System.Windows.Forms.Label();
-            this.label54 = new System.Windows.Forms.Label();
-            this.label53 = new System.Windows.Forms.Label();
-            this.label50 = new System.Windows.Forms.Label();
-            this.label51 = new System.Windows.Forms.Label();
-            this.label52 = new System.Windows.Forms.Label();
-            this.label47 = new System.Windows.Forms.Label();
-            this.label48 = new System.Windows.Forms.Label();
-            this.label49 = new System.Windows.Forms.Label();
-            this.label38 = new System.Windows.Forms.Label();
-            this.label39 = new System.Windows.Forms.Label();
-            this.label40 = new System.Windows.Forms.Label();
-            this.label41 = new System.Windows.Forms.Label();
-            this.label42 = new System.Windows.Forms.Label();
-            this.label43 = new System.Windows.Forms.Label();
-            this.label44 = new System.Windows.Forms.Label();
-            this.label45 = new System.Windows.Forms.Label();
-            this.label46 = new System.Windows.Forms.Label();
-            this.label35 = new System.Windows.Forms.Label();
-            this.label36 = new System.Windows.Forms.Label();
-            this.label37 = new System.Windows.Forms.Label();
-            this.label32 = new System.Windows.Forms.Label();
-            this.label33 = new System.Windows.Forms.Label();
-            this.label34 = new System.Windows.Forms.Label();
-            this.label29 = new System.Windows.Forms.Label();
-            this.label31 = new System.Windows.Forms.Label();
-            this.label27 = new System.Windows.Forms.Label();
-            this.label30 = new System.Windows.Forms.Label();
-            this.lblDspCosts4 = new System.Windows.Forms.Label();
-            this.label28 = new System.Windows.Forms.Label();
-            this.lblDspCosts3 = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
-            this.lblDspCosts2 = new System.Windows.Forms.Label();
-            this.label21 = new System.Windows.Forms.Label();
-            this.lblDspCosts1 = new System.Windows.Forms.Label();
-            this.label26 = new System.Windows.Forms.Label();
-            this.label25 = new System.Windows.Forms.Label();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label23 = new System.Windows.Forms.Label();
-            this.label16 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
-            this.label19 = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.lblDspKm2 = new System.Windows.Forms.Label();
-            this.lblDspKm1 = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.pnlCheck4 = new System.Windows.Forms.Panel();
-            this.checkBox4_01 = new System.Windows.Forms.CheckBox();
-            this.pnlCheck3 = new System.Windows.Forms.Panel();
-            this.checkBox3_01 = new System.Windows.Forms.CheckBox();
-            this.pnlCheck2 = new System.Windows.Forms.Panel();
-            this.checkBox2_01 = new System.Windows.Forms.CheckBox();
-            this.pnlCheck1 = new System.Windows.Forms.Panel();
-            this.checkBox1_01 = new System.Windows.Forms.CheckBox();
-            this.lblkm3 = new System.Windows.Forms.Label();
-            this.textBox3_01 = new System.Windows.Forms.TextBox();
-            this.lblkm2 = new System.Windows.Forms.Label();
-            this.lblkm1 = new System.Windows.Forms.Label();
-            this.textBox2_01 = new System.Windows.Forms.TextBox();
-            this.textBox1_01 = new System.Windows.Forms.TextBox();
-            this.lblDay31 = new System.Windows.Forms.Label();
-            this.lblDay29 = new System.Windows.Forms.Label();
-            this.lblDay28 = new System.Windows.Forms.Label();
-            this.lblDay27 = new System.Windows.Forms.Label();
-            this.lblDay26 = new System.Windows.Forms.Label();
-            this.lblDay25 = new System.Windows.Forms.Label();
-            this.lblDay24 = new System.Windows.Forms.Label();
-            this.lblDay23 = new System.Windows.Forms.Label();
-            this.lblDay22 = new System.Windows.Forms.Label();
-            this.lblDay21 = new System.Windows.Forms.Label();
-            this.lblDay20 = new System.Windows.Forms.Label();
-            this.lblDay19 = new System.Windows.Forms.Label();
-            this.lblDay18 = new System.Windows.Forms.Label();
-            this.lblDay17 = new System.Windows.Forms.Label();
-            this.lblDay16 = new System.Windows.Forms.Label();
-            this.lblDay15 = new System.Windows.Forms.Label();
-            this.lblDay14 = new System.Windows.Forms.Label();
-            this.lblDay13 = new System.Windows.Forms.Label();
-            this.lblDay12 = new System.Windows.Forms.Label();
-            this.lblDay11 = new System.Windows.Forms.Label();
-            this.lblDay10 = new System.Windows.Forms.Label();
-            this.lblDay09 = new System.Windows.Forms.Label();
-            this.lblDay08 = new System.Windows.Forms.Label();
-            this.lblDay07 = new System.Windows.Forms.Label();
-            this.lblDay06 = new System.Windows.Forms.Label();
-            this.lblDay05 = new System.Windows.Forms.Label();
-            this.lblDay04 = new System.Windows.Forms.Label();
-            this.lblDay03 = new System.Windows.Forms.Label();
-            this.lblDay02 = new System.Windows.Forms.Label();
-            this.lblDay01 = new System.Windows.Forms.Label();
-            this.lblDay30 = new System.Windows.Forms.Label();
-            this.pnlTransport.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.pnlCheck4.SuspendLayout();
-            this.pnlCheck3.SuspendLayout();
-            this.pnlCheck2.SuspendLayout();
-            this.pnlCheck1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(422, 10);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(500, 20);
-            this.label1.TabIndex = 7;
-            this.label1.Text = "äº¤ã€€é€šã€€è²»ã€€å…¥ã€€åŠ›";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // btnLineDel
-            // 
-            this.btnLineDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLineDel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.btnLineDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnLineDel.Location = new System.Drawing.Point(815, 656);
-            this.btnLineDel.Name = "btnLineDel";
-            this.btnLineDel.Size = new System.Drawing.Size(130, 30);
-            this.btnLineDel.TabIndex = 100;
-            this.btnLineDel.Text = "è¡Œã€€å‰Šã€€é™¤";
-            this.btnLineDel.UseVisualStyleBackColor = false;
-            this.btnLineDel.Visible = false;
-            // 
-            // btnLineAdd
-            // 
-            this.btnLineAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnLineAdd.BackColor = System.Drawing.Color.PaleGreen;
-            this.btnLineAdd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnLineAdd.Location = new System.Drawing.Point(677, 656);
-            this.btnLineAdd.Name = "btnLineAdd";
-            this.btnLineAdd.Size = new System.Drawing.Size(130, 30);
-            this.btnLineAdd.TabIndex = 99;
-            this.btnLineAdd.Text = "è¡Œã€€è¿½ã€€åŠ ";
-            this.btnLineAdd.UseVisualStyleBackColor = false;
-            this.btnLineAdd.Visible = false;
-            // 
-            // btnDataDelete
-            // 
-            this.btnDataDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDataDelete.BackColor = System.Drawing.Color.Red;
-            this.btnDataDelete.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDataDelete.ForeColor = System.Drawing.Color.White;
-            this.btnDataDelete.Location = new System.Drawing.Point(1089, 656);
-            this.btnDataDelete.Name = "btnDataDelete";
-            this.btnDataDelete.Size = new System.Drawing.Size(120, 30);
-            this.btnDataDelete.TabIndex = 97;
-            this.btnDataDelete.Text = "å‰Šã€€é™¤";
-            this.btnDataDelete.UseVisualStyleBackColor = false;
-            // 
-            // btnDataEntry
-            // 
-            this.btnDataEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDataEntry.BackColor = System.Drawing.Color.Green;
-            this.btnDataEntry.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(963, 656);
-            this.btnDataEntry.Name = "btnDataEntry";
-            this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
-            this.btnDataEntry.TabIndex = 96;
-            this.btnDataEntry.Text = "ç™»ã€€éŒ²";
-            this.btnDataEntry.UseVisualStyleBackColor = false;
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1215, 656);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 98;
-            this.btnEnd.Text = "çµ‚ã€€äº†";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // btnOtherProc
-            // 
-            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
-            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
-            this.btnOtherProc.Name = "btnOtherProc";
-            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
-            this.btnOtherProc.TabIndex = 101;
-            this.btnOtherProc.TabStop = false;
-            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
-            this.btnOtherProc.UseVisualStyleBackColor = false;
-            // 
-            // pnlTransport
-            // 
-            this.pnlTransport.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.pnlTransport.BackColor = System.Drawing.Color.DarkCyan;
-            this.pnlTransport.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.pnlTransport.Controls.Add(this.label11);
-            this.pnlTransport.Controls.Add(this.label10);
-            this.pnlTransport.Controls.Add(this.label5);
-            this.pnlTransport.Controls.Add(this.label4);
-            this.pnlTransport.Controls.Add(this.label3);
-            this.pnlTransport.Controls.Add(this.label9);
-            this.pnlTransport.Controls.Add(this.label8);
-            this.pnlTransport.Controls.Add(this.label7);
-            this.pnlTransport.Controls.Add(this.label6);
-            this.pnlTransport.Controls.Add(this.label2);
-            this.pnlTransport.Controls.Add(this.label60);
-            this.pnlTransport.Controls.Add(this.textBox5);
-            this.pnlTransport.Controls.Add(this.label59);
-            this.pnlTransport.Controls.Add(this.textBox4);
-            this.pnlTransport.Controls.Add(this.label58);
-            this.pnlTransport.Controls.Add(this.textBox3);
-            this.pnlTransport.Controls.Add(this.label57);
-            this.pnlTransport.Controls.Add(this.textBox2);
-            this.pnlTransport.Controls.Add(this.label56);
-            this.pnlTransport.Controls.Add(this.textBox1);
-            this.pnlTransport.Controls.Add(this.label55);
-            this.pnlTransport.Controls.Add(this.label54);
-            this.pnlTransport.Controls.Add(this.label53);
-            this.pnlTransport.Controls.Add(this.label50);
-            this.pnlTransport.Controls.Add(this.label51);
-            this.pnlTransport.Controls.Add(this.label52);
-            this.pnlTransport.Controls.Add(this.label47);
-            this.pnlTransport.Controls.Add(this.label48);
-            this.pnlTransport.Controls.Add(this.label49);
-            this.pnlTransport.Controls.Add(this.label38);
-            this.pnlTransport.Controls.Add(this.label39);
-            this.pnlTransport.Controls.Add(this.label40);
-            this.pnlTransport.Controls.Add(this.label41);
-            this.pnlTransport.Controls.Add(this.label42);
-            this.pnlTransport.Controls.Add(this.label43);
-            this.pnlTransport.Controls.Add(this.label44);
-            this.pnlTransport.Controls.Add(this.label45);
-            this.pnlTransport.Controls.Add(this.label46);
-            this.pnlTransport.Controls.Add(this.label35);
-            this.pnlTransport.Controls.Add(this.label36);
-            this.pnlTransport.Controls.Add(this.label37);
-            this.pnlTransport.Controls.Add(this.label32);
-            this.pnlTransport.Controls.Add(this.label33);
-            this.pnlTransport.Controls.Add(this.label34);
-            this.pnlTransport.Controls.Add(this.label29);
-            this.pnlTransport.Controls.Add(this.label31);
-            this.pnlTransport.Controls.Add(this.label27);
-            this.pnlTransport.Controls.Add(this.label30);
-            this.pnlTransport.Controls.Add(this.lblDspCosts4);
-            this.pnlTransport.Controls.Add(this.label28);
-            this.pnlTransport.Controls.Add(this.lblDspCosts3);
-            this.pnlTransport.Controls.Add(this.label22);
-            this.pnlTransport.Controls.Add(this.lblDspCosts2);
-            this.pnlTransport.Controls.Add(this.label21);
-            this.pnlTransport.Controls.Add(this.lblDspCosts1);
-            this.pnlTransport.Controls.Add(this.label26);
-            this.pnlTransport.Controls.Add(this.label25);
-            this.pnlTransport.Controls.Add(this.label24);
-            this.pnlTransport.Controls.Add(this.label23);
-            this.pnlTransport.Controls.Add(this.label16);
-            this.pnlTransport.Controls.Add(this.label15);
-            this.pnlTransport.Controls.Add(this.label14);
-            this.pnlTransport.Controls.Add(this.label13);
-            this.pnlTransport.Controls.Add(this.label20);
-            this.pnlTransport.Controls.Add(this.label19);
-            this.pnlTransport.Controls.Add(this.label18);
-            this.pnlTransport.Controls.Add(this.lblDspKm2);
-            this.pnlTransport.Controls.Add(this.lblDspKm1);
-            this.pnlTransport.Controls.Add(this.label17);
-            this.pnlTransport.Controls.Add(this.label12);
-            this.pnlTransport.Controls.Add(this.panel1);
-            this.pnlTransport.Location = new System.Drawing.Point(7, 40);
-            this.pnlTransport.Name = "pnlTransport";
-            this.pnlTransport.Size = new System.Drawing.Size(1330, 610);
-            this.pnlTransport.TabIndex = 102;
-            // 
-            // label11
-            // 
-            this.label11.BackColor = System.Drawing.Color.White;
-            this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label11.Location = new System.Drawing.Point(396, 61);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(288, 27);
-            this.label11.TabIndex = 139;
-            this.label11.Tag = "";
-            this.label11.Text = "é€šã€€ã€€å‹¤";
-            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label10
-            // 
-            this.label10.BackColor = System.Drawing.Color.White;
-            this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label10.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label10.Location = new System.Drawing.Point(612, 88);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(72, 27);
-            this.label10.TabIndex = 138;
-            this.label10.Tag = "";
-            this.label10.Text = "äº‹å‹™æ‰€é€€å‹¤";
-            this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label5
-            // 
-            this.label5.BackColor = System.Drawing.Color.White;
-            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label5.Location = new System.Drawing.Point(540, 88);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(72, 27);
-            this.label5.TabIndex = 137;
-            this.label5.Tag = "";
-            this.label5.Text = "äº‹å‹™æ‰€é€€å‹¤";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label4
-            // 
-            this.label4.BackColor = System.Drawing.Color.White;
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label4.Location = new System.Drawing.Point(468, 88);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(72, 27);
-            this.label4.TabIndex = 136;
-            this.label4.Tag = "";
-            this.label4.Text = "å‡ºå‹¤æ™‚è³‡ç½®";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.White;
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label3.Location = new System.Drawing.Point(396, 88);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(72, 27);
-            this.label3.TabIndex = 135;
-            this.label3.Tag = "";
-            this.label3.Text = "äº‹å‹™æ‰€å‡ºå‹¤";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label9
-            // 
-            this.label9.BackColor = System.Drawing.Color.White;
-            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label9.Location = new System.Drawing.Point(6, 61);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(390, 27);
-            this.label9.TabIndex = 134;
-            this.label9.Tag = "";
-            this.label9.Text = "ç�¾ã€€å ´ã€€ç§»ã€€å‹•ï¼ˆå‡ºå¼µè²»ï¼‰";
-            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label8
-            // 
-            this.label8.BackColor = System.Drawing.Color.White;
-            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label8.Location = new System.Drawing.Point(276, 88);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(120, 27);
-            this.label8.TabIndex = 133;
-            this.label8.Tag = "";
-            this.label8.Text = "å½“ã€€æ—¥ã€€è¨ˆ";
-            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label7
-            // 
-            this.label7.BackColor = System.Drawing.Color.White;
-            this.label7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label7.Location = new System.Drawing.Point(156, 88);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(120, 27);
-            this.label7.TabIndex = 132;
-            this.label7.Tag = "";
-            this.label7.Text = "äº‹å‹™æ‰€ç�€";
-            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label6
-            // 
-            this.label6.BackColor = System.Drawing.Color.White;
-            this.label6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label6.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label6.Location = new System.Drawing.Point(36, 88);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(120, 27);
-            this.label6.TabIndex = 131;
-            this.label6.Tag = "";
-            this.label6.Text = "äº‹å‹™æ‰€ç™º";
-            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label2
-            // 
-            this.label2.BackColor = System.Drawing.Color.White;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.Location = new System.Drawing.Point(6, 88);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(30, 27);
-            this.label2.TabIndex = 130;
-            this.label2.Tag = "";
-            this.label2.Text = "æ—¥";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label60
-            // 
-            this.label60.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label60.BackColor = System.Drawing.Color.White;
-            this.label60.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label60.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label60.Location = new System.Drawing.Point(654, 413);
-            this.label60.Name = "label60";
-            this.label60.Size = new System.Drawing.Size(30, 27);
-            this.label60.TabIndex = 129;
-            this.label60.Text = "å›ž";
-            this.label60.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox5
-            // 
-            this.textBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox5.Location = new System.Drawing.Point(612, 413);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(42, 27);
-            this.textBox5.TabIndex = 128;
-            this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label59
-            // 
-            this.label59.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label59.BackColor = System.Drawing.Color.White;
-            this.label59.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label59.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label59.Location = new System.Drawing.Point(582, 413);
-            this.label59.Name = "label59";
-            this.label59.Size = new System.Drawing.Size(30, 27);
-            this.label59.TabIndex = 127;
-            this.label59.Text = "å›ž";
-            this.label59.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox4
-            // 
-            this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox4.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox4.Location = new System.Drawing.Point(540, 413);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(42, 27);
-            this.textBox4.TabIndex = 126;
-            this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label58
-            // 
-            this.label58.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label58.BackColor = System.Drawing.Color.White;
-            this.label58.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label58.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label58.Location = new System.Drawing.Point(510, 413);
-            this.label58.Name = "label58";
-            this.label58.Size = new System.Drawing.Size(30, 27);
-            this.label58.TabIndex = 125;
-            this.label58.Text = "å›ž";
-            this.label58.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox3
-            // 
-            this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox3.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox3.Location = new System.Drawing.Point(468, 413);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(42, 27);
-            this.textBox3.TabIndex = 124;
-            this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label57
-            // 
-            this.label57.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label57.BackColor = System.Drawing.Color.White;
-            this.label57.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label57.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label57.Location = new System.Drawing.Point(438, 413);
-            this.label57.Name = "label57";
-            this.label57.Size = new System.Drawing.Size(30, 27);
-            this.label57.TabIndex = 123;
-            this.label57.Text = "å›ž";
-            this.label57.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox2
-            // 
-            this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox2.Location = new System.Drawing.Point(396, 413);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(42, 27);
-            this.textBox2.TabIndex = 122;
-            this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label56
-            // 
-            this.label56.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label56.BackColor = System.Drawing.Color.White;
-            this.label56.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label56.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label56.Location = new System.Drawing.Point(366, 413);
-            this.label56.Name = "label56";
-            this.label56.Size = new System.Drawing.Size(30, 27);
-            this.label56.TabIndex = 121;
-            this.label56.Text = "Km";
-            this.label56.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox1
-            // 
-            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox1.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox1.Location = new System.Drawing.Point(276, 413);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(90, 27);
-            this.textBox1.TabIndex = 120;
-            this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // label55
-            // 
-            this.label55.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label55.BackColor = System.Drawing.Color.White;
-            this.label55.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label55.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label55.Location = new System.Drawing.Point(6, 413);
-            this.label55.Name = "label55";
-            this.label55.Size = new System.Drawing.Size(270, 27);
-            this.label55.TabIndex = 119;
-            this.label55.Tag = "";
-            this.label55.Text = "å�ˆã€€ã€€è¨ˆ";
-            this.label55.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label54
-            // 
-            this.label54.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label54.BackColor = System.Drawing.Color.White;
-            this.label54.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label54.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label54.Location = new System.Drawing.Point(983, 453);
-            this.label54.Name = "label54";
-            this.label54.Size = new System.Drawing.Size(170, 30);
-            this.label54.TabIndex = 118;
-            this.label54.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label53
-            // 
-            this.label53.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label53.BackColor = System.Drawing.Color.White;
-            this.label53.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label53.Location = new System.Drawing.Point(573, 573);
-            this.label53.Name = "label53";
-            this.label53.Size = new System.Drawing.Size(580, 30);
-            this.label53.TabIndex = 117;
-            this.label53.Text = "â‘ ã€€ï¼‹ã€€â‘¡ã€€ï¼‹ã€€â‘¢ã€€ï¼‹ã€€â‘£";
-            this.label53.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label50
-            // 
-            this.label50.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label50.BackColor = System.Drawing.Color.White;
-            this.label50.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label50.Location = new System.Drawing.Point(1283, 573);
-            this.label50.Name = "label50";
-            this.label50.Size = new System.Drawing.Size(40, 30);
-            this.label50.TabIndex = 116;
-            this.label50.Text = "å††";
-            this.label50.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label51
-            // 
-            this.label51.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label51.BackColor = System.Drawing.Color.White;
-            this.label51.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label51.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label51.Location = new System.Drawing.Point(1183, 573);
-            this.label51.Name = "label51";
-            this.label51.Size = new System.Drawing.Size(100, 30);
-            this.label51.TabIndex = 115;
-            this.label51.Text = "9,999,999";
-            this.label51.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label52
-            // 
-            this.label52.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label52.BackColor = System.Drawing.Color.White;
-            this.label52.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label52.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label52.Location = new System.Drawing.Point(1153, 573);
-            this.label52.Name = "label52";
-            this.label52.Size = new System.Drawing.Size(30, 30);
-            this.label52.TabIndex = 114;
-            this.label52.Text = "ï¼�";
-            this.label52.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label47
-            // 
-            this.label47.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label47.BackColor = System.Drawing.Color.White;
-            this.label47.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label47.Location = new System.Drawing.Point(1283, 453);
-            this.label47.Name = "label47";
-            this.label47.Size = new System.Drawing.Size(40, 30);
-            this.label47.TabIndex = 113;
-            this.label47.Text = "å††";
-            this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label48
-            // 
-            this.label48.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label48.BackColor = System.Drawing.Color.White;
-            this.label48.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label48.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label48.Location = new System.Drawing.Point(1183, 453);
-            this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(100, 30);
-            this.label48.TabIndex = 112;
-            this.label48.Text = "9,999,999";
-            this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label49
-            // 
-            this.label49.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label49.BackColor = System.Drawing.Color.White;
-            this.label49.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label49.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label49.Location = new System.Drawing.Point(1153, 453);
-            this.label49.Name = "label49";
-            this.label49.Size = new System.Drawing.Size(30, 30);
-            this.label49.TabIndex = 111;
-            this.label49.Text = "ï¼�";
-            this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label38
-            // 
-            this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label38.BackColor = System.Drawing.Color.White;
-            this.label38.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label38.Location = new System.Drawing.Point(1283, 543);
-            this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(40, 30);
-            this.label38.TabIndex = 110;
-            this.label38.Text = "å††";
-            this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label39
-            // 
-            this.label39.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label39.BackColor = System.Drawing.Color.White;
-            this.label39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label39.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label39.Location = new System.Drawing.Point(1183, 543);
-            this.label39.Name = "label39";
-            this.label39.Size = new System.Drawing.Size(100, 30);
-            this.label39.TabIndex = 109;
-            this.label39.Text = "9,999,999";
-            this.label39.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label40
-            // 
-            this.label40.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label40.BackColor = System.Drawing.Color.White;
-            this.label40.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label40.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label40.Location = new System.Drawing.Point(1153, 543);
-            this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(30, 30);
-            this.label40.TabIndex = 108;
-            this.label40.Text = "ï¼�";
-            this.label40.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label41
-            // 
-            this.label41.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label41.BackColor = System.Drawing.Color.White;
-            this.label41.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label41.Location = new System.Drawing.Point(1283, 513);
-            this.label41.Name = "label41";
-            this.label41.Size = new System.Drawing.Size(40, 30);
-            this.label41.TabIndex = 107;
-            this.label41.Text = "å††";
-            this.label41.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label42
-            // 
-            this.label42.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label42.BackColor = System.Drawing.Color.White;
-            this.label42.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label42.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label42.Location = new System.Drawing.Point(1183, 513);
-            this.label42.Name = "label42";
-            this.label42.Size = new System.Drawing.Size(100, 30);
-            this.label42.TabIndex = 106;
-            this.label42.Text = "9,999,999";
-            this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label43
-            // 
-            this.label43.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label43.BackColor = System.Drawing.Color.White;
-            this.label43.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label43.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label43.Location = new System.Drawing.Point(1153, 513);
-            this.label43.Name = "label43";
-            this.label43.Size = new System.Drawing.Size(30, 30);
-            this.label43.TabIndex = 105;
-            this.label43.Text = "ï¼�";
-            this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label44
-            // 
-            this.label44.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label44.BackColor = System.Drawing.Color.White;
-            this.label44.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label44.Location = new System.Drawing.Point(1283, 483);
-            this.label44.Name = "label44";
-            this.label44.Size = new System.Drawing.Size(40, 30);
-            this.label44.TabIndex = 104;
-            this.label44.Text = "å††";
-            this.label44.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label45
-            // 
-            this.label45.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label45.BackColor = System.Drawing.Color.White;
-            this.label45.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label45.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label45.Location = new System.Drawing.Point(1183, 483);
-            this.label45.Name = "label45";
-            this.label45.Size = new System.Drawing.Size(100, 30);
-            this.label45.TabIndex = 103;
-            this.label45.Text = "9,999,999";
-            this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label46
-            // 
-            this.label46.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label46.BackColor = System.Drawing.Color.White;
-            this.label46.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label46.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label46.Location = new System.Drawing.Point(1153, 483);
-            this.label46.Name = "label46";
-            this.label46.Size = new System.Drawing.Size(30, 30);
-            this.label46.TabIndex = 102;
-            this.label46.Text = "ï¼�";
-            this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label35
-            // 
-            this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label35.BackColor = System.Drawing.Color.White;
-            this.label35.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label35.Location = new System.Drawing.Point(1113, 543);
-            this.label35.Name = "label35";
-            this.label35.Size = new System.Drawing.Size(40, 30);
-            this.label35.TabIndex = 101;
-            this.label35.Text = "å›ž";
-            this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label36
-            // 
-            this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label36.BackColor = System.Drawing.Color.White;
-            this.label36.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label36.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label36.Location = new System.Drawing.Point(1013, 543);
-            this.label36.Name = "label36";
-            this.label36.Size = new System.Drawing.Size(100, 30);
-            this.label36.TabIndex = 100;
-            this.label36.Text = "9,999,999";
-            this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label37
-            // 
-            this.label37.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label37.BackColor = System.Drawing.Color.White;
-            this.label37.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label37.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label37.Location = new System.Drawing.Point(983, 543);
-            this.label37.Name = "label37";
-            this.label37.Size = new System.Drawing.Size(30, 30);
-            this.label37.TabIndex = 99;
-            this.label37.Text = "Ã—";
-            this.label37.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label32
-            // 
-            this.label32.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label32.BackColor = System.Drawing.Color.White;
-            this.label32.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label32.Location = new System.Drawing.Point(1113, 513);
-            this.label32.Name = "label32";
-            this.label32.Size = new System.Drawing.Size(40, 30);
-            this.label32.TabIndex = 98;
-            this.label32.Text = "å›ž";
-            this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label33
-            // 
-            this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label33.BackColor = System.Drawing.Color.White;
-            this.label33.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label33.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label33.Location = new System.Drawing.Point(1013, 513);
-            this.label33.Name = "label33";
-            this.label33.Size = new System.Drawing.Size(100, 30);
-            this.label33.TabIndex = 97;
-            this.label33.Text = "9,999,999";
-            this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label34
-            // 
-            this.label34.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label34.BackColor = System.Drawing.Color.White;
-            this.label34.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label34.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label34.Location = new System.Drawing.Point(983, 513);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(30, 30);
-            this.label34.TabIndex = 96;
-            this.label34.Text = "Ã—";
-            this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label29
-            // 
-            this.label29.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label29.BackColor = System.Drawing.Color.White;
-            this.label29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label29.Location = new System.Drawing.Point(1113, 483);
-            this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(40, 30);
-            this.label29.TabIndex = 95;
-            this.label29.Text = "å›ž";
-            this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label31
-            // 
-            this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label31.BackColor = System.Drawing.Color.White;
-            this.label31.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label31.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label31.Location = new System.Drawing.Point(1013, 483);
-            this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(100, 30);
-            this.label31.TabIndex = 94;
-            this.label31.Text = "9,999,999";
-            this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label27
-            // 
-            this.label27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label27.BackColor = System.Drawing.Color.White;
-            this.label27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label27.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label27.Location = new System.Drawing.Point(983, 483);
-            this.label27.Name = "label27";
-            this.label27.Size = new System.Drawing.Size(30, 30);
-            this.label27.TabIndex = 93;
-            this.label27.Text = "Ã—";
-            this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label30
-            // 
-            this.label30.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label30.BackColor = System.Drawing.Color.White;
-            this.label30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label30.Location = new System.Drawing.Point(943, 543);
-            this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(40, 30);
-            this.label30.TabIndex = 92;
-            this.label30.Text = "å††";
-            this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDspCosts4
-            // 
-            this.lblDspCosts4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblDspCosts4.BackColor = System.Drawing.Color.White;
-            this.lblDspCosts4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDspCosts4.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDspCosts4.Location = new System.Drawing.Point(843, 543);
-            this.lblDspCosts4.Name = "lblDspCosts4";
-            this.lblDspCosts4.Size = new System.Drawing.Size(100, 30);
-            this.lblDspCosts4.TabIndex = 91;
-            this.lblDspCosts4.Text = "9,999,999";
-            this.lblDspCosts4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label28
-            // 
-            this.label28.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label28.BackColor = System.Drawing.Color.White;
-            this.label28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label28.Location = new System.Drawing.Point(943, 513);
-            this.label28.Name = "label28";
-            this.label28.Size = new System.Drawing.Size(40, 30);
-            this.label28.TabIndex = 90;
-            this.label28.Text = "å††";
-            this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDspCosts3
-            // 
-            this.lblDspCosts3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblDspCosts3.BackColor = System.Drawing.Color.White;
-            this.lblDspCosts3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDspCosts3.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDspCosts3.Location = new System.Drawing.Point(843, 513);
-            this.lblDspCosts3.Name = "lblDspCosts3";
-            this.lblDspCosts3.Size = new System.Drawing.Size(100, 30);
-            this.lblDspCosts3.TabIndex = 89;
-            this.lblDspCosts3.Text = "9,999,999";
-            this.lblDspCosts3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label22
-            // 
-            this.label22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label22.BackColor = System.Drawing.Color.White;
-            this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label22.Location = new System.Drawing.Point(943, 483);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(40, 30);
-            this.label22.TabIndex = 88;
-            this.label22.Text = "å††";
-            this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDspCosts2
-            // 
-            this.lblDspCosts2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblDspCosts2.BackColor = System.Drawing.Color.White;
-            this.lblDspCosts2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDspCosts2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDspCosts2.Location = new System.Drawing.Point(843, 483);
-            this.lblDspCosts2.Name = "lblDspCosts2";
-            this.lblDspCosts2.Size = new System.Drawing.Size(100, 30);
-            this.lblDspCosts2.TabIndex = 87;
-            this.lblDspCosts2.Text = "9,999,999";
-            this.lblDspCosts2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label21
-            // 
-            this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label21.BackColor = System.Drawing.Color.White;
-            this.label21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label21.Location = new System.Drawing.Point(943, 453);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(40, 30);
-            this.label21.TabIndex = 86;
-            this.label21.Text = "å††";
-            this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDspCosts1
-            // 
-            this.lblDspCosts1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblDspCosts1.BackColor = System.Drawing.Color.White;
-            this.lblDspCosts1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDspCosts1.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDspCosts1.Location = new System.Drawing.Point(843, 453);
-            this.lblDspCosts1.Name = "lblDspCosts1";
-            this.lblDspCosts1.Size = new System.Drawing.Size(100, 30);
-            this.lblDspCosts1.TabIndex = 85;
-            this.lblDspCosts1.Text = "9,999,999";
-            this.lblDspCosts1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label26
-            // 
-            this.label26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label26.BackColor = System.Drawing.Color.White;
-            this.label26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label26.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label26.Location = new System.Drawing.Point(813, 483);
-            this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(30, 30);
-            this.label26.TabIndex = 84;
-            this.label26.Text = "Ã—";
-            this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label25
-            // 
-            this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label25.BackColor = System.Drawing.Color.White;
-            this.label25.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label25.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label25.Location = new System.Drawing.Point(813, 453);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(30, 30);
-            this.label25.TabIndex = 83;
-            this.label25.Text = "Ã—";
-            this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label24
-            // 
-            this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label24.BackColor = System.Drawing.Color.White;
-            this.label24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label24.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label24.Location = new System.Drawing.Point(773, 483);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(40, 30);
-            this.label24.TabIndex = 81;
-            this.label24.Text = "Km";
-            this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label23
-            // 
-            this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label23.BackColor = System.Drawing.Color.White;
-            this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label23.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label23.Location = new System.Drawing.Point(773, 453);
-            this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(40, 30);
-            this.label23.TabIndex = 82;
-            this.label23.Text = "Km";
-            this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label16
-            // 
-            this.label16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label16.BackColor = System.Drawing.Color.White;
-            this.label16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label16.Location = new System.Drawing.Point(513, 573);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(60, 30);
-            this.label16.TabIndex = 71;
-            this.label16.Text = "å�ˆè¨ˆ";
-            this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label15
-            // 
-            this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label15.BackColor = System.Drawing.Color.White;
-            this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label15.Location = new System.Drawing.Point(513, 543);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(60, 30);
-            this.label15.TabIndex = 72;
-            this.label15.Text = "â‘£";
-            this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label14
-            // 
-            this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label14.BackColor = System.Drawing.Color.White;
-            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label14.Location = new System.Drawing.Point(513, 513);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(60, 30);
-            this.label14.TabIndex = 73;
-            this.label14.Text = "â‘¢";
-            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label13
-            // 
-            this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label13.BackColor = System.Drawing.Color.White;
-            this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label13.Location = new System.Drawing.Point(513, 483);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(60, 30);
-            this.label13.TabIndex = 74;
-            this.label13.Text = "â‘¡";
-            this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label20
-            // 
-            this.label20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label20.BackColor = System.Drawing.Color.White;
-            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label20.Location = new System.Drawing.Point(573, 543);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(270, 30);
-            this.label20.TabIndex = 80;
-            this.label20.Text = "é€šå‹¤æœ‰æ–™ï¼ˆå…¬èª�åˆ†ç‰‡é�“ï¼‰";
-            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label19
-            // 
-            this.label19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label19.BackColor = System.Drawing.Color.White;
-            this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label19.Location = new System.Drawing.Point(573, 513);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(270, 30);
-            this.label19.TabIndex = 76;
-            this.label19.Text = "é€šå‹¤æ™‚ã�®è³‡æ��ç½®ã��å ´ã�«æ‹ ã�£ã�Ÿå›žæ•°";
-            this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label18
-            // 
-            this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label18.BackColor = System.Drawing.Color.White;
-            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label18.Location = new System.Drawing.Point(573, 483);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(100, 30);
-            this.label18.TabIndex = 77;
-            this.label18.Text = "é€šã€€ã€€å‹¤";
-            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDspKm2
-            // 
-            this.lblDspKm2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblDspKm2.BackColor = System.Drawing.Color.White;
-            this.lblDspKm2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDspKm2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDspKm2.Location = new System.Drawing.Point(673, 483);
-            this.lblDspKm2.Name = "lblDspKm2";
-            this.lblDspKm2.Size = new System.Drawing.Size(100, 30);
-            this.lblDspKm2.TabIndex = 78;
-            this.lblDspKm2.Text = "9,999,999";
-            this.lblDspKm2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // lblDspKm1
-            // 
-            this.lblDspKm1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblDspKm1.BackColor = System.Drawing.Color.White;
-            this.lblDspKm1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDspKm1.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDspKm1.Location = new System.Drawing.Point(673, 453);
-            this.lblDspKm1.Name = "lblDspKm1";
-            this.lblDspKm1.Size = new System.Drawing.Size(100, 30);
-            this.lblDspKm1.TabIndex = 79;
-            this.lblDspKm1.Text = "9,999,999";
-            this.lblDspKm1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label17
-            // 
-            this.label17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label17.BackColor = System.Drawing.Color.White;
-            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label17.Location = new System.Drawing.Point(573, 453);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(100, 30);
-            this.label17.TabIndex = 75;
-            this.label17.Text = "ç�¾å ´ç§»å‹•";
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label12
-            // 
-            this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label12.BackColor = System.Drawing.Color.White;
-            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label12.Location = new System.Drawing.Point(513, 453);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(60, 30);
-            this.label12.TabIndex = 70;
-            this.label12.Text = "â‘ ";
-            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // panel1
-            // 
-            this.panel1.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.panel1.AutoScroll = true;
-            this.panel1.Controls.Add(this.comboBox1);
-            this.panel1.Controls.Add(this.pnlCheck4);
-            this.panel1.Controls.Add(this.pnlCheck3);
-            this.panel1.Controls.Add(this.pnlCheck2);
-            this.panel1.Controls.Add(this.pnlCheck1);
-            this.panel1.Controls.Add(this.lblkm3);
-            this.panel1.Controls.Add(this.textBox3_01);
-            this.panel1.Controls.Add(this.lblkm2);
-            this.panel1.Controls.Add(this.lblkm1);
-            this.panel1.Controls.Add(this.textBox2_01);
-            this.panel1.Controls.Add(this.textBox1_01);
-            this.panel1.Controls.Add(this.lblDay31);
-            this.panel1.Controls.Add(this.lblDay29);
-            this.panel1.Controls.Add(this.lblDay28);
-            this.panel1.Controls.Add(this.lblDay27);
-            this.panel1.Controls.Add(this.lblDay26);
-            this.panel1.Controls.Add(this.lblDay25);
-            this.panel1.Controls.Add(this.lblDay24);
-            this.panel1.Controls.Add(this.lblDay23);
-            this.panel1.Controls.Add(this.lblDay22);
-            this.panel1.Controls.Add(this.lblDay21);
-            this.panel1.Controls.Add(this.lblDay20);
-            this.panel1.Controls.Add(this.lblDay19);
-            this.panel1.Controls.Add(this.lblDay18);
-            this.panel1.Controls.Add(this.lblDay17);
-            this.panel1.Controls.Add(this.lblDay16);
-            this.panel1.Controls.Add(this.lblDay15);
-            this.panel1.Controls.Add(this.lblDay14);
-            this.panel1.Controls.Add(this.lblDay13);
-            this.panel1.Controls.Add(this.lblDay12);
-            this.panel1.Controls.Add(this.lblDay11);
-            this.panel1.Controls.Add(this.lblDay10);
-            this.panel1.Controls.Add(this.lblDay09);
-            this.panel1.Controls.Add(this.lblDay08);
-            this.panel1.Controls.Add(this.lblDay07);
-            this.panel1.Controls.Add(this.lblDay06);
-            this.panel1.Controls.Add(this.lblDay05);
-            this.panel1.Controls.Add(this.lblDay04);
-            this.panel1.Controls.Add(this.lblDay03);
-            this.panel1.Controls.Add(this.lblDay02);
-            this.panel1.Controls.Add(this.lblDay01);
-            this.panel1.Controls.Add(this.lblDay30);
-            this.panel1.Location = new System.Drawing.Point(3, 115);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1320, 298);
-            this.panel1.TabIndex = 1;
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(681, 1);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(260, 27);
-            this.comboBox1.TabIndex = 49;
-            // 
-            // pnlCheck4
-            // 
-            this.pnlCheck4.BackColor = System.Drawing.Color.White;
-            this.pnlCheck4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pnlCheck4.Controls.Add(this.checkBox4_01);
-            this.pnlCheck4.Location = new System.Drawing.Point(609, 1);
-            this.pnlCheck4.Name = "pnlCheck4";
-            this.pnlCheck4.Size = new System.Drawing.Size(72, 27);
-            this.pnlCheck4.TabIndex = 0;
-            // 
-            // checkBox4_01
-            // 
-            this.checkBox4_01.Location = new System.Drawing.Point(26, 5);
-            this.checkBox4_01.Name = "checkBox4_01";
-            this.checkBox4_01.Size = new System.Drawing.Size(16, 16);
-            this.checkBox4_01.TabIndex = 0;
-            this.checkBox4_01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.checkBox4_01.UseVisualStyleBackColor = true;
-            // 
-            // pnlCheck3
-            // 
-            this.pnlCheck3.BackColor = System.Drawing.Color.White;
-            this.pnlCheck3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pnlCheck3.Controls.Add(this.checkBox3_01);
-            this.pnlCheck3.Location = new System.Drawing.Point(537, 1);
-            this.pnlCheck3.Name = "pnlCheck3";
-            this.pnlCheck3.Size = new System.Drawing.Size(72, 27);
-            this.pnlCheck3.TabIndex = 0;
-            // 
-            // checkBox3_01
-            // 
-            this.checkBox3_01.Location = new System.Drawing.Point(26, 5);
-            this.checkBox3_01.Name = "checkBox3_01";
-            this.checkBox3_01.Size = new System.Drawing.Size(16, 16);
-            this.checkBox3_01.TabIndex = 0;
-            this.checkBox3_01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.checkBox3_01.UseVisualStyleBackColor = true;
-            // 
-            // pnlCheck2
-            // 
-            this.pnlCheck2.BackColor = System.Drawing.Color.White;
-            this.pnlCheck2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pnlCheck2.Controls.Add(this.checkBox2_01);
-            this.pnlCheck2.Location = new System.Drawing.Point(465, 1);
-            this.pnlCheck2.Name = "pnlCheck2";
-            this.pnlCheck2.Size = new System.Drawing.Size(72, 27);
-            this.pnlCheck2.TabIndex = 0;
-            // 
-            // checkBox2_01
-            // 
-            this.checkBox2_01.Location = new System.Drawing.Point(26, 5);
-            this.checkBox2_01.Name = "checkBox2_01";
-            this.checkBox2_01.Size = new System.Drawing.Size(16, 16);
-            this.checkBox2_01.TabIndex = 0;
-            this.checkBox2_01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.checkBox2_01.UseVisualStyleBackColor = true;
-            // 
-            // pnlCheck1
-            // 
-            this.pnlCheck1.BackColor = System.Drawing.Color.White;
-            this.pnlCheck1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pnlCheck1.Controls.Add(this.checkBox1_01);
-            this.pnlCheck1.Location = new System.Drawing.Point(393, 1);
-            this.pnlCheck1.Name = "pnlCheck1";
-            this.pnlCheck1.Size = new System.Drawing.Size(72, 27);
-            this.pnlCheck1.TabIndex = 48;
-            // 
-            // checkBox1_01
-            // 
-            this.checkBox1_01.Location = new System.Drawing.Point(26, 5);
-            this.checkBox1_01.Name = "checkBox1_01";
-            this.checkBox1_01.Size = new System.Drawing.Size(16, 16);
-            this.checkBox1_01.TabIndex = 0;
-            this.checkBox1_01.TabStop = false;
-            this.checkBox1_01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.checkBox1_01.UseVisualStyleBackColor = true;
-            // 
-            // lblkm3
-            // 
-            this.lblkm3.BackColor = System.Drawing.Color.White;
-            this.lblkm3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblkm3.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblkm3.Location = new System.Drawing.Point(363, 1);
-            this.lblkm3.Name = "lblkm3";
-            this.lblkm3.Size = new System.Drawing.Size(30, 27);
-            this.lblkm3.TabIndex = 34;
-            this.lblkm3.Text = "Km";
-            this.lblkm3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox3_01
-            // 
-            this.textBox3_01.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox3_01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox3_01.Location = new System.Drawing.Point(273, 1);
-            this.textBox3_01.Name = "textBox3_01";
-            this.textBox3_01.Size = new System.Drawing.Size(90, 27);
-            this.textBox3_01.TabIndex = 0;
-            this.textBox3_01.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // lblkm2
-            // 
-            this.lblkm2.BackColor = System.Drawing.Color.White;
-            this.lblkm2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblkm2.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblkm2.Location = new System.Drawing.Point(243, 1);
-            this.lblkm2.Name = "lblkm2";
-            this.lblkm2.Size = new System.Drawing.Size(30, 27);
-            this.lblkm2.TabIndex = 32;
-            this.lblkm2.Text = "Km";
-            this.lblkm2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblkm1
-            // 
-            this.lblkm1.BackColor = System.Drawing.Color.White;
-            this.lblkm1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblkm1.Font = new System.Drawing.Font("Century", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblkm1.Location = new System.Drawing.Point(123, 1);
-            this.lblkm1.Name = "lblkm1";
-            this.lblkm1.Size = new System.Drawing.Size(30, 27);
-            this.lblkm1.TabIndex = 32;
-            this.lblkm1.Text = "Km";
-            this.lblkm1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // textBox2_01
-            // 
-            this.textBox2_01.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox2_01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox2_01.Location = new System.Drawing.Point(153, 1);
-            this.textBox2_01.Name = "textBox2_01";
-            this.textBox2_01.Size = new System.Drawing.Size(90, 27);
-            this.textBox2_01.TabIndex = 0;
-            this.textBox2_01.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // textBox1_01
-            // 
-            this.textBox1_01.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.textBox1_01.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox1_01.Location = new System.Drawing.Point(33, 1);
-            this.textBox1_01.Name = "textBox1_01";
-            this.textBox1_01.Size = new System.Drawing.Size(90, 27);
-            this.textBox1_01.TabIndex = 0;
-            this.textBox1_01.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            // 
-            // lblDay31
-            // 
-            this.lblDay31.BackColor = System.Drawing.Color.White;
-            this.lblDay31.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay31.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay31.Location = new System.Drawing.Point(3, 811);
-            this.lblDay31.Name = "lblDay31";
-            this.lblDay31.Size = new System.Drawing.Size(30, 27);
-            this.lblDay31.TabIndex = 31;
-            this.lblDay31.Text = "31";
-            this.lblDay31.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay29
-            // 
-            this.lblDay29.BackColor = System.Drawing.Color.White;
-            this.lblDay29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay29.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay29.Location = new System.Drawing.Point(3, 757);
-            this.lblDay29.Name = "lblDay29";
-            this.lblDay29.Size = new System.Drawing.Size(30, 27);
-            this.lblDay29.TabIndex = 29;
-            this.lblDay29.Text = "29";
-            this.lblDay29.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay28
-            // 
-            this.lblDay28.BackColor = System.Drawing.Color.White;
-            this.lblDay28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay28.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay28.Location = new System.Drawing.Point(3, 730);
-            this.lblDay28.Name = "lblDay28";
-            this.lblDay28.Size = new System.Drawing.Size(30, 27);
-            this.lblDay28.TabIndex = 28;
-            this.lblDay28.Text = "28";
-            this.lblDay28.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay27
-            // 
-            this.lblDay27.BackColor = System.Drawing.Color.White;
-            this.lblDay27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay27.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay27.Location = new System.Drawing.Point(3, 703);
-            this.lblDay27.Name = "lblDay27";
-            this.lblDay27.Size = new System.Drawing.Size(30, 27);
-            this.lblDay27.TabIndex = 27;
-            this.lblDay27.Text = "27";
-            this.lblDay27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay26
-            // 
-            this.lblDay26.BackColor = System.Drawing.Color.White;
-            this.lblDay26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay26.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay26.Location = new System.Drawing.Point(3, 676);
-            this.lblDay26.Name = "lblDay26";
-            this.lblDay26.Size = new System.Drawing.Size(30, 27);
-            this.lblDay26.TabIndex = 26;
-            this.lblDay26.Text = "26";
-            this.lblDay26.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay25
-            // 
-            this.lblDay25.BackColor = System.Drawing.Color.White;
-            this.lblDay25.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay25.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay25.Location = new System.Drawing.Point(3, 649);
-            this.lblDay25.Name = "lblDay25";
-            this.lblDay25.Size = new System.Drawing.Size(30, 27);
-            this.lblDay25.TabIndex = 25;
-            this.lblDay25.Text = "25";
-            this.lblDay25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay24
-            // 
-            this.lblDay24.BackColor = System.Drawing.Color.White;
-            this.lblDay24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay24.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay24.Location = new System.Drawing.Point(3, 622);
-            this.lblDay24.Name = "lblDay24";
-            this.lblDay24.Size = new System.Drawing.Size(30, 27);
-            this.lblDay24.TabIndex = 24;
-            this.lblDay24.Text = "24";
-            this.lblDay24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay23
-            // 
-            this.lblDay23.BackColor = System.Drawing.Color.White;
-            this.lblDay23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay23.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay23.Location = new System.Drawing.Point(3, 595);
-            this.lblDay23.Name = "lblDay23";
-            this.lblDay23.Size = new System.Drawing.Size(30, 27);
-            this.lblDay23.TabIndex = 23;
-            this.lblDay23.Text = "23";
-            this.lblDay23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay22
-            // 
-            this.lblDay22.BackColor = System.Drawing.Color.White;
-            this.lblDay22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay22.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay22.Location = new System.Drawing.Point(3, 568);
-            this.lblDay22.Name = "lblDay22";
-            this.lblDay22.Size = new System.Drawing.Size(30, 27);
-            this.lblDay22.TabIndex = 22;
-            this.lblDay22.Text = "22";
-            this.lblDay22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay21
-            // 
-            this.lblDay21.BackColor = System.Drawing.Color.White;
-            this.lblDay21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay21.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay21.Location = new System.Drawing.Point(3, 541);
-            this.lblDay21.Name = "lblDay21";
-            this.lblDay21.Size = new System.Drawing.Size(30, 27);
-            this.lblDay21.TabIndex = 21;
-            this.lblDay21.Text = "21";
-            this.lblDay21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay20
-            // 
-            this.lblDay20.BackColor = System.Drawing.Color.White;
-            this.lblDay20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay20.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay20.Location = new System.Drawing.Point(3, 514);
-            this.lblDay20.Name = "lblDay20";
-            this.lblDay20.Size = new System.Drawing.Size(30, 27);
-            this.lblDay20.TabIndex = 20;
-            this.lblDay20.Text = "20";
-            this.lblDay20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay19
-            // 
-            this.lblDay19.BackColor = System.Drawing.Color.White;
-            this.lblDay19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay19.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay19.Location = new System.Drawing.Point(3, 487);
-            this.lblDay19.Name = "lblDay19";
-            this.lblDay19.Size = new System.Drawing.Size(30, 27);
-            this.lblDay19.TabIndex = 19;
-            this.lblDay19.Text = "19";
-            this.lblDay19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay18
-            // 
-            this.lblDay18.BackColor = System.Drawing.Color.White;
-            this.lblDay18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay18.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay18.Location = new System.Drawing.Point(3, 460);
-            this.lblDay18.Name = "lblDay18";
-            this.lblDay18.Size = new System.Drawing.Size(30, 27);
-            this.lblDay18.TabIndex = 18;
-            this.lblDay18.Text = "18";
-            this.lblDay18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay17
-            // 
-            this.lblDay17.BackColor = System.Drawing.Color.White;
-            this.lblDay17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay17.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay17.Location = new System.Drawing.Point(3, 433);
-            this.lblDay17.Name = "lblDay17";
-            this.lblDay17.Size = new System.Drawing.Size(30, 27);
-            this.lblDay17.TabIndex = 17;
-            this.lblDay17.Text = "17";
-            this.lblDay17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay16
-            // 
-            this.lblDay16.BackColor = System.Drawing.Color.White;
-            this.lblDay16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay16.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay16.Location = new System.Drawing.Point(3, 406);
-            this.lblDay16.Name = "lblDay16";
-            this.lblDay16.Size = new System.Drawing.Size(30, 27);
-            this.lblDay16.TabIndex = 16;
-            this.lblDay16.Text = "16";
-            this.lblDay16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay15
-            // 
-            this.lblDay15.BackColor = System.Drawing.Color.White;
-            this.lblDay15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay15.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay15.Location = new System.Drawing.Point(3, 379);
-            this.lblDay15.Name = "lblDay15";
-            this.lblDay15.Size = new System.Drawing.Size(30, 27);
-            this.lblDay15.TabIndex = 15;
-            this.lblDay15.Text = "15";
-            this.lblDay15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay14
-            // 
-            this.lblDay14.BackColor = System.Drawing.Color.White;
-            this.lblDay14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay14.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay14.Location = new System.Drawing.Point(3, 352);
-            this.lblDay14.Name = "lblDay14";
-            this.lblDay14.Size = new System.Drawing.Size(30, 27);
-            this.lblDay14.TabIndex = 14;
-            this.lblDay14.Text = "14";
-            this.lblDay14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay13
-            // 
-            this.lblDay13.BackColor = System.Drawing.Color.White;
-            this.lblDay13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay13.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay13.Location = new System.Drawing.Point(3, 325);
-            this.lblDay13.Name = "lblDay13";
-            this.lblDay13.Size = new System.Drawing.Size(30, 27);
-            this.lblDay13.TabIndex = 13;
-            this.lblDay13.Text = "13";
-            this.lblDay13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay12
-            // 
-            this.lblDay12.BackColor = System.Drawing.Color.White;
-            this.lblDay12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay12.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay12.Location = new System.Drawing.Point(3, 298);
-            this.lblDay12.Name = "lblDay12";
-            this.lblDay12.Size = new System.Drawing.Size(30, 27);
-            this.lblDay12.TabIndex = 12;
-            this.lblDay12.Text = "12";
-            this.lblDay12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay11
-            // 
-            this.lblDay11.BackColor = System.Drawing.Color.White;
-            this.lblDay11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay11.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay11.Location = new System.Drawing.Point(3, 271);
-            this.lblDay11.Name = "lblDay11";
-            this.lblDay11.Size = new System.Drawing.Size(30, 27);
-            this.lblDay11.TabIndex = 11;
-            this.lblDay11.Text = "11";
-            this.lblDay11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay10
-            // 
-            this.lblDay10.BackColor = System.Drawing.Color.White;
-            this.lblDay10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay10.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay10.Location = new System.Drawing.Point(3, 244);
-            this.lblDay10.Name = "lblDay10";
-            this.lblDay10.Size = new System.Drawing.Size(30, 27);
-            this.lblDay10.TabIndex = 10;
-            this.lblDay10.Text = "10";
-            this.lblDay10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay09
-            // 
-            this.lblDay09.BackColor = System.Drawing.Color.White;
-            this.lblDay09.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay09.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay09.Location = new System.Drawing.Point(3, 217);
-            this.lblDay09.Name = "lblDay09";
-            this.lblDay09.Size = new System.Drawing.Size(30, 27);
-            this.lblDay09.TabIndex = 9;
-            this.lblDay09.Text = "9";
-            this.lblDay09.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay08
-            // 
-            this.lblDay08.BackColor = System.Drawing.Color.White;
-            this.lblDay08.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay08.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay08.Location = new System.Drawing.Point(3, 190);
-            this.lblDay08.Name = "lblDay08";
-            this.lblDay08.Size = new System.Drawing.Size(30, 27);
-            this.lblDay08.TabIndex = 8;
-            this.lblDay08.Text = "8";
-            this.lblDay08.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay07
-            // 
-            this.lblDay07.BackColor = System.Drawing.Color.White;
-            this.lblDay07.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay07.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay07.Location = new System.Drawing.Point(3, 163);
-            this.lblDay07.Name = "lblDay07";
-            this.lblDay07.Size = new System.Drawing.Size(30, 27);
-            this.lblDay07.TabIndex = 7;
-            this.lblDay07.Text = "7";
-            this.lblDay07.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay06
-            // 
-            this.lblDay06.BackColor = System.Drawing.Color.White;
-            this.lblDay06.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay06.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay06.Location = new System.Drawing.Point(3, 136);
-            this.lblDay06.Name = "lblDay06";
-            this.lblDay06.Size = new System.Drawing.Size(30, 27);
-            this.lblDay06.TabIndex = 6;
-            this.lblDay06.Text = "6";
-            this.lblDay06.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay05
-            // 
-            this.lblDay05.BackColor = System.Drawing.Color.White;
-            this.lblDay05.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay05.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay05.Location = new System.Drawing.Point(3, 109);
-            this.lblDay05.Name = "lblDay05";
-            this.lblDay05.Size = new System.Drawing.Size(30, 27);
-            this.lblDay05.TabIndex = 5;
-            this.lblDay05.Text = "5";
-            this.lblDay05.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay04
-            // 
-            this.lblDay04.BackColor = System.Drawing.Color.White;
-            this.lblDay04.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay04.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay04.Location = new System.Drawing.Point(3, 82);
-            this.lblDay04.Name = "lblDay04";
-            this.lblDay04.Size = new System.Drawing.Size(30, 27);
-            this.lblDay04.TabIndex = 4;
-            this.lblDay04.Text = "4";
-            this.lblDay04.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay03
-            // 
-            this.lblDay03.BackColor = System.Drawing.Color.White;
-            this.lblDay03.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay03.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay03.Location = new System.Drawing.Point(3, 55);
-            this.lblDay03.Name = "lblDay03";
-            this.lblDay03.Size = new System.Drawing.Size(30, 27);
-            this.lblDay03.TabIndex = 3;
-            this.lblDay03.Text = "3";
-            this.lblDay03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay02
-            // 
-            this.lblDay02.BackColor = System.Drawing.Color.White;
-            this.lblDay02.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay02.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay02.Location = new System.Drawing.Point(3, 28);
-            this.lblDay02.Name = "lblDay02";
-            this.lblDay02.Size = new System.Drawing.Size(30, 27);
-            this.lblDay02.TabIndex = 2;
-            this.lblDay02.Text = "2";
-            this.lblDay02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay01
-            // 
-            this.lblDay01.BackColor = System.Drawing.Color.White;
-            this.lblDay01.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay01.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay01.Location = new System.Drawing.Point(3, 1);
-            this.lblDay01.Name = "lblDay01";
-            this.lblDay01.Size = new System.Drawing.Size(30, 27);
-            this.lblDay01.TabIndex = 1;
-            this.lblDay01.Text = "1";
-            this.lblDay01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblDay30
-            // 
-            this.lblDay30.BackColor = System.Drawing.Color.White;
-            this.lblDay30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblDay30.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblDay30.Location = new System.Drawing.Point(3, 784);
-            this.lblDay30.Name = "lblDay30";
-            this.lblDay30.Size = new System.Drawing.Size(30, 27);
-            this.lblDay30.TabIndex = 0;
-            this.lblDay30.Text = "30";
-            this.lblDay30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // FrmDRTransport
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1344, 692);
-            this.Controls.Add(this.pnlTransport);
-            this.Controls.Add(this.btnOtherProc);
-            this.Controls.Add(this.btnLineDel);
-            this.Controls.Add(this.btnLineAdd);
-            this.Controls.Add(this.btnDataDelete);
-            this.Controls.Add(this.btnDataEntry);
-            this.Controls.Add(this.btnEnd);
-            this.Controls.Add(this.label1);
-            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
-            this.KeyPreview = true;
-            this.Name = "FrmDRTransport";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTAndPCosts_FormClosing);
-            this.Load += new System.EventHandler(this.FrmTAndPCosts_Load);
-            this.pnlTransport.ResumeLayout(false);
-            this.pnlTransport.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.pnlCheck4.ResumeLayout(false);
-            this.pnlCheck3.ResumeLayout(false);
-            this.pnlCheck2.ResumeLayout(false);
-            this.pnlCheck1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnLineDel;
-        private System.Windows.Forms.Button btnLineAdd;
-        private System.Windows.Forms.Button btnDataDelete;
-        private System.Windows.Forms.Button btnDataEntry;
-        private System.Windows.Forms.Button btnEnd;
-        private System.Windows.Forms.Button btnOtherProc;
-        private System.Windows.Forms.Panel pnlTransport;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lblDay29;
-        private System.Windows.Forms.Label lblDay28;
-        private System.Windows.Forms.Label lblDay27;
-        private System.Windows.Forms.Label lblDay26;
-        private System.Windows.Forms.Label lblDay25;
-        private System.Windows.Forms.Label lblDay24;
-        private System.Windows.Forms.Label lblDay23;
-        private System.Windows.Forms.Label lblDay22;
-        private System.Windows.Forms.Label lblDay21;
-        private System.Windows.Forms.Label lblDay20;
-        private System.Windows.Forms.Label lblDay19;
-        private System.Windows.Forms.Label lblDay18;
-        private System.Windows.Forms.Label lblDay17;
-        private System.Windows.Forms.Label lblDay16;
-        private System.Windows.Forms.Label lblDay15;
-        private System.Windows.Forms.Label lblDay14;
-        private System.Windows.Forms.Label lblDay13;
-        private System.Windows.Forms.Label lblDay12;
-        private System.Windows.Forms.Label lblDay11;
-        private System.Windows.Forms.Label lblDay10;
-        private System.Windows.Forms.Label lblDay09;
-        private System.Windows.Forms.Label lblDay08;
-        private System.Windows.Forms.Label lblDay07;
-        private System.Windows.Forms.Label lblDay06;
-        private System.Windows.Forms.Label lblDay05;
-        private System.Windows.Forms.Label lblDay04;
-        private System.Windows.Forms.Label lblDay03;
-        private System.Windows.Forms.Label lblDay02;
-        private System.Windows.Forms.Label lblDay01;
-        private System.Windows.Forms.Label lblDay30;
-        private System.Windows.Forms.CheckBox checkBox4_01;
-        private System.Windows.Forms.CheckBox checkBox3_01;
-        private System.Windows.Forms.CheckBox checkBox2_01;
-        private System.Windows.Forms.CheckBox checkBox1_01;
-        private System.Windows.Forms.Label lblkm3;
-        private System.Windows.Forms.TextBox textBox3_01;
-        private System.Windows.Forms.Label lblkm2;
-        private System.Windows.Forms.Label lblkm1;
-        private System.Windows.Forms.TextBox textBox2_01;
-        private System.Windows.Forms.TextBox textBox1_01;
-        private System.Windows.Forms.Label lblDay31;
-        private System.Windows.Forms.Panel pnlCheck4;
-        private System.Windows.Forms.Panel pnlCheck3;
-        private System.Windows.Forms.Panel pnlCheck2;
-        private System.Windows.Forms.Panel pnlCheck1;
-        private System.Windows.Forms.Label label54;
-        private System.Windows.Forms.Label label53;
-        private System.Windows.Forms.Label label50;
-        private System.Windows.Forms.Label label51;
-        private System.Windows.Forms.Label label52;
-        private System.Windows.Forms.Label label47;
-        private System.Windows.Forms.Label label48;
-        private System.Windows.Forms.Label label49;
-        private System.Windows.Forms.Label label38;
-        private System.Windows.Forms.Label label39;
-        private System.Windows.Forms.Label label40;
-        private System.Windows.Forms.Label label41;
-        private System.Windows.Forms.Label label42;
-        private System.Windows.Forms.Label label43;
-        private System.Windows.Forms.Label label44;
-        private System.Windows.Forms.Label label45;
-        private System.Windows.Forms.Label label46;
-        private System.Windows.Forms.Label label35;
-        private System.Windows.Forms.Label label36;
-        private System.Windows.Forms.Label label37;
-        private System.Windows.Forms.Label label32;
-        private System.Windows.Forms.Label label33;
-        private System.Windows.Forms.Label label34;
-        private System.Windows.Forms.Label label29;
-        private System.Windows.Forms.Label label31;
-        private System.Windows.Forms.Label label27;
-        private System.Windows.Forms.Label label30;
-        private System.Windows.Forms.Label lblDspCosts4;
-        private System.Windows.Forms.Label label28;
-        private System.Windows.Forms.Label lblDspCosts3;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.Label lblDspCosts2;
-        private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.Label lblDspCosts1;
-        private System.Windows.Forms.Label label26;
-        private System.Windows.Forms.Label label25;
-        private System.Windows.Forms.Label label24;
-        private System.Windows.Forms.Label label23;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.Label lblDspKm2;
-        private System.Windows.Forms.Label lblDspKm1;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.Label label60;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label59;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label58;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label57;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label56;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label55;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.ComboBox comboBox1;
-    }
-}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRTransport/FrmDRTransport.cs	(nonexistent)
@@ -1,199 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using log4net;
-using log4net.Appender;
-using log4net.Repository.Hierarchy;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.DB.Core;
-using ProcessManagement.Forms.Master;
-using ProcessManagement.Forms.SubForms;
-using ProcessManagement.Forms.ControlsAction;
-using ProcessManagement.Forms.CustomControls;
-
-namespace ProcessManagement.Forms.DataEntry
-{
-    public partial class FrmDRTransport : Form
-    {
-        #region ãƒ­ã‚°ä½¿ç”¨å®šç¾©
-        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region å®šæ•°
-        #endregion
-
-        #region å¤‰æ•°
-        /// <summary>
-        /// ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰å€¤å¤‰åŒ–ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private bool m_bChengeAns = false;
-
-        /// <summary>
-        /// å·¥äº‹ã‚³ãƒ¼ãƒ‰
-        /// </summary>
-        private int m_ConstructionCode = 0;
-
-        /// <summary>
-        /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private bool m_CloseingProcessOn = true;
-
-        /// <summary>
-        /// ã‚¢ã‚¯ã‚»ã‚¹åˆ¶é™�ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private bool m_EditLock = false;
-
-        /// <summary>
-        /// è©²å½“å·¥äº‹åŸºæœ¬æƒ…å ±
-        /// </summary>
-        private ConstructionBaseInfo m_ConstructionBaseInfo = new ConstructionBaseInfo();
-
-
-        #region äº¤é€šè²»å…¥åŠ›è¡Œãƒ‡ãƒ¼ã‚¿
-        /// <summary>
-        /// äº¤é€šè²»å…¥åŠ›è¡Œãƒ‡ãƒ¼ã‚¿
-        /// </summary>
-        DailyReportRow[] TransPortRow = new DailyReportRow[31];
-        #endregion
-
-        // *-----* å…±é€šå‡¦ç�†è¨­å®š *-----*
-        /// <summary>
-        /// ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private bool m_SubForm = false;
-        /// <summary>
-        /// å‘¼å‡ºå…ƒçµ‚äº†ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private bool m_ParentEnd = false;
-        // *-----* å…±é€šå‡¦ç�†è¨­å®š *-----*
-
-        #endregion
-
-        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
-        /// <summary>
-        /// å·¥äº‹ç•ªå�·
-        /// </summary>
-        public int ConstructionCode
-        {
-            get { return m_ConstructionCode; }
-            set { m_ConstructionCode = value; }
-        }
-
-        /// <summary>
-        /// ã‚¢ã‚¯ã‚»ã‚¹åˆ¶é™�ãƒ•ãƒ©ã‚°
-        /// </summary>
-        public bool EditLock
-        {
-            get { return m_EditLock; }
-            set { m_EditLock = value; }
-        }
-
-        // *-----* å…±é€šå‡¦ç�†è¨­å®š *-----*
-        /// <summary>
-        /// ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ ãƒ•ãƒ©ã‚°
-        /// </summary>
-        public bool SubForm
-        {
-            get { return m_SubForm; }
-            set { m_SubForm = value; }
-        }
-        /// <summary>
-        /// å‘¼å‡ºå…ƒçµ‚äº†ãƒ•ãƒ©ã‚°
-        /// </summary>
-        public bool ParentEnd
-        {
-            get { return m_ParentEnd; }
-            set { m_ParentEnd = value; }
-        }
-        // *-----* å…±é€šå‡¦ç�†è¨­å®š *-----*
-
-        #endregion
-
-        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
-        /// <summary>
-        /// ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
-        /// </summary>
-        public FrmDRTransport()
-        {
-            InitializeComponent();
-        }
-        #endregion
-
-        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
-        /// <summary>
-        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmTAndPCosts_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                // äº¤é€šè²»å…¥åŠ›ç”»é�¢
-                CreateTransportFormLayout();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region çµ‚äº†ãƒœã‚¿ãƒ³ã‚¯ãƒªãƒƒã‚¯
-        /// <summary>
-        /// çµ‚äº†ãƒœã‚¿ãƒ³ã‚¯ãƒªãƒƒã‚¯
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
-        {
-            if (!m_SubForm) m_CloseingProcessOn = true;
-            this.Close();
-        }
-        #endregion
-
-        #region Ã—ãƒœã‚¿ãƒ³
-        /// <summary>
-        /// Ã—ãƒœã‚¿ãƒ³æŠ¼ä¸‹
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmTAndPCosts_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            try
-            {
-                if (m_bChengeAns)
-                {
-                    if (MessageBox.Show("ãƒ‡ãƒ¼ã‚¿ã�«å¤‰æ›´ã�Œã�‚ã‚Šã�¾ã�™ã€�ç™»éŒ²ã�›ã�šã�«çµ‚äº†ã�—ã�¦ã‚ˆã‚�ã�—ã�„ã�§ã�™ã�‹ï¼Ÿã€‚", "çµ‚äº†ç¢ºèª�"
-                                    , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
-                    {
-                        e.Cancel = true;
-                        return;
-                    }
-                }
-                // ã‚µãƒ–ãƒ•ã‚©ãƒ¼ãƒ èµ·å‹•ã�¯ãƒ—ãƒ­ã‚»ã‚¹ã‚«ã‚¦ãƒ³ã‚¿ã‚’å¤‰æ›´ã�—ã�ªã�„
-                if (m_SubForm) m_CloseingProcessOn = false;
-
-                // çµ‚äº†ãƒœã‚¿ãƒ³ã�ŒONã�ªã‚‰ã�°å‰�ãƒ—ãƒ­ã‚»ã‚¹ã�«æˆ»ã‚‹
-                if (m_CloseingProcessOn) ClsExcute.BackProcess();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CreateConstructionList/CreateConstructionList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CreateConstructionList/CreateConstructionList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CreateConstructionList/CreateConstructionList.cs	(nonexistent)
@@ -1,164 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using System.Collections;
-
-using log4net;
-using log4net.Appender;
-using log4net.Repository.Hierarchy;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.DB.Core;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.ControlsAction;
-
-namespace ProcessManagement.Forms.DataEntry
-{
-    class CreateConstructionList
-    {
-        #region ä½¿ç”¨å®šç¾©
-        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        /// <summary>
-        /// ä¸€è¦§ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
-        /// </summary>
-        private void DataDisplay()
-        {
-            IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
-            IOMPersonInCharge picDB = new IOMPersonInCharge();
-            try
-            {
-                string strSQL = "";
-                // SQLä½œæˆ�
-                CreateConstructionListSQL(ref strSQL);
-                ArrayList arData = new ArrayList();
-                // å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—
-                if (cbiDB.ExecuteReader(strSQL, ref arData))
-                {
-                    // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-                    //int ino = 1;
-                    foreach (object[] objwrk in arData)
-                    {
-                        // å–¶æ¥­æ‹…å½“å��å�–å¾—
-                        string strSales = picDB.CreatePrimarykeyString(CommonMotions.cnvInt(objwrk[3]));
-                        PersonInChargeMaster salesData = new PersonInChargeMaster();
-                        picDB.SelectAction(strSales, ref salesData);
-                        string salesname = salesData.PersonName;
-                        // å·¥äº‹æ‹…å½“å��å�–å¾—
-                        string strConstructor = picDB.CreatePrimarykeyString(CommonMotions.cnvInt(objwrk[4]));
-                        PersonInChargeMaster constructorData = new PersonInChargeMaster();
-                        string constructorname = CommonDefine.s_UndecidedString;
-                        if (picDB.SelectAction(strConstructor, ref constructorData)) constructorname = constructorData.PersonName;
-
-                        //dgvMaster.Rows.Add((ino++)
-                        //                    , int.Parse(objwrk[0].ToString())
-                        //                    , int.Parse(objwrk[1].ToString())
-                        //                    , objwrk[2].ToString()
-                        //                    , salesname
-                        //                    , constructorname
-                        //                    , ClsCommonDefine.ConstructionProjectsStatus[int.Parse(objwrk[5].ToString())]
-                        //                    );
-
-                    }
-                }
-                // èª­è¾¼æ™‚ãƒ‡ãƒ¼ã‚¿ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
-                //m_initDataCount = arData.Count;
-                //dgvMaster.RowCount += (ClsCommonDefine.s_MaxInitLineCount - m_initDataCount);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                cbiDB.close(); cbiDB = null;
-
-                picDB.close(); picDB = null;
-            }
-        }
-        /// <summary>
-        /// è¡¨ç¤ºç”¨ãƒ‡ãƒ¼ã‚¿å�–å¾—SQLä½œæˆ�
-        /// </summary>
-        private void CreateConstructionListSQL(ref string strSQL)
-        {
-            string strSubSQL = "";
-            try
-            {
-                strSQL = "Select";
-                strSQL += "  A.ConstructionCode";
-                strSQL += ", A.ConstructionYear";
-                strSQL += ", B.DetailString";
-                strSQL += ", A.SalesPersonCode";
-                strSQL += ", A.ConstructionPersonCode";
-                strSQL += ", A.ConstructionStatusFlg";
-                strSQL += " From ConstructionBaseInfo A";
-
-                //strSQL += ", (Select SB.ConstructionCode, SB.DetailString";
-                strSQL += "LEFT OUTER JOIN (Select SB.ConstructionCode, SB.DetailString";
-                //strSQL += " From ConstructionBaseInfo SA, ConstructionBaseInfoDetail SB";
-                //strSQL += " Where (SA.ConstructionCode (+) = SB.ConstructionCode And SB.DETAILNO = ";
-                strSQL += " From ConstructionBaseInfo SA RIGHT OUTER JOIN ConstructionBaseInfoDetail SB";
-                strSQL += " ON (SA.ConstructionCode = SB.ConstructionCode And SB.DETAILNO = ";
-                strSQL += ((int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName).ToString() + ")";
-                strSQL += ") B";
-
-                //strSQL += " Where A.ConstructionCode = B.ConstructionCode (+)";
-                strSQL += " ON A.ConstructionCode = B.ConstructionCode";
-
-
-                // èµ·å‹•å¯¾è±¡ã�«ã‚ˆã‚Šé�¸æŠžã�§ã��ã‚‹ãƒ‡ãƒ¼ã‚¿ã‚’å¤‰ã�ˆã‚‹
-                //if (m_ExecuteFlg == (int)ProcExcute.ProcessExecuteNo.ConstructionBaseInfo ||
-                //    m_ExecuteFlg == (int)ProcExcute.ProcessExecuteNo.EstimateInput ||
-                //    m_ExecuteFlg == (int)ProcExcute.ProcessExecuteNo.EstimatePrint)
-                //{
-                //    // å·¥äº‹åŸºæœ¬å…¥åŠ›ã�¯å…¨ãƒ‡ãƒ¼ã‚¿
-                //}
-                //else
-                //{
-                //    // ä¸Šè¨˜ä»¥å¤–ã�®ãƒ‡ãƒ¼ã‚¿
-                //    strSQL += string.Format(" And A.ConstructionStatusFlg >= {0}", (m_ExecuteFlg - 1));
-                //}
-
-                // ã‚·ã‚¹ãƒ†ãƒ æ¨©é™�ã�«ã‚ˆã�£ã�¦ãƒ‡ãƒ¼ã‚¿ã‚¢ã‚¯ã‚»ã‚¹ã�«åˆ¶é™�ã�Œã�‚ã‚‹
-                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
-                {
-                    // ã‚·ã‚¹ãƒ†ãƒ ç®¡ç�†è€…ï¼ˆã�™ã�¹ã�¦å¯¾è±¡ï¼‰
-                }
-                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key)
-                {
-                    // æœ€é«˜æ©Ÿå¯†ç®¡ç�†è€…ï¼ˆã�™ã�¹ã�¦å¯¾è±¡ï¼‰
-                }
-                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key)
-                {
-                    // çµ±æ‹¬æ©Ÿå¯†ç®¡ç�†è€…ï¼ˆæ©Ÿèƒ½åˆ¶é™�ï¼‰
-                }
-                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
-                {
-                    // æ©Ÿå¯†ç®¡ç�†è€…ï¼ˆè‡ªéƒ¨ç½²ã�®ã�¿ï¼‰
-                    strSQL += string.Format(" And (A.SalesPersonCode IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
-                    strSQL += string.Format(" Or A.ConstructionPersonCode IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0}))", CommonMotions.LoginUserData.DepartmentCode);
-                }
-                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
-                {
-                    // ä¸€èˆ¬ä½¿ç”¨è€…ï¼ˆè‡ªãƒ‡ãƒ¼ã‚¿ã�®ã�¿ï¼‰
-                    strSQL += string.Format(" And (A.SalesPersonCode = {0} Or A.ConstructionPersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
-                }
-
-                strSQL += strSubSQL + " Order By A.ConstructionCode";
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", ex.Message, strSQL, strSubSQL);
-            }
-        }
-
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs	(revision 143)
@@ -194,6 +194,7 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
+            SetInitnumUDConstPro();
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
@@ -263,6 +264,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_bInitFlg) return;
+
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 143)
@@ -483,22 +483,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // ŒŸ�õ�ðŒ�
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
 
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 if (!picDB.SelectAction(strSQL, ref workList)) return false;
 
@@ -541,6 +553,37 @@
         }
         #endregion
 
+        #region ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// <summary>
+        /// ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // “–ŠúŠúŽñ”NŒŽ“ú‚ðŽæ“¾
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // ‰c‹ÆŠú
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ƒf�[ƒ^•\Ž¦�ˆ—�
         /// <summary>
         /// ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
@@ -1253,6 +1296,31 @@
         }
         #endregion
 
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// <summary>
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// </summary>
+        private void SetInitnumUDConstPro()
+        {
+            try
+            {
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYear(ref minval, ref maxval);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
@@ -1287,7 +1355,7 @@
                 else
                 {
                     // ‘I‘ð•”��‚ª•¡�”‚ÌŽÒ‚ÍƒZƒbƒg‚µ‚È‚¢
-                    if (cmbDepartment.Items.Count > 1) return;
+                    if (cmbDepartment.Items.Count > 2) return;
                     cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     SetcmbPersons();
                     cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 143)
@@ -203,6 +203,7 @@
         /// <param name="e"></param>
         private void FrmConstructionList_Load(object sender, EventArgs e)
         {
+            SetInitnumUDConstPro();
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
@@ -295,6 +296,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_initDataLoad) return;
+
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 143)
@@ -975,6 +975,31 @@
         }
         #endregion
 
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// <summary>
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// </summary>
+        private void SetInitnumUDConstPro()
+        {
+            try
+            {
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYear(ref minval, ref maxval);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
@@ -1012,7 +1037,7 @@
                 else
                 {
                     // ‘I‘ð•”��‚ª•¡�”‚ÌŽÒ‚ÍƒZƒbƒg‚µ‚È‚¢
-                    if (cmbDepartment.Items.Count > 1) return;
+                    if (cmbDepartment.Items.Count > 2) return;
                     cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     SetcmbPersons();
                     cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
@@ -1516,6 +1541,7 @@
         private void SetcmbPersons()
         {
             IOMPersonInCharge picDB = new IOMPersonInCharge();
+            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
             bool bSave = m_initDataLoad;
             m_initDataLoad = true;
             try
@@ -1524,23 +1550,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
-                List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // ŒŸ�õ�ðŒ�
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
 
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 if (!picDB.SelectAction(strSQL, ref workList)) return;
 
@@ -1571,6 +1608,37 @@
         }
         #endregion
 
+        #region ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// <summary>
+        /// ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // “–ŠúŠúŽñ”NŒŽ“ú‚ðŽæ“¾
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // ‰c‹ÆŠú
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs	(revision 143)
@@ -313,6 +313,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_bInitFlag) return;
+
+            // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆ
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
             InitDataLoad();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs	(revision 143)
@@ -355,13 +355,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // æ¤œç´¢æ�¡ä»¶
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
-                    strSQL = " WHERE DELETEFLG = 0 ORDER BY EMPLOYEECLASSFLG ASC, DISPLAYORDER ASC";
+                {
+                    // å�‚ç…§éƒ¨ç½²ãƒžã‚¹ã‚¿ã‚ˆã‚Šå�–å¾—ã�™ã‚‹
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
+                }
                 else
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DELETEFLG = 0 ORDER BY EMPLOYEECLASSFLG ASC, DISPLAYORDER ASC", DepartmentCode);
+                {
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
+                }
+                strSQL += strSubSQL + ")";
 
+                // å½“æœŸæœŸé¦–æ—¥ãƒ»æœŸæœ«æ—¥ã‚’å�–å¾—
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (STARTDATE <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= ENDDATE", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = ENDDATE))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // æ‹…å½“è€…ãƒžã‚¹ã‚¿èª­è¾¼
                 if (!picDB.SelectAction(strSQL, ref workList)) return;
 
@@ -402,6 +423,37 @@
         }
         #endregion
 
+        #region ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�®æœŸé¦–æ—¥ãƒ»æœŸæœ«æ—¥ã‚’æ±‚ã‚�ã‚‹
+        /// <summary>
+        /// ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�®æœŸé¦–æ—¥ãƒ»æœŸæœ«æ—¥ã‚’æ±‚ã‚�ã‚‹
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // å½“æœŸæœŸé¦–å¹´æœˆæ—¥ã‚’å�–å¾—
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // å–¶æ¥­æœŸ
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // çµ‚äº†ã�¯ï¼‹1å¹´ï¼�1æ—¥
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region æ‹…å½“è€…ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆæ™‚éƒ¨ç½²ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// <summary>
         /// æ‹…å½“è€…ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆæ™‚éƒ¨ç½²ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
@@ -813,8 +865,9 @@
                     frm.NameList.Add(CommonMotions.cnvString(CurRow.Cells[(int)DispGridColumn.ConstructionName].Value));
                 }
 
-                frm.OrderersDivision = m_OrderersDivision;  // ç™ºæ³¨è€…åŒºåˆ†
-                frm.OrdererCode = m_OrdererCode;            // ç™ºæ³¨è€…ç•ªå�·
+                frm.ExcuteFlg = (int)FrmJoinSelect.ExcuteType.Join;    // å‹•ä½œã‚¿ã‚¤ãƒ—
+                frm.OrderersDivision = m_OrderersDivision;              // ç™ºæ³¨è€…åŒºåˆ†
+                frm.OrdererCode = m_OrdererCode;                        // ç™ºæ³¨è€…ç•ªå�·
                 frm.ShowDialog();
                 if (frm.Result == DialogResult.Cancel) return;
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmJoinSelect.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmJoinSelect.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmJoinSelect.cs	(revision 143)
@@ -24,7 +24,24 @@
         #endregion
 
         #region å®šæ•°
-
+        /// <summary>
+        /// ç”»é�¢å‹•ä½œã‚¿ã‚¤ãƒ—
+        /// </summary>
+        public enum ExcuteType
+        {
+            /// <summary>
+            /// ç„¡ã�—
+            /// </summary>
+            None=0,
+            /// <summary>
+            /// çµ�å�ˆå‡¦ç�†
+            /// </summary>
+            Join,
+            /// <summary>
+            /// åˆ†å‰²å‡¦ç�†
+            /// </summary>
+            Split,
+        }
         #endregion
 
         #region å¤‰æ•°
@@ -49,6 +66,11 @@
         private string m_ConstructionName = string.Empty;
 
         /// <summary>
+        /// å‹•ä½œåŒºåˆ†
+        /// </summary>
+        private int m_ExcuteFlg = 0;
+
+        /// <summary>
         /// çµ‚äº†ãƒœã‚¿ãƒ³
         /// </summary>
         private DialogResult m_Result = DialogResult.Cancel;
@@ -61,6 +83,7 @@
 
         #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
 
+
         /// <summary>
         /// å·¥äº‹å��ç§°ä¸€è¦§
         /// </summary>
@@ -94,6 +117,15 @@
         }
 
         /// <summary>
+        /// å‹•ä½œåŒºåˆ†
+        /// </summary>
+        public int ExcuteFlg
+        {
+            get { return m_ExcuteFlg; }
+            set { m_ExcuteFlg = value; }
+        }
+
+        /// <summary>
         /// çµ‚äº†ãƒœã‚¿ãƒ³
         /// </summary>
         public DialogResult Result
@@ -121,6 +153,18 @@
         /// <param name="e"></param>
         private void FrmJoinSelect_Load(object sender, EventArgs e)
         {
+            switch (m_ExcuteFlg)
+            {
+                case (int)ExcuteType.Join:
+                    this.Text = "æ–°è¦�çµ�å�ˆä½œæˆ�å‡¦ç�†";
+                    label3.Text = "çµ�å�ˆå¾Œã�«ä½¿ç”¨ã�™ã‚‹å·¥äº‹å��ç§°ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚";
+                    break;
+                case (int)ExcuteType.Split:
+                    this.Text = "æ–°è¦�åˆ†å‰²ä½œæˆ�å‡¦ç�†";
+                    label3.Text = "åˆ†å‰²å¾Œã�«ä½¿ç”¨ã�™ã‚‹å·¥äº‹å��ç§°ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚";
+                    break;
+            }
+
             InitDataDisp();
         }
         #endregion
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs	(revision 143)
@@ -167,9 +167,9 @@
         /// <summary>
         /// ƒOƒŠƒbƒh�€–Ú�sƒ^ƒCƒgƒ‹
         /// </summary>
-        private static string[] s_GroupTitle = new string[] {"•›’S“–ŽÒ�U•ª",
-                                                            "Žw “± ˆõ �U •ª",
-                                                            "’S“–ŽÒ‹‹—^�·Šz"};
+        private static string[] s_GroupTitle = new string[] {" •›’S“–ŽÒŽû‰v ",
+                                                             "  Žw“±ˆõŽû‰v  ",
+                                                             "’S“–ŽÒ‹‹—^�·Šz"};
         #endregion
 
         #region Ž©ƒvƒ�ƒZƒX‚Ì”Ô�†
@@ -455,7 +455,7 @@
         /// <param name="e"></param>
         private void FrmLedgerStatus_Load(object sender, EventArgs e)
         {
-
+            SetInitnumUDConstPro();
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
@@ -554,6 +554,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_initDataLoad) return;
+
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs	(revision 143)
@@ -28,24 +28,24 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            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 dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -105,6 +105,7 @@
             this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btnLedgerStatus = new System.Windows.Forms.Button();
+            this.label18 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.pnlPayroll.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
@@ -162,6 +163,7 @@
             // 
             this.pnlPayroll.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.pnlPayroll.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlPayroll.Controls.Add(this.label18);
             this.pnlPayroll.Controls.Add(this.lblEndDate);
             this.pnlPayroll.Controls.Add(this.lblStartDate);
             this.pnlPayroll.Controls.Add(this.label8);
@@ -259,7 +261,7 @@
             // 
             // label23
             // 
-            this.label23.BackColor = System.Drawing.Color.LightSalmon;
+            this.label23.BackColor = System.Drawing.Color.Orange;
             this.label23.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label23.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label23.ForeColor = System.Drawing.Color.White;
@@ -267,7 +269,7 @@
             this.label23.Name = "label23";
             this.label23.Size = new System.Drawing.Size(110, 25);
             this.label23.TabIndex = 51;
-            this.label23.Text = "å½“æœŸç´”åˆ©ç›Š";
+            this.label23.Text = "æ‹…å½“å¤–å�Žç›Š";
             this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label11
@@ -297,7 +299,7 @@
             // 
             // label19
             // 
-            this.label19.BackColor = System.Drawing.Color.LightSalmon;
+            this.label19.BackColor = System.Drawing.Color.Orange;
             this.label19.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label19.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label19.ForeColor = System.Drawing.Color.White;
@@ -305,7 +307,7 @@
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(110, 25);
             this.label19.TabIndex = 49;
-            this.label19.Text = "å½“æœŸç´”åˆ©ç›Š";
+            this.label19.Text = "æ‹…å½“å¤–å�Žç›Š";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // lblPlusorMinus2
@@ -382,7 +384,7 @@
             this.label22.Name = "label22";
             this.label22.Size = new System.Drawing.Size(110, 25);
             this.label22.TabIndex = 32;
-            this.label22.Text = "å½“æœŸæš«å®šç´”åˆ©ç›Š";
+            this.label22.Text = "å½“æœŸäººä»¶è²»";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // lblTotalValue2
@@ -403,7 +405,7 @@
             this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label14.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label14.ForeColor = System.Drawing.Color.DarkRed;
-            this.label14.Location = new System.Drawing.Point(379, 28);
+            this.label14.Location = new System.Drawing.Point(72, 53);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(110, 25);
             this.label14.TabIndex = 32;
@@ -424,15 +426,15 @@
             // 
             // label20
             // 
-            this.label20.BackColor = System.Drawing.Color.DarkOrange;
+            this.label20.BackColor = System.Drawing.Color.LightGoldenrodYellow;
             this.label20.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label20.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label20.ForeColor = System.Drawing.Color.White;
+            this.label20.ForeColor = System.Drawing.Color.Black;
             this.label20.Location = new System.Drawing.Point(72, 28);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(110, 25);
             this.label20.TabIndex = 11;
-            this.label20.Text = "æŒ¯åˆ†æ¸ˆç´”åˆ©ç›Š";
+            this.label20.Text = "å‰¯æ‹…å½“å�Žç›Š";
             this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label13
@@ -474,15 +476,15 @@
             // 
             // label17
             // 
-            this.label17.BackColor = System.Drawing.Color.Green;
+            this.label17.BackColor = System.Drawing.Color.OldLace;
             this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label17.ForeColor = System.Drawing.Color.White;
-            this.label17.Location = new System.Drawing.Point(72, 53);
+            this.label17.ForeColor = System.Drawing.Color.Black;
+            this.label17.Location = new System.Drawing.Point(379, 28);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(110, 25);
             this.label17.TabIndex = 6;
-            this.label17.Text = "æœªæŒ¯åˆ†ç´”åˆ©ç›Š";
+            this.label17.Text = "æŒ‡å°Žå“¡å�Žç›Š";
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label9
@@ -674,21 +676,21 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            dataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37;
+            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
             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.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle38.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38;
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
@@ -706,14 +708,14 @@
             this.Column10,
             this.Column11,
             this.Column12});
-            dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle54.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle54.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle54.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle54.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
-            dataGridViewCellStyle54.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle54;
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle36.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle36;
             this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgvMaster.Location = new System.Drawing.Point(5, 168);
             this.dgvMaster.Name = "dgvMaster";
@@ -731,8 +733,8 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle39;
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle21;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "â„–";
             this.Column1.Name = "Column1";
@@ -743,8 +745,8 @@
             // 
             // Column13
             // 
-            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column13.DefaultCellStyle = dataGridViewCellStyle40;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column13.DefaultCellStyle = dataGridViewCellStyle22;
             this.Column13.Frozen = true;
             this.Column13.HeaderText = "æ¸ˆ";
             this.Column13.Name = "Column13";
@@ -754,8 +756,8 @@
             // 
             // Column14
             // 
-            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column14.DefaultCellStyle = dataGridViewCellStyle41;
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column14.DefaultCellStyle = dataGridViewCellStyle23;
             this.Column14.Frozen = true;
             this.Column14.HeaderText = "éƒ¨ç½²";
             this.Column14.Name = "Column14";
@@ -763,8 +765,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle42;
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle24;
             this.Column2.Frozen = true;
             this.Column2.HeaderText = "æ‹…å½“è€…å��";
             this.Column2.Name = "Column2";
@@ -774,8 +776,8 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle43;
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle25;
             this.Column3.Frozen = true;
             this.Column3.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.Column3.Name = "Column3";
@@ -787,8 +789,8 @@
             // 
             // Column4
             // 
-            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle44;
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle26;
             this.Column4.Frozen = true;
             this.Column4.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
             this.Column4.Name = "Column4";
@@ -799,9 +801,9 @@
             // 
             // Column15
             // 
-            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle45.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column15.DefaultCellStyle = dataGridViewCellStyle45;
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle27.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column15.DefaultCellStyle = dataGridViewCellStyle27;
             this.Column15.Frozen = true;
             this.Column15.HeaderText = "çŠ¶ã€€æ…‹";
             this.Column15.Name = "Column15";
@@ -810,9 +812,9 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle46.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle46;
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle28;
             this.Column5.Frozen = true;
             this.Column5.HeaderText = "å�—æ³¨é‡‘é¡�";
             this.Column5.Name = "Column5";
@@ -823,9 +825,9 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle47.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle47;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle29;
             this.Column6.HeaderText = "ä¼šç¤¾çµŒè²»";
             this.Column6.Name = "Column6";
             this.Column6.ReadOnly = true;
@@ -834,9 +836,9 @@
             // 
             // Column7
             // 
-            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle48.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle48;
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle30.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle30;
             this.Column7.HeaderText = "éƒ¨ç½²çµŒè²»";
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
@@ -845,9 +847,9 @@
             // 
             // Column8
             // 
-            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle49.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle49;
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle31.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle31;
             this.Column8.HeaderText = "å–¶æ¥­çµŒè²»";
             this.Column8.Name = "Column8";
             this.Column8.ReadOnly = true;
@@ -856,9 +858,9 @@
             // 
             // Column9
             // 
-            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle50.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle50;
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle32.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle32;
             this.Column9.HeaderText = "ç·�æ”¯æ‰•é¡�";
             this.Column9.Name = "Column9";
             this.Column9.ReadOnly = true;
@@ -867,9 +869,9 @@
             // 
             // Column10
             // 
-            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle51.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle51;
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle33.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle33;
             this.Column10.HeaderText = "ç²—ã€€åˆ©";
             this.Column10.Name = "Column10";
             this.Column10.ReadOnly = true;
@@ -878,9 +880,9 @@
             // 
             // Column11
             // 
-            dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle52.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column11.DefaultCellStyle = dataGridViewCellStyle52;
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle34.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column11.DefaultCellStyle = dataGridViewCellStyle34;
             this.Column11.HeaderText = "çµ¦ã€€ä¸Ž";
             this.Column11.Name = "Column11";
             this.Column11.ReadOnly = true;
@@ -891,9 +893,9 @@
             // 
             // Column12
             // 
-            dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle53.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle53;
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle35.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold);
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle35;
             this.Column12.HeaderText = "ç´”åˆ©ç›Š";
             this.Column12.Name = "Column12";
             this.Column12.ReadOnly = true;
@@ -914,6 +916,18 @@
             this.btnLedgerStatus.UseVisualStyleBackColor = false;
             this.btnLedgerStatus.Click += new System.EventHandler(this.btnLedgerStatus_Click);
             // 
+            // label18
+            // 
+            this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label18.AutoSize = true;
+            this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label18.ForeColor = System.Drawing.Color.Red;
+            this.label18.Location = new System.Drawing.Point(944, 59);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(282, 19);
+            this.label18.TabIndex = 55;
+            this.label18.Text = "â€»å½“æœŸäººä»¶è²»ã�®ã�¿ã�®è¨ˆç®—ã�§ã�™";
+            // 
             // FrmLedgerStatus
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1010,5 +1024,6 @@
         private System.Windows.Forms.Label lblCalcValue1;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Button btnLedgerStatus;
+        private System.Windows.Forms.Label label18;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 143)
@@ -445,35 +445,6 @@
         }
         #endregion
 
-        #region Ž–‹ÆŠú�‰ŠúƒZƒbƒg
-        /// <summary>
-        /// Ž–‹ÆŠú�‰ŠúƒZƒbƒg
-        /// </summary>
-        private void SetcmbPeriod()
-        {
-            try
-            {
-                m_initDataLoad = true;
-                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆŠúƒZƒbƒg
-                int minval = 0;
-                int maxval = 0;
-                CommonMotions.GetPeriodYear(ref minval, ref maxval);
-                numUDConstPro.Minimum = minval;
-                numUDConstPro.Maximum = maxval;
-                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
-                m_initDataLoad = false;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                m_initDataLoad = false;
-            }
-        }
-        #endregion
-
         #region ‰æ–ÊƒTƒCƒY•Ï�XŽž‚ÌƒZƒ‹ƒTƒCƒY•Ï�X
         /// <summary>
         /// ‰æ–ÊƒTƒCƒY•Ï�XŽž‚ÌƒZƒ‹ƒTƒCƒY•Ï�X
@@ -688,7 +659,7 @@
         /// <param name="dtStartArray"></param>
         /// <param name="dtCompArray"></param>
         /// <returns></returns>
-        private int SetOtherCost(List<int> PersonCDArray, List<DateTime> dtStartArray, List<DateTime> dtCompArray)
+        private int SetOtherCost(List<int> PersonCDArray, List<DateTime> dtStartArray, List<DateTime> dtCompArray,  List<DateTime> dtHireStDayArray)
         {
             try
             {
@@ -706,11 +677,18 @@
                 for (int ii = 0; ii < PersonCDArray.Count; ii++)
                 {
                     // ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
-                    if (dtStartArray[ii] == DateTime.MinValue || dtStartArray[ii] == DateTime.MaxValue) dtStartArray[ii] = dtDefaultStart;
-                    if (dtCompArray[ii] == DateTime.MinValue || dtCompArray[ii] == DateTime.MaxValue) dtCompArray[ii] = dtDefaultEnd;
+                    //if (dtStartArray[ii] == DateTime.MinValue || dtStartArray[ii] == DateTime.MaxValue) dtStartArray[ii] = dtDefaultStart;
+                    //if (dtCompArray[ii] == DateTime.MinValue || dtCompArray[ii] == DateTime.MaxValue) dtCompArray[ii] = dtDefaultEnd;
+                    // ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
 
+                    DateTime stDate = dtStartArray[ii];
+                    DateTime edDate = dtCompArray[ii];
+                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[ii], dtCompArray[ii], ref stDate, ref edDate);
+
+
                     // Œo”ïŽæ“¾
-                    GetPersonExpensesCostValue(PersonCDArray[ii], dtStartArray[ii], dtCompArray[ii], ref CostValue);
+                    //GetPersonExpensesCostValue(PersonCDArray[ii], dtStartArray[ii], dtCompArray[ii], ref CostValue);
+                    GetPersonExpensesCostValue(PersonCDArray[ii], stDate, edDate, ref CostValue);
                 }
 
                 // ----- Œo”ï‚Ì�WŒv
@@ -724,6 +702,7 @@
                     dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = CommonDefine.CostDataNoString[i];
                     // ‹àŠzƒZƒbƒg
                     dgv.Rows[RowCnt].Cells[(int)DispColumn.TotalPayment].Value = CostValue[i].ToString("#,0");
+                    dgv.Rows[RowCnt].Cells[(int)DispColumn.NetProfit].Value = (CostValue[i] * -1).ToString("#,0");
                     SumData += CostValue[i];
                 }
 
@@ -735,6 +714,7 @@
                 dgv.Rows[ExpensesCnt].Cells[(int)DispColumn.SelectionName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
                 // ‹àŠzƒZƒbƒg
                 dgv.Rows[ExpensesCnt].Cells[(int)DispColumn.TotalPayment].Value = SumData.ToString("#,0");
+                dgv.Rows[ExpensesCnt].Cells[(int)DispColumn.NetProfit].Value = (SumData * -1).ToString("#,0");
                 // �s‚Ì�F‚ð•Ï‚¦‚é
                 SetRowColor(dgv.Rows[ExpensesCnt], s_RowTotalBackColor, s_RowTotalForeColor);
 
@@ -780,7 +760,7 @@
                     // Œo”ï–¼�Ì
                     dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = s_GroupTitle[i];
                     // ‹àŠzƒZƒbƒg
-                    dgv.Rows[RowCnt].Cells[(int)DispColumn.GrossProfit].Value = CostValue[i].ToString("#,0");
+                    dgv.Rows[RowCnt].Cells[(int)DispColumn.NetProfit].Value = CostValue[i].ToString("#,0");
                     SumData += CostValue[i];
                 }
 
@@ -791,7 +771,7 @@
                 // Œo”ï–¼�Ì
                 dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = s_GroupTitle[2];
                 // ‹àŠzƒZƒbƒg
-                dgv.Rows[RowCnt].Cells[(int)DispColumn.GrossProfit].Value = ConstrCost.ToString("#,0");
+                dgv.Rows[RowCnt].Cells[(int)DispColumn.NetProfit].Value = ConstrCost.ToString("#,0");
                 SumData += ConstrCost;
 
                 // ----- •â�•�U•ª‚ÌŒv‚ð•\Ž¦‚·‚é
@@ -801,7 +781,7 @@
                 dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.SelectionName].Value = s_TotalTitleArray[(int)RowTitleNum.Auxiliary];
                 dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.SelectionName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
                 // ‹àŠzƒZƒbƒg
-                dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.GrossProfit].Value = SumData.ToString("#,0");
+                dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.NetProfit].Value = SumData.ToString("#,0");
                 // �s‚Ì�F‚ð•Ï‚¦‚é
                 SetRowColor(dgv.Rows[AuxiliaryCnt], s_RowTotalBackColor, s_RowTotalForeColor);
 
@@ -983,22 +963,34 @@
                 strSQL += string.Format(" AND E.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND E.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
 
-                strSQL += " WHERE P.DELETEFLG = 0";
-                strSQL += string.Format(" AND P.LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += string.Format(" WHERE P.LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
 
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+                strSQL += string.Format(" AND (DATE(P.STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(P.ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(P.ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
                 // �HŽ–‘ä’ ƒf�[ƒ^‚Ì•”��‚¾‚¯‚ª‘Î�Û
-                strSQL += " AND P.DEPARTMENTCODE IN";
-                strSQL += " (SELECT DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
-                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C , CONSTRUCTIONLEDGERDETAIL D";
-                strSQL += " WHERE A.DELETEFLG = 0";
-                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
-                strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
-                strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
+                if (DepartmentCode == 0)
+                {
+                    strSQL += " AND P.DEPARTMENTCODE IN";
+                    strSQL += " (SELECT TMP.DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
+                    strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C , CONSTRUCTIONLEDGERDETAIL D";
+                    strSQL += " WHERE A.DELETEFLG = 0";
+                    strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
+                    strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
+                    strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
 
-                strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) AS TMP )";
-
-                // •”��ƒR�[ƒh‘I‘ðŽž‚Í•”��‚ðŒŸ�õ�ðŒ�‚Ö“ü‚ê‚é
-                if (DepartmentCode != 0) strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
+                    strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) TMP)";
+                }
+                else
+                {
+                    // •”��ƒR�[ƒh‘I‘ðŽž‚Í•”��‚ðŒŸ�õ�ðŒ�‚Ö“ü‚ê‚é
+                    strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
+                }
                 if (PersonCode != 0) strSQL += string.Format(" AND P.PERSONCODE = {0}", PersonCode);
 
                 strSQL += " GROUP BY P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE, P.ENDDATE";
@@ -1007,11 +999,6 @@
                 ArrayList arList = new ArrayList();
                 if (!PersonDB.ExecuteReader(strSQL, ref arList)) return 0;
 
-                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
-                DateTime dtDefaultStart = DateTime.MinValue;
-                DateTime dtDefaultEnd = DateTime.MinValue;
-                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
-
                 DateTime stDate = DateTime.MaxValue;
                 DateTime edDate = DateTime.MinValue;
                 DateTime maxDate = DateTime.MinValue;
@@ -1136,9 +1123,7 @@
                 int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
 
                 // �HŽ–�Ú�×‘ä’ ƒf�[ƒ^‚æ‚è•â�•�U•ª‚ðŽæ“¾‚·‚é
-                //string strSQL = "SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(P.EXECUTIONAMOUNT)";
                 string strSQL = "SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(B.PAYMENTAMOUNT)";
-                //strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P, CONSTRUCTIONBASEINFO A";
                 strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P LEFT JOIN CONSTRUCTIONLEDGEREXCUTE B";
                 strSQL += " ON B.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND B.GROUPCOUNT = P.GROUPCOUNT AND B.LINECOUNT = P.LINECOUNT";
                 strSQL += " , CONSTRUCTIONBASEINFO A";
@@ -1156,9 +1141,7 @@
                 strSQL += " GROUP BY A.CONSTRUCTIONPERIOD, P.GROUPCOUNT";
 
                 strSQL += " UNION";
-                //strSQL += " SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(P.EXECUTIONAMOUNT)";
                 strSQL += " SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(B.PAYMENTAMOUNT)";
-                //strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P, CONSTRUCTIONBASEINFO A";
                 strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P LEFT JOIN CONSTRUCTIONLEDGEREXCUTE B";
                 strSQL += " ON B.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND B.GROUPCOUNT = P.GROUPCOUNT AND B.LINECOUNT = P.LINECOUNT";
                 strSQL += " , CONSTRUCTIONBASEINFO A";
@@ -1302,60 +1285,6 @@
         }
         #endregion
 
-        #region ƒwƒbƒ_�[‚Ì—˜‰v‚©‚çŒo”ï‚ðˆø‚­
-        /// <summary>
-        /// ƒwƒbƒ_�[‚Ì—˜‰v‚©‚çŒo”ï‚ðˆø‚­
-        /// </summary>
-        private void ReCalcHeader(int Expenses)
-        {
-            try
-            {
-                // �U•ª‹‹—^‹àŠz
-                int OnSalary = CommonMotions.cnvInt(lblCalcValue1.Text);
-
-                // �ƒ—˜‰v‹àŠz
-                int NetIncome = CommonMotions.cnvInt(lblCalcValue2.Text);
-
-                // ‘e—˜‰v‹àŠzŽæ“¾
-                int NonSalary = CommonMotions.cnvInt(lblCalcValue3.Text);
-
-                // ‹‹—^—Ý�Ï•\Ž¦
-                int TotalSalary = CommonMotions.cnvInt(lblPayroll.Text);
-
-
-                // �U•ª‹‹—^‹àŠz•\Ž¦
-                lblCalcValue1.Text = OnSalary.ToString("#,0");
-
-                // ‹‹—^—Ý�Ï•\Ž¦
-                lblPayroll.Text = TotalSalary.ToString("#,0");
-
-                // ‹‹—^�·ŠzŒvŽZ�E•\Ž¦
-                int TotalValue = OnSalary - TotalSalary;
-                lblTotalValue.Text = TotalValue.ToString("#,0");
-                lblTotalValue2.Text = TotalValue.ToString("#,0");
-
-                // �ƒ—˜‰v‹àŠz•\Ž¦
-                lblCalcValue2.Text = NetIncome.ToString("#,0");
-
-                // “–Šú�ƒ—˜‰vŒvŽZ
-                int CalcTotal1 = NetIncome + TotalValue;
-                lblTotalCalcValue1.Text = CalcTotal1.ToString("#,0");
-                lblTotalCalcValue2.Text = CalcTotal1.ToString("#,0");
-
-                // ‘e—˜‰v‹àŠzŽæ“¾
-                lblCalcValue3.Text = NonSalary.ToString("#,0");
-
-                // “–Šú�ƒ—˜‰vŒvŽZ
-                int CalcTotal = NonSalary + CalcTotal1 - Expenses;
-                lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
         #region ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
         /// <summary>
         /// ˆê——ƒf�[ƒ^•\Ž¦�ˆ—�
@@ -1535,7 +1464,7 @@
                                 dtHireStDays, dtHireEdDays);
 
                 // ----- Œo”ï‚ð•\Ž¦‚·‚é
-                int Expenses = SetOtherCost(PersonCDArray, dtStartArray, dtCompArray);
+                int Expenses = SetOtherCost(PersonCDArray, dtStartArray, dtCompArray, dtHireStDays);
 
                 // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                 prgber.Value++;
@@ -1549,10 +1478,13 @@
                 prgber.Value++;
                 prgber.Update();
 
-                // Œo”ï�^•â�•�U•ª‚ðŽx•¥Šz‚Ö‘«‚µ‚Ä�A—˜‰v‚æ‚èˆø‚­
+                // Žx•¥‘�Šz
                 TotalArea[(int)DispColumn.TotalPayment] += Expenses;                // Žx•¥‘�Šz+Œo”ï
+
+                // ‘e—˜
                 TotalArea[(int)DispColumn.GrossProfit] -= Expenses;                 // ‘e—˜-Œo”ï
-                TotalArea[(int)DispColumn.GrossProfit] += Auxiliary;                // ‘e—˜+•â�•�lŒ�”ï
+                
+                // �ƒ—˜‰v
                 TotalArea[(int)DispColumn.NetProfit] -= Expenses;                   // �ƒ—˜‰v-Œo”ï
                 TotalArea[(int)DispColumn.NetProfit] += Auxiliary;                  // �ƒ—˜‰v+•â�•�lŒ�”ï
 
@@ -1736,20 +1668,6 @@
         }
         #endregion
 
-        #region ‹‹—^ƒGƒŠƒAƒNƒŠƒA
-        /// <summary>
-        /// ‹‹—^ƒGƒŠƒAƒNƒŠƒA
-        /// </summary>
-        private void ClearSalary()
-        {
-            lblPayroll.Text = "";
-            lblCalcValue1.Text = "";
-            lblTotalValue.Text = "";
-            lblCalcValue3.Text = "";
-            lblCalcValue2.Text = "";
-        }
-        #endregion
-
         #region ’S“–ŽÒ–ˆ‚ÌŽw’èŠú‚Ì�HŽ–ŠJŽn“ú‚ðŽæ“¾‚·‚é
         /// <summary>
         /// ’S“–ŽÒ–ˆ‚ÌŽw’èŠú‚Ì�HŽ–ŠJŽn“ú‚ðŽæ“¾‚·‚é
@@ -1792,115 +1710,92 @@
         }
         #endregion
 
-        #region ‹‹—^ƒf�[ƒ^•\Ž¦”»’è
+        #region ŒvŽZŠJŽn�E�I—¹“ú‚Ìƒ`ƒFƒbƒN“ü‚ê‘Ö‚¦
         /// <summary>
-        /// ‹‹—^ƒf�[ƒ^•\Ž¦”»’è
+        /// ŒvŽZŠJŽn�E�I—¹“ú‚Ìƒ`ƒFƒbƒN“ü‚ê‘Ö‚¦
         /// </summary>
-        /// <returns></returns>
-        private bool SalaryDisplay()
+        private void CalcStartCompDate(DateTime dtDefaultStart, DateTime dtDefaultEnd,
+                                        DateTime HireStartDate, DateTime HireCompDate,
+                                        ref DateTime StartDate, ref DateTime CompDate)
         {
-            IOMPersonInCharge personDB = new IOMPersonInCharge();
             try
             {
-                bool bRet = false;
-
-                // ‚Ü‚¸ƒf�[ƒ^”ñ•\Ž¦
-                pnlPayroll.Visible = false;
-
-                // ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚æ‚è‘I‘ð’S“–ŽÒ‚ðŽæ“¾‚·‚é
-                int PersonCode = GetConstructionPersonCode();
-                if (!cmbConstructionPerson.Visible) PersonCode = CommonMotions.LoginUserData.PersonCode;
-
-                // �VƒZƒLƒ…ƒŠƒeƒBƒf�[ƒ^‘Î‰ž�Ï‚Ý‚©‚ðŠm”F‚·‚é
-                if (CommonMotions.LoginUserData.SecCode == 0)
+                if (StartDate == DateTime.MinValue)
                 {
-                    // ƒZƒLƒ…ƒŠƒeƒBƒŒƒxƒ‹Žæ“¾
-                    int SecLevel1 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key;
-                    int SecLevel2 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key;
-                    int SecLevel3 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key;
-                    // ƒVƒXƒeƒ€Œ ŒÀ‚É‚æ‚Á‚Äƒf�[ƒ^ƒAƒNƒZƒX‚É�§ŒÀ‚ª‚ ‚é
-                    if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
-                    {
-                        // ƒVƒXƒeƒ€ŠÇ—�ŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                        bRet = true;
-                    }
-                    else if (CommonMotions.LoginUserData.SecurityManagement == SecLevel1)
-                    {
-                        // �Å�‚‹@–§ŠÇ—�ŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                        bRet = true;
-                    }
-                    else if (CommonMotions.LoginUserData.SecurityManagement == SecLevel2)
-                    {
-                        // “�Š‡‹@–§ŠÇ—�ŽÒ�i‹@”\�§ŒÀ�j
-                        bRet = true;
-                    }
-                    else if (CommonMotions.LoginUserData.SecurityManagement == SecLevel3)
-                    {
-                        // �Š‘®’·
-                        bRet = true;
-                    }
-                    else
-                    {
-                        // ˆê”Êƒ†�[ƒU�[‚ÍŽ©•ª‚Ì‹‹—^‚ªŒ©‚¦‚é
-                        if (CommonMotions.LoginUserData.PersonCode == PersonCode)
-                            bRet = true;
-                        else
-                            bRet = false;
-                    }
+                    StartDate = dtDefaultStart;
                 }
-                else
+                else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
                 {
-                    int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;
-                    int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;
-                    int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;
+                    StartDate = HireStartDate;
+                }
+                else if (dtDefaultStart < StartDate)
+                {
+                    StartDate = dtDefaultStart;
+                }
 
-                    // ƒVƒXƒeƒ€Œ ŒÀ‚É‚æ‚Á‚Äƒf�[ƒ^ƒAƒNƒZƒX‚É�§ŒÀ‚ª‚ ‚é
-                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode)
-                    {
-                        // ƒVƒXƒeƒ€ŠÇ—�ŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                        bRet = true;
-                    }
-                    else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)
-                    {
-                        // Œo‰cŽÒ�i‚·‚×‚Ä‘Î�Û�j
-                        bRet = true;
-                    }
-                    else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
-                    {
-                        // “�Š‡ŠÇ—�ŽÒ�i‹@”\�§ŒÀ�j
-                        bRet = true;
-                    }
-                    else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
-                    {
-                        // �Š‘®’·
-                        bRet = true;
-                    }
-                    else
-                    {
-                        // ˆê”Êƒ†�[ƒU�[‚ÍŽ©•ª‚Ì‹‹—^‚ªŒ©‚¦‚é
-                        if (CommonMotions.LoginUserData.PersonCode == PersonCode)
-                            bRet = true;
-                        else
-                            bRet = false;
-                    }
+                // �Å‘å“ú‚ª�¡“ú‚æ‚è�¬‚³‚¢�ê�‡ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (CompDate.Date > DateTime.Today.Date) return;
+
+                if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
+                {   // ‘OŠúˆÈ‘O‚ÍŠú––
+                    CompDate = dtDefaultEnd;
                 }
-                // ƒf�[ƒ^•\Ž¦
-                pnlPayroll.Visible = bRet;
+                else if (HireCompDate != DateTime.MinValue
+                        && (dtDefaultStart < HireCompDate && HireCompDate < dtDefaultEnd))
+                {   // ‘ÞŽÐ“ú‚ªŠú“à‚È‚ç‚Î�I—¹‚ð‘ÞŽÐ“ú‚É‚·‚é
+                    CompDate = HireCompDate;
+                }
+                else
+                {   // ˆÈŠO‚Í�¡“ú
+                    CompDate = DateTime.Today.Date;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}", ex.Message);
+            }
+        }
+        #endregion
 
-                // —ÌˆæƒNƒŠƒA
-                ClearSalary();
+        #region ŠúŠJŽn‘Oƒwƒbƒ_�[ƒZƒbƒg
+        /// <summary>
+        /// ŠúŠJŽn‘Oƒwƒbƒ_�[ƒZƒbƒg
+        /// </summary>
+        private void SetUnreachedPeriod()
+        {
+            try
+            {
+                // �U•ª‹‹—^‹àŠz•\Ž¦
+                lblCalcValue1.Text = "0";
 
-                return bRet;
+                // ‹‹—^—Ý�Ï•\Ž¦
+                lblPayroll.Text = "0";
+
+                // ‹‹—^�·ŠzŒvŽZ�E•\Ž¦
+                lblTotalValue.Text = "0";
+                lblCalcValue3.Text = "0";
+
+                // •›’S“–ŽÒŽû‰v‹àŠz•\Ž¦
+                lblCalcValue2.Text = "0";
+
+                // Žw“±ˆõŽû‰v‹àŠz•\Ž¦
+                lblTotalValue2.Text = "0";
+
+                // ’S“–ŠOŽû‰vŒvŽZ
+                lblTotalCalcValue1.Text = "0";
+                lblTotalCalcValue2.Text = "0";
+
+                // �lŒ�”ïŒv
+                lblTotalCalcValue.Text = "0";
+
+                // ‹‹—^ŒvŽZŠJŽn“ú�E�I—¹“ú
+                lblStartDate.Text = "";
+                lblEndDate.Text = "";
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
             }
-            finally
-            {
-                personDB.close(); personDB = null;
-            }
         }
         #endregion
 
@@ -1919,85 +1814,52 @@
         {
             try
             {
+                // Šú–¢“ž’B‚Íƒwƒbƒ_�[‚ðƒNƒŠƒA‚µ‚Ä”²‚¯‚é
+                if (numUDConstPro.Value > CommonMotions.SystemMasterData.BusinessPeriod)
+                {
+                    SetUnreachedPeriod();
+                    return;
+                }
+
                 //Debug.WriteLine("---------------------");
                 // •”��ƒR�[ƒhŽæ“¾
                 int DepartmentCode = GetDepartmentCode();
 
-                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
-                DateTime dtCurDefaultStart = dtDefaultStart;
-                DateTime dtCurDefaultEnd = dtDefaultEnd;
-
                 int TotalSalary = 0;        // ‹‹—^—Ý�ÏŽæ“¾
                 int OnSalary = 0;           // �U•ª‹‹—^‹àŠzŽæ“¾
                 int NetIncome = 0;          // �ƒ—˜‰v‹àŠzŽæ“¾
                 int NonSalary = 0;          // ‘e—˜‰v‹àŠzŽæ“¾
 
-                DateTime dtStart = DateTime.MinValue;
-                DateTime dtEnd = DateTime.MinValue;
-                DateTime dtMax = DateTime.MaxValue;
-                DateTime dtDispStart = DateTime.MaxValue;
-                DateTime dtDispComplate = DateTime.MinValue;
+                DateTime stDate = DateTime.Today;
+                DateTime edDate = DateTime.Today;
+
+                DateTime dtCurDefaultStart = dtDefaultStart;
+                DateTime dtCurDefaultEnd = DateTime.Today;
                 // ‹‹—^‚ð�WŒv‚·‚é
                 for (int i = 0; i < PersonCDArray.Count; i++)
                 {
-                    // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
-                    dtCurDefaultStart = dtDefaultStart;
-                    dtCurDefaultEnd = dtDefaultEnd;
+                    // ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
+                    stDate = dtStartArray[i];
+                    edDate = dtMaxCompArray[i];
+                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
 
-                    // “üŽÐ“ú‚ªŠú“à‚È‚ç‚ÎŠJŽn‚ð“üŽÐ“ú‚É‚·‚é
-                    if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
-                    {
-                        dtCurDefaultStart = dtHireStDayArray[i];
-                    }
-                    // ‘ÞŽÐ“ú‚ªŠú“à‚È‚ç‚Î�I—¹‚ð‘ÞŽÐ“ú‚É‚·‚é
-                    if (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
-                    {
-                        dtCurDefaultEnd = dtHireEdDayArray[i];
-                    }
-
-                    // ŠJŽn“úŽæ“¾
-                    dtStart = dtStartArray[i];
-                    // ƒf�[ƒ^‚ª–³‚¢�ê�‡‚ÍŠúŽñ“ú‚ðƒZƒbƒg‚·‚é
-                    if (dtStart == DateTime.MaxValue)
-                    {
-                        dtStart = dtCurDefaultStart;
-                    }
-                    else if (dtCurDefaultStart < dtStart)
-                    {   // ŠJŽn“ú‚ªŠúŽñ‚æ‚èŒã‚È‚ç‚ÎŠúŽñ“ú‚ðƒZƒbƒg‚·‚é
-                        dtStart = dtCurDefaultStart;
-                    }
-
-                    // �Å‘å“úŽæ“¾
-                    dtMax = dtMaxCompArray[i];
-                    if (dtMax == DateTime.MinValue) dtMax = dtCurDefaultEnd;
-                    // �Å‘å“ú‚ª�¡“ú‚æ‚è�¬‚³‚¢�ê�‡
-                    if (dtMax < DateTime.Today.Date)
-                    {
-                        if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
-                        {   // ‘OŠúˆÈ‘O‚ÍŠú––
-                            dtMax = dtCurDefaultEnd;
-                        }
-                        else if (dtHireEdDayArray[i] != DateTime.MinValue && dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
-                        {   // ‘ÞŽÐ“ú‚ªŠú“à‚È‚ç‚Î�I—¹‚ð‘ÞŽÐ“ú‚É‚·‚é
-                            dtMax = dtCurDefaultEnd;
-                        }
-                        else
-                        {   // ˆÈŠO‚Í�¡“ú
-                            dtMax = DateTime.Today.Date;
-                        }
-                    }
-
                     // ‹‹—^—Ý�ÏŽæ“¾
-                    int workSalary = CalcElapsedSalary(dtStart, dtMax, PersonCDArray[i], SalaryArray[i]);
+                    int workSalary = CalcElapsedSalary(stDate, edDate, PersonCDArray[i], SalaryArray[i]);
                     // —ÝŒv‰ÁŽZ
-                    if (workSalary > 0) TotalSalary += workSalary;
-                    //Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
+                    TotalSalary += workSalary;
 
-                    // ŒvŽZŠJŽn�I—¹“ú‚ðŽæ“¾‚·‚é
-                    if (dtStart < dtDispStart) dtDispStart = dtStart;
-                    if (dtDispComplate < dtMax) dtDispComplate = dtMax;
+                    if (stDate < dtCurDefaultStart) dtCurDefaultStart = stDate;
+                    if (dtCurDefaultEnd < edDate) dtCurDefaultEnd = edDate;
                 }
+                if (PersonCDArray.Count == 1)
+                {
+                    if (dtHireStDayArray[0] != DateTime.MinValue)
+                        if (dtDefaultStart < dtHireStDayArray[0]) dtCurDefaultStart = dtHireStDayArray[0];
 
+                    if (dtHireEdDayArray[0] != DateTime.MinValue)
+                        if (dtHireEdDayArray[0] < dtDefaultEnd) dtCurDefaultEnd = dtHireEdDayArray[0];
+                }
+
                 // ----- •\Ž¦�ˆ—�
                 // �U•ª‹‹—^‹àŠz�E�ƒ—˜‰v‹àŠz�E‘e—˜‰v‹àŠzŽæ“¾
                 ProfitGeneral(ref OnSalary, ref  NetIncome, ref  NonSalary);
@@ -2011,26 +1873,30 @@
                 // ‹‹—^�·ŠzŒvŽZ�E•\Ž¦
                 int TotalValue = OnSalary - TotalSalary;
                 lblTotalValue.Text = TotalValue.ToString("#,0");
-                lblTotalValue2.Text = TotalValue.ToString("#,0");
+                lblCalcValue3.Text = TotalValue.ToString("#,0");
 
-                // �ƒ—˜‰v‹àŠz•\Ž¦
-                lblCalcValue2.Text = NetIncome.ToString("#,0");
-                
-                // “–Šú�ƒ—˜‰vŒvŽZ
-                int CalcTotal1 = NetIncome + TotalValue;
+                // �U•ª‹àŠz‚ðŽæ“¾‚·‚é
+                int[] CostValue = new int[2];
+                GetPersonAuxiliaryCostValue(ref CostValue);
+
+                // •›’S“–ŽÒŽû‰v‹àŠz•\Ž¦
+                lblCalcValue2.Text = CostValue[0].ToString("#,0");
+
+                // Žw“±ˆõŽû‰v‹àŠz•\Ž¦
+                lblTotalValue2.Text = CostValue[1].ToString("#,0");
+
+                // ’S“–ŠOŽû‰vŒvŽZ
+                int CalcTotal1 = CostValue[0] + CostValue[1];
                 lblTotalCalcValue1.Text = CalcTotal1.ToString("#,0");
                 lblTotalCalcValue2.Text = CalcTotal1.ToString("#,0");
 
-                // ‘e—˜‰v‹àŠzŽæ“¾
-                lblCalcValue3.Text = NonSalary.ToString("#,0");
-
-                // “–Šú�ƒ—˜‰vŒvŽZ
-                int CalcTotal = NonSalary + CalcTotal1;
+                // �lŒ�”ïŒv
+                int CalcTotal = TotalValue + CalcTotal1;
                 lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
 
                 // ‹‹—^ŒvŽZŠJŽn“ú�E�I—¹“ú
-                lblStartDate.Text = dtDispStart.ToShortDateString();
-                lblEndDate.Text = dtDispComplate.ToShortDateString();
+                lblStartDate.Text = dtCurDefaultStart.ToShortDateString();
+                lblEndDate.Text = dtCurDefaultEnd.ToShortDateString();
             }
             catch (Exception ex)
             {
@@ -2387,21 +2253,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // ŒŸ�õ�ðŒ�
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}",(int)CommonDefine.EmployeeClassFlg.Regular);
                     // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
+
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+                
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 if (!picDB.SelectAction(strSQL, ref workList)) return;
 
@@ -2548,6 +2427,31 @@
         }
         #endregion
 
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// <summary>
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// </summary>
+        private void SetInitnumUDConstPro()
+        {
+            try
+            {
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYear(ref minval, ref maxval);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
@@ -2592,7 +2496,7 @@
                     else
                     {
                         // ‘I‘ð•”��‚ª•¡�”‚ÌŽÒ‚ÍƒZƒbƒg‚µ‚È‚¢
-                        if (cmbDepartment.Items.Count > 1) return;
+                        if (cmbDepartment.Items.Count > 2) return;
                         cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                         SetcmbPersons();
                         cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistListAuxiliary.cs	(revision 143)
@@ -66,7 +66,7 @@
         {
             try
             {
-                if (cmbDepartment.Items.Count > 1) return;
+                if (cmbDepartment.Items.Count > 2) return;
                 cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                 SetcmbPersons();
                 cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRList.cs	(revision 143)
@@ -206,6 +206,7 @@
         /// <param name="e"></param>
         private void FrmDRList_Load(object sender, EventArgs e)
         {
+            SetInitnumUDConstPro();
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
@@ -281,6 +282,14 @@
         {
             if (m_initDataLoad) return;
 
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 143)
@@ -823,6 +823,31 @@
         }
         #endregion
 
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// <summary>
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// </summary>
+        private void SetInitnumUDConstPro()
+        {
+            try
+            {
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYear(ref minval, ref maxval);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
@@ -857,7 +882,7 @@
                 else
                 {
                     // ‘I‘ð•”��‚ª•¡�”‚ÌŽÒ‚ÍƒZƒbƒg‚µ‚È‚¢
-                    if (cmbDepartment.Items.Count > 1) return;
+                    if (cmbDepartment.Items.Count > 2) return;
                     cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     SetcmbPersons();
                     cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
@@ -985,22 +1010,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // ŒŸ�õ�ðŒ�
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
 
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 if (!picDB.SelectAction(strSQL, ref workList)) return false;
 
@@ -1043,6 +1080,37 @@
         }
         #endregion
 
+        #region ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// <summary>
+        /// ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // “–ŠúŠúŽñ”NŒŽ“ú‚ðŽæ“¾
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // ‰c‹ÆŠú
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.cs	(revision 143)
@@ -106,22 +106,14 @@
         private enum RowTitleNum
         {
             /// <summary>
-            /// Ž{�H’†�‡Œv�s
+            /// ’S“–ŽÒ�‡Œv
             /// </summary>
-            Execution = 0,
+            Incumbents = 0,
             /// <summary>
-            /// Š®—¹�Ï‚Ý
+            /// ‘Þ�EŽÒŒv
             /// </summary>
-            Completed,
+            Retiree,
             /// <summary>
-            /// Œo”ïŒv�s
-            /// </summary>
-            Expenses,
-            /// <summary>
-            /// •â�•�U•ª
-            /// </summary>
-            Auxiliary,
-            /// <summary>
             /// ‘��‡Œv�s
             /// </summary>
             AllTotal,
@@ -131,9 +123,7 @@
         /// �‡Œv�sƒ^ƒCƒgƒ‹
         /// </summary>
         private static string[] s_TotalTitleArray = new string[] {  "�–’S�@“–�@ŽÒ�@�‡�@Œv�–",
-                                                                    "�–Š®�@—¹�@�Ï�@�‡�@Œv�–",
-                                                                    "�–�@Œo�@�@”ï�@�@Œv�@�–",
-                                                                    "�–�l Œ� ”ï �U •ª Œv�–",
+                                                                    "�–‘Þ�@�E�@ŽÒ�@�‡�@Œv�–",
                                                                     "�–�–�@‘��@�‡�@Œv�@�–�–",
                                                                 };
         #endregion
@@ -188,11 +178,6 @@
         private bool m_initDataLoad = true;
 
         /// <summary>
-        /// �‰Šú“Ç�žŽžƒf�[ƒ^ƒJƒEƒ“ƒg
-        /// </summary>
-        private int m_initDataCount = 0;
-
-        /// <summary>
         /// ‹N“®ƒtƒ‰ƒO
         /// </summary>
         private int m_ExecuteFlg = 0;
@@ -303,7 +288,7 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
-
+            SetInitnumUDConstPro();
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
             SetcmbPeriod();
             SetcmbDepartment();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssList.designer.cs	(revision 143)
@@ -81,6 +81,7 @@
             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();
@@ -92,7 +93,7 @@
             this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnLedgerStatus = new System.Windows.Forms.Button();
+            this.label18 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.pnlPayroll.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
@@ -148,6 +149,7 @@
             // 
             this.pnlPayroll.BackColor = System.Drawing.Color.LightSteelBlue;
             this.pnlPayroll.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlPayroll.Controls.Add(this.label18);
             this.pnlPayroll.Controls.Add(this.lblEndDate);
             this.pnlPayroll.Controls.Add(this.lblStartDate);
             this.pnlPayroll.Controls.Add(this.label8);
@@ -245,7 +247,7 @@
             // 
             // label23
             // 
-            this.label23.BackColor = System.Drawing.Color.LightSalmon;
+            this.label23.BackColor = System.Drawing.Color.Orange;
             this.label23.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label23.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label23.ForeColor = System.Drawing.Color.White;
@@ -253,7 +255,7 @@
             this.label23.Name = "label23";
             this.label23.Size = new System.Drawing.Size(110, 25);
             this.label23.TabIndex = 51;
-            this.label23.Text = "å½“æœŸç´”åˆ©ç›Š";
+            this.label23.Text = "æ‹…å½“å¤–å�Žç›Š";
             this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label11
@@ -283,7 +285,7 @@
             // 
             // label19
             // 
-            this.label19.BackColor = System.Drawing.Color.LightSalmon;
+            this.label19.BackColor = System.Drawing.Color.Orange;
             this.label19.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label19.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label19.ForeColor = System.Drawing.Color.White;
@@ -291,7 +293,7 @@
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(110, 25);
             this.label19.TabIndex = 49;
-            this.label19.Text = "å½“æœŸç´”åˆ©ç›Š";
+            this.label19.Text = "æ‹…å½“å¤–å�Žç›Š";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // lblPlusorMinus2
@@ -368,7 +370,7 @@
             this.label22.Name = "label22";
             this.label22.Size = new System.Drawing.Size(110, 25);
             this.label22.TabIndex = 32;
-            this.label22.Text = "å½“æœŸæš«å®šç´”åˆ©ç›Š";
+            this.label22.Text = "å½“æœŸäººä»¶è²»";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // lblTotalValue2
@@ -389,7 +391,7 @@
             this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label14.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.label14.ForeColor = System.Drawing.Color.DarkRed;
-            this.label14.Location = new System.Drawing.Point(379, 28);
+            this.label14.Location = new System.Drawing.Point(72, 53);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(110, 25);
             this.label14.TabIndex = 32;
@@ -410,15 +412,15 @@
             // 
             // label20
             // 
-            this.label20.BackColor = System.Drawing.Color.DarkOrange;
+            this.label20.BackColor = System.Drawing.Color.LightGoldenrodYellow;
             this.label20.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label20.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label20.ForeColor = System.Drawing.Color.White;
+            this.label20.ForeColor = System.Drawing.Color.Black;
             this.label20.Location = new System.Drawing.Point(72, 28);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(110, 25);
             this.label20.TabIndex = 11;
-            this.label20.Text = "æŒ¯åˆ†æ¸ˆç´”åˆ©ç›Š";
+            this.label20.Text = "å‰¯æ‹…å½“å�Žç›Š";
             this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label13
@@ -460,15 +462,15 @@
             // 
             // label17
             // 
-            this.label17.BackColor = System.Drawing.Color.Green;
+            this.label17.BackColor = System.Drawing.Color.OldLace;
             this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label17.ForeColor = System.Drawing.Color.White;
-            this.label17.Location = new System.Drawing.Point(72, 53);
+            this.label17.ForeColor = System.Drawing.Color.Black;
+            this.label17.Location = new System.Drawing.Point(379, 28);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(110, 25);
             this.label17.TabIndex = 6;
-            this.label17.Text = "æœªæŒ¯åˆ†ç´”åˆ©ç›Š";
+            this.label17.Text = "æŒ‡å°Žå“¡å�Žç›Š";
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label6
@@ -629,6 +631,20 @@
             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;
@@ -813,19 +829,17 @@
             this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column12.Width = 140;
             // 
-            // btnLedgerStatus
+            // label18
             // 
-            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);
+            this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label18.AutoSize = true;
+            this.label18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.label18.ForeColor = System.Drawing.Color.Red;
+            this.label18.Location = new System.Drawing.Point(944, 59);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(282, 19);
+            this.label18.TabIndex = 56;
+            this.label18.Text = "â€»å½“æœŸäººä»¶è²»ã�®ã�¿ã�®è¨ˆç®—ã�§ã�™";
             // 
             // FrmDepExpenssList
             // 
@@ -916,5 +930,6 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Button btnLedgerStatus;
+        private System.Windows.Forms.Label label18;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 143)
@@ -381,15 +381,10 @@
         /// <summary>
         /// ƒOƒŠƒbƒh�sƒf�[ƒ^ƒZƒbƒg
         /// </summary>
-        /// <param name="objwrk"></param>
-        /// <param name="ino"></param>
-        /// <param name="TotalArea"></param>
-        /// <param name="initFlg"></param>
-        /// <param name="StatusFlg"></param>
-        private void GridDataSet(object[] objwrk, ref int ino, ref int[] TotalArea, ref bool initFlg, ref int StatusFlg,
+        private void GridDataSet(object[] objwrk, ref int ino, ref int[] TotalArea,
                                     List<int> DepInPerArray, List<int> PersonCDArray,
                                     List<DateTime> dtStartArray, List<DateTime> dtCompArray, List<int> SalaryArray,
-                                    List<DateTime> dtHireStDayArray,
+                                    List<DateTime> dtHireStDayArray, List<DateTime> dtHireEdDayArray,
                                     DateTime dtDefaultStart, DateTime dtDefaultEnd)
         {
             try
@@ -434,16 +429,24 @@
                     {
                         if (DepInPerArray[i] != DepartmentCode) continue;
                         // ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
-                        if (dtStartArray[i] == DateTime.MinValue || dtStartArray[i] == DateTime.MaxValue) dtStartArray[i] = dtDefaultStart;
-                        if (dtCompArray[i] == DateTime.MinValue || dtCompArray[i] == DateTime.MaxValue) dtCompArray[i] = dtDefaultEnd;
+                        DateTime stDate = dtStartArray[i];
+                        DateTime edDate = dtCompArray[i];
+                        CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
 
+                        dtStartArray[i] = stDate;
+                        dtCompArray[i] = edDate;
+
                         // Œo”ïŽæ“¾
                         GetPersonExpensesCostValue(PersonCDArray[i], dtStartArray[i], dtCompArray[i], ref CostValue2);
 
                         // ‹‹—^—Ý�ÏŽæ“¾
-                        int workSalary = CalcElapsedSalary(dtStartArray[i], dtCompArray[i], PersonCDArray[i], SalaryArray[i]);
+                        int workSalary = 0;
+                        if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
+                        {
+                            workSalary = CalcElapsedSalary(dtStartArray[i], dtCompArray[i], PersonCDArray[i], SalaryArray[i]);
+                        }
                         // —ÝŒv‰ÁŽZ
-                        if (workSalary > 0) TotalSalary += workSalary;
+                        TotalSalary += workSalary;
                     }
 
                     // �U•ª‹‹—^‹àŠz�E�ƒ—˜‰v‹àŠz�E‘e—˜‰v‹àŠzŽæ“¾
@@ -454,10 +457,6 @@
                     int PersonCount = -1;
                     for (int i = 0; i < PersonCDArray.Count; i++)
                     {
-                        //// ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
-                        //if (dtStartArray[i] == DateTime.MinValue || dtStartArray[i] == DateTime.MaxValue) dtStartArray[i] = dtDefaultStart;
-                        //if (dtCompArray[i] == DateTime.MinValue || dtCompArray[i] == DateTime.MaxValue) dtCompArray[i] = dtDefaultEnd;
-
                         // “¯‚¶’S“–ŽÒƒR�[ƒh‚ð’T‚·
                         if (PersonCode == PersonCDArray[i])
                         {
@@ -468,20 +467,21 @@
                     if (PersonCount < 0) return;
 
                     // ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
-                    if (dtStartArray[PersonCount] == DateTime.MinValue || dtStartArray[PersonCount] == DateTime.MaxValue)
-                    {
-                        if (dtDefaultStart < dtHireStDayArray[PersonCount] && dtHireStDayArray[PersonCount] < dtDefaultEnd)
-                            dtStartArray[PersonCount] = dtHireStDayArray[PersonCount];
-                        else
-                            dtStartArray[PersonCount] = dtDefaultStart;
-                    }
-                    if (dtCompArray[PersonCount] == DateTime.MinValue || dtCompArray[PersonCount] == DateTime.MaxValue) dtCompArray[PersonCount] = dtDefaultEnd;
+                    DateTime stDate = dtStartArray[PersonCount];
+                    DateTime edDate = dtCompArray[PersonCount];
+                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[PersonCount], dtHireEdDayArray[PersonCount], ref stDate, ref edDate);
+
+                    dtStartArray[PersonCount] = stDate;
+                    dtCompArray[PersonCount] = edDate;
                     
                     // Œo”ïŽæ“¾
                     GetPersonExpensesCostValue(PersonCDArray[PersonCount], dtStartArray[PersonCount], dtCompArray[PersonCount], ref CostValue2);
 
                     // ‹‹—^—Ý�ÏŽæ“¾
-                    TotalSalary = CalcElapsedSalary(dtStartArray[PersonCount], dtCompArray[PersonCount], PersonCDArray[PersonCount], SalaryArray[PersonCount]);
+                    if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
+                    {
+                        TotalSalary = CalcElapsedSalary(dtStartArray[PersonCount], dtCompArray[PersonCount], PersonCDArray[PersonCount], SalaryArray[PersonCount]);
+                    }
 
                     // �U•ª‹‹—^‹àŠz�E�ƒ—˜‰v‹àŠz�E‘e—˜‰v‹àŠzŽæ“¾
                     ProfitGeneral(DepartmentCode, PersonCode, ref OnSalary, ref  NetIncome, ref  NonSalary);
@@ -494,7 +494,6 @@
                     wrkArray[(int)DBGetData.NetProfit] -= CostValue2[i];            // �ƒ—˜‰v-�w“ü•i
                 }
                 int TotalValue = OnSalary - TotalSalary;
-                //wrkArray[(int)DBGetData.GrossProfit] += TotalValue;                 // ‘e—˜‰v+�U•ª‹‹—^�·Šz
                 wrkArray[(int)DBGetData.NetProfit] += TotalValue;                   // �ƒ—˜‰v+�U•ª‹‹—^�·Šz
                 // ------------------------------------------------------------------------------------------
 
@@ -538,6 +537,78 @@
         }
         #endregion
 
+        #region ŒvŽZŠJŽn�E�I—¹“ú‚Ìƒ`ƒFƒbƒN“ü‚ê‘Ö‚¦
+        /// <summary>
+        /// ŒvŽZŠJŽn�E�I—¹“ú‚Ìƒ`ƒFƒbƒN“ü‚ê‘Ö‚¦
+        /// </summary>
+        private void CalcStartCompDate(DateTime dtDefaultStart, DateTime dtDefaultEnd,
+                                        DateTime HireStartDate, DateTime HireCompDate,
+                                        ref DateTime StartDate, ref DateTime CompDate)
+        {
+            try
+            {
+                if (StartDate == DateTime.MinValue)
+                {
+                    StartDate = dtDefaultStart;
+                }
+                else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
+                {
+                    StartDate = HireStartDate;
+                }
+                else if (dtDefaultStart < StartDate)
+                {
+                    StartDate = dtDefaultStart;
+                }
+
+                // �Å‘å“ú‚ª�¡“ú‚æ‚è�¬‚³‚¢�ê�‡ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                if (CompDate.Date > DateTime.Today.Date) return;
+
+                if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
+                {   // ‘OŠúˆÈ‘O‚ÍŠú––
+                    CompDate = dtDefaultEnd;
+                }
+                else if (HireCompDate != DateTime.MinValue
+                        && (dtDefaultStart < HireCompDate && HireCompDate < dtDefaultEnd))
+                {   // ‘ÞŽÐ“ú‚ªŠú“à‚È‚ç‚Î�I—¹‚ð‘ÞŽÐ“ú‚É‚·‚é
+                    CompDate = HireCompDate;
+                }
+                else
+                {   // ˆÈŠO‚Í�¡“ú
+                    CompDate = DateTime.Today.Date;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}", ex.Message);
+            }
+        }
+        #endregion
+
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// <summary>
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// </summary>
+        private void SetInitnumUDConstPro()
+        {
+            try
+            {
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYear(ref minval, ref maxval);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽžƒf�[ƒ^Žæ“¾
         /// <summary>
         /// �‰ŠúŽžƒf�[ƒ^Žæ“¾
@@ -974,48 +1045,73 @@
                 strSQL += " MAX(C.CONSTRUCTIONPERIODEND) M3, MAX(C.CONSTRUCTIONPERIODEND2) M4,";
                 strSQL += " MAX(D.CONSTRUCTIONPERIODEND) S3, MAX(D.CONSTRUCTIONPERIODEND2) S4,";
                 strSQL += " MAX(E.CONSTRUCTIONPERIODEND) I3, MAX(E.CONSTRUCTIONPERIODEND2) I4,";
-                strSQL += " SUM(C2.EXECUTIONAMOUNT) M5, SUM(D2.EXECUTIONAMOUNT) S5, SUM(E2.EXECUTIONAMOUNT) I5,";
-                strSQL += " COUNT(C2.EXECUTIONAMOUNT) M6, COUNT(D2.EXECUTIONAMOUNT) S6, COUNT(E2.EXECUTIONAMOUNT) I6,";
+                strSQL += " SUM(C.EXECUTIONAMOUNT) M5, SUM(D.EXECUTIONAMOUNT) S5, SUM(E.EXECUTIONAMOUNT) I5,";
+                strSQL += " COUNT(C.EXECUTIONAMOUNT) M6, COUNT(D.EXECUTIONAMOUNT) S6, COUNT(E.EXECUTIONAMOUNT) I6,";
                 strSQL += " P.STARTDATE, P.ENDDATE";
                 strSQL += " FROM PERSONINCHARGEMASTER P";
-                
+
                 // �HŽ–’S“–ŽÒ‚Ìƒf�[ƒ^Žæ“¾
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO C ON C.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
+                strSQL += " LEFT JOIN (SELECT C1.CONSTRUCTIONPERSONCODE, C1.CONSTRUCTIONSTATUSFLG, C1.CONSTRUCTIONPERIOD";
+                strSQL += ", C1.CONSTRUCTIONPERIODSTART, C1.CONSTRUCTIONPERIODSTART2, C1.CONSTRUCTIONPERIODEND, C1.CONSTRUCTIONPERIODEND2, C2.EXECUTIONAMOUNT";
+                strSQL += " FROM CONSTRUCTIONBASEINFO C1, CONSTRUCTIONLEDGERDETAIL C2, CONSTRUCTIONLEDGER C3";
+                strSQL += " WHERE C2.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND C2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
+                strSQL += " AND C3.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE) C";
+                strSQL += " ON C.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
                 strSQL += string.Format(" AND C.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND C.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += " AND EXISTS (SELECT * FROM CONSTRUCTIONLEDGER C3 WHERE C3.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE)";
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGERDETAIL C2 ON C2.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND C2.GROUPCOUNT = {0}",(int)FrmConstructionLedger.DataGroup.Payroll);
 
                 // �HŽ–•›’S“–ŽÒ‚Ìƒf�[ƒ^Žæ“¾
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO D ON D.CONSTRSUBPERSONCODE = P.PERSONCODE";
+                strSQL += " LEFT JOIN (SELECT D1.CONSTRSUBPERSONCODE CONSTRUCTIONPERSONCODE, D1.CONSTRUCTIONSTATUSFLG, D1.CONSTRUCTIONPERIOD";
+                strSQL += ", D1.CONSTRUCTIONPERIODSTART, D1.CONSTRUCTIONPERIODSTART2, D1.CONSTRUCTIONPERIODEND, D1.CONSTRUCTIONPERIODEND2, D2.EXECUTIONAMOUNT";
+                strSQL += " FROM CONSTRUCTIONBASEINFO D1, CONSTRUCTIONLEDGERDETAIL D2, CONSTRUCTIONLEDGER D3";
+                strSQL += " WHERE D2.CONSTRUCTIONCODE = D1.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND D2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
+                strSQL += " AND D3.CONSTRUCTIONCODE = D1.CONSTRUCTIONCODE) D";
+                strSQL += " ON D.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
                 strSQL += string.Format(" AND D.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND D.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += " AND EXISTS (SELECT * FROM CONSTRUCTIONLEDGER D3 WHERE D3.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE)";
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGERDETAIL D2 ON D2.CONSTRUCTIONCODE = D.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND D2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
 
                 // �HŽ–Žw“±ˆõ‚Ìƒf�[ƒ^Žæ“¾
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO E ON E.CONSTRUCTIONINSTRUCTOR = P.PERSONCODE";
+                strSQL += " LEFT JOIN (SELECT E1.CONSTRUCTIONINSTRUCTOR CONSTRUCTIONPERSONCODE, E1.CONSTRUCTIONSTATUSFLG, E1.CONSTRUCTIONPERIOD";
+                strSQL += ", E1.CONSTRUCTIONPERIODSTART, E1.CONSTRUCTIONPERIODSTART2, E1.CONSTRUCTIONPERIODEND, E1.CONSTRUCTIONPERIODEND2, E2.EXECUTIONAMOUNT";
+                strSQL += " FROM CONSTRUCTIONBASEINFO E1, CONSTRUCTIONLEDGERDETAIL E2, CONSTRUCTIONLEDGER E3";
+                strSQL += " WHERE E2.CONSTRUCTIONCODE = E1.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND E2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
+                strSQL += " AND E3.CONSTRUCTIONCODE = E1.CONSTRUCTIONCODE) E";
+                strSQL += " ON E.CONSTRUCTIONPERSONCODE = P.PERSONCODE";
                 strSQL += string.Format(" AND E.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
                 strSQL += string.Format(" AND E.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += " AND EXISTS (SELECT * FROM CONSTRUCTIONLEDGER E3 WHERE E3.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE)";
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGERDETAIL E2 ON E2.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND E2.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
 
                 strSQL += string.Format(" WHERE P.LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+                strSQL += string.Format(" AND (DATE(P.STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(P.ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(P.ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
                 // �HŽ–‘ä’ ƒf�[ƒ^‚Ì•”��‚¾‚¯‚ª‘Î�Û
-                strSQL += " AND P.DEPARTMENTCODE IN";
-                strSQL += " (SELECT DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
-                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C, CONSTRUCTIONLEDGERDETAIL D";
-                strSQL += " WHERE A.DELETEFLG = 0";
-                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
-                strSQL += " AND (B.PERSONCODE = C.CONSTRUCTIONPERSONCODE OR B.PERSONCODE = C.CONSTRUCTIONINSTRUCTOR OR B.PERSONCODE = C.CONSTRSUBPERSONCODE)";
-                strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
-                strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) AS TMP )";
+                if (DepartmentCode == 0)
+                {
+                    strSQL += " AND P.DEPARTMENTCODE IN";
+                    strSQL += " (SELECT AA.DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
+                    strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C , CONSTRUCTIONLEDGERDETAIL D";
+                    strSQL += " WHERE A.DELETEFLG = 0";
+                    strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
+                    strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
+                    strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
 
-                if (DepartmentCode != 0)
+                    strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) AA)";
+                }
+                else
+                {
+                    // •”��ƒR�[ƒh‘I‘ðŽž‚Í•”��‚ðŒŸ�õ�ðŒ�‚Ö“ü‚ê‚é
                     strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
+                }
+
                 strSQL += " GROUP BY P.DEPARTMENTCODE, P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE, P.ENDDATE";
                 strSQL += " ORDER BY P.DISPLAYORDER";
 
@@ -1022,11 +1118,6 @@
                 ArrayList arList = new ArrayList();
                 if (!PersonDB.ExecuteReader(strSQL, ref arList)) return 0;
 
-                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
-                DateTime dtDefaultStart = DateTime.MinValue;
-                DateTime dtDefaultEnd = DateTime.MinValue;
-                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
-
                 DateTime stDate = DateTime.MaxValue;
                 DateTime edDate = DateTime.MinValue;
                 DateTime maxDate = DateTime.MinValue;
@@ -1322,6 +1413,7 @@
             IOConstructionLedger LedgerDB = new IOConstructionLedger();
             DataGridView dgv = dgvMaster;
             ProgressBar prgber = ProgressBar;
+            int initDataCount = 0;
             try
             {
                 dgv.SuspendLayout();
@@ -1389,72 +1481,52 @@
                 // ----- �HŽ–�Ú�×‘ä’ Žæ“¾
                 if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
 
-                // •”��‚²‚Æˆê——‚Ì�ê�‡‚Í‘Þ�EŽÒ‚Å‚àƒf�[ƒ^‚ª‚ ‚ê‚Î•\Ž¦‚·‚é
-                if (DispType== (int)DispDataTypeCode.Department)
-                {
-                    GetType2DeleteData(LedgerDB, ref arData);
-                }
-
-                // “Ç�žŽžƒf�[ƒ^ƒJƒEƒ“ƒgŽæ“¾
-                m_initDataCount = arData.Count;
-                if (arData.Count == 0) return;
-
                 // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                 prgber.Value++;
                 prgber.Update();
 
-                // �‡ŒvƒGƒŠƒA
+                // “Ç�žŽžƒf�[ƒ^ƒJƒEƒ“ƒgŽæ“¾
+                initDataCount = arData.Count;
+
+                // �‡ŒvƒGƒŠƒA�‰Šú‰»
                 int TotalColCnt = Enum.GetNames(typeof(DispColumn)).Length;
                 int[] TotalArea = new int[TotalColCnt];
                 Array.Clear(TotalArea, 0, TotalArea.Length);
 
+                int ino = 1;
                 // ƒf�[ƒ^•\Ž¦
-                int ino = 1;
-                int StatusFlg = -1;
-                bool initFlg = true;
-                string strStatus = string.Empty;
-               // ----- Ž{�H’†ƒf�[ƒ^•\Ž¦
-                foreach (object[] objwrk in arData)
+                if (arData.Count != 0)
                 {
-                    // ƒOƒŠƒbƒh‚Öƒf�[ƒ^•\Ž¦
-                    GridDataSet(objwrk, ref ino, ref TotalArea, ref initFlg, ref StatusFlg,
-                                DepInPerArray, PersonCDArray, dtStartArray, dtCompArray, SalaryArray, dtHireStDayArray,
-                                dtDefaultStart, dtDefaultEnd);
+                    // ƒf�[ƒ^•\Ž¦
+                    CreateRowBlock(DispType, arData, ref ino, ref TotalArea,
+                                    DepInPerArray, PersonCDArray,
+                                    dtStartArray, dtMaxCompArray, SalaryArray,
+                                        dtHireStDayArray, dtHireEdDayArray,
+                                        dtDefaultStart, dtDefaultEnd, true);
                 }
 
-                dgv.Columns[(int)DispColumn.SelectionName].HeaderText = GridColumnHeader[DispType];
-
-                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
-                prgber.Value++;
-                prgber.Update();
-
-                int depcode = GetDepartmentCode();
-                // ----- �‡Œv•\Ž¦
-                if (arData.Count != 0 && depcode != 0)
+                // •”��‚²‚Æˆê——‚Ì�ê�‡‚Í‘Þ�EŽÒ‚Å‚àƒf�[ƒ^‚ª‚ ‚ê‚Î•\Ž¦‚·‚é
+                if (DispType == (int)DispDataTypeCode.Department)
                 {
-                    //dgv.Rows.Add();       // ‹ó�s
+                    arData.Clear();
+                    int[] RetireeTotalArea = new int[TotalColCnt];
 
-                    // �‡Œv�s•\Ž¦
-                    int TotalRow = dgv.Rows.Add(1);
-                    dgv.Rows[TotalRow].Cells[(int)DispColumn.SelectionName].Value = s_TotalTitleArray[(int)RowTitleNum.Execution];
-                    // �s‚Ì�F‚ð•Ï‚¦‚é
-                    SetRowColor(dgv.Rows[TotalRow], s_RowTotalBackColor, s_RowTotalForeColor);
-
-                    // �”’l•\Ž¦
-                    for (int i = (int)DispColumn.OrdersDecisionPrice; i <= (int)DispColumn.NetProfit; i++)
+                    GetType2DeleteData(LedgerDB, ref arData);
+                    if (arData.Count > 0)
                     {
-                        dgv.Rows[TotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
+                        CreateRowBlock(DispType, arData, ref ino, ref RetireeTotalArea,
+                                        DepInPerArray, PersonCDArray,
+                                        dtStartArray, dtMaxCompArray, SalaryArray,
+                                            dtHireStDayArray, dtHireEdDayArray,
+                                            dtDefaultStart, dtDefaultEnd, false);
+                        for (int i = 0; i < TotalArea.Length; i++)
+                        {
+                            TotalArea[i] += RetireeTotalArea[i];
+                        }
                     }
                 }
 
-                dgv.Rows.Add();       // ‹ó�s
-
-                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
-                prgber.Value++;
-                prgber.Update();
-
                 // ----- ‘��‡Œv�s•\Ž¦
-                dgv.Rows.Add();       // ‹ó�s
                 int AllTotalRow = dgv.Rows.Add(1);
                 dgv.Rows[AllTotalRow].Cells[(int)DispColumn.SelectionName].Value = s_TotalTitleArray[(int)RowTitleNum.AllTotal];
 
@@ -1466,11 +1538,6 @@
                 {
                     dgv.Rows[AllTotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
                 }
-
-                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
-                prgber.Value = prgber.Maximum;
-                prgber.Update();
-
             }
             catch (Exception ex)
             {
@@ -1486,7 +1553,7 @@
                 }
                 else
                 {
-                    dgv.RowCount += (CommonDefine.s_MaxInitLineCount - m_initDataCount);
+                    dgv.RowCount += (CommonDefine.s_MaxInitLineCount - initDataCount);
                 }
 
                 LedgerDB.close(); LedgerDB = null;
@@ -1500,6 +1567,71 @@
         }
         #endregion
 
+        #region ‘I‘ð‚³‚ê‚½ƒf�[ƒ^‚ð�‡Œv‚Æ‹¤‚É•\Ž¦‚·‚é
+        /// <summary>
+        /// ‘I‘ð‚³‚ê‚½ƒf�[ƒ^‚ð�‡Œv‚Æ‹¤‚É•\Ž¦‚·‚é
+        /// </summary>
+        private void CreateRowBlock(int DispType, ArrayList arData, ref int ino, ref int[] TotalArea,
+                                    List<int> DepInPerArray, List<int> PersonCDArray,
+                                    List<DateTime> dtStartArray, List<DateTime> dtCompArray, List<int> SalaryArray,
+                                    List<DateTime> dtHireStDayArray, List<DateTime> dtHireEdDayArray,
+                                    DateTime dtDefaultStart, DateTime dtDefaultEnd, bool IncumbentsFlg)
+        {
+            DataGridView dgv = dgvMaster;
+            ProgressBar prgber = ProgressBar;
+            try
+            {
+               // ----- Ž{�H’†ƒf�[ƒ^•\Ž¦
+                foreach (object[] objwrk in arData)
+                {
+                    // ƒOƒŠƒbƒh‚Öƒf�[ƒ^•\Ž¦
+                    GridDataSet(objwrk, ref ino, ref TotalArea,
+                                DepInPerArray, PersonCDArray, dtStartArray, dtCompArray, SalaryArray,
+                                dtHireStDayArray, dtHireEdDayArray,
+                                dtDefaultStart, dtDefaultEnd);
+                }
+
+                dgv.Columns[(int)DispColumn.SelectionName].HeaderText = GridColumnHeader[DispType];
+
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
+
+                int depcode = GetDepartmentCode();
+                // ----- �‡Œv•\Ž¦
+                if (arData.Count != 0 && depcode != 0)
+                {
+                    // �‡Œv�s•\Ž¦
+                    int TotalRow = dgv.Rows.Add(1);
+                    
+                    if (IncumbentsFlg)
+                        dgv.Rows[TotalRow].Cells[(int)DispColumn.SelectionName].Value = s_TotalTitleArray[(int)RowTitleNum.Incumbents];
+                    else
+                        dgv.Rows[TotalRow].Cells[(int)DispColumn.SelectionName].Value = s_TotalTitleArray[(int)RowTitleNum.Retiree];
+
+                    // �s‚Ì�F‚ð•Ï‚¦‚é
+                    SetRowColor(dgv.Rows[TotalRow], s_RowTotalBackColor, s_RowTotalForeColor);
+
+                    // �”’l•\Ž¦
+                    for (int i = (int)DispColumn.OrdersDecisionPrice; i <= (int)DispColumn.NetProfit; i++)
+                    {
+                        dgv.Rows[TotalRow].Cells[i].Value = TotalArea[i].ToString("#,0");
+                    }
+                }
+
+                dgv.Rows.Add();       // ‹ó�s
+
+                // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
+                prgber.Value++;
+                prgber.Update();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ‚c‚aŽæ“¾�‡”Ô
         /// <summary>
         /// ‚c‚aŽæ“¾�‡”Ô
@@ -1576,6 +1708,24 @@
         {
             try
             {
+                // ----- ‚r‚p‚k�ì�¬
+                CreateType2SQL(true, ref strSQL);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSQL);
+            }
+        }
+        #endregion
+
+        #region •”��‚²‚Æ‚Ìˆê——‚r‚p‚k‚ð�ì�¬‚·‚é
+        /// <summary>
+        /// •”��‚²‚Æ‚Ìˆê——‚r‚p‚k‚ð�ì�¬‚·‚é
+        /// </summary>
+        private void CreateType2SQL(bool bDelFlg, ref string strSQL)
+        {
+            try
+            {
                 // SQL‚ÉƒAƒNƒZƒX�§ŒÀ‚ð‚©‚¯‚é
                 string strSecurity = string.Empty;
                 CreateSecuritySQL(ref strSecurity);
@@ -1582,6 +1732,7 @@
 
                 int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
                 int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+
                 // ----- ‚r‚p‚k�ì�¬
                 // ‘¶�Ý�Ú�×‘ä’ ƒf�[ƒ^ŒŸ�õ
                 strSQL = "SELECT";
@@ -1605,8 +1756,12 @@
                 strSQL += string.Format(" AND B.TyingFlg != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
                 strSQL += " LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                 strSQL += string.Format(" WHERE C.DEPARTMENTCODE = {0}", DepCode);
-                strSQL += " AND C.DELETEFLG = 0";
-                //strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
+                
+                if (bDelFlg)
+                    strSQL += " AND C.DELETEFLG = 0";
+                else
+                    strSQL += " AND C.DELETEFLG != 0";
+
                 strSQL += " GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG";
                 strSQL += " ORDER BY 11, 3 ASC";
 
@@ -1618,9 +1773,9 @@
         }
         #endregion
 
-        #region •”��‚²‚Æ‚Ìˆê——ƒf�[ƒ^‚Å’S“–ŽÒ‚Ìƒf�[ƒ^‚ð’Ç‰Á‚ÅŽæ“¾‚·‚é
+        #region •”��‚²‚Æ‚Ìˆê——ƒf�[ƒ^‚Å’S“–ŽÒ‚Ì�í�œƒf�[ƒ^‚ð’Ç‰Á‚ÅŽæ“¾‚·‚é
         /// <summary>
-        /// •”��‚²‚Æ‚Ìˆê——ƒf�[ƒ^‚Å’S“–ŽÒ‚Ìƒf�[ƒ^‚ð’Ç‰Á‚ÅŽæ“¾‚·‚é
+        /// •”��‚²‚Æ‚Ìˆê——ƒf�[ƒ^‚Å’S“–ŽÒ‚Ì�í�œƒf�[ƒ^‚ð’Ç‰Á‚ÅŽæ“¾‚·‚é
         /// </summary>
         private void GetType2DeleteData(IOConstructionLedger LedgerDB, ref ArrayList arData)
         {
@@ -1627,51 +1782,56 @@
             string strSQL = string.Empty;
             try
             {
-                // SQL‚ÉƒAƒNƒZƒX�§ŒÀ‚ð‚©‚¯‚é
-                string strSecurity = string.Empty;
-                CreateSecuritySQL(ref strSecurity);
-
-                int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
-                int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
                 // ----- ‚r‚p‚k�ì�¬
-                // ‘¶�Ý�Ú�×‘ä’ ƒf�[ƒ^ŒŸ�õ
-                strSQL = "SELECT";
+                CreateType2SQL(false, ref strSQL);
+                
+                if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSQL);
+            }
+        }
+        #endregion
 
-                strSQL += " C.PERSONCODE";
-                strSQL += " ,C.PERSONNAME";
-                strSQL += " ,C.DISPLAYORDER";
-                strSQL += " ,SUM(A.ORDERSDECISIONPRICE)";
-                strSQL += " ,SUM(A.COMPANYEXPENSES)";
-                strSQL += " ,SUM(A.DEPARTMENTEXPENSES)";
-                strSQL += " ,SUM(A.SALESEXPENSES)";
-                strSQL += " ,SUM(A.TOTALPAYMENT)";
-                strSQL += " ,SUM(A.GROSSPROFIT)";
-                strSQL += " ,SUM(A.NETPROFIT)";
-                strSQL += " ,C.EMPLOYEECLASSFLG";
+        #region ŠúŠJŽn‘Oƒwƒbƒ_�[ƒZƒbƒg
+        /// <summary>
+        /// ŠúŠJŽn‘Oƒwƒbƒ_�[ƒZƒbƒg
+        /// </summary>
+        private void SetUnreachedPeriod()
+        {
+            try
+            {
+                // �U•ª‹‹—^‹àŠz•\Ž¦
+                lblCalcValue1.Text = "0";
 
-                strSQL += " FROM PERSONINCHARGEMASTER C";
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO B ON B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
-                strSQL += string.Format(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
-                strSQL += string.Format(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
-                strSQL += string.Format(" AND B.TyingFlg != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
+                // ‹‹—^—Ý�Ï•\Ž¦
+                lblPayroll.Text = "0";
 
-                strSQL += ", CONSTRUCTIONLEDGER A";
-                //strSQL += " LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+                // ‹‹—^�·ŠzŒvŽZ�E•\Ž¦
+                lblTotalValue.Text = "0";
+                lblCalcValue3.Text = "0";
 
-                strSQL += string.Format(" WHERE C.DEPARTMENTCODE = {0}", DepCode);
-                strSQL += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+                // •›’S“–ŽÒŽû‰v‹àŠz•\Ž¦
+                lblCalcValue2.Text = "0";
 
-                strSQL += " AND C.DELETEFLG != 0";
-                //strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
+                // Žw“±ˆõŽû‰v‹àŠz•\Ž¦
+                lblTotalValue2.Text = "0";
 
-                strSQL += " GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG";
-                strSQL += " ORDER BY 11, 3 ASC";
+                // ’S“–ŠOŽû‰vŒvŽZ
+                lblTotalCalcValue1.Text = "0";
+                lblTotalCalcValue2.Text = "0";
 
-                if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
+                // �lŒ�”ïŒv
+                lblTotalCalcValue.Text = "0";
+
+                // ‹‹—^ŒvŽZŠJŽn“ú�E�I—¹“ú
+                lblStartDate.Text = "";
+                lblEndDate.Text = "";
             }
             catch (Exception ex)
             {
-                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSQL);
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
         }
         #endregion
@@ -1687,84 +1847,42 @@
         {
             try
             {
+                // Šú–¢“ž’B‚Íƒwƒbƒ_�[‚ðƒNƒŠƒA‚µ‚Ä”²‚¯‚é
+                if (numUDConstPro.Value > CommonMotions.SystemMasterData.BusinessPeriod)
+                {
+                    SetUnreachedPeriod();
+                    return;
+                }
+
                 //Debug.WriteLine("---------------------");
                 // •”��ƒR�[ƒhŽæ“¾
                 int DepartmentCode = GetDepartmentCode();
 
-                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
-                DateTime dtCurDefaultStart = dtDefaultStart;
-                DateTime dtCurDefaultEnd = dtDefaultEnd;
-
                 int TotalSalary = 0;        // ‹‹—^—Ý�ÏŽæ“¾
                 int OnSalary = 0;           // �U•ª‹‹—^‹àŠzŽæ“¾
                 int NetIncome = 0;          // �ƒ—˜‰v‹àŠzŽæ“¾
                 int NonSalary = 0;          // ‘e—˜‰v‹àŠzŽæ“¾
 
-                DateTime dtStart = DateTime.MinValue;
-                DateTime dtEnd = DateTime.MinValue;
-                DateTime dtMax = DateTime.MaxValue;
-                DateTime dtDispStart = DateTime.MaxValue;
-                DateTime dtDispComplate = DateTime.MinValue;
+                DateTime stDate = DateTime.Today;
+                DateTime edDate = DateTime.Today;
+
+                DateTime dtCurDefaultStart = dtDefaultStart;
+                DateTime dtCurDefaultEnd = DateTime.Today;
                 // ‹‹—^‚ð�WŒv‚·‚é
                 for (int i = 0; i < PersonCDArray.Count; i++)
                 {
-                    // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
-                    dtCurDefaultStart = dtDefaultStart;
-                    dtCurDefaultEnd = dtDefaultEnd;
+                    // ŠJŽn�E�I—¹“ú‚ª–³‚¢�ê�‡‚ÍƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ�EŠú––‚ðŽg—p‚·‚é
+                    stDate = dtStartArray[i];
+                    edDate = dtMaxCompArray[i];
+                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
 
-                    // “üŽÐ“ú‚ªŠú“à‚È‚ç‚ÎŠJŽn‚ð“üŽÐ“ú‚É‚·‚é
-                    if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
-                    {
-                        dtCurDefaultStart = dtHireStDayArray[i];
-                    }
-                    // ‘ÞŽÐ“ú‚ªŠú“à‚È‚ç‚Î�I—¹‚ð‘ÞŽÐ“ú‚É‚·‚é
-                    if (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
-                    {
-                        dtCurDefaultEnd = dtHireEdDayArray[i];
-                    }
-                    
-                    // ŠJŽn“úŽæ“¾
-                    dtStart = dtStartArray[i];
-                    // ƒf�[ƒ^‚ª–³‚¢�ê�‡‚ÍŠúŽñ“ú‚ðƒZƒbƒg‚·‚é
-                    if (dtStart == DateTime.MaxValue)
-                    {
-                        dtStart = dtCurDefaultStart;
-                    }
-                    else if (dtCurDefaultStart < dtStart)
-                    {   // ŠJŽn“ú‚ªŠúŽñ‚æ‚èŒã‚È‚ç‚ÎŠúŽñ“ú‚ðƒZƒbƒg‚·‚é
-                        dtStart = dtCurDefaultStart;
-                    }
-
-                    // �Å‘å“úŽæ“¾
-                    dtMax = dtMaxCompArray[i];
-                    if (dtMax == DateTime.MinValue) dtMax = dtCurDefaultEnd;
-                    // �Å‘å“ú‚ª�¡“ú‚æ‚è�¬‚³‚¢�ê�‡
-                    if (dtMax < DateTime.Today.Date)
-                    {
-                        if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
-                        {   // ‘OŠúˆÈ‘O‚ÍŠú––
-                            dtMax = dtCurDefaultEnd;
-                        }
-                        else if (dtHireEdDayArray[i] != DateTime.MinValue
-                                && (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd))
-                        {   // ‘ÞŽÐ“ú‚ªŠú“à‚È‚ç‚Î�I—¹‚ð‘ÞŽÐ“ú‚É‚·‚é
-                            dtMax = dtCurDefaultEnd;
-                        }
-                        else
-                        {   // ˆÈŠO‚Í�¡“ú
-                            dtMax = DateTime.Today.Date;
-                        }
-                    }
-
                     // ‹‹—^—Ý�ÏŽæ“¾
-                    int workSalary = CalcElapsedSalary(dtStart, dtMax, PersonCDArray[i], SalaryArray[i]);
+                    int workSalary = CalcElapsedSalary(stDate, edDate, PersonCDArray[i], SalaryArray[i]);
                     // —ÝŒv‰ÁŽZ
-                    if (workSalary > 0) TotalSalary += workSalary;
-                    // Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
+                    TotalSalary += workSalary;
 
-                    // ŒvŽZŠJŽn�I—¹“ú‚ðŽæ“¾‚·‚é
-                    if (dtStart < dtDispStart) dtDispStart = dtStart;
-                    if (dtDispComplate < dtMax) dtDispComplate = dtMax;
+                    if (stDate < dtCurDefaultStart) dtCurDefaultStart = stDate;
+                    if (dtCurDefaultEnd < edDate) dtCurDefaultEnd = edDate;
                 }
 
                 // ----- •\Ž¦�ˆ—�
@@ -1780,26 +1898,30 @@
                 // ‹‹—^�·ŠzŒvŽZ�E•\Ž¦
                 int TotalValue = OnSalary - TotalSalary;
                 lblTotalValue.Text = TotalValue.ToString("#,0");
-                lblTotalValue2.Text = TotalValue.ToString("#,0");
+                lblCalcValue3.Text = TotalValue.ToString("#,0");
 
-                // �ƒ—˜‰v‹àŠz•\Ž¦
-                lblCalcValue2.Text = NetIncome.ToString("#,0");
+                // �U•ª‹àŠz‚ðŽæ“¾‚·‚é
+                int[] CostValue = new int[2];
+                GetPersonAuxiliaryCostValue(DepartmentCode, 0, ref CostValue);
 
-                // “–Šú�ƒ—˜‰vŒvŽZ
-                int CalcTotal1 = NetIncome + TotalValue;
+                // •›’S“–ŽÒŽû‰v‹àŠz•\Ž¦
+                lblCalcValue2.Text = CostValue[0].ToString("#,0");
+
+                // Žw“±ˆõŽû‰v‹àŠz•\Ž¦
+                lblTotalValue2.Text = CostValue[1].ToString("#,0");
+
+                // ’S“–ŠOŽû‰vŒvŽZ
+                int CalcTotal1 = CostValue[0] + CostValue[1];
                 lblTotalCalcValue1.Text = CalcTotal1.ToString("#,0");
                 lblTotalCalcValue2.Text = CalcTotal1.ToString("#,0");
 
-                // ‘e—˜‰v‹àŠzŽæ“¾
-                lblCalcValue3.Text = NonSalary.ToString("#,0");
-
-                // “–Šú�ƒ—˜‰vŒvŽZ
-                int CalcTotal = NonSalary + CalcTotal1;
+                // �lŒ�”ïŒv
+                int CalcTotal = TotalValue + CalcTotal1;
                 lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
 
                 // ‹‹—^ŒvŽZŠJŽn“ú�E�I—¹“ú
-                lblStartDate.Text = dtDispStart.ToShortDateString();
-                lblEndDate.Text = dtDispComplate.ToShortDateString();
+                lblStartDate.Text = dtCurDefaultStart.ToShortDateString();
+                lblEndDate.Text = dtCurDefaultEnd.ToShortDateString();
             }
             catch (Exception ex)
             {
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatus.cs	(revision 143)
@@ -227,6 +227,7 @@
         /// <param name="e"></param>
         private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
         {
+            SetInitnumUDConstPro();
             // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
             SetcmbDepartment();
             SetcmbPersons();
@@ -317,6 +318,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_initDataLoad) return;
+
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 143)
@@ -915,6 +915,31 @@
         }
         #endregion
 
+        #region ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// <summary>
+        /// ‘Î�Û”N“x�‰ŠúƒZƒbƒg
+        /// </summary>
+        private void SetInitnumUDConstPro()
+        {
+            try
+            {
+                // ŒŸ�õ”N“xƒZƒbƒg
+                // ƒf�[ƒ^‚É‚ ‚éŽ–‹ÆŠú‚ÆŒ»�Ý‚ÌŽ–‹ÆƒZƒbƒg
+                int minval = 0;
+                int maxval = 0;
+                CommonMotions.GetPeriodYear(ref minval, ref maxval);
+                numUDConstPro.Minimum = minval;
+                numUDConstPro.Maximum = maxval;
+                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// �‰ŠúŽž‚Éƒ�ƒOƒCƒ“’S“–ŽÒ‚ðƒZƒbƒg‚·‚é
@@ -952,7 +977,7 @@
                 else
                 {
                     // ‘I‘ð•”��‚ª•¡�”‚ÌŽÒ‚ÍƒZƒbƒg‚µ‚È‚¢
-                    if (cmbDepartment.Items.Count > 1) return;
+                    if (cmbDepartment.Items.Count > 2) return;
                     cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                     SetcmbPersons();
                     cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
@@ -1073,22 +1098,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // ŒŸ�õ�ðŒ�
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
 
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 if (!picDB.SelectAction(strSQL, ref workList)) return;
 
@@ -1129,6 +1166,37 @@
         }
         #endregion
 
+        #region ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// <summary>
+        /// ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // “–ŠúŠúŽñ”NŒŽ“ú‚ðŽæ“¾
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // ‰c‹ÆŠú
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegist.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegist.designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegist.designer.cs	(revision 143)
@@ -88,9 +88,6 @@
             this.label16 = new System.Windows.Forms.Label();
             this.cmbCorporateStatus = new System.Windows.Forms.ComboBox();
             this.label17 = new System.Windows.Forms.Label();
-            this.dgvJobItem = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.ItemColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ItemColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label7 = new System.Windows.Forms.Label();
             this.txtInput10 = new System.Windows.Forms.TextBox();
             this.label5 = new System.Windows.Forms.Label();
@@ -114,9 +111,6 @@
             this.btnJobItemAdd = new System.Windows.Forms.Button();
             this.btnJobItemUp = new System.Windows.Forms.Button();
             this.label29 = new System.Windows.Forms.Label();
-            this.dgvJobLink = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btnJobLinkAdd = new System.Windows.Forms.Button();
             this.btnJobLinkDelete = new System.Windows.Forms.Button();
             this.btnJobLinkUp = new System.Windows.Forms.Button();
@@ -127,6 +121,12 @@
             this.label30 = new System.Windows.Forms.Label();
             this.btnJobItemDelete = new System.Windows.Forms.Button();
             this.label19 = new System.Windows.Forms.Label();
+            this.dgvJobItem = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.ItemColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ItemColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgvJobLink = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             this.pnlApproval.SuspendLayout();
@@ -134,9 +134,9 @@
             this.panel2.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel5.SuspendLayout();
+            this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvJobItem)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvJobLink)).BeginInit();
-            this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnDataEntry
@@ -902,7 +902,7 @@
             "å�ˆå��ä¼šç¤¾",
             "å�ˆè³‡ä¼šç¤¾",
             "å�ˆå�Œä¼šç¤¾"});
-            this.cmbCorporateStatus.Location = new System.Drawing.Point(143, 44);
+            this.cmbCorporateStatus.Location = new System.Drawing.Point(143, 42);
             this.cmbCorporateStatus.Name = "cmbCorporateStatus";
             this.cmbCorporateStatus.Size = new System.Drawing.Size(704, 24);
             this.cmbCorporateStatus.TabIndex = 1;
@@ -921,67 +921,6 @@
             this.label17.Text = "æ–½å·¥å·¥ç¨®";
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dgvJobItem
-            // 
-            this.dgvJobItem.AllowUserToAddRows = false;
-            this.dgvJobItem.AllowUserToDeleteRows = false;
-            this.dgvJobItem.AllowUserToResizeColumns = false;
-            this.dgvJobItem.AllowUserToResizeRows = false;
-            this.dgvJobItem.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.dgvJobItem.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dgvJobItem.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvJobItem.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvJobItem.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvJobItem.ColumnHeadersVisible = false;
-            this.dgvJobItem.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ItemColumn01,
-            this.ItemColumn02});
-            this.tableLayoutPanel1.SetColumnSpan(this.dgvJobItem, 4);
-            this.dgvJobItem.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvJobItem.Location = new System.Drawing.Point(143, 615);
-            this.dgvJobItem.MultiSelect = false;
-            this.dgvJobItem.Name = "dgvJobItem";
-            this.dgvJobItem.RowHeadersVisible = false;
-            this.dgvJobItem.RowHeadersWidth = 20;
-            this.dgvJobItem.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.tableLayoutPanel1.SetRowSpan(this.dgvJobItem, 3);
-            this.dgvJobItem.RowTemplate.Height = 24;
-            this.dgvJobItem.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvJobItem.Size = new System.Drawing.Size(664, 102);
-            this.dgvJobItem.TabIndex = 20;
-            this.dgvJobItem.TabStop = false;
-            this.dgvJobItem.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvJobItem_CellDoubleClick);
-            // 
-            // ItemColumn01
-            // 
-            this.ItemColumn01.Frozen = true;
-            this.ItemColumn01.HeaderText = "å·¥ç¨®ã‚­ãƒ¼";
-            this.ItemColumn01.Name = "ItemColumn01";
-            this.ItemColumn01.ReadOnly = true;
-            this.ItemColumn01.Visible = false;
-            // 
-            // ItemColumn02
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
-            this.ItemColumn02.DefaultCellStyle = dataGridViewCellStyle2;
-            this.ItemColumn02.Frozen = true;
-            this.ItemColumn02.HeaderText = "å·¥ç¨®å��ç§°";
-            this.ItemColumn02.Name = "ItemColumn02";
-            this.ItemColumn02.ReadOnly = true;
-            this.ItemColumn02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ItemColumn02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.ItemColumn02.Width = 664;
-            // 
             // label7
             // 
             this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -1281,67 +1220,6 @@
             this.label29.Text = "æ–½å·¥è�·ç¨®";
             this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dgvJobLink
-            // 
-            this.dgvJobLink.AllowUserToAddRows = false;
-            this.dgvJobLink.AllowUserToDeleteRows = false;
-            this.dgvJobLink.AllowUserToResizeColumns = false;
-            this.dgvJobLink.AllowUserToResizeRows = false;
-            this.dgvJobLink.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.dgvJobLink.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dgvJobLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvJobLink.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
-            this.dgvJobLink.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvJobLink.ColumnHeadersVisible = false;
-            this.dgvJobLink.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2});
-            this.tableLayoutPanel1.SetColumnSpan(this.dgvJobLink, 4);
-            this.dgvJobLink.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvJobLink.Location = new System.Drawing.Point(143, 759);
-            this.dgvJobLink.MultiSelect = false;
-            this.dgvJobLink.Name = "dgvJobLink";
-            this.dgvJobLink.RowHeadersVisible = false;
-            this.dgvJobLink.RowHeadersWidth = 20;
-            this.dgvJobLink.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.tableLayoutPanel1.SetRowSpan(this.dgvJobLink, 3);
-            this.dgvJobLink.RowTemplate.Height = 24;
-            this.dgvJobLink.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvJobLink.Size = new System.Drawing.Size(664, 102);
-            this.dgvJobLink.TabIndex = 21;
-            this.dgvJobLink.TabStop = false;
-            this.dgvJobLink.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvJobLink_CellDoubleClick);
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.Frozen = true;
-            this.dataGridViewTextBoxColumn1.HeaderText = "å·¥ç¨®ã‚­ãƒ¼";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Visible = false;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle4;
-            this.dataGridViewTextBoxColumn2.Frozen = true;
-            this.dataGridViewTextBoxColumn2.HeaderText = "å·¥ç¨®å��ç§°";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn2.Width = 664;
-            // 
             // btnJobLinkAdd
             // 
             this.btnJobLinkAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -1487,6 +1365,128 @@
             this.label19.Text = "å�–å¼•é–‹å§‹æ—¥";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // dgvJobItem
+            // 
+            this.dgvJobItem.AllowUserToAddRows = false;
+            this.dgvJobItem.AllowUserToDeleteRows = false;
+            this.dgvJobItem.AllowUserToResizeColumns = false;
+            this.dgvJobItem.AllowUserToResizeRows = false;
+            this.dgvJobItem.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.dgvJobItem.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvJobItem.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvJobItem.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvJobItem.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvJobItem.ColumnHeadersVisible = false;
+            this.dgvJobItem.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ItemColumn01,
+            this.ItemColumn02});
+            this.tableLayoutPanel1.SetColumnSpan(this.dgvJobItem, 4);
+            this.dgvJobItem.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvJobItem.Location = new System.Drawing.Point(143, 615);
+            this.dgvJobItem.MultiSelect = false;
+            this.dgvJobItem.Name = "dgvJobItem";
+            this.dgvJobItem.RowHeadersVisible = false;
+            this.dgvJobItem.RowHeadersWidth = 20;
+            this.dgvJobItem.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.tableLayoutPanel1.SetRowSpan(this.dgvJobItem, 3);
+            this.dgvJobItem.RowTemplate.Height = 24;
+            this.dgvJobItem.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvJobItem.Size = new System.Drawing.Size(664, 102);
+            this.dgvJobItem.TabIndex = 20;
+            this.dgvJobItem.TabStop = false;
+            this.dgvJobItem.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvJobItem_CellDoubleClick);
+            // 
+            // ItemColumn01
+            // 
+            this.ItemColumn01.Frozen = true;
+            this.ItemColumn01.HeaderText = "å·¥ç¨®ã‚­ãƒ¼";
+            this.ItemColumn01.Name = "ItemColumn01";
+            this.ItemColumn01.ReadOnly = true;
+            this.ItemColumn01.Visible = false;
+            // 
+            // ItemColumn02
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            this.ItemColumn02.DefaultCellStyle = dataGridViewCellStyle2;
+            this.ItemColumn02.Frozen = true;
+            this.ItemColumn02.HeaderText = "å·¥ç¨®å��ç§°";
+            this.ItemColumn02.Name = "ItemColumn02";
+            this.ItemColumn02.ReadOnly = true;
+            this.ItemColumn02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ItemColumn02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ItemColumn02.Width = 664;
+            // 
+            // dgvJobLink
+            // 
+            this.dgvJobLink.AllowUserToAddRows = false;
+            this.dgvJobLink.AllowUserToDeleteRows = false;
+            this.dgvJobLink.AllowUserToResizeColumns = false;
+            this.dgvJobLink.AllowUserToResizeRows = false;
+            this.dgvJobLink.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.dgvJobLink.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvJobLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvJobLink.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvJobLink.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvJobLink.ColumnHeadersVisible = false;
+            this.dgvJobLink.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2});
+            this.tableLayoutPanel1.SetColumnSpan(this.dgvJobLink, 4);
+            this.dgvJobLink.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvJobLink.Location = new System.Drawing.Point(143, 759);
+            this.dgvJobLink.MultiSelect = false;
+            this.dgvJobLink.Name = "dgvJobLink";
+            this.dgvJobLink.RowHeadersVisible = false;
+            this.dgvJobLink.RowHeadersWidth = 20;
+            this.dgvJobLink.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.tableLayoutPanel1.SetRowSpan(this.dgvJobLink, 3);
+            this.dgvJobLink.RowTemplate.Height = 24;
+            this.dgvJobLink.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvJobLink.Size = new System.Drawing.Size(664, 102);
+            this.dgvJobLink.TabIndex = 21;
+            this.dgvJobLink.TabStop = false;
+            this.dgvJobLink.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvJobLink_CellDoubleClick);
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.Frozen = true;
+            this.dataGridViewTextBoxColumn1.HeaderText = "å·¥ç¨®ã‚­ãƒ¼";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dataGridViewTextBoxColumn2.Frozen = true;
+            this.dataGridViewTextBoxColumn2.HeaderText = "å·¥ç¨®å��ç§°";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn2.Width = 664;
+            // 
             // FrmSubConstrRegist
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1527,10 +1527,10 @@
             this.tableLayoutPanel1.PerformLayout();
             this.panel5.ResumeLayout(false);
             this.panel5.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvJobItem)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvJobLink)).EndInit();
-            this.panel4.ResumeLayout(false);
-            this.panel4.PerformLayout();
             this.ResumeLayout(false);
 
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistAuxiliary.cs	(revision 143)
@@ -1451,7 +1451,6 @@
                     // ä¿®æ­£æ™‚ã�¯ãƒ‡ãƒ¼ã‚¿å�–å¾—
                     m_SourceCode = m_frm.CompanyCode;
                 }
-                this.Activate();
             }
             catch (Exception ex)
             {
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistList.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistList.cs	(revision 143)
@@ -274,6 +274,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_OpeRestrict) return;
+
+            // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ƒf�[ƒ^•\Ž¦
             DataDisplay();
         }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs	(revision 143)
@@ -66,7 +66,7 @@
         {
             try
             {
-                if (cmbDepartment.Items.Count > 1) return;
+                if (cmbDepartment.Items.Count > 2) return;
                 cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                 SetcmbPersons();
                 cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
@@ -761,22 +761,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // ŒŸ�õ�ðŒ�
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     // ŽQ�Æ•”��ƒ}ƒXƒ^‚æ‚èŽæ“¾‚·‚é
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
 
+                // “–ŠúŠúŽñ“ú�EŠú––“ú‚ðŽæ“¾
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // ’S“–ŽÒƒ}ƒXƒ^“Ç�ž
                 if (!picDB.SelectAction(strSQL, ref workList)) return;
 
@@ -807,6 +819,37 @@
         }
         #endregion
 
+        #region ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// <summary>
+        /// ƒfƒtƒHƒ‹ƒg‚ÌŠúŽñ“ú�EŠú––“ú‚ð‹�‚ß‚é
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // “–ŠúŠúŽñ”NŒŽ“ú‚ðŽæ“¾
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // ‰c‹ÆŠú
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // �I—¹‚Í�{1”N�|1“ú
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
         /// <summary>
         /// ’S“–ŽÒƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒgŽž•”��‚ðƒZƒbƒg‚·‚é
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmSelectPaymentDay.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmSelectPaymentDay.Designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmSelectPaymentDay.Designer.cs	(revision 143)
@@ -58,7 +58,7 @@
             this.btnCancel.Location = new System.Drawing.Point(161, 10);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(140, 40);
-            this.btnCancel.TabIndex = 1;
+            this.btnCancel.TabIndex = 3;
             this.btnCancel.Text = "ã‚­ãƒ£ãƒ³ã‚»ãƒ«";
             this.btnCancel.UseVisualStyleBackColor = false;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -71,7 +71,7 @@
             this.panel1.Location = new System.Drawing.Point(-8, 100);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(320, 60);
-            this.panel1.TabIndex = 1;
+            this.panel1.TabIndex = 3;
             // 
             // groupBox2
             // 
@@ -80,7 +80,7 @@
             this.groupBox2.Location = new System.Drawing.Point(52, 10);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(200, 80);
-            this.groupBox2.TabIndex = 0;
+            this.groupBox2.TabIndex = 7;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "æ”¯æ‰•æ—¥";
             // 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs	(revision 143)
@@ -141,7 +141,7 @@
             try
             {
                 // é�¸æŠžéƒ¨ç½²ã�Œè¤‡æ•°ã�®è€…ã�¯ã‚»ãƒƒãƒˆã�—ã�ªã�„
-                if (cmbDepartment.Items.Count > 1) return;
+                if (cmbDepartment.Items.Count > 2) return;
 
                 cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
                 SetcombBoxPerson();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.designer.cs	(revision 143)
@@ -30,8 +30,6 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -38,6 +36,8 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
@@ -47,12 +47,6 @@
             this.btnDispDown = new System.Windows.Forms.Button();
             this.btnDispUp = new System.Windows.Forms.Button();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.cmbDataSecRank = new System.Windows.Forms.ComboBox();
-            this.dgvExpenses = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.numUDPeriod = new System.Windows.Forms.NumericUpDown();
             this.lblStaticItemCode = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -65,8 +59,10 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.lblEditMode = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
-            this.lblEditMode = new System.Windows.Forms.Label();
+            this.cmbDataSecRank = new System.Windows.Forms.ComboBox();
+            this.dgvExpenses = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.dgvWorkList = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -73,10 +69,14 @@
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tableLayoutPanel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvExpenses)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numUDPeriod)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvExpenses)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvWorkList)).BeginInit();
             this.SuspendLayout();
             // 
@@ -220,94 +220,6 @@
             this.tableLayoutPanel1.Size = new System.Drawing.Size(610, 310);
             this.tableLayoutPanel1.TabIndex = 23;
             // 
-            // cmbDataSecRank
-            // 
-            this.tableLayoutPanel1.SetColumnSpan(this.cmbDataSecRank, 2);
-            this.cmbDataSecRank.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDataSecRank.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDataSecRank.FormattingEnabled = true;
-            this.cmbDataSecRank.Location = new System.Drawing.Point(153, 108);
-            this.cmbDataSecRank.Name = "cmbDataSecRank";
-            this.cmbDataSecRank.Size = new System.Drawing.Size(340, 24);
-            this.cmbDataSecRank.TabIndex = 25;
-            // 
-            // dgvExpenses
-            // 
-            this.dgvExpenses.AllowUserToAddRows = false;
-            this.dgvExpenses.AllowUserToDeleteRows = false;
-            this.dgvExpenses.AllowUserToResizeColumns = false;
-            this.dgvExpenses.AllowUserToResizeRows = false;
-            this.dgvExpenses.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders;
-            this.dgvExpenses.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dgvExpenses.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvExpenses.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvExpenses.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvExpenses.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn2,
-            this.Column4,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn1});
-            this.tableLayoutPanel1.SetColumnSpan(this.dgvExpenses, 3);
-            this.dgvExpenses.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.dgvExpenses.Location = new System.Drawing.Point(3, 213);
-            this.dgvExpenses.Name = "dgvExpenses";
-            this.dgvExpenses.RowHeadersVisible = false;
-            this.dgvExpenses.RowHeadersWidth = 20;
-            this.dgvExpenses.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvExpenses.RowTemplate.Height = 20;
-            this.dgvExpenses.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvExpenses.Size = new System.Drawing.Size(600, 86);
-            this.dgvExpenses.TabIndex = 25;
-            this.dgvExpenses.Visible = false;
-            this.dgvExpenses.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvExpenses_CellValidated);
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.Frozen = true;
-            this.dataGridViewTextBoxColumn2.HeaderText = "çµŒè²»å��ç§°ã‚³ãƒ¼ãƒ‰";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn2.Visible = false;
-            // 
-            // Column4
-            // 
-            this.Column4.Frozen = true;
-            this.Column4.HeaderText = "";
-            this.Column4.Name = "Column4";
-            this.Column4.Width = 40;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridViewTextBoxColumn3.Frozen = true;
-            this.dataGridViewTextBoxColumn3.HeaderText = "çµŒã€€è²»ã€€å��ã€€ç§°";
-            this.dataGridViewTextBoxColumn3.MaxInputLength = 50;
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn3.Width = 440;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
-            dataGridViewCellStyle3.NullValue = null;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dataGridViewTextBoxColumn1.Frozen = true;
-            this.dataGridViewTextBoxColumn1.HeaderText = "çµŒè²»çŽ‡(%)";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
             // numUDPeriod
             // 
             this.numUDPeriod.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -404,7 +316,7 @@
             this.cmbPublicFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPublicFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbPublicFlg.FormattingEnabled = true;
-            this.cmbPublicFlg.Location = new System.Drawing.Point(153, 77);
+            this.cmbPublicFlg.Location = new System.Drawing.Point(153, 75);
             this.cmbPublicFlg.Name = "cmbPublicFlg";
             this.cmbPublicFlg.Size = new System.Drawing.Size(340, 24);
             this.cmbPublicFlg.TabIndex = 2;
@@ -462,6 +374,18 @@
             this.radioButton1.UseVisualStyleBackColor = true;
             this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
             // 
+            // lblEditMode
+            // 
+            this.lblEditMode.BackColor = System.Drawing.Color.White;
+            this.lblEditMode.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEditMode.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblEditMode.ForeColor = System.Drawing.Color.Black;
+            this.lblEditMode.Location = new System.Drawing.Point(600, 40);
+            this.lblEditMode.Name = "lblEditMode";
+            this.lblEditMode.Size = new System.Drawing.Size(117, 32);
+            this.lblEditMode.TabIndex = 24;
+            this.lblEditMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // label6
             // 
             this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -475,18 +399,54 @@
             this.label6.Text = "é�¸æŠžè¨±å�¯åŒºåˆ†";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // lblEditMode
+            // cmbDataSecRank
             // 
-            this.lblEditMode.BackColor = System.Drawing.Color.White;
-            this.lblEditMode.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblEditMode.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblEditMode.ForeColor = System.Drawing.Color.Black;
-            this.lblEditMode.Location = new System.Drawing.Point(600, 40);
-            this.lblEditMode.Name = "lblEditMode";
-            this.lblEditMode.Size = new System.Drawing.Size(117, 32);
-            this.lblEditMode.TabIndex = 24;
-            this.lblEditMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.tableLayoutPanel1.SetColumnSpan(this.cmbDataSecRank, 2);
+            this.cmbDataSecRank.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDataSecRank.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDataSecRank.FormattingEnabled = true;
+            this.cmbDataSecRank.Location = new System.Drawing.Point(153, 108);
+            this.cmbDataSecRank.Name = "cmbDataSecRank";
+            this.cmbDataSecRank.Size = new System.Drawing.Size(340, 24);
+            this.cmbDataSecRank.TabIndex = 25;
             // 
+            // dgvExpenses
+            // 
+            this.dgvExpenses.AllowUserToAddRows = false;
+            this.dgvExpenses.AllowUserToDeleteRows = false;
+            this.dgvExpenses.AllowUserToResizeColumns = false;
+            this.dgvExpenses.AllowUserToResizeRows = false;
+            this.dgvExpenses.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders;
+            this.dgvExpenses.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvExpenses.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvExpenses.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvExpenses.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvExpenses.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn2,
+            this.Column4,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn1});
+            this.tableLayoutPanel1.SetColumnSpan(this.dgvExpenses, 3);
+            this.dgvExpenses.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.dgvExpenses.Location = new System.Drawing.Point(3, 213);
+            this.dgvExpenses.Name = "dgvExpenses";
+            this.dgvExpenses.RowHeadersVisible = false;
+            this.dgvExpenses.RowHeadersWidth = 20;
+            this.dgvExpenses.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvExpenses.RowTemplate.Height = 20;
+            this.dgvExpenses.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dgvExpenses.Size = new System.Drawing.Size(600, 86);
+            this.dgvExpenses.TabIndex = 25;
+            this.dgvExpenses.Visible = false;
+            this.dgvExpenses.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvExpenses_CellValidated);
+            // 
             // dgvWorkList
             // 
             this.dgvWorkList.AllowUserToAddRows = false;
@@ -581,6 +541,46 @@
             this.Column5.ReadOnly = true;
             this.Column5.Width = 60;
             // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.Frozen = true;
+            this.dataGridViewTextBoxColumn2.HeaderText = "çµŒè²»å��ç§°ã‚³ãƒ¼ãƒ‰";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn2.Visible = false;
+            // 
+            // Column4
+            // 
+            this.Column4.Frozen = true;
+            this.Column4.HeaderText = "";
+            this.Column4.Name = "Column4";
+            this.Column4.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dataGridViewTextBoxColumn3.Frozen = true;
+            this.dataGridViewTextBoxColumn3.HeaderText = "çµŒã€€è²»ã€€å��ã€€ç§°";
+            this.dataGridViewTextBoxColumn3.MaxInputLength = 50;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 440;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle3.NullValue = null;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dataGridViewTextBoxColumn1.Frozen = true;
+            this.dataGridViewTextBoxColumn1.HeaderText = "çµŒè²»çŽ‡(%)";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // FrmConstructionType
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -612,10 +612,10 @@
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmConstructionType_KeyDown);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvExpenses)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numUDPeriod)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvExpenses)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvWorkList)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs	(revision 143)
@@ -30,16 +30,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
@@ -58,8 +58,13 @@
             this.label8 = new System.Windows.Forms.Label();
             this.txtInput2 = new System.Windows.Forms.TextBox();
             this.label9 = new System.Windows.Forms.Label();
+            this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
             this.txtInput4 = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
+            this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SalaryColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label7 = new System.Windows.Forms.Label();
             this.txtInput6 = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
@@ -74,13 +79,20 @@
             this.label13 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.label16 = new System.Windows.Forms.Label();
+            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.txtInput5 = new System.Windows.Forms.TextBox();
             this.txtInput8 = new System.Windows.Forms.TextBox();
             this.txtInput9 = new System.Windows.Forms.TextBox();
+            this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label17 = new System.Windows.Forms.Label();
+            this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.label18 = new System.Windows.Forms.Label();
             this.lblSecRank = new System.Windows.Forms.Label();
             this.lblSecRange = new System.Windows.Forms.Label();
+            this.dgvRefDepartment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
             this.btnRefDepAdd = new System.Windows.Forms.Button();
             this.btnRefDepDel = new System.Windows.Forms.Button();
             this.label4 = new System.Windows.Forms.Label();
@@ -93,21 +105,9 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.label19 = new System.Windows.Forms.Label();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.label20 = new System.Windows.Forms.Label();
             this.btnChrgToEmp = new System.Windows.Forms.Button();
             this.btnEmpToChrg = new System.Windows.Forms.Button();
-            this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
-            this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SalaryColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.dgvRefDepartment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
+            this.label20 = new System.Windows.Forms.Label();
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -118,10 +118,10 @@
             this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).BeginInit();
             this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.SuspendLayout();
             // 
@@ -416,6 +416,18 @@
             this.label9.Text = "çµ‚äº†å¹´æœˆæ—¥";
             this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // txtInput3
+            // 
+            this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtInput3.Location = new System.Drawing.Point(148, 111);
+            this.txtInput3.MaxLength = 11;
+            this.txtInput3.Name = "txtInput3";
+            this.txtInput3.Size = new System.Drawing.Size(139, 23);
+            this.txtInput3.TabIndex = 3;
+            this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
+            this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated);
+            // 
             // txtInput4
             // 
             this.txtInput4.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -440,6 +452,78 @@
             this.label2.Text = "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // dgvSalary
+            // 
+            this.dgvSalary.AllowUserToAddRows = false;
+            this.dgvSalary.AllowUserToDeleteRows = false;
+            this.dgvSalary.AllowUserToResizeColumns = false;
+            this.dgvSalary.AllowUserToResizeRows = false;
+            this.dgvSalary.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.dgvSalary.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvSalary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSalary.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            this.dgvSalary.ColumnHeadersHeight = 24;
+            this.dgvSalary.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvSalary.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.SalaryColumn1,
+            this.SalaryColumn2,
+            this.SalaryColumn3});
+            this.tableLayoutPanel1.SetColumnSpan(this.dgvSalary, 4);
+            this.dgvSalary.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvSalary.Location = new System.Drawing.Point(3, 248);
+            this.dgvSalary.MultiSelect = false;
+            this.dgvSalary.Name = "dgvSalary";
+            this.dgvSalary.RowHeadersVisible = false;
+            this.dgvSalary.RowHeadersWidth = 18;
+            this.dgvSalary.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.tableLayoutPanel1.SetRowSpan(this.dgvSalary, 3);
+            this.dgvSalary.RowTemplate.Height = 20;
+            this.dgvSalary.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvSalary.Size = new System.Drawing.Size(570, 106);
+            this.dgvSalary.TabIndex = 21;
+            this.dgvSalary.TabStop = false;
+            // 
+            // SalaryColumn1
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.SalaryColumn1.DefaultCellStyle = dataGridViewCellStyle12;
+            this.SalaryColumn1.Frozen = true;
+            this.SalaryColumn1.HeaderText = "çµ¦ä¸Žé–‹å§‹å¹´æœˆæ—¥";
+            this.SalaryColumn1.Name = "SalaryColumn1";
+            this.SalaryColumn1.ReadOnly = true;
+            this.SalaryColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.SalaryColumn1.Width = 190;
+            // 
+            // SalaryColumn2
+            // 
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.SalaryColumn2.DefaultCellStyle = dataGridViewCellStyle13;
+            this.SalaryColumn2.Frozen = true;
+            this.SalaryColumn2.HeaderText = "æœˆçµ¦ä¸Žé¡�";
+            this.SalaryColumn2.Name = "SalaryColumn2";
+            this.SalaryColumn2.ReadOnly = true;
+            this.SalaryColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.SalaryColumn2.Width = 180;
+            // 
+            // SalaryColumn3
+            // 
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.SalaryColumn3.DefaultCellStyle = dataGridViewCellStyle14;
+            this.SalaryColumn3.Frozen = true;
+            this.SalaryColumn3.HeaderText = "å¹´çµ¦ä¸Žé¡�";
+            this.SalaryColumn3.Name = "SalaryColumn3";
+            this.SalaryColumn3.ReadOnly = true;
+            this.SalaryColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.SalaryColumn3.Width = 180;
+            // 
             // label7
             // 
             this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -628,6 +712,19 @@
             this.label16.Text = "å�°å¸³è¨ˆç®—å¯¾è±¡";
             this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // cmbDepartment
+            // 
+            this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 2);
+            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbDepartment.FormattingEnabled = true;
+            this.cmbDepartment.Location = new System.Drawing.Point(148, 364);
+            this.cmbDepartment.Name = "cmbDepartment";
+            this.cmbDepartment.Size = new System.Drawing.Size(284, 24);
+            this.cmbDepartment.TabIndex = 9;
+            this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange);
+            // 
             // txtInput5
             // 
             this.txtInput5.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -663,6 +760,18 @@
             this.txtInput9.TabIndex = 12;
             this.txtInput9.TextChanged += new System.EventHandler(this.valueChange);
             // 
+            // cmbLedgerFlg
+            // 
+            this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbLedgerFlg.FormattingEnabled = true;
+            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 504);
+            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
+            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
+            this.cmbLedgerFlg.TabIndex = 13;
+            this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange);
+            // 
             // label17
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -676,6 +785,20 @@
             this.label17.Text = "æ©Ÿå¯†åŒºåˆ†";
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // cmbSecManage
+            // 
+            this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2);
+            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbSecManage.FormattingEnabled = true;
+            this.cmbSecManage.Location = new System.Drawing.Point(148, 539);
+            this.cmbSecManage.Name = "cmbSecManage";
+            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
+            this.cmbSecManage.TabIndex = 8;
+            this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged);
+            this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange);
+            // 
             // label18
             // 
             this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -712,6 +835,77 @@
             this.lblSecRange.TabIndex = 34;
             this.lblSecRange.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // dgvRefDepartment
+            // 
+            this.dgvRefDepartment.AllowUserToAddRows = false;
+            this.dgvRefDepartment.AllowUserToDeleteRows = false;
+            this.dgvRefDepartment.AllowUserToResizeColumns = false;
+            this.dgvRefDepartment.AllowUserToResizeRows = false;
+            this.dgvRefDepartment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvRefDepartment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvRefDepartment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+            this.dgvRefDepartment.ColumnHeadersHeight = 24;
+            this.dgvRefDepartment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvRefDepartment.ColumnHeadersVisible = false;
+            this.dgvRefDepartment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column8,
+            this.TextBoxColumn1});
+            this.tableLayoutPanel1.SetColumnSpan(this.dgvRefDepartment, 4);
+            this.dgvRefDepartment.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dgvRefDepartment.Location = new System.Drawing.Point(3, 675);
+            this.dgvRefDepartment.MultiSelect = false;
+            this.dgvRefDepartment.Name = "dgvRefDepartment";
+            this.dgvRefDepartment.RowHeadersWidth = 18;
+            this.dgvRefDepartment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.tableLayoutPanel1.SetRowSpan(this.dgvRefDepartment, 3);
+            this.dgvRefDepartment.RowTemplate.Height = 20;
+            this.dgvRefDepartment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvRefDepartment.Size = new System.Drawing.Size(570, 104);
+            this.dgvRefDepartment.TabIndex = 21;
+            this.dgvRefDepartment.TabStop = false;
+            // 
+            // Column8
+            // 
+            this.Column8.Frozen = true;
+            this.Column8.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.Visible = false;
+            // 
+            // TextBoxColumn1
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.TextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle16;
+            this.TextBoxColumn1.Frozen = true;
+            this.TextBoxColumn1.HeaderText = "å�‚ã€€ç…§ã€€éƒ¨ã€€ç½²ã€€å��ã€€ç§°";
+            this.TextBoxColumn1.Name = "TextBoxColumn1";
+            this.TextBoxColumn1.ReadOnly = true;
+            this.TextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.TextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.TextBoxColumn1.Width = 530;
+            // 
+            // cmbRefDepartment
+            // 
+            this.cmbRefDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.tableLayoutPanel1.SetColumnSpan(this.cmbRefDepartment, 2);
+            this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.cmbRefDepartment.FormattingEnabled = true;
+            this.cmbRefDepartment.Location = new System.Drawing.Point(3, 789);
+            this.cmbRefDepartment.Name = "cmbRefDepartment";
+            this.cmbRefDepartment.Size = new System.Drawing.Size(284, 24);
+            this.cmbRefDepartment.TabIndex = 15;
+            this.cmbRefDepartment.TextChanged += new System.EventHandler(this.valueChange);
+            // 
             // btnRefDepAdd
             // 
             this.btnRefDepAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -871,18 +1065,6 @@
             this.panel3.Size = new System.Drawing.Size(470, 30);
             this.panel3.TabIndex = 24;
             // 
-            // label20
-            // 
-            this.label20.BackColor = System.Drawing.Color.Transparent;
-            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(4, 5);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(120, 20);
-            this.label20.TabIndex = 24;
-            this.label20.Text = "ãƒ‡ãƒ¼ã‚¿å¤‰æ›´";
-            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // btnChrgToEmp
             // 
             this.btnChrgToEmp.BackColor = System.Drawing.Color.LimeGreen;
@@ -909,200 +1091,18 @@
             this.btnEmpToChrg.UseVisualStyleBackColor = false;
             this.btnEmpToChrg.Click += new System.EventHandler(this.btnEmpToChrg_Click);
             // 
-            // txtInput3
+            // label20
             // 
-            this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtInput3.Location = new System.Drawing.Point(148, 111);
-            this.txtInput3.MaxLength = 11;
-            this.txtInput3.Name = "txtInput3";
-            this.txtInput3.Size = new System.Drawing.Size(139, 23);
-            this.txtInput3.TabIndex = 3;
-            this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
-            this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated);
+            this.label20.BackColor = System.Drawing.Color.Transparent;
+            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label20.ForeColor = System.Drawing.Color.Black;
+            this.label20.Location = new System.Drawing.Point(4, 5);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(120, 20);
+            this.label20.TabIndex = 24;
+            this.label20.Text = "ãƒ‡ãƒ¼ã‚¿å¤‰æ›´";
+            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // dgvSalary
-            // 
-            this.dgvSalary.AllowUserToAddRows = false;
-            this.dgvSalary.AllowUserToDeleteRows = false;
-            this.dgvSalary.AllowUserToResizeColumns = false;
-            this.dgvSalary.AllowUserToResizeRows = false;
-            this.dgvSalary.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.dgvSalary.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dgvSalary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSalary.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvSalary.ColumnHeadersHeight = 24;
-            this.dgvSalary.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvSalary.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.SalaryColumn1,
-            this.SalaryColumn2,
-            this.SalaryColumn3});
-            this.tableLayoutPanel1.SetColumnSpan(this.dgvSalary, 4);
-            this.dgvSalary.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvSalary.Location = new System.Drawing.Point(3, 248);
-            this.dgvSalary.MultiSelect = false;
-            this.dgvSalary.Name = "dgvSalary";
-            this.dgvSalary.RowHeadersVisible = false;
-            this.dgvSalary.RowHeadersWidth = 18;
-            this.dgvSalary.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.tableLayoutPanel1.SetRowSpan(this.dgvSalary, 3);
-            this.dgvSalary.RowTemplate.Height = 20;
-            this.dgvSalary.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvSalary.Size = new System.Drawing.Size(570, 106);
-            this.dgvSalary.TabIndex = 21;
-            this.dgvSalary.TabStop = false;
-            // 
-            // SalaryColumn1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.SalaryColumn1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.SalaryColumn1.Frozen = true;
-            this.SalaryColumn1.HeaderText = "çµ¦ä¸Žé–‹å§‹å¹´æœˆæ—¥";
-            this.SalaryColumn1.Name = "SalaryColumn1";
-            this.SalaryColumn1.ReadOnly = true;
-            this.SalaryColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.SalaryColumn1.Width = 190;
-            // 
-            // SalaryColumn2
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.SalaryColumn2.DefaultCellStyle = dataGridViewCellStyle3;
-            this.SalaryColumn2.Frozen = true;
-            this.SalaryColumn2.HeaderText = "æœˆçµ¦ä¸Žé¡�";
-            this.SalaryColumn2.Name = "SalaryColumn2";
-            this.SalaryColumn2.ReadOnly = true;
-            this.SalaryColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.SalaryColumn2.Width = 180;
-            // 
-            // SalaryColumn3
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.SalaryColumn3.DefaultCellStyle = dataGridViewCellStyle4;
-            this.SalaryColumn3.Frozen = true;
-            this.SalaryColumn3.HeaderText = "å¹´çµ¦ä¸Žé¡�";
-            this.SalaryColumn3.Name = "SalaryColumn3";
-            this.SalaryColumn3.ReadOnly = true;
-            this.SalaryColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.SalaryColumn3.Width = 180;
-            // 
-            // cmbDepartment
-            // 
-            this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 2);
-            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbDepartment.FormattingEnabled = true;
-            this.cmbDepartment.Location = new System.Drawing.Point(148, 362);
-            this.cmbDepartment.Name = "cmbDepartment";
-            this.cmbDepartment.Size = new System.Drawing.Size(284, 24);
-            this.cmbDepartment.TabIndex = 9;
-            this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbLedgerFlg
-            // 
-            this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbLedgerFlg.FormattingEnabled = true;
-            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 502);
-            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
-            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
-            this.cmbLedgerFlg.TabIndex = 13;
-            this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // cmbSecManage
-            // 
-            this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2);
-            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbSecManage.FormattingEnabled = true;
-            this.cmbSecManage.Location = new System.Drawing.Point(148, 537);
-            this.cmbSecManage.Name = "cmbSecManage";
-            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
-            this.cmbSecManage.TabIndex = 8;
-            this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged);
-            this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // dgvRefDepartment
-            // 
-            this.dgvRefDepartment.AllowUserToAddRows = false;
-            this.dgvRefDepartment.AllowUserToDeleteRows = false;
-            this.dgvRefDepartment.AllowUserToResizeColumns = false;
-            this.dgvRefDepartment.AllowUserToResizeRows = false;
-            this.dgvRefDepartment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dgvRefDepartment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRefDepartment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
-            this.dgvRefDepartment.ColumnHeadersHeight = 24;
-            this.dgvRefDepartment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvRefDepartment.ColumnHeadersVisible = false;
-            this.dgvRefDepartment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column8,
-            this.TextBoxColumn1});
-            this.tableLayoutPanel1.SetColumnSpan(this.dgvRefDepartment, 4);
-            this.dgvRefDepartment.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvRefDepartment.Location = new System.Drawing.Point(3, 675);
-            this.dgvRefDepartment.MultiSelect = false;
-            this.dgvRefDepartment.Name = "dgvRefDepartment";
-            this.dgvRefDepartment.RowHeadersWidth = 18;
-            this.dgvRefDepartment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.tableLayoutPanel1.SetRowSpan(this.dgvRefDepartment, 3);
-            this.dgvRefDepartment.RowTemplate.Height = 20;
-            this.dgvRefDepartment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvRefDepartment.Size = new System.Drawing.Size(570, 104);
-            this.dgvRefDepartment.TabIndex = 21;
-            this.dgvRefDepartment.TabStop = false;
-            // 
-            // Column8
-            // 
-            this.Column8.Frozen = true;
-            this.Column8.HeaderText = "éƒ¨ç½²ã‚³ãƒ¼ãƒ‰";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.Visible = false;
-            // 
-            // TextBoxColumn1
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.TextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6;
-            this.TextBoxColumn1.Frozen = true;
-            this.TextBoxColumn1.HeaderText = "å�‚ã€€ç…§ã€€éƒ¨ã€€ç½²ã€€å��ã€€ç§°";
-            this.TextBoxColumn1.Name = "TextBoxColumn1";
-            this.TextBoxColumn1.ReadOnly = true;
-            this.TextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.TextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.TextBoxColumn1.Width = 530;
-            // 
-            // cmbRefDepartment
-            // 
-            this.cmbRefDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.tableLayoutPanel1.SetColumnSpan(this.cmbRefDepartment, 2);
-            this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbRefDepartment.FormattingEnabled = true;
-            this.cmbRefDepartment.Location = new System.Drawing.Point(3, 787);
-            this.cmbRefDepartment.Name = "cmbRefDepartment";
-            this.cmbRefDepartment.Size = new System.Drawing.Size(284, 24);
-            this.cmbRefDepartment.TabIndex = 15;
-            this.cmbRefDepartment.TextChanged += new System.EventHandler(this.valueChange);
-            // 
             // dgvMaster
             // 
             this.dgvMaster.AllowUserToAddRows = false;
@@ -1111,14 +1111,14 @@
             this.dgvMaster.AllowUserToResizeRows = false;
             this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvMaster.ColumnHeadersHeight = 24;
             this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1143,9 +1143,9 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle18;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "â„–";
             this.Column1.Name = "Column1";
@@ -1155,8 +1155,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle19;
             this.Column2.Frozen = true;
             this.Column2.HeaderText = "æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰";
             this.Column2.Name = "Column2";
@@ -1166,9 +1166,9 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle20;
             this.Column3.HeaderText = "æ‹…ã€€å½“ã€€è€…ã€€å��";
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
@@ -1236,11 +1236,11 @@
             this.panel1.ResumeLayout(false);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).EndInit();
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.panel3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
             this.ResumeLayout(false);
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs	(revision 143)
@@ -526,9 +526,54 @@
                     }
                     strSQL.Append(" ) UNI ORDER BY UNI.CONSTRUCTIONPERIODSTART DESC");
                 }
-                ///                else if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.OrderJoin) Del BIT 2017/02/22
-                else                                // Add BIT 2017/02/22
-	            {
+                /////                else if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.OrderJoin) Del BIT 2017/02/22
+                //else                                // Add BIT 2017/02/22
+                //{             // â€»â€»â€»â€»â€»ã�ªã�œæ¤œç´¢æ�¡ä»¶ã�Œé�•ã�†ï¼³ï¼±ï¼¬ã‚’ä¸€ã�¤ã�«ã�—ã�Ÿã�®ã�‹ï¼Ÿ 2017/05/13
+                //    // å¯¾è±¡å…¨ã�¦ã�®æ¡ˆä»¶ã‚’æ¤œç´¢ã�™ã‚‹
+                //    strSQL.Append("SELECT DISTINCT A.CONSTRUCTIONCODE, B.DETAILSTRING, A.OrderersDivision, A.OrderersCode");
+                //    strSQL.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PERSONINCHARGEMASTER C");
+                //    strSQL.AppendFormat(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+                //    strSQL.AppendFormat(" AND A.JOINFLG = {0} ", (int)CommonDefine.BaseInfoJoinFlg.JoinParent);
+                //    switch (m_PersonCharge)
+                //    {
+                //        case (int)PersonChargePoint.Sales:
+                //            /// å–¶æ¥­æ‹…å½“æ¤œç´¢
+                //            strSQL.AppendFormat(" AND A.SALESPERSONCODE = {0}", m_PersonCode);
+                //            break;
+                //        case (int)PersonChargePoint.Construction:
+                //            /// å·¥äº‹æ‹…å½“è€…
+                //            strSQL.AppendFormat(" AND (A.CONSTRUCTIONPERSONCODE = {0} OR A.CONSTRSUBPERSONCODE = {0} OR A.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
+                //            break;
+                //    }
+                //    strSQL.Append(" AND (C.PERSONCODE = A.SALESPERSONCODE");
+                //    strSQL.Append(" OR C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
+                //    strSQL.Append(" OR C.PERSONCODE = A.CONSTRSUBPERSONCODE");
+                //    strSQL.Append(" OR C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)");
+                //    strSQL.Append(" ORDER BY B.DETAILSTRING ASC, A.CONSTRUCTIONCODE DESC");
+                //}
+                else if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.TAndPCosts)
+                {   // ----- è³¼å…¥å“�é�¸æŠžã�®å ´å�ˆ
+                    // é€²è¡Œä¸­æ¡ˆä»¶ã‚’æ¤œç´¢ã�™ã‚‹
+                    strSQL.Append("SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING");
+                    strSQL.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONLEDGER C");
+                    strSQL.AppendFormat(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+                    strSQL.Append(" AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE AND C.COMPLATEFLG = 0");
+
+                    switch (m_PersonCharge)
+                    {
+                        case (int)PersonChargePoint.Sales:
+                            /// å–¶æ¥­æ‹…å½“æ¤œç´¢
+                            strSQL.AppendFormat(" AND A.SalesPersonCode = {0}", m_PersonCode);
+                            break;
+                        case (int)PersonChargePoint.Construction:
+                            /// å·¥äº‹æ‹…å½“è€…
+                            strSQL.AppendFormat(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
+                            break;
+                    }
+                    strSQL.Append(" ORDER BY A.ConstructionPeriodStart DESC");
+                }
+                else if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.OrderJoin)
+                {   // ----- å·¥äº‹çµ�å�ˆã�®å ´å�ˆ
                     // å¯¾è±¡å…¨ã�¦ã�®æ¡ˆä»¶ã‚’æ¤œç´¢ã�™ã‚‹
                     strSQL.Append("SELECT DISTINCT A.CONSTRUCTIONCODE, B.DETAILSTRING, A.OrderersDivision, A.OrderersCode");
                     strSQL.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PERSONINCHARGEMASTER C");
@@ -538,17 +583,17 @@
                     {
                         case (int)PersonChargePoint.Sales:
                             /// å–¶æ¥­æ‹…å½“æ¤œç´¢
-                            strSQL.AppendFormat(" AND A.SALESPERSONCODE = {0}", m_PersonCode);
+                            strSQL.AppendFormat(" AND A.SalesPersonCode = {0}", m_PersonCode);
                             break;
                         case (int)PersonChargePoint.Construction:
                             /// å·¥äº‹æ‹…å½“è€…
-                            strSQL.AppendFormat(" AND (A.CONSTRUCTIONPERSONCODE = {0} OR A.CONSTRSUBPERSONCODE = {0} OR A.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
+                            strSQL.AppendFormat(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
                             break;
                     }
                     strSQL.Append(" AND (C.PERSONCODE = A.SALESPERSONCODE");
-                    strSQL.Append(" OR C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
-                    strSQL.Append(" OR C.PERSONCODE = A.CONSTRSUBPERSONCODE");
-                    strSQL.Append(" OR C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)");
+                    strSQL.Append(" Or C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
+                    strSQL.Append(" Or C.PERSONCODE = A.CONSTRSUBPERSONCODE");
+                    strSQL.Append(" Or C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)");
                     strSQL.Append(" ORDER BY B.DETAILSTRING ASC, A.CONSTRUCTIONCODE DESC");
                 }
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPriceOfBudget.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPriceOfBudget.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPriceOfBudget.cs	(revision 143)
@@ -159,6 +159,15 @@
         private void numUDConstPro_ValueChanged(object sender, EventArgs e)
         {
             if (m_initDataLoad) return;
+
+            // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆ
+            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
+            SetcmbDepartment();
+            SetcmbPersons();
+            cmbDepartment.SelectedValue = DepCode;
+            cmbConstructionPerson.SelectedValue = PerCode;
+
             // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
             DispData();
         }
@@ -813,22 +822,34 @@
                 cmbConstructionPerson.Items.Clear();
                 cmbConstructionPerson.Text = "";
 
+                int DepartmentCode = GetDepartmentCode();
                 string strSQL = string.Empty;
-                int DepartmentCode = GetDepartmentCode();
+                // æ¤œç´¢æ�¡ä»¶
+                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
+                strSQL += " AND (DEPARTMENTCODE";
+                string strSubSQL = string.Empty;
                 if (DepartmentCode == 0)
                 {
-                    strSQL = " WHERE DeleteFlg = 0";
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                     // å�‚ç…§éƒ¨ç½²ãƒžã‚¹ã‚¿ã‚ˆã‚Šå�–å¾—ã�™ã‚‹
-                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
-                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
-                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
+                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
+                                            , CommonMotions.LoginUserData.PersonCode);
                 }
                 else
                 {
-                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
+                    strSubSQL += string.Format(" = {0}", DepartmentCode);
                 }
+                strSQL += strSubSQL + ")";
 
+                // å½“æœŸæœŸé¦–æ—¥ãƒ»æœŸæœ«æ—¥ã‚’å�–å¾—
+                DateTime dtDefaultStart = DateTime.MinValue;
+                DateTime dtDefaultEnd = DateTime.MinValue;
+                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
+
+                strSQL += string.Format(" AND (DATE(STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
+                strSQL += string.Format(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(ENDDATE)", dtDefaultStart.ToShortDateString());
+                strSQL += string.Format(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(ENDDATE)))", DateTime.MinValue.ToShortDateString());
+
+                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
                 // æ‹…å½“è€…ãƒžã‚¹ã‚¿èª­è¾¼
                 if (!picDB.SelectAction(strSQL, ref workList)) return false;
 
@@ -860,6 +881,37 @@
         }
         #endregion
 
+        #region ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�®æœŸé¦–æ—¥ãƒ»æœŸæœ«æ—¥ã‚’æ±‚ã‚�ã‚‹
+        /// <summary>
+        /// ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�®æœŸé¦–æ—¥ãƒ»æœŸæœ«æ—¥ã‚’æ±‚ã‚�ã‚‹
+        /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
+        {
+            try
+            {
+                // å½“æœŸæœŸé¦–å¹´æœˆæ—¥ã‚’å�–å¾—
+                int iYear = 0;
+                int month = 0;
+                int day = 0;
+                bool bPeriod = true;
+                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
+                {   // å–¶æ¥­æœŸ
+                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
+                    bPeriod = true;
+                }
+                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
+                dtStart = new DateTime(iYear, month, day);
+                dtEnd = dtStart.AddYears(1).AddDays(-1);     // çµ‚äº†ã�¯ï¼‹1å¹´ï¼�1æ—¥
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region éƒ¨ç½²ã‚³ãƒ³ãƒœã‚ˆã‚Šæ‹…å½“è€…ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
         /// <summary>
         /// éƒ¨ç½²ã‚³ãƒ³ãƒœã‚ˆã‚Šæ‹…å½“è€…ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—ã�™ã‚‹
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.designer.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.designer.cs	(revision 143)
@@ -73,15 +73,16 @@
             // 
             // lblTitle
             // 
+            this.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.lblTitle.AutoSize = true;
             this.lblTitle.BackColor = System.Drawing.Color.Black;
             this.lblTitle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblTitle.Font = new System.Drawing.Font("ARä¸¸ã‚´ã‚·ãƒƒã‚¯ä½“E", 14.25F);
+            this.lblTitle.Font = new System.Drawing.Font("ARä¸¸ã‚´ã‚·ãƒƒã‚¯ä½“E", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.lblTitle.ForeColor = System.Drawing.Color.White;
-            this.lblTitle.Location = new System.Drawing.Point(195, 6);
+            this.lblTitle.Location = new System.Drawing.Point(233, 6);
             this.lblTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblTitle.Name = "lblTitle";
-            this.lblTitle.Size = new System.Drawing.Size(391, 21);
+            this.lblTitle.Size = new System.Drawing.Size(314, 18);
             this.lblTitle.TabIndex = 7;
             this.lblTitle.Text = "ç�¾ã€€å ´ã€€ç›£ã€€ç�£ã€€ç§˜ã€€æ›¸ã€€ãƒ­ã€€ã‚°ã€€ã‚¤ã€€ãƒ³";
             this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 142)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 143)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.29")]
-[assembly: AssemblyFileVersion("1.0.0.29")]
+[assembly: AssemblyVersion("1.0.0.30")]
+[assembly: AssemblyFileVersion("1.0.0.30")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
