Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 95)
@@ -14,7 +14,7 @@
         /// <summary>
         /// 本体バージョン
         /// </summary>
-        public static int s_SystemVersion = 19;
+        public static int s_SystemVersion = 21;
 
         /// <summary>
         /// コピー・環境バージョン
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs	(revision 95)
@@ -630,9 +630,9 @@
                 DetailDB.connect(); DetailDB.beginTran();
 
                 // 工事基本情報データ
-                strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO SET CONSTRUCTIONSTATUSFLG = {0},", iCode1);
+                strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO A SET CONSTRUCTIONSTATUSFLG = {0},", iCode1);
                 strSQL += string.Format(" NONORDERDATE = TO_DATE('{0}','YYYY/MM/DD')", DateTime.Today.ToShortDateString());
-                strSQL += string.Format(" WHERE CONSTRUCTIONCODE IN (SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO A {0})", strWHERE);
+                strSQL += strWHERE;
                 if (!BaseDB.ExecuteNonQuery(strSQL, false))
                 {
                     BaseDB.rollback();
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMOrderers.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMOrderers.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMOrderers.cs	(revision 95)
@@ -248,8 +248,8 @@
                 strcmd += string.Format(",'{0}'", work.Address3);
                 strcmd += string.Format(",'{0}'", work.PhoneNumber);
                 strcmd += string.Format(",'{0}'", work.FaxNumber);
+                strcmd += string.Format(",'{0}'", work.MailAddress);
                 strcmd += string.Format(",'{0}'", work.Note);
-                strcmd += string.Format(",'{0}'", work.MailAddress);
                 strcmd += string.Format(", {0}", work.DeleteFlg);
 
                 strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrderDetail.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrderDetail.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrderDetail.cs	(revision 95)
@@ -47,6 +47,7 @@
             UnitPrice,		        // 単価
             OrdersLinePrice,		// 金額
             SourceCode,             // 予算作成時工事番号
+            SourceLineCnt,	        // 注文書作成時台帳行番号
 
             EntryDate,
             UpdateDate,
@@ -87,6 +88,7 @@
             strcmd += ", UnitPrice";		        // 単価
             strcmd += ", OrdersLinePrice";		    // 金額
             strcmd += ", SourceCode";               // 予算作成時工事番号
+            strcmd += ", SourceLineCnt";	        // 注文書作成時台帳行番号
 
             strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";
             strcmd += ", TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";
@@ -185,26 +187,18 @@
             {
 
                 strcmd = "INSERT INTO PurchaseOrderDetail";
-                strcmd += " (";
-                strcmd += "  ConstructionCode";	        // 工事コード
-                strcmd += ", SeqNo";                    // 注文書枝番
-                strcmd += ", GroupCount";               // グループ番号
-                strcmd += ", LineCount";                // 行番号
-                strcmd += ", ComponentCode";            // 構成キー
-                strcmd += ", ItemCode";		            // 工種キー
-                strcmd += ", FirstString";              // 工種品名
-                strcmd += ", SecondString";             // 内容内訳
-                strcmd += ", UnitCount";		        // 数量
-                strcmd += ", UnitName";		            // 単位
-                strcmd += ", UnitPrice";		        // 単価
-                strcmd += ", OrdersLinePrice";		    // 金額
-                strcmd += ", SourceCode";               // 予算作成時工事番号
-                strcmd += ", EntryDate";
-                strcmd += ", UpdateDate";
-                strcmd += ")";
 
-                strcmd += " VALUES (";
+                strcmd += "(";
+                bool bFirst = true;
+                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
+                {
+                    if (!bFirst) strcmd += " ,";
+                    strcmd += gender.ToString();
+                    bFirst = false;
+                }
+                strcmd += ") VALUES (";
 
+
                 strcmd += string.Format("  {0}", work.ConstructionCode);        // 工事番号
 
                 strcmd += string.Format(", {0}", work.SeqNo);                   // 注文書枝番
@@ -219,6 +213,7 @@
                 strcmd += string.Format(", {0}", work.UnitPrice);		        // 単価
                 strcmd += string.Format(", {0}", work.OrdersLinePrice);         // 金額
                 strcmd += string.Format(", {0}", work.SourceCode);              // 予算作成時工事番号
+                strcmd += string.Format(", {0}", work.SourceLineCnt);	        // 注文書作成時台帳行番号
 
                 strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
                 strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
@@ -292,6 +287,7 @@
                 strcmd += string.Format(", UnitPrice = {0}", data.UnitPrice);		                // 単価
                 strcmd += string.Format(", OrdersLinePrice = {0}", data.OrdersLinePrice);		    // 金額
                 strcmd += string.Format(", SourceCode = {0}", data.SourceCode);                     // 予算作成時工事番号
+                strcmd += string.Format(", SourceLineCnt = {0}", data.SourceLineCnt);	            // 注文書作成時台帳行番号
 
                 strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
                 strcmd += AddSQLString;
@@ -389,6 +385,9 @@
                     case (int)TableColumn.SourceCode:       // 予算作成時工事番号
                         strcmd += string.Format(" SourceCode = {0}", ((int)value).ToString());
                         break;
+                    case (int)TableColumn.SourceLineCnt:	            // 注文書作成時台帳行番号
+                        strcmd += string.Format(" SourceLineCnt = {0}", ((int)value).ToString());
+                        break;
                 }
 
                 strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
@@ -432,6 +431,7 @@
                 wrk.UnitPrice = double.Parse(objwrk[(int)TableColumn.UnitPrice].ToString());		            // 単価
                 wrk.OrdersLinePrice = double.Parse(objwrk[(int)TableColumn.OrdersLinePrice].ToString());		// 金額
                 wrk.SourceCode = int.Parse(objwrk[(int)TableColumn.SourceCode].ToString());                     // 予算作成時工事番号
+                wrk.SourceLineCnt = int.Parse(objwrk[(int)TableColumn.SourceLineCnt].ToString());	            // 注文書作成時台帳行番号
 
                 wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
                 wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
Index: trunk/src/ProcessManagement/ProcessManagement/DataModel/PurchaseOrderDetail.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DataModel/PurchaseOrderDetail.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/DataModel/PurchaseOrderDetail.cs	(revision 95)
@@ -27,6 +27,7 @@
         private double  m_UnitPrice = 0;	                // 単価
         private double  m_OrdersLinePrice = 0;	            // 金額
         private double  m_SourceCode = 0;                   // 予算作成時工事番号
+        private int     m_SourceLineCnt = 0;                // 注文書作成時台帳行番号
 
         private DateTime m_EntryDate = DateTime.Now;        // 登録日付
         private DateTime m_UpdateDate = DateTime.Now;       // 更新日付
@@ -141,6 +142,14 @@
             get { return m_SourceCode; }
             set { m_SourceCode = value; }
         }
+        /// <summary>
+        /// 注文書作成時台帳行番号
+        /// </summary>
+        public int SourceLineCnt
+        {
+            get { return m_SourceLineCnt; }
+            set { m_SourceLineCnt = value; }
+        }
 
         /// <summary>
         /// 登録日付
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs	(revision 95)
@@ -30,27 +30,27 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnDataDelete = new System.Windows.Forms.Button();
             this.btnDataEntry = new System.Windows.Forms.Button();
@@ -82,6 +82,9 @@
             this.btnLineDel = new System.Windows.Forms.Button();
             this.btnLineAdd = new System.Windows.Forms.Button();
             this.pnlBase = new System.Windows.Forms.Panel();
+            this.label20 = new System.Windows.Forms.Label();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.label6 = new System.Windows.Forms.Label();
             this.btnSubJob = new System.Windows.Forms.Button();
             this.label39 = new System.Windows.Forms.Label();
             this.label48 = new System.Windows.Forms.Label();
@@ -143,7 +146,6 @@
             this.label13 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
             this.lblCellTotal = new System.Windows.Forms.Label();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -166,11 +168,11 @@
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnFirst = new System.Windows.Forms.Button();
             this.btnFinal = new System.Windows.Forms.Button();
-            this.panel3 = new System.Windows.Forms.Panel();
             this.panel1.SuspendLayout();
             this.pnlApproval.SuspendLayout();
             this.pnlApprovalButton.SuspendLayout();
             this.pnlBase.SuspendLayout();
+            this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX2)).BeginInit();
@@ -177,7 +179,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
             this.panel2.SuspendLayout();
-            this.panel3.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
@@ -579,6 +580,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.pnlBase.AutoScroll = true;
             this.pnlBase.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.pnlBase.Controls.Add(this.label20);
             this.pnlBase.Controls.Add(this.panel3);
             this.pnlBase.Controls.Add(this.label39);
             this.pnlBase.Controls.Add(this.label48);
@@ -626,6 +628,38 @@
             this.pnlBase.Size = new System.Drawing.Size(1320, 490);
             this.pnlBase.TabIndex = 36;
             // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.ForeColor = System.Drawing.Color.Red;
