Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 114)
@@ -14,7 +14,7 @@
         /// <summary>
         /// 本体バージョン
         /// </summary>
-        public static int s_SystemVersion = 1;
+        public static int s_SystemVersion = 24;
 
         /// <summary>
         /// コピー・環境バージョン
Index: branches/src/ProcessManagement/ProcessManagement/Forms/CustomControls/MoveLabel.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/CustomControls/MoveLabel.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/CustomControls/MoveLabel.cs	(nonexistent)
@@ -1,172 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using Microsoft.VisualBasic.PowerPacks;
-
-namespace ProcessManagement.Forms.CustomControls
-{
-    public class MoveLabel : Label
-    {
-        #region 変数
-
-        /// <summary>
-        /// 引き出し線
-        /// </summary>
-        private LineShape m_MyLine = null;
-
-        /// <summary>
-        /// 線のコンテナ
-        /// </summary>
-        private ShapeContainer m_MyshapeContainer = null;
-
-        /// <summary>
-        /// 描画色
-        /// </summary>
-        private Color m_MyDrowColor = Color.White;
-
-        /// <summary>
-        /// 親のポイント
-        /// </summary>
-        private Point m_ParentPoint = new Point(0, 0);
-
-        /// <summary>
-        /// 自分の初期ポイント
-        /// </summary>
-        private Point m_MyDrowPoint = new Point(0, 0);
-        #endregion
-
-        #region プロパティ
-
-        /// <summary>
-        /// 親のポイント
-        /// </summary>
-        public Point ParentPoint
-        {
-            get { return m_ParentPoint; }
-            set { m_ParentPoint = value; }
-        }
-
-        /// <summary>
-        /// 描画色
-        /// </summary>
-        public Color DrowColor
-        {
-            get { return m_MyDrowColor; }
-            set { m_MyDrowColor = value; }
-        }
-
-        /// <summary>
-        /// 自分の初期ポイント
-        /// </summary>
-        public Point StartPoint
-        {
-            get { return m_MyDrowPoint; }
-            set { m_MyDrowPoint = value; }
-        }
-        #endregion
-
-        #region 線を描く
-        /// <summary>
-        /// 引き出し線を描く
-        /// </summary>
-        private void DrowLeadLine()
-        {
-            // ShapeContainerを探す
-            bool bFindContaner = false;
-            foreach (Control ctrl in this.Parent.Controls)
-            {
-                if (ctrl.GetType().Equals(typeof(ShapeContainer)))
-                {
-                    m_MyshapeContainer = (ShapeContainer)ctrl;
-                    bFindContaner = true;
-                    break;
-                }
-            }
-            // ShapeContainerが無い場合は作る
-            if (!bFindContaner)
-            {
-                m_MyshapeContainer = new ShapeContainer();
-                m_MyshapeContainer.Parent = this.Parent;
-            }
-            // 線を描く
-            m_MyLine = new LineShape();
-            m_MyLine.Parent = m_MyshapeContainer;
-            m_MyLine.StartPoint = m_ParentPoint;
-            m_MyLine.EndPoint = this.Location;
-            m_MyLine.BorderColor = m_MyDrowColor;
-        }
-        #endregion
-
-        #region フォームに登録された時点で親フォーム取得
-        /// <summary>
-        /// OnParentChanged
-        /// </summary>
-        /// <param name="e"></param>
-        protected override void OnParentChanged(EventArgs e)
-        {
-            // ラベルのプロパティ
-            this.BackColor = m_MyDrowColor;
-
-            // 線を描く
-            DrowLeadLine();
-        }
-        #endregion
-
-        #region マウスイベント
-        /// <summary>
-        /// 移動フラグ
-        /// </summary>
-        private bool m_isDraggable = false;
-        /// <summary>
-        /// 描画ポイント
-        /// </summary>
-        private Point m_point;
-        /// <summary>
-        /// マウスダウン
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected override void OnMouseDown(MouseEventArgs e)
-        {
-            m_isDraggable = true;
-            m_point.X = e.X;
-            m_point.Y = e.Y;
-        }
-        /// <summary>
-        /// マウスムーヴ
-        /// </summary>
-        /// <param name="e"></param>
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            // マウスダウン時以外は処理しない
-            if (!m_isDraggable) return;
-
-            //移動処理
-            this.Left += e.X - m_point.X;
-            this.Top += e.Y - m_point.Y;
-
-            // 線も同時に移動する
-            int LineX = m_MyLine.EndPoint.X;
-            int LineY = m_MyLine.EndPoint.Y;
-            LineX += e.X - m_point.X;
-            LineY += e.Y - m_point.Y;
-            m_MyLine.EndPoint = new Point(LineX, LineY);
-        }
-        /// <summary>
-        /// マウスアップ
-        /// </summary>
-        /// <param name="e"></param>
-        protected override void OnMouseUp(MouseEventArgs e)
-        {
-            m_isDraggable = false;
-        }
-        #endregion
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/_FrmPurchaseOrderPrint.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/_FrmPurchaseOrderPrint.Designer.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/_FrmPurchaseOrderPrint.Designer.cs	(nonexistent)
@@ -1,550 +0,0 @@
-﻿namespace ProcessManagement.Forms.DataEntry
-{
-    partial class FrmPurchaseOrderPrint
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            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();
-            this.label1 = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
-            this.lblLabel01 = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label16 = new System.Windows.Forms.Label();
-            this.lblConstructionCodelabel = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.lblLabel03 = new System.Windows.Forms.Label();
-            this.lblLabel02 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.lblLabel04 = new System.Windows.Forms.Label();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.btnPrint = new System.Windows.Forms.Button();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.PrintProgress = new System.Windows.Forms.ProgressBar();
-            this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.panel1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(422, 10);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(500, 20);
-            this.label1.TabIndex = 7;
-            this.label1.Text = "注　　文　　書　　印　　刷";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // panel1
-            // 
-            this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.lblLabel01);
-            this.panel1.Controls.Add(this.label17);
-            this.panel1.Controls.Add(this.label16);
-            this.panel1.Controls.Add(this.lblConstructionCodelabel);
-            this.panel1.Controls.Add(this.label3);
-            this.panel1.Controls.Add(this.lblLabel03);
-            this.panel1.Controls.Add(this.lblLabel02);
-            this.panel1.Controls.Add(this.label6);
-            this.panel1.Controls.Add(this.label14);
-            this.panel1.Controls.Add(this.label4);
-            this.panel1.Controls.Add(this.label9);
-            this.panel1.Controls.Add(this.label5);
-            this.panel1.Controls.Add(this.label7);
-            this.panel1.Controls.Add(this.label11);
-            this.panel1.Controls.Add(this.label8);
-            this.panel1.Controls.Add(this.lblLabel04);
-            this.panel1.Location = new System.Drawing.Point(7, 40);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1330, 108);
-            this.panel1.TabIndex = 8;
-            // 
-            // label2
-            // 
-            this.label2.BackColor = System.Drawing.Color.White;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(818, 36);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(253, 27);
-            this.label2.TabIndex = 53;
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // lblLabel01
-            // 
-            this.lblLabel01.BackColor = System.Drawing.Color.White;
-            this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblLabel01.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel01.Location = new System.Drawing.Point(134, 5);
-            this.lblLabel01.Name = "lblLabel01";
-            this.lblLabel01.Size = new System.Drawing.Size(115, 25);
-            this.lblLabel01.TabIndex = 52;
-            this.lblLabel01.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label17
-            // 
-            this.label17.BackColor = System.Drawing.Color.White;
-            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label17.ForeColor = System.Drawing.Color.Black;
-            this.label17.Location = new System.Drawing.Point(462, 71);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(350, 25);
-            this.label17.TabIndex = 47;
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label16
-            // 
-            this.label16.BackColor = System.Drawing.Color.SandyBrown;
-            this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label16.Location = new System.Drawing.Point(334, 71);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(120, 25);
-            this.label16.TabIndex = 46;
-            this.label16.Text = "工事種別";
-            this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblConstructionCodelabel
-            // 
-            this.lblConstructionCodelabel.BackColor = System.Drawing.Color.SandyBrown;
-            this.lblConstructionCodelabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblConstructionCodelabel.ForeColor = System.Drawing.Color.White;
-            this.lblConstructionCodelabel.Location = new System.Drawing.Point(8, 5);
-            this.lblConstructionCodelabel.Name = "lblConstructionCodelabel";
-            this.lblConstructionCodelabel.Size = new System.Drawing.Size(120, 25);
-            this.lblConstructionCodelabel.TabIndex = 30;
-            this.lblConstructionCodelabel.Text = "工事名称";
-            this.lblConstructionCodelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.SandyBrown;
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label3.Font = new System.Drawing.Font("ＭＳ 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label3.Location = new System.Drawing.Point(8, 38);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(120, 25);
-            this.label3.TabIndex = 33;
-            this.label3.Text = "施工及び納入場所";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblLabel03
-            // 
-            this.lblLabel03.BackColor = System.Drawing.Color.White;
-            this.lblLabel03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblLabel03.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel03.Location = new System.Drawing.Point(134, 38);
-            this.lblLabel03.Name = "lblLabel03";
-            this.lblLabel03.Size = new System.Drawing.Size(550, 25);
-            this.lblLabel03.TabIndex = 34;
-            this.lblLabel03.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // lblLabel02
-            // 
-            this.lblLabel02.BackColor = System.Drawing.Color.White;
-            this.lblLabel02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblLabel02.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel02.Location = new System.Drawing.Point(255, 5);
-            this.lblLabel02.Name = "lblLabel02";
-            this.lblLabel02.Size = new System.Drawing.Size(816, 25);
-            this.lblLabel02.TabIndex = 32;
-            this.lblLabel02.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label6
-            // 
-            this.label6.BackColor = System.Drawing.Color.SandyBrown;
-            this.label6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label6.Location = new System.Drawing.Point(1081, 71);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(120, 25);
-            this.label6.TabIndex = 35;
-            this.label6.Text = "注文書作成日";
-            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label14
-            // 
-            this.label14.BackColor = System.Drawing.Color.SandyBrown;
-            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label14.Location = new System.Drawing.Point(1081, 38);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(120, 25);
-            this.label14.TabIndex = 35;
-            this.label14.Text = "完　了　日";
-            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label4
-            // 
-            this.label4.BackColor = System.Drawing.Color.SandyBrown;
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.Location = new System.Drawing.Point(692, 38);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(120, 25);
-            this.label4.TabIndex = 35;
-            this.label4.Text = "発注書タイプ";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label9
-            // 
-            this.label9.BackColor = System.Drawing.Color.SandyBrown;
-            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label9.Location = new System.Drawing.Point(1081, 5);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(120, 25);
-            this.label9.TabIndex = 35;
-            this.label9.Text = "着　工　日";
-            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label5
-            // 
-            this.label5.BackColor = System.Drawing.Color.SandyBrown;
-            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label5.Location = new System.Drawing.Point(8, 71);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(120, 25);
-            this.label5.TabIndex = 35;
-            this.label5.Text = "工事担当者";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label7
-            // 
-            this.label7.BackColor = System.Drawing.Color.White;
-            this.label7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(1208, 71);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(114, 25);
-            this.label7.TabIndex = 36;
-            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label11
-            // 
-            this.label11.BackColor = System.Drawing.Color.White;
-            this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(1209, 38);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(114, 25);
-            this.label11.TabIndex = 36;
-            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label8
-            // 
-            this.label8.BackColor = System.Drawing.Color.White;
-            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(1209, 5);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(114, 25);
-            this.label8.TabIndex = 36;
-            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblLabel04
-            // 
-            this.lblLabel04.BackColor = System.Drawing.Color.White;
-            this.lblLabel04.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblLabel04.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel04.Location = new System.Drawing.Point(134, 71);
-            this.lblLabel04.Name = "lblLabel04";
-            this.lblLabel04.Size = new System.Drawing.Size(190, 25);
-            this.lblLabel04.TabIndex = 36;
-            this.lblLabel04.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1217, 656);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 53;
-            this.btnEnd.Text = "終　了";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // btnOtherProc
-            // 
-            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
-            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
-            this.btnOtherProc.Name = "btnOtherProc";
-            this.btnOtherProc.Size = new System.Drawing.Size(200, 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);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.BackColor = System.Drawing.Color.Red;
-            this.btnCancel.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(1089, 656);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(120, 30);
-            this.btnCancel.TabIndex = 97;
-            this.btnCancel.Text = "印刷中止";
-            this.btnCancel.UseVisualStyleBackColor = false;
-            this.btnCancel.Visible = false;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnPrint
-            // 
-            this.btnPrint.BackColor = System.Drawing.Color.Green;
-            this.btnPrint.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnPrint.ForeColor = System.Drawing.Color.White;
-            this.btnPrint.Location = new System.Drawing.Point(961, 656);
-            this.btnPrint.Name = "btnPrint";
-            this.btnPrint.Size = new System.Drawing.Size(120, 30);
-            this.btnPrint.TabIndex = 96;
-            this.btnPrint.Text = "印　刷";
-            this.btnPrint.UseVisualStyleBackColor = false;
-            this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
-            //this.groupBox2.BorderColor = System.Drawing.Color.Black;
-            this.groupBox2.Controls.Add(this.PrintProgress);
-            this.groupBox2.Controls.Add(this.dgvAllDisplay);
-            this.groupBox2.Location = new System.Drawing.Point(7, 154);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(1330, 483);
-            this.groupBox2.TabIndex = 0;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "発　注　先　一　覧";
-            // 
-            // PrintProgress
-            // 
-            this.PrintProgress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.PrintProgress.Location = new System.Drawing.Point(10, 434);
-            this.PrintProgress.Name = "PrintProgress";
-            this.PrintProgress.Size = new System.Drawing.Size(1310, 36);
-            this.PrintProgress.TabIndex = 22;
-            this.PrintProgress.Visible = false;
-            // 
-            // dgvAllDisplay
-            // 
-            this.dgvAllDisplay.AllowUserToAddRows = false;
-            this.dgvAllDisplay.AllowUserToDeleteRows = false;
-            this.dgvAllDisplay.AllowUserToResizeColumns = false;
-            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;
-            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.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn3,
-            this.Column5,
-            this.Column6,
-            this.Column1,
-            this.Column3,
-            this.Column2});
-            this.dgvAllDisplay.Location = new System.Drawing.Point(10, 22);
-            this.dgvAllDisplay.Name = "dgvAllDisplay";
-            this.dgvAllDisplay.RowHeadersVisible = false;
-            this.dgvAllDisplay.RowHeadersWidth = 20;
-            this.dgvAllDisplay.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvAllDisplay.RowTemplate.Height = 21;
-            this.dgvAllDisplay.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.dgvAllDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvAllDisplay.Size = new System.Drawing.Size(1310, 405);
-            this.dgvAllDisplay.TabIndex = 2;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridViewTextBoxColumn1.Frozen = true;
-            this.dataGridViewTextBoxColumn1.HeaderText = "№";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn1.Width = 40;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.Frozen = true;
-            this.dataGridViewTextBoxColumn3.HeaderText = "注文書枝番";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.Visible = false;
-            this.dataGridViewTextBoxColumn3.Width = 5;
-            // 
-            // Column5
-            // 
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle3;
-            this.Column5.Frozen = true;
-            this.Column5.HeaderText = "注文書番号";
-            this.Column5.Name = "Column5";
-            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 150;
-            // 
-            // Column6
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column6.Frozen = true;
-            this.Column6.HeaderText = "発注会社名";
-            this.Column6.Name = "Column6";
-            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column6.Width = 550;
-            // 
-            // Column1
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "発注金額";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 150;
-            // 
-            // Column3
-            // 
-            this.Column3.Frozen = true;
-            this.Column3.HeaderText = "支払条件";
-            this.Column3.Name = "Column3";
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 300;
-            // 
-            // Column2
-            // 
-            this.Column2.Frozen = true;
-            this.Column2.HeaderText = "印刷";
-            this.Column2.Name = "Column2";
-            // 
-            // FrmPurchaseOrderPrint
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1344, 692);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnPrint);
-            this.Controls.Add(this.btnOtherProc);
-            this.Controls.Add(this.btnEnd);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.groupBox2);
-            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 = "FrmPurchaseOrderPrint";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PurchaseOrderPrint_FormClosing);
-            this.Load += new System.EventHandler(this.PurchaseOrderPrint_Load);
-            this.panel1.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.Label lblConstructionCodelabel;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label lblLabel03;
-        private System.Windows.Forms.Label lblLabel02;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label lblLabel04;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btnEnd;
-        private System.Windows.Forms.Label lblLabel01;
-        private System.Windows.Forms.Button btnOtherProc;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.Label label2;
-        private CustomControls.DataGridViewEX dgvAllDisplay;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Button btnPrint;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn Column2;
-        private System.Windows.Forms.ProgressBar PrintProgress;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label7;
-    }
-}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/EditWord.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/EditWord.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/EditWord.cs	(nonexistent)
@@ -1,12 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProcessManagement.Forms.DataEntry.PurchaseOrderPrint
-{
-    class EditWord
-    {
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRegField.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRegField.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRegField.cs	(revision 114)
@@ -43,22 +43,6 @@
             ReadOnly,
         }
 
-        // 取得するデータ項目
-        private enum ClickGetData
-        {
-            RequestNo = 0,
-            OrderNo,
-            OrderersDivision,
-            OrderersCode,
-            BillCreationDate,
-            BillTotalPrice,
-            BillPrice,
-            TaxPrice,
-            DetailString,
-            PersonCode,
-            PersonName,
-            DepartmentCode,
-        }
         #endregion
 
         #region クラス定義
@@ -78,6 +62,8 @@
             public long DepositAmount { set; get; }
             public bool DeleteFlg { set; get; }
             public bool ReadOnly { set; get; }
+            public int SubPersonCode { set; get; }
+            public int InstructorPersonCode { set; get; } 
         }
         #endregion
 
