Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs	(revision 48)
@@ -1565,7 +1565,7 @@
 
         #region å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ï¼šæ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
         /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ï¼šæ³¨æ–‡æ›¸ç™ºè¡Œãƒ•ãƒ©ã‚°
+        /// å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ï¼šæ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ãƒ•ãƒ©ã‚°
         /// </summary>
         public enum PurchaseOrderFlg
         {
@@ -1574,13 +1574,13 @@
             /// </summary>
             NoCreate = 0,
             /// <summary>
-            /// ä½œæˆ�ä¸­
+            /// ä½œæˆ�æ¸ˆ
             /// </summary>
             Making = 1,
             /// <summary>
             /// ä½œæˆ�ã�—ã�ªã�„
             /// </summary>
-            NoMakeData = 9,
+            NotMakingData = 9,
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 48)
@@ -14,11 +14,11 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 2;
+        public static int s_SystemVersion = 1;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_UpDateCopyVersion = 2;
+        public static int s_UpDateCopyVersion = 1;
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsCreateLedgerData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsCreateLedgerData.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsCreateLedgerData.cs	(nonexistent)
@@ -1,455 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Collections;
-using System.Diagnostics;
-
-using log4net;
-using log4net.Appender;
-using log4net.Repository.Hierarchy;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.Forms.Master;
-using ProcessManagement.Forms.DataEntry;
-using ProcessManagement.Forms.ControlsAction;
-using ProcessManagement.Forms.SubForms;
-
-//*----------------------- å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿å¼•è¾¼ã‚¯ãƒ©ã‚¹ -----------------------*
-//  2016/05/31  Ver1.0.0.0      Create Source           
-//
-//
-//
-//*----------------------------------------------------------------------------*
-namespace ProcessManagement.Common
-{
-    //*--------------------- çµŒè²»ãƒ‡ãƒ¼ã‚¿ã‚’å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿å¼•è¾¼ã‚€ -----------------*
-    //  2015/08/12  Ver1.0.0.0      Create Source           
-    //
-    //
-    //
-    //*----------------------------------------------------------------------------*
-    /// <summary>
-    /// çµŒè²»ãƒ‡ãƒ¼ã‚¿ã‚’å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿å¼•è¾¼ã‚€
-    /// </summary>
-    public static class ClsCreateLedgerData
-    {
-        #region ãƒ­ã‚°å®šç¾©
-        /// <summary>
-        /// log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
-        /// </summary>
-        private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region å®šæ•°
-
-        #endregion
-
-        #region å¤‰æ•°
-        /// <summary>
-        /// å·¥äº‹æ–½å·¥å�°å¸³æ”¯æ‰•ã�„å®Ÿç¸¾å…ˆé ­ã‚«ãƒ©ãƒ æ•°
-        /// </summary>
-        private static int m_LedgerColumnCount = 0;
-        #endregion
-
-        #region å¯¾è±¡æœˆã�®å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
-        /// <summary>
-        /// å¯¾è±¡æœˆã�®å·¥äº‹è©³ç´°å�°å¸³å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚’ä½œæˆ�ã�™ã‚‹
-        /// </summary>
-        /// <param name="PersonCode">æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰</param>
-        /// <param name="TargetMonth">å¯¾è±¡å¹´æœˆ</param>
-        /// <returns></returns>
-        public static bool MakeLedgerData(int PersonCode, string TargetMonth)
-        {
-            IOCostDataOfPerson CostDB = new IOCostDataOfPerson();
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            IOConstructionLedgerDetail LedgerDetailDB = new IOConstructionLedgerDetail();
-            IOConstructionLedgerExcute LedgerExcuteDB = new IOConstructionLedgerExcute();
-            try
-            {
-                // ä¸€æ‹¬å‡¦ç�†ã�§ç™»éŒ²ã‚’è¡Œã�†
-                CostDB.connect();
-                LedgerDB.connect();
-                LedgerDetailDB.connect();
-                LedgerExcuteDB.connect(); LedgerExcuteDB.beginTran();
-
-                // è©³ç´°å�°å¸³ã‚ˆã‚Šã‚°ãƒªãƒƒãƒ‰ã�®ã‚«ãƒ©ãƒ ã‚’å�–å¾—ã�™ã‚‹
-                GetLedgerColumnCount();
-
-                // å¯¾è±¡ã‚’ã�¾ã�šå‰Šé™¤ã�™ã‚‹
-                string strDelSQL = "DELETE CONSTRUCTIONLEDGEREXCUTE";
-                strDelSQL += " WHERE CONSTRUCTIONCODE IN";
-                strDelSQL += " (SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO";
-                strDelSQL += string.Format(" WHERE (SALESPERSONCODE = {0} OR CONSTRUCTIONPERSONCODE = {0} OR CONSTRSUBPERSONCODE = {0} OR CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
-                strDelSQL += string.Format(" AND GROUPCOUNT IN ({0}, {1}, {2}, {3}, {4})"
-                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Transport)
-                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Purchase)
-                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Lease)
-                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.StoragePlace)
-                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Lodging));
-                strDelSQL += string.Format(" AND TARGETMONTH = TO_DATE('{0}','YYYY/MM/DD')", (TargetMonth + "/01"));
-                LedgerExcuteDB.ExecuteNonQuery(strDelSQL, false);
-
-                for (int i = (int)CommonDefine.CostDataNo.Transport; i <= (int)CommonDefine.CostDataNo.Lodging; i++)
-                {
-                    string strSQL = "SELECT CONSTRUCTIONCODE, DATATYPE, TO_CHAR(ACTIONDATE,'YYYY/MM'), SUM(ENTRYPRICE) FROM COSTDATAOFPERSON";
-                    strSQL += String.Format(" WHERE TO_CHAR(ACTIONDATE,'YYYY/MM') = '{0}'", TargetMonth);
-                    strSQL += String.Format(" AND DATATYPE = {0}", i);
-                    strSQL += " AND CONSTRUCTIONCODE IN (SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO";
-                    strSQL += string.Format(" WHERE (SALESPERSONCODE = {0} OR CONSTRUCTIONPERSONCODE = {0} OR CONSTRSUBPERSONCODE = {0} OR CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
-                    strSQL += " GROUP BY CONSTRUCTIONCODE, DATATYPE, TO_CHAR(ACTIONDATE,'YYYY/MM')";
-                    strSQL += " ORDER BY CONSTRUCTIONCODE, DATATYPE";
-                    ArrayList arList = new ArrayList();
-                    if (!CostDB.ExecuteReader(strSQL, ref arList, false)) continue;
-                    if (arList.Count == 0) continue;
-
-                    foreach (object[] wrkrec in arList)
-                    {
-
-                        // æ”¯æ‰•é‡‘é¡�
-                        int PaymentPrice = CommonMotions.cnvInt(wrkrec[3]);
-                        // æ”¯æ‰•é‡‘é¡�ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
-                        if (PaymentPrice == 0) continue;
-
-                        // å·¥äº‹ç•ªå�·
-                        int ConstructionCode = CommonMotions.cnvInt(wrkrec[0]);
-
-                        // ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·
-                        int DataType = i;
-                        int GroupNo = GetConstructionLedgerGroupNo(DataType);
-
-                        // å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã�®è¡Œãƒ»åˆ—ã‚’å�–å¾—ã�™ã‚‹
-                        int LineCnt = 0;
-                        int ColCnt = 0;
-                        // å�°å¸³ã�Œç„¡ã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
-                        if (!SearchTatgetConstructionLedger(LedgerDB, LedgerDetailDB, ConstructionCode, GroupNo, TargetMonth, ref  LineCnt, ref ColCnt)) continue;
-
-                        ConstructionLedgerExcute excRec = new ConstructionLedgerExcute();
-                        // ãƒ‡ãƒ¼ã‚¿ç·¨é›†
-                        excRec.ConstructionCode = ConstructionCode;
-                        excRec.GroupCount = GroupNo;
-                        excRec.LineCount = LineCnt;
-                        excRec.ColumnCount = ColCnt;
-                        excRec.PaymentAmount = PaymentPrice;
-                        excRec.TargetMonth = CommonMotions.cnvDate(TargetMonth + "/01");
-
-                        if (!LedgerExcuteDB.InsertAction(excRec, false))
-                        {
-                            LedgerExcuteDB.rollback();
-                            return false;
-                        }
-                    }
-                }
-                // DBã‚³ãƒŸãƒƒãƒˆ
-                LedgerExcuteDB.commit();
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                LedgerExcuteDB.rollback();
-                return false;
-            }
-            finally
-            {
-                CostDB.close(); CostDB = null;
-                LedgerDB.close(); LedgerDB = null;
-                LedgerDetailDB.close(); LedgerDetailDB = null;
-                LedgerExcuteDB.close(); LedgerExcuteDB = null;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šå¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã‚’æŽ¢ã�—ã�¦å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã�®è¡Œç•ªå�·ãƒ»åˆ—ç•ªå�·ã‚’è¿”ã�™
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šå¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã‚’æŽ¢ã�—ã�¦å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã�®è¡Œç•ªå�·ãƒ»åˆ—ç•ªå�·ã‚’è¿”ã�™
-        /// </summary>
-        /// <returns></returns>
-        private static bool SearchTatgetConstructionLedger(IOConstructionLedger LedgerDB, IOConstructionLedgerDetail LedgerDetailDB
-                                                            ,int ConstructionCode, int GroupNo, string TargetMonth, ref int LineCnt, ref int ColCnt)
-        {
-            try
-            {
-                // å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
-                string strLedger = LedgerDB.CreatePrimarykeyString(ConstructionCode);
-                ConstructionLedger LedgerRec = new ConstructionLedger();
-                if (!LedgerDB.SelectAction(strLedger, ref LedgerRec, false)) return false;
-                
-                // ç�¾åœ¨ã�®å‡¦ç�†å¹´æœˆã‚’DateTimeåž‹ã�«å¤‰æ�›ã�™ã‚‹
-                DateTime NowDates = CommonMotions.cnvDate(TargetMonth + "/01");
-                // çµŒé�Žæœˆæ•°ã‚’å�–å¾—ã�™ã‚‹
-                int DiffMonth = NowDates.Month - LedgerRec.ConstructionStart.Month;
-
-                // åˆ—ç•ªå�·å�–å¾—
-                ColCnt = m_LedgerColumnCount + DiffMonth;
-
-                // å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ãƒ‡ãƒ¼ã‚¿èª­è¾¼ã�¿
-                string strSQL = LedgerDetailDB.CreatePrimarykeyString(ConstructionCode, GroupNo);
-                List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
-                if (!LedgerDetailDB.SelectAction(strSQL, ref DetailList, false)) return false;
-                // è¡Œç•ªå�·å�–å¾—
-                LineCnt = DetailList[0].LineCount;
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        /// <param name="TargetData"></param>
-        /// <returns></returns>
-        public static int GetConstructionLedgerGroupNo(int TargetData)
-        {
-            int GroupNo = 0;
-            // å·¥äº‹å�°å¸³ã�®ã‚°ãƒ«ãƒ¼ãƒ—ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
-            switch (TargetData)
-            {
-                case (int)CommonDefine.CostDataNo.Transport:
-                    // äº¤é€šè²»ï¼ˆé€šè¡Œæ–™ãƒ»é›»è»Šä»£ï¼‰
-                    GroupNo = (int)GroupName_ConstructionLedger.TransportationCosts;
-                    break;
-                case (int)CommonDefine.CostDataNo.Purchase:
-                    // è³¼å…¥å“�
-                    GroupNo = (int)GroupName_ConstructionLedger.PurchaseCosts;
-                    break;
-                case (int)CommonDefine.CostDataNo.Lease:
-                    // è»Šä¸¡ãƒªãƒ¼ã‚¹ä»£
-                    GroupNo = (int)GroupName_ConstructionLedger.VehicleLeaseFee;
-                    break;
-                case (int)CommonDefine.CostDataNo.StoragePlace:
-                    // é§�è»Šå ´ãƒ»è³‡æ��ç½®ã��å ´
-                    GroupNo = (int)GroupName_ConstructionLedger.ParkingCosts;
-                    break;
-                case (int)CommonDefine.CostDataNo.Lodging:
-                    // å®¿æ³Šè²»
-                    GroupNo = (int)GroupName_ConstructionLedger.RoomChargeCosts;
-                    break;
-            }
-            return GroupNo;
-        }
-        #endregion
-
-        #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šæ”¯æ‰•é‡‘é¡�ã‚°ãƒªãƒƒãƒ‰ã�®å…ˆé ­ã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šæ”¯æ‰•é‡‘é¡�ã‚°ãƒªãƒƒãƒ‰ã�®å…ˆé ­ã‚«ãƒ©ãƒ æ•°ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        private static void GetLedgerColumnCount()
-        {
-            FrmConstructionLedger frm = new FrmConstructionLedger();
-            try
-            {
-                m_LedgerColumnCount = frm.GetGridColumsCount - 1;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                frm.Dispose(); frm = null;
-            }
-        }
-        #endregion
-
-        #region å€‹äººæ¯ŽçµŒè²»ãƒ‡ãƒ¼ã‚¿ã�‹ã‚‰å·¥äº‹è©³ç´°å�°å¸³ã�®å·¥äº‹æ¯Žã�®ãƒ‡ãƒ¼ã‚¿å†�è¨ˆç®—æ›´æ–°å‡¦ç�†
-        /// <summary>
-        /// å€‹äººæ¯ŽçµŒè²»ãƒ‡ãƒ¼ã‚¿ã�‹ã‚‰å·¥äº‹è©³ç´°å�°å¸³ã�®å·¥äº‹æ¯Žã�®ãƒ‡ãƒ¼ã‚¿å†�è¨ˆç®—æ›´æ–°å‡¦ç�†
-        /// </summary>
-        /// <param name="PersonCode"></param>
-        /// <param name="TargetMonth"></param>
-        /// <returns></returns>
-        public static bool UpdateRecalLedgerDataFromTAndPCost(int PersonCode, string TargetMonth)
-        {
-            IOCostDataOfPerson CostDB = new IOCostDataOfPerson();
-            FrmConstructionLedger frm = new FrmConstructionLedger();
-            try
-            {
-                string strSQL = "SELECT PERSONCODE, TO_CHAR(ACTIONDATE,'YYYY/MM'), CONSTRUCTIONCODE FROM COSTDATAOFPERSON";
-                strSQL += String.Format(" WHERE PERSONCODE = {0} AND TO_CHAR(ACTIONDATE,'YYYY/MM') = '{1}'", PersonCode, TargetMonth);
-                strSQL += " GROUP BY PERSONCODE, TO_CHAR(ACTIONDATE,'YYYY/MM'), CONSTRUCTIONCODE";
-                strSQL += " ORDER BY CONSTRUCTIONCODE";
-
-                ArrayList arList = new ArrayList();
-                if (!CostDB.ExecuteReader(strSQL, ref arList)) return false;
-                if (arList.Count == 0) return true;
-
-                bool bInit = true;
-                foreach (object[] wrkobj in arList)
-                {
-                    int ConstructionCode = CommonMotions.cnvInt(wrkobj[2]);
-                    // å·¥äº‹ç•ªå�·ã�Œå­˜åœ¨ã�—ã�ªã�„ãƒ‡ãƒ¼ã‚¿ã�¯æ›´æ–°ã�«ã�—ã�ªã�„
-                    if (ConstructionCode == 0) continue;
-
-                    // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
-                    frm.ConstructionCode = ConstructionCode;
-
-                    if (bInit)
-                    {
-                        // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
-                        frm.Show();
-                        // ãƒ•ã‚©ãƒ¼ãƒ é�žè¡¨ç¤º
-                        frm.Visible = false;
-                        bInit = false;
-                    }
-                    // å†�è¨ˆç®—å‡¦ç�†
-                    bool bret = frm.RecalculateLedger;
-                }
-                
-                // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                frm.Close();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                CostDB.close(); CostDB = null;
-                frm.Dispose(); frm = null;
-            }
-            return true;
-        }
-        #endregion
-
-        #region å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’æ–°è¦�ä½œæˆ�ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚’æ–°è¦�ä½œæˆ�ã�™ã‚‹
-        /// </summary>
-        /// <param name="ConstructionCode"></param>
-        /// <returns></returns>
-        public static bool MakingLedgerData(int ConstructionCode)
-        {
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            FrmConstructionLedger frm = new FrmConstructionLedger();
-            try
-            {
-                // å·¥äº‹ç•ªå�·ã�Œå­˜åœ¨ã�—ã�ªã�„ãƒ‡ãƒ¼ã‚¿ã�¯æ›´æ–°ã�—ã�ªã�„
-                if (ConstructionCode == 0) return false;
-
-                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã�Œæ—¢ã�«ã�‚ã‚Œã�°ä½œæˆ�ã�—ã�ªã�„
-                string strExists = LedgerDB.CreatePrimarykeyString(ConstructionCode);
-                List<ConstructionLedger> LedgerList = new List<ConstructionLedger>();
-                LedgerDB.SelectAction(strExists, ref LedgerList);
-                if (LedgerList.Count > 0) return true;
-
-                // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
-                frm.ConstructionCode = ConstructionCode;
-
-                // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
-                frm.WindowState = FormWindowState.Minimized;
-                frm.Show();
-                // ãƒ•ã‚©ãƒ¼ãƒ é�žè¡¨ç¤º
-                frm.Visible = false;
-
-                // ãƒ‡ãƒ¼ã‚¿ä½œæˆ�å‡¦ç�†
-                if (!frm.SaveLedgerData)
-                {
-                    frm.Close();                    // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                    return false;
-                }
-
-                // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                frm.Close();
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                frm.Dispose(); frm = null;
-                LedgerDB.close(); LedgerDB = null;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã�«å¢—æ¸›ãƒ‡ãƒ¼ã‚¿ã‚’è¿½åŠ ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã�«å¢—æ¸›ãƒ‡ãƒ¼ã‚¿ã‚’è¿½åŠ ã�™ã‚‹
-        /// </summary>
-        /// <param name="ConstructionCode"></param>
-        /// <returns></returns>
-        public static bool AddingLedgerData(int ConstructionCode)
-        {
-            IOConstructionLink LinkDB = new IOConstructionLink();
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            FrmConstructionLedger frm = new FrmConstructionLedger();
-            try
-            {
-
-                // å·¥äº‹ç•ªå�·ã�Œå­˜åœ¨ã�—ã�ªã�„ãƒ‡ãƒ¼ã‚¿ã�¯æ›´æ–°ã�—ã�ªã�„
-                if (ConstructionCode == 0) return false;
-
-                // è¦ªã�®å·¥äº‹ã‚’æŽ¢ã�™
-                string strParent = string.Format(" WHERE FluctuationCode = {0}", ConstructionCode);
-                ConstructionLink LinkRec = new ConstructionLink();
-                if (!LinkDB.SelectAction(strParent, ref LinkRec)) return false;
-
-                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�„å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
-                string strExists = LedgerDB.CreatePrimarykeyString(LinkRec.ConstructionCode);
-                ConstructionLedger LedgerList = new ConstructionLedger();
-                if (!LedgerDB.SelectAction(strExists, ref LedgerList)) return false;
-
-                // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
-                frm.ConstructionCode = LinkRec.ConstructionCode;
-
-                // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
-                frm.WindowState = FormWindowState.Minimized;
-                frm.Show();
-                // ãƒ•ã‚©ãƒ¼ãƒ é�žè¡¨ç¤º
-                frm.Visible = false;
-                
-                // ãƒ‡ãƒ¼ã‚¿ã‚’è¿½åŠ ã�™ã‚‹
-                frm.AddingConstrCode = ConstructionCode;
-                if (!frm.AddDataLedger)
-                {
-                    frm.Close();                    // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                    return false;
-                }
-
-                // ãƒ‡ãƒ¼ã‚¿ä½œæˆ�å‡¦ç�†
-                if (!frm.SaveLedgerData)
-                {
-                    frm.Close();                    // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                    return false;
-                }
-
-                // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                frm.Close();
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                frm.Dispose(); frm = null;
-                LedgerDB.close(); LedgerDB = null;
-                LinkDB.close(); LinkDB = null;
-            }
-        }
-        #endregion
-    }
-}
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 48)
@@ -1003,6 +1003,7 @@
 
                 // ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
                 frm.ConstructionCode = CurrentPara.IntExecParameter[0];
+                frm.OrderNo = CurrentPara.IntExecParameter[1];
 
                 // ãƒ•ã‚©ãƒ¼ãƒ è¡¨ç¤º
                 frm.ShowDialog();
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IODailyDataConstruction.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IODailyDataConstruction.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IODailyDataConstruction.cs	(revision 48)
@@ -254,6 +254,54 @@
         }
         #endregion
 
+        #region 1é …ç›®æ›´æ–°å‡¦ç�†
+        /// <summary>
+        /// 1é …ç›®ã�®æ›´æ–°ã‚’è¡Œã�†
+        /// </summary>
+        /// <param name="ConstructionCode"></param>
+        /// <param name="FeildNo"></param>
+        /// <param name="value"></param>
+        /// <param name="bConnect"></param>
+        /// <returns></returns>
+        public bool UpdateFeild(int PersonCode, DateTime DailyDataDate, int ConstructionCode, int FeildNo, object value, bool bConnect = true)
+        {
+            string strcmd = "";
+            try
+            {
+                strcmd = "UPDATE DailyDataConstruction";
+
+                strcmd += " SET";
+                switch (FeildNo)
+                {
+                    case (int)DataColumn.PersonCode:
+                        strcmd += string.Format(" PersonCode = {0}", ((int)value).ToString());
+                        break;
+                    case (int)DataColumn.DailyDataDate:
+                        strcmd += string.Format(" DailyDataDate = TO_DATE('{0}','YYYY/MM/DD')", ((DateTime)value).ToShortDateString());
+                        break;
+                    case (int)DataColumn.ConstructionCode:
+                        strcmd += string.Format(" ConstructionCode = {0}", ((int)value).ToString());
+                        break;
+                    case (int)DataColumn.Weather:
+                        strcmd += string.Format(" Weather = '{0}'", value.ToString());
+                        break;
+                }
+
+                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
+                strcmd += CreatePrimarykeyString(PersonCode, DailyDataDate, ConstructionCode);
+
+                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}ï¼š{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
+                return false;
+            }
+        }
+        #endregion
+
         #region å‰Šé™¤å‡¦ç�†
         /// <summary>
         /// æ‹…å½“è€…æ¯ŽçµŒè²»ãƒ‡ãƒ¼ã‚¿å‰Šé™¤
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrder.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrder.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrder.cs	(revision 48)
@@ -625,7 +625,7 @@
         /// <param name="AddSQLString"></param>
         /// <param name="bConnect"></param>
         /// <returns></returns>
-        public int SelectMaxConstructionCodeCount(string AddSQLString, bool bConnect = true)
+        public int SelectMaxSeqNoCount(string AddSQLString, bool bConnect = true)
         {
             //Oracle ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹
             string strcmd = "";
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/DepartmentExpensesMaster.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/DepartmentExpensesMaster.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/DepartmentExpensesMaster.cs	(nonexistent)
@@ -1,85 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ProcessManagement.DataModel
-{
-    /// <summary>
-    /// éƒ¨ç½²çµŒè²»çŽ‡ãƒžã‚¹ã‚¿
-    /// </summary>
-    public class DepartmentExpensesMaster
-    {
-        #region ãƒ¡ãƒ³ãƒ�å¤‰æ•°
-        private int         m_DepartmentCode = 0;	            // å·¥äº‹ç¨®åˆ¥ã‚³ãƒ¼ãƒ‰
-        private int         m_NameCode = 0;	                    // çµŒè²»åŒºåˆ†ã‚³ãƒ¼ãƒ‰
-        private int         m_DisplayOrder = 0;	                // è¡¨ç¤ºé †
-        private double      m_ExpensesRatio = 0;	            // çµŒè²»çŽ‡
-        private int         m_DeleteFlg = 0;	                // å‰Šé™¤ãƒ•ãƒ©ã‚°
-        private DateTime    m_EntryDate = DateTime.Now;         // ç™»éŒ²æ—¥ä»˜
-        private DateTime    m_UpdateDate = DateTime.Now;        // æ›´æ–°æ—¥ä»˜
-        #endregion
-
-        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
-        #endregion
-
-        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
-        /// <summary>
-        /// åŒºåˆ†ã‚³ãƒ¼ãƒ‰
-        /// </summary>
-        public int DepartmentCode
-        {
-            get { return m_DepartmentCode; }
-            set { m_DepartmentCode = value; }
-        }
-        /// <summary>
-        /// å��ç§°ã‚³ãƒ¼ãƒ‰
-        /// </summary>
-        public int NameCode
-        {
-            get { return m_NameCode; }
-            set { m_NameCode = value; }
-        }
-        /// <summary>
-        /// è¡¨ç¤ºé †
-        /// </summary>
-        public int DisplayOrder
-        {
-            get { return m_DisplayOrder; }
-            set { m_DisplayOrder = value; }
-        }
-        /// <summary>
-        /// çµŒè²»çŽ‡
-        /// </summary>
-        public double ExpensesRatio
-        {
-            get { return m_ExpensesRatio; }
-            set { m_ExpensesRatio = value; }
-        }
-        /// <summary>
-        /// å‰Šé™¤ãƒ•ãƒ©ã‚°
-        /// </summary>
-        public int DeleteFlg
-        {
-            get { return m_DeleteFlg; }
-            set { m_DeleteFlg = value; }
-        }
-        /// <summary>
-        /// ç™»éŒ²æ—¥ä»˜
-        /// </summary>
-        public DateTime EntryDate
-        {
-            set { m_EntryDate = value; }
-            get { return m_EntryDate; }
-        }
-        /// <summary>
-        /// æ›´æ–°æ—¥ä»˜
-        /// </summary>
-        public DateTime UpdateDate
-        {
-            set { m_UpdateDate = value; }
-            get { return m_UpdateDate; }
-        }
-        #endregion
-    }
-}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 48)
@@ -567,18 +567,23 @@
                 // ŠÖ˜Aƒf�[ƒ^‚ð�í�œ‚·‚é
                 switch (m_ApprovalCode)
                 {
+                    // 1:�ÏŽZŒ©�Ï�‘�³”F
                     case (int)ClsExcute.ApprovalListNo.EstimateApproval:
-                    // 1:�ÏŽZŒ©�Ï�‘�³”F
+                    // 2:�ÏŽZ—\ŽZ�‘�³”F
                     case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval:
-                    // 2:�ÏŽZ—\ŽZ�‘�³”F
+                    // 3:�HŽ–—\ŽZ�‘�³”F
                     case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval:
-                    // 3:�HŽ–—\ŽZ�‘�³”F
+                        break;
+
+                    // 4:’�•¶�‘�³”F
                     case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval:
-                    // 4:’�•¶�‘�³”F
+                        RemoveApprovalLinkDetail();
+                        break;
+                    
+                    // 5:�¿‹��‘�³”F
                     case (int)ClsExcute.ApprovalListNo.OrderBillingApproval:
-                    // 5:�¿‹��‘�³”F
+                    // 6:�HŽ–“ú•ñ�³”F
                     case (int)ClsExcute.ApprovalListNo.DRConstructionApproval:
-                    // 6:�HŽ–“ú•ñ�³”F
                     default:
                         break;
                 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 48)
@@ -1185,5 +1185,32 @@
             }
         }
         #endregion
+
+        #region æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
+        /// <summary>
+        /// æ‰¿èª�ãƒ‡ãƒ¼ã‚¿ã�¨æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�®ãƒªãƒ³ã‚¯æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
+        /// </summary>
+        private void RemoveApprovalLinkDetail()
+        {
+            IOProcessApprovalDetail DetailDB = new IOProcessApprovalDetail();
+            try
+            {
+                DetailDB.connect(); DetailDB.beginTran();
+
+                string strSQL = DetailDB.CreatePrimarykeyString(m_ConstructionCode, m_ApprovalCode, m_OrderNo);
+                DetailDB.DeleteAction(strSQL, false);
+
+                DetailDB.commit();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DetailDB.close(); DetailDB = null;
+            }
+        }
+        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs	(revision 48)
@@ -48,6 +48,7 @@
             PrintOutFlg,
             ConstructionPeriod,
             ConstructionCode,
+            OrderNo,
         }
 
         #endregion
@@ -177,23 +178,6 @@
         }
         #endregion
 
-        #region ‘I‘ðƒ{ƒ^ƒ“
-        /// <summary>
-        /// �HŽ–‘I‘ðƒ{ƒ^ƒ“‰Ÿ‰º
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDataSelect_Click(object sender, EventArgs e)
-        {
-            // ƒf�[ƒ^‚ª‚È‚¢�ê�‡‚Í”²‚¯‚é
-            if (dgvMaster.RowCount == 0) return;
-            if (CommonMotions.chkCellBlank(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionName].Value)) return;
-
-            // Še�ˆ—�‹N“®
-            SubProcessExecute(CommonMotions.cnvIntFromStringCode(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-"));
-        }
-        #endregion
-
         #region �X�Vƒ{ƒ^ƒ“
         /// <summary>
         /// ƒf�[ƒ^�X�Vƒ{ƒ^ƒ“‰Ÿ‰º
@@ -247,7 +231,9 @@
             if (CommonMotions.chkCellBlank(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionName].Value)) return;
 
             // Še�ˆ—�‹N“®
-            SubProcessExecute(CommonMotions.cnvIntFromStringCode(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-"));
+            int ConstrCode = CommonMotions.cnvIntFromStringCode(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-");
+            int OrderNo = CommonMotions.cnvInt(dgvMaster.CurrentRow.Cells[(int)DispColumn.OrderNo].Value);
+            SubProcessExecute(ConstrCode, OrderNo);
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 48)
@@ -41,7 +41,6 @@
             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();
-            this.btnDataSelect = new System.Windows.Forms.Button();
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
@@ -70,25 +69,12 @@
             this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
             this.SuspendLayout();
             // 
-            // btnDataSelect
-            // 
-            this.btnDataSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnDataSelect.BackColor = System.Drawing.Color.Green;
-            this.btnDataSelect.ForeColor = System.Drawing.Color.White;
-            this.btnDataSelect.Location = new System.Drawing.Point(10, 619);
-            this.btnDataSelect.Name = "btnDataSelect";
-            this.btnDataSelect.Size = new System.Drawing.Size(120, 30);
-            this.btnDataSelect.TabIndex = 6;
-            this.btnDataSelect.Text = "å·¥äº‹ã‚’é�¸æŠž";
-            this.btnDataSelect.UseVisualStyleBackColor = false;
-            this.btnDataSelect.Visible = false;
-            this.btnDataSelect.Click += new System.EventHandler(this.btnDataSelect_Click);
-            // 
             // btnDataEntry
             // 
             this.btnDataEntry.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
@@ -351,7 +337,8 @@
             this.Column7,
             this.Column8,
             this.Column3,
-            this.Column2});
+            this.Column2,
+            this.Column11});
             dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
             dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
@@ -490,6 +477,17 @@
             this.Column2.Visible = false;
             this.Column2.Width = 5;
             // 
+            // Column11
+            // 
+            this.Column11.Frozen = true;
+            this.Column11.HeaderText = "ç”³è«‹å�—ä»˜ç•ªå�·";
+            this.Column11.Name = "Column11";
+            this.Column11.ReadOnly = true;
+            this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column11.Visible = false;
+            this.Column11.Width = 5;
+            // 
             // FrmConstructionList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -501,7 +499,6 @@
             this.Controls.Add(this.lblProcessTitil);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.btnDataSelect);
             this.Controls.Add(this.btnDataUpDate);
             this.Controls.Add(this.btnDataEntry);
             this.Controls.Add(this.btnEnd);
@@ -527,7 +524,6 @@
 
         #endregion
 
-        private System.Windows.Forms.Button btnDataSelect;
         private System.Windows.Forms.Button btnDataEntry;
         private System.Windows.Forms.Button btnEnd;
         private System.Windows.Forms.Label label1;
@@ -544,6 +540,8 @@
         private System.Windows.Forms.NumericUpDown numUDConstPro;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
@@ -554,7 +552,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
-        private System.Windows.Forms.RadioButton radioButton2;
-        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.resx	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.resx	(revision 48)
@@ -147,4 +147,7 @@
   <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 48)
@@ -93,6 +93,7 @@
             CONSTMANDISPORDER,
             CONSTDEPDISPORDER,
             PRINTOUTDATE,
+            ORDERNO,
         }
         #endregion
 
@@ -109,7 +110,7 @@
         /// �HŽ–ˆê——‚æ‚è‹N“®‚·‚éƒvƒ�ƒZƒX‘I‘ð�ˆ—�
         /// </summary>
         /// <param name="para_ConstructionCode"></param>
-        private void SubProcessExecute(int para_ConstructionCode = 0)
+        private void SubProcessExecute(int para_ConstructionCode = 0, int para_OrderNo = 0)
         {
             IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
             try
@@ -146,6 +147,11 @@
                 NowPoint = ClsExcute.NextProcess(m_ExecuteFlg);
                 // ‘I‘ð�HŽ–”Ô�†ƒZƒbƒg
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_ConstructionCode);
+                // ’�•¶�‘ˆó�ü‚ÍŽó•t”Ô�†‚ðƒZƒbƒg‚·‚é
+                if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint)
+                {
+                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_OrderNo);
+                }
             }
             catch (Exception ex)
             {
@@ -721,7 +727,7 @@
 
             string wrkFormat = string.Empty;
             for (int i = 0; i < (s_SQLPart1.Length - 1); i++) wrkFormat += s_SQLPart1[i];
-            wrkFormat += ", TO_CHAR(A2.PRINTOUTDATE, 'YYYY/MM/DD')";
+            wrkFormat += ", TO_CHAR(A2.PRINTOUTDATE, 'YYYY/MM/DD'), A1.ORDERNO";
             for (int i = (s_SQLPart1.Length - 1); i < s_SQLPart1.Length; i++) wrkFormat += s_SQLPart1[i];
             for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat += s_SQLPart2[i];
             for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat += s_SQLPart3[i];
@@ -816,19 +822,38 @@
         /// </summary>
         /// <param name="AllCount"></param>
         /// <param name="PrintCount"></param>
-        private void GetPrintCount(int TargetCode, ref int AllCount, ref int PrintCount)
+        private void GetPrintCount(IOPurchaseOrder OrderDB, int ParentCode, int SourceCode, ref int AllCount, ref int PrintCount)
         {
-            IOPurchaseOrder OrderDB = new IOPurchaseOrder();
             try
             {
                 string strSQL = "SELECT * FROM";
-                strSQL += string.Format(" (SELECT COUNT(*) FROM PURCHASEORDER A1 WHERE CONSTRUCTIONCODE = {0}) A,", TargetCode);
-                strSQL += string.Format(" (SELECT COUNT(*) FROM PURCHASEORDER B1 WHERE CONSTRUCTIONCODE = {0} AND PRINTOUTDATE != TO_DATE('0001/01/01')) B", TargetCode);
+                strSQL += " (SELECT COUNT(*) FROM CONSTRUCTIONLEDGERDETAIL A1";
+                strSQL += string.Format(" WHERE A1.CONSTRUCTIONCODE = {0}", ParentCode);
+                strSQL += string.Format(" AND A1.SOURCECODE = {0}", SourceCode);
+                strSQL += string.Format(" AND A1.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL += string.Format(" AND A1.PURCHASEORDERFLG <> {0} AND A1.COMPANYCODE > 0", (int)CommonDefine.PurchaseOrderFlg.NotMakingData);
+
+                strSQL += " GROUP BY A1.COMPANYCODE";
+                strSQL += string.Format(" HAVING SUM(A1.EXECUTIONAMOUNT) >= {0}) A,", CommonDefine.s_PrintOutPrice);
+
+                strSQL += " (SELECT COUNT(*) FROM PURCHASEORDER B1";
+                if (ParentCode == SourceCode)
+                {
+                    strSQL += string.Format(" WHERE B1.CONSTRUCTIONCODE = {0}", ParentCode);
+                }
+                else
+                {
+                    strSQL += string.Format(" WHERE B1.CONSTRUCTIONCODE = {0}", SourceCode);
+                }
+                strSQL += string.Format(" AND B1.PRINTOUTDATE != TO_DATE('{0}')) B", DateTime.MinValue.ToShortDateString());
+
                 ArrayList arList = new ArrayList();
                 if (!OrderDB.ExecuteReader(strSQL, ref arList)) return;
 
+                //if (SourceCode == 2016027801) Debug.WriteLine("");
+
                 object[] objRec = (object[])arList[0];
-                AllCount = CommonMotions.cnvInt(objRec[0]);
+                AllCount = arList.Count;
                 PrintCount = CommonMotions.cnvInt(objRec[1]);
             }
             catch (Exception ex)
@@ -835,10 +860,6 @@
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                OrderDB.close(); OrderDB = null;
-            }
         }
         #endregion
 
@@ -849,6 +870,7 @@
         /// <param name="arData"></param>
         private void SetToGridData(ArrayList arData)
         {
+            IOPurchaseOrder OrderDB = new IOPurchaseOrder();
             try
             {
                 DataGridView dgv = dgvMaster;
@@ -863,21 +885,30 @@
                 string[] strConstDepName = new string[2];
                 string[] strConstName = new string[2];
                 string strStatus = string.Empty;
+                string strConstrName = string.Empty;
                 int ConstrCode = 0;
+                int ParentCode = 0;
+                int OrderNo = 0;
                 foreach (object[] objwrk in arData)
                 {
                     FlgString = string.Empty;
                     ConstrCode = CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONCODE]);
+                    strConstrName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME]);
                     // ‹N“®�ˆ—�–ˆ‚Ì“®�ì
+                    if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint)
+                    {
+                        OrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]);
+                        strConstrName += string.Format(" �\�¿{0}‰ñ–Ú", OrderNo);
+                    }
                     switch (m_ExecuteFlg)
                     {
                         case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry:
                         case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:
                             // ’�•¶�‘“ü—Í�E’�•¶�‘ˆó�ü‚Íƒtƒ‰ƒO‚ðŽg‚¤
-                            //DateTime wrkDate = CommonMotions.cnvDate(objwrk[(int)GetData.PRINTOUTDATE]);
+                            ParentCode = ClsProcessExist.GetParentConstrCode(ConstrCode);
                             int AllCount = 0;
-                            int PrintCount=0;
-                            GetPrintCount(ConstrCode, ref AllCount, ref PrintCount);
+                            int PrintCount = 0;
+                            GetPrintCount(OrderDB, ParentCode, ConstrCode, ref AllCount, ref PrintCount);
                             if (AllCount != 0 && AllCount == PrintCount) FlgString = "�Ï";
                             break;
                         default:
@@ -884,7 +915,6 @@
                             break;
                     }
 
-                    //strStatus = string.Empty;
                     // ƒXƒe�[ƒ^ƒXƒtƒ‰ƒO‚ªˆá‚¦‚Î1�sŠJ‚¯‚é
                     if (StatusFlg != CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONSTATUSFLG]))
                     {
@@ -893,10 +923,6 @@
                         if (!initFlg) dgv.Rows.Add(1);
                         initFlg = false;
                     }
-                    //strSalesDepName[1] = string.Empty;
-                    //strSalesName[1] = string.Empty;
-                    //strConstDepName[1] = string.Empty;
-                    //strConstName[1] = string.Empty;
 
                     if (!CommonMotions.cnvString(objwrk[(int)GetData.SALESDEPNAME]).Equals(strSalesDepName[0]))
                     {
@@ -924,11 +950,12 @@
                                         , strSalesName[1]
                                         , strConstDepName[1]
                                         , strConstName[1]
-                                        , CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME])
+                                        , strConstrName
                                         , strStatus
                                         , FlgString
                                         , CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONPERIOD])
                                         , CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8)
+                                        , OrderNo
                                         );
 
                 }
@@ -937,6 +964,10 @@
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                OrderDB.close(); OrderDB = null;
+            }
         }
         #endregion
 
@@ -1082,7 +1113,6 @@
             // ƒf�[ƒ^’Ç‰Á–³‚Íƒ{ƒ^ƒ“”ñ•\Ž¦
             if (!m_DataAddtionButton)
             {
-                btnDataSelect.Left = btnDataEntry.Left;
                 btnDataEntry.Visible = false;
             }
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 48)
@@ -4788,153 +4788,153 @@
         /// <summary>
         /// çµŒè²»å†�è¨ˆç®—
         /// </summary>
-        private void CalcExpenese()
-        {
-            IOConstructionLedger LedgerDB = new IOConstructionLedger();
-            IOConstructionLedgerDetail LedgerDDB = new IOConstructionLedgerDetail();
-            IOConstructionLedgerExcute LedgerEDB = new IOConstructionLedgerExcute();
-            FrmConstructionLedger frm = new FrmConstructionLedger();
+        //private void CalcExpenese()
+        //{
+            //IOConstructionLedger LedgerDB = new IOConstructionLedger();
+            //IOConstructionLedgerDetail LedgerDDB = new IOConstructionLedgerDetail();
+            //IOConstructionLedgerExcute LedgerEDB = new IOConstructionLedgerExcute();
+            //FrmConstructionLedger frm = new FrmConstructionLedger();
 
-            try
-            {
-                LedgerDB.connect(); LedgerDB.beginTran();
-                LedgerDDB.connect();LedgerDDB.beginTran();
-                LedgerEDB.connect(); LedgerEDB.beginTran();
+            //try
+            //{
+            //    LedgerDB.connect(); LedgerDB.beginTran();
+            //    LedgerDDB.connect();LedgerDDB.beginTran();
+            //    LedgerEDB.connect(); LedgerEDB.beginTran();
                 
-                // çµŒè²»çŽ‡ã�®ã‚»ãƒƒãƒˆ
-                string strSQL1 = "SELECT A.CONSTRUCTIONCODE, E.DETAILSTRING, F.DEPARTMENTSTRING, A.LINECOUNT, A.FIRSTSTRING";
-                strSQL1 += ", A.EXECUTIONAMOUNT, A.AMOUNTCONFIGRATE, B.CONSTRUCTIONPERIOD, C.DEPARTMENTCODE, D.NAMECODE";
-                strSQL1 += ", D.EXPENSESRATIO, ROUND(B.ORDERSDECISIONPRICE * (A.AMOUNTCONFIGRATE / 100.0)), G.NAMESTRING";
-                strSQL1 += " FROM CONSTRUCTIONLEDGERDETAIL A, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER C, DEPARTMENTEXPENSESMASTER D, CONSTRUCTIONBASEINFODETAIL E, DEPARTMENTMASTER F, DIVISIONMASTER G";
-                strSQL1 += " WHERE A.CONSTRUCTIONCODE <> 2015043401";
-                strSQL1 += " AND A.GROUPCOUNT = 1";
-                strSQL1 += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
-                strSQL1 += " AND B.CONSTRUCTIONPERIOD = 16";
-                strSQL1 += " AND B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
-                strSQL1 += " AND (C.DEPARTMENTCODE = D.DEPARTMENTCODE AND B.CONSTRUCTIONPERIOD = D.EXPENSESPERIOD AND D.DISPLAYORDER = (A.LINECOUNT - 1))";
-                strSQL1 += " AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND E.DETAILNO = 2";
-                strSQL1 += " AND F.DEPARTMENTCODE = C.DEPARTMENTCODE";
-                strSQL1 += " AND G.DIVISIONCODE = 3";
-                strSQL1 += " AND G.NAMECODE = D.NAMECODE";
-                strSQL1 += " ORDER BY A.CONSTRUCTIONCODE, A.LINECOUNT";
-                ArrayList arList = new ArrayList();
-                if (!LedgerDB.ExecuteReader(strSQL1, ref arList, false)) return;
-                foreach (object[] CurRec in arList)
-                {
-                    int CurConstrCode = CommonMotions.cnvInt(CurRec[(int)Read1Enum.CONSTRUCTIONCODE]);
-                    int CurLineCnt = CommonMotions.cnvInt(CurRec[(int)Read1Enum.LINECOUNT]);
-                    int CurCompnentCode = CommonMotions.cnvInt(CurRec[(int)Read1Enum.NAMECODE]);
-                    double CurParcent = CommonMotions.cnvDouble(CurRec[(int)Read1Enum.EXPENSESRATIO]);
-                    int CurValue = CommonMotions.cnvInt(CurRec[(int)Read1Enum.EXPENESE]);
-                    string strValue = CommonMotions.cnvString(CurRec[(int)Read1Enum.EXPENESENAME]) + string.Format("({0}%)", CurParcent.ToString("0.00"));
-                    // é …ç›®å��
-                    if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.FirstString, strValue, 1, CurLineCnt, false))
-                    {
-                        LedgerDDB.rollback();
-                        return;
-                    }
-                    // å®Ÿè¡Œé‡‘é¡�
-                    if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.ExecutionAmount, CurValue, 1, CurLineCnt, false))
-                    {
-                        LedgerDDB.rollback();
-                        return;
-                    }
-                    // çµŒè²»çŽ‡ã‚»ãƒƒãƒˆ
-                    if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.AmountConfigRate, CurParcent, 1, CurLineCnt, false))
-                    {
-                        LedgerDDB.rollback();
-                        return;
-                    }
-                    // çµŒè²»ã‚³ãƒ¼ãƒ‰
-                    if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.ComponentCode, CurCompnentCode, 1, CurLineCnt, false))
-                    {
-                        LedgerDDB.rollback();
-                        return;
-                    }
-                }
+            //    // çµŒè²»çŽ‡ã�®ã‚»ãƒƒãƒˆ
+            //    string strSQL1 = "SELECT A.CONSTRUCTIONCODE, E.DETAILSTRING, F.DEPARTMENTSTRING, A.LINECOUNT, A.FIRSTSTRING";
+            //    strSQL1 += ", A.EXECUTIONAMOUNT, A.AMOUNTCONFIGRATE, B.CONSTRUCTIONPERIOD, C.DEPARTMENTCODE, D.NAMECODE";
+            //    strSQL1 += ", D.EXPENSESRATIO, ROUND(B.ORDERSDECISIONPRICE * (A.AMOUNTCONFIGRATE / 100.0)), G.NAMESTRING";
+            //    strSQL1 += " FROM CONSTRUCTIONLEDGERDETAIL A, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER C, DEPARTMENTEXPENSESMASTER D, CONSTRUCTIONBASEINFODETAIL E, DEPARTMENTMASTER F, DIVISIONMASTER G";
+            //    strSQL1 += " WHERE A.CONSTRUCTIONCODE <> 2015043401";
+            //    strSQL1 += " AND A.GROUPCOUNT = 1";
+            //    strSQL1 += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+            //    strSQL1 += " AND B.CONSTRUCTIONPERIOD = 16";
+            //    strSQL1 += " AND B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
+            //    strSQL1 += " AND (C.DEPARTMENTCODE = D.DEPARTMENTCODE AND B.CONSTRUCTIONPERIOD = D.EXPENSESPERIOD AND D.DISPLAYORDER = (A.LINECOUNT - 1))";
+            //    strSQL1 += " AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND E.DETAILNO = 2";
+            //    strSQL1 += " AND F.DEPARTMENTCODE = C.DEPARTMENTCODE";
+            //    strSQL1 += " AND G.DIVISIONCODE = 3";
+            //    strSQL1 += " AND G.NAMECODE = D.NAMECODE";
+            //    strSQL1 += " ORDER BY A.CONSTRUCTIONCODE, A.LINECOUNT";
+            //    ArrayList arList = new ArrayList();
+            //    if (!LedgerDB.ExecuteReader(strSQL1, ref arList, false)) return;
+            //    foreach (object[] CurRec in arList)
+            //    {
+            //        int CurConstrCode = CommonMotions.cnvInt(CurRec[(int)Read1Enum.CONSTRUCTIONCODE]);
+            //        int CurLineCnt = CommonMotions.cnvInt(CurRec[(int)Read1Enum.LINECOUNT]);
+            //        int CurCompnentCode = CommonMotions.cnvInt(CurRec[(int)Read1Enum.NAMECODE]);
+            //        double CurParcent = CommonMotions.cnvDouble(CurRec[(int)Read1Enum.EXPENSESRATIO]);
+            //        int CurValue = CommonMotions.cnvInt(CurRec[(int)Read1Enum.EXPENESE]);
+            //        string strValue = CommonMotions.cnvString(CurRec[(int)Read1Enum.EXPENESENAME]) + string.Format("({0}%)", CurParcent.ToString("0.00"));
+            //        // é …ç›®å��
+            //        if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.FirstString, strValue, 1, CurLineCnt, false))
+            //        {
+            //            LedgerDDB.rollback();
+            //            return;
+            //        }
+            //        // å®Ÿè¡Œé‡‘é¡�
+            //        if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.ExecutionAmount, CurValue, 1, CurLineCnt, false))
+            //        {
+            //            LedgerDDB.rollback();
+            //            return;
+            //        }
+            //        // çµŒè²»çŽ‡ã‚»ãƒƒãƒˆ
+            //        if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.AmountConfigRate, CurParcent, 1, CurLineCnt, false))
+            //        {
+            //            LedgerDDB.rollback();
+            //            return;
+            //        }
+            //        // çµŒè²»ã‚³ãƒ¼ãƒ‰
+            //        if (!LedgerDDB.UpdateFeild(CurConstrCode, (int)IOConstructionLedgerDetail.DataColumn.ComponentCode, CurCompnentCode, 1, CurLineCnt, false))
+            //        {
+            //            LedgerDDB.rollback();
+            //            return;
+            //        }
+            //    }
 
-                string strSQL2 = "SELECT A.CONSTRUCTIONCODE, A.TYINGFLG, B.CONSTRUCTIONCODE, B.LINECOUNT, B.DataCnt,";
-                strSQL2 += " C.CONSTRUCTIONCODE, C.GROUPCOUNT, C.LINECOUNT, C.COLUMNCOUNT,";
-                strSQL2 += " ROUND(A.ORDERSDECISIONPRICE * (D.AMOUNTCONFIGRATE / 100.0))";
-                strSQL2 += " FROM CONSTRUCTIONBASEINFO A,";
-                strSQL2 += " (SELECT CONSTRUCTIONCODE, LINECOUNT, COUNT(*) DataCnt FROM CONSTRUCTIONLEDGEREXCUTE WHERE GROUPCOUNT = 1 GROUP BY CONSTRUCTIONCODE, LINECOUNT) B,";
-                strSQL2 += " CONSTRUCTIONLEDGEREXCUTE C,";
-                strSQL2 += " CONSTRUCTIONLEDGERDETAIL D";
-                strSQL2 += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
-                strSQL2 += " AND A.CONSTRUCTIONCODE <> 2015043401";
-                strSQL2 += " AND B.DataCnt = 1";
-                strSQL2 += " AND C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
-                strSQL2 += " AND C.GROUPCOUNT = 1";
-                strSQL2 += " AND C.LINECOUNT = B.LINECOUNT";
-                strSQL2 += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
-                strSQL2 += " AND D.GROUPCOUNT = C.GROUPCOUNT";
-                strSQL2 += " AND D.LINECOUNT = C.LINECOUNT";
-                strSQL2 += " ORDER BY C.CONSTRUCTIONCODE, C.GROUPCOUNT, C.LINECOUNT, C.COLUMNCOUNT";
-                ArrayList arList2 = new ArrayList();
-                if (!LedgerEDB.ExecuteReader(strSQL2, ref arList2, false))
-                {
-                    LedgerDDB.rollback();
-                    return;
-                }
-                foreach (object[] CurRec in arList2)
-                {
-                    int CONSTRUCTIONCODE = CommonMotions.cnvInt(CurRec[0]);
-                    int TYINGFLG = CommonMotions.cnvInt(CurRec[1]);
-                    int CONSTRUCTIONCODE2 = CommonMotions.cnvInt(CurRec[2]);
-                    int LINECOUNT = CommonMotions.cnvInt(CurRec[3]);
-                    int DataCnt = CommonMotions.cnvInt(CurRec[4]);
-                    int CONSTRUCTIONCODE3 = CommonMotions.cnvInt(CurRec[5]);
-                    int GROUPCOUNT = CommonMotions.cnvInt(CurRec[6]);
-                    int LINECOUNT2 = CommonMotions.cnvInt(CurRec[7]);
-                    int COLUMNCOUNT = CommonMotions.cnvInt(CurRec[8]);
-                    int iValue =CommonMotions.cnvInt(CurRec[9]);
+            //    string strSQL2 = "SELECT A.CONSTRUCTIONCODE, A.TYINGFLG, B.CONSTRUCTIONCODE, B.LINECOUNT, B.DataCnt,";
+            //    strSQL2 += " C.CONSTRUCTIONCODE, C.GROUPCOUNT, C.LINECOUNT, C.COLUMNCOUNT,";
+            //    strSQL2 += " ROUND(A.ORDERSDECISIONPRICE * (D.AMOUNTCONFIGRATE / 100.0))";
+            //    strSQL2 += " FROM CONSTRUCTIONBASEINFO A,";
+            //    strSQL2 += " (SELECT CONSTRUCTIONCODE, LINECOUNT, COUNT(*) DataCnt FROM CONSTRUCTIONLEDGEREXCUTE WHERE GROUPCOUNT = 1 GROUP BY CONSTRUCTIONCODE, LINECOUNT) B,";
+            //    strSQL2 += " CONSTRUCTIONLEDGEREXCUTE C,";
+            //    strSQL2 += " CONSTRUCTIONLEDGERDETAIL D";
+            //    strSQL2 += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+            //    strSQL2 += " AND A.CONSTRUCTIONCODE <> 2015043401";
+            //    strSQL2 += " AND B.DataCnt = 1";
+            //    strSQL2 += " AND C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
+            //    strSQL2 += " AND C.GROUPCOUNT = 1";
+            //    strSQL2 += " AND C.LINECOUNT = B.LINECOUNT";
+            //    strSQL2 += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
+            //    strSQL2 += " AND D.GROUPCOUNT = C.GROUPCOUNT";
+            //    strSQL2 += " AND D.LINECOUNT = C.LINECOUNT";
+            //    strSQL2 += " ORDER BY C.CONSTRUCTIONCODE, C.GROUPCOUNT, C.LINECOUNT, C.COLUMNCOUNT";
+            //    ArrayList arList2 = new ArrayList();
+            //    if (!LedgerEDB.ExecuteReader(strSQL2, ref arList2, false))
+            //    {
+            //        LedgerDDB.rollback();
+            //        return;
+            //    }
+            //    foreach (object[] CurRec in arList2)
+            //    {
+            //        int CONSTRUCTIONCODE = CommonMotions.cnvInt(CurRec[0]);
+            //        int TYINGFLG = CommonMotions.cnvInt(CurRec[1]);
+            //        int CONSTRUCTIONCODE2 = CommonMotions.cnvInt(CurRec[2]);
+            //        int LINECOUNT = CommonMotions.cnvInt(CurRec[3]);
+            //        int DataCnt = CommonMotions.cnvInt(CurRec[4]);
+            //        int CONSTRUCTIONCODE3 = CommonMotions.cnvInt(CurRec[5]);
+            //        int GROUPCOUNT = CommonMotions.cnvInt(CurRec[6]);
+            //        int LINECOUNT2 = CommonMotions.cnvInt(CurRec[7]);
+            //        int COLUMNCOUNT = CommonMotions.cnvInt(CurRec[8]);
+            //        int iValue =CommonMotions.cnvInt(CurRec[9]);
 
-                    if (!LedgerEDB.UpdateFeild(CONSTRUCTIONCODE3, GROUPCOUNT, LINECOUNT2, COLUMNCOUNT, (int)IOConstructionLedgerExcute.TableColumn.PaymentAmount, iValue, false))
-                    {
-                        LedgerDDB.rollback();
-                        return;
-                    }
-                }
+            //        if (!LedgerEDB.UpdateFeild(CONSTRUCTIONCODE3, GROUPCOUNT, LINECOUNT2, COLUMNCOUNT, (int)IOConstructionLedgerExcute.TableColumn.PaymentAmount, iValue, false))
+            //        {
+            //            LedgerDDB.rollback();
+            //            return;
+            //        }
+            //    }
 
-                LedgerDB.commit();
-                LedgerDDB.commit();
-                LedgerEDB.commit();
+            //    LedgerDB.commit();
+            //    LedgerDDB.commit();
+            //    LedgerEDB.commit();
 
-                string strSQL3 = "SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGER A, CONSTRUCTIONBASEINFO B";
-                strSQL3 += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
-                strSQL3 += " AND B.CONSTRUCTIONPERIOD = 16";
-                strSQL3 += " ORDER BY A.CONSTRUCTIONCODE";
-                ArrayList arList3 = new ArrayList();
-                if (!LedgerDB.ExecuteReader(strSQL3, ref arList3)) return;
-                foreach (object[] CurRec in arList3)
-                {
-                    // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
-                    frm.ConstructionCode = CommonMotions.cnvInt(CurRec[0]);
+            //    string strSQL3 = "SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGER A, CONSTRUCTIONBASEINFO B";
+            //    strSQL3 += " WHERE A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+            //    strSQL3 += " AND B.CONSTRUCTIONPERIOD = 16";
+            //    strSQL3 += " ORDER BY A.CONSTRUCTIONCODE";
+            //    ArrayList arList3 = new ArrayList();
+            //    if (!LedgerDB.ExecuteReader(strSQL3, ref arList3)) return;
+            //    foreach (object[] CurRec in arList3)
+            //    {
+            //        // å·¥äº‹ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
+            //        frm.ConstructionCode = CommonMotions.cnvInt(CurRec[0]);
 
-                    // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
-                    frm.Hide();
-                    // ãƒ•ã‚©ãƒ¼ãƒ é�žè¡¨ç¤º
-                    //frm.Visible = false;
+            //        // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
+            //        frm.Hide();
+            //        // ãƒ•ã‚©ãƒ¼ãƒ é�žè¡¨ç¤º
+            //        //frm.Visible = false;
 
-                    // å†�è¨ˆç®—å‡¦ç�†
-                    if (!frm.RecalculateLedger) break;
-                }
-                // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
-                frm.Close();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                LedgerDB.close(); LedgerDB = null;
-                LedgerDDB.close(); LedgerDDB = null;
-                LedgerEDB.close(); LedgerEDB = null;
+            //        // å†�è¨ˆç®—å‡¦ç�†
+            //        if (!frm.RecalculateLedger) break;
+            //    }
+            //    // ç”»é�¢ã‚’é–‰ã�˜ã‚‹
+            //    frm.Close();
+            //}
+            //catch (Exception ex)
+            //{
+            //    logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            //}
+            //finally
+            //{
+            //    LedgerDB.close(); LedgerDB = null;
+            //    LedgerDDB.close(); LedgerDDB = null;
+            //    LedgerEDB.close(); LedgerEDB = null;
 
-                frm.Dispose(); frm = null;
-            }
-        }
+            //    frm.Dispose(); frm = null;
+            //}
+        //}
         #endregion
 
         #region æœªä½œæˆ�ãƒ‡ãƒ¼ã‚¿è¡Œä½œæˆ�å‡¦ç�†
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs	(revision 48)
@@ -895,6 +895,7 @@
             IOConstructionLedger LedgerDB = new IOConstructionLedger();
             IOConstructionLedgerDetail LedgerDDB = new IOConstructionLedgerDetail();
             IOConstructionLedgerExcute ExcuteDB = new IOConstructionLedgerExcute();
+            IOCostDataOfPerson CostDataDB = new IOCostDataOfPerson();
 
             IODailyDataConstruction DailyData1 = new IODailyDataConstruction();
             IODailyDataDetail DailyData2 = new IODailyDataDetail();
@@ -911,6 +912,7 @@
                 LedgerDB.connect(); LedgerDB.beginTran();
                 LedgerDDB.connect(); LedgerDDB.beginTran();
                 ExcuteDB.connect(); ExcuteDB.beginTran();
+                CostDataDB.connect(); CostDataDB.beginTran();
 
                 DailyData1.connect(); DailyData1.beginTran();
                 DailyData2.connect(); DailyData2.beginTran();
@@ -966,17 +968,6 @@
                         JoinRollBackDataProc(BaseDB, DetailDB, LinkDB, LedgerDB, LedgerDDB, ExcuteDB, DateCodeList, m_ConstructionCode);
                         return false;
                     }
-
-                    // æ—¥å ±çµ�å�ˆ
-                    if (!JoiningDairyData(LinkDB, DailyData1, DailyData2, DailyData3, DailyData4, DailyData5, DailyData6))
-                    {
-                        MessageBox.Show("å·¥äº‹æ—¥å ±çµ�å�ˆå‡¦ç�†ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ—¥å ±çµ�èªžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-                        // ã‚¨ãƒ©ãƒ¼æ™‚å·¥äº‹æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
-                        JoinRollBackDataProc(BaseDB, DetailDB, LinkDB, LedgerDB, LedgerDDB, ExcuteDB, DateCodeList, m_ConstructionCode);
-                        ClsChangeLedgerData.PseudoRollBackForBudgetData(m_ConstructionCode, DateCodeList);
-                        return false;
-                    }
                 }
                 else
                 {   // ----- çµ�å�ˆå·¥äº‹è¿½åŠ 
@@ -1013,21 +1004,31 @@
                         JoinRollBackDataProc(BaseDB, DetailDB, LinkDB, LedgerDB, LedgerDDB, ExcuteDB, DateCodeList, m_ConstructionCode);
                         return false;
                     }
+                }
 
-                    // æ—¥å ±çµ�å�ˆ
-                    if (!JoiningDairyData(LinkDB, DailyData1, DailyData2, DailyData3, DailyData4, DailyData5, DailyData6))
-                    {
-                        MessageBox.Show("å·¥äº‹æ—¥å ±çµ�å�ˆå‡¦ç�†ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ—¥å ±çµ�èªžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                // 
+                // æ—¥å ±çµ�å�ˆ
+                if (!JoiningDairyData(DateCodeList, DailyData1, DailyData2, DailyData3, DailyData4, DailyData5, DailyData6))
+                {
+                    MessageBox.Show("å·¥äº‹æ—¥å ±çµ�å�ˆå‡¦ç�†ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "æ—¥å ±çµ�å�ˆã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
 
-                        ClsChangeLedgerData.PseudoRollBackForBudgetData(m_ConstructionCode, DateCodeList);
+                    // ã‚¨ãƒ©ãƒ¼æ™‚å·¥äº‹æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
+                    JoinRollBackDataProc(BaseDB, DetailDB, LinkDB, LedgerDB, LedgerDDB, ExcuteDB, DateCodeList, m_ConstructionCode);
+                    ClsChangeLedgerData.PseudoRollBackForBudgetData(m_ConstructionCode, DateCodeList);
 
-                        // ã‚¨ãƒ©ãƒ¼æ™‚å·¥äº‹æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
-                        JoinRollBackDataProc(BaseDB, DetailDB, LinkDB, LedgerDB, LedgerDDB, ExcuteDB, DateCodeList, m_ConstructionCode);
+                    return false;
+                }
+                // è³¼å…¥å“�çµ�å�ˆ
+                if (!JoinCostData(DateCodeList, CostDataDB))
+                {
+                    MessageBox.Show("äº¤é€šè²»ãƒ»è³¼å…¥å“�çµ�å�ˆå‡¦ç�†ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "äº¤é€šè²»ãƒ»è³¼å…¥å“�çµ�å�ˆã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
 
-                        return false;
-                    }
+                    // ã‚¨ãƒ©ãƒ¼æ™‚å·¥äº‹æƒ…å ±ã‚’å‰Šé™¤ã�™ã‚‹
+                    JoinRollBackDataProc(BaseDB, DetailDB, LinkDB, LedgerDB, LedgerDDB, ExcuteDB, DateCodeList, m_ConstructionCode);
+                    ClsChangeLedgerData.PseudoRollBackForBudgetData(m_ConstructionCode, DateCodeList);
+                    DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                    return false;
                 }
-                string strRemove = string.Empty;
 
                 return true;
             }
@@ -1044,6 +1045,7 @@
                 LedgerDB.commit();
                 LedgerDDB.commit();
                 ExcuteDB.commit();
+                CostDataDB.commit();
 
                 DailyData1.commit();
                 DailyData2.commit();
@@ -1058,6 +1060,7 @@
                 LedgerDB.close(); LedgerDB = null;
                 LedgerDDB.close(); LedgerDDB = null;
                 ExcuteDB.close(); ExcuteDB = null;
+                CostDataDB.close(); CostDataDB = null;
 
                 DailyData1.close(); DailyData1 = null;
                 DailyData2.close(); DailyData2 = null;
@@ -1426,7 +1429,7 @@
         /// æ—¥å ±çµ�å�ˆ
         /// </summary>
         /// <returns></returns>
-        private bool JoiningDairyData(IOConstructionLink LinkDB,
+        private bool JoiningDairyData(List<int> DateCodeList,
                 IODailyDataConstruction DailyData1,
                 IODailyDataDetail DailyData2,
                 IODailyDataVehicles DailyData3,
@@ -1436,87 +1439,220 @@
         {
             try
             {
-                string strLinkSQL = LinkDB.CreatePrimarykeyString(m_ConstructionCode);
-                List<ConstructionLink> LinkList = new List<ConstructionLink>();
-                if (!LinkDB.SelectAction(strLinkSQL, ref LinkList, false)) return false;
+                string[] s_TableName = new string[] { "DAILYDATACONSTRUCTION",
+                                                        "DAILYDATADETAIL",
+                                                        "DAILYDATAVEHICLES",
+                                                        "DAILYDATAMATERIALS",
+                                                        "DAILYDATASUBCONTRACTORS",
+                                                        "DAILYDATAFIELD" };
 
-                string strSelSQL = "SELECT COUNT(*) FROM DAILYDATACONSTRUCTION WHERE CONSTRUCTIONCODE IN (";
-                string strDelSQL = string.Format("UPDATE DAILYDATACONSTRUCTION SET CONSTRUCTIONCODE = {0} WHERE CONSTRUCTIONCODE IN (", m_ConstructionCode);
+                string strSelSQL = string.Format("SELECT COUNT(*) FROM {0} WHERE", s_TableName[0]);
+                
+                string strDelSQL = string.Format("DELETE {0} WHERE", s_TableName[0]);
+
+                string strInsSQL = string.Format("INSERT INTO {0}", s_TableName[0]);
+                strInsSQL += " {0} FROM DAILYDATADETAIL WHERE";
+
                 // æ¤œç´¢ã‚­ãƒ¼è¿½åŠ 
-                for (int i = 0; i < LinkList.Count; i++)
+                for (int i = 0; i < DateCodeList.Count; i++)
                 {
-                    if (i != 0) strDelSQL += " ,";
-                    if (i != 0) strSelSQL += " ,";
-                    strDelSQL += string.Format("{0}", LinkList[i].FluctuationCode);
-                    strSelSQL += string.Format("{0}", LinkList[i].FluctuationCode);
-
+                    if (i != 0) strSelSQL += " Or";
+                    if (i != 0) strDelSQL += " Or";
+                    if (i != 0) strInsSQL += " Or";
+                    strSelSQL += string.Format(" CONSTRUCTIONCODE = {0}", DateCodeList[i]);
+                    strDelSQL += string.Format(" CONSTRUCTIONCODE = {0}", DateCodeList[i]);
+                    strInsSQL += string.Format(" CONSTRUCTIONCODE = {0}", DateCodeList[i]);
                 }
-                strDelSQL += ")";
-                strSelSQL += ")";
 
-                int DataCount = GetDailyDataCount(DailyData1, strSelSQL);
-                if (DataCount > 0)
+                // ----- æ—¥å ±ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                ArrayList arList = new ArrayList();
+                int DataCount = 0;
+
+                // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+                List<DailyDataConstruction> DailyList = new List<DailyDataConstruction>();
+                string WorkSQL = strSelSQL.Replace(string.Format("SELECT COUNT(*) FROM {0}", s_TableName[0]), "");
+                WorkSQL += " ORDER BY DAILYDATADATE, CONSTRUCTIONCODE";
+                if (!DailyData1.SelectAction(WorkSQL, ref DailyList, false))
                 {
-                    if (!DailyData1.ExecuteNonQuery(strDelSQL, false))
+                    DailyData1.rollback();
+                    return false;
+                }
+                if (DailyList.Count > 0)
+                {
+                    DateTime BreakDate = DateTime.MinValue;
+                    foreach (DailyDataConstruction CurRec in DailyList)
                     {
-                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                        if (BreakDate.Date == CurRec.DailyDataDate.Date) continue;
+                        if (!DailyData1.UpdateFeild(CurRec.PersonCode, CurRec.DailyDataDate, CurRec.ConstructionCode,
+                                                        (int)IODailyDataConstruction.DataColumn.ConstructionCode, m_ConstructionCode, false))
+                        {
+                            DailyData1.rollback();
+                            return false;
+                        }
+                        BreakDate = CurRec.DailyDataDate;
+                    }
+
+                    // æ®‹ãƒ‡ãƒ¼ã‚¿å‰Šé™¤
+                    arList.Clear();
+                    if (!DailyData1.ExecuteReader(strSelSQL, ref arList, false))
+                    {
+                        DailyData1.rollback();
                         return false;
                     }
+                    DataCount = GetDailyDataCount(arList);
+                    if (DataCount > 0)
+                    {
+                        if (!DailyData1.ExecuteNonQuery(strDelSQL, false))
+                        {
+                            DailyData1.rollback();
+                            return false;
+                        }
+                    }
                 }
 
-                strSelSQL = strSelSQL.Replace("DAILYDATACONSTRUCTION", "DAILYDATADETAIL");
-                strDelSQL = strDelSQL.Replace("DAILYDATACONSTRUCTION", "DAILYDATADETAIL");
-                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
+                // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ (æ˜Žç´°)
+                strSelSQL = strSelSQL.Replace(s_TableName[0], s_TableName[1]);
+                strInsSQL = strInsSQL.Replace(s_TableName[0], s_TableName[1]);
+                strDelSQL = strDelSQL.Replace(s_TableName[0], s_TableName[1]);
+                
+                string strInsSQL1 = string.Format("SELECT PERSONCODE, DAILYDATADATE, {0},", m_ConstructionCode);
+                strInsSQL1 += " ROW_NUMBER() OVER(PARTITION BY DAILYDATADATE ORDER BY PERSONCODE, DAILYDATADATE, CONSTRUCTIONCODE, SEQNO),";
+                strInsSQL1 += " JOBCATEGORYCODE, COMPANYCODE, TODAYHEADCOUNT, TOTALHEADCOUNT, TODAYWORK, NEXTDAYWORK, NEXTDAYHEADCOUNT, ENTRYDATE, UPDATEDATE";
+
+                arList.Clear();
+                if (!DailyData2.ExecuteReader(strSelSQL, ref arList, false))
+                {
+                    DailyData1.rollback(); DailyData2.rollback();
+                    return false;
+                }
+                DataCount = GetDailyDataCount(arList);
                 if (DataCount > 0)
                 {
+                    if (!DailyData2.ExecuteNonQuery(string.Format(strInsSQL, strInsSQL1), false))
+                    {
+                        DailyData1.rollback(); DailyData2.rollback();
+                        return false;
+                    }
                     if (!DailyData2.ExecuteNonQuery(strDelSQL, false))
                     {
-                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                        DailyData1.rollback(); DailyData2.rollback();
                         return false;
                     }
                 }
 
-                strSelSQL = strSelSQL.Replace("DAILYDATADETAIL", "DAILYDATAVEHICLES");
-                strDelSQL = strDelSQL.Replace("DAILYDATADETAIL", "DAILYDATAVEHICLES");
-                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
+                // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ (è»Šä¸¡)
+                strSelSQL = strSelSQL.Replace(s_TableName[1], s_TableName[2]);
+                strInsSQL = strInsSQL.Replace(s_TableName[1], s_TableName[2]);
+                strDelSQL = strDelSQL.Replace(s_TableName[1], s_TableName[2]);
+
+                string strInsSQL2 = string.Format("SELECT PERSONCODE, DAILYDATADATE, {0},", m_ConstructionCode);
+                strInsSQL2 += " ROW_NUMBER() OVER(PARTITION BY DAILYDATADATE ORDER BY PERSONCODE, DAILYDATADATE, CONSTRUCTIONCODE, SEQNO),";
+                strInsSQL2 += " MODEL, PERFORMANCE, OWNER, DRIVER, STARTWORKINGTIME, ENDWORKINGTIME, ENTRYDATE, UPDATEDATE";
+
+                arList.Clear();
+                if (!DailyData3.ExecuteReader(strSelSQL, ref arList, false))
+                {
+                    DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback();
+                    return false;
+                }
+                DataCount = GetDailyDataCount(arList);
                 if (DataCount > 0)
                 {
+                    if (!DailyData3.ExecuteNonQuery(string.Format(strInsSQL, strInsSQL2), false))
+                    {
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback();
+                        return false;
+                    }
                     if (!DailyData3.ExecuteNonQuery(strDelSQL, false))
                     {
-                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback();
                         return false;
                     }
                 }
 
-                strSelSQL = strSelSQL.Replace("DAILYDATAVEHICLES", "DAILYDATAMATERIALS");
-                strDelSQL = strDelSQL.Replace("DAILYDATAVEHICLES", "DAILYDATAMATERIALS");
-                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
+                // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ (è³‡æ��)
+                strSelSQL = strSelSQL.Replace(s_TableName[2], s_TableName[3]);
+                strInsSQL = strInsSQL.Replace(s_TableName[2], s_TableName[3]);
+                strDelSQL = strDelSQL.Replace(s_TableName[2], s_TableName[3]);
+
+                string strInsSQL3 = string.Format("SELECT PERSONCODE, DAILYDATADATE, {0},", m_ConstructionCode);
+                strInsSQL3 += " ROW_NUMBER() OVER(PARTITION BY DAILYDATADATE ORDER BY PERSONCODE, DAILYDATADATE, CONSTRUCTIONCODE, SEQNO),";
+                strInsSQL3 += " MATERIALS, QUANTITY, PRODUCTION, DELIVERY, QUALITYCONTROL, ENTRYDATE, UPDATEDATE";
+
+                arList.Clear();
+                if (!DailyData4.ExecuteReader(strSelSQL, ref arList, false))
+                {
+                    DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback();
+                    return false;
+                }
+                DataCount = GetDailyDataCount(arList);
                 if (DataCount > 0)
                 {
+                    if (!DailyData4.ExecuteNonQuery(string.Format(strInsSQL, strInsSQL3), false))
+                    {
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback();
+                        return false;
+                    }
                     if (!DailyData4.ExecuteNonQuery(strDelSQL, false))
                     {
-                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback();
                         return false;
                     }
                 }
 
-                strSelSQL = strSelSQL.Replace("DAILYDATAMATERIALS", "DAILYDATASUBCONTRACTORS");
-                strDelSQL = strDelSQL.Replace("DAILYDATAMATERIALS", "DAILYDATASUBCONTRACTORS");
-                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
+                // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ (å�”åŠ›æ¥­è€…æŒ‡ç¤º)
+                strSelSQL = strSelSQL.Replace(s_TableName[3], s_TableName[4]);
+                strInsSQL = strInsSQL.Replace(s_TableName[3], s_TableName[4]);
+                strDelSQL = strDelSQL.Replace(s_TableName[3], s_TableName[4]);
+
+                string strInsSQL4 = string.Format("SELECT PERSONCODE, DAILYDATADATE, {0},", m_ConstructionCode);
+                strInsSQL4 += " ROW_NUMBER() OVER(PARTITION BY DAILYDATADATE ORDER BY PERSONCODE, DAILYDATADATE, CONSTRUCTIONCODE, SEQNO),";
+                strInsSQL4 += " ATTENDEE, CONTENTSTEXT, ENTRYDATE, UPDATEDATE";
+
+                arList.Clear();
+                if (!DailyData5.ExecuteReader(strSelSQL, ref arList, false))
+                {
+                    DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback();
+                    return false;
+                }
+                DataCount = GetDailyDataCount(arList);
                 if (DataCount > 0)
                 {
+                    if (!DailyData5.ExecuteNonQuery(string.Format(strInsSQL, strInsSQL4), false))
+                    {
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback();
+                        return false;
+                    }
                     if (!DailyData5.ExecuteNonQuery(strDelSQL, false))
                     {
-                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback();
                         return false;
                     }
                 }
 
-                strSelSQL = strSelSQL.Replace("DAILYDATASUBCONTRACTORS", "DAILYDATAFIELD");
-                strDelSQL = strDelSQL.Replace("DAILYDATASUBCONTRACTORS", "DAILYDATAFIELD");
-                DataCount = GetDailyDataCount(DailyData1, strSelSQL);
+                // å·¥äº‹æ—¥å ±ãƒ‡ãƒ¼ã‚¿ (ç�¾å ´å·¡å›ž)
+                strSelSQL = strSelSQL.Replace(s_TableName[4], s_TableName[5]);
+                strInsSQL = strInsSQL.Replace(s_TableName[4], s_TableName[5]);
+                strDelSQL = strDelSQL.Replace(s_TableName[4], s_TableName[5]);
+
+                string strInsSQL5 = string.Format("SELECT PERSONCODE, DAILYDATADATE, {0},", m_ConstructionCode);
+                strInsSQL5 += " ROW_NUMBER() OVER(PARTITION BY DAILYDATADATE ORDER BY PERSONCODE, DAILYDATADATE, CONSTRUCTIONCODE, SEQNO),";
+                strInsSQL5 += " PATROLTIME, CONTENTSTEXT, ENTRYDATE, UPDATEDATE";
+
+                arList.Clear();
+                if (!DailyData6.ExecuteReader(strSelSQL, ref arList, false))
+                {
+                    DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                    return false;
+                }
+                DataCount = GetDailyDataCount(arList);
                 if (DataCount > 0)
                 {
+                    if (!DailyData6.ExecuteNonQuery(string.Format(strInsSQL, strInsSQL5), false))
+                    {
+                        DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
+                        return false;
+                    }
                     if (!DailyData6.ExecuteNonQuery(strDelSQL, false))
                     {
                         DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
@@ -1528,6 +1664,7 @@
             catch (Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}", ex.Message);
+                DailyData1.rollback(); DailyData2.rollback(); DailyData3.rollback(); DailyData4.rollback(); DailyData5.rollback(); DailyData6.rollback();
                 return false;
             }
         }
@@ -1538,15 +1675,11 @@
         /// æ—¥å ±ãƒ‡ãƒ¼ã‚¿ã�®ä»¶æ•°ã‚’å�–å¾—ã�™ã‚‹
         /// </summary>
         /// <returns></returns>
-        private int GetDailyDataCount(IODailyDataConstruction DailyData1, string strSel)
+        private int GetDailyDataCount(ArrayList CntWork)
         {
             try
             {
                 int iRet = 0;
-                ArrayList CntWork = new ArrayList();
-
-                if (!DailyData1.ExecuteReader(strSel, ref CntWork, false)) return 0;
-
                 object[] objRec = (object[])CntWork[0];
                 iRet = CommonMotions.cnvInt(objRec[0]);
 
@@ -1559,5 +1692,49 @@
             }
         }
         #endregion
+
+        #region æ‹…å½“è€…æ¯ŽçµŒè²»ãƒ‡ãƒ¼ã‚¿çµ�å�ˆ
+        /// <summary>
+        /// æ‹…å½“è€…æ¯ŽçµŒè²»ãƒ‡ãƒ¼ã‚¿çµ�å�ˆ
+        /// </summary>
+        /// <returns></returns>
+        private bool JoinCostData(List<int> DateCodeList, IOCostDataOfPerson CostDataDB)
+        {
+            try
+            {
+                string strSelSQL = "SELECT COUNT(*) FROM COSTDATAOFPERSON WHERE";
+
+                string strMoveSQL = string.Format("UPDATE COSTDATAOFPERSON SET CONSTRUCTIONCODE = {0} WHERE", m_ConstructionCode);
+                // æ¤œç´¢ã‚­ãƒ¼è¿½åŠ 
+                for (int i = 0; i < DateCodeList.Count; i++)
+                {
+                    if (i != 0) strSelSQL += " Or";
+                    if (i != 0) strMoveSQL += " Or";
+                    strSelSQL += string.Format(" CONSTRUCTIONCODE = {0}", DateCodeList[i]);
+                    strMoveSQL += string.Format(" CONSTRUCTIONCODE = {0}", DateCodeList[i]);
+                }
+
+                ArrayList arList = new ArrayList();
+                if (!CostDataDB.ExecuteReader(strSelSQL, ref arList, false)) return false;
+                object[] objRec = (object[])arList[0];
+
+                if (CommonMotions.cnvInt(objRec[0]) > 0)
+                {
+                    if (!CostDataDB.ExecuteNonQuery(strMoveSQL, false))
+                    {
+                        CostDataDB.rollback();
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}", ex.Message);
+                return false;
+            }
+        }
+        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 48)
@@ -371,7 +371,7 @@
                 for (int i = 0; i < dgv.ColumnCount; i++)
                 {
                     dgv.Rows[e.RowIndex].Cells[i].Style.ForeColor = Color.Black;
-                    dgv.Rows[e.RowIndex].Cells[i].Style.BackColor = Color.White;
+                    dgv.Rows[e.RowIndex].Cells[i].Style.BackColor = Color.Goldenrod;
                     dgv.Rows[e.RowIndex].Cells[i].ReadOnly = true;
                 }
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs	(revision 48)
@@ -51,6 +51,7 @@
             this.lblLabel04 = new System.Windows.Forms.Label();
             this.btnEnd = new System.Windows.Forms.Button();
             this.btnDataEntry = new System.Windows.Forms.Button();
+            this.btnTargetOut = new System.Windows.Forms.Button();
             this.groupBox2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -60,10 +61,13 @@
             this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
@@ -280,6 +284,19 @@
             this.btnDataEntry.UseVisualStyleBackColor = false;
             this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
             // 
+            // btnTargetOut
+            // 
+            this.btnTargetOut.BackColor = System.Drawing.Color.LightYellow;
+            this.btnTargetOut.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnTargetOut.ForeColor = System.Drawing.Color.Black;
+            this.btnTargetOut.Location = new System.Drawing.Point(874, 656);
+            this.btnTargetOut.Name = "btnTargetOut";
+            this.btnTargetOut.Size = new System.Drawing.Size(120, 30);
+            this.btnTargetOut.TabIndex = 96;
+            this.btnTargetOut.Text = "ä½œæˆ�å¯¾è±¡å¤–ã‚»ãƒƒãƒˆ";
+            this.btnTargetOut.UseVisualStyleBackColor = false;
+            this.btnTargetOut.Click += new System.EventHandler(this.btnTargetOut_Click);
+            // 
             // groupBox2
             // 
             this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -318,10 +335,13 @@
             this.Column9,
             this.Column1,
             this.Column5,
+            this.Column10,
             this.Column2,
             this.Column7,
             this.Column8,
-            this.Column4});
+            this.Column4,
+            this.Column11,
+            this.Column12});
             this.dgvAllDisplay.Location = new System.Drawing.Point(10, 22);
             this.dgvAllDisplay.Name = "dgvAllDisplay";
             this.dgvAllDisplay.RowHeadersVisible = false;
@@ -365,7 +385,7 @@
             this.Column3.ReadOnly = true;
             this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 400;
+            this.Column3.Width = 350;
             // 
             // Column6
             // 
@@ -377,7 +397,7 @@
             this.Column6.ReadOnly = true;
             this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 400;
+            this.Column6.Width = 350;
             // 
             // Column9
             // 
@@ -384,9 +404,10 @@
             dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column9.Frozen = true;
-            this.Column9.HeaderText = "ç”³è«‹ãƒ»æ‰¿èª�";
+            this.Column9.HeaderText = "ç”³è«‹å›ž";
             this.Column9.Name = "Column9";
             this.Column9.ReadOnly = true;
+            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
             // Column1
             // 
@@ -412,6 +433,13 @@
             this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column5.Width = 150;
             // 
+            // Column10
+            // 
+            this.Column10.Frozen = true;
+            this.Column10.HeaderText = "ä½œæˆ�å¯¾è±¡å¤–";
+            this.Column10.Name = "Column10";
+            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            // 
             // Column2
             // 
             this.Column2.Frozen = true;
@@ -441,12 +469,28 @@
             // Column4
             // 
             this.Column4.Frozen = true;
-            this.Column4.HeaderText = "å�—ä»˜ç•ªå�·";
+            this.Column4.HeaderText = "ç”³è«‹å�—ä»˜ç•ªå�·";
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
             this.Column4.Visible = false;
             this.Column4.Width = 5;
             // 
+            // Column11
+            // 
+            this.Column11.HeaderText = "è¡Œç•ªå�·";
+            this.Column11.Name = "Column11";
+            this.Column11.ReadOnly = true;
+            this.Column11.Visible = false;
+            // 
+            // Column12
+            // 
+            this.Column12.HeaderText = "æ³¨æ–‡æ›¸æž�ç•ª";
+            this.Column12.Name = "Column12";
+            this.Column12.ReadOnly = true;
+            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column12.Visible = false;
+            this.Column12.Width = 5;
+            // 
             // FrmOrderEntryList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -453,6 +497,7 @@
             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.btnTargetOut);
             this.Controls.Add(this.btnDataEntry);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.btnEnd);
@@ -496,6 +541,7 @@
         private System.Windows.Forms.Label lblDispCnt01;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Button btnTargetOut;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
@@ -503,9 +549,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Column10;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs	(revision 48)
@@ -72,6 +72,10 @@
             /// </summary>
             PurchaseExists,
             /// <summary>
+            /// ä½œæˆ�å¯¾è±¡å¤–
+            /// </summary>
+            NotCreate,
+            /// <summary>
             /// é�¸æŠžãƒ�ã‚§ãƒƒã‚¯
             /// </summary>
             SelectExec,
@@ -87,6 +91,10 @@
             /// å�—ä»˜ç•ªå�·
             /// </summary>
             OrderNo,
+            /// <summary>
+            /// è¡Œç•ªå�·
+            /// </summary>
+            LineCount,
         }
         #endregion
 
@@ -137,8 +145,9 @@
             Making,
             Request,
             Approvals,
+            NotMaking,
         }
-        private string[] DataStatusString = new string[] { "æœªä½œæˆ�", "ä½œæˆ�ä¸­", "ç”³è«‹ä¸­", "æ‰¿èª�æ¸ˆ" };
+        private string[] DataStatusString = new string[] { "æœªä½œæˆ�", "ä½œæˆ�ä¸­", "ç”³è«‹ä¸­", "æ‰¿èª�æ¸ˆ", "ä½œæˆ�å¯¾è±¡å¤–" };
         #endregion
 
         #endregion
@@ -251,13 +260,13 @@
                 // ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
                 DataDisplay();
 
-                // å�‚ç…§æ™‚ã�¯å¤‰æ›´ã�§ã��ã�ªã�„
-                if (m_EditLock)
-                {
-                    // ã‚°ãƒªãƒƒãƒ‰ã‚’èª­è¾¼å°‚ç”¨ã�«ã�™ã‚‹
-                    dgvAllDisplay.ReadOnly = true;
-                    btnDataEntry.Enabled = false;
-                }
+                //// å�‚ç…§æ™‚ã�¯å¤‰æ›´ã�§ã��ã�ªã�„
+                //if (m_EditLock)
+                //{
+                //    // ã‚°ãƒªãƒƒãƒ‰ã‚’èª­è¾¼å°‚ç”¨ã�«ã�™ã‚‹
+                //    dgvAllDisplay.ReadOnly = true;
+                //    btnDataEntry.Enabled = false;
+                //}
             }
             catch (System.Exception ex)
             {
@@ -323,529 +332,54 @@
         }
         #endregion
 
-        #region ã‚°ãƒªãƒƒãƒ‰ã‚»ãƒ«ã‚¯ãƒªãƒƒã‚¯
+        #region ä½œæˆ�å¯¾è±¡å¤–ã‚»ãƒƒãƒˆæŠ¼ä¸‹
         /// <summary>
-        /// ã‚°ãƒªãƒƒãƒ‰ã‚»ãƒ«ã‚¯ãƒªãƒƒã‚¯
+        /// ä½œæˆ�å¯¾è±¡å¤–ã‚»ãƒƒãƒˆæŠ¼ä¸‹
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void dgvAllDisplay_CellClick(object sender, DataGridViewCellEventArgs e)
+        private void btnTargetOut_Click(object sender, EventArgs e)
         {
-            try
-            {
+            // å·¥äº‹è©³ç´°å�°å¸³æ˜Žç´°ãƒ‡ãƒ¼ã‚¿æ›´æ–°
+            UpdateTargetOut();
 
-                DataGridView dgv = dgvAllDisplay;
-                bool bAns = (bool)dgv.Rows[e.RowIndex].Cells[(int)GridColumn.SelectExec].Value;
-                dgv.Rows[e.RowIndex].Cells[(int)GridColumn.SelectExec].Value = !bAns;
-
-                if (e.ColumnIndex == (int)GridColumn.SelectExec)
-                {
-                    dgv.EndEdit();
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-
+            // å†�è¡¨ç¤º
+            DataDisplay();
         }
         #endregion
 
-        // ---------- å†…éƒ¨å‡¦ç�†
-        #region è¡¨ç¤ºã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã�®å�–å¾—
+        #region ã‚°ãƒªãƒƒãƒ‰ã‚»ãƒ«ã‚¯ãƒªãƒƒã‚¯
         /// <summary>
-        /// è¡¨ç¤ºã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã�®å�–å¾—
+        /// ã‚°ãƒªãƒƒãƒ‰ã‚»ãƒ«ã‚¯ãƒªãƒƒã‚¯
         /// </summary>
-        private void SetDisplayObject()
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvAllDisplay_CellClick(object sender, DataGridViewCellEventArgs e)
         {
-            int DspCtrlCnt = Enum.GetNames(typeof(DspLblCtrlName)).Length;
-            m_DspLabelCtrl = new Control[DspCtrlCnt];
-
-            // ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±
-            m_DspLabelCtrl[(int)DspLblCtrlName.ConstCode] = lblLabel01;
-            m_DspLabelCtrl[(int)DspLblCtrlName.ConstName] = lblLabel02;
-            m_DspLabelCtrl[(int)DspLblCtrlName.ConstPlace] = lblLabel03;
-
-            m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName] = lblLabel04;
-            m_DspLabelCtrl[(int)DspLblCtrlName.ConstructionType] = label17;
-
-            m_DspLabelCtrl[(int)DspLblCtrlName.OrderPrice] = label6;
-            m_DspLabelCtrl[(int)DspLblCtrlName.PurchaseCount] = lblDispCnt01;
-        }
-        #endregion
-
-        #region å·¥äº‹æƒ…å ±å�–å¾—å‡¦ç�†
-        /// <summary>
-        /// å·¥äº‹æƒ…å ±å�–å¾—
-        /// </summary>
-        /// <returns></returns>
-        private bool GetBaseInfoData()
-        {
-            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
             try
             {
-                string strSQL = cbDB.CreatePrimarykeyString(m_ConstructionCode);
-                if (!cbDB.SelectAction(strSQL, ref m_ConstructionBaseInfo)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                cbDB.close(); cbDB = null;
-            }
-        }
-        #endregion
-
-        #region ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±ã�®è¡¨ç¤º
-        /// <summary>
-        /// ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±ã�®è¡¨ç¤º
-        /// </summary>
-        private void DispHeader()
-        {
-            IOConstructionBaseInfoDetail cbidDB = new IOConstructionBaseInfoDetail();
-            try
-            {
-                string strConstrCode = CommonMotions.cnvStringCodeFromInt(m_ConstructionCode, "-", 8);       // å·¥äº‹ã‚³ãƒ¼ãƒ‰
-                m_DspLabelCtrl[(int)DspLblCtrlName.ConstCode].Text = strConstrCode;
-
-                // å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ãƒ»æ‹…å½“è€…ãƒžã‚¹ã‚¿ãƒ»å·¥äº‹ç¨®åˆ¥ãƒžã‚¹ã‚¿å�–å¾—
-                string strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILNO, B.DETAILSTRING, C.PERSONCODE, C.PERSONNAME, D.TYPECODE, D.NAMESTRING, A.ORDERSDECISIONPRICE";
-                strSQL += " FROM CONSTRUCTIONBASEINFO A";
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B";
-                strSQL += " ON B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
-                strSQL += string.Format(" AND (B.DETAILNO = {0} OR B.DETAILNO = {1} OR B.DETAILNO = {2} OR B.DETAILNO = {3})",
-                                        (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName,                          // å·¥äº‹å��ç§°
-                                            (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace1,                    // å·¥äº‹å ´æ‰€ï¼‘
-                                            (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace2,                    // å·¥äº‹å ´æ‰€ï¼’
-                                            (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace3);                   // å·¥äº‹å ´æ‰€ï¼“
-                strSQL += " LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.CONSTRUCTIONPERSONCODE";
-                strSQL += " LEFT JOIN CONSTRUCTIONTYPEMASTER D ON D.TYPECODE = A.CONSTRUCTIONTYPE";
-                strSQL += " LEFT JOIN CONSTRUCTIONLEDGER E ON E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
-
-                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                strSQL += " ORDER BY B.DETAILNO ASC";
-
-                ArrayList workList = new ArrayList();
-                if (!cbidDB.ExecuteReader(strSQL, ref workList)) return;
-                string ConstrName = string.Empty;
-                string ConstrPlace = string.Empty;
-                string CreatorName = string.Empty;
-                string ConstructionType = string.Empty;
-                int OrderPrice = 0;
-                foreach (object[] wrkRec in workList)
-                {
-                    switch (CommonMotions.cnvInt(wrkRec[1]))
-                    {
-                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName:
-                            ConstrName = CommonMotions.cnvString(wrkRec[2]);
-                            break;
-                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace1:
-                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace2:
-                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace3:
-                            ConstrPlace += CommonMotions.cnvString(wrkRec[2]);
-                            break;
-                    }
-                    CreatorName = CommonMotions.cnvString(wrkRec[4]);
-                    ConstructionType = CommonMotions.cnvString(wrkRec[6]);
-                    OrderPrice = CommonMotions.cnvInt(wrkRec[7]);
-                }
-                m_DspLabelCtrl[(int)DspLblCtrlName.ConstName].Text = ConstrName;                    // å·¥äº‹å��ç§°
-                m_DspLabelCtrl[(int)DspLblCtrlName.ConstPlace].Text = ConstrPlace;                  // å·¥äº‹å ´æ‰€
-                m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName].Text = CreatorName;                 // å·¥äº‹æ‹…å½“è€…å�–å¾—
-                m_DspLabelCtrl[(int)DspLblCtrlName.ConstructionType].Text = ConstructionType;       // å·¥äº‹ç¨®åˆ¥ãƒžã‚¹ã‚¿å�–å¾—
-                m_DspLabelCtrl[(int)DspLblCtrlName.OrderPrice].Text = OrderPrice.ToString("#,0");   // å�—æ³¨é‡‘é¡�
-
-           }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                cbidDB.close(); cbidDB = null;
-            }
-        }
-        #endregion
-
-        #region DBèª­è¾¼é †
-        /// <summary>
-        /// DBèª­è¾¼é †
-        /// </summary>
-        public enum ReadDBColumn
-        {
-            ConstructionCode = 0,
-            FirstString,
-            SecondString,
-            CompanyCode,
-            CompanyName,
-            ExecutionAmount,
-            SourceCode,
-            PurchaseOrderflg,
-            DetailString,
-            ApprovalStatus,
-            PurchaseSeqNo,
-            LedgerLine,
-            OrderNo,
-            PrintoutDate,
-        }
-        #endregion
-
-        #region ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
-        /// <summary>
-        /// ä¸€è¦§ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
-        /// </summary>
-        private void DataDisplay()
-        {
-            IOConstructionBaseInfoDetail BaseDetailDB = new IOConstructionBaseInfoDetail();
-            DataGridView dgv = dgvAllDisplay;
-            try
-            {
-                dgv.Rows.Clear();
-                m_OrderFrm.DetailList.Clear();
-
-                string strSQL = "";
-                int SearchCode = m_ConstructionCode;
-                if (m_ConstructionBaseInfo.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
-                {   // çµ�å�ˆã�®è¦ªå·¥äº‹
-                    SearchCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-                    CreateSQL(ref strSQL, SearchCode, 0);
-                }
-                else if (m_ConstructionBaseInfo.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinChildren)
-                {   // çµ�å�ˆã�®æ§‹æˆ�å·¥äº‹
-                    SearchCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-                    CreateSQL(ref strSQL, SearchCode, m_ConstructionCode);
-                }
-                else if (m_ConstructionBaseInfo.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Standard)
-                {   // å¢—æ¸›å·¥äº‹
-                    SearchCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
-                    CreateSQL(ref strSQL, SearchCode, m_ConstructionCode);
-                }
-                else
-                {   // é€šå¸¸å·¥äº‹
-                    // å…ƒå·¥äº‹ã‚’è¡¨ç¤ºã�—ã�ªã�„
-                    dgv.Columns[(int)GridColumn.PurchaseName].Width += dgv.Columns[(int)GridColumn.SourceName].Width;
-                    dgv.Columns[(int)GridColumn.SourceName].Visible = false;
-                    CreateSQL(ref strSQL, m_ConstructionCode, 0);               // SQLä½œæˆ�
-                }
-
-                ArrayList arList = new ArrayList();
-                // å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—
-                if (!BaseDetailDB.ExecuteReader(strSQL, ref arList)) return;
-
-                int iNo = 1;
-                string brkConstrName = string.Empty;
-                string strConstrName = string.Empty;
-                string strCompanyName = string.Empty;
-                string strCount = string.Empty;
-                int AppStat = 0;
-                int Orderflg = 0;
-                int ApprovalCnt = 0;
-                int OrderNo = 0;
-                DateTime Printout = DateTime.Now;
-                foreach (object[] objRec in arList)
-                {
-                    // è¦ªãƒ•ã‚©ãƒ¼ãƒ ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                    m_OrderFrm.DetailList.Add(objRec);
-
-                    AppStat = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.ApprovalStatus]);
-                    Orderflg = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.PurchaseOrderflg]);
-                    OrderNo = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.OrderNo]);
-                    Printout = CommonMotions.cnvDate(objRec[(int)ReadDBColumn.PrintoutDate]);
-
-                    strConstrName = CommonMotions.cnvString(objRec[(int)ReadDBColumn.DetailString]);
-                    strCompanyName = CommonMotions.cnvString(objRec[(int)ReadDBColumn.CompanyName]);
-
-                    if (!brkConstrName.Equals(strConstrName)) brkConstrName = strConstrName;
-                    else strConstrName = string.Empty;
-
-                    strCount = string.Empty;
-                    if (OrderNo < 0)
-                    {
-                        strCount = "ä¸€ã€€æ‹¬";
-                    }
-                    else
-                    {
-                        if (OrderNo != 0) strCount = string.Format("{0}å›žç›®", OrderNo);
-                    }
-                    int CurRowCnt = dgv.Rows.Add(iNo++,
-                                                    0,
-                                                    strConstrName,
-                                                    strCompanyName,
-                                                    strCount,
-                                                    CommonMotions.cnvInt(objRec[(int)ReadDBColumn.ExecutionAmount]).ToString("#,0"),
-                                                    "",
-                                                    false,
-                                                    CommonMotions.cnvInt(objRec[(int)ReadDBColumn.SourceCode]),
-                                                    CommonMotions.cnvInt(objRec[(int)ReadDBColumn.ConstructionCode]),
-                                                    OrderNo
-                                                    );
-                    // è¡ŒçŠ¶æ…‹ã‚»ãƒƒãƒˆ
-                    ChageRowColor(CurRowCnt, Orderflg, AppStat, Printout, ref  ApprovalCnt);
-                }
-                m_DspLabelCtrl[(int)DspLblCtrlName.PurchaseCount].Text = string.Format("{0}/{1}", ApprovalCnt, arList.Count);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                BaseDetailDB.close(); BaseDetailDB = null;
-                if (dgv.RowCount < 18) dgv.Rows.Add(18 - dgv.RowCount);
-            }
-        }
-        #endregion
-
-        #region è¡Œè‰²ãƒ»çŠ¶æ…‹ã‚»ãƒƒãƒˆ
-        /// <summary>
-        /// è¡Œè‰²ãƒ»çŠ¶æ…‹ã‚»ãƒƒãƒˆ
-        /// </summary>
-        private void ChageRowColor(int CurRowCnt, int Orderflg, int AppStat, DateTime Printout, ref int ApprovalCnt)
-        {
-            try
-            {
                 DataGridView dgv = dgvAllDisplay;
 
-                string strCreate = string.Empty;
-                int i = 0;
-                Color wrkColor = Color.White;
-                switch (Orderflg)
+                switch (e.ColumnIndex)
                 {
-                    case (int)CommonDefine.PurchaseOrderFlg.NoCreate:
-                        strCreate = DataStatusString[(int)DataStatusNo.NoCreate];
-                        wrkColor = Color.White;
+                    case (int)GridColumn.SelectExec:
+                        // é�¸æŠžå‡¦ç�†
+                        bool bAns = (bool)dgv.Rows[e.RowIndex].Cells[(int)GridColumn.SelectExec].Value;
+                        dgv.Rows[e.RowIndex].Cells[(int)GridColumn.SelectExec].Value = !bAns;
+                        dgv.EndEdit();
+                        GridSelectData(e.RowIndex);
                         break;
-                    case (int)CommonDefine.PurchaseOrderFlg.Making:
-                        switch (AppStat)
-                        {
-                            case (int)CommonDefine.ApprovalStatus.Approval:
-                                strCreate = DataStatusString[(int)DataStatusNo.Approvals];
-                                wrkColor = Color.LightGray;
-                                break;
-                            case -1:
-                                strCreate = DataStatusString[(int)DataStatusNo.Making];
-                                // ãƒ�ã‚§ãƒƒã‚¯ã‚»ãƒ«è‰²æ›¿ã�ˆ
-                                wrkColor = Color.LightCyan;
-                                break;
-                            default:
-                                strCreate = DataStatusString[(int)DataStatusNo.Request];
-                                // ãƒ�ã‚§ãƒƒã‚¯ã‚»ãƒ«è‰²æ›¿ã�ˆ
-                                wrkColor = Color.LemonChiffon;
-                                break;
-                        }
-                        if (Printout != DateTime.MinValue.Date) ApprovalCnt++;
-                        break;
                     default:
-                        strCreate = DataStatusString[(int)DataStatusNo.Approvals];
-                        wrkColor = Color.LightGray;
                         break;
                 }
-                dgv.Rows[CurRowCnt].Cells[(int)GridColumn.PurchaseExists].Value = strCreate;
-                foreach (DataGridViewCell CurCell in dgv.Rows[CurRowCnt].Cells)
-                {
-                    if (i++ < (int)GridColumn.SourceName) continue;
-                    CurCell.Style.BackColor = wrkColor;
-                }
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-        }
-        #endregion
 
-        #region ä¸€è¦§æ¤œç´¢ï¼³ï¼±ï¼¬ä½œæˆ�
-        /// <summary>
-        /// ä¸€è¦§æ¤œç´¢ï¼³ï¼±ï¼¬ä½œæˆ�
-        /// </summary>
-        /// <param name="strSQL"></param>
-        private void CreateSQL(ref string strSQL, int OrderCode,int SearchCode)
-        {
-            try
-            {
-                strSQL = "SELECT A.CONSTRUCTIONCODE";
-                strSQL += ", A.FIRSTSTRING";
-                strSQL += ", A.SECONDSTRING";
-                strSQL += ", A.COMPANYCODE";
-                strSQL += ", A.COMPANYNAME";
-                strSQL += ", A.EXECUTIONAMOUNT";
-                strSQL += ", A.SOURCECODE";
-                strSQL += ", A.PURCHASEORDERFLG";
-                strSQL += ", B.DETAILSTRING";
-                strSQL += ", NVL(C.APPROVALSTATUS, -1) APPVAL";
-                strSQL += ", F.SEQNO";
-                strSQL += ", A.LINECOUNT";
-                strSQL += ", NVL(C.ORDERNO, 0)";
-                strSQL += ", TO_CHAR(F.PRINTOUTDATE,'YYYY/MM/DD')";
-                strSQL += " FROM CONSTRUCTIONLEDGERDETAIL A";
-
-                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.SOURCECODE";
-                strSQL += string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
-
-                strSQL += " LEFT JOIN PURCHASEORDERDETAIL E ON (E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE OR E.CONSTRUCTIONCODE = A.SOURCECODE)";
-
-                strSQL += " LEFT JOIN PURCHASEORDER F ON F.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE AND F.COMPANYCODE = A.COMPANYCODE";
-
-                strSQL += " LEFT JOIN PROCESSAPPROVALDETAIL G ON G.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND G.APPROVALCODE = 4 AND G.LINKCODE = F.SEQNO";
-
-                strSQL += " LEFT JOIN PROCESSAPPROVAL C ON (C.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE OR C.CONSTRUCTIONCODE = A.SOURCECODE)";
-                strSQL += string.Format(" AND C.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
-                strSQL += " AND C.ORDERNO = G.ORDERNO AND C.SEQNO = 1";
-
-                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", OrderCode);
-                if (SearchCode != 0) strSQL += string.Format(" AND A.SOURCECODE = {0}", SearchCode);
-
-                strSQL += string.Format(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
-                strSQL += " AND A.COMPANYCODE > 0";
-                strSQL += string.Format(" AND A.COMPANYTYPE <> {0}", (int)CommonDefine.CodeDataType.Person);
-                strSQL += string.Format(" AND A.EXECUTIONAMOUNT > {0}", CommonDefine.s_PrintOutPrice);
-
-                strSQL += " GROUP BY";
-                strSQL += " A.CONSTRUCTIONCODE";
-                strSQL += ", A.FIRSTSTRING";
-                strSQL += ", A.SECONDSTRING";
-                strSQL += ", A.COMPANYCODE";
-                strSQL += ", A.COMPANYNAME";
-                strSQL += ", A.EXECUTIONAMOUNT";
-                strSQL += ", A.SOURCECODE";
-                strSQL += ", A.PURCHASEORDERFLG";
-                strSQL += ", B.DETAILSTRING";
-                strSQL += ", C.APPROVALSTATUS";
-                strSQL += ", F.SEQNO";
-                strSQL += ", A.LINECOUNT";
-                strSQL += ", C.ORDERNO";
-                strSQL += ", F.PRINTOUTDATE";
-                strSQL += " ORDER BY APPVAL ASC, A.COMPANYCODE ASC, A.SOURCECODE ASC";
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
         }
         #endregion
 
-        #region ãƒ‡ãƒ¼ã‚¿é�¸æŠžå‡¦ç�†
-        /// <summary>
-        /// ãƒ‡ãƒ¼ã‚¿é�¸æŠžå‡¦ç�†
-        /// </summary>
-        private void SelectRowData()
-        {
-            try
-            {
-                DataGridView dgv = dgvAllDisplay;
-
-                for (int i = (dgv.RowCount - 1); i >= 0; i--)
-                {
-                    if (CommonMotions.chkCellBlank(dgv.Rows[i].Cells[(int)GridColumn.SelectExec].Value)) continue;
-                    if ((bool)dgv.Rows[i].Cells[(int)GridColumn.SelectExec].Value) continue;
-
-                    // æ—§å‡¦ç�†ã�§ã�®æ‰¿èª�ã�¯ä¸€æ‹¬ã�§ã�Šã�“ã�ªã�£ã�¦ã�„ã‚‹ã�Ÿã‚�ã��ã‚Œã�Œã�‚ã‚Œã�°å…¨ãƒ‡ãƒ¼ã‚¿å¯¾è±¡
-                    if (CommonMotions.cnvInt(dgv.Rows[i].Cells[(int)GridColumn.OrderNo].Value) < 0) break;
-
-                    // å†…éƒ¨ãƒ‡ãƒ¼ã‚¿å‰Šé™¤ï¼ˆè¦ªãƒ•ã‚©ãƒ¼ãƒ ã�®ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚’ç·¨é›†ã�™ã‚‹ï¼‰
-                    m_OrderFrm.DetailList.RemoveAt(i);
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region ç”»é�¢é …ç›®ã�®ãƒ�ã‚§ãƒƒã‚¯
-        /// <summary>
-        /// ç”»é�¢é …ç›®ã�®ãƒ�ã‚§ãƒƒã‚¯
-        /// </summary>
-        /// <returns></returns>
-        private bool DispFeildCheck()
-        {
-            bool bRet = true;
-            try
-            {
-                DataGridView dgv = dgvAllDisplay;
-
-                // é�¸æŠžã‚¨ãƒ©ãƒ¼ãƒ�ã‚§ãƒƒã‚¯
-                bool bNoCreateData = false;
-                bool bMakeingData = false;
-                bool bApprovalData = false;
-                bool bUnMatchOrderNO = false;
-                int OrderNo = -1;
-                int SelectCnt = 0;
-                string CreateStat = string.Empty;
-                foreach (DataGridViewRow CurRow in dgv.Rows)
-                {
-                    // ãƒ�ã‚§ãƒƒã‚¯ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
-                    if (CommonMotions.chkCellBlank(CurRow.Cells[(int)GridColumn.SelectExec].Value)) continue;
-                    if (!(bool)CurRow.Cells[(int)GridColumn.SelectExec].Value) continue;
-
-                    // ãƒ‡ãƒ¼ã‚¿æœªä½œæˆ�ãƒ»ä½œæˆ�æ¸ˆã�®ãƒ�ã‚§ãƒƒã‚¯
-                    CreateStat = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn.PurchaseExists].Value);
-                    if (CreateStat.Equals(DataStatusString[(int)DataStatusNo.NoCreate])) bNoCreateData = true;
-                    else if (CreateStat.Equals(DataStatusString[(int)DataStatusNo.Approvals])) bApprovalData = true;
-                    else bMakeingData = true;
-
-                    // å�—ä»˜ç•ªå�·ã�®æ•´å�ˆæ€§ãƒ�ã‚§ãƒƒã‚¯
-                    if (OrderNo != CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderNo].Value))
-                    {
-                        if (OrderNo > -1) bUnMatchOrderNO = true;
-                        OrderNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderNo].Value);
-                    }
-
-                    // ãƒ‡ãƒ¼ã‚¿ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
-                    SelectCnt++;
-                }
-                
-                if (bNoCreateData && bMakeingData && bApprovalData)
-                {
-                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šæ–°è¦�ä½œæˆ�ãƒ»ç·¨é›†ãƒ»é–²è¦§ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                if (bNoCreateData && bMakeingData)
-                {
-                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šæ–°è¦�ä½œæˆ�ãƒ»ç·¨é›†ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                if (bMakeingData && bApprovalData)
-                {
-                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šç·¨é›†ãƒ»é–²è¦§ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                if (bNoCreateData && bApprovalData)
-                {
-                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šæ–°è¦�ä½œæˆ�ãƒ»é–²è¦§ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                if (SelectCnt < 1)
-                {
-                    MessageBox.Show("ãƒ‡ãƒ¼ã‚¿ã�Œé�¸æŠžã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                if (bUnMatchOrderNO)
-                {
-                    MessageBox.Show("ä½œæˆ�ãƒ»ç·¨é›†æ™‚ã�«\r\nç”³è«‹ãƒ»æ‰¿èª�ã�Œé�•ã�†ãƒ‡ãƒ¼ã‚¿ã�¯ä¸€ç·’ã�«é�¸æŠžã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
-                if (bNoCreateData) m_OrderFrm.CreateData = true;
-                else m_OrderFrm.CreateData = false;
-
-                return bRet;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.resx	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.resx	(revision 48)
@@ -129,6 +129,9 @@
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -141,4 +144,10 @@
   <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 48)
@@ -0,0 +1,732 @@
+ï»¿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.Linq;
+
+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
+{
+    partial class FrmOrderEntryList
+    {
+        #region è¡¨ç¤ºã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã�®å�–å¾—
+        /// <summary>
+        /// è¡¨ç¤ºã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã�®å�–å¾—
+        /// </summary>
+        private void SetDisplayObject()
+        {
+            int DspCtrlCnt = Enum.GetNames(typeof(DspLblCtrlName)).Length;
+            m_DspLabelCtrl = new Control[DspCtrlCnt];
+
+            // ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±
+            m_DspLabelCtrl[(int)DspLblCtrlName.ConstCode] = lblLabel01;
+            m_DspLabelCtrl[(int)DspLblCtrlName.ConstName] = lblLabel02;
+            m_DspLabelCtrl[(int)DspLblCtrlName.ConstPlace] = lblLabel03;
+
+            m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName] = lblLabel04;
+            m_DspLabelCtrl[(int)DspLblCtrlName.ConstructionType] = label17;
+
+            m_DspLabelCtrl[(int)DspLblCtrlName.OrderPrice] = label6;
+            m_DspLabelCtrl[(int)DspLblCtrlName.PurchaseCount] = lblDispCnt01;
+        }
+        #endregion
+
+        #region å·¥äº‹æƒ…å ±å�–å¾—å‡¦ç�†
+        /// <summary>
+        /// å·¥äº‹æƒ…å ±å�–å¾—
+        /// </summary>
+        /// <returns></returns>
+        private bool GetBaseInfoData()
+        {
+            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
+            try
+            {
+                string strSQL = cbDB.CreatePrimarykeyString(m_ConstructionCode);
+                if (!cbDB.SelectAction(strSQL, ref m_ConstructionBaseInfo)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                cbDB.close(); cbDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±ã�®è¡¨ç¤º
+        /// <summary>
+        /// ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±ã�®è¡¨ç¤º
+        /// </summary>
+        private void DispHeader()
+        {
+            IOConstructionBaseInfoDetail cbidDB = new IOConstructionBaseInfoDetail();
+            try
+            {
+                string strConstrCode = CommonMotions.cnvStringCodeFromInt(m_ConstructionCode, "-", 8);       // å·¥äº‹ã‚³ãƒ¼ãƒ‰
+                m_DspLabelCtrl[(int)DspLblCtrlName.ConstCode].Text = strConstrCode;
+
+                // å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ãƒ»æ‹…å½“è€…ãƒžã‚¹ã‚¿ãƒ»å·¥äº‹ç¨®åˆ¥ãƒžã‚¹ã‚¿å�–å¾—
+                string strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILNO, B.DETAILSTRING, C.PERSONCODE, C.PERSONNAME, D.TYPECODE, D.NAMESTRING, A.ORDERSDECISIONPRICE";
+                strSQL += " FROM CONSTRUCTIONBASEINFO A";
+                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B";
+                strSQL += " ON B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND (B.DETAILNO = {0} OR B.DETAILNO = {1} OR B.DETAILNO = {2} OR B.DETAILNO = {3})",
+                                        (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName,                          // å·¥äº‹å��ç§°
+                                            (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace1,                    // å·¥äº‹å ´æ‰€ï¼‘
+                                            (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace2,                    // å·¥äº‹å ´æ‰€ï¼’
+                                            (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace3);                   // å·¥äº‹å ´æ‰€ï¼“
+                strSQL += " LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.CONSTRUCTIONPERSONCODE";
+                strSQL += " LEFT JOIN CONSTRUCTIONTYPEMASTER D ON D.TYPECODE = A.CONSTRUCTIONTYPE";
+                strSQL += " LEFT JOIN CONSTRUCTIONLEDGER E ON E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
+
+                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL += " ORDER BY B.DETAILNO ASC";
+
+                ArrayList workList = new ArrayList();
+                if (!cbidDB.ExecuteReader(strSQL, ref workList)) return;
+                string ConstrName = string.Empty;
+                string ConstrPlace = string.Empty;
+                string CreatorName = string.Empty;
+                string ConstructionType = string.Empty;
+                int OrderPrice = 0;
+                foreach (object[] wrkRec in workList)
+                {
+                    switch (CommonMotions.cnvInt(wrkRec[1]))
+                    {
+                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName:
+                            ConstrName = CommonMotions.cnvString(wrkRec[2]);
+                            break;
+                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace1:
+                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace2:
+                        case (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionPlace3:
+                            ConstrPlace += CommonMotions.cnvString(wrkRec[2]);
+                            break;
+                    }
+                    CreatorName = CommonMotions.cnvString(wrkRec[4]);
+                    ConstructionType = CommonMotions.cnvString(wrkRec[6]);
+                    OrderPrice = CommonMotions.cnvInt(wrkRec[7]);
+                }
+                m_DspLabelCtrl[(int)DspLblCtrlName.ConstName].Text = ConstrName;                    // å·¥äº‹å��ç§°
+                m_DspLabelCtrl[(int)DspLblCtrlName.ConstPlace].Text = ConstrPlace;                  // å·¥äº‹å ´æ‰€
+                m_DspLabelCtrl[(int)DspLblCtrlName.CreatorName].Text = CreatorName;                 // å·¥äº‹æ‹…å½“è€…å�–å¾—
+                m_DspLabelCtrl[(int)DspLblCtrlName.ConstructionType].Text = ConstructionType;       // å·¥äº‹ç¨®åˆ¥ãƒžã‚¹ã‚¿å�–å¾—
+                m_DspLabelCtrl[(int)DspLblCtrlName.OrderPrice].Text = OrderPrice.ToString("#,0");   // å�—æ³¨é‡‘é¡�
+
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                cbidDB.close(); cbidDB = null;
+            }
+        }
+        #endregion
+
+        #region DBèª­è¾¼é †
+        /// <summary>
+        /// DBèª­è¾¼é †
+        /// </summary>
+        public enum ReadDBColumn
+        {
+            ConstructionCode = 0,
+            FirstString,
+            SecondString,
+            CompanyCode,
+            CompanyName,
+            ExecutionAmount,
+            SourceCode,
+            PurchaseOrderflg,
+            DetailString,
+            ApprovalStatus,
+            PurchaseSeqNo,
+            LedgerLine,
+            OrderNo,
+            PrintoutDate,
+        }
+        #endregion
+
+        #region ä¸€è¦§æ¤œç´¢ï¼³ï¼±ï¼¬ä½œæˆ�
+        /// <summary>
+        /// ä¸€è¦§æ¤œç´¢ï¼³ï¼±ï¼¬ä½œæˆ�
+        /// </summary>
+        /// <param name="strSQL"></param>
+        public void CreateSQL(ref string strSQL, int ParentCode, int SearchCode)
+        {
+            try
+            {
+                strSQL = "SELECT A.CONSTRUCTIONCODE";
+                strSQL += ", A.FIRSTSTRING";
+                strSQL += ", A.SECONDSTRING";
+                strSQL += ", A.COMPANYCODE";
+                strSQL += ", A.COMPANYNAME";
+                strSQL += ", A.EXECUTIONAMOUNT";
+                strSQL += ", A.SOURCECODE";
+                strSQL += ", A.PURCHASEORDERFLG";
+                strSQL += ", B.DETAILSTRING";
+                strSQL += ", NVL(C.APPROVALSTATUS, -1) APPVAL";
+                strSQL += ", F.SEQNO";
+                strSQL += ", A.LINECOUNT";
+                strSQL += ", NVL(C.ORDERNO, 0)";
+                strSQL += ", TO_CHAR(F.PRINTOUTDATE,'YYYY/MM/DD')";
+                strSQL += " FROM CONSTRUCTIONLEDGERDETAIL A";
+
+                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.SOURCECODE";
+                strSQL += string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
+
+                strSQL += " LEFT JOIN PURCHASEORDERDETAIL E ON E.CONSTRUCTIONCODE = A.SOURCECODE";
+
+                strSQL += " LEFT JOIN PURCHASEORDER F ON F.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE AND F.COMPANYCODE = A.COMPANYCODE";
+
+                strSQL += " LEFT JOIN PROCESSAPPROVALDETAIL G ON G.CONSTRUCTIONCODE = F.CONSTRUCTIONCODE AND G.APPROVALCODE = 4 AND G.LINKCODE = F.SEQNO";
+
+                strSQL += " LEFT JOIN PROCESSAPPROVAL C ON C.CONSTRUCTIONCODE = G.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND C.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQL += " AND C.ORDERNO = G.ORDERNO AND C.SEQNO = 1";
+
+                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", ParentCode);
+                if (SearchCode != 0) strSQL += string.Format(" AND A.SOURCECODE = {0}", SearchCode);
+
+                strSQL += string.Format(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL += " AND A.COMPANYCODE > 0";
+                strSQL += string.Format(" AND A.COMPANYTYPE <> {0}", (int)CommonDefine.CodeDataType.Person);
+                //strSQL += " AND A.EXECUTIONAMOUNT > 0";
+
+                strSQL += " AND (A.SOURCECODE, A.COMPANYCODE) IN ((SELECT SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE FROM CONSTRUCTIONLEDGERDETAIL SUMTBL";
+                strSQL += string.Format(" WHERE SUMTBL.CONSTRUCTIONCODE = {0}", ParentCode);
+                strSQL += string.Format(" AND SUMTBL.GROUPCOUNT = {0} AND SUMTBL.COMPANYCODE > 0", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL += " GROUP BY SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE";
+                strSQL += string.Format(" HAVING SUM(SUMTBL.EXECUTIONAMOUNT) >= {0})", CommonDefine.s_PrintOutPrice);
+                if (SearchCode == 0)
+                    strSQL += string.Format(" UNION (SELECT POR.CONSTRUCTIONCODE, POR.COMPANYCODE FROM PURCHASEORDER POR WHERE POR.CONSTRUCTIONCODE = {0}))", ParentCode);
+                else
+                    strSQL += string.Format(" UNION (SELECT POR.CONSTRUCTIONCODE, POR.COMPANYCODE FROM PURCHASEORDER POR WHERE POR.CONSTRUCTIONCODE = {0}))", SearchCode);
+
+                strSQL += " GROUP BY";
+                strSQL += " A.CONSTRUCTIONCODE";
+                strSQL += ", A.FIRSTSTRING";
+                strSQL += ", A.SECONDSTRING";
+                strSQL += ", A.COMPANYCODE";
+                strSQL += ", A.COMPANYNAME";
+                strSQL += ", A.EXECUTIONAMOUNT";
+                strSQL += ", A.SOURCECODE";
+                strSQL += ", A.PURCHASEORDERFLG";
+                strSQL += ", B.DETAILSTRING";
+                strSQL += ", C.APPROVALSTATUS";
+                strSQL += ", F.SEQNO";
+                strSQL += ", A.LINECOUNT";
+                strSQL += ", C.ORDERNO";
+                strSQL += ", F.PRINTOUTDATE";
+                strSQL += " ORDER BY A.PURCHASEORDERFLG ASC, A.SOURCECODE ASC, A.COMPANYCODE ASC, APPVAL ASC";
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region è¡¨ç¤ºãƒ‡ãƒ¼ã‚¿å�–å¾—
+        /// <summary>
+        /// è¡¨ç¤ºãƒ‡ãƒ¼ã‚¿å�–å¾—
+        /// </summary>
+        /// <param name="arList"></param>
+        private void GetDisplayDataList(ref ArrayList arList)
+        {
+            IOConstructionBaseInfoDetail BaseDetailDB = new IOConstructionBaseInfoDetail();
+            try
+            {
+                DataGridView dgv = dgvAllDisplay;
+                bool LimitedDisp = false;
+
+                string strSQL = "";
+                int ParentCode = m_ConstructionCode;
+                if (m_ConstructionBaseInfo.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
+                {   // çµ�å�ˆã�®è¦ªå·¥äº‹
+                    ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+                    CreateSQL(ref strSQL, ParentCode, 0);
+                }
+                else if (m_ConstructionBaseInfo.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinChildren)
+                {   // çµ�å�ˆã�®æ§‹æˆ�å·¥äº‹
+                    ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+                    CreateSQL(ref strSQL, ParentCode, m_ConstructionCode);
+                }
+                else if (m_ConstructionBaseInfo.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Standard)
+                {   // å¢—æ¸›å·¥äº‹
+                    ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+                    CreateSQL(ref strSQL, ParentCode, m_ConstructionCode);
+                    LimitedDisp = true;
+                }
+                else
+                {   // é€šå¸¸å·¥äº‹
+                    CreateSQL(ref strSQL, m_ConstructionCode, 0);               // SQLä½œæˆ�
+                    LimitedDisp = true;
+                }
+
+                // å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—
+                if (!BaseDetailDB.ExecuteReader(strSQL, ref arList)) return;
+
+                if (LimitedDisp)
+                {
+                    // å…ƒå·¥äº‹ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’è¡¨ç¤ºã�—ã�ªã�„
+                    int VisbleCount = 0;
+                    foreach (DataGridViewColumn CurCol in dgv.Columns)
+                    {
+                        if (CurCol.Visible) VisbleCount++;
+                    }
+                    if (VisbleCount == 8)
+                    {
+                        dgv.Columns[(int)GridColumn.PurchaseName].Width += dgv.Columns[(int)GridColumn.SourceName].Width;
+                        dgv.Columns[(int)GridColumn.SourceName].Visible = false;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                BaseDetailDB.close(); BaseDetailDB = null;
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
+        /// <summary>
+        /// ä¸€è¦§ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºå‡¦ç�†
+        /// </summary>
+        private void DataDisplay()
+        {
+            DataGridView dgv = dgvAllDisplay;
+            try
+            {
+                dgv.Rows.Clear();
+                m_OrderFrm.DetailList.Clear();
+
+                ArrayList arList = new ArrayList();
+                // è¡¨ç¤ºãƒ‡ãƒ¼ã‚¿å�–å¾—
+                GetDisplayDataList(ref arList);
+
+                int iNo = 1;
+                string brkConstrName = string.Empty;
+                string strConstrName = string.Empty;
+                string strCompanyName = string.Empty;
+                int SeqNo = 0;
+                int AppStat = 0;
+                int Orderflg = 0;
+                int ApprovalCnt = 0;
+                int BaseDataCnt = 0;
+                int OrderNo = 0;
+                int LineCount = 0;
+                DateTime Printout = DateTime.Now;
+                bool NotCreateFlg = false;
+                foreach (object[] objRec in arList)
+                {
+                    // è¦ªãƒ•ã‚©ãƒ¼ãƒ ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                    m_OrderFrm.DetailList.Add(objRec);
+
+                    SeqNo = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.PurchaseSeqNo]);
+                    AppStat = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.ApprovalStatus]);
+                    Orderflg = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.PurchaseOrderflg]);
+                    OrderNo = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.OrderNo]);
+                    Printout = CommonMotions.cnvDate(objRec[(int)ReadDBColumn.PrintoutDate]);
+                    LineCount = CommonMotions.cnvInt(objRec[(int)ReadDBColumn.LedgerLine]);
+
+                    strConstrName = CommonMotions.cnvString(objRec[(int)ReadDBColumn.DetailString]);
+                    strCompanyName = CommonMotions.cnvString(objRec[(int)ReadDBColumn.CompanyName]);
+
+                    if (!brkConstrName.Equals(strConstrName)) brkConstrName = strConstrName;
+                    else strConstrName = string.Empty;
+
+                    NotCreateFlg = false;
+                    if (Orderflg == (int)CommonDefine.PurchaseOrderFlg.NotMakingData)
+                    {
+                        NotCreateFlg = true;
+                    }
+
+                    int CurRowCnt = dgv.Rows.Add(iNo++,
+                                                    SeqNo,
+                                                    strConstrName,
+                                                    strCompanyName,
+                                                    "",
+                                                    CommonMotions.cnvInt(objRec[(int)ReadDBColumn.ExecutionAmount]).ToString("#,0"),
+                                                    "",
+                                                    NotCreateFlg,
+                                                    false,
+                                                    CommonMotions.cnvInt(objRec[(int)ReadDBColumn.SourceCode]),
+                                                    CommonMotions.cnvInt(objRec[(int)ReadDBColumn.CompanyCode]),
+                                                    OrderNo,
+                                                    LineCount
+                                                    );
+                    // è¡ŒçŠ¶æ…‹ã‚»ãƒƒãƒˆ
+                    ChageRowColor(CurRowCnt, Orderflg, AppStat, Printout, OrderNo, ref  ApprovalCnt, ref BaseDataCnt);
+                    // å¯¾è±¡å¤–ã�¯é�¸æŠžã�§ã��ã�ªã�„
+                    if (Orderflg == (int)CommonDefine.PurchaseOrderFlg.NotMakingData)
+                    {
+                        dgv.Rows[CurRowCnt].Cells[(int)GridColumn.SelectExec].ReadOnly = true;
+                    }
+                }
+                m_DspLabelCtrl[(int)DspLblCtrlName.PurchaseCount].Text = string.Format("{0}/{1}", ApprovalCnt, BaseDataCnt);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                int NowRowCnt = dgv.RowCount;
+                if (NowRowCnt < 18) dgv.Rows.Add(18 - NowRowCnt);
+                for (int i = NowRowCnt; i < dgv.RowCount; i++)
+                {
+                    dgv.Rows[i].Cells[(int)GridColumn.NotCreate].ReadOnly = true;
+                    dgv.Rows[i].Cells[(int)GridColumn.SelectExec].ReadOnly = true;
+                }
+            }
+        }
+        #endregion
+
+        #region è¡Œè‰²ãƒ»çŠ¶æ…‹ã‚»ãƒƒãƒˆ
+        /// <summary>
+        /// è¡Œè‰²ãƒ»çŠ¶æ…‹ã‚»ãƒƒãƒˆ
+        /// </summary>
+        private void ChageRowColor(int CurRowCnt, int Orderflg, int AppStat, DateTime Printout, int OrderNo,
+                                    ref int ApprovalCnt, ref int BaseDataCnt)
+        {
+            try
+            {
+                DataGridView dgv = dgvAllDisplay;
+
+                // ä½œæˆ�å›žæ•°ä½œæˆ�
+                string strCount = string.Empty;
+                if (OrderNo > 0)
+                {
+                    strCount = string.Format("{0}å›žç›®", OrderNo);
+                }
+
+                // æ³¨æ–‡æ›¸çŠ¶æ…‹ä½œæˆ�
+                string strCreate = string.Empty;
+                int i = 0;
+                Color wrkColor = Color.White;
+
+                int SeqNo = CommonMotions.cnvInt(dgv.Rows[CurRowCnt].Cells[(int)GridColumn.SeqNo].Value);
+                if (SeqNo == 0)
+                {
+                    if (Orderflg == (int)CommonDefine.PurchaseOrderFlg.NotMakingData)
+                    {
+                        strCreate = DataStatusString[(int)DataStatusNo.NotMaking];
+                        wrkColor = Color.White;
+                        strCount = string.Empty;
+                    }
+                    else
+                    {
+                        strCreate = DataStatusString[(int)DataStatusNo.NoCreate];
+                        wrkColor = Color.White;
+                        strCount = string.Empty;
+                        BaseDataCnt++;
+                    }
+                }
+                else if (SeqNo > 0)
+                {
+                    switch (AppStat)
+                    {
+                        case (int)CommonDefine.ApprovalStatus.Approval:
+                            strCreate = DataStatusString[(int)DataStatusNo.Approvals];
+                            wrkColor = Color.LightGray;
+                            break;
+                        case -1:
+                            strCreate = DataStatusString[(int)DataStatusNo.Making];
+                            wrkColor = Color.LightCyan;
+                            break;
+                        default:
+                            strCreate = DataStatusString[(int)DataStatusNo.Request];
+                            wrkColor = Color.LemonChiffon;
+                            break;
+                    }
+                    if (Printout != DateTime.MinValue.Date) ApprovalCnt++;
+                    BaseDataCnt++;
+                }
+
+                // ä½œæˆ�å›žæ•°ã‚»ãƒƒãƒˆ
+                dgv.Rows[CurRowCnt].Cells[(int)GridColumn.RequestCount].Value = strCount;
+
+                // æ³¨æ–‡æ›¸çŠ¶æ…‹ã‚»ãƒƒãƒˆ
+                dgv.Rows[CurRowCnt].Cells[(int)GridColumn.PurchaseExists].Value = strCreate;
+
+                // è¡Œè‰²ã‚»ãƒƒãƒˆ
+                foreach (DataGridViewCell CurCell in dgv.Rows[CurRowCnt].Cells)
+                {
+                    if (i++ < (int)GridColumn.SourceName) continue;
+                    CurCell.Style.BackColor = wrkColor;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿é�¸æŠžå‡¦ç�†
+        /// <summary>
+        /// ãƒ‡ãƒ¼ã‚¿é�¸æŠžå‡¦ç�†
+        /// </summary>
+        private void SelectRowData()
+        {
+            try
+            {
+                DataGridView dgv = dgvAllDisplay;
+
+                for (int ix = (m_OrderFrm.DetailList.Count - 1); ix > -1; ix--)
+                {
+                    object[] ObjRec = (object[])m_OrderFrm.DetailList[ix];
+
+                    foreach (DataGridViewRow ChkRow in dgv.Rows)
+                    {
+                        // ç”»é�¢ä¸Šã�§ãƒ‡ãƒ¼ã‚¿ã‚’æŽ¢ã�™
+                        if (CommonMotions.cnvInt(ObjRec[(int)ReadDBColumn.SourceCode])
+                            != CommonMotions.cnvInt(ChkRow.Cells[(int)GridColumn.SourceCode].Value)) continue;
+
+                        if (CommonMotions.cnvInt(ObjRec[(int)ReadDBColumn.CompanyCode])
+                            != CommonMotions.cnvInt(ChkRow.Cells[(int)GridColumn.CompanyCode].Value)) continue;
+
+                        // ä½œæˆ�å¯¾è±¡å¤–ã�®ãƒ�ã‚§ãƒƒã‚¯
+                        if (!CommonMotions.chkCellBlank(ChkRow.Cells[(int)GridColumn.NotCreate].Value))
+                        {
+                            if ((bool)ChkRow.Cells[(int)GridColumn.NotCreate].Value)
+                            {
+                                // å†…éƒ¨ãƒ‡ãƒ¼ã‚¿å‰Šé™¤ï¼ˆè¦ªãƒ•ã‚©ãƒ¼ãƒ ã�®ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚’ç·¨é›†ã�™ã‚‹ï¼‰
+                                m_OrderFrm.DetailList.RemoveAt(ix);
+                                break;
+                            }
+                        }
+
+                        // é�¸æŠžãƒ•ãƒ©ã‚°ã�®ãƒ�ã‚§ãƒƒã‚¯
+                        if (!CommonMotions.chkCellBlank(ChkRow.Cells[(int)GridColumn.SelectExec].Value))
+                        {
+                            if (!(bool)ChkRow.Cells[(int)GridColumn.SelectExec].Value)
+                            {
+                                // å†…éƒ¨ãƒ‡ãƒ¼ã‚¿å‰Šé™¤ï¼ˆè¦ªãƒ•ã‚©ãƒ¼ãƒ ã�®ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£ã‚’ç·¨é›†ã�™ã‚‹ï¼‰
+                                m_OrderFrm.DetailList.RemoveAt(ix);
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ç”»é�¢é …ç›®ã�®ãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// ç”»é�¢é …ç›®ã�®ãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <returns></returns>
+        private bool DispFeildCheck()
+        {
+            bool bRet = true;
+            try
+            {
+                DataGridView dgv = dgvAllDisplay;
+
+                // é�¸æŠžã‚¨ãƒ©ãƒ¼ãƒ�ã‚§ãƒƒã‚¯
+                bool bNoCreateData = false;
+                bool bMakeingData = false;
+                bool bApprovalData = false;
+                bool bUnMatchOrderNO = false;
+                int OrderNo = -1;
+                int SelectCnt = 0;
+                string CreateStat = string.Empty;
+                foreach (DataGridViewRow CurRow in dgv.Rows)
+                {
+                    // ãƒ�ã‚§ãƒƒã‚¯ç„¡ã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if (CommonMotions.chkCellBlank(CurRow.Cells[(int)GridColumn.SelectExec].Value)) continue;
+                    if (!(bool)CurRow.Cells[(int)GridColumn.SelectExec].Value) continue;
+
+                    // ãƒ‡ãƒ¼ã‚¿æœªä½œæˆ�ãƒ»ä½œæˆ�æ¸ˆã�®ãƒ�ã‚§ãƒƒã‚¯
+                    CreateStat = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn.PurchaseExists].Value);
+                    if (CreateStat.Equals(DataStatusString[(int)DataStatusNo.NoCreate])) bNoCreateData = true;
+                    else if (CreateStat.Equals(DataStatusString[(int)DataStatusNo.Approvals])) bApprovalData = true;
+                    else bMakeingData = true;
+
+                    // å�—ä»˜ç•ªå�·ã�®æ•´å�ˆæ€§ãƒ�ã‚§ãƒƒã‚¯
+                    if (OrderNo != CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderNo].Value))
+                    {
+                        if (OrderNo > -1) bUnMatchOrderNO = true;
+                        OrderNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderNo].Value);
+                    }
+
+                    // ãƒ‡ãƒ¼ã‚¿ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
+                    SelectCnt++;
+                }
+
+                if (bNoCreateData && bMakeingData && bApprovalData)
+                {
+                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šæ–°è¦�ä½œæˆ�ãƒ»ç·¨é›†ãƒ»é–²è¦§ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                if (bNoCreateData && bMakeingData)
+                {
+                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šæ–°è¦�ä½œæˆ�ãƒ»ç·¨é›†ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                if (bMakeingData && bApprovalData)
+                {
+                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šç·¨é›†ãƒ»é–²è¦§ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                if (bNoCreateData && bApprovalData)
+                {
+                    MessageBox.Show("æ³¨æ–‡æ›¸ï¼šæ–°è¦�ä½œæˆ�ãƒ»é–²è¦§ã�¯å�Œæ™‚ã�«ã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                if (SelectCnt < 1)
+                {
+                    MessageBox.Show("ãƒ‡ãƒ¼ã‚¿ã�Œé�¸æŠžã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                if (bUnMatchOrderNO)
+                {
+                    MessageBox.Show("ä½œæˆ�ãƒ»ç·¨é›†æ™‚ã�«\r\nç”³è«‹ãƒ»æ‰¿èª�ã�Œé�•ã�†ãƒ‡ãƒ¼ã‚¿ã�¯ä¸€ç·’ã�«é�¸æŠžã�§ã��ã�¾ã�›ã‚“ã€‚", "é�¸æŠžã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                // æ–°è¦�ãƒ‡ãƒ¼ã‚¿ä½œæˆ�ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
+                if (bNoCreateData) m_OrderFrm.CreateData = true;
+                else m_OrderFrm.CreateData = false;
+
+                return bRet;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region ä½œæˆ�å¯¾è±¡å¤–ãƒ•ãƒ©ã‚°æ›´æ–°
+        /// <summary>
+        /// ä½œæˆ�å¯¾è±¡å¤–ãƒ•ãƒ©ã‚°æ›´æ–°
+        /// </summary>
+        private void UpdateTargetOut()
+        {
+            IOConstructionLedgerDetail DetailDB = new IOConstructionLedgerDetail();
+            try
+            {
+                int TargetCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode);
+                // ã�¾ã�šä½œæˆ�å¯¾è±¡å¤–ã‚’å…ƒã�«ã‚‚ã�©ã�™
+                string strUpdate = string.Format("UPDATE CONSTRUCTIONLEDGERDETAIL SET PURCHASEORDERFLG = {0}", (int)CommonDefine.PurchaseOrderFlg.NoCreate);
+                strUpdate += string.Format(" WHERE CONSTRUCTIONCODE = {0}", TargetCode);
+                strUpdate += string.Format(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strUpdate += string.Format(" AND PURCHASEORDERFLG = {0}", (int)CommonDefine.PurchaseOrderFlg.NotMakingData);
+                DetailDB.ExecuteNonQuery(strUpdate);
+
+                // æ¬¡ã�«ä½œæˆ�å¯¾è±¡å¤–ã�«è¨­å®šã�•ã‚Œã�Ÿã‚‚ã�®ã‚’æ›´æ–°ã�™ã‚‹
+                strUpdate = string.Format("UPDATE CONSTRUCTIONLEDGERDETAIL SET PURCHASEORDERFLG = {0}", (int)CommonDefine.PurchaseOrderFlg.NotMakingData);
+                strUpdate += string.Format(" WHERE CONSTRUCTIONCODE = {0}", TargetCode);
+                strUpdate += string.Format(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strUpdate += " AND LINECOUNT IN (";
+                int i = 0;
+                int LineCout = 0;
+
+                foreach (DataGridViewRow CurRow in dgvAllDisplay.Rows)
+                {
+                    if (CommonMotions.chkCellBlank(CurRow.Cells[(int)GridColumn.NotCreate].Value)) continue;
+                    if (!(bool)CurRow.Cells[(int)GridColumn.NotCreate].Value) continue;
+
+                    LineCout = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.LineCount].Value);
+
+                    if (i != 0) strUpdate += ",";
+                    strUpdate += string.Format(" {0}", LineCout);
+                    i++;
+                }
+                strUpdate += ")";
+                DetailDB.ExecuteNonQuery(strUpdate);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                DetailDB.close(); DetailDB = null;
+            }
+        }
+        #endregion
+
+        #region å�Œä¸€å›žæ•°è¡Œé�¸æŠžå‡¦ç�†
+        /// <summary>
+        /// å�Œä¸€å›žæ•°è¡Œé�¸æŠžå‡¦ç�†
+        /// </summary>
+        /// <param name="CurRowCnt"></param>
+        private void GridSelectData(int CurRowCnt)
+        {
+            try
+            {
+                DataGridView dgv = dgvAllDisplay;
+                
+                // æœªä½œæˆ�æ™‚ã�¯ä¸€æ–‰ãƒ�ã‚§ãƒƒã‚¯ã�—ã�ªã�„
+                if (CommonMotions.cnvString(dgv.Rows[CurRowCnt].Cells[(int)GridColumn.RequestCount].Value).Length == 0)
+                    return;
+                
+                string strExecCnt = CommonMotions.cnvString(dgv.Rows[CurRowCnt].Cells[(int)GridColumn.RequestCount].Value);
+                bool bSelect = (bool)dgv.Rows[CurRowCnt].Cells[(int)GridColumn.SelectExec].Value;
+
+                string CompWork = string.Empty;
+                foreach (DataGridViewRow GetRow in dgv.Rows)
+                {
+                    // ç©ºç™½è¡Œã�¯å¯¾è±¡å¤–
+                    if (CommonMotions.cnvString(GetRow.Cells[(int)GridColumn.PurchaseName].Value).Length == 0
+                        && CommonMotions.cnvString(GetRow.Cells[(int)GridColumn.SourceName].Value).Length == 0
+                        && CommonMotions.cnvInt(GetRow.Cells[(int)GridColumn.PurchasePrice].Value) == 0) continue;
+
+                    // è‡ªè¡Œã�¯å¯¾è±¡å¤–
+                    if (GetRow.Index == CurRowCnt) continue;
+
+                    CompWork = CommonMotions.cnvString(GetRow.Cells[(int)GridColumn.RequestCount].Value);
+                    // å�Œä¸€ç”³è«‹å›žæ•°ã�ªã‚‰ã�°ãƒ�ã‚§ãƒƒã‚¯ã�™ã‚‹
+                    if (CompWork.Equals(strExecCnt))
+                    {
+                        GetRow.Cells[(int)GridColumn.SelectExec].Value = bSelect;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs	(revision 48)
@@ -73,16 +73,6 @@
             this.btnEnd = new System.Windows.Forms.Button();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.lbl001 = new System.Windows.Forms.Label();
-            this.lbl003 = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.txtBoxS001 = new System.Windows.Forms.TextBox();
-            this.lbl002 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.TabCollections = new System.Windows.Forms.TabControl();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.btnPageDelete = new System.Windows.Forms.Button();
-            this.btnChangeCompany = new System.Windows.Forms.Button();
             this.groupBox3 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.label40 = new System.Windows.Forms.Label();
             this.txtBoxR013 = new System.Windows.Forms.TextBox();
@@ -130,6 +120,11 @@
             this.label19 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label22 = new System.Windows.Forms.Label();
+            this.lbl001 = new System.Windows.Forms.Label();
+            this.lbl003 = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.txtBoxS001 = new System.Windows.Forms.TextBox();
+            this.lbl002 = new System.Windows.Forms.Label();
             this.groupBox4 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.dgvTerms = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -152,6 +147,11 @@
             this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label15 = new System.Windows.Forms.Label();
+            this.TabCollections = new System.Windows.Forms.TabControl();
+            this.btnOtherProc = new System.Windows.Forms.Button();
+            this.btnPageDelete = new System.Windows.Forms.Button();
+            this.btnChangeCompany = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.pnlApproval.SuspendLayout();
@@ -158,7 +158,6 @@
             this.pnlApprovalButton.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.panel3.SuspendLayout();
-            this.TabCollections.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -166,6 +165,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.dgvTerms)).BeginInit();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
+            this.TabCollections.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
@@ -544,7 +544,6 @@
             this.btnDataDelete.TabIndex = 52;
             this.btnDataDelete.Text = "å‰Šã€€é™¤";
             this.btnDataDelete.UseVisualStyleBackColor = false;
-            this.btnDataDelete.Visible = false;
             this.btnDataDelete.Click += new System.EventHandler(this.btnDataDelete_Click);
             // 
             // btnDataEntry
@@ -608,125 +607,6 @@
             this.panel3.TabIndex = 0;
             this.panel3.Scroll += new System.Windows.Forms.ScrollEventHandler(this.BasePanel_Scroll);
             // 
-            // lbl001
-            // 
-            this.lbl001.BackColor = System.Drawing.Color.White;
-            this.lbl001.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lbl001.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lbl001.Location = new System.Drawing.Point(8, 8);
-            this.lbl001.Name = "lbl001";
-            this.lbl001.Size = new System.Drawing.Size(166, 22);
-            this.lbl001.TabIndex = 73;
-            this.lbl001.Text = "2016999901-001";
-            this.lbl001.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // lbl003
-            // 
-            this.lbl003.BackColor = System.Drawing.Color.White;
-            this.lbl003.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lbl003.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lbl003.Location = new System.Drawing.Point(874, 8);
-            this.lbl003.Name = "lbl003";
-            this.lbl003.Size = new System.Drawing.Size(170, 22);
-            this.lbl003.TabIndex = 72;
-            this.lbl003.Text = "\\999,999,999-";
-            this.lbl003.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label18
-            // 
-            this.label18.BackColor = System.Drawing.Color.SandyBrown;
-            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label18.Location = new System.Drawing.Point(706, 7);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(160, 25);
-            this.label18.TabIndex = 71;
-            this.label18.Text = "ç™ºæ³¨é‡‘é¡�ï¼ˆç¨Žåˆ¥ï¼‰";
-            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // txtBoxS001
-            // 
-            this.txtBoxS001.Location = new System.Drawing.Point(1180, 8);
-            this.txtBoxS001.Name = "txtBoxS001";
-            this.txtBoxS001.Size = new System.Drawing.Size(114, 23);
-            this.txtBoxS001.TabIndex = 66;
-            // 
-            // lbl002
-            // 
-            this.lbl002.BackColor = System.Drawing.Color.White;
-            this.lbl002.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lbl002.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lbl002.Location = new System.Drawing.Point(182, 8);
-            this.lbl002.Name = "lbl002";
-            this.lbl002.Size = new System.Drawing.Size(500, 22);
-            this.lbl002.TabIndex = 70;
-            this.lbl002.Text = "å�”åŠ›ä¼šç¤¾å��ç§°";
-            this.lbl002.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label15
-            // 
-            this.label15.BackColor = System.Drawing.Color.Cyan;
-            this.label15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label15.Location = new System.Drawing.Point(1052, 7);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(120, 25);
-            this.label15.TabIndex = 69;
-            this.label15.Text = "ç™ºæ³¨æ›¸ä½œæˆ�æ—¥";
-            this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // TabCollections
-            // 
-            this.TabCollections.Alignment = System.Windows.Forms.TabAlignment.Bottom;
-            this.TabCollections.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.TabCollections.Controls.Add(this.tabPage1);
-            this.TabCollections.Location = new System.Drawing.Point(7, 150);
-            this.TabCollections.Name = "TabCollections";
-            this.TabCollections.SelectedIndex = 0;
-            this.TabCollections.Size = new System.Drawing.Size(1330, 502);
-            this.TabCollections.TabIndex = 56;
-            // 
-            // 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 = 95;
-            this.btnOtherProc.TabStop = false;
-            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
-            this.btnOtherProc.UseVisualStyleBackColor = false;
-            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
-            // 
-            // btnPageDelete
-            // 
-            this.btnPageDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnPageDelete.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.btnPageDelete.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnPageDelete.ForeColor = System.Drawing.Color.Black;
-            this.btnPageDelete.Location = new System.Drawing.Point(812, 656);
-            this.btnPageDelete.Name = "btnPageDelete";
-            this.btnPageDelete.Size = new System.Drawing.Size(120, 30);
-            this.btnPageDelete.TabIndex = 96;
-            this.btnPageDelete.Text = "ãƒšãƒ¼ã‚¸å‰Šé™¤";
-            this.btnPageDelete.UseVisualStyleBackColor = false;
-            this.btnPageDelete.Click += new System.EventHandler(this.btnPageDelete_Click);
-            // 
-            // btnChangeCompany
-            // 
-            this.btnChangeCompany.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnChangeCompany.BackColor = System.Drawing.Color.DeepSkyBlue;
-            this.btnChangeCompany.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnChangeCompany.ForeColor = System.Drawing.Color.Black;
-            this.btnChangeCompany.Location = new System.Drawing.Point(686, 655);
-            this.btnChangeCompany.Name = "btnChangeCompany";
-            this.btnChangeCompany.Size = new System.Drawing.Size(120, 30);
-            this.btnChangeCompany.TabIndex = 97;
-            this.btnChangeCompany.Text = "ç™ºæ³¨å…ˆå¤‰æ›´";
-            this.btnChangeCompany.UseVisualStyleBackColor = false;
-            this.btnChangeCompany.Click += new System.EventHandler(this.btnChangeCompany_Click);
-            // 
             // groupBox3
             // 
             this.groupBox3.BackColor = System.Drawing.Color.White;
@@ -1288,6 +1168,60 @@
             this.label22.Text = "äºº";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // lbl001
+            // 
+            this.lbl001.BackColor = System.Drawing.Color.White;
+            this.lbl001.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lbl001.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lbl001.Location = new System.Drawing.Point(8, 8);
+            this.lbl001.Name = "lbl001";
+            this.lbl001.Size = new System.Drawing.Size(166, 22);
+            this.lbl001.TabIndex = 73;
+            this.lbl001.Text = "2016999901-001";
+            this.lbl001.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // lbl003
+            // 
+            this.lbl003.BackColor = System.Drawing.Color.White;
+            this.lbl003.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lbl003.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lbl003.Location = new System.Drawing.Point(874, 8);
+            this.lbl003.Name = "lbl003";
+            this.lbl003.Size = new System.Drawing.Size(170, 22);
+            this.lbl003.TabIndex = 72;
+            this.lbl003.Text = "\\999,999,999-";
+            this.lbl003.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label18
+            // 
+            this.label18.BackColor = System.Drawing.Color.SandyBrown;
+            this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label18.Location = new System.Drawing.Point(706, 7);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(160, 25);
+            this.label18.TabIndex = 71;
+            this.label18.Text = "ç™ºæ³¨é‡‘é¡�ï¼ˆç¨Žåˆ¥ï¼‰";
+            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // txtBoxS001
+            // 
+            this.txtBoxS001.Location = new System.Drawing.Point(1180, 8);
+            this.txtBoxS001.Name = "txtBoxS001";
+            this.txtBoxS001.Size = new System.Drawing.Size(114, 23);
+            this.txtBoxS001.TabIndex = 66;
+            // 
+            // lbl002
+            // 
+            this.lbl002.BackColor = System.Drawing.Color.White;
+            this.lbl002.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lbl002.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lbl002.Location = new System.Drawing.Point(182, 8);
+            this.lbl002.Name = "lbl002";
+            this.lbl002.Size = new System.Drawing.Size(500, 22);
+            this.lbl002.TabIndex = 70;
+            this.lbl002.Text = "å�”åŠ›ä¼šç¤¾å��ç§°";
+            this.lbl002.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // groupBox4
             // 
             this.groupBox4.BackColor = System.Drawing.Color.White;
@@ -1579,6 +1513,71 @@
             this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column12.Width = 150;
             // 
+            // label15
+            // 
+            this.label15.BackColor = System.Drawing.Color.Cyan;
+            this.label15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label15.Location = new System.Drawing.Point(1052, 7);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(120, 25);
+            this.label15.TabIndex = 69;
+            this.label15.Text = "ç™ºæ³¨æ›¸ä½œæˆ�æ—¥";
+            this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // TabCollections
+            // 
+            this.TabCollections.Alignment = System.Windows.Forms.TabAlignment.Bottom;
+            this.TabCollections.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.TabCollections.Controls.Add(this.tabPage1);
+            this.TabCollections.Location = new System.Drawing.Point(7, 150);
+            this.TabCollections.Name = "TabCollections";
+            this.TabCollections.SelectedIndex = 0;
+            this.TabCollections.Size = new System.Drawing.Size(1330, 502);
+            this.TabCollections.TabIndex = 56;
+            // 
+            // 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 = 95;
+            this.btnOtherProc.TabStop = false;
+            this.btnOtherProc.Text = "ä»–ã�®ç”»é�¢ã�¸";
+            this.btnOtherProc.UseVisualStyleBackColor = false;
+            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
+            // 
+            // btnPageDelete
+            // 
+            this.btnPageDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnPageDelete.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            this.btnPageDelete.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnPageDelete.ForeColor = System.Drawing.Color.Black;
+            this.btnPageDelete.Location = new System.Drawing.Point(812, 656);
+            this.btnPageDelete.Name = "btnPageDelete";
+            this.btnPageDelete.Size = new System.Drawing.Size(120, 30);
+            this.btnPageDelete.TabIndex = 96;
+            this.btnPageDelete.Text = "ãƒšãƒ¼ã‚¸å‰Šé™¤";
+            this.btnPageDelete.UseVisualStyleBackColor = false;
+            this.btnPageDelete.Click += new System.EventHandler(this.btnPageDelete_Click);
+            // 
+            // btnChangeCompany
+            // 
+            this.btnChangeCompany.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnChangeCompany.BackColor = System.Drawing.Color.DeepSkyBlue;
+            this.btnChangeCompany.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnChangeCompany.ForeColor = System.Drawing.Color.Black;
+            this.btnChangeCompany.Location = new System.Drawing.Point(686, 655);
+            this.btnChangeCompany.Name = "btnChangeCompany";
+            this.btnChangeCompany.Size = new System.Drawing.Size(120, 30);
+            this.btnChangeCompany.TabIndex = 97;
+            this.btnChangeCompany.Text = "ç™ºæ³¨å…ˆå¤‰æ›´";
+            this.btnChangeCompany.UseVisualStyleBackColor = false;
+            this.btnChangeCompany.Click += new System.EventHandler(this.btnChangeCompany_Click);
+            // 
             // FrmPurchaseOrderEntry
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1613,7 +1612,6 @@
             this.tabPage1.ResumeLayout(false);
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
-            this.TabCollections.ResumeLayout(false);
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
             this.groupBox2.ResumeLayout(false);
@@ -1625,6 +1623,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
+            this.TabCollections.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.cs	(revision 48)
@@ -387,7 +387,7 @@
         /// <summary>
         /// å�—ä»˜ç•ªå�·
         /// </summary>
-        private int m_OrderNo = 1;
+        private int m_OrderNo = -1;
 
         /// <summary>
         /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹ãƒ•ãƒ©ã‚°
@@ -569,12 +569,20 @@
                 // ãƒ©ãƒ™ãƒ«ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆå�–å¾—
                 SetDisplayObject();
 
-                // ãƒ‡ãƒ¼ã‚¿é�¸æŠžç”»é�¢è¡¨ç¤º
-                if (!DispOrderEntryList())
+                if (m_DirectFlg)
                 {
-                    this.Close();
-                    return;
+                    // å¯¾è±¡ãƒªã‚¹ãƒˆã‚’ä½œæˆ�ã�™ã‚‹
+                    SetOrderEntryList();
                 }
+                else
+                {
+                    // ãƒ‡ãƒ¼ã‚¿é�¸æŠžç”»é�¢è¡¨ç¤º
+                    if (!DispOrderEntryList())
+                    {
+                        this.Close();
+                        return;
+                    }
+                }
 
                 // è‡ªç”»é�¢åˆ�æœŸè¡¨ç¤º
                 InitDataLoad();
@@ -716,6 +724,7 @@
         private void btnPetition_Click(object sender, EventArgs e)
         {
             IOPurchaseOrder OrderDB = new IOPurchaseOrder();
+            IOProcessApproval ProAppDB = new IOProcessApproval();
             try
             {
                 // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�„å ´å�ˆã�¯ç™»éŒ²ã�™ã‚‹
@@ -743,6 +752,10 @@
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
 
                 // å�—ä»˜ç•ªå�·
+                if (m_OrderNo < 1)
+                {
+                    m_OrderNo = ProAppDB.SelectMaxSeqNoCount(ProAppDB.CreatePrimarykeyString(m_ConstructionCode, iApprovalCode)) + 1;
+                }
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_OrderNo);
 
                 // æ³¨æ–‡æ›¸æž�ç•ª
@@ -766,6 +779,7 @@
             finally
             {
                 OrderDB.close(); OrderDB = null;
+                ProAppDB.close(); ProAppDB = null;
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 48)
@@ -126,6 +126,67 @@
         }
         #endregion
 
+        #region ç›´æŽ¥è¡¨ç¤ºæ™‚ã�®å¯¾è±¡ãƒªã‚¹ãƒˆã‚’ä½œæˆ�ã�™ã‚‹
+        /// <summary>
+        /// ç›´æŽ¥è¡¨ç¤ºæ™‚ã�®å¯¾è±¡ãƒªã‚¹ãƒˆã‚’ä½œæˆ�ã�™ã‚‹
+        /// </summary>
+        private void SetOrderEntryList()
+        {
+            IOProcessApprovalDetail AppDetailDB = new IOProcessApprovalDetail();
+            try
+            {
+
+                //ConstructionCode = 0,
+                //FirstString,
+                //SecondString,
+                //CompanyCode,
+                //CompanyName,
+                //ExecutionAmount,
+                //SourceCode,
+                //PurchaseOrderflg,
+                //DetailString,
+                //ApprovalStatus,
+                //PurchaseSeqNo,
+                //LedgerLine,
+                //OrderNo,
+                //PrintoutDate,
+
+                m_DetailList.Clear();
+                // ä¸€è¦§ãƒªã‚¹ãƒˆã‚’ä½œæˆ�ã�™ã‚‹
+                string strSQL = AppDetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval, m_OrderNo);
+                strSQL += " ORDER BY ORDERNO";
+                List<ProcessApprovalDetail> DetailList = new List<ProcessApprovalDetail>();
+                if (!AppDetailDB.SelectAction(strSQL, ref DetailList)) return;
+
+                foreach (ProcessApprovalDetail CurRec in DetailList)
+                {
+                    m_DetailList.Add(new object[] { m_ConstructionCode,
+                                                    "",
+                                                    "",
+                                                    0,
+                                                    "",
+                                                    0,
+                                                    m_ConstructionCode,
+                                                    1,
+                                                    "",
+                                                    (int)CommonDefine.ApprovalStatus.Approval,
+                                                    CurRec.LinkCode,
+                                                    0,
+                                                    m_OrderNo,
+                                                    DateTime.Now });
+                }
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                AppDetailDB.close(); AppDetailDB = null;
+            }
+        }
+        #endregion
+
         #region æ³¨æ–‡æ›¸æ˜Žç´°é�¸æŠžç”»é�¢è¡¨ç¤º
         /// <summary>
         /// æ³¨æ–‡æ›¸æ˜Žç´°é�¸æŠžç”»é�¢è¡¨ç¤º
@@ -143,6 +204,10 @@
                 // çµ‚äº†é�¸æŠžæ™‚
                 if (frm.ComplateFlg == DialogResult.Cancel) return false;
 
+                object[] objRec = (object[])m_DetailList[0];
+                m_OrderNo = CommonMotions.cnvInt(objRec[(int)FrmOrderEntryList.ReadDBColumn.OrderNo]);
+                if (m_OrderNo == 0) m_OrderNo = -1;
+
                 this.Show();
 
                 return true;
@@ -155,7 +220,6 @@
             finally
             {
                 frm.Dispose(); frm = null;
-
             }
         }
         #endregion
@@ -172,24 +236,12 @@
                 // ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±è¡¨ç¤º
                 DispHeader();
 
-                object[] objRec = (object[])m_DetailList[0];
-                if (CommonMotions.cnvInt(objRec[(int)FrmOrderEntryList.ReadDBColumn.OrderNo]) < 0)
-                {   // æ—§æ–¹å¼�ã�®ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-                    OldType_SetPurchaseOrderData();
-                }
-                else
+                // æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
+                if (!SetPurchaseOrderData())
                 {
-                    // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
-                    if (m_CreateData)
-                    {
-                        // å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
-                        CreateNewOrderData();
-                    }
-                    else
-                    {
-                        // æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
-                        SetPurchaseOrderData();
-                    }
+                    // å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
+                    CreateNewOrderData();
+
                     // æ‰¿èª�ãƒ‡ãƒ¼ã‚¿å�—ä»˜ç•ªå�·ã‚»ãƒƒãƒˆ
                     SetApprovalOrderNo();
                 }
@@ -369,264 +421,36 @@
         }
         #endregion
 
-        // ---------- æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ï¼ˆæ–°æ–¹å¼�ï¼‰ã€€â†“â†“
-        #region æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—
+        // ---------- å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ã€€ã€€ã€€ã€€â†“â†“
+        #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šèª­ã�¿è¾¼ã‚€SQLã‚’ä½œæˆ�ã�™ã‚‹
         /// <summary>
-        /// æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—ã�—ã�¦ç”»é�¢è¡¨ç¤ºã�™ã‚‹
+        /// å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šèª­ã�¿è¾¼ã‚€SQLã‚’ä½œæˆ�ã�™ã‚‹
         /// </summary>
-        /// <returns></returns>
-        private bool SetPurchaseOrderData()
-        {
-            IOPurchaseOrder OrderDB = new IOPurchaseOrder();
-            IOPurchaseOrderDetail DetailDB = new IOPurchaseOrderDetail();
-            try
-            {
-                if (m_DetailList.Count == 0) return false;
-
-                // ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒšãƒ¼ã‚¸ã‚’å‰Šé™¤ã�™ã‚‹
-                this.TabCollections.TabPages.RemoveAt(0);
-
-                int icnt = 0;
-                string strSQL = string.Empty;
-                int ConstrCode = 0;
-                int OrderNo = 0;
-                object[] CurRec = (object[])m_DetailList[0];
-                ConstrCode = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.ConstructionCode]);
-                OrderNo = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.OrderNo]);
-
-                strSQL = string.Format(" WHERE CONSTRUCTIONCODE = {0}",ConstrCode);
-                strSQL += " AND SEQNO IN (SELECT LINKCODE FROM PROCESSAPPROVALDETAIL";
-                strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0} AND ORDERNO = {1})", ConstrCode, OrderNo);
-                strSQL += " ORDER BY SEQNO";
-                List<PurchaseOrder> OrderList = new List<PurchaseOrder>();
-                if (!OrderDB.SelectAction(strSQL, ref OrderList)) return false;
-
-                foreach (PurchaseOrder OrderRec in OrderList)
-                {
-                    strSQL = DetailDB.CreatePrimarykeyString(OrderRec.ConstructionCode, OrderRec.SeqNo);
-                    strSQL += " ORDER BY GroupCount ASC, LineCount ASC";
-                    List<PurchaseOrderDetail> DetailData = new List<PurchaseOrderDetail>();
-                    if (!DetailDB.SelectAction(strSQL, ref DetailData)) continue;
-
-                    // ãƒšãƒ¼ã‚¸è¿½åŠ 
-                    PurchaseOrderInputPage inputpage = new PurchaseOrderInputPage();
-                    CreateNewPage(ref inputpage, icnt, OrderRec.OrderSheetType);
-                    m_TabPageList.Add(inputpage);
-
-                    // ã‚°ãƒ«ãƒ¼ãƒ—ï¼•ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆ
-                    SetInitcmbPersonInCharge(inputpage);
-
-                    // ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                    SetPurchaseOrderPage(ref inputpage, OrderRec, icnt, OrderNo);
-                    // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                    SetPurchaseOrderDetail(ref inputpage, DetailData, icnt);
-                    icnt++;
-                }
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                OrderDB.close(); OrderDB = null;
-                DetailDB.close(); DetailDB = null;
-            }
-        }
-        #endregion
-
-        #region æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-        /// <summary>
-        /// æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-        /// </summary>
-        /// <returns></returns>
-        private void SetPurchaseOrderPage(ref PurchaseOrderInputPage inputpage, PurchaseOrder DataRec, int PageCount, int SeqNo)
-        {
-            IOMSubContractor SubCDB = new IOMSubContractor();
-            try
-            {
-                inputpage.OrderCompanyCode = DataRec.CompanyCode;                                   // å�”åŠ›ä¼šç¤¾ã‚³ãƒ¼ãƒ‰
-                inputpage.SeqNo = SeqNo;                                                            // æ³¨æ–‡æ›¸æž�ç•ª
-
-                SubContractorMaster SubRec = new SubContractorMaster();
-                string strSQL = SubCDB.CreatePrimarykeyString(DataRec.CompanyCode);
-                SubCDB.SelectAction(strSQL, ref SubRec);
-                 
-                // å�”åŠ›ä¼šç¤¾å��ã‚»ãƒƒãƒˆ
-                inputpage.EntryTab.Text = SubRec.CompanyName;
-                inputpage.PageValueItem[(int)PageValue.SubConstractorName].Text = SubRec.CompanyName;
-                // ç™ºæ³¨ç•ªå�·ã‚»ãƒƒãƒˆ
-                inputpage.PageValueItem[(int)PageValue.OrdersNo].Text = string.Format("{0}-{1}", DataRec.ConstructionCode, DataRec.SeqNo.ToString("000"));
-
-                inputpage.PageTextBox.Text = DataRec.CreateDate.ToShortDateString();                                        // ä½œæˆ�æ—¥ä»˜
-
-                inputpage.PageValueItem[(int)PageValue.OrderPrice].Text = DataRec.OrderPrice.ToString("#,0");               // ç™ºæ³¨é‡‘é¡�
-
-                if (DataRec.LastRowStringDate != DateTime.MinValue)
-                    inputpage.Group1TextBox.Text = DataRec.LastRowStringDate.ToShortDateString();                           // æœ€çµ‚è¡Œè¡¨ç¤ºæ–‡å­—
-
-                // ç°¡æ˜“ç‰ˆã�¨æ­£è¦�ç‰ˆã�§ã�¯ç™»éŒ²å†…å®¹ã�Œé�•ã�†
-                if (DataRec.OrderSheetType == (int)CommonDefine.OrderSheetType.SimpleType)
-                {   // ç°¡æ˜“ç‰ˆãƒ‡ãƒ¼ã‚¿
-                    radioButton1.Checked = true;
-                    inputpage.EntryGroupBox[(int)PageGroupBox.SimpleTypeGroup].Visible = true;
-                    inputpage.EntryGroupBox[(int)PageGroupBox.RegularTypeGroup].Visible = false;
-
-                    if (DataRec.PaymentTerms == (int)Group2CheckBox.Chk1)                                                   // æ”¯æ‰•ã�„æ�¡ä»¶
-                        inputpage.Group2RadioButton[(int)Group2CheckBox.Chk1].Checked = true;
-                    else
-                        inputpage.Group2RadioButton[(int)Group2CheckBox.Chk2].Checked = true;
-
-                    inputpage.Group2TextBox[(int)Group2Item.CachRatio].Text = DataRec.CashRatio.ToString("0.0");            // ç�¾é‡‘å‰²å�ˆï¼ˆï¼…ï¼‰
-                    inputpage.Group2TextBox[(int)Group2Item.BillRatio].Text = (100 - DataRec.CashRatio).ToString("0.0");    // æ‰‹å½¢å‰²å�ˆï¼ˆï¼…ï¼‰
-                }
-                else
-                {   // æ­£è¦�ç‰ˆãƒ‡ãƒ¼ã‚¿
-                    radioButton2.Checked = true;
-                    inputpage.EntryGroupBox[(int)PageGroupBox.SimpleTypeGroup].Visible = false;
-                    inputpage.EntryGroupBox[(int)PageGroupBox.RegularTypeGroup].Visible = true;
-
-                    if (DataRec.PrePayments == 1)
-                    {                                                    // å‰�é‡‘æ‰•
-                        inputpage.Group3CheckBox[(int)Group3CheckBox.Previous].Checked = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PrePaymentsDays].Text = DataRec.PrePaymentsDays.ToString("0");       // å‰�é‡‘æ‰•æ—¥æ•°
-                        inputpage.Group3TextBox[(int)Group3TextBox.PrePaymentsPrice].Text = DataRec.PrePaymentsPrice.ToString("#,0");     // å‰�é‡‘æ‰•é‡‘é¡�
-                        inputpage.Group3CheckBox[(int)Group3CheckBox.Previous].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PrePaymentsDays].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PrePaymentsPrice].Enabled = true;
-                    }
-                    if(DataRec.PartialPayment == 1)                     // éƒ¨åˆ†æ‰•
-                    {
-                        inputpage.Group3CheckBox[(int)Group3CheckBox.Partial].Checked = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentMounth].Text = DataRec.PartialPaymentMounth.ToString("0");     // éƒ¨åˆ†æ‰•ç· åˆ‡æœˆ
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentDay1].Text = DataRec.PartialPaymentDay1.ToString("0");         // éƒ¨åˆ†æ‰•ç· åˆ‡æ—¥
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentDay2].Text = DataRec.PartialPaymentDay2.ToString("0");         // éƒ¨åˆ†æ‰•æ”¯æ‰•æ—¥
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentPrice].Text = DataRec.PartialPaymentPrice.ToString("#,0");	    // éƒ¨åˆ†æ‰•é‡‘é¡�
-                        inputpage.Group3CheckBox[(int)Group3CheckBox.Partial].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentMounth].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentDay1].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentDay2].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.PartialPaymentPrice].Enabled = true;
-                    }
-                    if(DataRec.CompletionPayment == 1)	                                            // å¼•æ¸¡ã�—æ™‚ã�®æ”¯æ‰•
-                    {
-                        inputpage.Group3CheckBox[(int)Group3CheckBox.Complete].Checked = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.CompletionPaymentDays].Text = DataRec.CompletionPaymentDays.ToString("0");   // å¼•æ¸¡ã�—æ™‚ã�®æ”¯æ‰•æ—¥æ•°
-                        inputpage.Group3TextBox[(int)Group3TextBox.CompletionPaymentPrice].Text = DataRec.CompletionPaymentPrice.ToString("#,0"); // å¼•æ¸¡ã�—æ™‚ã�®æ”¯æ‰•é‡‘é¡�
-                        inputpage.Group3CheckBox[(int)Group3CheckBox.Complete].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.CompletionPaymentDays].Enabled = true;
-                        inputpage.Group3TextBox[(int)Group3TextBox.CompletionPaymentPrice].Enabled = true;
-                    }
-
-                    inputpage.Group3TextBox[(int)Group3TextBox.CashRatio].Text = DataRec.CashRatio.ToString("0.0");             // ç�¾é‡‘å‰²å�ˆï¼ˆï¼…ï¼‰
-                    inputpage.Group3TextBox[(int)Group3TextBox.BillRatio].Text = (100.0 - DataRec.CashRatio).ToString("0.0");   // æ‰‹å½¢å‰²å�ˆï¼ˆï¼…ï¼‰
-                    inputpage.Group3TextBox[(int)Group3TextBox.BillPeriod].Text = DataRec.BillPeriod.ToString();	            // æ‰‹å½¢æœŸé–“
-
-                    inputpage.Group5ComboBox[(int)Group5ComboBox.LeadEngineer].SelectedValue = DataRec.LeadEngineerCode.ToString();     // ä¸»ä»»æŠ€è¡“è€…ã‚³ãƒ¼ãƒ‰
-                    inputpage.Group5ComboBox[(int)Group5ComboBox.LeadEngineer].Text = DataRec.LeadEngineerName;                         // ä¸»ä»»æŠ€è¡“è€…å��
-                    inputpage.Group5ComboBox[(int)Group5ComboBox.SafetyOfficer].SelectedValue = DataRec.SafetyOfficerCode.ToString();   // å®‰å…¨ç®¡ç�†è€…ã‚³ãƒ¼ãƒ‰
-                    inputpage.Group5ComboBox[(int)Group5ComboBox.SafetyOfficer].Text = DataRec.SafetyOfficerName;                       // å®‰å…¨ç®¡ç�†è€…å��
-                    inputpage.Group5TextBox.Text = DataRec.WorkersCount.ToString();                                                     // ä½œæ¥­å“¡æ•°
-
-                }
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                SubCDB.close(); SubCDB = null;
-            }
-        }
-        #endregion
-
-        #region æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-        /// <summary>
-        /// æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-        /// </summary>
-        /// <returns></returns>
-        private void SetPurchaseOrderDetail(ref PurchaseOrderInputPage inputpage, List<PurchaseOrderDetail> DetailList, int PageCount)
-        {
-            try
-            {
-                // æ˜Žç´°ã‚°ãƒªãƒƒãƒ‰è¡¨ç¤º
-                int iRow = 0;
-                double PriceValueValue = 0;
-                foreach (PurchaseOrderDetail DetailRec in DetailList)
-                {
-                    // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã�®ã�¿ã‚’å¯¾è±¡ã�«ã�™ã‚‹
-                    if (DetailRec.GroupCount != 0) break;
-
-                    DataGridViewRow GetRow = inputpage.Group1DataGridView.Rows[iRow];
-
-                    GetRow.Cells[(int)DispDetailGridColumn.ComponentCode].Value = DetailRec.ComponentCode;                      // æ§‹æˆ�ã‚­ãƒ¼
-                    GetRow.Cells[(int)DispDetailGridColumn.ItemCode].Value = DetailRec.ItemCode;                                // å·¥ç¨®ã‚­ãƒ¼
-                    GetRow.Cells[(int)DispDetailGridColumn.FirstName].Value = DetailRec.FirstString;                            // å·¥ç¨®ãƒ»å“�å��
-                    GetRow.Cells[(int)DispDetailGridColumn.SecondName].Value = DetailRec.SecondString;                          // å†…å®¹å†…è¨³
-                    GetRow.Cells[(int)DispDetailGridColumn.Quantity].Value = DetailRec.UnitCount.ToString("#,0");               // æ•°é‡�
-                    GetRow.Cells[(int)DispDetailGridColumn.UnitName].Value = DetailRec.UnitName;                                // å�˜ä½�
-                    GetRow.Cells[(int)DispDetailGridColumn.UnitPrice].Value = DetailRec.UnitPrice.ToString("#,#");	            // å�˜ä¾¡
-                    GetRow.Cells[(int)DispDetailGridColumn.PriceValue].Value = DetailRec.OrdersLinePrice.ToString("#,0");       // é‡‘é¡�
-                    GetRow.Cells[(int)DispDetailGridColumn.SourceCode].Value = DetailRec.SourceCode;                            // å…ƒå·¥äº‹ç•ªå�·
-                    
-                    // é‡‘é¡�é›†è¨ˆ
-                    PriceValueValue += DetailRec.OrdersLinePrice;
-                    
-                    iRow++;
-                }
-                // ã‚°ãƒªãƒƒãƒ‰å�ˆè¨ˆè¡¨ç¤º
-                inputpage.Group1Label.Text = PriceValueValue.ToString("#,0");
-
-                // æ�¡ä»¶ã‚°ãƒªãƒƒãƒ‰
-                iRow = CommonDefine.Group4GridStaticString.Length;
-                
-                foreach (PurchaseOrderDetail DetailRec in DetailList)
-                {
-                    DataGridViewRow GetRow = inputpage.Group4DataGridView.Rows[iRow];
-                    // æ�¡ä»¶ãƒ‡ãƒ¼ã‚¿ã�®ã�¿ã‚’å¯¾è±¡ã�«ã�™ã‚‹
-                    if (DetailRec.GroupCount == 0) continue;
-
-                    GetRow.Cells[(int)DispTermsGridColumn.Terms].Value = DetailRec.FirstString;     // æ�¡ä»¶æ–‡å­—åˆ—
-                    iRow++;
-                }
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-        // ---------- æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ï¼ˆæ–°æ–¹å¼�ï¼‰ã€€â†‘â†‘
-
-        // ---------- å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ã€€ã€€ã€€ã€€â†“â†“
-        #region å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šèª­ã�¿è¾¼ã‚€SQLã‚’ä½œæˆ�ã�™ã‚‹
-        /// <summary>
-        /// å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šèª­ã�¿è¾¼ã‚€SQLã‚’ä½œæˆ�ã�™ã‚‹
-        /// </summary>
         /// <param name="strSQL"></param>
         private void CreateNewDataSQL(ref string strSQL)
         {
             try
             {
-                int ConstrCode = 0;
+                // å·¥äº‹å�°å¸³ã‚³ãƒ¼ãƒ‰ã�®ã‚»ãƒƒãƒˆ
+                object[] ParentRec = (object[])m_DetailList[0];
+                strSQL = string.Format(" WHERE CONSTRUCTIONCODE = {0}",
+                                        CommonMotions.cnvInt(ParentRec[(int)FrmOrderEntryList.ReadDBColumn.ConstructionCode]));
+
+                int SourceCode = 0;
                 int CompanyCode = 0;
-                int brkConstrCode = 0;
+                int brkSourceCode = 0;
                 bool bFirstCode = true;
                 bool bFirstCompany = true;
                 foreach (object[] CurRec in m_DetailList)
                 {
-                    ConstrCode = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.SourceCode]);
+                    SourceCode = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.SourceCode]);
                     CompanyCode = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.CompanyCode]);
                     // å·¥äº‹ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
-                    if (brkConstrCode != ConstrCode)
+                    if (brkSourceCode != SourceCode)
                     {
                         if (bFirstCode)
                         {
-                            strSQL = " WHERE";
+                            strSQL += " AND";
                             bFirstCode = false;
                         }
                         else
@@ -633,10 +457,10 @@
                         {
                             strSQL += ")) OR";
                         }
-                    
-                        strSQL += string.Format(" (CONSTRUCTIONCODE = {0} AND (", ConstrCode);
 
-                        brkConstrCode = ConstrCode;
+                        strSQL += string.Format(" (SOURCECODE = {0} AND (", SourceCode);
+
+                        brkSourceCode = SourceCode;
                         bFirstCompany = true;
                     }
                     // ä¼šç¤¾ç•ªå�·ã�®ã‚»ãƒƒãƒˆ
@@ -655,14 +479,15 @@
         }
         #endregion
 
-        #region å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
+        #region å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
         /// <summary>
-        /// å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
+        /// å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’å�–ã‚Šè¾¼ã‚€
         /// </summary>
         /// <returns></returns>
         private bool CreateNewOrderData()
         {
-            IOConstructionBudgetDetail DetailDB = new IOConstructionBudgetDetail();
+            //IOConstructionBudgetDetail DetailDB = new IOConstructionBudgetDetail();
+            IOConstructionLedgerDetail DetailDB = new IOConstructionLedgerDetail();
             IOPurchaseOrder OrderDB = new IOPurchaseOrder();
             try
             {
@@ -671,8 +496,9 @@
                 // å¯¾è±¡ãƒ‡ãƒ¼ã‚¿SQLä½œæˆ�
                 string strSQL = string.Empty;
                 CreateNewDataSQL(ref strSQL);
-                // å·¥äº‹äºˆç®—æ›¸ãƒ‡ãƒ¼ã‚¿èª­è¾¼
-                List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
+                // å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿èª­è¾¼
+                //List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
+                List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
                 if (!DetailDB.SelectAction(strSQL, ref DetailList)) return false;
                 if (DetailList.Count == 0) return false;
 
@@ -679,12 +505,15 @@
                 // ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒšãƒ¼ã‚¸ã‚’å‰Šé™¤ã�™ã‚‹
                 this.TabCollections.TabPages.RemoveAt(0);
 
-                int icnt = OrderDB.SelectMaxConstructionCodeCount(OrderDB.CreatePrimarykeyString(m_ConstructionCode));
+                int icnt = OrderDB.SelectMaxSeqNoCount(OrderDB.CreatePrimarykeyString(m_ConstructionCode));
+                int PageSeqNo = icnt;
                 bool binit = true;
                 int Break_CompanyCode = 0;
                 double Break_Total = 0;
-                List<ConstructionBudgetDetail> SumBuffer = new List<ConstructionBudgetDetail>();
-                foreach (ConstructionBudgetDetail DetailRec in DetailList)
+                //List<ConstructionBudgetDetail> SumBuffer = new List<ConstructionBudgetDetail>();
+                List<ConstructionLedgerDetail> SumBuffer = new List<ConstructionLedgerDetail>();
+                //foreach (ConstructionBudgetDetail DetailRec in DetailList)
+                foreach (ConstructionLedgerDetail DetailRec in DetailList)
                 {
                     // 1ä»¶ç›®ã�¯ãƒ�ãƒƒãƒ•ã‚¡ã�¸ã‚»ãƒƒãƒˆã�—ã�¦å‡¦ç�†ã�—ã�ªã�„
                     if (binit)
@@ -709,6 +538,8 @@
                             // ã‚°ãƒ«ãƒ¼ãƒ—ï¼•ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã‚»ãƒƒãƒˆ
                             SetInitcmbPersonInCharge(inputpage);
 
+                            // æ³¨æ–‡æ›¸æž�ç•ªã‚»ãƒƒãƒˆ
+                            inputpage.SeqNo = ++PageSeqNo;
                             // ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                             SetConstructionBudget(inputpage, SumBuffer, icnt);
                             icnt++;
@@ -734,6 +565,8 @@
                     CreateNewPage(ref inputpage, icnt, (int)CommonDefine.OrderSheetType.SimpleType);
                     m_TabPageList.Add(inputpage);
 
+                    // æ³¨æ–‡æ›¸æž�ç•ªã‚»ãƒƒãƒˆ
+                    inputpage.SeqNo = ++PageSeqNo;
                     // ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
                     SetConstructionBudget(inputpage, SumBuffer, icnt);
                     icnt++;
@@ -767,13 +600,14 @@
         }
         #endregion
 
-        #region å·¥äº‹äºˆç®—æ›¸ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šç”»é�¢ã�¸ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+        #region å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šç”»é�¢ã�¸ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// <summary>
-        /// å·¥äº‹äºˆç®—æ›¸ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šç”»é�¢ã�¸ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
+        /// å·¥äº‹è©³ç´°å�°å¸³ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šç”»é�¢ã�¸ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// </summary>
         /// <param name="inputpage"></param>
         /// <param name="DetailRec"></param>
-        private bool SetConstructionBudget(PurchaseOrderInputPage inputpage, List<ConstructionBudgetDetail> DetailList, int PageCount)
+        //private bool SetConstructionBudget(PurchaseOrderInputPage inputpage, List<ConstructionBudgetDetail> DetailList, int PageCount)
+        private bool SetConstructionBudget(PurchaseOrderInputPage inputpage, List<ConstructionLedgerDetail> DetailList, int PageCount)
         {
             try
             {
@@ -788,7 +622,8 @@
                 int Linecnt = 0;
                 double TotalPrice = 0;
                 DataGridView dgv = inputpage.Group1DataGridView;
-                foreach (ConstructionBudgetDetail DetailRec in DetailList)
+                //foreach (ConstructionBudgetDetail DetailRec in DetailList)
+                foreach (ConstructionLedgerDetail DetailRec in DetailList)
                 {
                     // 15è¡Œä»¥ä¸Šã�¯å‡¦ç�†ã�—ã�ªã�„
                     if (Linecnt > (dgv.RowCount - 1)) break;
@@ -846,15 +681,15 @@
             }
         }
         #endregion
-        // ---------- å·¥äº‹äºˆç®—æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ã€€ã€€ã€€ã€€â†‘â†‘
+        // ---------- å·¥äº‹è©³ç´°å�°å¸³ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ã€€ã€€ã€€ã€€â†‘â†‘
 
-        // ---------- æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ï¼ˆæ—§æ–¹å¼�ï¼‰ã€€â†“â†“
+        // ---------- æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�          ã€€â†“â†“
         #region æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—
         /// <summary>
         /// æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—ã�—ã�¦ç”»é�¢è¡¨ç¤ºã�™ã‚‹
         /// </summary>
         /// <returns></returns>
-        private bool OldType_SetPurchaseOrderData()
+        private bool SetPurchaseOrderData()
         {
             IOPurchaseOrder OrderDB = new IOPurchaseOrder();
             IOPurchaseOrderDetail DetailDB = new IOPurchaseOrderDetail();
@@ -861,8 +696,17 @@
             try
             {
                 // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿èª­è¾¼
-                string strSQL = OrderDB.CreatePrimarykeyString(m_ConstructionCode);
-                strSQL += " ORDER BY SEQNO";
+                string strSQL = " WHERE";
+                bool bFirst = true;
+                foreach (object[] objRec in m_DetailList)
+                {
+                    if (!bFirst) strSQL += " Or";
+                    strSQL += string.Format(" (CONSTRUCTIONCODE = {0}", CommonMotions.cnvInt(objRec[(int)FrmOrderEntryList.ReadDBColumn.SourceCode]));
+                    strSQL += string.Format(" AND SEQNO = {0})", CommonMotions.cnvInt(objRec[(int)FrmOrderEntryList.ReadDBColumn.PurchaseSeqNo]));
+                    bFirst = false;
+                }
+                strSQL += " ORDER BY CONSTRUCTIONCODE, SEQNO";
+
                 List<PurchaseOrder> OrderList = new List<PurchaseOrder>();
                 if (!OrderDB.SelectAction(strSQL, ref OrderList)) return false;
                 if (OrderList.Count == 0) return false;
@@ -887,9 +731,9 @@
                     SetInitcmbPersonInCharge(inputpage);
 
                     // ãƒšãƒ¼ã‚¸ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                    OldType_SetPurchaseOrderPage(ref inputpage, OrderRec, icnt);
+                    SetPurchaseOrderPage(ref inputpage, OrderRec, icnt);
                     // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-                    OldType_SetPurchaseOrderDetail(ref inputpage, DetailData, icnt);
+                    SetPurchaseOrderDetail(ref inputpage, DetailData, icnt);
                     icnt++;
                 }
 
@@ -913,7 +757,7 @@
         /// æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// </summary>
         /// <returns></returns>
-        private void OldType_SetPurchaseOrderPage(ref PurchaseOrderInputPage inputpage, PurchaseOrder DataRec, int PageCount)
+        private void SetPurchaseOrderPage(ref PurchaseOrderInputPage inputpage, PurchaseOrder DataRec, int PageCount)
         {
             IOMSubContractor SubCDB = new IOMSubContractor();
             try
@@ -1019,7 +863,7 @@
         /// æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
         /// </summary>
         /// <returns></returns>
-        private void OldType_SetPurchaseOrderDetail(ref PurchaseOrderInputPage inputpage, List<PurchaseOrderDetail> DetailList, int PageCount)
+        private void SetPurchaseOrderDetail(ref PurchaseOrderInputPage inputpage, List<PurchaseOrderDetail> DetailList, int PageCount)
         {
             try
             {
@@ -1070,7 +914,7 @@
             }
         }
         #endregion
-        // ---------- æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�ï¼ˆæ—§æ–¹å¼�ï¼‰ã€€â†‘â†‘
+        // ---------- æ³¨æ–‡æ›¸ã‚ˆã‚Šãƒ‡ãƒ¼ã‚¿ä½œæˆ�          ã€€â†‘â†‘
 
         #region ç°¡æ˜“ç‰ˆæ”¯æ‰•æ�¡ä»¶ã�®åˆ�æœŸå€¤ã‚»ãƒƒãƒˆ
         /// <summary>
@@ -1208,10 +1052,7 @@
                 {
                     PurchaseOrderInputPage DataTab = m_TabPageList[i];
                     SeqCnt = DataTab.SeqNo;
-                    if (SeqCnt == 0)
-                    {
-                        SeqCnt = OrderDB.SelectMaxConstructionCodeCount(OrderDB.CreatePrimarykeyString(m_ConstructionCode), false) + 1;
-                    }
+
                     // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿ç™»éŒ²å‡¦ç�†
                     if (!EntryPurchaseOrder(ref OrderDB, DataTab, SeqCnt))
                     {
@@ -1732,6 +1573,7 @@
                         // å�”åŠ›ä¼šç¤¾å��å¤‰æ›´
                         TargetField = (int)IOConstructionLedgerDetail.DataColumn.CompanyName;
                         strSQL = LDetailDB.CreatePrimarykeyString(TargetCode);
+                        strSQL += string.Format(" AND SOURCECODE = {0}", m_ConstructionCode);
                         strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
                         strSQL += string.Format(" AND COMPANYCODE = {0}", BeforeCode);
                         strSQL += string.Format(" AND EXECUTIONAMOUNT = {0}", PriceVal);
@@ -1752,6 +1594,7 @@
                     // æ³¨æ–‡æ›¸ä½œæˆ�ãƒ•ãƒ©ã‚°ON
                     TargetField = (int)IOConstructionLedgerDetail.DataColumn.PurchaseOrderFlg;
                     strSQL = LDetailDB.CreatePrimarykeyString(TargetCode);
+                    strSQL += string.Format(" AND SOURCECODE = {0}", m_ConstructionCode);
                     strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
                     strSQL += string.Format(" AND COMPANYCODE = {0}", DataTab.OrderCompanyCode);
                     strSQL += string.Format(" AND EXECUTIONAMOUNT = {0}", PriceVal);
@@ -1824,7 +1667,7 @@
                 OrderDB.connect(); OrderDB.beginTran();
                 DetailDB.connect(); DetailDB.beginTran();
 
-                // ã�¾ã�šå‰Šé™¤ã�™ã‚‹
+                // å‰Šé™¤ã�™ã‚‹
                 string strDel = OrderDB.CreatePrimarykeyString(m_ConstructionCode);
                 if (!OrderDB.DeleteAction(strDel, false))
                 {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.Designer.cs	(revision 48)
@@ -33,6 +33,7 @@
             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();
             this.label1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.label2 = new System.Windows.Forms.Label();
@@ -56,6 +57,7 @@
             this.btnOtherProc = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnPrint = new System.Windows.Forms.Button();
+            this.lblNoLook = new System.Windows.Forms.Label();
             this.groupBox2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.PrintProgress = new System.Windows.Forms.ProgressBar();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
@@ -63,10 +65,10 @@
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.lblNoLook = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
@@ -213,6 +215,7 @@
             this.label6.TabIndex = 35;
             this.label6.Text = "æ³¨æ–‡æ›¸ä½œæˆ�æ—¥";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label6.Visible = false;
             // 
             // label14
             // 
@@ -268,6 +271,7 @@
             this.label7.Size = new System.Drawing.Size(114, 25);
             this.label7.TabIndex = 36;
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label7.Visible = false;
             // 
             // label11
             // 
@@ -356,6 +360,17 @@
             this.btnPrint.UseVisualStyleBackColor = false;
             this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
             // 
+            // lblNoLook
+            // 
+            this.lblNoLook.AutoSize = true;
+            this.lblNoLook.BackColor = System.Drawing.Color.White;
+            this.lblNoLook.Location = new System.Drawing.Point(12, 9);
+            this.lblNoLook.Name = "lblNoLook";
+            this.lblNoLook.Size = new System.Drawing.Size(127, 16);
+            this.lblNoLook.TabIndex = 98;
+            this.lblNoLook.Text = "è¦‹ã�ˆã�ªã�„ãƒ©ãƒ™ãƒ«";
+            this.lblNoLook.Visible = false;
+            // 
             // groupBox2
             // 
             this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -401,6 +416,7 @@
             this.dataGridViewTextBoxColumn3,
             this.Column5,
             this.Column6,
+            this.Column4,
             this.Column1,
             this.Column3,
             this.Column2});
@@ -456,13 +472,23 @@
             this.Column6.Name = "Column6";
             this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 550;
+            this.Column6.Width = 400;
             // 
+            // Column4
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column4.HeaderText = "æ³¨æ–‡æ›¸ä½œæˆ�æ—¥";
+            this.Column4.Name = "Column4";
+            this.Column4.ReadOnly = true;
+            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column4.Width = 150;
+            // 
             // Column1
             // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column1.Frozen = true;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column1.HeaderText = "ç™ºæ³¨é‡‘é¡�";
             this.Column1.Name = "Column1";
             this.Column1.ReadOnly = true;
@@ -471,7 +497,6 @@
             // 
             // Column3
             // 
-            this.Column3.Frozen = true;
             this.Column3.HeaderText = "æ”¯æ‰•æ�¡ä»¶";
             this.Column3.Name = "Column3";
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -479,21 +504,9 @@
             // 
             // Column2
             // 
-            this.Column2.Frozen = true;
             this.Column2.HeaderText = "å�°åˆ·";
             this.Column2.Name = "Column2";
             // 
-            // lblNoLook
-            // 
-            this.lblNoLook.AutoSize = true;
-            this.lblNoLook.BackColor = System.Drawing.Color.White;
-            this.lblNoLook.Location = new System.Drawing.Point(12, 9);
-            this.lblNoLook.Name = "lblNoLook";
-            this.lblNoLook.Size = new System.Drawing.Size(127, 16);
-            this.lblNoLook.TabIndex = 98;
-            this.lblNoLook.Text = "è¦‹ã�ˆã�ªã�„ãƒ©ãƒ™ãƒ«";
-            this.lblNoLook.Visible = false;
-            // 
             // FrmPurchaseOrderPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -551,16 +564,17 @@
         private CustomControls.DataGridViewEX dgvAllDisplay;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Button btnPrint;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.ProgressBar PrintProgress;
+        private System.Windows.Forms.Label lblNoLook;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.ProgressBar PrintProgress;
-        private System.Windows.Forms.Label lblNoLook;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.cs	(revision 48)
@@ -60,6 +60,10 @@
             /// </summary>
             PurchaseName,
             /// <summary>
+            /// æ³¨æ–‡æ›¸ä½œæˆ�æ—¥
+            /// </summary>
+            CreateDate,
+            /// <summary>
             /// ç™ºæ³¨é‡‘é¡�
             /// </summary>
             PurchasePrice,
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.resx	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrint.resx	(revision 48)
@@ -120,6 +120,9 @@
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs	(revision 48)
@@ -210,18 +210,26 @@
             try
             {
                 // æ³¨æ–‡æ›¸ãƒ‡ãƒ¼ã‚¿èª­è¾¼
-                string strSQL = OrderDB.CreatePrimarykeyString(m_ConstructionCode);
-                strSQL += " ORDER BY SEQNO";
-                List<PurchaseOrder> OrderList = new List<PurchaseOrder>();
-                if (!OrderDB.SelectAction(strSQL, ref OrderList)) return false;
-                if (OrderList.Count == 0) return false;
+                string strSQL = "SELECT A.* FROM PURCHASEORDER A, PROCESSAPPROVALDETAIL B, PROCESSAPPROVAL C";
+                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL += " AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
+                strSQL += string.Format(" AND B.APPROVALCODE = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQL += string.Format(" AND B.ORDERNO = {0}", m_OrderNo);
+                strSQL += " AND B.LINKCODE = A.SEQNO";
+                strSQL += " AND C.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND C.APPROVALCODE = B.APPROVALCODE AND C.ORDERNO = B.ORDERNO AND C.SEQNO = 1";
+                strSQL += string.Format(" AND C.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval);
+                strSQL += " ORDER BY A.SEQNO";
 
-                // å�°åˆ·æ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
-                lblNoLook.Text = OrderList[0].PrintoutDate.ToShortDateString();
+                ArrayList arList = new ArrayList();
+                if (!OrderDB.ExecuteReader(strSQL, ref arList)) return false;
+                if (arList.Count == 0) return false;
 
                 int icnt = 1;
-                foreach (PurchaseOrder OrderRec in OrderList)
+                PurchaseOrder OrderRec = new PurchaseOrder();
+                foreach (object[] objRec in arList)
                 {
+                    OrderDB.Reader2Struct(objRec, ref OrderRec);
+
                     // å�”åŠ›ä¼šç¤¾æ¤œç´¢
                     string SubSQL = SubConDB.CreatePrimarykeyString(OrderRec.CompanyCode);
                     SubContractorMaster SubConRec = new SubContractorMaster();
@@ -252,10 +260,14 @@
                                             OrderRec.SeqNo,
                                             string.Format("{0}-{1}", OrderRec.ConstructionCode, OrderRec.SeqNo.ToString("000")),    // ç™ºæ³¨ç•ªå�·ã‚»ãƒƒãƒˆ
                                             SubConRec.CompanyName,                                                                  // ç™ºæ³¨å…ˆä¼šç¤¾å��
+                                            OrderRec.CreateDate.ToShortDateString(),                                              // æ³¨æ–‡æ›¸ä½œæˆ�æ—¥
                                             OrderRec.OrderPrice.ToString("#,0"),                                                    // ç™ºæ³¨é‡‘é¡�
                                             PurchaseString,                                                                         // æ”¯æ‰•æ�¡ä»¶
                                             true);
                     icnt++;
+
+                    // å�°åˆ·æ—¥ä»˜ã‚’å�–å¾—ã�™ã‚‹
+                    //lblNoLook.Text = OrderRec.PrintoutDate.ToShortDateString();
                 }
 
                 return true;
@@ -381,14 +393,31 @@
             IOPurchaseOrder OrderDB = new IOPurchaseOrder();
             try
             {
-                string strWhere = OrderDB.CreatePrimarykeyString(m_ConstructionCode);
-                List<PurchaseOrder> OrderList = new List<PurchaseOrder>();
-                if (!OrderDB.SelectAction(strWhere, ref OrderList)) return false;
+                //string strWhere = OrderDB.CreatePrimarykeyString(m_ConstructionCode);
+                //List<PurchaseOrder> OrderList = new List<PurchaseOrder>();
+                //if (!OrderDB.SelectAction(strWhere, ref OrderList)) return false;
 
-                string strSQL = string.Format("UPDATE PurchaseOrder SET PrintoutDate = TO_DATE('{0}','YYYY/MM/DD')", CreateDate.ToShortDateString());
-                strSQL += string.Format(" {0}", strWhere);
-                if (!OrderDB.ExecuteNonQuery(strSQL)) return false;
+                //string strSQL = string.Format("UPDATE PurchaseOrder SET PrintoutDate = TO_DATE('{0}','YYYY/MM/DD')", CreateDate.ToShortDateString());
+                //strSQL += string.Format(" {0}", strWhere);
+                //if (!OrderDB.ExecuteNonQuery(strSQL)) return false;
 
+                OrderDB.connect(); OrderDB.beginTran();
+                int GridSeqNo = 0;
+                foreach(DataGridViewRow GridCurRow in dgvAllDisplay.Rows)
+                {
+                    // é�¸æŠžç„¡ã�¯å¯¾è±¡å¤–
+                    if (CommonMotions.chkCellBlank(GridCurRow.Cells[(int)GridColumn.PrintExec].Value)) continue;
+                    if (!(bool)GridCurRow.Cells[(int)GridColumn.PrintExec].Value) continue;
+                    // æž�ç•ªå�–å¾—
+                    GridSeqNo=CommonMotions.cnvInt(GridCurRow.Cells[(int)GridColumn.SeqNo].Value);
+                    // å�°åˆ·æ—¥ã‚»ãƒƒãƒˆ
+                    if (!OrderDB.UpdateFeild(m_ConstructionCode,(int)IOPurchaseOrder.TableColumn.PrintoutDate, CreateDate, false, GridSeqNo))
+                    {
+                        OrderDB.rollback();
+                        return false;
+                    }
+                }
+
                 return true;
             }
             catch (System.Exception ex)
@@ -398,6 +427,7 @@
             }
             finally
             {
+                OrderDB.commit();
                 OrderDB.close(); OrderDB = null;
             }
         }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs	(revision 48)
@@ -91,7 +91,7 @@
                 }
 
                 // ŽŸ‹N“®ƒvƒ�ƒZƒXƒZƒbƒg
-                NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo);
+                NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry);
                 // ‘I‘ð�HŽ–”Ô�†ƒZƒbƒg
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_ConstructionCode);
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.cs	(nonexistent)
@@ -1,1173 +0,0 @@
-ï»¿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.ControlsAction;
-
-namespace ProcessManagement.Forms.SubForms
-{
-    public partial class FrmNewOrContinueCopy : Form
-    {
-        #region ãƒ­ã‚°ä½¿ç”¨å®šç¾©
-        //log4netãƒ­ã‚°ã‚’ä½¿ç”¨ã�™ã‚‹
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region å®šæ•°
-        /// <summary>
-        /// è¡¨ç¤ºã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«å®šç¾©
-        /// </summary>
-        private enum Dispcount
-        {
-            ConstructionCode = 0,
-            ConstructionName,
-            SalesPerson,
-            ConstructionPerson,
-            ConstructionPeriod,
-            radioButton1,
-            ConstructionCode1,
-            radioButton2,
-            ConstructionCode2,
-            radioButton3,
-            ConstructionCode3,
-            radioButton4,
-            ConstructionCode4,
-        }
-        /// <summary>
-        /// å·¥äº‹å��ç§°
-        /// </summary>
-        private const int s_ConstructionNameLength = 120;
-        /// <summary>
-        /// è¦‹ç©�æ��å‡ºæœŸé™�ï¼ˆæ—¥ï¼‰
-        /// </summary>
-        private static int s_EstimatesSubmitDeadline = 7;
-        #endregion
-
-        #region å¤‰æ•°
-        /// <summary>
-        /// çµ‚äº†çŠ¶æ…‹ãƒ•ãƒ©ã‚°
-        /// </summary>
-        private DialogResult m_EndButton = DialogResult.None;
-        /// <summary>
-        /// å·¥äº‹ç•ªå�·
-        /// </summary>
-        private int m_ConstructionCode = 0;
-        /// <summary>
-        /// ã‚³ãƒ³ãƒ­ãƒ¼ãƒ«ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ
-        /// </summary>
-        private Control[] m_dispControl;
-        /// <summary>
-        /// æ–°è¦�å·¥äº‹ç•ªå�·å�–å¾—
-        /// </summary>
-        private bool m_NewConstruction = false;
-        #endregion
-
-        #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
-        /// <summary>
-        /// å·¥äº‹ç•ªå�·
-        /// </summary>
-        public int ConstructionCode
-        {
-            get { return m_ConstructionCode; }
-            set { m_ConstructionCode = value; }
-        }
-        /// <summary>
-        /// æ–°è¦�å·¥äº‹ç•ªå�·å�–å¾—
-        /// </summary>
-        public bool NewConstruction
-        {
-            get { return m_NewConstruction; }
-        }
-        /// <summary>
-        /// çµ‚äº†ãƒœã‚¿ãƒ³çŠ¶æ…‹
-        /// </summary>
-        public DialogResult EndButton
-        {
-            get { return m_EndButton; }
-        }
-        #endregion
-
-        #region ãƒ•ã‚©ãƒ¼ãƒ ã‚¯ãƒ­ãƒ¼ã‚º
-        private void FrmNewOrContinueCopy_FormClosed(object sender, FormClosedEventArgs e)
-        {
-            if (m_EndButton == DialogResult.None) m_EndButton = DialogResult.Cancel;
-
-        }
-        #endregion
-        
-        #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
-        /// <summary>
-        /// ãƒ•ã‚©ãƒ¼ãƒ åˆ�æœŸåŒ–
-        /// </summary>
-        public FrmNewOrContinueCopy()
-        {
-            InitializeComponent();
-        }
-        #endregion
-        
-        #region ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
-        /// <summary>
-        /// ãƒ•ã‚©ãƒ¼ãƒ ãƒ­ãƒ¼ãƒ‰
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmCostStructureDiag_Load(object sender, EventArgs e)
-        {
-            // ãƒ•ã‚©ãƒ¼ãƒ ã‚µã‚¤ã‚ºå›ºå®š
-            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
-
-            // ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�®ã‚»ãƒƒãƒˆ
-            SetDisplayObject();
-
-            // å–¶æ¥­æœŸã‚»ãƒƒãƒˆ
-            SetcmbConstructionPeriod();
-
-            // æ‹…å½“è€…ã‚»ãƒƒãƒˆ
-            SetcmbPersons();
-
-            // åˆ�æœŸè¡¨ç¤º
-            InitDataLoad();
-        }
-        #endregion
-        
-        #region ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³
-        /// <summary>
-        /// ã‚­ãƒ£ãƒ³ã‚»ãƒ«ãƒœã‚¿ãƒ³è¿½åŠ 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnCancel_Click(object sender, EventArgs e)
-        {
-            m_EndButton = DialogResult.Cancel;
-            this.Close();
-        }
-        #endregion
-
-        #region å®Ÿè¡Œãƒœã‚¿ãƒ³
-        /// <summary>
-        /// å®Ÿè¡Œãƒœã‚¿ãƒ³æŠ¼ä¸‹
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnExecProc1_Click(object sender, EventArgs e)
-        {
-            // ãƒ‡ãƒ¼ã‚¿å­˜åœ¨ãƒ�ã‚§ãƒƒã‚¯
-            if (!DispFeildCheck()) return;
-
-            // ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼
-            if (!CopyTableData())
-            {
-                MessageBox.Show("ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ã‚³ãƒ”ãƒ¼ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            m_EndButton = DialogResult.Yes;
-            this.Close();
-        }
-        #endregion
-        
-        #region ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³
-        /// <summary>
-        /// ãƒ�ã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ã�®å¤‰æ›´
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void radioButton1_CheckedChanged(object sender, EventArgs e)
-        {
-            if (radioButton1.Checked)
-            {
-                tableLayoutPanel3.Visible = true;
-                lblNextMessage.Visible = false;
-                // å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-                m_dispControl[(int)Dispcount.ConstructionCode1].Visible = true;
-                m_dispControl[(int)Dispcount.ConstructionCode2].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode3].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode4].Visible = false;
-            }
-            else if (radioButton2.Checked)
-            {
-                tableLayoutPanel3.Visible = false;
-                lblNextMessage.Visible = true;
-                // å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-                m_dispControl[(int)Dispcount.ConstructionCode1].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode2].Visible = true;
-                m_dispControl[(int)Dispcount.ConstructionCode3].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode4].Visible = false;
-            }
-            else if (radioButton3.Checked)
-            {
-                tableLayoutPanel3.Visible = false;
-                lblNextMessage.Visible = true;
-                // å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-                m_dispControl[(int)Dispcount.ConstructionCode1].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode2].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode3].Visible = true;
-                m_dispControl[(int)Dispcount.ConstructionCode4].Visible = false;
-            }
-            else if (radioButton4.Checked)
-            {
-                tableLayoutPanel3.Visible = false;
-                lblNextMessage.Visible = true;
-                // å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-                m_dispControl[(int)Dispcount.ConstructionCode1].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode2].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode3].Visible = false;
-                m_dispControl[(int)Dispcount.ConstructionCode4].Visible = true;
-            }
-            // å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-            SetConstructionCode();
-        }
-
-        #endregion
-
-        #region ç”»é�¢ã‚¯ãƒªã‚¢
-        /// <summary>
-        /// ç”»é�¢ã‚¯ãƒªã‚¢
-        /// </summary>
-        private void ClearDisplay()
-        {
-            try
-            {
-                foreach (Control wrk in m_dispControl)
-                {
-                    if (CommonMotions.chkObjectIsNull(wrk)) continue;
-                    if (!wrk.GetType().Equals(typeof(CheckBox))) continue;
-                    wrk.Text = "";
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚»ãƒƒãƒˆ
-        /// <summary>
-        /// è¡¨ç¤ºã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã�®å�–å¾—
-        /// </summary>
-        private void SetDisplayObject()
-        {
-            int CtrlCnt = Enum.GetNames(typeof(Dispcount)).Length;
-            m_dispControl = new Control[CtrlCnt];
-
-            m_dispControl[(int)Dispcount.ConstructionCode] = label14;
-            m_dispControl[(int)Dispcount.ConstructionName] = label10;
-            m_dispControl[(int)Dispcount.SalesPerson] = label11;
-            m_dispControl[(int)Dispcount.ConstructionPerson] = label12;
-            m_dispControl[(int)Dispcount.ConstructionPeriod] = cmbConstructionPeriod;
-            m_dispControl[(int)Dispcount.radioButton1] = radioButton1;
-            m_dispControl[(int)Dispcount.radioButton2] = radioButton2;
-            m_dispControl[(int)Dispcount.radioButton3] = radioButton3;
-            m_dispControl[(int)Dispcount.radioButton4] = radioButton4;
-            m_dispControl[(int)Dispcount.ConstructionCode1] = label1;
-            m_dispControl[(int)Dispcount.ConstructionCode2] = label5;
-            m_dispControl[(int)Dispcount.ConstructionCode3] = label16;
-            m_dispControl[(int)Dispcount.ConstructionCode4] = label17;
-        }
-        #endregion
-
-        #region åˆ�æœŸé–¢é€£
-        /// <summary>
-        /// åˆ�æœŸè¡¨ç¤ºå‡¦ç�†
-        /// </summary>
-        private void InitDataLoad()
-        {
-            try
-            {
-                // ã‚¯ãƒªã‚¢
-                ClearDisplay();
-
-                if (!DisplayData())
-                {
-                    m_EndButton = DialogResult.Cancel;
-                    this.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region æ‹…å½“è€…å��å�–å¾—
-        /// <summary>
-        /// æ‹…å½“è€…å��ã‚’å�–å¾—ã�™ã‚‹
-        /// </summary>
-        /// <param name="PersonCode"></param>
-        /// <returns></returns>
-        private string GetPersonName(int PersonCode)
-        {
-            IOMPersonInCharge picDB = new IOMPersonInCharge();
-            try
-            {
-                string strRet = string.Empty;
-
-                string strPerson = picDB.CreatePrimarykeyString(PersonCode);
-                PersonInChargeMaster picRec = new PersonInChargeMaster();
-                if (picDB.SelectAction(strPerson, ref picRec)) strRet =picRec.PersonName;
-
-                return strRet;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return string.Empty;
-            }
-            finally
-            {
-                picDB.close(); picDB = null;
-            }
-
-        }
-        #endregion
-
-        #region ãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯
-        /// <summary>
-        /// ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-        /// </summary>
-        /// <returns></returns>
-        private bool DispFeildCheck()
-        {
-            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
-            IOEstimateData edDB = new IOEstimateData();
-            try
-            {
-                bool bRet = true;
-                bool BaseFlg = true;
-                bool EstiFlg = true;
-
-                // å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—
-                string strSQL = cbDB.CreatePrimarykeyString(m_ConstructionCode);
-                ConstructionBaseInfo cbRec = new ConstructionBaseInfo();
-                if (!cbDB.SelectAction(strSQL, ref cbRec)) BaseFlg = false;
-
-                // ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                strSQL = edDB.CreatePrimarykeyString(m_ConstructionCode);
-                EstimateData edRec = new EstimateData();
-                if (!edDB.SelectAction(strSQL, ref edRec)) EstiFlg = false;
-
-                if (radioButton1.Checked)
-                {   // ä¸¡æ–¹ã‚³ãƒ”ãƒ¼
-                    if (BaseFlg && EstiFlg)
-                    {
-                        bRet = true;
-                    }
-                    else if (!BaseFlg)
-                    {
-                        MessageBox.Show("å·¥äº‹åŸºæœ¬æƒ…å ±ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "ã‚³ãƒ”ãƒ¼ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        bRet = false;
-                    }
-                    else if (!EstiFlg)
-                    {
-                        MessageBox.Show("ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "ã‚³ãƒ”ãƒ¼ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        bRet = false;
-                    }
-                    else
-                    {
-                        MessageBox.Show("å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ»ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "ã‚³ãƒ”ãƒ¼ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        bRet = false;
-                    }
-                }
-                else if (radioButton2.Checked)
-                {   // ç©�ç®—ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼
-                    if (EstiFlg)
-                    {
-                        bRet = true;
-                    }
-                    else
-                    {
-                        MessageBox.Show("ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "ã‚³ãƒ”ãƒ¼ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        bRet = false;
-                    }
-                }
-                else if (radioButton3.Checked)
-                {   // å·¥äº‹åŸºæœ¬æƒ…å ±ã‚³ãƒ”ãƒ¼
-                    if (BaseFlg)
-                    {
-                        bRet = true;
-                    }
-                    else
-                    {
-                        MessageBox.Show("å·¥äº‹åŸºæœ¬æƒ…å ±ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚", "ã‚³ãƒ”ãƒ¼ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        bRet = false;
-                    }
-                }
-
-                return bRet;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                cbDB.close(); cbDB = null;
-                edDB.close(); edDB = null;
-            }
-        }
-        #endregion
-
-        #region ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-        /// <summary>
-        /// ãƒ‡ãƒ¼ã‚¿è¡¨ç¤º
-        /// </summary>
-        /// <returns></returns>
-        private bool DisplayData()
-        {
-            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
-            IOConstructionBaseInfoDetail cbdDB = new IOConstructionBaseInfoDetail();
-            IOEstimateData edDB = new IOEstimateData();
-            try
-            {
-                bool bRet = true;
-
-                // å…ƒå·¥äº‹ç•ªå�·
-                m_dispControl[(int)Dispcount.ConstructionCode].Text = CommonMotions.cnvStringCodeFromInt(m_ConstructionCode, "-", 8);
-
-                // å·¥äº‹åŸºæœ¬æƒ…å ±å�–å¾—
-                string strSQL = cbDB.CreatePrimarykeyString(m_ConstructionCode);
-                ConstructionBaseInfo cbRec = new ConstructionBaseInfo();
-                if (!cbDB.SelectAction(strSQL, ref cbRec)) return false;
-
-                // ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿å�–å¾—ï¼ˆè¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã��ã�¦ã‚‚ã‚³ãƒ”ãƒ¼ã‚’è¡Œã�† 2016/07/19ï¼‰
-                //strSQL = edDB.CreatePrimarykeyString(m_ConstructionCode);
-                //EstimateData edRec = new EstimateData();
-                //if (!edDB.SelectAction(strSQL, ref edRec)) return false;
-
-                // å·¥äº‹å��ç§°å�–å¾—
-                strSQL = cbdDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
-                ConstructionBaseInfoDetail cbdRec = new ConstructionBaseInfoDetail();
-                if (!cbdDB.SelectAction(strSQL, ref cbdRec)) return false;
-                m_dispControl[(int)Dispcount.ConstructionName].Text = cbdRec.DetailString;
-                toolTip1.SetToolTip(m_dispControl[(int)Dispcount.ConstructionName], cbdRec.DetailString);
-
-                // æ‹…å½“è€…è¡¨ç¤º
-                m_dispControl[(int)Dispcount.SalesPerson].Text = GetPersonName(cbRec.SalesPersonCode);
-                toolTip1.SetToolTip(m_dispControl[(int)Dispcount.SalesPerson], m_dispControl[(int)Dispcount.SalesPerson].Text);
-                cmbSalesPerson.SelectedValue = cbRec.SalesPersonCode;
-
-                m_dispControl[(int)Dispcount.ConstructionPerson].Text = GetPersonName(cbRec.ConstructionPersonCode);
-                toolTip1.SetToolTip(m_dispControl[(int)Dispcount.ConstructionPerson], m_dispControl[(int)Dispcount.ConstructionPerson].Text);
-                cmbConstructionPerson.SelectedValue = cbRec.ConstructionPersonCode;
-
-                // å·¥äº‹ç•ªå�·è¡¨ç¤º
-                SetConstructionCode();
-
-                return bRet;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                cbDB.close(); cbDB = null;
-                cbdDB.close(); cbdDB = null;
-                edDB.close(); edDB = null;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹æƒ…å ±ãƒ»è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼æ™‚ã�®å·¥äº‹ç•ªå�·è¡¨ç¤º(radiobutton1)
-        /// <summary>
-        /// å·¥äº‹æƒ…å ±ãƒ»è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼æ™‚ã�®å·¥äº‹ç•ªå�·è¡¨ç¤º(radiobutton1)
-        /// </summary>
-        /// <param name="cbDB"></param>
-        private bool DispChildDataCode(IOConstructionBaseInfo cbDB)
-        {
-            try
-            {
-                int ConstructionCode = 0;
-
-                // å·¥äº‹æž�ç•ªã�®ã‚«ã‚¦ãƒ³ãƒˆã‚¢ãƒƒãƒ—åˆ†å·¥äº‹ç•ªå�·å�–å¾—
-                ConstructionCode = cbDB.CreateNextBranchCounstructionCode(m_ConstructionCode);
-
-                // å·¥äº‹ç•ªå�·è¡¨ç¤º
-                m_dispControl[(int)Dispcount.ConstructionCode1].Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
-
-                // ä½œæˆ�é™�ç•Œã‚’è¶…ã�ˆã�Ÿå ´å�ˆã�¯ã‚¨ãƒ©ãƒ¼ã�«ã�™ã‚‹
-                if (ConstructionCode < 0)
-                {
-                    MessageBox.Show("æ–°è¦�å·¥äº‹ç•ªå�·ã�Œå�–å¾—ã�§ã��ã�¾ã�›ã‚“ã€‚", "ç¶™ç¶šä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                else if ((ConstructionCode - m_ConstructionCode) > 99)
-                {
-                    MessageBox.Show("å¤‰æ›´ä½œæˆ�ã�®ä¸Šé™�æ•°ã‚’è¶…ã�ˆã�¾ã�—ã�Ÿã€�\nã�“ã‚Œä»¥ä¸Šã�¯ä½œæˆ�ã�§ã��ã�¾ã�›ã‚“ã€�\næ–°è¦�å·¥äº‹ã�¨ã�—ã�¦ä½œæˆ�ã�—ã�¦ã��ã� ã�•ã�„ã€‚",
-                                    "ç¶™ç¶šä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹ç•ªå�·è¡¨ç¤º
-        /// <summary>
-        /// å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-        /// </summary>
-        private void SetConstructionCode()
-        {
-            IOConstructionBaseInfo cbDB = new IOConstructionBaseInfo();
-            try
-            {
-                btnExecProc1.Enabled = true;
-
-                // å·¥äº‹ç•ªå�·ã‚¯ãƒªã‚¢
-                m_dispControl[(int)Dispcount.ConstructionCode1].Text = string.Empty;
-                m_dispControl[(int)Dispcount.ConstructionCode2].Text = string.Empty;
-                m_dispControl[(int)Dispcount.ConstructionCode3].Text = string.Empty;
-                m_dispControl[(int)Dispcount.ConstructionCode4].Text = string.Empty;
-
-                // ----- å·¥äº‹æƒ…å ±ãƒ»è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼
-                if (radioButton1.Checked)
-                {
-                    // ----- ç¶™ç¶šå·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-                    if (!DispChildDataCode(cbDB)) btnExecProc1.Enabled = false;
-
-                    // ----- ã�“ã�“ã�§æŠœã�‘ã‚‹ï¼ˆä»¥ä¸‹ã�®å‡¦ç�†ã�¯æ–°è¦�å·¥äº‹ç•ªå�·å�–å¾—ï¼‰
-                    return;
-                }
-
-                // ç�¾åœ¨ãƒ‡ãƒ¼ã‚¿ã‚’å�–å¾—ã�™ã‚‹
-                string strExistsData = cbDB.CreatePrimarykeyString(m_ConstructionCode);
-                ConstructionBaseInfo BaseRec = new ConstructionBaseInfo();
-                if (!cbDB.SelectAction(strExistsData, ref BaseRec)) return;
-
-                // ----- è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�®ã�¿ã‚³ãƒ”ãƒ¼ãƒ»å·¥äº‹æƒ…å ±ã�®ã�¿ã‚³ãƒ”ãƒ¼
-                int PeriodValue = 0;
-                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
-                    PeriodValue = BaseRec.ConstructionPeriod;
-                else
-                    PeriodValue = BaseRec.ConstructionYear;
-
-                // æ–°è¦�å·¥äº‹ç•ªå�·ã�®è¡¨ç¤º
-                int ConstructionCode = cbDB.CreateNewCounstructionCode(PeriodValue);
-                // ä½œæˆ�é™�ç•Œã‚’è¶…ã�ˆã�Ÿå ´å�ˆã�¯ã‚¨ãƒ©ãƒ¼ã�«ã�™ã‚‹
-                if (ConstructionCode < 0)
-                {
-                    MessageBox.Show("æ–°è¦�å·¥äº‹ç•ªå�·ã�Œå�–å¾—ã�§ã��ã�¾ã�›ã‚“ã€‚", "ç¶™ç¶šä½œæˆ�ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                if (radioButton2.Checked)
-                    m_dispControl[(int)Dispcount.ConstructionCode2].Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
-                else if (radioButton3.Checked)
-                    m_dispControl[(int)Dispcount.ConstructionCode3].Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
-                else if (radioButton4.Checked)
-                    m_dispControl[(int)Dispcount.ConstructionCode4].Text = CommonMotions.cnvStringCodeFromInt(ConstructionCode, "-", 8);
-
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                cbDB.close(); cbDB = null;
-            }
-        }
-
-        #endregion
-
-        #region å–¶æ¥­æœŸã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹
-        /// <summary>
-        /// å–¶æ¥­æœŸã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�¸æ–‡å­—ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-        /// </summary>
-        private bool SetcmbConstructionPeriod()
-        {
-            try
-            {
-                cmbConstructionPeriod.Items.Clear();
-                cmbConstructionPeriod.Text = "";
-
-                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
-                {
-                    // æœŸæ•°ã‚»ãƒƒãƒˆï¼ˆ-2å¹´ï½ž+2å¹´ï¼‰
-                    int NowPeriod = CommonMotions.SystemMasterData.BusinessPeriod;
-                    if (NowPeriod > 2) cmbConstructionPeriod.Items.Add((NowPeriod - 2).ToString());
-                    if (NowPeriod > 1) cmbConstructionPeriod.Items.Add((NowPeriod - 1).ToString());
-                    cmbConstructionPeriod.Items.Add(NowPeriod.ToString());
-                    cmbConstructionPeriod.Items.Add((NowPeriod + 1).ToString());
-                    cmbConstructionPeriod.Items.Add((NowPeriod + 2).ToString());
-
-                    // ä»Šå­£ã‚»ãƒƒãƒˆ
-                    if (cmbConstructionPeriod.Items.Count == 5)
-                        cmbConstructionPeriod.SelectedIndex = 2;
-                    else if (cmbConstructionPeriod.Items.Count == 4)
-                        cmbConstructionPeriod.SelectedIndex = 1;
-                    else if (cmbConstructionPeriod.Items.Count == 3)
-                        cmbConstructionPeriod.SelectedIndex = 0;
-                }
-                else
-                {
-                    label7.Text = "å–¶æ¥­å¹´åº¦";
-                    int NowYear = CommonMotions.SystemMasterData.ConstructionYear;
-
-                    cmbConstructionPeriod.Items.Add((NowYear - 2).ToString());
-                    cmbConstructionPeriod.Items.Add((NowYear - 1).ToString());
-                    cmbConstructionPeriod.Items.Add((NowYear).ToString());
-                    cmbConstructionPeriod.Items.Add((NowYear + 1).ToString());
-                    cmbConstructionPeriod.Items.Add((NowYear + 2).ToString());
-
-                    // ä»Šå­£ã‚»ãƒƒãƒˆ
-                    cmbConstructionPeriod.SelectedIndex = 2;
-
-                }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region æ‹…å½“è€…ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹
-        /// <summary>
-        /// æ‹…å½“è€…ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã�¸æ–‡å­—ã‚’ã‚»ãƒƒãƒˆã�™ã‚‹
-        /// </summary>
-        private bool SetcmbPersons()
-        {
-            IOMPersonInCharge picDB = new IOMPersonInCharge();
-            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
-            try
-            {
-                cmbSalesPerson.DataSource = null;
-                cmbSalesPerson.Items.Clear();
-                cmbSalesPerson.Text = "";
-
-                // æ‹…å½“è€…ãƒžã‚¹ã‚¿ã‚’æ¤œç´¢ã�™ã‚‹
-                string strSQL = " Where DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC";
-
-                // æ‹…å½“è€…ãƒžã‚¹ã‚¿èª­è¾¼
-                if (!picDB.SelectAction(strSQL, ref workList)) return false;
-
-                List<KeyValuePair<int, string>> SalesDataList = new List<KeyValuePair<int, string>>();
-                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
-                SalesDataList.Add(new KeyValuePair<int, string>(0, ""));
-                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
-
-                foreach (PersonInChargeMaster work in workList)
-                {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(work.PersonCode, work.PersonName);
-
-                    SalesDataList.Add(keyval);
-                    ConstructionDataList.Add(keyval);
-                }
-
-                // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆ�æœŸè¡¨ç¤º
-                ComboBoxAction.InitDataSetCombBox(cmbSalesPerson, SalesDataList);
-                ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList);
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                picDB.close();
-                picDB = null;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹æƒ…å ±ãƒ»ç©�ç®—è¦‹ç©�ã‚³ãƒ”ãƒ¼
-        /// <summary>
-        /// å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ»ç©�ç®—è¦‹ç©�ã�®ã‚³ãƒ”ãƒ¼
-        /// </summary>
-        /// <returns></returns>
-        private bool CopyTableData()
-        {
-            IOConstructionBaseInfo DB1 = new IOConstructionBaseInfo();                  // å·¥äº‹åŸºæœ¬æƒ…å ±
-            IOConstructionBaseInfoDetail DB2 = new IOConstructionBaseInfoDetail();      // å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°
-            IOEstimateData DB3 = new IOEstimateData();                                  // ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿  
-            IOEstimateDataBody DB4 = new IOEstimateDataBody();                          // ç©�ç®—è¦‹ç©�ãƒœãƒ‡ã‚£
-            IOEstimateDataDetail DB5 = new IOEstimateDataDetail();                      // ç©�ç®—è¦‹ç©�æ˜Žç´°
-            IOConstructionProgressDate DB6 = new IOConstructionProgressDate();          // æ¡ˆä»¶é€²æ�—æ—¥ä»˜ãƒ‡ãƒ¼ã‚¿
-            try
-            {
-                int iToCode = 0;
-
-                // ã‚³ãƒ”ãƒ¼å…ˆå·¥äº‹ç•ªå�·å�–å¾—
-                if (radioButton1.Checked)
-                    iToCode = CommonMotions.cnvIntFromStringCode(m_dispControl[(int)Dispcount.ConstructionCode1].Text, "-");
-                else if (radioButton2.Checked)
-                    iToCode = CommonMotions.cnvIntFromStringCode(m_dispControl[(int)Dispcount.ConstructionCode2].Text, "-");
-                else if (radioButton3.Checked)
-                    iToCode = CommonMotions.cnvIntFromStringCode(m_dispControl[(int)Dispcount.ConstructionCode3].Text, "-");
-                else if (radioButton4.Checked)
-                    iToCode = CommonMotions.cnvIntFromStringCode(m_dispControl[(int)Dispcount.ConstructionCode4].Text, "-");
-
-                if (iToCode == 0)
-                {
-                    MessageBox.Show("æ–°è¦�å·¥äº‹ç•ªå�·ã�Œå�–å¾—ã�§ã��ã�¾ã�›ã‚“ã€‚", "ã‚³ãƒ”ãƒ¼å‡¦ç�†ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                // ã‚³ãƒ”ãƒ¼å‡¦ç�†
-                DB1.connect(); DB1.beginTran();
-                DB2.connect(); DB2.beginTran();
-                DB3.connect(); DB3.beginTran();
-                DB4.connect(); DB4.beginTran();
-                DB5.connect(); DB5.beginTran();
-                DB6.connect(); DB6.beginTran();
-
-                // ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�¯æ–°è¦�å·¥äº‹ã�«ã�—ã�¦ã�Šã��
-                m_NewConstruction = true;
-
-                // ----- å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ»ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼(æž�ç•ªã‚«ã‚¦ãƒ³ãƒˆã‚¢ãƒƒãƒ—)
-                if (radioButton1.Checked)
-                {
-                    // ç©�ç®—è¦‹ç©�æƒ…å ±ã‚³ãƒ”ãƒ¼
-                    if (!RecordCopyTypeB(m_ConstructionCode, iToCode, DB3, DB4, DB5))
-                    {
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-
-                    if (!RecordCopyTypeA(m_ConstructionCode, iToCode, DB1, DB2))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                    // ã��ã�®ï¼’å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!InitSetBaseInfo(iToCode, DB1))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                    // ã��ã�®ï¼“å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!InitSetBaseInfoDetail(m_ConstructionCode, iToCode, DB2))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-
-                    // ç¶™ç¶šæ¡ˆä»¶ã�®å ´å�ˆã�¯æ–°è¦�å·¥äº‹ãƒ•ãƒ©ã‚°ã‚’è�½ã�¨ã�™
-                    m_NewConstruction = false;
-                }
-                // ----- ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼
-                else if (radioButton2.Checked)
-                {
-                    // ç©�ç®—è¦‹ç©�æƒ…å ±ã‚³ãƒ”ãƒ¼
-                    if (!RecordCopyTypeB(m_ConstructionCode, iToCode, DB3, DB4, DB5))
-                    {
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-
-                }
-                // ----- å·¥äº‹åŸºæœ¬æƒ…å ±ã‚³ãƒ”ãƒ¼
-                else if (radioButton3.Checked)
-                {
-                    if (!RecordCopyTypeA(m_ConstructionCode, iToCode, DB1, DB2))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                    // ã��ã�®ï¼’å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!InitSetBaseInfo(iToCode, DB1))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                    // ã��ã�®ï¼“å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!InitSetBaseInfoDetail(m_ConstructionCode, iToCode, DB2))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                }
-                // ----- å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ»ç©�ç®—è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚³ãƒ”ãƒ¼(æ–°è¦�å·¥äº‹)
-                else if (radioButton4.Checked)
-                {
-                    // ç©�ç®—è¦‹ç©�æƒ…å ±ã‚³ãƒ”ãƒ¼
-                    if (!RecordCopyTypeB(m_ConstructionCode, iToCode, DB3, DB4, DB5))
-                    {
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-
-                    if (!RecordCopyTypeA(m_ConstructionCode, iToCode, DB1, DB2))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                    // ã��ã�®ï¼’å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!InitSetBaseInfo(iToCode, DB1))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                    // ã��ã�®ï¼“å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-                    if (!InitSetBaseInfoDetail(m_ConstructionCode, iToCode, DB2))
-                    {
-                        DB1.rollback();
-                        DB2.rollback();
-                        DB3.rollback();
-                        DB4.rollback();
-                        DB5.rollback();
-                        return false;
-                    }
-                }
-
-                // æ¡ˆä»¶é€²æ�—æ—¥ä»˜ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-                if (!ProgressDate(DB6, iToCode))
-                {
-                    DB1.rollback();
-                    DB2.rollback();
-                    DB3.rollback();
-                    DB4.rollback();
-                    DB5.rollback();
-                    DB6.rollback();
-                    return false;
-                }
-
-                // æ–°è¦�å·¥äº‹ç•ªå�·ã‚»ãƒƒãƒˆ
-                m_ConstructionCode = iToCode;
-
-                DB1.commit();
-                DB2.commit();
-                DB3.commit();
-                DB4.commit();
-                DB5.commit();
-                DB6.commit();
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                DB1.close(); DB1 = null;
-                DB2.close(); DB2 = null;
-                DB3.close(); DB3 = null;
-                DB4.close(); DB4 = null;
-                DB5.close(); DB5 = null;
-                DB6.close(); DB6 = null;
-            }
-        }
-        #endregion
-
-        #region ã��ã�®ï¼’å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// <summary>
-        /// å·¥äº‹åŸºæœ¬æƒ…å ±è¨­å®š
-        /// </summary>
-        /// <param name="cbRec"></param>
-        private bool InitSetBaseInfo(int ToCode, IOConstructionBaseInfo cbDB)
-        {
-            try
-            {
-                // å·¥äº‹åŸºæœ¬æƒ…å ±ã�®è¨­å®š
-                string strSQL = cbDB.CreatePrimarykeyString(ToCode);
-                ConstructionBaseInfo cbRec = new ConstructionBaseInfo();
-                if (!cbDB.SelectAction(strSQL, ref cbRec, false)) return false;
-
-                // å–¶æ¥­æœŸãƒ»å·¥äº‹å¹´åº¦ã‚’æ›´æ–°ã�™ã‚‹
-                int iPeriod = 0;
-                if (tableLayoutPanel3.Visible)
-                {
-                    iPeriod = CommonMotions.cnvInt(cmbConstructionPeriod.Text);
-                    if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
-                        cbRec.ConstructionPeriod = iPeriod;                                                 // å·¥äº‹æœŸ
-                    else
-                        cbRec.ConstructionYear = iPeriod;	                                                // å·¥äº‹å¹´åº¦
-                }
-
-                cbRec.ConstructionStatusFlg = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("ä¾�é ¼å�—ã�‘ä¸­")).Key;  // å·¥äº‹é€²æ�—çŠ¶æ…‹
-                cbRec.RequestedDate	= DateTime.Now;                                                 // ä¾�é ¼å�—ã�‘æ—¥
-                cbRec.EstimatesSubmitDeadline = DateTime.Now.AddDays(s_EstimatesSubmitDeadline);	// è¦‹ç©�æ��å‡ºæœŸé™�
-                cbRec.EstimatesSubmittedDate = DateTime.MinValue;	                                // è¦‹ç©�æ��å‡ºæ—¥
-                cbRec.EstimatesExpirationDate = DateTime.MinValue;	                                // è¦‹ç©�æœ‰åŠ¹æœŸé™�
-                cbRec.ProvisionalOrderDate = DateTime.MinValue;                                     // ä»®å�—æ³¨æ—¥
-                cbRec.OrderDate = DateTime.MinValue;                                                // å�—æ³¨æ—¥
-                cbRec.TransferConstructionDate = DateTime.MinValue;                                 // éƒ¨ç½²å¼•ç¶™æ—¥
-                cbRec.ConstructionStartingDate = DateTime.MinValue;                                 // æ–½å·¥é–‹å§‹æ—¥
-                cbRec.ConstructionCompletionDate = DateTime.MinValue;                               // æ–½å·¥å®Œäº†æ—¥
-                cbRec.BillingStartDate = DateTime.MinValue;	                                        // è«‹æ±‚æº–å‚™é–‹å§‹æ—¥
-                cbRec.BillingDate = DateTime.MinValue;	                                            // è«‹æ±‚æ—¥
-
-                // å·¥äº‹æƒ…å ±ã�®ã�¿ã‚³ãƒ”ãƒ¼ãƒ»æ–°è¦�å·¥äº‹ä½œæˆ�ã�¯å·¥äº‹ã�®æƒ…å ±ä»¥å¤–ã�¯ã‚¯ãƒªã‚¢ã�™ã‚‹
-                if (radioButton3.Checked || radioButton4.Checked)
-                {
-                    cbRec.TyingFlg = (int)CommonDefine.BaseInfoTyingFlg.Standard;                   // ç´�ä»˜ãƒ‡ãƒ¼ã‚¿ãƒ•ãƒ©ã‚°
-                    cbRec.OrderStartingDate = DateTime.MinValue;	                                // é–‹å§‹äºˆå®šæ—¥
-                    cbRec.OrderCompletionDate = DateTime.MinValue;	                                // å®Œäº†äºˆå®šæ—¥
-                    cbRec.PreparationStartDate = DateTime.MinValue;                                 // æ–½å·¥æº–å‚™é–‹å§‹æ—¥
-                    cbRec.NonOrderDate = DateTime.MinValue;                                         // é�žå�—æ³¨æ—¥
-                    cbRec.OrdersDecisionPrice = 0;                                                  // ç¨ŽæŠœå�—æ³¨æ±ºå®šé‡‘é¡�
-                    cbRec.OrdersDecisionPriceInTax = 0;                                             // ç¨Žè¾¼å�—æ³¨æ±ºå®šé‡‘é¡�
-                    cbRec.ConstructionPersonCode = 0;                                               // å·¥äº‹æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
-                    cbRec.ConstrSubPersonCode = 0;	                                                // å·¥äº‹å‰¯æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰
-                    cbRec.ConstructionInstructor = 0;                                               // å·¥äº‹æŒ‡å°Žå“¡ã‚³ãƒ¼ãƒ‰
-                    cbRec.TransferConstruction = 0;                                                 // ç§»ç®¡å…ˆã‚³ãƒ¼ãƒ‰
-                    cbRec.TransferConstructionDate = DateTime.MinValue;                             // å·¥äº‹ç§»ç®¡æ—¥
-                    cbRec.ConstructionPeriodStart = DateTime.MinValue;                              // å¥‘ç´„å·¥æœŸé–‹å§‹
-                    cbRec.ConstructionPeriodEnd = DateTime.MinValue;                                // å¥‘ç´„å·¥æœŸå®Œäº†
-                    cbRec.ConstructionPeriodStart2 = DateTime.MinValue;                             // å¥‘ç´„å·¥æœŸé–‹å§‹ï¼ˆå»¶é•·æ™‚ï¼‰
-                    cbRec.ConstructionPeriodEnd2 = DateTime.MinValue;                               // å¥‘ç´„å·¥æœŸå®Œäº†ï¼ˆå»¶é•·æ™‚ï¼‰
-                    cbRec.StartDate = DateTime.MinValue;	                                        // å·¥äº‹é–‹å§‹æ—¥
-                    cbRec.EndDate = DateTime.MinValue;                                              // å·¥äº‹çµ‚äº†æ—¥
-                    cbRec.PurchaseOrderMailingDate = DateTime.MinValue;                             // æ³¨æ–‡æ›¸éƒµé€�æ—¥
-                    cbRec.PurchaseOrderReturnDate = DateTime.MinValue;                              // æ³¨æ–‡æ›¸è¿”é€�æ—¥
-                    cbRec.PurchaseOrderReturnCheckDate = DateTime.MinValue;                         // æ³¨æ–‡æ›¸è¿”é€�ç¢ºèª�æ—¥
-                    cbRec.ConsumptionTaxFlg = 1;                                                    // æ¶ˆè²»ç¨Žãƒ•ãƒ©ã‚°
-                    //cbRec.PrimeContractorFlg = 1;	                                                // å…ƒè«‹ãƒ•ãƒ©ã‚°
-                    //cbRec.SalesCostFlg = 1;	                                                    // å–¶æ¥­çµŒè²»ç™ºç”Ÿãƒ•ãƒ©ã‚°
-                    //cbRec.EstimateType = 1;                                                       // è¦‹ç©�ç¨®åˆ¥
-                    cbRec.BillingSplitFlg = 1;                                                      // è«‹æ±‚å›žæ•°ãƒ•ãƒ©ã‚°
-                    cbRec.BillingSendDate = DateTime.MinValue;                                      // è«‹æ±‚æ›¸éƒµé€�/æ‰‹æ¸¡ã�—æ—¥
-                }
-                else if (radioButton1.Checked)
-                {
-                    // é�¸æŠžãƒ‡ãƒ¼ã‚¿ã�Œé€šå¸¸ä»¥å¤–ï¼ˆå¢—æ¸›å·¥äº‹ã�®å ´å�ˆã�¯ç´�ä»˜ã��ãƒ•ãƒ©ã‚°ã‚’å­�ãƒ‡ãƒ¼ã‚¿ã�«ã�™ã‚‹ï¼‰
-                    if (cbRec.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Standard)
-                    {
-                        cbRec.TyingFlg = (int)CommonDefine.BaseInfoTyingFlg.Tying;
-                    }
-                }
-
-                // å–¶æ¥­æ‹…å½“
-                if (cmbSalesPerson.Text.Length != 0)
-                {
-                    cbRec.SalesPersonCode = CommonMotions.cnvInt(cmbSalesPerson.SelectedValue.ToString());
-                }
-                // å·¥äº‹æ‹…å½“
-                if (cmbConstructionPerson.Text.Length != 0)
-                {
-                    cbRec.ConstructionPersonCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue.ToString());
-                }
-
-                // æ›´æ–°å‡¦ç�†
-                if (!cbDB.UpdateAction(strSQL, cbRec, false)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region ã��ã�®ï¼“å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ä½œæˆ�
-        /// <summary>
-        /// å·¥äº‹åŸºæœ¬æƒ…å ±è¨­å®š
-        /// </summary>
-        /// <param name="cbRec"></param>
-        private bool InitSetBaseInfoDetail(int FromCode, int ToCode, IOConstructionBaseInfoDetail cbidDB)
-        {
-            try
-            {
-                // å·¥äº‹åŸºæœ¬æƒ…å ±æ˜Žç´°ã�®è¨­å®š
-                string strSQL = cbidDB.CreatePrimarykeyString(ToCode, (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
-                ConstructionBaseInfoDetail cbidRec = new ConstructionBaseInfoDetail();
-                if (!cbidDB.SelectAction(strSQL, ref cbidRec, false)) return false;
-
-                // å·¥äº‹å��ã‚’æ›´æ–°ã�™ã‚‹
-                if (cbidRec.DetailString.Length < s_ConstructionNameLength - 2)
-                {
-                    // ã‚³ãƒ”ãƒ¼å…ƒã�Œã‚³ãƒ”ãƒ¼ãƒ‡ãƒ¼ã‚¿ã�®å ´å�ˆã�«æœ€å¾Œã�Œæ•°å­—ã�‹ã‚’ãƒ�ã‚§ãƒƒã‚¯
-                    int CodeLowerwork = (FromCode % 100);
-                    if (CodeLowerwork != 1)
-                    {
-                        int subcnt = 1;
-                        if (CodeLowerwork > 9) subcnt = 2;
-                        string strwrok = cbidRec.DetailString.Substring(cbidRec.DetailString.Length - subcnt);
-                        // æœ€å¾Œã�Œæ•°å­—ã�®å ´å�ˆã�¯ã��ã‚Œã‚’é™¤ã��
-                        if (CommonMotions.chkNumeric(strwrok))
-                        {
-                            cbidRec.DetailString = cbidRec.DetailString.Substring(0, cbidRec.DetailString.Length - subcnt);
-                        }
-                    }
-
-                    int CodeLower = (ToCode % 100);
-                    cbidRec.DetailString = cbidRec.DetailString + CodeLower.ToString();
-                }
-
-                // æ›´æ–°å‡¦ç�†
-                if (!cbidDB.UpdateAction(strSQL, cbidRec, false)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region å·¥äº‹åŸºæœ¬æƒ…å ±ä¸€æ‹¬ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚³ãƒ”ãƒ¼å‡¦ç�†ï¼ˆã‚³ãƒ”ãƒ¼ã‚¿ã‚¤ãƒ—ï¼¡ï¼‰
-        /// <summary>
-        /// å·¥äº‹åŸºæœ¬æƒ…å ±ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚³ãƒ”ãƒ¼å‡¦ç�†ï¼ˆã‚³ãƒ”ãƒ¼ã‚¿ã‚¤ãƒ—ï¼¡ï¼‰
-        /// </summary>
-        /// <param name="FromCode"></param>
-        /// <param name="ToCode"></param>
-        /// <param name="bConnect"></param>
-        /// <returns></returns>
-        public bool RecordCopyTypeA(int FromCode, int ToCode, IOConstructionBaseInfo DB1, IOConstructionBaseInfoDetail DB2)
-        {
-            try
-            {
-                // ã�¾ã�šå‰Šé™¤
-                string strSQL = DB1.CreatePrimarykeyString(ToCode);
-                DB1.DeleteAction(strSQL, false);
-                DB2.DeleteAction(strSQL, false);
-
-                if (!DB1.RecordCopyAction(FromCode, ToCode, false)) return false;
-                if (!DB2.RecordCopyAction(FromCode, ToCode, false)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region ç©�ç®—è¦‹ç©�æƒ…å ±ä¸€æ‹¬ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚³ãƒ”ãƒ¼å‡¦ç�†ï¼ˆã‚³ãƒ”ãƒ¼ã‚¿ã‚¤ãƒ—ï¼¢ï¼‰
-        /// <summary>
-        /// ç©�ç®—è¦‹ç©�æƒ…å ±ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚³ãƒ”ãƒ¼å‡¦ç�†ï¼ˆã‚³ãƒ”ãƒ¼ã‚¿ã‚¤ãƒ—ï¼¢
-        /// ï¼‰
-        /// </summary>
-        /// <param name="FromCode"></param>
-        /// <param name="ToCode"></param>
-        /// <param name="bConnect"></param>
-        /// <returns></returns>
-        public bool RecordCopyTypeB(int FromCode, int ToCode, IOEstimateData DB1, IOEstimateDataBody DB2, IOEstimateDataDetail DB3)
-        {
-            try
-            {
-                // ã�¾ã�šå‰Šé™¤
-                string strSQL = DB1.CreatePrimarykeyString(ToCode);
-                DB1.DeleteAction(strSQL, false);
-                DB2.DeleteAction(strSQL, false);
-                DB3.DeleteAction(strSQL, false);
-
-                if (!DB1.RecordCopyAction(FromCode, ToCode, false)) return false;
-                if (!DB2.RecordCopyAction(FromCode, ToCode, false)) return false;
-                if (!DB3.RecordCopyAction(FromCode, ToCode, false)) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(2), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region æ¡ˆä»¶é€²æ�—æ—¥ä»˜ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-        /// <summary>
-        /// æ¡ˆä»¶é€²æ�—æ—¥ä»˜ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-        /// </summary>
-        /// <param name="cpdDB"></param>
-        /// <returns></returns>
-        public bool ProgressDate(IOConstructionProgressDate cpdDB, int ConstructionCode)
-        {
-            try
-            {
-                // ã�¾ã�šå‰Šé™¤
-                string strWhere = cpdDB.CreatePrimarykeyString(ConstructionCode);
-                cpdDB.DeleteAction(strWhere, false);
-
-                // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                ConstructionProgressDate Rec = new ConstructionProgressDate();
-                Rec.ConstructionCode = ConstructionCode;
-                Rec.ConstructionStatusFlg = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("ä¾�é ¼å�—ã�‘ä¸­")).Key; ;
-                Rec.PreviousStatusFlg = 0;
-                Rec.ChangeDate = DateTime.Now;
-                Rec.ChangePersonCode = CommonMotions.LoginUserData.PersonCode;
-
-                // æ¤œç´¢æ–‡å­—åˆ—ä½œæˆ�
-                strWhere = cpdDB.CreatePrimarykeyString(Rec.ConstructionCode, Rec.ConstructionStatusFlg);
-
-                List<ConstructionProgressDate> workList = new List<ConstructionProgressDate>();
-                // ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
-                if (!cpdDB.InsertAction(Rec, false))
-                {
-                    MessageBox.Show("æ¡ˆä»¶é€²æ�—æ—¥ä»˜ãƒ‡ãƒ¼ã‚¿ï¼šè¿½åŠ ç™»éŒ²ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚", "ç™»éŒ²ã‚¨ãƒ©ãƒ¼", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-    }
-}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.Designer.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.Designer.cs	(nonexistent)
@@ -1,606 +0,0 @@
-ï»¿namespace ProcessManagement.Forms.SubForms
-{
-    partial class FrmNewOrContinueCopy
-    {
-        /// <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.components = new System.ComponentModel.Container();
-            this.btnExecProc1 = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.label18 = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.radioButton4 = new System.Windows.Forms.RadioButton();
-            this.label16 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.radioButton2 = new System.Windows.Forms.RadioButton();
-            this.label1 = new System.Windows.Forms.Label();
-            this.radioButton3 = new System.Windows.Forms.RadioButton();
-            this.label15 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.lblNextMessage = new System.Windows.Forms.Label();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.cmbConstructionPerson = new System.Windows.Forms.ComboBox();
-            this.cmbSalesPerson = new System.Windows.Forms.ComboBox();
-            this.label20 = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
-            this.cmbConstructionPeriod = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
-            this.panel1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // btnExecProc1
-            // 
-            this.btnExecProc1.BackColor = System.Drawing.Color.Green;
-            this.btnExecProc1.ForeColor = System.Drawing.Color.White;
-            this.btnExecProc1.Location = new System.Drawing.Point(519, 5);
-            this.btnExecProc1.Name = "btnExecProc1";
-            this.btnExecProc1.Size = new System.Drawing.Size(140, 40);
-            this.btnExecProc1.TabIndex = 0;
-            this.btnExecProc1.Text = "å®Ÿã€€è¡Œ";
-            this.btnExecProc1.UseVisualStyleBackColor = false;
-            this.btnExecProc1.Click += new System.EventHandler(this.btnExecProc1_Click);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.BackColor = System.Drawing.Color.Red;
-            this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(675, 5);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(140, 40);
-            this.btnCancel.TabIndex = 3;
-            this.btnCancel.Text = "ã‚­ãƒ£ãƒ³ã‚»ãƒ«";
-            this.btnCancel.UseVisualStyleBackColor = false;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.Silver;
-            this.panel1.Controls.Add(this.btnCancel);
-            this.panel1.Controls.Add(this.btnExecProc1);
-            this.panel1.Location = new System.Drawing.Point(-3, 600);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(833, 50);
-            this.panel1.TabIndex = 3;
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.groupBox2.Controls.Add(this.label18);
-            this.groupBox2.Controls.Add(this.label17);
-            this.groupBox2.Controls.Add(this.radioButton4);
-            this.groupBox2.Controls.Add(this.label16);
-            this.groupBox2.Controls.Add(this.label5);
-            this.groupBox2.Controls.Add(this.label8);
-            this.groupBox2.Controls.Add(this.label6);
-            this.groupBox2.Controls.Add(this.radioButton1);
-            this.groupBox2.Controls.Add(this.radioButton2);
-            this.groupBox2.Controls.Add(this.label1);
-            this.groupBox2.Controls.Add(this.radioButton3);
-            this.groupBox2.Controls.Add(this.label15);
-            this.groupBox2.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.groupBox2.Location = new System.Drawing.Point(12, 140);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(800, 320);
-            this.groupBox2.TabIndex = 7;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "ã‚³ãƒ”ãƒ¼ç¨®åˆ¥ãƒ»å·¥äº‹ç•ªå�·";
-            // 
-            // label18
-            // 
-            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(44, 273);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(574, 38);
-            this.label18.TabIndex = 30;
-            this.label18.Text = "æ—¢å­˜å·¥äº‹ã‚’ã‚³ãƒ”ãƒ¼ã�—ã�¦ä½œæˆ�ã€€ã€€ã€€ã€�åˆ¥å·¥äº‹ã�¨ã�—ã�¦æ–°è¦�ã�«ä½œæˆ�ã�•ã‚Œã�¾ã�™ã€‘\r\nâ€»ä½œæˆ�ä¸­ã�®å·¥äº‹ã‚’æ–°è¦�ã�®å·¥äº‹ã�¨ã�—ã�¦ç§»è¡Œã�™ã‚‹å ´å�ˆã�«ä½¿ç”¨";
-            // 
-            // label17
-            // 
-            this.label17.BackColor = System.Drawing.Color.White;
-            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label17.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label17.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label17.Location = new System.Drawing.Point(597, 249);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(174, 24);
-            this.label17.TabIndex = 29;
-            this.label17.Text = "22229999-01";
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.label17.Visible = false;
-            // 
-            // radioButton4
-            // 
-            this.radioButton4.AutoSize = true;
-            this.radioButton4.Location = new System.Drawing.Point(28, 250);
-            this.radioButton4.Name = "radioButton4";
-            this.radioButton4.Size = new System.Drawing.Size(552, 23);
-            this.radioButton4.TabIndex = 28;
-            this.radioButton4.Text = "å·¥äº‹æƒ…å ±ãƒ»è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚’ã‚³ãƒ”ãƒ¼ã€�æ–°è¦�å·¥äº‹ã�¨ã�—ã�¦ä½œæˆ�ã€‘";
-            this.radioButton4.UseVisualStyleBackColor = true;
-            this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
-            // 
-            // label16
-            // 
-            this.label16.BackColor = System.Drawing.Color.White;
-            this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label16.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label16.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label16.Location = new System.Drawing.Point(597, 172);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(174, 24);
-            this.label16.TabIndex = 21;
-            this.label16.Text = "22229999-01";
-            this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.label16.Visible = false;
-            // 
-            // label5
-            // 
-            this.label5.BackColor = System.Drawing.Color.White;
-            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label5.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label5.Location = new System.Drawing.Point(597, 95);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(174, 24);
-            this.label5.TabIndex = 20;
-            this.label5.Text = "22229999-01";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.label5.Visible = false;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label8.ForeColor = System.Drawing.Color.Red;
-            this.label8.Location = new System.Drawing.Point(44, 119);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(573, 38);
-            this.label8.TabIndex = 24;
-            this.label8.Text = "é¡žä¼¼å·¥äº‹ã�®å ´å�ˆã�«è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�®ã�¿ã‚’å¼•ç”¨ã�—ã�¦ä½œæˆ�\r\nâ€»å·¥äº‹æƒ…å ±ã�¯åˆ�æœŸåŒ–ã�•ã‚Œã�¾ã�™ã€€ã€�åˆ¥å·¥äº‹ã�¨ã�—ã�¦æ–°è¦�ã�«ä½œæˆ�ã�•ã‚Œã�¾ã�™ã€‘";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label6.ForeColor = System.Drawing.Color.Red;
-            this.label6.Location = new System.Drawing.Point(44, 42);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(590, 38);
-            this.label6.TabIndex = 25;
-            this.label6.Text = "æ—¢å­˜å·¥äº‹ã‚’ã‚³ãƒ”ãƒ¼ã�—ã�¦ä½œæˆ�ã€€ã€€ã€€ã€�å�Œã�˜å·¥äº‹ã�¨ã�—ã�¦æ–°è¦�ã�«ä½œæˆ�ã�•ã‚Œã�¾ã�™ã€‘\r\nâ€»å·¥äº‹å†…å®¹ã�®å¢—æ¸›ãƒ»å¤‰æ›´ã�«ä¼´ã�†è¦‹ç©�å¤‰æ›´ã�®å ´å�ˆã�«ä½¿ç”¨";
-            // 
-            // radioButton1
-            // 
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Checked = true;
-            this.radioButton1.Location = new System.Drawing.Point(28, 20);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(552, 23);
-            this.radioButton1.TabIndex = 23;
-            this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "å·¥äº‹æƒ…å ±ãƒ»è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã‚’ã‚³ãƒ”ãƒ¼ã€�å�Œä¸€å·¥äº‹ã�¨ã�—ã�¦ä½œæˆ�ã€‘";
-            this.radioButton1.UseVisualStyleBackColor = true;
-            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
-            // 
-            // radioButton2
-            // 
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.Location = new System.Drawing.Point(28, 96);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(237, 23);
-            this.radioButton2.TabIndex = 22;
-            this.radioButton2.Text = "è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�®ã�¿ã‚³ãƒ”ãƒ¼";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
-            // 
-            // label1
-            // 
-            this.label1.BackColor = System.Drawing.Color.White;
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label1.Location = new System.Drawing.Point(597, 19);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(174, 24);
-            this.label1.TabIndex = 19;
-            this.label1.Text = "22229999-01";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // radioButton3
-            // 
-            this.radioButton3.AutoSize = true;
-            this.radioButton3.Location = new System.Drawing.Point(28, 173);
-            this.radioButton3.Name = "radioButton3";
-            this.radioButton3.Size = new System.Drawing.Size(216, 23);
-            this.radioButton3.TabIndex = 26;
-            this.radioButton3.Text = "å·¥äº‹æƒ…å ±ã�®ã�¿ã‚³ãƒ”ãƒ¼";
-            this.radioButton3.UseVisualStyleBackColor = true;
-            this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Font = new System.Drawing.Font("ï¼­ï¼³ ï¼°æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label15.ForeColor = System.Drawing.Color.Red;
-            this.label15.Location = new System.Drawing.Point(44, 196);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(574, 38);
-            this.label15.TabIndex = 27;
-            this.label15.Text = "æ—¢å­˜å·¥äº‹ã‚’ã‚³ãƒ”ãƒ¼ã�—ã�¦ä½œæˆ�ã€€ã€€ã€€ã€�åˆ¥å·¥äº‹ã�¨ã�—ã�¦æ–°è¦�ã�«ä½œæˆ�ã�•ã‚Œã�¾ã�™ã€‘\r\nâ€»è¦‹ç©�ãƒ‡ãƒ¼ã‚¿ã�¯ã‚³ãƒ”ãƒ¼ã�•ã‚Œã�¾ã�›ã‚“";
-            // 
-            // label9
-            // 
-            this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label9.ForeColor = System.Drawing.Color.Red;
-            this.label9.Location = new System.Drawing.Point(267, 6);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(366, 19);
-            this.label9.TabIndex = 16;
-            this.label9.Text = "â€»å–¶æ¥­æœŸã�¯ä»»æ„�ã�§å¤‰æ›´ã�—ã�¦ã��ã� ã�•ã�„ã€‚";
-            // 
-            // label7
-            // 
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label7.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.label7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(3, 1);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(138, 30);
-            this.label7.TabIndex = 16;
-            this.label7.Text = "å–¶æ¥­æœŸ";
-            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.BackColor = System.Drawing.Color.Maroon;
-            this.groupBox1.Controls.Add(this.label10);
-            this.groupBox1.Controls.Add(this.label13);
-            this.groupBox1.Controls.Add(this.label12);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.label11);
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Controls.Add(this.label4);
-            this.groupBox1.Controls.Add(this.label14);
-            this.groupBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.groupBox1.ForeColor = System.Drawing.Color.White;
-            this.groupBox1.Location = new System.Drawing.Point(12, 6);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(800, 130);
-            this.groupBox1.TabIndex = 6;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "ã‚³ãƒ”ãƒ¼å…ƒãƒ‡ãƒ¼ã‚¿";
-            // 
-            // label10
-            // 
-            this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label10.BackColor = System.Drawing.Color.White;
-            this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label10.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label10.ForeColor = System.Drawing.Color.Black;
-            this.label10.Location = new System.Drawing.Point(170, 46);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(596, 24);
-            this.label10.TabIndex = 27;
-            this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label13
-            // 
-            this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.label13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(26, 20);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(138, 24);
-            this.label13.TabIndex = 23;
-            this.label13.Text = "å·¥äº‹ç•ªå�·";
-            this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label12
-            // 
-            this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label12.BackColor = System.Drawing.Color.White;
-            this.label12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(170, 98);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(240, 24);
-            this.label12.TabIndex = 28;
-            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(26, 46);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(138, 24);
-            this.label2.TabIndex = 24;
-            this.label2.Text = "å·¥äº‹å��ç§°";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label11
-            // 
-            this.label11.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label11.BackColor = System.Drawing.Color.White;
-            this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(170, 72);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(240, 24);
-            this.label11.TabIndex = 29;
-            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label3
-            // 
-            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(26, 72);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(138, 24);
-            this.label3.TabIndex = 25;
-            this.label3.Text = "å–¶æ¥­æ‹…å½“è€…";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label4
-            // 
-            this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(26, 98);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(138, 24);
-            this.label4.TabIndex = 26;
-            this.label4.Text = "å·¥äº‹æ‹…å½“è€…";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label14
-            // 
-            this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label14.BackColor = System.Drawing.Color.White;
-            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label14.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label14.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label14.ForeColor = System.Drawing.Color.Black;
-            this.label14.Location = new System.Drawing.Point(170, 20);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(180, 24);
-            this.label14.TabIndex = 22;
-            this.label14.Text = "22229999-01";
-            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblNextMessage
-            // 
-            this.lblNextMessage.BackColor = System.Drawing.Color.White;
-            this.lblNextMessage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblNextMessage.Location = new System.Drawing.Point(26, 26);
-            this.lblNextMessage.Name = "lblNextMessage";
-            this.lblNextMessage.Size = new System.Drawing.Size(748, 96);
-            this.lblNextMessage.TabIndex = 21;
-            this.lblNextMessage.Text = "å·¥äº‹æƒ…å ±ã�¯æ¬¡ç”»é�¢ã�§å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚";
-            this.lblNextMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.BackColor = System.Drawing.Color.LightGreen;
-            this.groupBox3.Controls.Add(this.tableLayoutPanel3);
-            this.groupBox3.Controls.Add(this.lblNextMessage);
-            this.groupBox3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.groupBox3.Location = new System.Drawing.Point(12, 466);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(800, 130);
-            this.groupBox3.TabIndex = 18;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "å–¶æ¥­æœŸãƒ»å–¶æ¥­æ‹…å½“è€…ãƒ»å·¥äº‹æ‹…å½“è€…";
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.ColumnCount = 3;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 144F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 484F));
-            this.tableLayoutPanel3.Controls.Add(this.cmbConstructionPerson, 1, 2);
-            this.tableLayoutPanel3.Controls.Add(this.cmbSalesPerson, 1, 1);
-            this.tableLayoutPanel3.Controls.Add(this.label20, 0, 1);
-            this.tableLayoutPanel3.Controls.Add(this.label9, 2, 0);
-            this.tableLayoutPanel3.Controls.Add(this.label22, 0, 2);
-            this.tableLayoutPanel3.Controls.Add(this.label7, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.cmbConstructionPeriod, 1, 0);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(26, 26);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 3;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(748, 96);
-            this.tableLayoutPanel3.TabIndex = 23;
-            // 
-            // cmbConstructionPerson
-            // 
-            this.cmbConstructionPerson.BackColor = System.Drawing.Color.White;
-            this.tableLayoutPanel3.SetColumnSpan(this.cmbConstructionPerson, 2);
-            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionPerson.FormattingEnabled = true;
-            this.cmbConstructionPerson.Location = new System.Drawing.Point(147, 67);
-            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
-            this.cmbConstructionPerson.Size = new System.Drawing.Size(300, 27);
-            this.cmbConstructionPerson.TabIndex = 22;
-            // 
-            // cmbSalesPerson
-            // 
-            this.cmbSalesPerson.BackColor = System.Drawing.Color.White;
-            this.tableLayoutPanel3.SetColumnSpan(this.cmbSalesPerson, 2);
-            this.cmbSalesPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbSalesPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbSalesPerson.FormattingEnabled = true;
-            this.cmbSalesPerson.Location = new System.Drawing.Point(147, 35);
-            this.cmbSalesPerson.Name = "cmbSalesPerson";
-            this.cmbSalesPerson.Size = new System.Drawing.Size(300, 27);
-            this.cmbSalesPerson.TabIndex = 21;
-            // 
-            // label20
-            // 
-            this.label20.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label20.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(3, 33);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(138, 30);
-            this.label20.TabIndex = 18;
-            this.label20.Text = "å–¶æ¥­æ‹…å½“è€…";
-            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label22
-            // 
-            this.label22.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.label22.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.label22.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label22.ForeColor = System.Drawing.Color.Black;
-            this.label22.Location = new System.Drawing.Point(3, 65);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(138, 30);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "å·¥äº‹æ‹…å½“è€…";
-            this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // cmbConstructionPeriod
-            // 
-            this.cmbConstructionPeriod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbConstructionPeriod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbConstructionPeriod.FormattingEnabled = true;
-            this.cmbConstructionPeriod.Location = new System.Drawing.Point(147, 3);
-            this.cmbConstructionPeriod.Name = "cmbConstructionPeriod";
-            this.cmbConstructionPeriod.Size = new System.Drawing.Size(114, 27);
-            this.cmbConstructionPeriod.TabIndex = 17;
-            // 
-            // FrmNewOrContinueCopy
-            // 
-            this.AcceptButton = this.btnCancel;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.ClientSize = new System.Drawing.Size(824, 647);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.panel1);
-            this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.KeyPreview = true;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmNewOrContinueCopy";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "å®Ÿã€€è¡Œã€€ç¢ºã€€èª�";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmNewOrContinueCopy_FormClosed);
-            this.Load += new System.EventHandler(this.FrmCostStructureDiag_Load);
-            this.panel1.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox3.ResumeLayout(false);
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnExecProc1;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private CustomControls.ComboBoxEX cmbConstructionPeriod;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label lblNextMessage;
-        private System.Windows.Forms.ToolTip toolTip1;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.ComboBox cmbSalesPerson;
-        private System.Windows.Forms.ComboBox cmbConstructionPerson;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.RadioButton radioButton1;
-        private System.Windows.Forms.RadioButton radioButton2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.RadioButton radioButton3;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.RadioButton radioButton4;
-    }
-}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.resx	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmNewOrContinueCopy.resx	(nonexistent)
@@ -1,126 +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>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>50</value>
-  </metadata>
-</root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs	(revision 48)
@@ -79,13 +79,13 @@
             // 
             // button1
             // 
-            this.button1.Enabled = false;
+            this.button1.BackColor = System.Drawing.Color.White;
             this.button1.Location = new System.Drawing.Point(15, 266);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 30);
             this.button1.TabIndex = 7;
             this.button1.Text = "ä½œæˆ�";
-            this.button1.UseVisualStyleBackColor = true;
+            this.button1.UseVisualStyleBackColor = false;
             this.button1.Visible = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
@@ -185,7 +185,7 @@
             this.cmbKen.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbKen.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbKen.FormattingEnabled = true;
-            this.cmbKen.Location = new System.Drawing.Point(120, 7);
+            this.cmbKen.Location = new System.Drawing.Point(120, 5);
             this.cmbKen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cmbKen.Name = "cmbKen";
             this.cmbKen.Size = new System.Drawing.Size(133, 24);
@@ -212,7 +212,7 @@
             this.cmbCity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbCity.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbCity.FormattingEnabled = true;
-            this.cmbCity.Location = new System.Drawing.Point(120, 41);
+            this.cmbCity.Location = new System.Drawing.Point(120, 39);
             this.cmbCity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cmbCity.Name = "cmbCity";
             this.cmbCity.Size = new System.Drawing.Size(286, 24);
@@ -226,7 +226,7 @@
             this.cmbTown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbTown.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbTown.FormattingEnabled = true;
-            this.cmbTown.Location = new System.Drawing.Point(120, 75);
+            this.cmbTown.Location = new System.Drawing.Point(120, 73);
             this.cmbTown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cmbTown.Name = "cmbTown";
             this.cmbTown.Size = new System.Drawing.Size(335, 24);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmTyingConstrDiag.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmTyingConstrDiag.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmTyingConstrDiag.cs	(revision 48)
@@ -272,7 +272,7 @@
                         strSQL += " AND EXISTS (SELECT * FROM CONSTRUCTIONLEDGERDETAIL EXDB";
                         strSQL += " WHERE EXDB.CONSTRUCTIONCODE in " + strInWher;
                         strSQL += " AND EXDB.SOURCECODE = A.CONSTRUCTIONCODE";
-                        strSQL += string.Format(" AND EXDB.EXECUTIONAMOUNT > {0})", CommonDefine.s_PrintOutPrice);
+                        strSQL += string.Format(" AND EXDB.EXECUTIONAMOUNT >= {0})", CommonDefine.s_PrintOutPrice);
                         break;
                     case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:
                         strSQL += " AND EXISTS (SELECT * FROM PURCHASEORDER EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)";
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 48)
@@ -1658,8 +1658,8 @@
                 ProgressDApproval.Visible = false;
 
                 // èª­è¾¼æ™‚ãƒ‡ãƒ¼ã‚¿ã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
-                if (CommonDefine.s_MaxInitLineCount > arData.Count)
-                    dgv.RowCount += (CommonDefine.s_MaxInitLineCount - arData.Count);
+                if (CommonDefine.s_MaxInitLineCount > dgv.RowCount)
+                    dgv.RowCount += (CommonDefine.s_MaxInitLineCount - dgv.RowCount);
 
                 // ãƒ‡ãƒ¼ã‚¿ã�Œå¤šã��ã�ªã‚Œã�°ã‚½ãƒ¼ãƒˆã�§ã��ã‚‹
                 foreach (DataGridViewColumn wrkCol in dgv.Columns)
@@ -1690,18 +1690,35 @@
                 bool bFirst = true;
                 int CurRowCnt = 0;
                 int ObjCurCount = 0;
+
+                int iConstructionCode = 0;
+                int iApprovalCode = 0;
+                int iOrderNo = 0;
+                int DepartmentCode = 0;
+                string strPerson = string.Empty;
+                string strConstrName = string.Empty;
+                DateTime ApprovalEntryDate = DateTime.MinValue;
+                DateTime ApprovalLimitDates = DateTime.MinValue;
+                
                 // å…ˆé ­ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚’å�–å¾—
                 foreach (object[] objwrk in BufferList)
                 {
                     // ãƒ‡ãƒ¼ã‚¿å�–å¾—
-                    int iConstructionCode = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.ConstructionCode]);       // å·¥äº‹ç•ªå�·
-                    int iApprovalCode = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.ApprovalCode]);               // æ‰¿èª�æ©Ÿèƒ½ç•ªå�·
-                    int iOrderNo = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.OrderNo]);                         // å�—ä»˜ç•ªå�·
-                    DateTime ApprovalEntryDate = CommonMotions.cnvDate(objwrk[(int)ApprovalDataList.EntryDate]);        // ç”³è«‹æ—¥ä»˜
-                    int DepartmentCode = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.DepartmentCode]);            // å¯¾è±¡éƒ¨ç½²å�–å¾—
-                    string strPerson = CommonMotions.cnvString(objwrk[(int)ApprovalDataList.PersonName]);               // ç”³è«‹è€…å��å�–å¾—
-                    DateTime ApprovalLimitDates = CommonMotions.cnvDate(objwrk[(int)ApprovalDataList.ApprovalLimitDates].ToString());   // æ‰¿èª�å¸Œæœ›æ—¥
+                    iConstructionCode = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.ConstructionCode]);       // å·¥äº‹ç•ªå�·
+                    iApprovalCode = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.ApprovalCode]);               // æ‰¿èª�æ©Ÿèƒ½ç•ªå�·
+                    iOrderNo = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.OrderNo]);                         // å�—ä»˜ç•ªå�·
+                    DepartmentCode = CommonMotions.cnvInt(objwrk[(int)ApprovalDataList.DepartmentCode]);            // å¯¾è±¡éƒ¨ç½²å�–å¾—
+                    strPerson = CommonMotions.cnvString(objwrk[(int)ApprovalDataList.PersonName]);                  // ç”³è«‹è€…å��å�–å¾—
+                    strConstrName = CommonMotions.cnvString(objwrk[(int)ApprovalDataList.ConstructionName]);
+                    // æ³¨æ–‡æ›¸ã�¯å›žæ•°ã‚’ä»˜ã�‘ã‚‹
+                    if (iApprovalCode == (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval)
+                    {
+                        strConstrName += string.Format("ã€€{0}å›žç›®", iOrderNo);
+                    }
 
+                    ApprovalEntryDate = CommonMotions.cnvDate(objwrk[(int)ApprovalDataList.EntryDate]);             // ç”³è«‹æ—¥ä»˜
+                    ApprovalLimitDates = CommonMotions.cnvDate(objwrk[(int)ApprovalDataList.ApprovalLimitDates].ToString());    // æ‰¿èª�å¸Œæœ›æ—¥
+
                     if (!bFirst)
                     {
                         if (iApprovalCode == (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval)
@@ -1737,7 +1754,7 @@
                                                     iApprovalCode,
                                                     iOrderNo,
                                                     ino,
-                                                    CommonMotions.cnvString(objwrk[(int)ApprovalDataList.ConstructionName]),
+                                                    strConstrName,
                                                     ClsExcute.AppovalList[iApprovalCode],
                                                     strPerson,
                                                     ApprovalEntryDate.ToShortDateString(),
Index: trunk/src/ProcessManagement/ProcessManagement/KEN_ALL.CSV
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/KEN_ALL.CSV	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/KEN_ALL.CSV	(revision 48)
@@ -7715,6 +7715,7 @@
 ,,0881406,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,�Ô”‘
 ,,0881403,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,ƒAƒUƒ‰ƒbƒv
 ,,0881646,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,Žo•Ê�i’š–Ú�j
+,,0881641,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,Žo•ÊŠî�ü
 ,,0881648,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,Žo•Ê–k
 ,,0881647,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,Žo•Ê“ì
 ,,0881649,,,,–kŠC“¹,ŒúŠÝŒS•l’†’¬,Žo•Ê—Î‰h
@@ -13095,6 +13096,7 @@
 ,,9830865,,,,‹{�éŒ§,�å‘äŽs‹{�é–ì‹æ,Œ³Ž›�¬˜H
 ,,9840000,,,,‹{�éŒ§,�å‘äŽsŽá—Ñ‹æ,
 ,,9840032,,,,‹{�éŒ§,�å‘äŽsŽá—Ñ‹æ,�rˆä
+,,9840039,,,,‹{�éŒ§,�å‘äŽsŽá—Ñ‹æ,�rˆä“ì
 ,,9840033,,,,‹{�éŒ§,�å‘äŽsŽá—Ñ‹æ,�r•l
 ,,9840034,,,,‹{�éŒ§,�å‘äŽsŽá—Ñ‹æ,�r•l�V
 ,,9840073,,,,‹{�éŒ§,�å‘äŽsŽá—Ñ‹æ,�r’¬
@@ -13389,6 +13391,7 @@
 ,,9860132,,,,‹{�éŒ§,�ÎŠªŽs,�¬‘D‰z
 ,,9862122,,,,‹{�éŒ§,�ÎŠªŽs,�K’¬
 ,,9860022,,,,‹{�éŒ§,�ÎŠªŽs,‹›’¬
+,,9862137,,,,‹{�éŒ§,�ÎŠªŽs,‚³‚­‚ç’¬
 ,,9862351,,,,‹{�éŒ§,�ÎŠªŽs,Ž˜•l
 ,,9862403,,,,‹{�éŒ§,�ÎŠªŽs,ŽL‰Y
 ,,9860104,,,,‹{�éŒ§,�ÎŠªŽs,ŽMŠL
@@ -14047,6 +14050,7 @@
 ,,9811237,,,,‹{�éŒ§,–¼ŽæŽs,ˆ¤“‡–k–Ú
 ,,9811239,,,,‹{�éŒ§,–¼ŽæŽs,ˆ¤“‡‰–Žè
 ,,9811251,,,,‹{�éŒ§,–¼ŽæŽs,ˆ¤“‡‘ä
+,,9811240,,,,‹{�éŒ§,–¼ŽæŽs,ˆ¤“‡‹½
 ,,9811227,,,,‹{�éŒ§,–¼ŽæŽs,“m‚¹‚«‚Ì‚µ‚½
 ,,9811213,,,,‹{�éŒ§,–¼ŽæŽs,è|�ã
 ,,9811245,,,,‹{�éŒ§,–¼ŽæŽs,‚ä‚è‚ª‹u
@@ -14102,6 +14106,7 @@
 ,,9892400,,,,‹{�éŒ§,Šâ�ÀŽs,
 ,,9892431,,,,‹{�éŒ§,Šâ�ÀŽs,‘Š‚ÌŒ´
 ,,9892474,,,,‹{�éŒ§,Šâ�ÀŽs,’©“ú
+,,9892478,,,,‹{�éŒ§,Šâ�ÀŽs,‚ ‚³‚Ð–ì
 ,,9892435,,,,‹{�éŒ§,Šâ�ÀŽs,ˆ¢•�ŒG
 ,,9892463,,,,‹{�éŒ§,Šâ�ÀŽs,�rˆä
 ,,9892443,,,,‹{�éŒ§,Šâ�ÀŽs,ˆî‰×’¬
@@ -14110,6 +14115,7 @@
 ,,9892423,,,,‹{�éŒ§,Šâ�ÀŽs,‰Ÿ•ª
 ,,9892472,,,,‹{�éŒ§,Šâ�ÀŽs,Š�‹´
 ,,9892455,,,,‹{�éŒ§,Šâ�ÀŽs,–k’·’J
+,,9892420,,,,‹{�éŒ§,Šâ�ÀŽs,‹ó�`�¼
 ,,9892422,,,,‹{�éŒ§,Šâ�ÀŽs,‹ó�`“ì
 ,,9892445,,,,‹{�éŒ§,Šâ�ÀŽs,ŒKŒ´
 ,,9892447,,,,‹{�éŒ§,Šâ�ÀŽs,ŒKŒ´�¼
@@ -15136,6 +15142,32 @@
 ,,9871304,,,,‹{�éŒ§,‘å�èŽs,�¼ŽR�ç�Î
 ,,9871305,,,,‹{�éŒ§,‘å�èŽs,�¼ŽRŽŸ‹´
 ,,9871302,,,,‹{�éŒ§,‘å�èŽs,�¼ŽR’·”ö
+,,9813300,,,,‹{�éŒ§,•x’JŽs,
+,,9813326,,,,‹{�éŒ§,•x’JŽs,–¾�Î
+,,9813332,,,,‹{�éŒ§,•x’JŽs,–¾�Î‘ä
+,,9813361,,,,‹{�éŒ§,•x’JŽs,‚ ‚¯‚Ì•½
+,,9813325,,,,‹{�éŒ§,•x’JŽs,�Î�Ï
+,,9813305,,,,‹{�éŒ§,•x’JŽs,ˆêƒmŠÖ
+,,9813322,,,,‹{�éŒ§,•x’JŽs,�¡�ò
+,,9813323,,,,‹{�éŒ§,•x’JŽs,‘å‹T
+,,9813329,,,,‹{�éŒ§,•x’JŽs,‘å�´�…
+,,9813321,,,,‹{�éŒ§,•x’JŽs,‘å“¶
+,,9813328,,,,‹{�éŒ§,•x’JŽs,�ã�÷–Ø
+,,9813327,,,,‹{�éŒ§,•x’JŽs,�’“c
+,,9813302,,,,‹{�éŒ§,•x’JŽs,ŽOƒmŠÖ
+,,9813301,,,,‹{�éŒ§,•x’JŽs,ŽuŒË“c
+,,9813303,,,,‹{�éŒ§,•x’JŽs,‘¾Žq“°
+,,9813351,,,,‹{�éŒ§,•x’JŽs,‘é”T“m
+,,9813312,,,,‹{�éŒ§,•x’JŽs,‚Æ‚¿‚Ì–Ø
+,,9813352,,,,‹{�éŒ§,•x’JŽs,•xƒP‹u
+,,9813311,,,,‹{�éŒ§,•x’JŽs,•x’J
+,,9813341,,,,‹{�éŒ§,•x’JŽs,�¬“c
+,,9813324,,,,‹{�éŒ§,•x’JŽs,�¼�¬“c
+,,9813306,,,,‹{�éŒ§,•x’JŽs,“ñƒmŠÖ
+,,9813331,,,,‹{�éŒ§,•x’JŽs,“ŒŒü—z‘ä
+,,9813362,,,,‹{�éŒ§,•x’JŽs,“ú‹g‘ä
+,,9813304,,,,‹{�éŒ§,•x’JŽs,‚Ð‚æ‚è‘ä
+,,9813363,,,,‹{�éŒ§,•x’JŽs,“m”T‹´
 ,,9890800,,,,‹{�éŒ§,Š “cŒS‘ ‰¤’¬,
 ,,9890921,,,,‹{�éŒ§,Š “cŒS‘ ‰¤’¬,‰~“c�iŠ˜‘ò�A‘P•‘�X�A“y•‚’J’n�A“y•‚ŽR‚Q�`‚T”Ô’n�j
 ,,9890821,,,,‹{�éŒ§,Š “cŒS‘ ‰¤’¬,‰~“c�i‚»‚Ì‘¼�j
@@ -15662,6 +15694,7 @@
 ,,9892205,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,�¬•½
 ,,9892111,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,�âŒ³
 ,,9892202,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,�‚�£
+,,9892208,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,‚Â‚Î‚ß‚Ì“m
 ,,9892207,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,”ªŽè’ë
 ,,9892112,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,�^’ë
 ,,9892201,,,,‹{�éŒ§,˜j—�ŒSŽRŒ³’¬,ŽRŽ›
@@ -15751,32 +15784,6 @@
 ,,9813522,,,,‹{�éŒ§,�•�ìŒS‘å‹½’¬,“Œ�¬“c
 ,,9813513,,,,‹{�éŒ§,�•�ìŒS‘å‹½’¬,–¡–¾
 ,,9813511,,,,‹{�éŒ§,�•�ìŒS‘å‹½’¬,ŽR�è
-,,9813300,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,
-,,9813326,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,–¾�Î
-,,9813332,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,–¾�Î‘ä
-,,9813361,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‚ ‚¯‚Ì•½
-,,9813325,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,�Î�Ï
-,,9813305,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,ˆêƒmŠÖ
-,,9813322,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,�¡�ò
-,,9813323,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‘å‹T
-,,9813329,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‘å�´�…
-,,9813321,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‘å“¶
-,,9813328,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,�ã�÷–Ø
-,,9813327,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,�’“c
-,,9813302,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,ŽOƒmŠÖ
-,,9813301,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,ŽuŒË“c
-,,9813303,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‘¾Žq“°
-,,9813351,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‘é”T“m
-,,9813312,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‚Æ‚¿‚Ì–Ø
-,,9813352,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,•xƒP‹u
-,,9813311,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,•x’J
-,,9813341,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,�¬“c
-,,9813324,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,�¼�¬“c
-,,9813306,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,“ñƒmŠÖ
-,,9813331,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,“ŒŒü—z‘ä
-,,9813362,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,“ú‹g‘ä
-,,9813304,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,‚Ð‚æ‚è‘ä
-,,9813363,,,,‹{�éŒ§,�•�ìŒS•x’J’¬,“m”T‹´
 ,,9813600,,,,‹{�éŒ§,�•�ìŒS‘å�t‘º,
 ,,9813601,,,,‹{�éŒ§,�•�ìŒS‘å�t‘º,‘å‰Z
 ,,9813602,,,,‹{�éŒ§,�•�ìŒS‘å�t‘º,‘å�t
@@ -20644,6 +20651,7 @@
 ,,9650016,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,’†“‡’¬
 ,,9650878,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,’†’¬
 ,,9650044,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,Žµ“ú’¬
+,,9650848,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,”ÑŽ›–k
 ,,9650837,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,‹Ñ’¬
 ,,9650877,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,�¼‰h’¬
 ,,9650045,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,�¼Žµ“ú’¬
@@ -20668,6 +20676,7 @@
 ,,9650026,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,•½ˆÀ’¬
 ,,9650862,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,–{’¬
 ,,9650856,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,–‹“à“Œ’¬
+,,9650849,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,–‹“à“ì’¬
 ,,9650054,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,’¬–k’¬�Î“°
 ,,9650053,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,’¬–k’¬�ã�r‹v“c
 ,,9650058,,,,•Ÿ“‡Œ§,‰ï’ÃŽá�¼Žs,’¬–k’¬’†‘ò
@@ -24771,6 +24780,7 @@
 ,,3070051,,,,ˆï�éŒ§,Œ‹�éŽs,�‘•{’¬
 ,,3070006,,,,ˆï�éŒ§,Œ‹�éŽs,ŒÜ�•
 ,,3070011,,,,ˆï�éŒ§,Œ‹�éŽs,�¬�X
+,,3070008,,,,ˆï�éŒ§,Œ‹�éŽs,‰º‚è�¼
 ,,3070023,,,,ˆï�éŒ§,Œ‹�éŽs,ŽR‰¤
 ,,3070038,,,,ˆï�éŒ§,Œ‹�éŽs,ŽµŒÜŽO�ê
 ,,3070054,,,,ˆï�éŒ§,Œ‹�éŽs,�é“ì’¬
@@ -25536,6 +25546,7 @@
 ,,3004242,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’†�›ŠÔ
 ,,3050012,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’†�ª
 ,,3050873,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’†–ì
+,,3002639,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’†“Œ
 ,,3002634,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’†“ŒŒ´�V“c
 ,,3002667,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’†•Ê•{
 ,,3050052,,,,ˆï�éŒ§,‚Â‚­‚ÎŽs,’·•ô
@@ -25842,6 +25853,7 @@
 ,,3020109,,,,ˆï�éŒ§,Žç’JŽs,–{’¬
 ,,3020127,,,,ˆï�éŒ§,Žç’JŽs,�¼ƒP‹u
 ,,3020108,,,,ˆï�éŒ§,Žç’JŽs,�¼•À
+,,3020132,,,,ˆï�éŒ§,Žç’JŽs,�¼•À�Â—t
 ,,3020102,,,,ˆï�éŒ§,Žç’JŽs,�¼‘O‘ä
 ,,3020121,,,,ˆï�éŒ§,Žç’JŽs,‚Ý‚¸‚«–ì
 ,,3020124,,,,ˆï�éŒ§,Žç’JŽs,”ü‰€
@@ -30373,6 +30385,7 @@
 ,,3700712,,,,ŒQ”nŒ§,—WŠyŒS–¾˜a’¬,–î“‡
 ,,3700500,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,
 ,,3700503,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,�ÔŠâ
+,,3700506,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,�ÔŠâ�¼
 ,,3700726,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,�ãŒÜ‰Ó
 ,,3700725,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,�ã’†�X
 ,,3700722,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,Šž–ì
@@ -30384,6 +30397,7 @@
 ,,3700502,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,“ç’J
 ,,3700501,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,•Ÿ“‡
 ,,3700504,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,•‘–Ø
+,,3700507,,,,ŒQ”nŒ§,—WŠyŒS�ç‘ã“c’¬,•‘–Ø“Œ
 ,,3700500,,,,ŒQ”nŒ§,—WŠyŒS‘å�ò’¬,
 ,,3700514,,,,ŒQ”nŒ§,—WŠyŒS‘å�ò’¬,’©“ú
 ,,3700531,,,,ŒQ”nŒ§,—WŠyŒS‘å�ò’¬,‚¢‚¸‚Ý
@@ -30669,6 +30683,7 @@
 ,,3360918,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,�¼–Ø
 ,,3360965,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,ŠÔ‹{
 ,,3360906,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,ŽO‰Y
+,,3360967,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,”ü‰€
 ,,3360915,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,Œ©�À
 ,,3360911,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,ŽOŽº
 ,,3360914,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽs—Î‹æ,‹{Œã
@@ -30731,6 +30746,7 @@
 ,,3390058,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,–{ŠÛ
 ,,3390077,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,”n�ž
 ,,3390012,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,‘�’·
+,,3390028,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,”ü‰€“Œ
 ,,3390032,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,“ì‰º�Vˆä
 ,,3390062,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,“ì’Ò
 ,,3390051,,,,�é‹ÊŒ§,‚³‚¢‚½‚ÜŽsŠâ’Î‹æ,“ì•½–ì
@@ -32178,6 +32194,7 @@
 ,,3430851,,,,�é‹ÊŒ§,‰z’JŽs,Žµ�¶’¬
 ,,3430045,,,,�é‹ÊŒ§,‰z’JŽs,‰ºŠÔ‹v—¢
 ,,3430852,,,,�é‹ÊŒ§,‰z’JŽs,�V�ì’¬
+,,3430857,,,,�é‹ÊŒ§,‰z’JŽs,�V‰z’J
 ,,3430805,,,,�é‹ÊŒ§,‰z’JŽs,�_–¾’¬
 ,,3430803,,,,�é‹ÊŒ§,‰z’JŽs,�»Œ´
 ,,3430042,,,,�é‹ÊŒ§,‰z’JŽs,�çŠÔ‘ä“Œ
@@ -32463,6 +32480,7 @@
 ,,3640006,,,,�é‹ÊŒ§,–k–{Žs,–k–{
 ,,3640021,,,,�é‹ÊŒ§,–k–{Žs,–k–{�h
 ,,3640027,,,,�é‹ÊŒ§,–k–{Žs,‰h
+,,3640028,,,,�é‹ÊŒ§,–k–{Žs,‰º�ÎŒË
 ,,3640022,,,,�é‹ÊŒ§,–k–{Žs,‰º�ÎŒË�ã
 ,,3640023,,,,�é‹ÊŒ§,–k–{Žs,‰º�ÎŒË‰º
 ,,3640034,,,,�é‹ÊŒ§,–k–{Žs,�‚”ö
@@ -32606,6 +32624,7 @@
 ,,3490131,,,,�é‹ÊŒ§,˜@“cŽs,�ª‹à
 ,,3490115,,,,�é‹ÊŒ§,˜@“cŽs,˜@“c
 ,,3490111,,,,�é‹ÊŒ§,˜@“cŽs,“Œ
+,,3490105,,,,�é‹ÊŒ§,˜@“cŽs,“¡ƒm–Ø
 ,,3490123,,,,�é‹ÊŒ§,˜@“cŽs,–{’¬
 ,,3490114,,,,�é‹ÊŒ§,˜@“cŽs,”n�ž
 ,,3490104,,,,�é‹ÊŒ§,˜@“cŽs,—Î’¬
@@ -34258,6 +34277,7 @@
 ,,2780035,,,,�ç—tŒ§,–ì“cŽs,’†–ì‘ä
 ,,2780036,,,,�ç—tŒ§,–ì“cŽs,’†–ì‘äŽ­“‡’¬
 ,,2780051,,,,�ç—tŒ§,–ì“cŽs,ŽµŒõ‘ä
+,,2700229,,,,�ç—tŒ§,–ì“cŽs,‚È‚Ý‚«
 ,,2700228,,,,�ç—tŒ§,–ì“cŽs,ŽŸ–Ø
 ,,2700216,,,,�ç—tŒ§,–ì“cŽs,�¼�‚–ì
 ,,2780015,,,,�ç—tŒ§,–ì“cŽs,�¼ŽOƒP”ö
@@ -36333,7 +36353,7 @@
 ,,2891205,,,,�ç—tŒ§,ŽR•�Žs,’Å�è
 ,,2891312,,,,�ç—tŒ§,ŽR•�Žs,ŽÄŒ´
 ,,2891325,,,,�ç—tŒ§,ŽR•�Žs,“‡
-,,2891342,,,,�ç—tŒ§,ŽR•�Žs,“‡ŒË
+,,2891342,,,,�ç—tŒ§,ŽR•�Žs,“ˆŒË
 ,,2891217,,,,�ç—tŒ§,ŽR•�Žs,‰º•z“c
 ,,2891314,,,,�ç—tŒ§,ŽR•�Žs,‰º‰¡’n
 ,,2891306,,,,�ç—tŒ§,ŽR•�Žs,”’”¦
@@ -38355,6 +38375,47 @@
 ,,1066043,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�òƒK�[ƒfƒ“ƒ^ƒ��[�i‚S‚RŠK�j
 ,,1066044,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�òƒK�[ƒfƒ“ƒ^ƒ��[�i‚S‚SŠK�j
 ,,1066045,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�òƒK�[ƒfƒ“ƒ^ƒ��[�i‚S‚TŠK�j
+,,1066290,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i’nŠK�EŠK‘w•s–¾�j
+,,1066201,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚PŠK�j
+,,1066202,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚QŠK�j
+,,1066203,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚RŠK�j
+,,1066204,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚SŠK�j
+,,1066205,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚TŠK�j
+,,1066206,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚UŠK�j
+,,1066207,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚VŠK�j
+,,1066208,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚WŠK�j
+,,1066209,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚XŠK�j
+,,1066210,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚OŠK�j
+,,1066211,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚PŠK�j
+,,1066212,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚QŠK�j
+,,1066213,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚RŠK�j
+,,1066214,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚SŠK�j
+,,1066215,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚TŠK�j
+,,1066216,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚UŠK�j
+,,1066217,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚VŠK�j
+,,1066218,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚WŠK�j
+,,1066219,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚P‚XŠK�j
+,,1066220,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚OŠK�j
+,,1066221,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚PŠK�j
+,,1066222,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚QŠK�j
+,,1066223,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚RŠK�j
+,,1066224,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚SŠK�j
+,,1066225,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚TŠK�j
+,,1066226,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚UŠK�j
+,,1066227,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚VŠK�j
+,,1066228,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚WŠK�j
+,,1066229,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚Q‚XŠK�j
+,,1066230,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚OŠK�j
+,,1066231,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚PŠK�j
+,,1066232,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚QŠK�j
+,,1066233,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚RŠK�j
+,,1066234,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚SŠK�j
+,,1066235,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚TŠK�j
+,,1066236,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚UŠK�j
+,,1066237,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚VŠK�j
+,,1066238,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚WŠK�j
+,,1066239,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚R‚XŠK�j
+,,1066240,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø�Z—F•s“®ŽY˜Z–{–ØƒOƒ‰ƒ“ƒhƒ^ƒ��[�i‚S‚OŠK�j
 ,,1066190,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø˜Z–{–Øƒqƒ‹ƒY�Xƒ^ƒ��[�i’nŠK�EŠK‘w•s–¾�j
 ,,1066101,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø˜Z–{–Øƒqƒ‹ƒY�Xƒ^ƒ��[�i‚PŠK�j
 ,,1066102,,,,“Œ‹ž“s,�`‹æ,˜Z–{–Ø˜Z–{–Øƒqƒ‹ƒY�Xƒ^ƒ��[�i‚QŠK�j
@@ -40358,6 +40419,7 @@
 ,,1940031,,,,“Œ‹ž“s,’¬“cŽs,“ì‘å’J
 ,,1940002,,,,“Œ‹ž“s,’¬“cŽs,“ì‚Â‚­‚µ–ì
 ,,1940045,,,,“Œ‹ž“s,’¬“cŽs,“ì�¬�£
+,,1940005,,,,“Œ‹ž“s,’¬“cŽs,“ì’¬“c
 ,,1950054,,,,“Œ‹ž“s,’¬“cŽs,ŽO—Ö’¬
 ,,1950055,,,,“Œ‹ž“s,’¬“cŽs,ŽO—Ö—ÎŽR
 ,,1940022,,,,“Œ‹ž“s,’¬“cŽs,�X–ì
@@ -41590,6 +41652,7 @@
 ,,2450000,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,
 ,,2450001,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,’r‚Ì’J
 ,,2450022,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,˜a�ò‚ª‹u
+,,2450024,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,˜a�ò’†‰›–k
 ,,2450023,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,˜a�ò’†‰›“ì
 ,,2450016,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,˜a�ò’¬
 ,,2450003,,,,�_“Þ�ìŒ§,‰¡•lŽs�ò‹æ,‰ª’Ã’¬
@@ -42800,6 +42863,7 @@
 ,,2591101,,,,�_“Þ�ìŒ§,ˆÉ�¨Œ´Žs,“úŒü
 ,,2591118,,,,�_“Þ�ìŒ§,ˆÉ�¨Œ´Žs,Œ©•�“‡
 ,,2430400,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,
+,,2430437,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,�ò
 ,,2430423,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,�¡—¢
 ,,2430436,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,�î’¬
 ,,2430411,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,‘å’J
@@ -42828,6 +42892,7 @@
 ,,2430412,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,•l“c’¬
 ,,2430401,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,“Œ”�ƒP’J
 ,,2430417,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,–{‹½
+,,2430438,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,‚ß‚®‚Ý’¬
 ,,2430403,,,,�_“Þ�ìŒ§,ŠC˜V–¼Žs,–]’n
 ,,2520000,,,,�_“Þ�ìŒ§,�ÀŠÔŽs,
 ,,2520024,,,,�_“Þ�ìŒ§,�ÀŠÔŽs,“ü’J
@@ -45396,7 +45461,6 @@
 ,,9498422,,,,�VŠƒŒ§,�\“ú’¬Žs,Žs”V‰z
 ,,9480101,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî—t
 ,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬�i‚R’š–Ú–{’Ê‚è�j
-,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬�i‚S’š–Ú�j
 ,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬ˆê’š–Ú
 ,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬“ñ’š–Ú
 ,,9480091,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬ŽO’š–Ú
@@ -45403,6 +45467,8 @@
 ,,9480092,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬ŽO’š–Ú–k
 ,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬ŽO’š–Ú“Œ
 ,,9480093,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬ŽO’š–Ú“ì
+,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬ŽO’š–Ú–{’Ê‚è
+,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬Žl’š–Ú
 ,,9480073,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆî‰×’¬�¼
 ,,9421504,,,,�VŠƒŒ§,�\“ú’¬Žs,Œ¢•š
 ,,9498441,,,,�VŠƒŒ§,�\“ú’¬Žs,ˆð�ì
@@ -45589,7 +45655,6 @@
 ,,9498534,,,,�VŠƒŒ§,�\“ú’¬Žs,�×”ö
 ,,9498426,,,,�VŠƒŒ§,�\“ú’¬Žs,’ö“‡
 ,,9498504,,,,�VŠƒŒ§,�\“ú’¬Žs,–x”V“à
-,,9480003,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬�i‚U‚Ì‚P’š–Ú�`‚U‚Ì‚R’š–Ú�j
 ,,9480003,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬�i‚V’š–Ú�j
 ,,9480083,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬ˆê’š–Ú�ã
 ,,9480083,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬ˆê’š–Ú‰º
@@ -45597,6 +45662,9 @@
 ,,9480082,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬ŽO’š–Ú
 ,,9480082,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬Žl’š–Ú
 ,,9480081,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬ŒÜ’š–Ú
+,,9480003,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬˜Z‚Ìˆê’š–Ú
+,,9480003,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬˜Z‚Ì“ñ’š–Ú
+,,9480003,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬˜Z‚ÌŽO’š–Ú
 ,,9480083,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬�¼ˆê’š–Ú
 ,,9480083,,,,�VŠƒŒ§,�\“ú’¬Žs,–{’¬“Œˆê’š–Ú
 ,,9421526,,,,�VŠƒŒ§,�\“ú’¬Žs,�¼‘ã
@@ -51837,6 +51905,7 @@
 ,,9201335,,,,�Î�ìŒ§,‹à‘òŽs,‘å•½‘ò’¬
 ,,9200013,,,,�Î�ìŒ§,‹à‘òŽs,‰«’¬
 ,,9201101,,,,�Î�ìŒ§,‹à‘òŽs,‰œ�V•Û’¬
+,,9200210,,,,�Î�ìŒ§,‹à‘òŽs,‘å‰Í’[�¼
 ,,9200213,,,,�Î�ìŒ§,‹à‘òŽs,‘å‰Í’[’¬
 ,,9218056,,,,�Î�ìŒ§,‹à‘òŽs,‰Ÿ–ì
 ,,9201324,,,,�Î�ìŒ§,‹à‘òŽs,‰•Œ´’¬
@@ -56699,6 +56768,7 @@
 ,,4030009,,,,ŽR—œŒ§,•xŽm‹g“cŽs,•xŽmŒ©
 ,,4030016,,,,ŽR—œŒ§,•xŽm‹g“cŽs,�¼ŽR
 ,,4030013,,,,ŽR—œŒ§,•xŽm‹g“cŽs,—ÎƒP‹u
+,,4030018,,,,ŽR—œŒ§,•xŽm‹g“cŽs,ŒüŒ´
 ,,4020000,,,,ŽR—œŒ§,“s—¯Žs,
 ,,4020015,,,,ŽR—œŒ§,“s—¯Žs,’©“ú‘]Ž“
 ,,4020014,,,,ŽR—œŒ§,“s—¯Žs,’©“ú”n�ê
@@ -62562,6 +62632,7 @@
 ,,4200948,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,�HŽR’¬
 ,,4200810,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,�ã“y
 ,,4200811,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,�ã“y�V“c
+,,4200968,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‚ ‚³‚Í‚½
 ,,4212125,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‘«‹v•Û‰œ‘g
 ,,4212124,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‘«‹v•ÛŒû‘g
 ,,4200836,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,“Œ’¬
@@ -62739,6 +62810,7 @@
 ,,4212104,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,–ì“c•½
 ,,4200864,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,’·’J’¬
 ,,4200966,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‰H�‚
+,,4200967,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‰H�‚’¬
 ,,4200078,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,”ª”Ô’¬
 ,,4211215,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‰H’¹
 ,,4211216,,,,�Ã‰ªŒ§,�Ã‰ªŽsˆ¨‹æ,‰H’¹‘å–å’¬
@@ -65911,6 +65983,7 @@
 ,,4530862,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,Šâ’Ë’¬
 ,,4530861,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,Šâ’Ë–{’Ê
 ,,4530853,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,‹�“c’Ê
+,,4530873,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,‰^‰Í’¬
 ,,4530804,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,‰©‹à’Ê
 ,,4530042,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,‘å�H’¬
 ,,4530821,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,‘å‹{’¬
@@ -66007,6 +66080,53 @@
 ,,4530838,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,Œü“‡’¬
 ,,4530002,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w�i‚P�|‚P�|‚W�A‚P�|‚P�|‚P‚Q�A‚P�|‚P�|‚P‚R�A‚P�|‚P�|‚P‚S�A‚P�|‚R�|‚S�A
 ,,4530002,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,‚P�|‚R�|‚V�j
+,,4506690,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i’nŠK�EŠK‘w•s–¾�j
+,,4506601,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚PŠK�j
+,,4506602,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚QŠK�j
+,,4506603,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚RŠK�j
+,,4506604,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚SŠK�j
+,,4506605,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚TŠK�j
+,,4506606,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚UŠK�j
+,,4506607,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚VŠK�j
+,,4506608,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚WŠK�j
+,,4506609,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚XŠK�j
+,,4506610,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚OŠK�j
+,,4506611,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚PŠK�j
+,,4506612,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚QŠK�j
+,,4506613,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚RŠK�j
+,,4506614,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚SŠK�j
+,,4506615,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚TŠK�j
+,,4506616,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚UŠK�j
+,,4506617,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚VŠK�j
+,,4506618,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚WŠK�j
+,,4506619,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚P‚XŠK�j
+,,4506620,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚OŠK�j
+,,4506621,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚PŠK�j
+,,4506622,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚QŠK�j
+,,4506623,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚RŠK�j
+,,4506624,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚SŠK�j
+,,4506625,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚TŠK�j
+,,4506626,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚UŠK�j
+,,4506627,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚VŠK�j
+,,4506628,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚WŠK�j
+,,4506629,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚Q‚XŠK�j
+,,4506630,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚OŠK�j
+,,4506631,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚PŠK�j
+,,4506632,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚QŠK�j
+,,4506633,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚RŠK�j
+,,4506634,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚SŠK�j
+,,4506635,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚TŠK�j
+,,4506636,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚UŠK�j
+,,4506637,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚VŠK�j
+,,4506638,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚WŠK�j
+,,4506639,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚R‚XŠK�j
+,,4506640,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚OŠK�j
+,,4506641,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚PŠK�j
+,,4506642,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚QŠK�j
+,,4506643,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚RŠK�j
+,,4506644,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚SŠK�j
+,,4506645,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚TŠK�j
+,,4506646,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒQ�[ƒgƒ^ƒ��[�i‚S‚UŠK�j
 ,,4506090,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒZƒ“ƒgƒ‰ƒ‹ƒ^ƒ��[ƒY�i’nŠK�EŠK‘w•s–¾�j
 ,,4506001,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒZƒ“ƒgƒ‰ƒ‹ƒ^ƒ��[ƒY�i‚PŠK�j
 ,,4506002,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs’†‘º‹æ,–¼‰w‚i‚qƒZƒ“ƒgƒ‰ƒ‹ƒ^ƒ��[ƒY�i‚QŠK�j
@@ -67040,6 +67160,7 @@
 ,,4580916,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,—L�¼’¬‰±‹·ŠÔ�iˆ¤“†�¼�j
 ,,4580912,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,—L�¼’¬‰±‹·ŠÔ�i�¶ŽR�j
 ,,4580911,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,—L�¼’¬‰±‹·ŠÔ�i‚»‚Ì‘¼�j
+,,4580928,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,—L�¼–‹ŽR
 ,,4598004,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,—L�¼“ì
 ,,4580044,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,’r�ã‘ä
 ,,4598012,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,ˆï’JŽR
@@ -67060,6 +67181,8 @@
 ,,4580922,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔ�ØŒË
 ,,4580921,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔ�´�…ŽR
 ,,4580919,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔ�_–¾
+,,4580929,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔ�¼
+,,4580920,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔŠªŽR
 ,,4580927,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔ“ì
 ,,4580910,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,‰±‹·ŠÔ�X‘O
 ,,4580024,,,,ˆ¤’mŒ§,–¼ŒÃ‰®Žs—Î‹æ,”ö�èŽR
@@ -67778,7 +67901,7 @@
 ,,4442106,,,,ˆ¤’mŒ§,‰ª�èŽs,�^•ŸŽ›’¬
 ,,4440914,,,,ˆ¤’mŒ§,‰ª�èŽs,––�L’¬
 ,,4440035,,,,ˆ¤’mŒ§,‰ª�èŽs,�›�¶’¬
-,,4443341,,,,ˆ¤’mŒ§,‰ª�èŽs,�{Ÿº’¬
+,,4443341,,,,ˆ¤’mŒ§,‰ª�èŽs,�{•£’¬
 ,,4443432,,,,ˆ¤’mŒ§,‰ª�èŽs,�ç–œ’¬’¬
 ,,4443448,,,,ˆ¤’mŒ§,‰ª�èŽs,ŠOŽR’¬
 ,,4442134,,,,ˆ¤’mŒ§,‰ª�èŽs,‘åŽ÷Ž›
@@ -70408,7 +70531,7 @@
 ,,4840071,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,“à“c“Œ’¬
 ,,4840026,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,“à‰®•~
 ,,4840074,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,”~’Ø
-,,4840854,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,— ƒm–å
+,,4840854,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,— ”V–å
 ,,4840035,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,— ŽR
 ,,4840902,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,’Ç•ª
 ,,4840903,,,,ˆ¤’mŒ§,Œ¢ŽRŽs,’Ç•ª“Œ
@@ -72059,6 +72182,7 @@
 ,,4700122,,,,ˆ¤’mŒ§,“ú�iŽs,ŠI�b’¬
 ,,4700103,,,,ˆ¤’mŒ§,“ú�iŽs,–k�V’¬
 ,,4700105,,,,ˆ¤’mŒ§,“ú�iŽs,ŒÜ�F‰€
+,,4700118,,,,ˆ¤’mŒ§,“ú�iŽs,•Ä–ì–Ø‘ä
 ,,4700111,,,,ˆ¤’mŒ§,“ú�iŽs,•Ä–ì–Ø’¬
 ,,4700113,,,,ˆ¤’mŒ§,“ú�iŽs,‰h
 ,,4700101,,,,ˆ¤’mŒ§,“ú�iŽs,ŽO–{–Ø’¬
@@ -72396,6 +72520,7 @@
 ,,4810038,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,“¿�d
 ,,4810045,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,’†”V‹½
 ,,4810033,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,�¼”V•Û
+,,4810040,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,�¼�t‰w‘O
 ,,4810003,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,”\“c
 ,,4810042,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,–ì�è
 ,,4810013,,,,ˆ¤’mŒ§,–k–¼ŒÃ‰®Žs,“ñŽq
@@ -75415,7 +75540,7 @@
 ,,5190434,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,“c‹{Ž›
 ,,5190412,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,’†Šy
 ,,5190437,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,�Ï—Ç
-,,5190421,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,•x‰ª
+,,5190421,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,•y‰ª
 ,,5190426,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,’†Šp
 ,,5190404,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,’·�X
 ,,5190432,,,,ŽO�dŒ§,“x‰ïŒS‹Ê�é’¬,–ìŽÂ
@@ -76772,6 +76897,7 @@
 ,,5203202,,,,Ž ‰êŒ§,ŒÎ“ìŽs,�¼•ô’¬
 ,,5203231,,,,Ž ‰êŒ§,ŒÎ“ìŽs,�j
 ,,5203203,,,,Ž ‰êŒ§,ŒÎ“ìŽs,“úŽ}’¬
+,,5203255,,,,Ž ‰êŒ§,ŒÎ“ìŽs,“úŽ}ŽRŽè‘ä
 ,,5203111,,,,Ž ‰êŒ§,ŒÎ“ìŽs,“ŒŽ›
 ,,5203232,,,,Ž ‰êŒ§,ŒÎ“ìŽs,•½�¼
 ,,5203235,,,,Ž ‰êŒ§,ŒÎ“ìŽs,•½�¼–k
@@ -85370,7 +85496,7 @@
 ,,5918005,,,,‘å�ã•{,�äŽs–k‹æ,�V–x’¬
 ,,5918003,,,,‘å�ã•{,�äŽs–k‹æ,‘D“°’¬
 ,,5918001,,,,‘å�ã•{,�äŽs–k‹æ,�í”Ö’¬
-,,5918025,,,,‘å�ã•{,�äŽs–k‹æ,’·‘\�ª’¬
+,,5918025,,,,‘å�ã•{,�äŽs–k‹æ,’·‘]�ª’¬
 ,,5918044,,,,‘å�ã•{,�äŽs–k‹æ,’†’·”ö’¬
 ,,5918012,,,,‘å�ã•{,�äŽs–k‹æ,’†‘º’¬
 ,,5918023,,,,‘å�ã•{,�äŽs–k‹æ,’†•S�ã’¹’¬
@@ -85443,6 +85569,7 @@
 ,,5960042,,,,‘å�ã•{,ŠÝ˜a“cŽs,‰ÁŽç’¬
 ,,5960073,,,,‘å�ã•{,ŠÝ˜a“cŽs,ŠÝ�é’¬
 ,,5960016,,,,‘å�ã•{,ŠÝ˜a“cŽs,ŠÝ”V‰Y’¬
+,,5960817,,,,‘å�ã•{,ŠÝ˜a“cŽs,ŠÝ‚Ì‹u’¬
 ,,5960051,,,,‘å�ã•{,ŠÝ˜a“cŽs,ŠÝ–ì’¬
 ,,5960843,,,,‘å�ã•{,ŠÝ˜a“cŽs,–k�ã’¬
 ,,5960056,,,,‘å�ã•{,ŠÝ˜a“cŽs,–k’¬
@@ -89452,6 +89579,7 @@
 ,,6740066,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬•Ÿ“c
 ,,6740053,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬�¼‰A
 ,,6740052,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬�¼‰A�V“c
+,,6740050,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬�¼‰AŽRŽè
 ,,6740055,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬—Î‚ª‹u
 ,,6740061,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬�X“c
 ,,6740063,,,,•ºŒÉŒ§,–¾�ÎŽs,‘å‹v•Û’¬”ª–Ø
@@ -91968,6 +92096,7 @@
 ,,6560424,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,‰|—ñ�¼�ì
 ,,6560427,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,‰|—ñ�¼“c
 ,,6560421,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,‰|—ñŽR�Š
+,,6560328,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,�÷‰Ô‚Ì‹½
 ,,6560518,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,‰ê�W‹�“à
 ,,6560517,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,‰ê�W“àƒPŒ´
 ,,6560515,,,,•ºŒÉŒ§,“ì‚ ‚í‚¶Žs,‰ê�W’bŽ¡‰®
@@ -95533,6 +95662,8 @@
 ,,6420011,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,�•�]
 ,,6420024,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,�ãˆä
 ,,6420023,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,�d�ª
+,,6420019,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,�d�ª�¼
+,,6420018,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,�d�ª“Œ
 ,,6420035,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,—â�…
 ,,6490147,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,‰º’Ã’¬�ÂŽ}
 ,,6490145,,,,˜a‰ÌŽRŒ§,ŠC“ìŽs,‰º’Ã’¬Žs’Ø
@@ -96781,6 +96912,7 @@
 ,,6801212,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬“¿‹g
 ,,6801224,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬’†ˆä
 ,,6801241,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬’·�£
+,,6801209,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬�¼‰~’ÊŽ›
 ,,6801222,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬‰g“c
 ,,6801201,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬‘Ü‰ÍŒ´
 ,,6801202,,,,’¹ŽæŒ§,’¹ŽæŽs,‰ÍŒ´’¬•z‘Ü
@@ -103044,6 +103176,7 @@
 ,,7390024,,,,�L“‡Œ§,“Œ�L“‡Žs,�¼�ð’¬Œä‰’‰F
 ,,7390032,,,,�L“‡Œ§,“Œ�L“‡Žs,�¼�ð’¬�X‹ß
 ,,7390002,,,,�L“‡Œ§,“Œ�L“‡Žs,�¼�ð’¬‹g�s
+,,7390049,,,,�L“‡Œ§,“Œ�L“‡Žs,Ž›‰ÆŽY‹Æ’c’n
 ,,7390263,,,,�L“‡Œ§,“Œ�L“‡Žs,Žu˜a—¬’Ê
 ,,7390261,,,,�L“‡Œ§,“Œ�L“‡Žs,Žu˜a’¬“à
 ,,7390266,,,,�L“‡Œ§,“Œ�L“‡Žs,Žu˜a’¬‰œ‰®
@@ -104154,6 +104287,8 @@
 ,,7530036,,,,ŽRŒûŒ§,ŽRŒûŽs,‰~�­Ž›’¬
 ,,7530033,,,,ŽRŒûŒ§,ŽRŒûŽs,‘åŽs’¬
 ,,7530242,,,,ŽRŒûŒ§,ŽRŒûŽs,‘å“à�¬‹ž“s
+,,7530251,,,,ŽRŒûŒ§,ŽRŒûŽs,‘å“à�ç–V
+,,7530252,,,,ŽRŒûŒ§,ŽRŒûŽs,‘å“à’†‰›
 ,,7530241,,,,ŽRŒûŒ§,ŽRŒûŽs,‘å“à–â“c
 ,,7530211,,,,ŽRŒûŒ§,ŽRŒûŽs,‘å“à’·–ì
 ,,7530231,,,,ŽRŒûŒ§,ŽRŒûŽs,‘å“à•X�ã
@@ -107931,6 +108066,7 @@
 ,,7991603,,,,ˆ¤•QŒ§,�¡Ž¡Žs,’©‘q‰º
 ,,7991606,,,,ˆ¤•QŒ§,�¡Ž¡Žs,’©‘q“ì‰³
 ,,7991605,,,,ˆ¤•QŒ§,�¡Ž¡Žs,’©‘q“ì�b
+,,7991608,,,,ˆ¤•QŒ§,�¡Ž¡Žs,’©‘q“ì•¸
 ,,7940042,,,,ˆ¤•QŒ§,�¡Ž¡Žs,ˆ®’¬
 ,,7940861,,,,ˆ¤•QŒ§,�¡Ž¡Žs,ŒÜ�\—’
 ,,7940085,,,,ˆ¤•QŒ§,�¡Ž¡Žs,‚¢‚±‚¢‚Ì‹u
@@ -110588,8 +110724,8 @@
 ,,7811618,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,’ÖŽR
 ,,7811626,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,’Øˆä�ì
 ,,7811511,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,Ž›‘º
-,,7811624,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,“y‹��iˆÀ‹�“y‹��j
-,,7811606,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,“y‹��i‚»‚Ì‘¼�j
+,,7811606,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,“y‹��i�b�E‰³�j
+,,7811624,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,“y‹��i‚»‚Ì‘¼�j
 ,,7811752,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,“»ƒm‰z
 ,,7811763,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,’†
 ,,7811764,,,,�‚’mŒ§,Œá�ìŒS�m—„�ì’¬,’·�â
@@ -113735,6 +113871,7 @@
 ,,8112103,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,Žl‰¤Ž›�â
 ,,8112127,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,�áŽqŠx
 ,,8112126,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,�áŽqŠx“ì
+,,8112129,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,�_•�Œ´
 ,,8112102,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,’Y�Ä
 ,,8112107,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,‚Æ‚Ñ‚½‚¯
 ,,8112132,,,,•Ÿ‰ªŒ§,‘Œ‰®ŒS‰F”ü’¬,Œ´“c
@@ -119112,6 +119249,7 @@
 ,,8700954,,,,‘å•ªŒ§,‘å•ªŽs,‰ºŒS’†‰›
 ,,8700953,,,,‘å•ªŒ§,‘å•ªŽs,‰ºŒS“Œ
 ,,8700955,,,,‘å•ªŒ§,‘å•ªŽs,‰ºŒS“ì
+,,8700961,,,,‘å•ªŒ§,‘å•ªŽs,‰ºŒSŽR‚ÌŽè
 ,,8700951,,,,‘å•ªŒ§,‘å•ªŽs,‰ºŒS
 ,,8700941,,,,‘å•ªŒ§,‘å•ªŽs,‰ºŒS�H‹Æ’c’n
 ,,8700803,,,,‘å•ªŒ§,‘å•ªŽs,‰º”’–Ø
@@ -119680,6 +119818,7 @@
 ,,8770112,,,,‘å•ªŒ§,“ú“cŽs,“V�£’¬–{�é
 ,,8794121,,,,‘å•ªŒ§,“ú“cŽs,“V�£’¬”nŒ´
 ,,8794203,,,,‘å•ªŒ§,“ú“cŽs,“V�£’¬“’ŽR
+,,8771366,,,,‘å•ªŒ§,“ú“cŽs,‚ ‚â‚ß‘ä
 ,,8771361,,,,‘å•ªŒ§,“ú“cŽs,—L“c’¬
 ,,8771375,,,,‘å•ªŒ§,“ú“cŽs,’r•Ó’¬
 ,,8770061,,,,‘å•ªŒ§,“ú“cŽs,�Îˆä
@@ -121289,7 +121428,7 @@
 ,,8892536,,,,‹{�èŒ§,“ú“ìŽs,Œá“c�¼
 ,,8870001,,,,‹{�èŒ§,“ú“ìŽs,–û’Ã
 ,,8892532,,,,‹{�èŒ§,“ú“ìŽs,”Â•~
-,,8892311,,,,‹{�èŒ§,“ú“ìŽs,ˆÉ”äˆä
+,,8870111,,,,‹{�èŒ§,“ú“ìŽs,ˆÉ”äˆä
 ,,8892525,,,,‹{�èŒ§,“ú“ìŽs,�¡’¬
 ,,8870014,,,,‹{�èŒ§,“ú“ìŽs,Šâ�è
 ,,8870017,,,,‹{�èŒ§,“ú“ìŽs,”~ƒP•l
@@ -123377,6 +123516,7 @@
 ,,9040023,,,,‰«“êŒ§,‰«“êŽs,‹v•Û“c
 ,,9042145,,,,‰«“êŒ§,‰«“êŽs,‘q•~
 ,,9042161,,,,‰«“êŒ§,‰«“êŽs,ŒÃŽÓ
+,,9042166,,,,‰«“êŒ§,‰«“êŽs,ŒÃŽÓ’Ã‰ÃŽR’¬
 ,,9040001,,,,‰«“êŒ§,‰«“êŽs,‰z—ˆ
 ,,9040021,,,,‰«“êŒ§,‰«“êŽs,ŒÓ‰®
 ,,9042144,,,,‰«“êŒ§,‰«“êŽs,”’�ì
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManage.xlsx
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 47)
+++ trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 48)
@@ -87,14 +87,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.Office.Interop.Word, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualBasic.PowerPacks, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <HintPath>..\packages\Oracle.ManagedDataAccess.12.1.2400\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
       <Private>True</Private>
@@ -214,6 +208,9 @@
     <Compile Include="Forms\DataEntry\PurchaseOrderEntry\FrmOrderEntryList.Designer.cs">
       <DependentUpon>FrmOrderEntryList.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\DataEntry\PurchaseOrderEntry\FrmOrderEntryListAuxiliary.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DataEntry\PurchaseOrderEntry\PurchaseOrderInputPage.cs" />
     <Compile Include="DataModel\PurchaseOrderDetail.cs" />
     <Compile Include="DataModel\PurchaseOrder.cs" />
@@ -976,7 +973,6 @@
     <Compile Include="Forms\ZMenu\FrmMenuAuxiliary.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="IniFile.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Forms\CustomControls\DataGridViewEX.resx">
@@ -1306,6 +1302,44 @@
     <Content Include="Resources\kanriIcon.ico" />
     <Content Include="rinen.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Core">
+      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>7</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Excel">
+      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>8</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Word">
+      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>6</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="VBIDE">
+      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: trunk/src/ProcessManagement/ProcessManagement.v12.suo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