+            this.label20.Location = new System.Drawing.Point(612, 854);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(603, 16);
+            this.label20.TabIndex = 77;
+            this.label20.Text = "未巡回の場合は未巡回と記入して下さい。（記入例：未巡回（電話確認）等）";
+            // 
+            // panel3
+            // 
+            this.panel3.BackColor = System.Drawing.Color.White;
+            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel3.Controls.Add(this.label6);
+            this.panel3.Controls.Add(this.btnSubJob);
+            this.panel3.Location = new System.Drawing.Point(53, 10);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(200, 40);
+            this.panel3.TabIndex = 76;
+            // 
+            // label6
+            // 
+            this.label6.BackColor = System.Drawing.Color.White;
+            this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.label6.Location = new System.Drawing.Point(8, 4);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(80, 30);
+            this.label6.TabIndex = 37;
+            this.label6.Text = "職　　種";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // btnSubJob
             // 
             this.btnSubJob.BackColor = System.Drawing.Color.SeaGreen;
@@ -733,14 +767,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dataGridViewEX4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dataGridViewEX4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewEX4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewEX4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridViewEX4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridViewEX4.ColumnHeadersVisible = false;
             this.dataGridViewEX4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -767,8 +801,8 @@
             // 
             // dataGridViewTextBoxColumn18
             // 
-            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridViewTextBoxColumn18.Frozen = true;
             this.dataGridViewTextBoxColumn18.HeaderText = "№";
             this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
@@ -779,8 +813,8 @@
             // 
             // dataGridViewTextBoxColumn19
             // 
-            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridViewTextBoxColumn19.HeaderText = "時間帯固定";
             this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
             this.dataGridViewTextBoxColumn19.ReadOnly = true;
@@ -789,8 +823,8 @@
             // 
             // Column9
             // 
-            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column9.HeaderText = "時間帯";
             this.Column9.Name = "Column9";
             this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -851,14 +885,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dataGridViewEX3.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dataGridViewEX3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle26.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewEX3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewEX3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridViewEX3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridViewEX3.ColumnHeadersVisible = false;
             this.dataGridViewEX3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -884,8 +918,8 @@
             // 
             // dataGridViewTextBoxColumn15
             // 
-            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle27;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle6;
             this.dataGridViewTextBoxColumn15.Frozen = true;
             this.dataGridViewTextBoxColumn15.HeaderText = "№";
             this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
@@ -1005,14 +1039,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dataGridViewEX2.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dataGridViewEX2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle28.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewEX2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewEX2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dataGridViewEX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridViewEX2.ColumnHeadersVisible = false;
             this.dataGridViewEX2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1041,8 +1075,8 @@
             // 
             // dataGridViewTextBoxColumn9
             // 
-            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle8;
             this.dataGridViewTextBoxColumn9.Frozen = true;
             this.dataGridViewTextBoxColumn9.HeaderText = "№";
             this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
@@ -1061,8 +1095,8 @@
             // 
             // dataGridViewTextBoxColumn11
             // 
-            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle30;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle9;
             this.dataGridViewTextBoxColumn11.HeaderText = "数量";
             this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
             this.dataGridViewTextBoxColumn11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1212,14 +1246,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dataGridViewEX1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dataGridViewEX1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle31.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewEX1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewEX1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
             this.dataGridViewEX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dataGridViewEX1.ColumnHeadersVisible = false;
             this.dataGridViewEX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1250,8 +1284,8 @@
             // 
             // dataGridViewTextBoxColumn1
             // 
-            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle32;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle11;
             this.dataGridViewTextBoxColumn1.Frozen = true;
             this.dataGridViewTextBoxColumn1.HeaderText = "№";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
@@ -1294,8 +1328,8 @@
             // 
             // dataGridViewTextBoxColumn6
             // 
-            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle33;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle12;
             this.dataGridViewTextBoxColumn6.HeaderText = "開始";
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
             this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1304,8 +1338,8 @@
             // 
             // dataGridViewTextBoxColumn7
             // 
-            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle34;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle13;
             this.dataGridViewTextBoxColumn7.HeaderText = "";
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
             this.dataGridViewTextBoxColumn7.ReadOnly = true;
@@ -1315,8 +1349,8 @@
             // 
             // dataGridViewTextBoxColumn8
             // 
-            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle35;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle14;
             this.dataGridViewTextBoxColumn8.HeaderText = "終了";
             this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
             this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1429,17 +1463,6 @@
             this.label7.Text = "業　者　名";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label6
-            // 
-            this.label6.BackColor = System.Drawing.Color.White;
-            this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.label6.Location = new System.Drawing.Point(8, 4);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(80, 30);
-            this.label6.TabIndex = 37;
-            this.label6.Text = "職　　種";
-            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // lblCellTotal
             // 
             this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1462,14 +1485,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle36.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvAllDisplay.ColumnHeadersVisible = false;
             this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1502,8 +1525,8 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle37;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle16;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "№";
             this.Column1.Name = "Column1";
@@ -1523,8 +1546,8 @@
             // 
             // Column2
             // 
-            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle38;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle17;
             this.Column2.Frozen = true;
             this.Column2.HeaderText = "職種名称";
             this.Column2.Name = "Column2";
@@ -1544,8 +1567,8 @@
             // 
             // Column3
             // 
-            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle39;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle18;
             this.Column3.Frozen = true;
             this.Column3.HeaderText = "業者名";
             this.Column3.Name = "Column3";
@@ -1556,8 +1579,8 @@
             // 
             // Column4
             // 
-            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle40;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle19;
             this.Column4.HeaderText = "当日";
             this.Column4.Name = "Column4";
             this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1566,8 +1589,8 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle41;
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle20;
             this.Column5.HeaderText = "累計";
             this.Column5.Name = "Column5";
             this.Column5.ReadOnly = true;
@@ -1593,8 +1616,8 @@
             // 
             // Column8
             // 
-            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle42;
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle21;
             this.Column8.HeaderText = "人員";
             this.Column8.Name = "Column8";
             this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1732,17 +1755,6 @@
             this.btnFinal.UseVisualStyleBackColor = false;
             this.btnFinal.Click += new System.EventHandler(this.btnFinal_Click);
             // 
-            // panel3
-            // 
-            this.panel3.BackColor = System.Drawing.Color.White;
-            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel3.Controls.Add(this.label6);
-            this.panel3.Controls.Add(this.btnSubJob);
-            this.panel3.Location = new System.Drawing.Point(53, 10);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(200, 40);
-            this.panel3.TabIndex = 76;
-            // 
             // FrmDRConstruction
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1782,6 +1794,7 @@
             this.pnlApprovalButton.ResumeLayout(false);
             this.pnlBase.ResumeLayout(false);
             this.pnlBase.PerformLayout();
+            this.panel3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX2)).EndInit();
@@ -1788,7 +1801,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
             this.panel2.ResumeLayout(false);
-            this.panel3.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1911,5 +1923,6 @@
         private System.Windows.Forms.Button btnFinal;
         private System.Windows.Forms.Button btnSubJob;
         private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Label label20;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs	(revision 95)
@@ -883,17 +883,20 @@
                 ArrayList arList = new ArrayList();
                 if (!DetailDB.ExecuteReader(strSQL, ref arList) || arList.Count == 0)
                 {
-                    // データ無は空行を表示する
-                    dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Detail]);
-                    // 合計表示
-                    lblGrid1Total1.Text = "0.0";
-                    double work = GetTotalHeadCount();
-                    if (work==0)
-                        lblGrid1Total2.Text = work.ToString("#,#.#");
-                    else
-                        lblGrid1Total2.Text = work.ToString("#,0.0");
-                    lblGrid1Total3.Text = "0.0";
-                    return;
+                    if (!MaxDateCheck(ref arList))
+                    {
+                        // データ無は空行を表示する
+                        dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Detail]);
+                        // 合計表示
+                        lblGrid1Total1.Text = "0.0";
+                        double work = GetTotalHeadCount();
+                        if (work == 0)
+                            lblGrid1Total2.Text = work.ToString("#,#.#");
+                        else
+                            lblGrid1Total2.Text = work.ToString("#,0.0");
+                        lblGrid1Total3.Text = "0.0";
+                        return;
+                    }
                 }
 
                 // グリッド表示
@@ -961,6 +964,50 @@
         }
         #endregion
 
+        #region 現在指定日がデータの最終日より大きいかをチェックする
+        /// <summary>
+        /// 現在指定日がデータの最終日より大きいかをチェックする
+        /// </summary>
+        /// <returns></returns>
+        private bool MaxDateCheck(ref ArrayList DispList)
+        {
+            IODailyDataDetail DetailDB = new IODailyDataDetail();
+            try
+            {
+                DateTime MaxDate = GetFPNDataDate((int)ReadData.Final);
+                if (MaxDate > dTPCreateDate.Value) return false;
+
+                // 明細データ取得
+                string strSQL = "SELECT A.JOBCATEGORYCODE";
+                strSQL += ", B.JOBCATEGORYNAME";
+                strSQL += ", A.COMPANYCODE";
+                strSQL += ", C.COMPANYNAME";
+                strSQL += ", A.NEXTDAYHEADCOUNT";
+                strSQL += ", (A.TOTALHEADCOUNT + A.NEXTDAYHEADCOUNT)";
+                strSQL += ", A.NEXTDAYWORK";
+                strSQL += ", A.NEXTDAYWORK";
+                strSQL += ", 0";
+                strSQL += " FROM DAILYDATADETAIL A";
+                strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE";
+                strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE";
+                strSQL += DetailDB.CreatePrimarykeyString(m_PersonCode, MaxDate, m_ConstructionCode, 0);
+                strSQL += " ORDER BY A.SEQNO";
+                if (!DetailDB.ExecuteReader(strSQL, ref DispList) || DispList.Count == 0) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                DetailDB.close(); DetailDB = null;
+            }
+        }
+        #endregion
+
         #region 作業内容グリッドの合計を計算する
         /// <summary>
         /// 作業内容グリッドの合計を計算する