@@ -390,6 +376,12 @@
                     return;
                 }
 
+                // 空文字も無視
+                if (dgv1[tcol, trow].Value == string.Empty)
+                {
+                    return;
+                }
+
                 int RequestNo = CommonMotions.cnvInt(dgv1[(int)ColumnIndex.RequestNo, trow].Value);
                 int OrderNo = CommonMotions.cnvInt(dgv1[(int)ColumnIndex.OrderNo, trow].Value);
 
@@ -605,7 +597,7 @@
                 dgv2.Rows.Clear();
 
                 // 金額行のフォーマットを指定
-                dgv1.Columns[(int)ColumnIndex.BillPrice].DefaultCellStyle.Format = "#,0";
+//                dgv1.Columns[(int)ColumnIndex.BillPrice].DefaultCellStyle.Format = "#,0";
                 dgv2.Columns[(int)ColumnIndex.BillPrice].DefaultCellStyle.Format = "#,0";
 
                 // 入金金額合計、他担当割り当て済み金額を算出
@@ -614,8 +606,9 @@
                 foreach(MyFieldData MyData in m_lstMyField)
                 {
                     TotalPrice += MyData.DepositAmount;
-                    if ((MyData.PersonCode != CommonMotions.LoginUserData.PersonCode) &&
-                        (MyData.PersonCode != 0))
+
+                    // 対象工事でない場合
+                    if( IsTargetConstruction( MyData ) == false )
                     {
                         OtherParsonPrice += MyData.DepositAmount;
                     }
@@ -635,7 +628,8 @@
 
                 foreach (MyFieldData MyData in m_lstMyField)
                 {
-                    if (MyData.PersonCode == CommonMotions.LoginUserData.PersonCode)
+                    // 対象工事の場合場合
+                    if( IsTargetConstruction( MyData ) == true )
                     {
                         // 各現場の行を追加
                         dgv1.Rows.Add(MyData.RequestNo, MyData.OrderNo, ++rowCount, MyData.ConstructionName, MyData.DepositAmount, MyData.ReadOnly);
@@ -865,6 +859,54 @@
         }
         #endregion
 
+        #region 対象工事が対象か判定する
+        private bool IsTargetConstruction(MyFieldData MyData)
+        {
+            // 不明行は対象外
+            if (MyData.RequestNo == 0)
+            {
+                return false;
+            }
+ 
+            // 保護区分ランクが特別権限の場合は全て対象
+            if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key)
+            {
+                return true;
+            }
 
+            // 保護区分範囲が自担当のみは担当分工事のみ
+            if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.None].Key)
+            {
+                if ((MyData.PersonCode == CommonMotions.LoginUserData.PersonCode)||
+                    (MyData.SubPersonCode == CommonMotions.LoginUserData.PersonCode)||
+                    (MyData.InstructorPersonCode == CommonMotions.LoginUserData.PersonCode))
+                {
+                    return true;
+                }
+            }
+            // 保護区分範囲が自部署のみは、部署コードが一致
+            else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.Only].Key)
+            {
+                if (MyData.DepartmentCode == CommonMotions.LoginUserData.DepartmentCode)
+                {
+                    return true;
+                }
+            }
+            else
+            {
+                // 担当者対象部署マスタに含まれるか判定                                
+                foreach( PersonDepartmentMaster Prsn in CommonMotions.LoginUserDepartment)
+                {
+                    if( MyData.DepartmentCode == Prsn.DepartmentCode )
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+        #endregion
+
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRequest.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRequest.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRequest.cs	(revision 114)
@@ -514,7 +514,7 @@
                 sql = new StringBuilder();
                 sql.Append("SELECT");
                 sql.Append(" ReqHead.RequestNo");                                               // 請求No
-                sql.Append(",0");                                                               // 受付番号（廃止予定）
+                sql.Append(",ReqHead.OrderNo");                                                 // 受付番号（廃止予定）
                 sql.Append(",ReqHead.OrderersDivision");                                        // 発注者区分
                 sql.Append(",ReqHead.OrderersCode");                                            // 発注者コード
                 sql.Append(",DATE_FORMAT(InvData.CretateDate, '%Y/%m/%d') as CreateDate ");     // 請求書作成日
@@ -578,7 +578,7 @@
                     dgv.Rows[LineCnt].Cells[(int)DispColumn.OrderersDivision].Value = CommonMotions.cnvInt(work[(int)ClickGetData.OrderersDivision]);
                     dgv.Rows[LineCnt].Cells[(int)DispColumn.OrderersCode].Value = CommonMotions.cnvInt(work[(int)ClickGetData.OrderersCode]);
                     dgv.Rows[LineCnt].Cells[(int)DispColumn.FieldName].Value = CommonMotions.cnvString(work[(int)ClickGetData.DetailString]);
-                    if (CommonMotions.cnvInt(work[(int)ClickGetData.OrderNo]) > 1 )
+                    if (CommonMotions.cnvInt(work[(int)ClickGetData.OrderNo]) > 1)
                     {
                         dgv.Rows[LineCnt].Cells[(int)DispColumn.FieldName].Value += "（" + CommonMotions.cnvInt(work[(int)ClickGetData.OrderNo]).ToString() + "回目）";
                     }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs	(revision 114)
@@ -647,6 +647,9 @@
                         PersonCode = depositDetail.ApprovalPersonCode,
                         DeleteFlg = false,
                         ReadOnly = depositDetail.IsApprovedByStaff,
+                        DepartmentCode = depositDetail.DepartmentCode,
+                        SubPersonCode = depositDetail.ConstrSubPersonCode,
+                        InstructorPersonCode = depositDetail.ConstructionInstructor,
                     });
                 }
                 // 不明行を渡す必要がある
@@ -1607,6 +1610,7 @@
                         // 更新
                         else
                         {
+                            depositDetail.Editted = true;
                             depositDetail.BillPrice = item.BillPrice;
                             depositDetail.TaxPrice = item.TaxPrice;
                             depositDetail.DepositAmount = item.DepositAmount;
@@ -1872,7 +1876,7 @@
                 sql.Append(" ,null");
                 sql.Append(" ,DepD.LineCount");
                 sql.Append(" ,ifnull(DepD.RequestNo, 0) as RequestNo");
-                sql.Append(" ,0 as OrderNo");
+                sql.Append(" ,ifnull(DepD.OrderNo, 0) as OrderNo");
                 sql.Append(" ,DepD.DepositAmount");
                 sql.Append(" ,ifnull(DepD.DiscountAmount, 0) as DiscountAmount");
                 sql.Append(" ,ifnull(DepD.CnstrPrice, 0) as CnstrPrice");
@@ -2159,7 +2163,7 @@
                 if (dgvMaster.Rows.Count > 0)
                 {
                     dgvMaster.FirstDisplayedScrollingRowIndex = 0;
-                    dgvMaster.FirstDisplayedScrollingColumnIndex = 1;
+                    dgvMaster.FirstDisplayedScrollingColumnIndex = 15;
                     dgvMaster.CurrentCell = dgvMaster[1, 0];
                 }
             }
@@ -3027,8 +3031,8 @@
                 // 特別権限は、無条件でボタン有効
                 if( m_UserInfo.m_Type == (int)CommonDefine.SecurityRankPos.SpecialAuthority)
                 {
-                    btnAddCmp.Enabled = false;
-                    btnDelCmp.Enabled = false;
+                    btnAddCmp.Enabled = true;
+                    btnDelCmp.Enabled = true;
                     btnAddFld.Enabled = true;
 
                     return;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.designer.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.designer.cs	(nonexistent)
@@ -1,217 +0,0 @@
-﻿using ProcessManagement.Forms.CustomControls;
-
-namespace ProcessManagement.Forms.SubForms
-{
-    partial class FrmMessageBoardInput
-    {
-        /// <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()
-        {
-            this.btnDataEntry = new System.Windows.Forms.Button();
-            this.btnDelete = new System.Windows.Forms.Button();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.cmbFrom = new System.Windows.Forms.ComboBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.cmbTo = new System.Windows.Forms.ComboBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.txtMessage = new System.Windows.Forms.TextBox();
-            this.lblMode = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // btnDataEntry
-            // 
-            this.btnDataEntry.BackColor = System.Drawing.Color.Green;
-            this.btnDataEntry.ForeColor = System.Drawing.Color.White;
-            this.btnDataEntry.Location = new System.Drawing.Point(279, 515);
-            this.btnDataEntry.Name = "btnDataEntry";
-            this.btnDataEntry.Size = new System.Drawing.Size(120, 30);
-            this.btnDataEntry.TabIndex = 4;
-            this.btnDataEntry.Text = "登　録";
-            this.btnDataEntry.UseVisualStyleBackColor = false;
-            this.btnDataEntry.Click += new System.EventHandler(this.btnDataEntry_Click);
-            // 
-            // btnDelete
-            // 
-            this.btnDelete.BackColor = System.Drawing.Color.Red;
-            this.btnDelete.ForeColor = System.Drawing.Color.White;
-            this.btnDelete.Location = new System.Drawing.Point(70, 515);
-            this.btnDelete.Name = "btnDelete";
-            this.btnDelete.Size = new System.Drawing.Size(120, 30);
-            this.btnDelete.TabIndex = 5;
-            this.btnDelete.Text = "削　除";
-            this.btnDelete.UseVisualStyleBackColor = false;
-            this.btnDelete.Visible = false;
-            this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(405, 515);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 6;
-            this.btnEnd.Text = "終　了";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // label1
-            // 
-            this.label1.BackColor = System.Drawing.Color.White;
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(25, 10);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(500, 20);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "掲示板データ入力";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // cmbFrom
-            // 
-            this.cmbFrom.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbFrom.FormattingEnabled = true;
-            this.cmbFrom.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.cmbFrom.Location = new System.Drawing.Point(119, 72);
-            this.cmbFrom.Name = "cmbFrom";
-            this.cmbFrom.Size = new System.Drawing.Size(406, 24);
-            this.cmbFrom.TabIndex = 0;
-            this.cmbFrom.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // label4
-            // 
-            this.label4.BackColor = System.Drawing.Color.RoyalBlue;
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.Location = new System.Drawing.Point(25, 72);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(86, 25);
-            this.label4.TabIndex = 8;
-            this.label4.Text = "誰だれ～";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label2
-            // 
-            this.label2.BackColor = System.Drawing.Color.RoyalBlue;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.Location = new System.Drawing.Point(25, 111);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 25);
-            this.label2.TabIndex = 8;
-            this.label2.Text = "～さんに";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // cmbTo
-            // 
-            this.cmbTo.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbTo.FormattingEnabled = true;
-            this.cmbTo.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.cmbTo.Location = new System.Drawing.Point(119, 111);
-            this.cmbTo.Name = "cmbTo";
-            this.cmbTo.Size = new System.Drawing.Size(406, 24);
-            this.cmbTo.TabIndex = 1;
-            this.cmbTo.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.RoyalBlue;
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label3.Location = new System.Drawing.Point(25, 155);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(86, 25);
-            this.label3.TabIndex = 8;
-            this.label3.Text = "伝言内容";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // txtMessage
-            // 
-            this.txtMessage.ImeMode = System.Windows.Forms.ImeMode.On;
-            this.txtMessage.Location = new System.Drawing.Point(119, 157);
-            this.txtMessage.Multiline = true;
-            this.txtMessage.Name = "txtMessage";
-            this.txtMessage.Size = new System.Drawing.Size(406, 345);
-            this.txtMessage.TabIndex = 3;
-            this.txtMessage.TextChanged += new System.EventHandler(this.valueChange);
-            // 
-            // lblMode
-            // 
-            this.lblMode.BackColor = System.Drawing.Color.White;
-            this.lblMode.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.lblMode.Location = new System.Drawing.Point(25, 38);
-            this.lblMode.Name = "lblMode";
-            this.lblMode.Size = new System.Drawing.Size(86, 25);
-            this.lblMode.TabIndex = 9;
-            this.lblMode.Text = "新規";
-            this.lblMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // FrmMessageBoardInput
-            // 
-            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(550, 557);
-            this.Controls.Add(this.lblMode);
-            this.Controls.Add(this.txtMessage);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.cmbTo);
-            this.Controls.Add(this.cmbFrom);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.btnDataEntry);
-            this.Controls.Add(this.btnDelete);
-            this.Controls.Add(this.btnEnd);
-            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 = "FrmMessageBoardInput";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMessageBoardInput_FormClosing);
-            this.Load += new System.EventHandler(this.FrmMessageBoardInput_Load);
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmMessageBoardInput_KeyDown);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnDataEntry;
-        private System.Windows.Forms.Button btnDelete;
-        private System.Windows.Forms.Button btnEnd;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.ComboBox cmbFrom;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.ComboBox cmbTo;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtMessage;
-        private System.Windows.Forms.Label lblMode;
-    }
-}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.cs	(nonexistent)
@@ -1,592 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.ControlsAction;
-
-namespace ProcessManagement.Forms.SubForms
-{
-    public partial class FrmEstimateDetailDiag : Form
-    {
-        #region ログ使用定義
-        //log4netログを使用する
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        
-        #region 定数
-        /// <summary>
-        /// 表示カラム
-        /// </summary>
-        private enum DispGridColumn
-        {
-            DisplayOrder = 0,
-            PageCount,
-            LineCount,
-            ComponentCode,
-            ItemCode,
-            WorkCode,
-            WorkName,
-            SpecName,
-            LineTotal,
-            sCheck,
-        }
-        #endregion
-
-        #region 変数
-        /// <summary>
-        /// 要素チェック
-        /// </summary>
-        private List<EstimateDataDetail> m_DetailArray_Input = new List<EstimateDataDetail>();
-        private List<EstimateDataDetail> m_DetailtArray_Output = new List<EstimateDataDetail>();
-
-        /// <summary>
-        /// 工事番号
-        /// </summary>
-        private int m_ConstructionCode = 0;
-        /// <summary>
-        /// 終了状態フラグ
-        /// </summary>
-        private DialogResult m_EndButton = DialogResult.None;
-
-        /// <summary>
-        /// 構成キー
-        /// </summary>
-        private int m_ComponentCode = 0;
-
-        /// <summary>
-        /// 工種キー
-        /// </summary>
-        private int m_ItemKey = 0;
-
-        /// <summary>
-        /// イベント抑制フラグ
-        /// </summary>
-        private bool m_bEventStop = true;
-        #endregion
-
-        #region プロパティ
-        /// <summary>
-        /// 構成要素
-        /// </summary>
-        public List<EstimateDataDetail> DetailArray
-        {
-            get { return m_DetailtArray_Output; }
-            set { m_DetailArray_Input = value; }
-        }
-        /// <summary>
-        /// 工事番号
-        /// </summary>
-        public int ConstructionCode
-        {
-            get { return m_ConstructionCode; }
-            set { m_ConstructionCode = value; }
-        }
-
-        /// <summary>
-        /// 終了ボタン状態
-        /// </summary>
-        public DialogResult EndButton
-        {
-            get { return m_EndButton; }
-        }
-        /// <summary>
-        /// 構成キー
-        /// </summary>
-        public int ComponentCode
-        {
-            get { return m_ComponentCode; }
-            set { m_ComponentCode = value; }
-        }
-
-        /// <summary>
-        /// 工種キー
-        /// </summary>
-        public int ItemKey
-        {
-            get { return m_ItemKey; }
-            set { m_ItemKey = value; }
-        }
-
-        #endregion
-
-        #region イベントメソッド
-        /// <summary>
-        /// フォーム初期化
-        /// </summary>
-        public FrmEstimateDetailDiag()
-        {
-            InitializeComponent();
-        }
-    
-        /// <summary>
-        /// フォームロード
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmCostStructureDiag_Load(object sender, EventArgs e)
-        {
-            // 初期表示
-            InitDataLoad();
-            // フォームサイズ固定
-            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
-        }
-
-        /// <summary>
-        /// 終了ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
-        {
-            m_EndButton = DialogResult.None;
-            Close();
-        }
-
-        /// <summary>
-        /// 選択ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnSelect_Click(object sender, EventArgs e)
-        {
-            // 選択
-            foreach (DataGridViewRow r in dgvMaster.Rows)
-            {
-                if ((bool)r.Cells[(int)DispGridColumn.sCheck].Value)
-                {
-                    // 空欄チェック
-                    if (!BlanckRowCheck(r)) continue;
-
-                    bool ExistFlg = false;
-                    // すでに存在するか
-                    ExistFlg = ChkDetailExist(CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.PageCount].Value.ToString()),
-                                                CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.LineCount].Value.ToString()));
-
-                    // 無ければ追加
-                    if (!ExistFlg)
-                    {
-                        EstimateDataDetail SetWork = new EstimateDataDetail();
-                        SetWork.ConstructionCode = m_ConstructionCode;	                                                            // 工事番号
-                        SetWork.PageCount = CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.PageCount].Value.ToString());          // ページ番号
-                        SetWork.LineCount = CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.LineCount].Value.ToString());          // 	行番号
-                        SetWork.ComponentCode = CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.ComponentCode].Value.ToString()); // 構成キー
-                        SetWork.ItemCode = CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.ItemCode].Value.ToString());            // 工種キー
-                        SetWork.WorkCode = CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.WorkCode].Value.ToString());            // 規格・寸法キー
-                        SetWork.ItemName = r.Cells[(int)DispGridColumn.WorkName].Value.ToString();                                  // 作業名称
-                        SetWork.WorkName = r.Cells[(int)DispGridColumn.SpecName].Value.ToString();                                  // 作業／品質・形状・寸法
-                        SetWork.LineTotal = CommonMotions.cnvInt(r.Cells[(int)DispGridColumn.LineTotal].Value.ToString());          // 金額
-
-                        m_DetailtArray_Output.Add(SetWork);
-                    }
-                }
-            }
-            // 選択無はエラー
-            if (m_DetailtArray_Output.Count == 0) return;
-
-            m_EndButton = DialogResult.OK;
-            Close();
-        }
-        /// <summary>
-        /// セルダブルクリック
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // 空白チェック
-            if (!BlanckRowCheck(dgvMaster.CurrentRow)) return;
-            // 一括チェックは処理しない
-            if (e.RowIndex < 0) return;
-
-            dgvMaster.CurrentRow.Cells[(int)DispGridColumn.sCheck].Value = !(bool)dgvMaster.CurrentRow.Cells[(int)DispGridColumn.sCheck].Value;
-        }
-
-        /// <summary>
-        /// セルクリック
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvMaster_CellClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // 一括チェック禁止は処理しない
-            if (!chkBoxAll.Enabled) return;
-
-            if (e.ColumnIndex == (int)DispGridColumn.sCheck && e.RowIndex == -1)
-            {
-                chkBoxAll.Checked = !chkBoxAll.Checked;
-
-                // すべての行のチェック状態を切り替える
-                foreach (DataGridViewRow row in this.dgvMaster.Rows)
-                {
-                    row.Cells[(int)DispGridColumn.sCheck].Value = chkBoxAll.Checked;
-                }
-            }
-        }
-        /// <summary>
-        /// 一括チェック
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void chkBoxAll_CheckedChanged(object sender, EventArgs e)
-        {
-            // すべての行のチェック状態を切り替える
-            foreach (DataGridViewRow row in this.dgvMaster.Rows)
-            {
-                // 空白チェック
-                if (!BlanckRowCheck(row)) return;
-
-                row.Cells[(int)DispGridColumn.sCheck].Value = chkBoxAll.Checked;
-            }
-        }
-
-        /// <summary>
-        /// アップキー押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDispUp_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                // グリッドアップキー処理
-                DataGridViewAction.GridRowUpAction((DataGridView)dgvMaster, (int)DispGridColumn.PageCount, (int)DispGridColumn.sCheck);
-            }
-            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
-            {
-                // グリッドダウンキー処理
-                DataGridViewAction.GridRowDownAction((DataGridView)dgvMaster, (int)DispGridColumn.PageCount, (int)DispGridColumn.sCheck);
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 工種コンボボックス選択変化時
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void cmbItemType_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (m_bEventStop) return;
-
-            try
-            {
-                // グリッド一覧表示処理
-                GridListDisplay();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 構成コンボボックス変化時
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void cmbStructureType_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (m_bEventStop) return;
-
-            int ikey = int.Parse(cmbStructureType.SelectedValue.ToString());
-            if (ikey < 1) return;
-
-            SetItemCombBox(ikey);
-        }
-
-        #endregion
-
-        #region プライベートメソッド
-        /// <summary>
-        /// 新しい行を作成する
-        /// </summary>
-        /// <param name="TergetRow">対象行</param>
-        private void CreateNewLine(ref int TergetRow)
-        {
-            try
-            {
-                // 後
-                dgvMaster.Rows.Add();
-                TergetRow = (dgvMaster.RowCount - 1);
-
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 初期表示処理
-        /// </summary>
-        private void InitDataLoad()
-        {
-            try
-            {
-                // 大項目を取り込む
-                CommonMotions.SetStructureName();
-
-                // グリッドの行を0に戻す
-                dgvMaster.Rows.Clear();
-
-                // コンボボックス初期処理
-                InitStructureCombBox();
-                SetItemCombBox();
-
-                m_bEventStop = false;
-
-                // グリッド一覧表示
-                //GridListDisplay();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-            }
-        }
-        /// <summary>
-        /// 初期表示処理
-        /// </summary>
-        private void GridListDisplay()
-        {
-            IOEstimateDataDetail etdDB = new IOEstimateDataDetail();
-            IOMComponent ComponentDB = new IOMComponent();
-            IOMConstructionItemOLD ItemDB = new IOMConstructionItemOLD();
-            try
-            {
-                // イベントストップ
-                m_bEventStop = true;
-
-                dgvMaster.Rows.Clear();
-
-                // ++++++++++++++++++++++++++++++++++++++++ 積算見積明細データ(作業)
-                List<EstimateDataDetail> SmallList = new List<EstimateDataDetail>();
-                // 積算見積データ取得
-                string strSQL = " A" + etdDB.CreatePrimarykeyString(m_ConstructionCode);
-                strSQL += string.Format(" And ConstructionCode = {0}", m_ConstructionCode);
-                strSQL += " And A.PageCount = (Select PageCount From EstimateDataBody";
-                strSQL += string.Format(" Where ConstructionCode = {0} And ComponentCode = {1} And ItemCode = {2})",
-                                                                m_ConstructionCode,
-                                                                cmbStructureType.SelectedValue.ToString(),
-                                                                cmbItemType.SelectedValue.ToString());
-                strSQL += " Order By A.LineCount";
-                if (!etdDB.SelectAction(strSQL, ref SmallList)) return;
-
-                // データ無は次処理
-                if (SmallList.Count == 0) return;
-                int INo = 1;
-                int icnt = 0;
-                foreach (EstimateDataDetail DataDetail in SmallList)
-                {
-                    // 読み飛ばし条件チェック（工種の明細は読み飛ばし）
-                    if (DataDetail.DataType == (int)CommonDefine.TabCotegory.Item)
-                    {
-                        if (DataDetail.ComponentCode != 0 && DataDetail.ItemCode != 0 && DataDetail.WorkCode == 0)
-                        {
-                            ConstructionItemOLDMaster wrkItem = new ConstructionItemOLDMaster();
-                            string ItemSQL = ItemDB.CreatePrimarykeyString(DataDetail.ComponentCode, DataDetail.ItemCode);
-                            bool bret = ItemDB.SelectAction(ItemSQL, ref wrkItem);
-                            if (bret == false) continue;
-                            // 直接入力以外は読み飛ばし
-                            if (wrkItem.SubitemsFlg == 1) continue;
-                        }
-                    }
-                    
-                    dgvMaster.Rows.Add(INo++,
-                                        DataDetail.PageCount,
-                                        DataDetail.LineCount,
-                                        DataDetail.ComponentCode,
-                                        DataDetail.ItemCode,
-                                        DataDetail.WorkCode,
-                                        DataDetail.ItemName,
-                                        DataDetail.WorkName,
-                                        DataDetail.LineTotal.ToString("#,0.##"),
-                                        false);
-                    dgvMaster.Rows[icnt].Cells[(int)DispGridColumn.WorkCode].ToolTipText = DataDetail.ItemName;
-                    dgvMaster.Rows[icnt].Cells[(int)DispGridColumn.SpecName].ToolTipText = DataDetail.WorkName;
-
-                    //データが選択済みならばチェックできない
-                    if (ChkDetailExist(DataDetail.PageCount, DataDetail.LineCount))
-                    {
-                        ((DataGridViewCheckBoxCell)dgvMaster.Rows[icnt].Cells[(int)DispGridColumn.sCheck]).Value = true;
-                        ((DataGridViewCheckBoxCell)dgvMaster.Rows[icnt].Cells[(int)DispGridColumn.sCheck]).ReadOnly = true;
-                    }
-                    icnt++;
-
-                }
-                // ++++++++++++++++++++++++++++++++++++++++ 積算見積明細データ(作業)
-
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                etdDB.close();
-                etdDB = null;
-
-                ComponentDB.close();
-                ComponentDB = null;
-
-                ItemDB.close();
-                ItemDB = null;
-
-                // イベントストップ解除
-                m_bEventStop = false;
-            }
-        }
-
-        /// <summary>
-        /// 選択済みデータがあればTrueを返す
-        /// </summary>
-        /// <param name="PageCnt"></param>
-        /// <returns></returns>
-        private bool ChkDetailExist(int PageCnt, int LineCnt)
-        {
-            foreach (EstimateDataDetail wrk in m_DetailArray_Input)
-            {
-                // あればtrue
-                if (wrk.PageCount == PageCnt && wrk.LineCount == LineCnt) return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// 構成コンボボックス初期表示
-        /// </summary>
-        private void InitStructureCombBox()
-        {
-            try
-            {
-                m_bEventStop = true;
-                //コンボボックスのDataSourceにデータを割り当てる
-                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
-                foreach (KeyValuePair<int, string> wrk in CommonMotions.StructureTypeName)
-                {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrk.Key, wrk.Value);
-
-                    DataList.Add(keyval);
-                }
-
-                // コンボボックス初期表示
-                ComboBoxAction.InitDataSetCombBox(cmbStructureType, DataList);
-
-                // 先頭行セット
-                cmbStructureType.SelectedValue = m_ComponentCode;
-
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                m_bEventStop = false;
-            }
-        }
-
-        /// <summary>
-        /// 工種コンボボックス初期表示処理
-        /// </summary>
-        private void SetItemCombBox(int iKeyVal = 0)
-        {
-            IOMConstructionItemOLD ciDB = new IOMConstructionItemOLD();
-            try
-            {
-                m_bEventStop = true;
-                List<ConstructionItemOLDMaster> ciList = new List<ConstructionItemOLDMaster>();
-
-                // コンボボックスクリア
-                cmbItemType.DataSource = null;
-                cmbItemType.Items.Clear();
-
-                // 選択項目クリア
-                cmbItemType.Text = "";
-
-                //コンボボックスのデータをセットする
-                // SQL作成
-                if (iKeyVal == 0) iKeyVal = m_ComponentCode;
-                string strSQL = string.Format(" Where ComponentCode = {0} And DeleteFlg = 0 Order By DisplayOrder ASC", iKeyVal);
-                // 工種マスタ取得
-                if (!ciDB.SelectAction(strSQL, ref ciList)) return;
-
-                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
-                foreach (ConstructionItemOLDMaster wrk in ciList)
-                {
-
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrk.ItemCode, wrk.ItemName);
-
-                    DataList.Add(keyval);
-                }
-                // コンボボックス初期表示
-                ComboBoxAction.InitDataSetCombBox(cmbItemType, DataList);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                ciDB.close();
-                ciDB = null;
-                m_bEventStop = false;
-            }
-        }
-
-        /// <summary>
-        /// グリッド空行チェック
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        private bool BlanckRowCheck(DataGridViewRow row)
-        {
-            try
-            {
-                // 空欄チェック
-                if (CommonMotions.chkObjectIsNull(row.Cells[(int)DispGridColumn.WorkName].Value)) return false;
-                if (CommonMotions.chkObjectIsNull(row.Cells[(int)DispGridColumn.SpecName].Value)) return false;
-
-                if (row.Cells[(int)DispGridColumn.WorkName].Value.ToString().Length == 0) return false;
-                if (row.Cells[(int)DispGridColumn.SpecName].Value.ToString().Length == 0) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.resx	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.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="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.resx	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.resx	(nonexistent)
@@ -1,144 +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="Column4.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>
-  <metadata name="Colum6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.cs	(nonexistent)
@@ -1,469 +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/07/14  Ver1.0.0.0      Create Source           
-//
-//
-//
-//*----------------------------------------------------------------------------*
-namespace ProcessManagement.Forms.SubForms
-{
-    public partial class FrmMessageBoardInput : Form
-    {
-        #region 使用定義
-        //log4netログを使用する
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region 定数
-        /// <summary>
-        /// 表示カラム
-        /// </summary>
-        private enum DispColumn
-        {
-            DisplayOrder = 0,
-            UnitKey,
-            NameString,
-        }
-        /// <summary>
-        /// マスタリストMAXライン
-        /// </summary>
-        private const int s_ListMaxLineCount = 53;
-        /// <summary>
-        /// 編集モード文字列
-        /// </summary>
-        private string[] s_ModeString = { "新規", "編集", "返信" };
-        #endregion
-
-        #region 変数
-        /// <summary>
-        /// フィールド値変化フラグ
-        /// </summary>
-        private bool m_bChengeAns = false;
-
-        /// <summary>
-        /// レコード番号
-        /// </summary>
-        private int m_RecordNumber = 0;
-        /// <summary>
-        /// レコード枝番
-        /// </summary>
-        private int m_BranchNumber = 0;
-        /// <summary>
-        /// 元データ書込み者
-        /// </summary>
-        private int m_WritingCode = 0;
-        /// <summary>
-        /// 終了ボタン押下フラグ
-        /// </summary>
-        private DialogResult m_EndButton = DialogResult.None;
-        #endregion
-
-        #region コンストラクタ
-        public FrmMessageBoardInput()
-        {
-            InitializeComponent();
-        }
-        #endregion
-        #region デストラクタ
-        ~FrmMessageBoardInput()
-        {
-            try
-            {
-                GC.Collect();
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-
-        #region プロパティ
-        /// <summary>
-        /// レコード番号
-        /// </summary>
-        public int RecordNumber
-        {
-            get { return m_RecordNumber; }
-            set { m_RecordNumber = value; }
-        }
-        /// <summary>
-        /// レコード枝番
-        /// </summary>
-        public int BranchNumber
-        {
-            get { return m_BranchNumber; }
-            set { m_BranchNumber = value; }
-        }
-        /// <summary>
-        /// 元データ書込み者
-        /// </summary>
-        public int WritingCode
-        {
-            get { return m_WritingCode; }
-            set { m_WritingCode = value; }
-        }
-
-        #endregion
-
-
-        #region イベントメソッド
-        /// <summary>
-        /// ×ボタン押下処理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmMessageBoardInput_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (m_bChengeAns)
-            {
-                if (MessageBox.Show("データに変更があります、登録せずに終了してよろしいですか？。", "終了確認"
-                                , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
-                {
-                    e.Cancel = true;
-                    return;
-                }
-                if (m_EndButton == DialogResult.None) m_EndButton = DialogResult.No;
-            }
-            // 前プロセスに戻る
-            ClsExcute.BackProcess();
-        }
-        /// <summary>
-        /// 終了ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
-        {
-            m_EndButton = DialogResult.No;
-            this.Close();
-        }
-
-        /// <summary>
-        /// フォームロード
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmMessageBoardInput_Load(object sender, EventArgs e)
-        {
-            // 担当者コンボ初期化
-            SetcmbPersonInCharge();
-            // 初期表示
-            InitDataLoad();
-            
-            // フォームサイズ固定
-            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
-        }
-
-        /// <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 btnDelete_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                m_EndButton = DialogResult.No;
-                this.Close();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-            }
-        }
-
-        /// <summary>
-        /// 登録ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDataEntry_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                //データチェック
-                if (!DispFeildCheck()) return;
-
-                if (MessageBox.Show("表示中のデータを登録します。", "登録確認"
-                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
-
-                // データ登録
-                MessageBoardEntry();
-
-                m_bChengeAns = false;
-                m_EndButton = DialogResult.OK;
-                this.Close();
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// Formキーダウン処理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmMessageBoardInput_KeyDown(object sender, KeyEventArgs e)
-        {
-            //Enterキーが押されているか確認
-            //AltかCtrlキーが押されている時は無視する
-            if ((e.KeyCode == Keys.Enter) && !e.Alt && !e.Control)
-            {
-                //あたかもTabキーが押されたかのようにする
-                //Shiftが押されている時は前のコントロールのフォーカスを移動
-                this.ProcessTabKey(!e.Shift);
-
-                e.Handled = true;
-                //.NET Framework 2.0以降
-                e.SuppressKeyPress = true;
-            }
-        }
-        #endregion
-
-        #region プライベートメソッド
-        /// <summary>
-        /// 初期表示処理
-        /// </summary>
-        private void InitDataLoad()
-        {
-            IOMessageBoardData mbdDB = new IOMessageBoardData();
-            try
-            {
-                // 表示モード
-                if (m_RecordNumber == 0)
-                {
-                    lblMode.Text = s_ModeString[0];
-                }
-                else
-                {
-                    if (m_WritingCode == ClsCommon.LoginUserData.PersonCode)
-                        lblMode.Text = s_ModeString[1];
-                    else
-                        lblMode.Text = s_ModeString[2];
-                }
-                // 書込み者セット
-                cmbFrom.SelectedValue = ClsCommon.LoginUserData.PersonCode;
-                // 返信対象セット
-                cmbTo.SelectedValue = m_WritingCode;
-
-                if (m_RecordNumber == 0) return;
-
-                if (m_WritingCode == ClsCommon.LoginUserData.PersonCode)
-                {
-                    // 掲示板データを取得する
-                    string strSQL = mbdDB.CreatePrimarykeyString(m_RecordNumber) + string.Format(" And BranchNumber = {0}", m_BranchNumber);
-                    MessageBoardData data = new MessageBoardData();
-                    if (!mbdDB.SelectAction(strSQL, ref data)) return;
-
-                    txtMessage.Text = data.MessageContent;
-                    cmbTo.Text = data.ToName;
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                mbdDB.close(); mbdDB = null;
-                m_bChengeAns = false;
-            }
-        }
-
-        /// <summary>
-        /// 画面項目のチェック
-        /// </summary>
-        /// <returns></returns>
-        private bool DispFeildCheck()
-        {
-            bool bRet = true;
-            try
-            {
-                // 背景色変更
-                ClsCommon.chgBackColor(txtMessage, bRet);
-                if (txtMessage.Text.Length == 0)
-                {
-                    bRet = false;
-                    ClsCommon.chgBackColor(txtMessage, bRet);
-                    MessageBox.Show("入力されていません、確認してください。", "データ確認"
-                                                , MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return bRet;
-                }
-
-                if (!(bRet = ClsCommon.DispFieldLengthCheck(txtMessage, 1200)))
-                {
-                    ClsCommon.chgBackColor(txtMessage, bRet);
-                    MessageBox.Show("文字が長すぎです、確認してください。", "データ確認"
-                                                , MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-
-                return bRet;
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        /// <summary>
-        /// 担当者コンボボックスへ文字をセットする
-        /// </summary>
-        private bool SetcmbPersonInCharge()
-        {
-            IOMPersonInCharge picDB = new IOMPersonInCharge();
-            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
-            IOMDepartment dmDB = new IOMDepartment();
-            List<DepartmentMaster> dmList = new List<DepartmentMaster>();
-            try
-            {
-                // 担当者マスタを検索する
-                string strSQL = " Where DeleteFlg = 0 Order By DisplayOrder, PersonCode ASC";
-
-                // 担当者マスタ読込
-                if (!picDB.SelectAction(strSQL, ref workList)) return false;
-
-                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
-                List<KeyValuePair<int, string>> DataList2 = new List<KeyValuePair<int, string>>();
-                DataList.Add(new KeyValuePair<int, string>(0, ""));
-                DataList2.Add(new KeyValuePair<int, string>(0, ""));
-                DataList2.Add(new KeyValuePair<int, string>(99999999, "全員"));
-                // 部署マスタを検索する
-                string strSQL2 = " Where DeleteFlg = 0 Order By DisplayOrder ASC";
-                // 部署マスタ読込
-                if (!dmDB.SelectAction(strSQL2, ref dmList)) return false;
-                // データ表示
-                foreach (DepartmentMaster wrk in dmList)
-                {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrk.DepartmentCode, wrk.DepartmentString);
-
-                    DataList2.Add(keyval);
-                }
-
-                // データ表示
-                foreach (PersonInChargeMaster wrk in workList)
-                {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(wrk.PersonCode, wrk.PersonName);
-
-                    DataList.Add(keyval);
-                    DataList2.Add(keyval);
-                }
-                // コンボボックス初期表示
-                ComboBoxAction.InitDataSetCombBox(cmbFrom, DataList);
-                ComboBoxAction.InitDataSetCombBox(cmbTo, DataList2);
-                cmbFrom.SelectedIndex = -1;
-                cmbTo.SelectedIndex = -1;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                picDB.close(); picDB = null;
-                dmDB.close(); dmDB = null;
-            }
-        }
-        /// <summary>
-        /// 掲示板データ登録
-        /// </summary>
-        /// <returns></returns>
-        private bool MessageBoardEntry()
-        {
-            IOMessageBoardData mbdDB = new IOMessageBoardData();
-            try
-            {
-                List<MessageBoardData> data = new List<MessageBoardData>();
-                MessageBoardData work = new MessageBoardData();
-                // 新規メッセージの時
-                if (m_RecordNumber == 0)
-                {
-                    m_RecordNumber = mbdDB.SelectMaxMessageBoardDataKeyCount("") + 1;
-                }
-                if (lblMode.Text != s_ModeString[0] && m_WritingCode != ClsCommon.LoginUserData.PersonCode)
-                {
-                    m_BranchNumber = mbdDB.SelectMaxMessageBoardDataBranchKeyCount(m_RecordNumber) + 1;
-                }
-                work.RecordNumber = m_RecordNumber;
-                work.BranchNumber = m_BranchNumber;
-                string strWhere = mbdDB.CreatePrimarykeyString(work.RecordNumber, work.BranchNumber);
-
-                if (!mbdDB.SelectAction(strWhere, ref data))
-                {
-                    MessageBox.Show("登録確認に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-
-                work.FromName = cmbFrom.Text;
-                work.ToName = cmbTo.Text;
-                work.MessageContent = txtMessage.Text;
-                work.WritingDate = DateTime.Now;
-                work.PersonCode = ClsCommon.LoginUserData.PersonCode;
-
-                if (data.Count == 0)
-                {
-                    // データがない場合
-                    data.Clear();
-                    data.Add(work);
-                    // データ登録
-                    if (!mbdDB.InsertAction(data)) return false;
-                }
-                else
-                {
-                    // データがある場合
-                    // データ更新
-                    if (!mbdDB.UpdateAction(strWhere, work)) return false;
-                }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", ClsCommon.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                mbdDB.close(); mbdDB = null;
-            }
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.Designer.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmEstimateDetailDiag.Designer.cs	(nonexistent)
@@ -1,397 +0,0 @@
-﻿namespace ProcessManagement.Forms.SubForms
-{
-    partial class FrmEstimateDetailDiag
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            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();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.btnSelect = new System.Windows.Forms.Button();
-            this.dgvMaster = new System.Windows.Forms.DataGridView();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Colum6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column10 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.chkBoxAll = new System.Windows.Forms.CheckBox();
-            this.btnDispDown = new System.Windows.Forms.Button();
-            this.btnDispUp = new System.Windows.Forms.Button();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.cmbItemType = new System.Windows.Forms.ComboBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.cmbStructureType = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
-            this.panel2.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(1108, 565);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 3;
-            this.btnEnd.Text = "終　了";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.BackColor = System.Drawing.Color.Green;
-            this.btnSelect.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnSelect.ForeColor = System.Drawing.Color.White;
-            this.btnSelect.Location = new System.Drawing.Point(982, 565);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(120, 30);
-            this.btnSelect.TabIndex = 2;
-            this.btnSelect.Text = "選　択";
-            this.btnSelect.UseVisualStyleBackColor = false;
-            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-            // 
-            // 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);
-            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.Column4,
-            this.Column5,
-            this.Colum6,
-            this.Column7,
-            this.Column8,
-            this.Column9,
-            this.Column10});
-            this.dgvMaster.Location = new System.Drawing.Point(10, 56);
-            this.dgvMaster.Name = "dgvMaster";
-            this.dgvMaster.RowHeadersVisible = false;
-            this.dgvMaster.RowHeadersWidth = 20;
-            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 21;
-            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(1170, 487);
-            this.dgvMaster.TabIndex = 0;
-            this.dgvMaster.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellClick);
-            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
-            // 
-            // 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)));
-            dataGridViewCellStyle2.NullValue = "false";
-            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;
-            this.Column1.Width = 40;
-            // 
-            // 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.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Visible = false;
-            this.Column3.Width = 480;
-            // 
-            // Column4
-            // 
-            this.Column4.Frozen = true;
-            this.Column4.HeaderText = "構成コード";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.Visible = false;
-            // 
-            // Column5
-            // 
-            this.Column5.Frozen = true;
-            this.Column5.HeaderText = "工種コード";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Visible = false;
-            // 
-            // Colum6
-            // 
-            this.Colum6.Frozen = true;
-            this.Colum6.HeaderText = "作業コード";
-            this.Colum6.Name = "Colum6";
-            this.Colum6.ReadOnly = true;
-            this.Colum6.Visible = false;
-            // 
-            // Column7
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Column7.Frozen = true;
-            this.Column7.HeaderText = "作業名称";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column7.Width = 460;
-            // 
-            // Column8
-            // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Column8.Frozen = true;
-            this.Column8.HeaderText = "品質・形状・寸法";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column8.Width = 460;
-            // 
-            // Column9
-            // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column9.Frozen = true;
-            this.Column9.HeaderText = "見積金額";
-            this.Column9.Name = "Column9";
-            this.Column9.ReadOnly = true;
-            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column9.Width = 150;
-            // 
-            // Column10
-            // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Column10.Frozen = true;
-            this.Column10.HeaderText = "";
-            this.Column10.Name = "Column10";
-            this.Column10.Width = 40;
-            // 
-            // chkBoxAll
-            // 
-            this.chkBoxAll.AutoSize = true;
-            this.chkBoxAll.Location = new System.Drawing.Point(1135, 61);
-            this.chkBoxAll.Name = "chkBoxAll";
-            this.chkBoxAll.Size = new System.Drawing.Size(15, 14);
-            this.chkBoxAll.TabIndex = 7;
-            this.chkBoxAll.UseVisualStyleBackColor = true;
-            this.chkBoxAll.CheckedChanged += new System.EventHandler(this.chkBoxAll_CheckedChanged);
-            // 
-            // 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(1196, 286);
-            this.btnDispDown.Name = "btnDispDown";
-            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
-            this.btnDispDown.TabIndex = 15;
-            this.btnDispDown.TabStop = false;
-            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(1196, 222);
-            this.btnDispUp.Name = "btnDispUp";
-            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
-            this.btnDispUp.TabIndex = 14;
-            this.btnDispUp.TabStop = false;
-            this.btnDispUp.Text = "▲";
-            this.btnDispUp.UseVisualStyleBackColor = true;
-            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
-            // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.panel2.Controls.Add(this.tableLayoutPanel1);
-            this.panel2.Location = new System.Drawing.Point(10, 8);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1170, 40);
-            this.panel2.TabIndex = 16;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 4;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
-            this.tableLayoutPanel1.Controls.Add(this.cmbItemType, 3, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.cmbStructureType, 1, 0);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 1;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1160, 30);
-            this.tableLayoutPanel1.TabIndex = 1;
-            // 
-            // cmbItemType
-            // 
-            this.cmbItemType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbItemType.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbItemType.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbItemType.FormattingEnabled = true;
-            this.cmbItemType.Location = new System.Drawing.Point(699, 3);
-            this.cmbItemType.Name = "cmbItemType";
-            this.cmbItemType.Size = new System.Drawing.Size(422, 24);
-            this.cmbItemType.TabIndex = 2;
-            this.cmbItemType.SelectedIndexChanged += new System.EventHandler(this.cmbItemType_SelectedIndexChanged);
-            // 
-            // label2
-            // 
-            this.label2.BackColor = System.Drawing.Color.White;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label2.Location = new System.Drawing.Point(583, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(109, 27);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "工　種";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label1
-            // 
-            this.label1.BackColor = System.Drawing.Color.White;
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label1.Location = new System.Drawing.Point(3, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(109, 27);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "構　成";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // cmbStructureType
-            // 
-            this.cmbStructureType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbStructureType.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.cmbStructureType.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.cmbStructureType.FormattingEnabled = true;
-            this.cmbStructureType.Location = new System.Drawing.Point(119, 3);
-            this.cmbStructureType.Name = "cmbStructureType";
-            this.cmbStructureType.Size = new System.Drawing.Size(422, 24);
-            this.cmbStructureType.TabIndex = 0;
-            this.cmbStructureType.SelectedIndexChanged += new System.EventHandler(this.cmbStructureType_SelectedIndexChanged);
-            // 
-            // FrmEstimateDetailDiag
-            // 
-            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(1240, 602);
-            this.Controls.Add(this.panel2);
-            this.Controls.Add(this.btnDispDown);
-            this.Controls.Add(this.btnDispUp);
-            this.Controls.Add(this.chkBoxAll);
-            this.Controls.Add(this.dgvMaster);
-            this.Controls.Add(this.btnSelect);
-            this.Controls.Add(this.btnEnd);
-            this.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.KeyPreview = true;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmEstimateDetailDiag";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "積算見積データ選択";
-            this.Load += new System.EventHandler(this.FrmCostStructureDiag_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
-            this.panel2.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnEnd;
-        private System.Windows.Forms.Button btnSelect;
-        private System.Windows.Forms.DataGridView dgvMaster;
-        private System.Windows.Forms.CheckBox chkBoxAll;
-        private System.Windows.Forms.Button btnDispDown;
-        private System.Windows.Forms.Button btnDispUp;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.ComboBox cmbStructureType;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.ComboBox cmbItemType;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Colum6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn Column10;
-    }
-}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.cs	(nonexistent)
@@ -1,1202 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Collections;
-
-using log4net;
-using log4net.Appender;
-using log4net.Repository.Hierarchy;
-
-using ProcessManagement.Common;
-using ProcessManagement.DB.IOAccess;
-using ProcessManagement.DataModel;
-using ProcessManagement.DB.Core;
-using ProcessManagement.Forms.SubForms;
-using ProcessManagement.Forms.CustomControls;
-using ProcessManagement.Forms.ControlsAction;
-
-namespace ProcessManagement.Forms.SubForms
-{
-    public partial class FrmSubLocationDiag : Form
-    {
-        #region ログ使用定義
-        //log4netログを使用する
-        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        #endregion
-
-        #region 定数
-        #region 表示カラム
-        /// <summary>
-        /// 表示カラム
-        /// </summary>
-        private enum DispGridColumn
-        {
-            No = 0,
-            CompanyCode,
-            CompanyName,
-            DataType,
-        }
-        #endregion
-
-        #region 可変ボタン定義
-        /// <summary>
-        /// 可変ボタン定義
-        /// </summary>
-        private enum buttonVariable
-        {
-            /// <summary>
-            /// 無
-            /// </summary>
-            None = 0,
-            /// <summary>
-            /// 業者未定
-            /// </summary>
-            UnDecided,
-            /// <summary>
-            /// 常雇者
-            /// </summary>
-            AlwaysEmployment,
-        }
-        #endregion
-
-        #region ボタン色
-        /// <summary>
-        /// ボタントップ色
-        /// </summary>
-        private static Color[] ButtonBackColor = new Color[] { Color.White, Color.Gray, Color.Aquamarine };
-        private static Color[] ButtonForeColor = new Color[] { Color.White, Color.White, Color.Black };
-        #endregion
-
-        #region ボタントップ固定文字
-        /// <summary>
-        /// ボタントップ固定文字
-        /// </summary>
-        private static string[] FixButtonTop = new string[] { "", "業　者　未　定", "常　　雇　　者" };
-        #endregion
-        #endregion
-
-        #region 変数
-        /// <summary>
-        /// 初期処理フラグ
-        /// </summary>
-        //private bool m_InitFlg = true;
-        /// <summary>
-        /// 協力業者マスタレコード
-        /// </summary>
-        private SubContractorMaster m_SubContractorSelcet = new SubContractorMaster();
-
-        /// <summary>
-        /// 起動元フラグ
-        /// </summary>
-        private int m_StartupSource = 0;
-
-        /// <summary>
-        /// 選択データタイプ
-        /// </summary>
-        private int m_DataType = 0;
-
-        /// <summary>
-        /// 複数選択フラグ
-        /// </summary>
-        private bool m_MultiSelect = true;
-
-        /// <summary>
-        /// 終了状態フラグ
-        /// </summary>
-        private DialogResult m_EndButton = DialogResult.None;
-
-        /// <summary>
-        /// 工事番号
-        /// </summary>
-        private int m_ConstructionCode = 0;
-
-        /// <summary>
-        /// 使用機能番号（協力会社検索）
-        /// </summary>
-        private const int m_UsedProcessNo = (int)ClsExcute.SubFormExecuteNo.SubconstractorDiag;
-        #endregion
-
-        #region プロパティ
-        /// <summary>
-        /// 工事番号
-        /// </summary>
-        public int ConstructionCode
-        {
-            get { return m_ConstructionCode; }
-            set { m_ConstructionCode = value; }
-        }
-        
-        /// <summary>
-        /// 協力会社
-        /// </summary>
-        public SubContractorMaster SelectData
-        {
-            get { return m_SubContractorSelcet; }
-            set { m_SubContractorSelcet = value; }
-        }
-
-        /// <summary>
-        /// 複数選択フラグ
-        /// </summary>
-        public bool MultiSelect
-        {
-            get { return m_MultiSelect; }
-            set { m_MultiSelect = value; }
-        }
-
-        /// <summary>
-        /// 終了ボタン状態
-        /// </summary>
-        public DialogResult EndButton
-        {
-            get { return m_EndButton; }
-        }
-
-        /// <summary>
-        /// 起動元フラグ
-        /// </summary>
-        public int StartupSource
-        {
-            get { return m_StartupSource; }
-            set { m_StartupSource = value; }
-        }
-
-        /// <summary>
-        /// 選択データタイプ
-        /// </summary>
-        public int DataType
-        {
-            get { return m_DataType; }
-            set { m_DataType = value; }
-        }
-
-        #endregion
-
-        #region コンストラクタ
-        /// <summary>
-        /// フォーム初期化
-        /// </summary>
-        public FrmSubLocationDiag()
-        {
-            InitializeComponent();
-        }
-        #endregion
-
-        #region フォームロード
-        /// <summary>
-        /// フォームロード
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmSubLocationDiag_Load(object sender, EventArgs e)
-        {
-
-            this.dgvMaster.RowHeadersVisible = false;
-            this.dgvMaster.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-
-            this.dgvMaster.Columns[0].Width = 60;
-            this.dgvMaster.Columns[1].Width = 120;
-            this.dgvMaster.Columns[2].Width = 797;
-
-            this.dgvMaster.Columns[0].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-            this.dgvMaster.Columns[1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-            this.dgvMaster.AllowUserToAddRows = false;
-
-            string no;
-            string kno;
-            string[] ss = { "中之島公園", "靭公園", "大泉緑地", "金岡公園", "長居公園", "浜寺公園", "大阪城公園", "天王寺公園", "扇町公園", "大仙公園", "中之島遊歩道", "北摂自然歩道", "通天閣", "梅田スカイタワー", "山内邸", "野間邸", "西川邸", "スーパー山本繁", "鴻臚寺", "古本市場新金岡店", "北花田イオンモール", "新金岡シティ" };
-
-            this.dgvMaster.Rows.Add(new object[] { "", "", "不明" });
-
-            for (int i = 0; i < 22; i++)
-            {
-                no = (i + 1).ToString();
-                kno = "2016" + (i + 160).ToString("0000") + "-1";
-
-                this.dgvMaster.Rows.Add(new object[] { no, kno, ss[i] + "改修工事" });
-
-            }
-            for (int i = 0; i < 20; i++)
-            {
-                this.dgvMaster.Rows.Add(new object[] { "", "", "" });
-            }
-
-            // 表示形式変更
-            InitDisplayFormat();
-
-            // マスタ検索コンボボックス
-            InitFixDataSet();
-
-            // フォームサイズ固定
-            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
-
-            // 表示タブの選択
-            //if (ExistHistoryData())
-            //{
-            //    tabControl1.SelectedIndex = 0;
-            //    DispHistryGridData();
-            //}
-            //else
-            //{
-            //    tabControl1.SelectedIndex = 1;
-            //}
-            //m_InitFlg = false;
-        }
-        #endregion
-
-        #region フォームクローズ
-        /// <summary>
-        /// フォーム終了
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void FrmSubLocationDiag_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            //if (m_EndButton == DialogResult.OK)
-            //{
-            //    // グリッド選択
-            //    DataGridView dgv = null;
-            //    if (tabControl1.SelectedIndex == 0)
-            //        dgv = dgvHistory;
-            //    else
-            //        dgv = dgvSearch;
-         
-            //    // 選択データ取得
-            //    int SelRow = dgv.CurrentRow.Index;
-            //    int SelCode = CommonMotions.cnvInt(dgv.Rows[SelRow].Cells[(int)DispGridColumn.CompanyCode].Value);
-            //    m_DataType = CommonMotions.cnvInt(dgv.Rows[SelRow].Cells[(int)DispGridColumn.DataType].Value);
-            //    GetSubContractor(m_DataType, SelCode, ref m_SubContractorSelcet);
-
-            //    // 履歴は終了時に登録を行う
-            //    EntryInputLogData(dgv, SelCode);
-            //}
-        }
-        #endregion
-
-        #region 動作判定
-        /// <summary>
-        /// 動作判定
-        /// </summary>
-        /// <returns></returns>
-        private int JudgmentAction()
-        {
-            int iRet = 0;
-            switch (m_StartupSource)
-            {
-                // 積算見積書
-                case (int)ClsExcute.ProcessExecuteNo.EstimateInput:
-                    iRet = (int)buttonVariable.UnDecided;
-                    break;
-                // 積算予算書
-                case (int)ClsExcute.ProcessExecuteNo.EstimateBudget:
-                    iRet = (int)buttonVariable.UnDecided;
-                    break;
-                // 工事予算書
-                case (int)ClsExcute.ProcessExecuteNo.ConstructionBudget:
-                    iRet = (int)buttonVariable.AlwaysEmployment;
-                    break;
-                // 工事詳細台帳
-                case (int)ClsExcute.ProcessExecuteNo.ConstructionLedger:
-                    iRet = (int)buttonVariable.AlwaysEmployment;
-                    break;
-                // 議事録
-                case (int)ClsExcute.ProcessExecuteNo.Proceedings:
-                    iRet = (int)buttonVariable.None;
-                    break;
-            }
-            return iRet;
-        }
-        #endregion
-
-        #region 初期表示形式変更
-        /// <summary>
-        /// 初期表示形式変更
-        /// </summary>
-        private void InitDisplayFormat()
-        {
-            try
-            {
-                //// 表示ボタンの判定
-                //int ActionNo = JudgmentAction();
-                //if (ActionNo == (int)buttonVariable.None)
-                //{
-                //    btnVariable.Visible = false;
-                //    return;
-                //}
-
-                //btnVariable.BackColor = ButtonBackColor[ActionNo];
-                //btnVariable.ForeColor = ButtonForeColor[ActionNo];
-                //btnVariable.Text = FixButtonTop[ActionNo];
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region キャンセルボタン
-        /// <summary>
-        /// キャンセルボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnCancel_Click(object sender, EventArgs e)
-        {
-            m_EndButton = DialogResult.Cancel;
-            this.Close();
-        }
-        #endregion
-
-        #region 終了ボタン
-        /// <summary>
-        /// 終了ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnEnd_Click(object sender, EventArgs e)
-        {
-            m_EndButton = DialogResult.None;
-            this.Close();
-        }
-        #endregion
-
-        #region 選択ボタン
-        /// <summary>
-        /// 選択ボタン押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnSelect_Click(object sender, EventArgs e)
-        {
-            //if (tabControl1.SelectedIndex == 0)
-            //{
-            //    // 空白チェック
-            //    if (!BlanckRowCheck(dgvHistory.CurrentRow)) return;
-            //}
-            //else
-            //{
-            //    // 空白チェック
-            //    if (!BlanckRowCheck(dgvSearch.CurrentRow)) return;
-            //}
-
-            m_EndButton = DialogResult.OK;
-            this.Close();
-        }
-        #endregion
-
-        //#region 自社ボタン
-        ///// <summary>
-        ///// 自社選択ボタン押下
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void btnMyCompany_Click(object sender, EventArgs e)
-        //{
-        //    dgvSearch.Rows.Clear();
-        //    dgvSearch.Rows.Add(1, CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key,
-        //                            CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Value,
-        //                            (int)CommonDefine.SearchLogDataType.FixCode);
-        //    dgvSearch.Rows[0].Cells[0].Selected = true;
-
-        //    m_EndButton = DialogResult.OK;
-        //    this.Close();
-        //}
-        //#endregion
-
-        //#region 汎用ボタン
-        ///// <summary>
-        ///// 汎用ボタン押下
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void btnVariable_Click(object sender, EventArgs e)
-        //{
-        //    if (JudgmentAction() == (int)buttonVariable.UnDecided)
-        //    {
-        //        // 業者未定
-        //        UnDecided_Action();
-        //    }
-        //    else
-        //    {
-        //        // 常用者選択
-        //        DispPersonMasterGridData();
-        //    }
-        //}
-        //#endregion
-
-        //#region 業者未定時動作
-        ///// <summary>
-        ///// 業者未定時動作
-        ///// </summary>
-        //private void UnDecided_Action()
-        //{
-        //    dgvSearch.Rows.Clear();
-        //    dgvSearch.Rows.Add(1, CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.UnDecided].Key,
-        //                            CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.UnDecided].Value);
-        //    dgvSearch.Rows[0].Cells[0].Selected = true;
-
-        //    m_EndButton = DialogResult.OK;
-        //    this.Close();
-        //}
-        //#endregion
-
-        //#region マスタグリッドダブルクリック
-        ///// <summary>
-        ///// マスタグリッドダブルクリック
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void dgvSearch_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        //{
-        //    // 空白チェック
-        //    if (!BlanckRowCheck(dgvSearch.CurrentRow)) return;
-
-        //    m_EndButton = DialogResult.OK;
-        //    this.Close();
-        //}
-        //#endregion
-
-        #region 履歴グリッドグリッドダブルクリック
-        /// <summary>
-        /// 履歴グリッドダブルクリック
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void dgvHistory_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // 空白チェック
-            if (!BlanckRowCheck(dgvMaster.CurrentRow)) return;
-
-            m_EndButton = DialogResult.OK;
-            this.Close();
-        }
-        #endregion
-
-        #region 固定SQL文字列
-        private const string s_SQLWHERE = " WHERE";
-        private const string s_SQLAND = " AND";
-        #endregion
-
-        //#region 工種コンボボックスチェンジ
-        ///// <summary>
-        ///// 工種コンボ変更時イベント
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void cmbItemType_SelectedIndexChanged(object sender, EventArgs e)
-        //{
-        //    try
-        //    {
-        //        if (m_InitFlg) return;
-
-        //        // 工種検索条件取得
-        //        string strSQL = GetSqlFromCmbItemType();
-        //        if (strSQL.Length != 0) strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL);
-
-        //        // 50音検索条件取得
-        //        string SecondSQL = GetSqlFromcmbJapaneseSyllabary();
-        //        if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
-
-        //        // 支払区分検索条件取得
-        //        string ThirdSQL = GetSqlFromcmbLabour(); ;
-        //        if (ThirdSQL.Length != 0) strSQL += string.Format("{0} {1}", s_SQLAND, ThirdSQL);
-
-        //        strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
-
-        //        // 文字列にWhereが無い場合は先頭をWhereに変更する
-        //        if (strSQL.IndexOf(s_SQLWHERE, 0) < 0)
-        //        {
-        //            strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL.Substring(s_SQLAND.Length + 1));
-        //        }
-
-        //        // データ表示
-        //        DispSubconstractorMasterGridData(strSQL);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //}
-        //#endregion
-
-        #region 工種選択コンボボックスよりSQLを作成する
-        /// <summary>
-        /// 工種選択コンボボックスよりSQLを作成する
-        /// </summary>
-        /// <returns></returns>
-        private string GetSqlFromCmbItemType()
-        {
-            try
-            {
-            //    int Value = CommonMotions.cnvInt(cmbItemType.SelectedValue);
-            //    if (Value < 1) return string.Empty;
-
-            //    return string.Format(" CompanyCode In (Select CompanyCode From SubContractorJobItem Where ItemCode = {0})",
-            //                    CommonMotions.cnvInt(cmbItemType.SelectedValue));
-                return string.Empty;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return string.Empty;
-            }
-        }
-        #endregion
-
-        //#region 手間業者コンボボックスチェンジ
-        ///// <summary>
-        ///// 手間業者コンボボックスチェンジ
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void cmbLabour_SelectedIndexChanged(object sender, EventArgs e)
-        //{
-        //    try
-        //    {
-        //        if (m_InitFlg) return;
-
-        //        // 支払区分検索条件取得
-        //        string strSQL = GetSqlFromcmbLabour();
-        //        if (strSQL.Length != 0) strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL);
-
-        //        // 工種検索条件取得
-        //        string SecondSQL = GetSqlFromCmbItemType();
-        //        if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
-
-        //        // 50音検索条件取得
-        //        string ThirdSQL = GetSqlFromcmbJapaneseSyllabary(); ;
-        //        if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
-
-        //        strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
-
-        //        // 文字列にWhereが無い場合は先頭をWhereに変更する
-        //        if (strSQL.IndexOf(s_SQLWHERE, 0) < 0)
-        //        {
-        //            strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL.Substring(s_SQLAND.Length + 1));
-        //        }
-
-        //        // データ表示
-        //        DispSubconstractorMasterGridData(strSQL);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //}
-        //#endregion
-
-        #region 支払区分コンボボックスよりSQLを作成する
-        /// <summary>
-        ///  支払区分コンボボックスよりSQLを作成する
-        /// </summary>
-        /// <returns></returns>
-        private string GetSqlFromcmbLabour()
-        {
-            try
-            {
-                //int Value = CommonMotions.cnvInt(cmbLabour.SelectedValue);
-                //if (Value < 0) return string.Empty;
-
-                //return string.Format(" labourKind = {0}", CommonMotions.cnvInt(cmbLabour.SelectedValue));
-                return string.Empty;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return string.Empty;
-            }
-        }
-        #endregion
-
-        //#region 50音順コンボボックスチェンジ
-        ///// <summary>
-        ///// 50音順コンボ変更時イベント
-        ///// </summary>
-        ///// <param name="sender"></param>
-        ///// <param name="e"></param>
-        //private void cmbJapaneseSyllabary_SelectedIndexChanged(object sender, EventArgs e)
-        //{
-        //    try
-        //    {
-        //        if (m_InitFlg) return;
-
-        //        // 50音検索条件取得
-        //        string strSQL = GetSqlFromcmbJapaneseSyllabary();
-        //        if (strSQL.Length != 0) strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL);
-
-        //        // 工種検索条件取得
-        //        string SecondSQL = GetSqlFromCmbItemType();
-        //        if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
-
-        //        // 支払区分検索条件取得
-        //        string ThirdSQL = GetSqlFromcmbLabour(); ;
-        //        if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
-
-        //        strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
-
-        //        // 文字列にWhereが無い場合は先頭をWhereに変更する
-        //        if (strSQL.IndexOf(s_SQLWHERE, 0) < 0)
-        //        {
-        //            strSQL = string.Format("{0} {1}", s_SQLWHERE, strSQL.Substring(s_SQLAND.Length + 1));
-        //        }
-
-        //        // データ表示
-        //        DispSubconstractorMasterGridData(strSQL);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //}
-        //#endregion
-
-        #region 50音順コンボボックスよりSQLを作成する
-        /// <summary>
-        ///  50音順コンボボックスよりSQLを作成する
-        /// </summary>
-        /// <returns></returns>
-        private string GetSqlFromcmbJapaneseSyllabary()
-        {
-            try
-            {
-                //string Value = CommonMotions.cnvString(cmbJapaneseSyllabary.SelectedValue);
-                //if (Value.Length == 0) return string.Empty;
-
-                //return string.Format(" JapaneseSyllabary = '{0}'", cmbJapaneseSyllabary.SelectedValue);
-                return string.Empty;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return string.Empty;
-            }
-        }
-        #endregion
-
-        #region 初期表示
-        /// <summary>
-        /// マスタ検索グリッド初期設定
-        /// </summary>
-        private void InitFixDataSet()
-        {
-            //dgvSearch.RowCount = CommonDefine.s_MaxInitLineCount;
-            
-            // 協力会社施工工種データセット
-            SetcmbSubContractorItem();
-            // 50音順セット
-            SetcmbcmbJapaneseSyllabary();
-            // 手間業者セット
-            SetcmbcmbLabout();
-        }
-        #endregion
-
-        #region 履歴データ確認処理
-        /// <summary>
-        /// 履歴データがあるかどうかを確認する
-        /// </summary>
-        /// <returns></returns>
-        private bool ExistHistoryData()
-        {
-            IOInputSearchLogData isdDB = new IOInputSearchLogData();
-            try
-            {
-                bool bRet = true;
-
-                string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo);
-                List<InputSearchLogData> isdList = new List<InputSearchLogData>();
-                if (!isdDB.SelectAction(strSQL, ref isdList)) bRet = false;
-                if (isdList.Count == 0) return false;
-
-                return bRet;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                isdDB.close(); isdDB = null;
-            }
-        }
-        #endregion
-
-        //#region 協力会社マスタグリッドデータ表示
-        ///// <summary>
-        ///// 協力会社マスタグリッドデータ表示
-        ///// </summary>
-        //private void DispSubconstractorMasterGridData(string strSearch)
-        //{
-        //    IOMSubContractor sbcDB = new IOMSubContractor();
-        //    try
-        //    {
-        //        dgvSearch.Rows.Clear();
-
-        //        List<SubContractorMaster> sbcList = new List<SubContractorMaster>();
-                
-        //        // SQL作成
-        //        // 工種マスタ取得
-        //        if (!sbcDB.SelectAction(strSearch, ref sbcList)) return;
-
-        //        // 要素表示
-        //        int i = 0;
-        //        foreach (SubContractorMaster wrk in sbcList)
-        //        {
-        //            int iRows = dgvSearch.Rows.Add(++i,
-        //                                wrk.CompanyCode,
-        //                                wrk.CompanyName,
-        //                                (int)CommonDefine.SearchLogDataType.Subconstractor);
-
-
-        //            dgvSearch.Rows[iRows].Cells[(int)DispGridColumn.CompanyName].ToolTipText = wrk.CompanyName;
-        //        }
-        //        // 画面一杯に行を表示する
-        //        if (dgvSearch.Rows.Count < CommonDefine.s_MaxInitLineCountMastamente)
-        //        {
-        //            int idspCnt = CommonDefine.s_MaxInitLineCountMastamente - dgvSearch.Rows.Count;
-        //            if (idspCnt != 0) dgvSearch.Rows.Add(idspCnt);
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //    finally
-        //    {
-        //        sbcDB.close();
-        //        sbcDB = null;
-        //    }
-        //}
-        //#endregion
-
-        //#region 担当者マスタグリッドデータ表示（常用者）
-        ///// <summary>
-        ///// 担当者マスタグリッドデータ表示（常用者）
-        ///// </summary>
-        //private void DispPersonMasterGridData()
-        //{
-        //    IOMPersonInCharge personDB = new IOMPersonInCharge();
-        //    try
-        //    {
-        //        dgvSearch.Rows.Clear();
-
-        //        List<PersonInChargeMaster> personList = new List<PersonInChargeMaster>();
-        //        // SQL作成
-        //        string strSQL = string.Format(" Where EmployeeClassFlg = {0} And DeleteFlg = 0 Order By DisplayOrder ASC", (int)CommonDefine.EmployeeClassFlg.OutSource);
-        //        // 担当者マスタ取得
-        //        if (!personDB.SelectAction(strSQL, ref personList)) return;
-
-        //        // 要素表示
-        //        int i = 0;
-        //        foreach (PersonInChargeMaster wrk in personList)
-        //        {
-        //            int iRows = dgvSearch.Rows.Add(++i,
-        //                                wrk.PersonCode,
-        //                                wrk.PersonName,
-        //                                (int)CommonDefine.SearchLogDataType.Person);
-
-        //            dgvSearch.Rows[iRows].Cells[(int)DispGridColumn.CompanyName].ToolTipText = wrk.PersonName;
-        //        }
-        //        // 画面一杯に行を表示する
-        //        if (dgvSearch.Rows.Count < CommonDefine.s_MaxInitLineCountMastamente)
-        //        {
-        //            int idspCnt = CommonDefine.s_MaxInitLineCountMastamente - dgvSearch.Rows.Count;
-        //            if (idspCnt != 0) dgvSearch.Rows.Add(idspCnt);
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //    finally
-        //    {
-        //        personDB.close(); personDB = null;
-        //    }
-        //}
-        //#endregion
-
-        #region 履歴グリッドデータ表示
-        /// <summary>
-        /// 履歴グリッドデータ表示
-        /// </summary>
-        private void DispHistryGridData()
-        {
-            IOInputSearchLogData isdDB = new IOInputSearchLogData();
-            IOMSubContractor sbcDB = new IOMSubContractor();
-            try
-            {
-                dgvMaster.Rows.Clear();
-
-                List<InputSearchLogData> isdList = new List<InputSearchLogData>();
-                // SQL作成
-                string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo);
-                strSQL += " Order By DisplayOrder";
-                if (!isdDB.SelectAction(strSQL, ref isdList)) return;
-
-                // 要素表示
-                int i = 0;
-                foreach (InputSearchLogData wrk in isdList)
-                {
-                    SubContractorMaster sbcRec = new SubContractorMaster();
-                    if (!GetSubContractor(wrk.DataType, wrk.InputCode, ref sbcRec)) continue;
-
-                    int iRows = dgvMaster.Rows.Add(++i,
-                                        sbcRec.CompanyCode,
-                                        sbcRec.CompanyName,
-                                        wrk.DataType);
-
-                    dgvMaster.Rows[iRows].Cells[(int)DispGridColumn.CompanyName].ToolTipText = sbcRec.CompanyName;
-                }
-                // 画面一杯に行を表示する
-                if (dgvMaster.Rows.Count < CommonDefine.s_MaxInitLineCountMastamente)
-                {
-                    int idspCnt = CommonDefine.s_MaxInitLineCountMastamente - dgvMaster.Rows.Count;
-                    if (idspCnt != 0) dgvMaster.Rows.Add(idspCnt);
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                isdDB.close(); isdDB = null;
-                sbcDB.close(); sbcDB = null;
-            }
-        }
-        #endregion
-
-        #region 選択データ取得
-        /// <summary>
-        /// 選択データ取得
-        /// </summary>
-        /// <param name="SubContractorCode"></param>
-        /// <param name="DataRec"></param>
-        /// <returns></returns>
-        private bool GetSubContractor(int DataType, int SubContractorCode, ref SubContractorMaster DataRec)
-        {
-            IOMSubContractor sbcDB = new IOMSubContractor();
-            IOMPersonInCharge personDB = new IOMPersonInCharge();
-            try
-            {
-                string strSQL = string.Empty;
-                if (DataType == (int)CommonDefine.SearchLogDataType.FixCode)
-                {
-                    // 自社の場合
-                    if (SubContractorCode == CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key)
-                    {
-                        DataRec.CompanyCode = CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key;
-                        DataRec.CompanyName = CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Value;
-                    }
-                    else if (SubContractorCode == CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.UnDecided].Key)
-                    {   // 業者未定の場合
-                        DataRec.CompanyCode = CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.UnDecided].Key;
-                        DataRec.CompanyName = CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.UnDecided].Value;
-                    }
-                    return true;
-                }
-                else if (DataType == (int)CommonDefine.SearchLogDataType.Subconstractor)
-                {
-                    // SQL作成
-                    strSQL = sbcDB.CreatePrimarykeyString(SubContractorCode);
-                    // 工種マスタ取得
-                    if (!sbcDB.SelectAction(strSQL, ref DataRec)) return false;
-                }
-                else if (DataType == (int)CommonDefine.SearchLogDataType.Person)
-                {
-                    PersonInChargeMaster personRec = new PersonInChargeMaster();
-                    // SQL作成
-                    strSQL = personDB.CreatePrimarykeyString(SubContractorCode);
-                    strSQL += string.Format(" AND EmployeeClassFlg = {0} And DeleteFlg = 0", (int)CommonDefine.EmployeeClassFlg.OutSource);
-                    // 担当者マスタ取得
-                    if (!personDB.SelectAction(strSQL, ref personRec)) return false;
-                    DataRec.CompanyCode = personRec.PersonCode;
-                    DataRec.CompanyName = personRec.PersonName;
-                }
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-            finally
-            {
-                sbcDB.close(); sbcDB = null;
-                personDB.close(); personDB = null;
-            }
-        }
-        #endregion
-
-        #region グリッド空き行チェック
-        /// <summary>
-        /// グリッド空行チェック
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        private bool BlanckRowCheck(DataGridViewRow row)
-        {
-            try
-            {
-                // 空欄チェック
-                if (CommonMotions.chkObjectIsNull(row.Cells[(int)DispGridColumn.CompanyName].Value)) return false;
-                if (CommonMotions.cnvString(row.Cells[(int)DispGridColumn.CompanyName].Value).Length == 0) return false;
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-                return false;
-            }
-        }
-        #endregion
-
-        #region 協力会社施工工種コンボボックスセット
-        /// <summary>
-        /// 協力会社施工工種コンボボックスセット
-        /// </summary>
-        private void SetcmbSubContractorItem()
-        {
-            IOMSubContractorItem itemDB = new IOMSubContractorItem();
-            try
-            {
-                List<SubContractorItemMaster> itemList = new List<SubContractorItemMaster>();
-
-                string strSQL = " Order By DisplayOrder";
-                if (!itemDB.SelectAction(strSQL, ref itemList)) return;
-                if (itemList.Count == 0) return;
-
-                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
-                DataList.Add(new KeyValuePair<int, string>(0, ""));
-                // データ表示
-                for (int i = 0; i < itemList.Count; i++)
-                {
-                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(itemList[i].ItemCode, itemList[i].ItemName);
-
-                    DataList.Add(keyval);
-                }
-                //// コンボボックス初期表示
-                //ComboBoxAction.InitDataSetCombBox(cmbItemType, DataList);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                itemDB.close(); itemDB = null;
-            }
-        }
-        #endregion
-
-        #region 協力会社50音順コンボボックスセット
-        /// <summary>
-        /// 協力会社50音順コンボボックスセット
-        /// </summary>
-        private void SetcmbcmbJapaneseSyllabary()
-        {
-            IOMSubContractor sbDB = new IOMSubContractor();
-            try
-            {
-                string strSQL = "Select Distinct JapaneseSyllabary From SubContractorMaster Order By JapaneseSyllabary";
-                ArrayList arData = new ArrayList();
-                if (!sbDB.ExecuteReader(strSQL, ref arData)) return;
-                if (arData.Count == 0) return;
-
-                // データセット
-                List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>();
-                DataList.Add(new KeyValuePair<string, string>("", ""));
-                foreach (object[] objwrk in arData)
-                {
-                    KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(objwrk[0].ToString(), objwrk[0].ToString());
-                    DataList.Add(keyval);
-                }
-                //// コンボボックス初期表示
-                //ComboBoxAction.InitDataSetCombBox(cmbJapaneseSyllabary, DataList);
-            }
-            catch (Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-            finally
-            {
-                sbDB.close(); sbDB = null;
-            }
-        }
-        #endregion
-
-        #region 手間業者コンボボックスセット
-        /// <summary>
-        /// 手間業者コンボボックスセット
-        /// </summary>
-        private void SetcmbcmbLabout()
-        {
-            try
-            {
-
-                // データセット
-                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
-                DataList.Add(new KeyValuePair<int, string>(-1, ""));
-
-                foreach (KeyValuePair<int, string> SetValue in CommonDefine.s_SubContractorKind)
-                {
-                    DataList.Add(new KeyValuePair<int, string>(SetValue.Key, SetValue.Value));
-                }
-
-                // コンボボックス初期表示
-                //ComboBoxAction.InitDataSetCombBox(cmbLabour, DataList);
-            }
-            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 tabControl1_DrawItem(object sender, DrawItemEventArgs e)
-        {
-            //対象のTabControlを取得
-            TabControl tab = (TabControl)sender;
-            //タブページのテキストを取得
-            string txt = tab.TabPages[e.Index].Text;
-
-            //タブのテキストと背景を描画するためのブラシを決定する
-            Brush foreBrush = null;
-            Brush backBrush = null;
-
-            if (tab.TabPages[e.Index].Name.Equals("tabPage1"))
-            {
-                // 履歴ページ
-                backBrush = new SolidBrush(Color.LightGreen);
-                foreBrush = Brushes.Black;
-            }
-            else if (tab.TabPages[e.Index].Name.Equals("tabPage2"))
-            {   // 検索ページ
-                backBrush = new SolidBrush(Color.LightSalmon);
-                foreBrush = Brushes.Black;
-            }
-            else
-            {
-                backBrush = new SolidBrush(Color.Black);
-                foreBrush = Brushes.White;
-            }
-
-            //StringFormatを作成
-            StringFormat sf = new StringFormat();
-            //中央に表示する
-            sf.Alignment = StringAlignment.Center;
-            sf.LineAlignment = StringAlignment.Center;
-
-            //背景の描画
-            e.Graphics.FillRectangle(backBrush, e.Bounds);
-            //Textの描画
-            e.Graphics.DrawString(txt, e.Font, foreBrush, e.Bounds, sf);
-        }
-        #endregion
-
-        //#region グリッドより履歴データ登録処理
-        ///// <summary>
-        ///// グリッドよりの登録処理
-        ///// </summary>
-        ///// <returns></returns>
-        //private bool EntryInputLogData(DataGridView dgv, int SubconstructorCode)
-        //{
-        //    IOInputSearchLogData isdDB = new IOInputSearchLogData();
-        //    try
-        //    {
-        //        // グリッドからの選択は処理しない
-        //        if (dgv == dgvMaster && dgvMaster.RowCount > 1)
-        //        {
-        //            return true;
-        //        }
-                
-        //        InputSearchLogData isdRec = new InputSearchLogData();
-        //        string strSQL = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo);
-        //        strSQL += string.Format(" And InputCode = {0}", SubconstructorCode);
-                
-        //        // データがあれば登録しない
-        //        if (isdDB.SelectAction(strSQL, ref isdRec)) return true;
-
-        //        // 最大表示番号を取得する
-        //        string strMax = isdDB.CreatePrimarykeyString(m_ConstructionCode, m_UsedProcessNo);
-        //        int iMax = isdDB.SelectMaxCount(strMax);
-
-        //        // 登録対象
-        //        isdRec.ConstructionCode = m_ConstructionCode;       // 工事番号
-        //        isdRec.UsedProcessNo = m_UsedProcessNo;             // 使用機能番号
-        //        isdRec.DisplayOrder = iMax + 1;                     // 表示順
-        //        isdRec.InputCode = SubconstructorCode;              // 入力コード
-        //        isdRec.DataType = CommonMotions.cnvInt(dgvSearch.CurrentRow.Cells[(int)DispGridColumn.DataType].Value);       // データタイプ
-
-        //        if (!isdDB.InsertAction(isdRec)) return false;
-
-        //        return true;
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //        return false;
-        //    }
-        //    finally
-        //    {
-        //        isdDB.close(); isdDB = null;
-        //    }
-        //}
-        //#endregion
-
-        #region アップボタン
-        /// <summary>
-        /// アップキー押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDispUp_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                // グリッドアップキー処理
-                DataGridViewAction.GridRowUpAction((DataGridView)dgvMaster, (int)DispGridColumn.CompanyCode, (int)DispGridColumn.CompanyName);
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-
-        #region ダウンボタン
-        /// <summary>
-        /// ダウンキー押下
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnDispDown_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                // グリッドアップキー処理
-                DataGridViewAction.GridRowDownAction((DataGridView)dgvMaster, (int)DispGridColumn.CompanyCode, (int)DispGridColumn.CompanyName);
-            }
-            catch (System.Exception ex)
-            {
-                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-            }
-        }
-        #endregion
-    }
-}
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.resx	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardInput.resx	(nonexistent)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.designer.cs	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubLocationDiag.designer.cs	(nonexistent)
@@ -1,174 +0,0 @@
-﻿namespace ProcessManagement.Forms.SubForms
-{
-    partial class FrmSubLocationDiag
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            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();
-            this.btnSelect = new System.Windows.Forms.Button();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.BackColor = System.Drawing.Color.Green;
-            this.btnSelect.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnSelect.ForeColor = System.Drawing.Color.White;
-            this.btnSelect.Location = new System.Drawing.Point(544, 596);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(120, 30);
-            this.btnSelect.TabIndex = 4;
-            this.btnSelect.Text = "選　択";
-            this.btnSelect.UseVisualStyleBackColor = false;
-            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnEnd.ForeColor = System.Drawing.Color.White;
-            this.btnEnd.Location = new System.Drawing.Point(672, 596);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 30);
-            this.btnEnd.TabIndex = 5;
-            this.btnEnd.Text = "終　了";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // 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);
-            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.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3});
-            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
-            this.dgvMaster.Location = new System.Drawing.Point(12, 12);
-            this.dgvMaster.MultiSelect = false;
-            this.dgvMaster.Name = "dgvMaster";
-            this.dgvMaster.RowHeadersVisible = false;
-            this.dgvMaster.RowHeadersWidth = 20;
-            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dgvMaster.RowTemplate.Height = 21;
-            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvMaster.Size = new System.Drawing.Size(780, 578);
-            this.dgvMaster.TabIndex = 20;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridViewTextBoxColumn1.Frozen = true;
-            this.dataGridViewTextBoxColumn1.HeaderText = "No.";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Width = 50;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dataGridViewTextBoxColumn2.Frozen = true;
-            this.dataGridViewTextBoxColumn2.HeaderText = "工事番号";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn2.Width = 200;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle4;
-            this.dataGridViewTextBoxColumn3.Frozen = true;
-            this.dataGridViewTextBoxColumn3.HeaderText = "名　　称";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn3.Width = 500;
-            // 
-            // Column4
-            // 
-            this.Column4.Name = "Column4";
-            // 
-            // FrmSubLocationDiag
-            // 
-            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(805, 632);
-            this.Controls.Add(this.dgvMaster);
-            this.Controls.Add(this.btnSelect);
-            this.Controls.Add(this.btnEnd);
-            this.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmSubLocationDiag";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "工事案件選択";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmSubLocationDiag_FormClosing);
-            this.Load += new System.EventHandler(this.FrmSubLocationDiag_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnSelect;
-        private System.Windows.Forms.Button btnEnd;
-        private CustomControls.DataGridViewEX dgvMaster;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
-    }
-}
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 113)
+++ branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 114)
@@ -87,10 +87,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Office.Interop.Excel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Office.Interop.Word, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\MySql.Data.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -1688,26 +1695,6 @@
     <Content Include="Resources\kanriIcon.ico" />
     <Content Include="rinen.jpg" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Interop.Excel">
-      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>8</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Word">
-      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>6</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