@@ -1856,8 +1903,16 @@
                 bAns = DailyDataCheck();
                 bRet &= bAns;
 
+                bool[] bDailyDataField = new bool[4];
+                Array.Clear(bDailyDataField, 0, bDailyDataField.Length);
+                CommonMotions.chgBackColor(m_DgvArray[4].Rows[0].Cells[(int)DispGridColumn5.ContentsText], true);
+                CommonMotions.chgBackColor(m_DgvArray[4].Rows[3].Cells[(int)DispGridColumn5.ContentsText], true);
+                CommonMotions.chgBackColor(m_DgvArray[4].Rows[6].Cells[(int)DispGridColumn5.ContentsText], true);
+                CommonMotions.chgBackColor(m_DgvArray[4].Rows[9].Cells[(int)DispGridColumn5.ContentsText], true);
+
                 foreach (DataGridView dgv in m_DgvArray)
                 {
+                    ErrorRow = 0;
                     // 明細チェック
                     foreach (DataGridViewRow wrkRow in dgv.Rows)
                     {
@@ -1869,6 +1924,7 @@
                         else if (dgv == m_DgvArray[(int)DataGridDefine.Vehicles])
                         {
                             bAns = DailyDataVehiclesCheck(wrkRow, ref ErrorRow);
+                            if (ErrorRow != 0) dgvAllDisplay.FirstDisplayedScrollingRowIndex = ErrorRow;
                         }
                         else if (dgv == m_DgvArray[(int)DataGridDefine.Materials])
                         {
@@ -1880,11 +1936,14 @@
                         }
                         else if (dgv == m_DgvArray[(int)DataGridDefine.Field])
                         {
-                            bAns = DailyDataFieldCheck(wrkRow, ref ErrorRow);
+                            bAns = DailyDataFieldCheck(wrkRow, ref ErrorRow, ref bDailyDataField);
                         }
                         bRet &= bAns;
                     }
+                    // 最後のエラー行へ移動する
+                    if (ErrorRow != 0) dgv.FirstDisplayedScrollingRowIndex = ErrorRow;
                 }
+
                 if (!bRet)
                 {
                     MessageBox.Show("入力エラーがあります、確認してください。", "データ確認", MessageBoxButtons.OK, MessageBoxIcon.Warning);
@@ -1891,9 +1950,24 @@
                     return false;
                 }
 
-                // 最後のエラー行へ移動する
-                dgvAllDisplay.FirstDisplayedScrollingRowIndex = ErrorRow;
+                int fieldcnt = 0;
+                for (int i = 0; i < bDailyDataField.Length; i++)
+                {
+                    if (bDailyDataField[i]) fieldcnt++;
+                }
+                if (fieldcnt < 4)
+                {
+                    dataGridViewEX4.Focus();
+                    CommonMotions.chgBackColor(m_DgvArray[4].Rows[0].Cells[(int)DispGridColumn5.ContentsText], false);
+                    CommonMotions.chgBackColor(m_DgvArray[4].Rows[3].Cells[(int)DispGridColumn5.ContentsText], false);
+                    CommonMotions.chgBackColor(m_DgvArray[4].Rows[6].Cells[(int)DispGridColumn5.ContentsText], false);
+                    CommonMotions.chgBackColor(m_DgvArray[4].Rows[9].Cells[(int)DispGridColumn5.ContentsText], false);
 
+                    MessageBox.Show("現場巡回は必須入力です、確認してください。", "データ確認", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return false;
+                }
+                
+                
                 return true;
             }
             catch (System.Exception ex)
@@ -2036,6 +2110,8 @@
                         bAns = false;
                     }
                 }
+                if (!bRet) ErrorRow = wrkRow.Index;
+                
                 // 背景色変更
                 CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn1.NextdayHeadCount], bAns);
                 bRet &= bAns;
@@ -2122,6 +2198,7 @@
                 CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn2.EndWorkingTime], bAns);
                 bRet &= bAns;
 
+                if (!bRet) ErrorRow = wrkRow.Index;
                 return bRet;
             }
             catch (System.Exception ex)
@@ -2191,6 +2268,7 @@
                 CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn3.QualityControl], bAns);
                 bRet &= bAns;
 
+                if (!bRet) ErrorRow = wrkRow.Index;
                 return bRet;
             }
             catch (System.Exception ex)
@@ -2233,6 +2311,7 @@
                 CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn4.ContentsText], bAns);
                 bRet &= bAns;
 
+                if (!bRet) ErrorRow = wrkRow.Index;
                 return bRet;
             }
             catch (System.Exception ex)
@@ -2248,11 +2327,55 @@
         /// 日報データ(現場巡回)チェック
         /// </summary>
         /// <returns></returns>
-        private bool DailyDataFieldCheck(DataGridViewRow wrkRow, ref int ErrorRow)
+        private bool DailyDataFieldCheck(DataGridViewRow wrkRow, ref int ErrorRow, ref bool[] bDailyDataField)
         {
             try
             {
-                return true;
+                bool bRet = true;
+                bool bAns = true;
+                int rowcnt = wrkRow.Index;
+
+                string strtime = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn5.PatrolTime].Value);
+                string strcomment = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn5.ContentsText].Value);
+
+                CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn5.PatrolTime], bAns);
+                CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn5.ContentsText], bAns);
+
+                if (strtime.Length == 0 && strcomment.Length == 0) return true;
+
+                if (strtime.Length != 0)
+                {
+                    // 巡回時間チェック
+                    bAns = CommonMotions.chkDate(strtime);
+                    // 背景色変更
+                    CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn5.PatrolTime], bAns);
+                    bRet &= bAns;
+                }
+
+                // 巡回状況チェック
+                bAns = CommonMotions.chkStringLength(strcomment, 200, true);
+                // 背景色変更
+                CommonMotions.chgBackColor(wrkRow.Cells[(int)DispGridColumn5.ContentsText], bAns);
+                bRet &= bAns;
+
+                if (0 <= rowcnt && rowcnt < 3)
+                {
+                    if (strcomment.Length != 0) bDailyDataField[0] = true;
+                }
+                else if (3 <= rowcnt && rowcnt < 6)
+                {
+                    if (strcomment.Length != 0) bDailyDataField[1] = true;
+                }
+                else if (6 <= rowcnt && rowcnt < 9)
+                {
+                    if (strcomment.Length != 0) bDailyDataField[2] = true;
+                }
+                else if (9 <= rowcnt && rowcnt < 12)
+                {
+                    if (strcomment.Length != 0) bDailyDataField[3] = true;
+                }
+
+                return bRet;
             }
             catch (System.Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs	(revision 95)
@@ -197,9 +197,9 @@
                 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 PURCHASEORDERDETAIL E ON E.CONSTRUCTIONCODE = A.SOURCECODE AND (E.SOURCELINECNT = A.LINECOUNT OR E.SOURCELINECNT = 0)";
 
-                strSQL += " LEFT JOIN PURCHASEORDER F ON F.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE AND F.COMPANYCODE = A.COMPANYCODE AND F.ORDERPRICE like A.EXECUTIONAMOUNT";
+                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";
 
@@ -511,38 +511,35 @@
                 {
                     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;
+                    DataGridViewRow ChkRow = dgv.Rows[ix];
 
-                        if (CommonMotions.cnvInt(ObjRec[(int)ReadDBColumn.CompanyCode])
-                            != CommonMotions.cnvInt(ChkRow.Cells[(int)GridColumn.CompanyCode].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.NotCreate].Value))
+                    {
+                        m_OrderFrm.DetailList.RemoveAt(ix);
+                        continue;
+                    }
+                    if ((bool)ChkRow.Cells[(int)GridColumn.NotCreate].Value)
+                    {
+                        m_OrderFrm.DetailList.RemoveAt(ix);
+                        continue;
+                    }
 
-                        // 選択フラグのチェック
-                        if (!CommonMotions.chkCellBlank(ChkRow.Cells[(int)GridColumn.SelectExec].Value))
-                        {
-                            if (!(bool)ChkRow.Cells[(int)GridColumn.SelectExec].Value)
-                            {
-                                // 内部データ削除（親フォームのプロパティを編集する）
-                                m_OrderFrm.DetailList.RemoveAt(ix);
-                                break;
-                            }
-                        }
-                        break;
+                    // 選択フラグのチェック
+                    if (CommonMotions.chkCellBlank(ChkRow.Cells[(int)GridColumn.SelectExec].Value))
+                    {
+                        m_OrderFrm.DetailList.RemoveAt(ix);
+                        continue;
                     }
+                    if (!(bool)ChkRow.Cells[(int)GridColumn.SelectExec].Value)
+                    {
+                        // 内部データ削除（親フォームのプロパティを編集する）
+                        m_OrderFrm.DetailList.RemoveAt(ix);
+                        continue;
+                    }
                 }
             }
             catch (Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs	(revision 95)
@@ -28,17 +28,17 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btnInputImage = new System.Windows.Forms.Button();
@@ -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();
@@ -142,6 +137,11 @@
             this.btnDispDown = new System.Windows.Forms.Button();
             this.btnDispUp = new System.Windows.Forms.Button();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            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.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -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
@@ -607,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(696, 7);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(170, 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;
@@ -1287,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(696, 7);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(170, 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;
@@ -1307,14 +1242,14 @@
             this.dgvTerms.AllowUserToResizeRows = false;
             this.dgvTerms.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvTerms.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvTerms.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvTerms.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvTerms.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvTerms.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn2,
@@ -1332,8 +1267,8 @@
             // 
             // dataGridViewTextBoxColumn2
             // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridViewTextBoxColumn2.Frozen = true;
             this.dataGridViewTextBoxColumn2.HeaderText = "№";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
@@ -1344,8 +1279,8 @@
             // 
             // dataGridViewTextBoxColumn12
             // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridViewTextBoxColumn12.HeaderText = "条　　　件";
             this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
             this.dataGridViewTextBoxColumn12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1444,14 +1379,14 @@
             this.dgvAllDisplay.AllowUserToResizeRows = false;
             this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
@@ -1475,10 +1410,75 @@
             this.dgvAllDisplay.Size = new System.Drawing.Size(1230, 214);
             this.dgvAllDisplay.TabIndex = 1;
             // 
+            // 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);
+            // 
             // dataGridViewTextBoxColumn1
             // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridViewTextBoxColumn1.Frozen = true;
             this.dataGridViewTextBoxColumn1.HeaderText = "№";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
@@ -1516,8 +1516,8 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column5.Frozen = true;
             this.Column5.HeaderText = "工　種・品　名";
             this.Column5.Name = "Column5";
@@ -1527,8 +1527,8 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column6.Frozen = true;
             this.Column6.HeaderText = "内　容　内　訳";
             this.Column6.Name = "Column6";
@@ -1538,10 +1538,11 @@
             // 
             // Column7
             // 
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle19.Format = "N0";
-            dataGridViewCellStyle19.NullValue = null;
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle8.Format = "N0";
+            dataGridViewCellStyle8.NullValue = null;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle8;
+            this.Column7.Frozen = true;
             this.Column7.HeaderText = "数　量";
             this.Column7.Name = "Column7";
             this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1550,8 +1551,9 @@
             // 
             // Column8
             // 
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle9;
+            this.Column8.Frozen = true;
             this.Column8.HeaderText = "単　位";
             this.Column8.Name = "Column8";
             this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1560,8 +1562,9 @@
             // 
             // Column11
             // 
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column11.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column11.DefaultCellStyle = dataGridViewCellStyle10;
+            this.Column11.Frozen = true;
             this.Column11.HeaderText = "単　価";
             this.Column11.Name = "Column11";
             this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1570,8 +1573,9 @@
             // 
             // Column12
             // 
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle11;
+            this.Column12.Frozen = true;
             this.Column12.HeaderText = "金　額";
             this.Column12.Name = "Column12";
             this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1612,7 +1616,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);
@@ -1624,6 +1627,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
+            this.TabCollections.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1724,6 +1728,15 @@
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private CustomControls.GroupBoxEx groupBox5;
+        private System.Windows.Forms.TextBox textBox3;
+        private System.Windows.Forms.Label label20;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.Button btnPageDelete;
+        private System.Windows.Forms.Button btnChangeCompany;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
@@ -1734,14 +1747,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
-        private CustomControls.GroupBoxEx groupBox5;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.ComboBox comboBox1;
-        private System.Windows.Forms.ComboBox comboBox2;
-        private System.Windows.Forms.Button btnPageDelete;
-        private System.Windows.Forms.Button btnChangeCompany;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 95)
@@ -438,6 +438,7 @@
 
                 int SourceCode = 0;
                 int CompanyCode = 0;
+                int LineNo = 0;
                 int brkSourceCode = 0;
                 bool bFirstCode = true;
                 bool bFirstCompany = true;
@@ -445,6 +446,7 @@
                 {
                     SourceCode = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.SourceCode]);
                     CompanyCode = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.CompanyCode]);
+                    LineNo = CommonMotions.cnvInt(CurRec[(int)FrmOrderEntryList.ReadDBColumn.LedgerLine]);
                     // 工事番号のセット
                     if (brkSourceCode != SourceCode)
                     {
@@ -466,7 +468,7 @@
                     // 会社番号のセット
                     if (!bFirstCompany) strSQL += " OR";
 
-                    strSQL += string.Format(" COMPANYCODE = {0}", CompanyCode);
+                    strSQL += string.Format(" (COMPANYCODE = {0} AND LINECOUNT = {1})", CompanyCode, LineNo);
                     
                     bFirstCompany = false;
                 }
@@ -486,18 +488,16 @@
         /// <returns></returns>
         private bool CreateNewOrderData()
         {
-            //IOConstructionBudgetDetail DetailDB = new IOConstructionBudgetDetail();
             IOConstructionLedgerDetail DetailDB = new IOConstructionLedgerDetail();
             IOPurchaseOrder OrderDB = new IOPurchaseOrder();
             try
             {
-                //if (m_DetailList.Count == 0) return false;
+                if (m_DetailList.Count == 0) return false;
 
                 // 対象データSQL作成
                 string strSQL = string.Empty;
                 CreateNewDataSQL(ref strSQL);
                 // 工事詳細台帳データ読込
-                //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;
@@ -510,9 +510,7 @@
                 bool binit = true;
                 int Break_CompanyCode = 0;
                 double Break_Total = 0;
-                //List<ConstructionBudgetDetail> SumBuffer = new List<ConstructionBudgetDetail>();
                 List<ConstructionLedgerDetail> SumBuffer = new List<ConstructionLedgerDetail>();
-                //foreach (ConstructionBudgetDetail DetailRec in DetailList)
                 foreach (ConstructionLedgerDetail DetailRec in DetailList)
                 {
                     // 1件目はバッファへセットして処理しない
@@ -606,7 +604,6 @@
         /// </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<ConstructionLedgerDetail> DetailList, int PageCount)
         {
             try
@@ -893,6 +890,7 @@
                     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;                            // 元工事番号
+                    GetRow.Cells[(int)DispDetailGridColumn.LedgerLine].Value = DetailRec.SourceLineCnt;                         // 元台帳行番号
 
                     // 金額集計
                     PriceValueValue += DetailRec.OrdersLinePrice;
@@ -938,10 +936,13 @@
             {
                 LedgerOrderPrice.Clear();
 
-                string strSQL = "SELECT COMPANYCODE, SUM(EXECUTIONAMOUNT) FROM CONSTRUCTIONLEDGERDETAIL";
-                strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
-                strSQL += string.Format(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
-                strSQL += " GROUP BY COMPANYCODE ORDER BY COMPANYCODE";
+                string strSQL = "SELECT A.COMPANYCODE, SUM(A.EXECUTIONAMOUNT)";
+                strSQL += " FROM CONSTRUCTIONLEDGERDETAIL A";
+                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
+                strSQL += string.Format(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
+                strSQL += string.Format(" AND A.PURCHASEORDERFLG = {0}", (int)CommonDefine.PurchaseOrderFlg.Making);
+                
+                strSQL += " GROUP BY A.COMPANYCODE ORDER BY A.COMPANYCODE";
                 ArrayList arList = new ArrayList();
                 LedgerDDB.ExecuteReader(strSQL, ref arList);
                 foreach (object[] objRec in arList)
@@ -1544,7 +1545,9 @@
                     DataGridViewRow GetRow = DataTab.Group1DataGridView.Rows[i];
                     // 文字が設定されていない場合は無効行
                     if (CommonMotions.cnvString(GetRow.Cells[(int)DispDetailGridColumn.FirstName].Value).Length == 0 &&
-                        CommonMotions.cnvString(GetRow.Cells[(int)DispDetailGridColumn.SecondName].Value).Length == 0) continue;
+                        CommonMotions.cnvString(GetRow.Cells[(int)DispDetailGridColumn.SecondName].Value).Length == 0 &&
+                        CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.Quantity].Value) == 0 &&
+                        CommonMotions.cnvDouble(GetRow.Cells[(int)DispDetailGridColumn.PriceValue].Value) == 0) continue;
 
                     PurchaseOrderDetail DatailRec = new PurchaseOrderDetail();
                     DatailRec.ConstructionCode = m_ConstructionCode;	                                                            // 工事番号
@@ -1560,6 +1563,7 @@
                     DatailRec.UnitPrice = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.UnitPrice].Value);	        // 単価
                     DatailRec.OrdersLinePrice = CommonMotions.cnvDouble(GetRow.Cells[(int)DispDetailGridColumn.PriceValue].Value);  // 金額
                     DatailRec.SourceCode = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.SourceCode].Value);          // 元工事番号
+                    DatailRec.SourceLineCnt = CommonMotions.cnvInt(GetRow.Cells[(int)DispDetailGridColumn.LedgerLine].Value);       // 元台帳行番号
 
                     // データ書込み
                     if (!DetailDB.InsertAction(DatailRec, false)) return false;
@@ -1677,7 +1681,7 @@
                     strSQL += string.Format(" AND COMPANYCODE = {0}", DataTab.OrderCompanyCode);
                     //strSQL += string.Format(" AND EXECUTIONAMOUNT = {0}", PriceVal);
                     if (LedgerLine != 0) strSQL += string.Format(" AND LINECOUNT = {0}", LedgerLine);
-                    if (!LDetailDB.UpdateFeild(strSQL, TargetField, 1, false))
+                    if (!LDetailDB.UpdateFeild(strSQL, TargetField, (int)CommonDefine.PurchaseOrderFlg.Making, false))
                     {
                         LogicalErrorMessage("注文書データ：注文書作成フラグ更新に失敗しました。", "更新エラー", CommonMotions.GetMethodName());
                         return false;
@@ -1745,20 +1749,25 @@
                 OrderDB.connect(); OrderDB.beginTran();
                 DetailDB.connect(); DetailDB.beginTran();
 
-                // 削除する
-                string strDel = OrderDB.CreatePrimarykeyString(m_ConstructionCode);
-                if (!OrderDB.DeleteAction(strDel, false))
+                for (int i = 0; i < m_TabPageList.Count; i++)
                 {
-                    OrderDB.rollback();
-                    return false;
+                    PurchaseOrderInputPage DataTab = m_TabPageList[i];
+                    int SeqCnt = DataTab.SeqNo;
+
+                    // 削除する
+                    string strDel = OrderDB.CreatePrimarykeyString(m_ConstructionCode, SeqCnt);
+                    if (!OrderDB.DeleteAction(strDel, false))
+                    {
+                        OrderDB.rollback();
+                        return false;
+                    }
+                    if (!DetailDB.DeleteAction(strDel, false))
+                    {
+                        OrderDB.rollback();
+                        DetailDB.rollback();
+                        return false;
+                    }
                 }
-                if (!DetailDB.DeleteAction(strDel, false))
-                {
-                    OrderDB.rollback();
-                    DetailDB.rollback();
-                    return false;
-                }
-
                 OrderDB.commit();
                 DetailDB.commit();
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.designer.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.designer.cs	(nonexistent)
@@ -1,248 +0,0 @@
-﻿using ProcessManagement.Forms.CustomControls;
-
-namespace ProcessManagement.Forms.Master
-{
-    partial class FrmConstructionType
-    {
-        /// <summary>
-        /// 必要なデザイナ変数です。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 使用中のリソースをすべてクリーンアップします。
-        /// </summary>
-        /// <param name="disposing">マネージ リソースが破棄される場合 true、破棄されない場合は false です。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows フォーム デザイナで生成されたコード
-
-        /// <summary>
-        /// デザイナ サポートに必要なメソッドです。このメソッドの内容を
-        /// コード エディタで変更しないでください。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.btnDataEntry = new System.Windows.Forms.Button();
-            this.btnLineEntry = new System.Windows.Forms.Button();
-            this.btnLineDelete = new System.Windows.Forms.Button();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.lblTitile = new System.Windows.Forms.Label();
-            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnDispDown = new System.Windows.Forms.Button();
-            this.btnDispUp = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // btnDataEntry
-            // 
-            this.btnDataEntry.BackColor = System.Drawing.Color.Green;
-            this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(144, 650);
-            this.btnDataEntry.Name = "btnDataEntry";
-            this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
-            this.btnDataEntry.TabIndex = 1;
-            this.btnDataEntry.Text = "登　録";
-            this.btnDataEntry.UseVisualStyleBackColor = false;
-            this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
-            // 
-            // btnLineEntry
-            // 
-            this.btnLineEntry.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            this.btnLineEntry.Location = new System.Drawing.Point(272, 650);
-            this.btnLineEntry.Name = "btnLineEntry";
-            this.btnLineEntry.Size = new System.Drawing.Size(120, 30);
-            this.btnLineEntry.TabIndex = 2;
-            this.btnLineEntry.Text = "追　加";
-            this.btnLineEntry.UseVisualStyleBackColor = false;
-            this.btnLineEntry.Click += new System.EventHandler(this.btnLineEntry_Click);
-            // 
-            // btnLineDelete
-            // 
-            this.btnLineDelete.BackColor = System.Drawing.Color.Red;
-            this.btnLineDelete.ForeColor = System.Drawing.Color.White;
-            this.btnLineDelete.Location = new System.Drawing.Point(400, 650);
-            this.btnLineDelete.Name = "btnLineDelete";
-            this.btnLineDelete.Size = new System.Drawing.Size(120, 30);
-            this.btnLineDelete.TabIndex = 3;
-            this.btnLineDelete.Text = "削　除";
-            this.btnLineDelete.UseVisualStyleBackColor = false;
-            this.btnLineDelete.Click += new System.EventHandler(this.btnLineDelete_Click);
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(528, 650);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 4;
-            this.btnEnd.Text = "終　了";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // lblTitile
-            // 
-            this.lblTitile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.lblTitile.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblTitile.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblTitile.ForeColor = System.Drawing.Color.Black;
-            this.lblTitile.Location = new System.Drawing.Point(100, 10);
-            this.lblTitile.Name = "lblTitile";
-            this.lblTitile.Size = new System.Drawing.Size(500, 20);
-            this.lblTitile.TabIndex = 6;
-            this.lblTitile.Text = "工事種別マスタメンテナンス";
-            this.lblTitile.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // dgvMaster
-            // 
-            this.dgvMaster.AllowUserToAddRows = false;
-            this.dgvMaster.AllowUserToDeleteRows = false;
-            this.dgvMaster.AllowUserToResizeColumns = false;
-            this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column1,
-            this.Column2,
-            this.Column3,
-            this.Column5});
-            this.dgvMaster.Location = new System.Drawing.Point(8, 40);
-            this.dgvMaster.Name = "dgvMaster";
-            this.dgvMaster.RowHeadersWidth = 20;
-            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 21;
-            this.dgvMaster.Size = new System.Drawing.Size(640, 602);
-            this.dgvMaster.TabIndex = 0;
-            this.dgvMaster.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellEnter);
-            this.dgvMaster.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellValueChanged);
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "№";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Column2
-            // 
-            this.Column2.Frozen = true;
-            this.Column2.HeaderText = "名称コード";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.Visible = false;
-            // 
-            // Column3
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "名　  称";
-            this.Column3.MaxInputLength = 50;
-            this.Column3.Name = "Column3";
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 500;
-            // 
-            // Column5
-            // 
-            this.Column5.HeaderText = "NewFlg";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Visible = false;
-            // 
-            // btnDispDown
-            // 
-            this.btnDispDown.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDispDown.Location = new System.Drawing.Point(653, 300);
-            this.btnDispDown.Name = "btnDispDown";
-            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
-            this.btnDispDown.TabIndex = 10;
-            this.btnDispDown.Text = "▼";
-            this.btnDispDown.UseVisualStyleBackColor = true;
-            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
-            // 
-            // btnDispUp
-            // 
-            this.btnDispUp.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDispUp.Location = new System.Drawing.Point(653, 236);
-            this.btnDispUp.Name = "btnDispUp";
-            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
-            this.btnDispUp.TabIndex = 9;
-            this.btnDispUp.Text = "▲";
-            this.btnDispUp.UseVisualStyleBackColor = true;
-            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
-            // 
-            // FrmConstructionType
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(700, 687);
-            this.Controls.Add(this.btnDispDown);
-            this.Controls.Add(this.btnDispUp);
-            this.Controls.Add(this.lblTitile);
-            this.Controls.Add(this.btnDataEntry);
-            this.Controls.Add(this.btnLineEntry);
-            this.Controls.Add(this.btnLineDelete);
-            this.Controls.Add(this.btnEnd);
-            this.Controls.Add(this.dgvMaster);
-            this.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
-            this.KeyPreview = true;
-            this.MaximizeBox = false;
-            this.Name = "FrmConstructionType";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmConstructionType_FormClosing);
-            this.Load += new System.EventHandler(this.FrmConstructionType_Load);
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmConstructionType_KeyDown);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridViewEX dgvMaster;
-        private System.Windows.Forms.Button btnDataEntry;
-        private System.Windows.Forms.Button btnLineEntry;
-        private System.Windows.Forms.Button btnLineDelete;
-        private System.Windows.Forms.Button btnEnd;
-        private System.Windows.Forms.Label lblTitile;
-        private System.Windows.Forms.Button btnDispDown;
-        private System.Windows.Forms.Button btnDispUp;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-    }
-}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.cs	(nonexistent)
@@ -1,782 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-
-using 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.SubForms;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.ControlsAction;
-//*------------------------ 工事種別メンテ画面 ------------------------------*
-//  2015/11/07  Ver1.0.0.0      Create Source           
-//
-//
-//
-//*----------------------------------------------------------------------------*
-namespace ProcessManagement.Forms.Master
-{
-    public partial class FrmConstructionType : Form
-    {
-        #region 使用定義
-        //log4netログを使用する
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region 定数
-        /// <summary>
-        /// 表示カラム
-        /// </summary>
-        private enum DispColumn
-        {
-            No = 0,
-            TypeCode,
-            NameString,
-            NewFlg,
-        }
-
-        /// <summary>
-        /// マスタリストMAXライン
-        /// </summary>
-        private const int s_ListMaxLineCount = 53;
-        #endregion
-
-        #region 変数
-        /// <summary>
-        /// フィールド値変化フラグ
-        /// </summary>
-        private bool m_bChengeAns = false;
-
-        /// <summary>
-        /// 初期時グリッドカウント
-        /// </summary>
-        private int m_initDataCount = 0;
-
-        /// <summary>
-        /// 名称キー
-        /// </summary>
-        private int m_NameCode = 0;
-        /// <summary>
-        /// ダイアログ使用時フラグ
-        /// </summary>
-        private bool m_DialogFlg = false;
-        #endregion
-
-        #region プロパティ
-        /// <summary>
-        /// ダイアログ使用時フラグ
-        /// </summary>
-        public bool DialogUsed
-        {
-            set { m_DialogFlg = value; }
-        }
-        /// <summary>
-        /// 名称コード
-        /// </summary>
-        public int NameCode
-        {
-            get { return m_NameCode; }
-            set { m_NameCode = value; }
-        }
-        #endregion
-
-        #region コンストラクタ
-        public FrmConstructionType()
-        {
-            InitializeComponent();
-        }
-        #endregion
-        #region デストラクタ
-        ~FrmConstructionType()
-        {
-            try
-            {
-                GC.Collect();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region イベントメソッド
-        /// <summary>
-        /// ×ボタン押下処理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmConstructionType_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (m_bChengeAns)
-            {
-                if (MessageBox.Show("データに変更があります、登録せずに終了してよろしいですか？。", "終了確認"
-                                , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
-                {
-                    e.Cancel = true;
-                    return;
-                }
-            }
-            // 前プロセスに戻る
-            ClsExcute.BackProcess();
-        }
-        /// <summary>
-        /// 終了ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        /// <summary>
-        /// フォームロード
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmConstructionType_Load(object sender, EventArgs e)
-        {
-            // 初期表示
-            InitDataLoad();
-            // ダイアログ使用時
-            if (m_DialogFlg)
-            {
-                //フォームの幅だけを変更する
-                this.SetBounds(this.Left, this.Top, (this.Width - 40), this.Height, BoundsSpecified.Width);
-            }
-            // フォームサイズ固定
-            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
-        }
-
-        /// <summary>
-        /// 行データクリア
-        /// </summary>
-        /// <param name="iIndex">行カウント</param>
-        private void SetRowClearData(int iIndex, bool bfront = true)
-        {
-            // クリアデータセット
-            dgvMaster[(int)DispColumn.No, iIndex].Value = "0";
-            dgvMaster[(int)DispColumn.TypeCode, iIndex].Value = "";
-            dgvMaster[(int)DispColumn.NameString, iIndex].Value = "";
-            dgvMaster[(int)DispColumn.NewFlg, iIndex].Value = "1";
-
-        }
-        /// <summary>
-        /// グリッド採番処理
-        /// </summary>
-        private void LineReNumbering()
-        {
-            int icnt = 1;
-            foreach (DataGridViewRow r in dgvMaster.Rows)
-            {
-                if (CommonMotions.chkObjectIsNull(r.Cells[(int)DispColumn.NameString].Value)) continue;
-                if (r.Cells[(int)DispColumn.NameString].Value.ToString().Length == 0) continue;
-
-                // 表示されているものだけ採番
-                if (r.Visible)
-                    r.Cells[(int)DispColumn.No].Value = (icnt++).ToString();
-                else
-                    r.Cells[(int)DispColumn.No].Value = "0";
-            }
-        }
-        /// <summary>
-        /// 行追加ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnLineEntry_Click(object sender, EventArgs e)
-        {
-            // 行がない場合は作成して抜ける
-            if (dgvMaster.Rows.Count == 0)
-            {
-                if (MessageBox.Show("行を追加します", "追加確認"
-                                    , MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.Cancel) return;
-
-                // 行追加
-                dgvMaster.Rows.Add();
-                // クリアデータセット
-                SetRowClearData(0);
-                // №再採番
-                LineReNumbering();
-                //　変更フラグOn
-                valueChange(sender, e);
-                // フォーカス移動
-                dgvMaster.Focus();
-                return;
-            }
-
-            // メッセージ表示
-            BtnTextCustomMessageBox msg = new BtnTextCustomMessageBox();
-            msg.ButtonText.No = "前へ追加";
-            msg.ButtonText.Yes = "後へ追加";
-            msg.ButtonText.Cancel = "キャンセル";
-            DialogResult resRet = msg.Show("行の前・後を選択してください。", "追加確認"
-                                            , MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information);
-
-            // キャンセルは処理しない
-            if (resRet == DialogResult.Cancel) return;
-
-            // カレント行取得
-            int iIndex = dgvMaster.CurrentRow.Index;
-
-            // 最終行
-            if (iIndex == dgvMaster.RowCount - 1)
-            {
-                if (resRet == DialogResult.No)
-                {
-                    // 前
-                    dgvMaster.Rows.Insert(iIndex);
-                }
-                else if (resRet == DialogResult.Yes)
-                {
-                    // 後
-                    dgvMaster.Rows.Add();
-                    iIndex = (dgvMaster.RowCount - 1);
-                }
-            }
-            else
-            {
-                if (resRet == DialogResult.Yes)
-                {
-                    // 後ろ
-                    ++iIndex;
-                }
-                dgvMaster.Rows.Insert(iIndex);
-            }
-
-            // クリアデータセット
-            if ((iIndex + 1) >= dgvMaster.Rows.Count)
-                SetRowClearData(iIndex, true);
-            else
-                SetRowClearData(iIndex, false);
-
-            // №再採番
-            LineReNumbering();
-
-            //　変更フラグOn
-            valueChange(sender, e);
-
-            // フォーカス移動
-            dgvMaster.Focus();
-            //dgvMaster.FirstDisplayedScrollingRowIndex = iIndex;
-            //dgvMaster.CurrentCell = dgvMaster[0, iIndex];
-        }
-
-        /// <summary>
-        /// フィールド値変更フラグ
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void valueChange(object sender, EventArgs e)
-        {
-            m_bChengeAns = true;
-        }
-
-        /// <summary>
-        /// セル値変化
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellValueChanged(object sender, DataGridViewCellEventArgs e)
-        {
-            // インデックス外は処理しない
-            if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
-            // null値は処理しない
-            if (CommonMotions.chkObjectIsNull(dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].Value)) return;
-
-            dgvMaster.Rows[e.RowIndex].Cells[e.ColumnIndex].ToolTipText
-                = ((DataGridView)sender).Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
-            
-            // 変更フラグON
-            m_bChengeAns = true;
-        }
-        /// <summary>
-        /// 行削除ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnLineDelete_Click(object sender, EventArgs e)
-        {
-            
-            IOMConstructionType ctDB = new IOMConstructionType();
-            IOMConstructionSpecUnitPrice csuDB = new IOMConstructionSpecUnitPrice();
-            try
-            {
-                if (CommonMotions.chkCellBlank(dgvMaster.CurrentRow.Cells[(int)DispColumn.NameString].Value)) return;
-
-                if (MessageBox.Show("選択した行データを削除します。", "削除確認"
-                    , MessageBoxButtons.YesNo, MessageBoxIcon.Information) != DialogResult.Yes) return;
-
-
-                // 表示行退避
-                int iIndex = dgvMaster.FirstDisplayedScrollingRowIndex;
-
-                ctDB.connect(); ctDB.beginTran();
-                csuDB.connect(); csuDB.beginTran();
-
-                int TypeCode = CommonMotions.cnvInt(dgvMaster.CurrentRow.Cells[(int)DispColumn.TypeCode].Value.ToString());
-                string strSQL = ctDB.CreatePrimarykeyString(TypeCode);
-                if (!ctDB.DeleteAction(strSQL, false))
-                {
-                    ctDB.rollback();
-                    MessageBox.Show("工事種別マスタ削除に失敗しました。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                strSQL = string.Format(" Where ConstructionTypeCode = {0}", TypeCode);
-                if (!csuDB.DeleteAction(strSQL, false))
-                {
-                    ctDB.rollback();
-                    csuDB.rollback();
-                    MessageBox.Show("作業単価マスタ削除に失敗しました。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                ctDB.commit();
-                csuDB.commit();
-
-                // データ表示
-                if (!DispGridData()) return;
-
-                // 表示行復元
-                dgvMaster.FirstDisplayedScrollingRowIndex = iIndex;
-
-                // 変更フラグOff
-                m_bChengeAns = false;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                ctDB.close(); ctDB = null;
-                csuDB.close(); csuDB = null;
-            }
-        }
-
-        /// <summary>
-        /// 登録ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDataEntry_Click(object sender, EventArgs e)
-        {
-            //データ無は抜ける
-            if (dgvMaster.Rows.Count == 0) return;
-
-            try
-            {
-                //データチェック
-                if (!DispFeildCheck()) return;
-
-                if (MessageBox.Show("表示中のデータを登録します。", "登録確認"
-                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
-
-                // 表示行退避
-                int iIndex = dgvMaster.FirstDisplayedScrollingRowIndex;
-
-                // データ登録
-                ConstructionTypeMasterDataEntry();
-
-                // データ表示
-                if (!DispGridData()) return;
-
-                // 表示行復元
-                dgvMaster.FirstDisplayedScrollingRowIndex = iIndex;
-
-                // 変更フラグクリア
-                m_bChengeAns = false;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        /// <summary>
-        /// IMEのコントロール
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellEnter(object sender, DataGridViewCellEventArgs e)
-        {
-            try
-            {
-                DataGridView dgv = (DataGridView)sender;
-
-                if (dgv.CurrentCell.ReadOnly) return;
-
-                //列によってIMEのモードを変更する
-                if (dgv.Columns[e.ColumnIndex].Name.Equals("Column3"))
-                {
-                    dgv.ImeMode = ImeMode.On;
-                }
-                else
-                {
-                    dgv.ImeMode = ImeMode.Disable;
-                }
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// アップキー押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDispUp_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                // 先頭は処理しない
-                if (dgvMaster.CurrentRow.Index == 0) return;
-
-                int irowcnt = dgvMaster.CurrentRow.Index;
-                if (irowcnt == 0) return;
-                if (CommonMotions.chkObjectIsNull(dgvMaster.Rows[irowcnt - 1].Cells[(int)DispColumn.NameString].Value)) return;
-
-                // グリッドアップキー処理
-                DataGridViewAction.GridRowUpAction((DataGridView)dgvMaster, (int)DispColumn.TypeCode, (int)DispColumn.NewFlg);
-
-                m_bChengeAns = true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        /// <summary>
-        /// ダウンキー押下処理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDispDown_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                // 最終行は処理しない
-                if ((dgvMaster.CurrentRow.Index + 1) == dgvMaster.Rows.Count) return;
-
-                int irowcnt = dgvMaster.CurrentRow.Index;
-                if (CommonMotions.chkObjectIsNull(dgvMaster.Rows[irowcnt + 1].Cells[(int)DispColumn.NameString].Value)) return;
-                if (dgvMaster.Rows[irowcnt + 1].Cells[(int)DispColumn.NameString].Value.ToString() == "") return;
-
-                // グリッドダウンキー処理
-                DataGridViewAction.GridRowDownAction((DataGridView)dgvMaster, (int)DispColumn.TypeCode, (int)DispColumn.NewFlg);
-
-                m_bChengeAns = true;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// セルクリック
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellClick(object sender, DataGridViewCellEventArgs e)
-        {
-            dgvMaster_CellDoubleClick(sender, e);
-        }
-
-        /// <summary>
-        /// セルダブルクリック
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // ダイアログとして使用するとき以外は処理しない
-            if (!m_DialogFlg) return;
-
-            if (e.RowIndex < 0) return;
-
-            m_NameCode = int.Parse(dgvMaster.CurrentRow.Cells[(int)DispColumn.TypeCode].Value.ToString());
-
-            this.Close();
-        }
-
-        /// <summary>
-        /// Formキーダウン処理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmConstructionType_KeyDown(object sender, KeyEventArgs e)
-        {
-            // DataGridviewは処理しない
-            if (ActiveControl.Name.Equals("dgvMaster"))
-            {
-                // 最終行時の処理
-                GridLastLine();
-                return;
-            }
-        }
-        #endregion
-
-        #region プライベートメソッド
-        /// <summary>
-        /// 初期表示処理
-        /// </summary>
-        private void InitDataLoad()
-        {
-            try
-            {
-                // グリッドの行を0に戻す
-                dgvMaster.Rows.Clear();
-
-                // 初期表示
-                DispGridData();
-
-                // 初期時フラグ
-                m_bChengeAns = false;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 画面項目のチェック
-        /// </summary>
-        /// <returns></returns>
-        private bool DispFeildCheck()
-        {
-            bool bRet = true;
-            bool bAns = true;
-            try
-            {
-                foreach (DataGridViewRow r in dgvMaster.Rows)
-                {
-                    //名称
-                    bAns = true;
-                    if (CommonMotions.chkObjectIsNull(r.Cells[(int)DispColumn.NameString].Value)) continue;
-                    if (r.Cells[(int)DispColumn.NameString].Value.ToString().Length == 0) continue;
-
-                    // レングスチェック
-                    bAns = CommonMotions.chkStringLength(r.Cells[(int)DispColumn.NameString].Value.ToString(), 100);
-
-                    // 背景色変更
-                    CommonMotions.chgBackColor(r.Cells[(int)DispColumn.NameString], bAns);
-                    bRet &= bAns;
-                }
-
-                if (!bRet)
-                {
-                    MessageBox.Show("入力エラーがあります、確認してください。", "データ確認"
-                                                , MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-
-                return bRet;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-      }
-
-        /// <summary>
-        /// 工事種別データ登録
-        /// </summary>
-        private void ConstructionTypeMasterDataEntry()
-        {
-            IOMConstructionType ctDB = new IOMConstructionType();
-            try
-            {
-                // 番号降り直し
-                int ino = 0;
-                foreach (DataGridViewRow r in dgvMaster.Rows)
-                {
-                    // 入力無は処理しない
-                    if (CommonMotions.chkObjectIsNull(r.Cells[(int)DispColumn.NameString].Value)) continue;
-                    // 番号セット
-                    r.Cells[(int)DispColumn.No].Value = (++ino).ToString();
-                }
-                //// 一括処理なので接続を行う
-                ctDB.connect();
-                ctDB.beginTran();
-
-                // データを画面より取得
-                foreach (DataGridViewRow r in dgvMaster.Rows)
-                {
-                    // 入力無は処理しない
-                    if (CommonMotions.chkObjectIsNull(r.Cells[(int)DispColumn.NameString].Value)) continue;
-                    if (r.Cells[(int)DispColumn.NameString].Value.ToString().Length == 0) continue;
-
-                    ConstructionTypeMaster ctRec = new ConstructionTypeMaster();
-
-                    // データセット
-                    ctRec.NameString = r.Cells[(int)DispColumn.NameString].Value.ToString();
-                    ctRec.DisplayOrder = int.Parse(r.Cells[(int)DispColumn.No].Value.ToString());
-                    ctRec.DeleteFlg = 0;
-
-                    // データセット
-                    if (CommonMotions.chkCellBlank(r.Cells[(int)DispColumn.TypeCode].Value))
-                    {
-                        // 新規時キーセット
-                        // 履歴がない場合は過去の最大値をとる
-                        ctRec.TypeCode = ctDB.SelectMaxCategoryHistoryCount(string.Empty, false) + 1;
-                    }
-                    else
-                    {
-                        ctRec.TypeCode = int.Parse(r.Cells[(int)DispColumn.TypeCode].Value.ToString());
-                    }
-                    ctRec.DisplayOrder = int.Parse(r.Cells[(int)DispColumn.No].Value.ToString());
-                    ctRec.NameString = r.Cells[(int)DispColumn.NameString].Value.ToString();
-
-                    // SQL作成
-                    string strSelect = ctDB.CreatePrimarykeyString(ctRec.TypeCode);
-                    List<ConstructionTypeMaster> ctList = new List<ConstructionTypeMaster>();
-                    // 業種マスタ取得
-                    if (!ctDB.SelectAction(strSelect, ref ctList, false))
-                    {
-                        ctDB.rollback();
-                        MessageBox.Show("登録確認に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        return;
-                    }
-
-                    if (ctList.Count == 0)
-                    {
-                        // データがない場合は追加
-                        ctList.Clear();
-                        ctList.Add(ctRec);
-
-                        // データ登録
-                        if (!ctDB.InsertAction(ctList, false))
-                        {
-                            ctDB.rollback();
-                            MessageBox.Show("登録に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        // データ登録
-                        if (!ctDB.UpdateAction(strSelect, ctRec, false))
-                        {
-                            ctDB.rollback();
-                            MessageBox.Show("更新に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                            return;
-                        }
-                    }
-                }
-
-                // 成功したらcommit
-                ctDB.commit();
-
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                ctDB.close();
-                ctDB = null;
-            }
-        }
-
-        /// <summary>
-        /// 名称マスタ表示
-        /// </summary>
-        /// <returns></returns>
-        private bool DispGridData()
-        {
-            IOMConstructionType cmDB = new IOMConstructionType();
-            List<ConstructionTypeMaster> cm = new List<ConstructionTypeMaster>();
-
-            try
-            {
-                // グリッドの行を0に戻す
-                dgvMaster.Rows.Clear();
-
-
-                // SQL作成
-                string strSQL = " Where DeleteFlg = 0 Order By DisplayOrder ASC";
-                // 表示順マスタ取得
-                if (!cmDB.SelectAction(strSQL, ref cm)) return false;
-
-                // データ表示
-                int icnt = 0;
-                foreach (ConstructionTypeMaster work in cm)
-                {
-                    dgvMaster.Rows.Add((icnt + 1)
-                                        , work.TypeCode
-                                        , work.NameString.ToString()
-                                        , 0);
-                    dgvMaster.Rows[icnt++].Cells[(int)DispColumn.NameString].ToolTipText = work.NameString.ToString();
-                }
-                // №再採番
-                LineReNumbering();
-
-                // 表示行が足りない場合は追加する
-                if (dgvMaster.Rows.Count <= CommonDefine.s_MaxInitLineCountMastamente)
-                {
-                    int iAddLine = CommonDefine.s_MaxInitLineCountMastamente - dgvMaster.Rows.Count;
-                    for (int i = 0; i < iAddLine; i++)
-                    {
-                        dgvMaster.Rows.Add();
-                    }
-                }
-
-                dgvMaster.Rows.Add();
-                // クリアデータセット
-                SetRowClearData(dgvMaster.Rows.Count - 1);
-
-                // 読込時データカウント取得
-                m_initDataCount = cm.Count;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                cmDB.close();
-                cmDB = null;
-            }
-        }
-
-        /// <summary>
-        /// グリッド最終行での処理
-        /// </summary>
-        private void GridLastLine()
-        {
-            // 最終行判定
-            if (dgvMaster.CurrentCell.RowIndex == dgvMaster.Rows.Count - 1)
-            {
-                // 最終列判定
-                if (dgvMaster.CurrentCell.ColumnIndex == (int)DispColumn.NameString)
-                {
-                    // 1行追加
-                    dgvMaster.Rows.Add();
-                    // クリアデータセット
-                    SetRowClearData(dgvMaster.Rows.Count - 1);
-                    // №再採番
-                    LineReNumbering();
-                }
-
-            }
-        }
-        #endregion
-    }
-}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.resx	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/_FrmConstructionType.resx	(nonexistent)
@@ -1,132 +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="Column1.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>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.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/Master/ConstructionType/FrmConstructionType.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.cs	(revision 95)
@@ -77,6 +77,7 @@
             TypeName,
             PublicFlg,
             EditMode,
+            DataSecRank,
         }
 
         /// <summary>
@@ -595,6 +596,7 @@
             m_dispControl[(int)DispCtrl.TypeName] = txtInput1;
             m_dispControl[(int)DispCtrl.PublicFlg] = cmbPublicFlg;
             m_dispControl[(int)DispCtrl.EditMode] = lblEditMode;
+            m_dispControl[(int)DispCtrl.DataSecRank] = cmbDataSecRank;
         }
         #endregion
 
@@ -626,6 +628,7 @@
                     lblTypeCode.Visible = true;
                 }
                 cmbPublicFlg.SelectedIndex = -1;
+                cmbDataSecRank.SelectedIndex = -1;
                 m_bChengeAns = false;
                 TypeExpensesVisible(false);
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 95)
@@ -4654,7 +4654,7 @@
 
                 // 工事基本情報取得
                 if (!cbiDB.ExecuteReader(strSQL, ref arData)) return;
-                if (arData.Count == 0) return;
+                //if (arData.Count == 0) return;
 
                 ProgressCompletionOfConstruction.Visible = true;
                 ProgressCompletionOfConstruction.Minimum = 0;
@@ -4671,6 +4671,87 @@
                 lblCompTotal03.Visible = false;
                 lblCompTotal04.Visible = false;
 
+                // グリッド表示
+                if (arData.Count != 0) DispCompOfConstrGrid(cbiDB, arData);
+
+                // 行や列を追加したり、セルに値を設定するときは、自動サイズ設定しない。
+                dgvCompletionOfConstruction.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None;
+                dgvCompletionOfConstruction.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.None;
+                dgvCompletionOfConstruction.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+
+                // ProgressBarの値を変更する
+                ProgressCompletionOfConstruction.Value = ProgressCompletionOfConstruction.Maximum;
+                ProgressCompletionOfConstruction.Update();
+                ProgressCompletionOfConstruction.Visible = false;
+
+                // 金額表示
+                long[] Total01 = CalcOrdersDecisionPrice((numUDCompletion.Value - 1));
+                long[] Total02 = CalcOrdersDecisionPrice(numUDCompletion.Value);
+                lblCompTotal01.Text = @"\" + (Total01[0] + Total01[1]).ToString("#,0") + "-";
+                lblCompTotal02.Text = @"\" + (Total02[0] + Total02[1]).ToString("#,0") + "-";
+                lblCompTotal03.Text = @"\" + Total02[0].ToString("#,0") + "-";
+                lblCompTotal04.Text = @"\" + Total02[1].ToString("#,0") + "-";
+
+                // 最高機密管理者のみ金額が表示される
+                bool bSelFlg = false;
+                // 新セキュリティデータ対応済みかを確認する
+                if (CommonMotions.LoginUserData.SecCode == 0)
+                {
+                    if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement ||
+                        CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key)
+                        bSelFlg = true;
+                }
+                else
+                {
+                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
+                        || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key)
+                        bSelFlg = true;
+                }
+
+                if (bSelFlg)
+                {
+                    lblCompTitle01.Visible = true;
+                    lblCompTitle02.Visible = true;
+                    lblCompTitle03.Visible = true;
+                    lblCompTitle04.Visible = true;
+                    lblCompTotal01.Visible = true;
+                    lblCompTotal02.Visible = true;
+                    lblCompTotal03.Visible = true;
+                    lblCompTotal04.Visible = true;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                // 読込時データカウント取得
+                if (CommonDefine.s_MaxInitLineCount > dgvCompletionOfConstruction.RowCount)
+                    dgvCompletionOfConstruction.RowCount += (CommonDefine.s_MaxInitLineCount - dgvCompletionOfConstruction.RowCount);
+                foreach (DataGridViewColumn wrkCol in dgvCompletionOfConstruction.Columns)
+                    wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
+
+                // グリッドソート実行
+                GridSortExcute(dgvCompletionOfConstruction);
+                dgvCompletionOfConstruction.ResumeLayout();
+
+                cbiDB.close(); cbiDB = null;
+                picDB.close(); picDB = null;
+            }
+        }
+        #endregion
+
+        #region 完了案件一覧グリッド表示
+        /// <summary>
+        /// 完了案件一覧グリッド表示
+        /// </summary>
+        /// <param name="cbiDB"></param>
+        /// <param name="arData"></param>
+        private void DispCompOfConstrGrid(IOConstructionBaseInfo cbiDB, ArrayList arData)
+        {
+            try
+            {
                 dgvCompletionOfConstruction.SuspendLayout();
 
                 // 1件目取得
@@ -4755,71 +4836,12 @@
                     ProgressCompletionOfConstruction.Value = ino++;
                     ProgressCompletionOfConstruction.Update();
                 }
-                // 行や列を追加したり、セルに値を設定するときは、自動サイズ設定しない。
-                dgvCompletionOfConstruction.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None;
-                dgvCompletionOfConstruction.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.None;
-                dgvCompletionOfConstruction.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 
-                // ProgressBarの値を変更する
-                ProgressCompletionOfConstruction.Value = ProgressCompletionOfConstruction.Maximum;
-                ProgressCompletionOfConstruction.Update();
-                ProgressCompletionOfConstruction.Visible = false;
-
-                // 金額表示
-                long[] Total01 = CalcOrdersDecisionPrice((numUDCompletion.Value - 1));
-                long[] Total02 = CalcOrdersDecisionPrice(numUDCompletion.Value);
-                lblCompTotal01.Text = @"\" + (Total01[0] + Total01[1]).ToString("#,0") + "-";
-                lblCompTotal02.Text = @"\" + (Total02[0] + Total02[1]).ToString("#,0") + "-";
-                lblCompTotal03.Text = @"\" + Total02[0].ToString("#,0") + "-";
-                lblCompTotal04.Text = @"\" + Total02[1].ToString("#,0") + "-";
-
-                // 最高機密管理者のみ金額が表示される
-                bool bSelFlg = false;
-                // 新セキュリティデータ対応済みかを確認する
-                if (CommonMotions.LoginUserData.SecCode == 0)
-                {
-                    if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement ||
-                        CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key)
-                        bSelFlg = true;
-                }
-                else
-                {
-                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
-                        || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key)
-                        bSelFlg = true;
-                }
-
-                if (bSelFlg)
-                {
-                    lblCompTitle01.Visible = true;
-                    lblCompTitle02.Visible = true;
-                    lblCompTitle03.Visible = true;
-                    lblCompTitle04.Visible = true;
-                    lblCompTotal01.Visible = true;
-                    lblCompTotal02.Visible = true;
-                    lblCompTotal03.Visible = true;
-                    lblCompTotal04.Visible = true;
-                }
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                // 読込時データカウント取得
-                if (CommonDefine.s_MaxInitLineCount > dgvCompletionOfConstruction.RowCount)
-                    dgvCompletionOfConstruction.RowCount += (CommonDefine.s_MaxInitLineCount - dgvCompletionOfConstruction.RowCount);
-                foreach (DataGridViewColumn wrkCol in dgvCompletionOfConstruction.Columns)
-                    wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
-
-                // グリッドソート実行
-                GridSortExcute(dgvCompletionOfConstruction);
-                dgvCompletionOfConstruction.ResumeLayout();
-
-                cbiDB.close(); cbiDB = null;
-                picDB.close(); picDB = null;
-            }
         }
         #endregion
 
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/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 94)
+++ trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 95)
@@ -33,6 +33,6 @@
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.9.9.19")]
+[assembly: AssemblyFileVersion("0.9.9.21")]
 // Log4netを使用する
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement.v12.suo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
